changeset 2149:cf20f1bd2f1e

- updated German translation - cleaned up alarm, mtp_up and song_change plugins
author mf0102 <0102@gmx.at>
date Thu, 01 Nov 2007 21:20:20 +0100
parents 5b5c450a6a37
children 04421592e6a3 2f7eff0bc6eb
files po/de.po src/alarm/alarm.c src/mtp_up/mtp.c src/song_change/song_change.c
diffstat 4 files changed, 31 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/po/de.po	Thu Nov 01 15:38:07 2007 +0100
+++ b/po/de.po	Thu Nov 01 21:20:20 2007 +0100
@@ -3,7 +3,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
 "POT-Creation-Date: 2007-10-18 21:38+0200\n"
-"PO-Revision-Date: 2007-11-01 00:22+0100\n"
+"PO-Revision-Date: 2007-11-01 21:10+0100\n"
 "Last-Translator: Michael Färber <0102@gmx.at>\n"
 "Language-Team: german <0102@gmx.at>\n"
 "MIME-Version: 1.0\n"
@@ -1377,7 +1377,7 @@
 
 #: src/aosd/aosd_trigger.c:80
 msgid "Triggers OSD when, during playback, the song title changes but the filename is the same. This is mostly useful to display title changes in internet streams."
-msgstr ""
+msgstr "Löst OSD aus, wenn sich während der Wiedergabe der Liedtitel ändert, aber der Dateiname gleich bleibt. Das ist hauptsächlich nützlich, um Titeländerungen bei Internetstreams anzuzeigen."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Volume Change"
@@ -1518,17 +1518,19 @@
 
 #: src/aosd/aosd_ui.c:801
 msgid "Composite manager detected"
-msgstr ""
+msgstr "Composite manager erkannt"
 
 #: src/aosd/aosd_ui.c:808
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
+"Composite manager nicht erkannt;\n"
+"sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, sonst wird der OSD nicht funktionieren"
 
 #: src/aosd/aosd_ui.c:816
 msgid "Composite manager not required for fake transparency"
-msgstr ""
+msgstr "Composite manager nicht benötigt für vorgetäuschte Transparenz"
 
 #: src/aosd/aosd_ui.c:854
 msgid "Transparency"
@@ -4618,7 +4620,7 @@
 
 #: src/song_change/song_change.c:323
 msgid "Command to run when Audacious starts a new song."
-msgstr "Auszuführender Befehl, wenn Audacious ein neues Lied startet."
+msgstr "Auszuführender Befehl, wenn Audacious ein neues Lied startet"
 
 #: src/song_change/song_change.c:332
 #: src/song_change/song_change.c:354
@@ -4633,11 +4635,11 @@
 
 #: src/song_change/song_change.c:366
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr ""
+msgstr "Auszuführender Befehl am Ende der Wiedergabeliste"
 
 #: src/song_change/song_change.c:387
 msgid "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
+msgstr "Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei Netzwerk-Streams)"
 
 #: src/song_change/song_change.c:408
 #, c-format
@@ -4655,6 +4657,18 @@
 "%%t: Playlist position (%%02d)\n"
 "%%p: Currently playing (1 or 0)"
 msgstr ""
+"Verwendbar sind folgende Zeichenketten, die ersetzt\n"
+" werden, bevor ein Befehl aufgerufen wird.\n"
+"(es sind jedoch nicht alle nützlich für den Ende-der-Wiedergabeliste-Befehl)\n"
+"\n"
+"%%F: Frequenz (in Hertz)\n"
+"%%c: Anzahl der Kanäle\n"
+"%%f: Dateiname (absoluter Pfad)\n"
+"%%l: Länge (in Millisekunden)\n"
+"%%n oder %%s: Titel\n"
+"%%r: Bitrate (in Bits pro Sekunde)\n"
+"%%t: Wiedergabelisten-Position (%%02d)\n"
+"%%p: Ist die Wiedergabe momentan aktiv? (1 oder 0)"
 
 #: src/song_change/song_change.c:433
 msgid "<span size='small'>Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk.</span>"
--- a/src/alarm/alarm.c	Thu Nov 01 15:38:07 2007 +0100
+++ b/src/alarm/alarm.c	Thu Nov 01 21:20:20 2007 +0100
@@ -687,7 +687,8 @@
 static void *alarm_fade(void *arg)
 {
    fader *vols = (fader *)arg;
-   guint i, v;
+   guint i;
+   gint v;
    gint inc, diff, adiff;
 
    /* lock */
@@ -718,7 +719,7 @@
      //threadsleep((gfloat)fading / (vols->end - vols->start));
      threadsleep((gfloat)fading / (gfloat)adiff);
      audacious_drct_get_volume_main(&v);
-     audacious_drct_set_volume_main((gint)(v + inc));
+     audacious_drct_set_volume_main(v + inc);
    }
    /* Setting the volume to the end volume sort of defeats the point if having
     * the code in there to allow other apps to control volume too :)
@@ -991,9 +992,6 @@
    stop_tid = 0;
 }
 
-/*
- * for xmms to get the function names
- */
 static GeneralPlugin alarm_plugin =
 {
      .description = "Alarm "VERSION,
--- a/src/mtp_up/mtp.c	Thu Nov 01 15:38:07 2007 +0100
+++ b/src/mtp_up/mtp.c	Thu Nov 01 21:20:20 2007 +0100
@@ -43,18 +43,12 @@
 
 void mtp_init ( void );
 void mtp_cleanup ( void );
-void mtp_prefs ( void );
-void mtp_about ( void );
 
 GeneralPlugin mtp_gp =
 {
-    NULL,                                   /* handle */
-    NULL,                                   /* filename */
-    "MTP Upload " ,                         /* description */
-    mtp_init,                               /* init */
-    mtp_about,                              /* about */
-    mtp_prefs,                              /* configure */
-    mtp_cleanup                             /* cleanup */
+    .description = "MTP Upload",
+    .init = mtp_init,
+    .cleanup = mtp_cleanup
 };
 GtkWidget *mtp_root_menuitem,*mtp_submenu_item_up,*mtp_submenu_item_free,*mtp_submenu;
 
@@ -260,17 +254,6 @@
     return NULL;
 }
 
-void mtp_prefs ( void )
-{
-    /*pref stub*/
-}
-
-
-void mtp_about ( void )
-{
-    /*about stub*/
-}
-
 gboolean mtp_press()
 {
     if(!mutex) 
--- a/src/song_change/song_change.c	Thu Nov 01 15:38:07 2007 +0100
+++ b/src/song_change/song_change.c	Thu Nov 01 21:20:20 2007 +0100
@@ -51,17 +51,13 @@
 
 GeneralPlugin sc_gp =
 {
-	NULL,			/* handle */
-	NULL,			/* filename */
-	"Song Change " PACKAGE_VERSION,			/* Description */
-	init,
-	NULL,
-	NULL,
-	cleanup,
+	.description = "Song Change " PACKAGE_VERSION,
+	.init = init,
+	.cleanup = cleanup,
 };
 
 GeneralPlugin *songchange_gplist[] = { &sc_gp, NULL };
-DECLARE_PLUGIN(songchange, NULL, NULL, NULL, NULL, NULL, songchange_gplist, NULL, NULL);
+SIMPLE_GENERAL_PLUGIN(songchange, songchange_gplist);
 
 static void bury_child(int signal)
 {