[Xfce4-commits] <xfmpc:master> === Release 0.2.0 ===
Mike Massonnet
mmassonnet at xfce.org
Thu Sep 3 13:54:01 CEST 2009
Updating branch refs/heads/master
to 5028370ba07093826f646394bf8267f35e62ee4a (commit)
from 38ea67038a564235b7d8276cc8fb01fc9d423744 (commit)
commit 5028370ba07093826f646394bf8267f35e62ee4a
Author: Mike Massonnet <mmassonnet at xfce.org>
Date: Thu Sep 3 13:50:36 2009 +0200
=== Release 0.2.0 ===
ChangeLog | 4 +
NEWS | 2 +-
configure.in.in | 2 +-
po/ar.po | 203 ++++++++++++++++++-----------------
po/ast.po | 228 +++++++++++++++++++++------------------
po/ca.po | 228 +++++++++++++++++++++------------------
po/cs.po | 245 ++++++++++++++++++++++--------------------
po/da.po | 247 +++++++++++++++++++++++--------------------
po/de.po | 232 ++++++++++++++++++++++-------------------
po/en_GB.po | 228 +++++++++++++++++++++------------------
po/es.po | 244 ++++++++++++++++++++++--------------------
po/eu.po | 212 +++++++++++++++++++------------------
po/fi.po | 232 ++++++++++++++++++++++-------------------
po/fr.po | 227 +++++++++++++++++++++------------------
po/gl.po | 246 +++++++++++++++++++++++--------------------
po/hu.po | 117 +++++++++++----------
po/id.po | 228 +++++++++++++++++++++------------------
po/it.po | 243 ++++++++++++++++++++++--------------------
po/ja.po | 107 ++++++++++---------
po/nl.po | 214 +++++++++++++++++++------------------
po/pt.po | 242 ++++++++++++++++++++++--------------------
po/pt_BR.po | 212 +++++++++++++++++++------------------
po/sl.po | 245 ++++++++++++++++++++++--------------------
po/sv.po | 248 +++++++++++++++++++++++--------------------
po/tr.po | 248 +++++++++++++++++++++++--------------------
po/uk.po | 212 +++++++++++++++++++------------------
po/ur.po | 246 ++++++++++++++++++++++--------------------
po/ur_PK.po | 246 ++++++++++++++++++++++--------------------
po/xfmpc.pot | 203 ++++++++++++++++++-----------------
po/zh_CN.po | 232 +++++++++++++++++++++-------------------
src/dbbrowser.c | 15 ++--
src/extended-interface.c | 9 +-
src/extended-interface.vala | 2 +-
src/interface.c | 7 +-
src/main-window.c | 9 +-
src/mpdclient.vapi | 1 -
src/playlist.c | 17 ++--
src/preferences-dialog.c | 7 +-
src/preferences.c | 71 ++++++++-----
src/song-dialog.c | 3 +-
src/statusbar.c | 1 -
src/xfmpc.h | 2 +-
42 files changed, 3266 insertions(+), 2901 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24484da..9a426d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-03 Mike Massonnet <mmassonnet at xfce.org>
+
+=== Release 0.2.0 ===
+
2009-07-26 Mike Massonnet <mmassonnet at xfce.org>
Some fixes here and there
diff --git a/NEWS b/NEWS
index fcf3007..dfd8901 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
- 0.2.0 (2009-0x-xx)
+ 0.2.0 (2009-09-03)
- Rewrite into Vala
- Install a manpage for xfmpc
diff --git a/configure.in.in b/configure.in.in
index 9a544d4..cb1109a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,7 +11,7 @@ m4_define([xfmpc_version_major], [0])
m4_define([xfmpc_version_minor], [2])
m4_define([xfmpc_version_micro], [0])
m4_define([xfmpc_version_build], [r at REVISION@])
-m4_define([xfmpc_version_tag], [git]) # leave empty for release
+m4_define([xfmpc_version_tag], []) # leave empty for release
m4_define([xfmpc_version], [xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(), [git], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
dnl ***************************
diff --git a/po/ar.po b/po/ar.po
index 83dfcbd..fb67b20 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2008-07-15 23:13+0200\n"
"Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
"Language-Team: Arabeyes <doc at arabeyes.org>\n"
@@ -11,235 +11,242 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Arabic\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+msgid "Replace"
msgstr ""
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr ""
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
+#: ../src/extended-interface.c:288
+msgid "Repeat"
msgstr ""
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
+#: ../src/extended-interface.c:293
+msgid "Random"
msgstr ""
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
msgstr ""
-#: ../src/extended-interface.c:220
-msgid "Browse database"
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
msgstr ""
-#: ../src/extended-interface.c:303
-msgid "Repeat"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
msgstr ""
-#: ../src/extended-interface.c:310
-msgid "Random"
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
msgstr ""
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
msgstr ""
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
msgstr ""
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
+#: ../src/extended-interface.c:501
+msgid "Browse database"
msgstr ""
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr ""
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr ""
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr ""
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr ""
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr ""
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr ""
-
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
msgstr ""
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr ""
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
msgstr ""
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr ""
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr ""
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr ""
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr ""
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr ""
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr ""
diff --git a/po/ast.po b/po/ast.po
index c469179..3f545ba 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-07-13 19:55+0100\n"
"Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
"Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -11,125 +11,107 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Trocar"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Restolar"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Al debalu"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Veceru MPD escritu en GTK+ pa Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Astur <malditoastur at gmail.com>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Llimpiar llista reproducción"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Recargar la base datos"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menú contestual"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Llista reproducción actual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Esplorar la base datos"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Al debalu"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Veceru MPD escritu en GTK+ pa Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Astur <malditoastur at gmail.com>"
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Non coneutáu"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "por \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Paráu"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Non coneutáu"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d canciones, %d hores y %d minutos"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d canciones, %d minutos"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "TÃtulu"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Ãlbum - TÃtulu"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - TÃtulu"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - TÃtulu (Data)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - Ãlbum - TÃtulu"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - Ãlbum - Tema. TÃtulu"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalizáu..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Conexón"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferencies Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Conexón"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Usar la configuración pre_determinada del sistema"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -137,108 +119,134 @@ msgstr ""
"Si ta activáu Xfmpc tentará lleer les variables d'entornu MPD_HOST y "
"MPD_PORT, a la escontra usará localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hostname:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Puertu:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Contraseña:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Aspeutu"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra d'estáu"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Amosar _barra d'estáu"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formatu canción"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formatu canción:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formatu canción"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "TÃtulu"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Ãlbum - TÃtulu"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - TÃtulu"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - TÃtulu (Data)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - Ãlbum - TÃtulu"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - Ãlbum - Tema. TÃtulu"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalizáu..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Formatu personalizáu:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parámetros disponibles:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Ãlbum"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Data"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Discu"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Ficheru"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Xéneru"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: TÃtulu"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%P: Pista"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Ficheru"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Ãlbum"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Data"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Pista"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Xéneru"
@@ -246,5 +254,15 @@ msgstr "Xéneru"
msgid "MPD client"
msgstr "Veceru MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferencies Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formatu canción:"
+
#~ msgid "MPD Settings"
#~ msgstr "Configuración MPD"
diff --git a/po/ca.po b/po/ca.po
index 9a7f29b..e7f4935 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Harald Servat <redcrash at gmail.com>\n"
"Language-Team: Harald Servat <redcrash at gmail.com>\n"
@@ -17,125 +17,107 @@ msgstr ""
"X-Poedit-Language: Catalan\n"
"X-Poedit-Country: Spain\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Reemplaçar"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Navegar"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aleatori"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Client MPD escrit en GTK+ per a Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Harald Servat"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Netejar llista de reproducció"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Refrescar la base de dades"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menú contextual"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Llista de reproducció actual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Navegar la base de dades"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aleatori"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Client MPD escrit en GTK+ per a Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Harald Servat"
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "No connectat"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "per \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Aturat"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "No connectat"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d cançons, %d hores i %d minuts"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d cançons, %d minuts"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/d"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "TÃtol"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Ãlbum - TÃtol"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - Titol"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - TÃtol (Data)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - Ãlbum - TÃtol"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - Ãlbum - Pista. TÃtol"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalitzar..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Connexió"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferències de Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/d"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Connexió"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Usar preferències per _defecte del sistema"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -143,111 +125,147 @@ msgstr ""
"Si està activat, Xfmpc intentarà llegir les variables d'entorn MPD_HOST i "
"MPD_PORT, altrament usarà localhost."
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nom de l'ordinador:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Contrasenya:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Aparença"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra d'estat"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Mostrar _barra d'estat"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Format de la cançó"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Format de la cançó:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Format de la cançó"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "TÃtol"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Ãlbum - TÃtol"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - Titol"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - TÃtol (Data)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - Ãlbum - TÃtol"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - Ãlbum - Pista. TÃtol"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalitzar..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Format personalitzat:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parà metres disponibles:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Ãlbum"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Data"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disc"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Fitxer"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Gènere"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: TÃtol"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Pista"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Fitxer"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Ãlbum"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Data"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Pista"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Gènere"
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr "Client MPD"
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferències de Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Format de la cançó:"
diff --git a/po/cs.po b/po/cs.po
index 1313513..a56f765 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-06-09 13:58+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech\n"
@@ -16,237 +16,243 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Nahradit"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Procházet"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Opakovat"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "NáhodnÄ"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Klient MPD napsaný v GTK+ pro prostÅedà Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Michal Várady <miko.vaji at gmail.com>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Vymazat seznam médiÃ"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Obnovit databázi"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "MÃstnà nabÃdka"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "SouÄasný seznam médiÃ"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Procházet databázi"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Opakovat"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "NáhodnÄ"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Klient MPD napsaný v GTK+ pro prostÅedà Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Michal Várady <miko.vaji at gmail.com>"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "NepÅipojeno"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "od \"%s\" z alba \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Zastaveno"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "NepÅipojeno"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d skladeb, %d hodin a %d minut"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d skladeb, %d minut"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Název"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Název"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "UmÄlec - Název"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "UmÄlec - Název (Datum)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "UmÄlec - Album - Název"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "UmÄlec - Album - Stopa. Název"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "VlastnÃ..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "PÅipojenÃ"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "PÅedvolby aplikace Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "PÅipojenÃ"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "PoužÃt _výchozà nastavenà systému"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Pokud je volba zaÅ¡krtnuta, pokusà se aplikace Xfmpc pÅeÄÃst promÄnné prostÅedà MPD_HOST a MPD_PORT, v opaÄném pÅÃpadÄ použije tento poÄÃtaÄ (localhost)"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Pokud je volba zaÅ¡krtnuta, pokusà se aplikace Xfmpc pÅeÄÃst promÄnné "
+"prostÅedà MPD_HOST a MPD_PORT, v opaÄném pÅÃpadÄ použije tento poÄÃtaÄ "
+"(localhost)"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Název hostitele:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Heslo:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Vzhled"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Stavový Åádek"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Zobrazovat _stavový Åádek"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formát skladby"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formát skladby:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formát skladby"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Název"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Název"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "UmÄlec - Název"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "UmÄlec - Název (Datum)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "UmÄlec - Album - Název"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "UmÄlec - Album - Stopa. Název"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "VlastnÃ..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Vlastnà formát:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Dostupné parametry:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: UmÄlec"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Datum"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disk"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Soubor"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Žánr"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Název"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Stopa"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Soubor"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "UmÄlec"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Datum"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Stopa"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Žánr"
@@ -254,6 +260,15 @@ msgstr "Žánr"
msgid "MPD client"
msgstr "Klient MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "PÅedvolby aplikace Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formát skladby:"
+
#~ msgid "MPD Settings"
#~ msgstr "Nastavenà MPD"
-
diff --git a/po/da.po b/po/da.po
index 35d0f78..9c9d524 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-03-14 12:03+0100\n"
"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -19,51 +19,29 @@ msgstr ""
"X-Poedit-Country: DENMARK\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Erstat"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Gennemse"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Ryd spilleliste"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "Genopfrisk database"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Kontekstmenu"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "Aktuel spilleliste"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "Gennemse database"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "Gentag"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "Tilfældig"
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "MPD-klient skrevet i GTK+ til Xfce"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Per Kongstad <p_kongstad at op.pl>\n"
@@ -71,189 +49,216 @@ msgstr ""
"Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
"Mere info: http://www.dansk-gruppen.dk"
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "Ikke tilsluttet"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Ryd spilleliste"
+
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "Genopfrisk database"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Kontekstmenu"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "Aktuel spilleliste"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "Gennemse database"
+
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "af \"%s\" fra \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Stoppet"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Ikke tilsluttet"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d sange, %d timer og %d minutter"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d sange, %d minutter"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "-"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - titel"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Kunstner - titel"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Kunstner - titel (dato)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Kunstner - album - titel"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Kunstner - album - spor. Titel"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Tilpasset..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Forbindelse"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Indstillinger Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "-"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Forbindelse"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Brug standardsys_temindstillinger"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Hvis afkrydset vil Xfmpc prøve at læse miljøvariabler MPD_HOST og MPD_PORT, ellers vil blive brugt localhost"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Hvis afkrydset vil Xfmpc prøve at læse miljøvariabler MPD_HOST og MPD_PORT, "
+"ellers vil blive brugt localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Værtsnavn:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Adgangskode:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Udseende"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Statusfelt"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Vis _statusfelt"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Sangformat"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Sangformat:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Sangformat"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - titel"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Kunstner - titel"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Kunstner - titel (dato)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Kunstner - album - titel"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Kunstner - album - spor. Titel"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Tilpasset..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Tilpasset format:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Tilgængelige parametre:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Kunstner"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Dato"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disk"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Fil"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Genre"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Titel"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Spor"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Fil"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Kunstner"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Dato"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Spor"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
@@ -261,5 +266,15 @@ msgstr "Genre"
msgid "MPD client"
msgstr "MPD-klient"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Indstillinger Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Sangformat:"
+
#~ msgid "MPD Settings"
#~ msgstr "MPD-indstillinger"
diff --git a/po/de.po b/po/de.po
index 1be5291..ee731d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc 0.0.5svn-r\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-14 22:47+0200\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-04-14 22:47+0200\n"
"Last-Translator: Simon Schneider <simon at schneiderimtal.de>\n"
"Language-Team: German <xfce-i18n-de at xfce.org>\n"
@@ -20,132 +20,107 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Ersetzen"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:251
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Durchsuchen"
-#: ../src/extended-interface.c:164
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Widerholen"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Zufall"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "MPD Client geschrieben in GTK+ für Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Namen der Ãbersetzer"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Wiedergabeliste leeren"
-#: ../src/extended-interface.c:174
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Datenbak auffrischen"
-#: ../src/extended-interface.c:184
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Kontextmenü"
-#: ../src/extended-interface.c:216
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Aktuelle Wiedergabeliste"
-#: ../src/extended-interface.c:219
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Datenbank durchsuchen"
-#: ../src/extended-interface.c:302
-msgid "Repeat"
-msgstr "Widerholen"
-
-#: ../src/extended-interface.c:309
-msgid "Random"
-msgstr "Zufall"
-
-#: ../src/extended-interface.c:401 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "MPD Client geschrieben in GTK+ für Xfce"
-
-#: ../src/extended-interface.c:405
-msgid "translator-credits"
-msgstr "Namen der Ãbersetzer"
-
-#: ../src/interface.c:159 ../src/interface.c:367
-msgid "Not connected"
-msgstr "Nicht verbunden"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:405
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "von »%s« aus »%s« (%s)"
-#: ../src/interface.c:451
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Angehalten"
-#: ../src/main.c:84
-msgid ""
-"Please stand by while the connection is established and the files are loaded"
-msgstr ""
-"Bitte warten Sie, während die Verbindung hergestellt wird und die Dateien "
-"geladen werden"
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Nicht verbunden"
-#: ../src/main-window.c:411
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d Lieder, %d Stunden und %d Minuten"
-#: ../src/main-window.c:413
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d Lieder, %d Minuten"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "unbekannt"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:181
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Titel"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Künstler - Titel"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Künstler - Titel (Datum)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Künstler - Album - Titel"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Künstler - Album - Nummer. Titel"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Benutzerdefiniert..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Verbindung"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Optionen für Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "unbekannt"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Verbindung"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "_Standardeinstellung verwenden"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -153,104 +128,134 @@ msgstr ""
"Falls dies ausgewählt ist, wird Xfpmc versuchen, die Umgebungsvariablen "
"MPD_HOST und MPD_PORT auszulesen, sonst wird localhost verwendet."
-#: ../src/preferences-dialog.c:225
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hostname:"
-#: ../src/preferences-dialog.c:232
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:242
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Passwort:"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Darstellung"
-#: ../src/preferences-dialog.c:264
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Statusleiste"
-#: ../src/preferences-dialog.c:267
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "_Statusleiste anzeigen"
-#: ../src/preferences-dialog.c:274
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Liedformat"
-#: ../src/preferences-dialog.c:279
-msgid "Song format:"
-msgstr "Liedformat:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Liedformat"
-#: ../src/preferences-dialog.c:299
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Titel"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Künstler - Titel"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Künstler - Titel (Datum)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Künstler - Album - Titel"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Künstler - Album - Nummer. Titel"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Benutzerdefiniert..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Benutzerdefiniertes Format:"
-#: ../src/preferences-dialog.c:316
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Verfügbare Parameter:"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Künstler"
-#: ../src/preferences-dialog.c:329
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Datum"
-#: ../src/preferences-dialog.c:338
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Platte"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Datei"
-#: ../src/preferences-dialog.c:347
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Genre"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Titel"
-#: ../src/preferences-dialog.c:356
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Titelnummer"
-#: ../src/song-dialog.c:161
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Datei"
-#: ../src/song-dialog.c:171
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Künstler"
-#: ../src/song-dialog.c:191
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:203
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Datum"
-#: ../src/song-dialog.c:213
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Titelnummer"
-#: ../src/song-dialog.c:223
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
@@ -262,5 +267,18 @@ msgstr "MPD Client"
msgid "Xfmpc"
msgstr "Xfmpc"
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Optionen für Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Liedformat:"
+
+#~ msgid ""
+#~ "Please stand by while the connection is established and the files are "
+#~ "loaded"
+#~ msgstr ""
+#~ "Bitte warten Sie, während die Verbindung hergestellt wird und die Dateien "
+#~ "geladen werden"
+
#~ msgid "MPD Settings"
#~ msgstr "MPD Einstellung"
diff --git a/po/en_GB.po b/po/en_GB.po
index 44b3261..bfe3db0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-08-18 13:17+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
"Language-Team: English/GB\n"
@@ -17,125 +17,107 @@ msgstr ""
"X-Poedit-Language: English\n"
"X-Poedit-Country: UNITED KINGDOM\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Replace"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Browse"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repeat"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Random"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "MPD client written in GTK+ for Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Jeff Bailes <thepizzaking at gmail.com>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Clear Playlist"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Refresh Database"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Context Menu"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Current Playlist"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Browse database"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repeat"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Random"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "MPD client written in GTK+ for Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Jeff Bailes <thepizzaking at gmail.com>"
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Not connected"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "by \"%s\" from \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Stopped"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Not connected"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d songs, %d hours and %d minutes"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d songs, %d minutes"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Title"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Title"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artist - Title"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artist - Title (Date)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artist - Album - Title"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artist - Album - Track. Title"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Custom..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Connection"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Xfmpc Preferences"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Connection"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Use _default system settings"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -143,111 +125,147 @@ msgstr ""
"If ticked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hostname:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Password:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Appearance"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Statusbar"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Show _statusbar"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Song Format"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Song format:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Song Format"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Title"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Title"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artist - Title"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artist - Title (Date)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artist - Album - Title"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artist - Album - Track. Title"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Custom..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Custom format:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Available parameters:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artist"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Date"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disc"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: File"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Genre"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Title"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Track"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "File"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artist"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Date"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Track"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr "MPD client"
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Xfmpc Preferences"
+
+#~ msgid "Song format:"
+#~ msgstr "Song format:"
diff --git a/po/es.po b/po/es.po
index 0001192..5028f2a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-06-13 19:28-0300\n"
"Last-Translator: elega <elega at elega.com.ar>\n"
"Language-Team: Spanish\n"
@@ -17,237 +17,242 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Reemplazar"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Navegar"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Cliente MPD escrito en GTK+ para Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Elega <elega at elega.com.ar>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Limpiar lista de reproducción"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Recargar la base de datos"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menú contextual"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Lista de reproducción actual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Explorar la base de datos"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aleatorio"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Cliente MPD escrito en GTK+ para Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Elega <elega at elega.com.ar>"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "No conectado"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "por \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Parado"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "No conectado"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d canciones, %d horas y %d minutos"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d canciones, %d minutos"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "TÃtulo"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - TÃtulo"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - TÃtulo (Fecha)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - Ãlbum - Tema. TÃtulo"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalizado..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Conexión"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferencias Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Conexión"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Utilizar la configuración pre_determinada del sistema"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Si está activado Xfmpc intentará leer las variables de entorno MPD_HOST y MPD_PORT, de lo contrario utilizará localhost"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Si está activado Xfmpc intentará leer las variables de entorno MPD_HOST y "
+"MPD_PORT, de lo contrario utilizará localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hostname:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Puerto:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Contraseña:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Apariencia"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra de estado"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Mostrar _barra de estado"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formato de canción"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formato de canción:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formato de canción"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "TÃtulo"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - TÃtulo"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - TÃtulo (Fecha)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - Ãlbum - Tema. TÃtulo"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalizado..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Formato personalizado:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parámetros disponibles:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Ãlbum"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Fecha"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disco"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Archivo"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Género"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: TÃtulo"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%P: Pista"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Archivo"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Ãlbum"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Fecha"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Pista"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Género"
@@ -255,6 +260,15 @@ msgstr "Género"
msgid "MPD client"
msgstr "Cliente MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferencias Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formato de canción:"
+
#~ msgid "MPD Settings"
#~ msgstr "Configuración MPD"
-
diff --git a/po/eu.po b/po/eu.po
index 4eaf9f7..b3ea6ee 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2008-09-14 01:22+0200\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -16,235 +16,243 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
+msgstr "Errepikatu"
+
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Errepikatu"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Ausaz"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Xfce-ren GTK+en idatzitako MPD bezeroa"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
msgstr ""
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Garbitu erreprodukzio-zerrenda"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Freskatu datu-basea"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Kontestu menua"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Uneko erreprodukzio-zerrenda"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Arakatu datu-basea"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Errepikatu"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Ausaz"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Xfce-ren GTK+en idatzitako MPD bezeroa"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Konexio gabe"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "\"%s\"-ek \"%s\" (%s)-etik"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Gelditurik"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Konexio gabe"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "e/g"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr ""
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr ""
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr ""
-
-#: ../src/preferences.c:47
-msgid "Custom..."
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr ""
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "e/g"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr ""
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
msgstr ""
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr ""
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr ""
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr ""
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr ""
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr "MPD bezeroa"
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
diff --git a/po/fi.po b/po/fi.po
index 23076a3..887c8a3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-16 20:54+0200\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-03-16 21:05+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish\n"
@@ -18,127 +18,109 @@ msgstr ""
"X-Poedit-Language: Finland\n"
"X-Poedit-Country: Finland\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Korvaa"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:250
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Selaa"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Tyhjennä soittolista"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "Päivitä kirjasto"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Pikavalikko"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "Nykyinen soittolista"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "Selaa kirjastoa"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "Toisto"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "Satunnainen"
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "GTK+-pohjainen MPD-asiakasohjelma Xfce:lle"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Miia Ranta <myrtti at ubuntu.com>\n"
"Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
-#: ../src/interface.c:158 ../src/interface.c:366
-msgid "Not connected"
-msgstr "Ei yhdistetty"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Tyhjennä soittolista"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:404
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "Päivitä kirjasto"
+
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Pikavalikko"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "Nykyinen soittolista"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "Selaa kirjastoa"
+
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr " \"%s\" albumilta \"%s\" (%s)"
-#: ../src/interface.c:450
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Pysäytetty"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Ei yhdistetty"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d kappaletta, %d tuntia ja %d minuuttia"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d kappaletta, %d minuuttia"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "-"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:171
-msgid "Title"
-msgstr "Kappale"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Albumi - Kappale"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Esittäjä - Kappale"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Esittäjä - Kappale (PVM)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Esittäjä - Albumi - Kappale"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Esittäjä - Albumi - Raitanro. Kappale"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Mukautettu..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Yhteys"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Xfmpc:n asetukset"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "-"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Yhteys"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Käytä järjestelmän _oletuksia"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -146,111 +128,147 @@ msgstr ""
"Jos valitset tämän, Xfmpc yrittää lukea ympäristömuuttujat MPD_HOST sekä "
"MPD_PORT; niiden puuttuessa olettaa, että palvelimen osoite on localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Palvelin:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Portti:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Salasana:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Ulkoasu"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Tilapalkki"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Näytä _tilapalkki"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Kappaleen esitystapa"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Kappaleen esitystapa:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Kappaleen esitystapa"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Kappale"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Albumi - Kappale"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Esittäjä - Kappale"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Esittäjä - Kappale (PVM)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Esittäjä - Albumi - Kappale"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Esittäjä - Albumi - Raitanro. Kappale"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Mukautettu..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Mukautettu esitystapa:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Käytettävissä olevat merkinnät:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Esittäjä"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Albumi"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: PVM"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Levy"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Tiedosto"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Tyylilaji"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Kappale"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Raitanro"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Tiedosto"
-#: ../src/song-dialog.c:162
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Esittäjä"
-#: ../src/song-dialog.c:180
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Albumi"
-#: ../src/song-dialog.c:189
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "PVM"
-#: ../src/song-dialog.c:194
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Raitanro"
-#: ../src/song-dialog.c:203
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Tyylilaji"
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr "MPD-asiakasohjelma"
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Xfmpc:n asetukset"
+
+#~ msgid "Song format:"
+#~ msgstr "Kappaleen esitystapa:"
diff --git a/po/fr.po b/po/fr.po
index ae6cad0..b27a6b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
-"PO-Revision-Date: 2009-02-03 21:49+0200\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
+"PO-Revision-Date: 2009-09-03 13:25+0200\n"
"Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
@@ -17,125 +17,107 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Remplacer"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Parcourir"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Répéter"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aléatoire"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Client MPD écrit en GTK+ pour Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Mike Massonnet"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Vider la liste de lecture"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Rafraîchir la base de données"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menu contextuel"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Liste de lecture"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Base de données"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Répéter"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aléatoire"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Client MPD écrit en GTK+ pour Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Mike Massonnet"
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Déconnecté"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "par « %s » de « %s » (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Stoppé"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Déconnecté"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d chansons, %d heures et %d minutes"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d chansons, %d minutes"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Titre"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Titre"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artiste - Titre"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artiste - Titre (Date)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artiste - Album - Titre"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artiste - Album - N° Piste. Titre"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personnalisé..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Connexion"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Préférences de Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Connexion"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Utiliser les paramètres par _défaut du système"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -143,108 +125,132 @@ msgstr ""
"Si coché, Xfmpc utilisera les variables d'environnements MPD_HOST et "
"MPD_PORT sinon localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hôte :"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port :"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Mot de passe :"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Apparence"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barre de statut"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr "Afficher la _barre de statut"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Format de la chanson"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Format :"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr "Format de la chanson :"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Titre"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Titre"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artiste - Titre"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artiste - Titre (Date)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artiste - Album - Titre"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artiste - Album - N° Piste. Titre"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personnalisé..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Personnalisé :"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Paramètres disponibles :"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a : Artiste"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A : Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d : Date"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D : Disque"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f : Fichier"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g : Genre"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t : Titre"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T : N° Piste"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Fichier"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artiste"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Date"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "N° Piste"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
@@ -252,3 +258,12 @@ msgstr "Genre"
msgid "MPD client"
msgstr "Client MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Préférences de Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Format :"
diff --git a/po/gl.po b/po/gl.po
index 3145532..05cc6dc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-04-14 21:11+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,237 +20,244 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_SubstituÃr"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Explorar"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Cliente de MPD escrito en GTK+ para Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr ""
+"Se está marcado, Xfmpc intentará ler as variables de contorno MPD_HOST e "
+"MPD_PORT ou usará localhost"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Limpar a lista de reprodución"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Actualizar a base de datos"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menú de contexto"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Lista de reprodución actual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Ver a base de datos"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aleatorio"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Cliente de MPD escrito en GTK+ para Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Se está marcado, Xfmpc intentará ler as variables de contorno MPD_HOST e MPD_PORT ou usará localhost"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "Non conectado"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "por \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Parado"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Non conectado"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d cancións, %d horas e %d minutos"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d cancións, %d minutos"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/d"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "TÃtulo"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - TÃtulo"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - TÃtulo (Data)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - Ãlbum - Pista. TÃtulo"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalizado..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Conexión"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferencias de Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/d"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Conexión"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Usar a _configuración predeterminada do sistema"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Se está marcado, Xfmpc intentará ler as variables de contorno MPD_HOST e MPD_PORT e se non usará localhost"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Se está marcado, Xfmpc intentará ler as variables de contorno MPD_HOST e "
+"MPD_PORT e se non usará localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nome de máquina:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Porto:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Contrasinal:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Aparencia"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra de estado"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Mostrar a barra de _estado"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formato da canción"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formato da canción:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formato da canción"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "TÃtulo"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - TÃtulo"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - TÃtulo (Data)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - Ãlbum - Pista. TÃtulo"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalizado..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Formato personalizado:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parámetros dispoñibles:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Ãlbum"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Data"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disco"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Ficheiro"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Xénero"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: TÃtulo"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Pista"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Ficheiro"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Ãlbum"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Data"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Pista"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Xénero"
@@ -258,6 +265,15 @@ msgstr "Xénero"
msgid "MPD client"
msgstr "Cliente de MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferencias de Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formato da canción:"
+
#~ msgid "MPD Settings"
#~ msgstr "Configuración de MPD"
-
diff --git a/po/hu.po b/po/hu.po
index 1a08720..9e4d468 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 02:03+0200\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-07-25 11:36+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome at gnome dot hu>\n"
@@ -18,47 +18,49 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../src/dbbrowser.c:914
+#: ../src/dbbrowser.c:913
+#, fuzzy
msgid "Replace"
msgstr "Csere"
-#: ../src/dbbrowser.c:920 ../src/playlist.c:885
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
msgid "Browse"
msgstr "Tallózás"
-#: ../src/extended-interface.c:289
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "Ismétlés"
-#: ../src/extended-interface.c:294
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "Véletlen"
-#: ../src/extended-interface.c:398 ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "GTK+-t használó MPD-kliens az Xfce-hez"
-#: ../src/extended-interface.c:398
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr "Kelemen Gábor <kelemeng at gnome.hu>"
-#: ../src/extended-interface.c:467
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Lejátszólista törlése"
-#: ../src/extended-interface.c:474
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Adatbázis frissÃtése"
-#: ../src/extended-interface.c:482
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Helyi menü"
-#: ../src/extended-interface.c:500
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Aktuális lejátszólista"
-#: ../src/extended-interface.c:502
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Adatbázis tallózása"
@@ -68,25 +70,25 @@ msgstr "Adatbázis tallózása"
#. text = get_subtitle (interface);
#.
#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:264
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "â%sâ elÅadó â%sâ (%s) albumáról"
-#: ../src/interface.c:269
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "LeállÃtva"
-#: ../src/interface.c:273 ../src/interface.c:471
+#: ../src/interface.c:272 ../src/interface.c:470
msgid "Not connected"
msgstr "Nincs kapcsolat"
-#: ../src/main-window.c:384
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d szám, %d óra és %d perc"
-#: ../src/main-window.c:386
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d szám, %d perc"
@@ -103,150 +105,154 @@ msgstr "Kapcsolódva az MPD-hez"
msgid "n/a"
msgstr "---"
-#: ../src/preferences-dialog.c:360
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:364
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Kapcsolat"
-#: ../src/preferences-dialog.c:367
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "_Alapértelmezett rendszerbeállÃtások használata"
-#: ../src/preferences-dialog.c:368
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
-msgstr "Az Xfmpc megpróbálja beolvasni az MPD_HOST és MPD_PORT környezeti változókat, ellenkezŠesetben a localhostot fogja használni"
+msgstr ""
+"Az Xfmpc megpróbálja beolvasni az MPD_HOST és MPD_PORT környezeti "
+"változókat, ellenkezŠesetben a localhostot fogja használni"
-#: ../src/preferences-dialog.c:379
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Gépnév:"
-#: ../src/preferences-dialog.c:387
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:398
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Jelszó:"
-#: ../src/preferences-dialog.c:415
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Megjelenés"
-#: ../src/preferences-dialog.c:421
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Ãllapotsor"
-#: ../src/preferences-dialog.c:424
+#: ../src/preferences-dialog.c:423
+#, fuzzy
msgid "Show _stastusbar"
msgstr "Ãllap_otsor megjelenÃtése"
-#: ../src/preferences-dialog.c:432
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Számformátum"
-#: ../src/preferences-dialog.c:437
+#: ../src/preferences-dialog.c:436
+#, fuzzy
msgid "Song Format:"
-msgstr "Számformátum:"
+msgstr "Számformátum"
-#: ../src/preferences-dialog.c:442 ../src/song-dialog.c:140
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
msgid "Title"
msgstr "CÃm"
-#: ../src/preferences-dialog.c:443
+#: ../src/preferences-dialog.c:442
msgid "Album - Title"
msgstr "Album â CÃm"
-#: ../src/preferences-dialog.c:444
+#: ../src/preferences-dialog.c:443
msgid "Artist - Title"
msgstr "ElÅadó - CÃm"
-#: ../src/preferences-dialog.c:445
+#: ../src/preferences-dialog.c:444
msgid "Artist - Title (Date)"
msgstr "ElÅadó - CÃm (Dátum)"
-#: ../src/preferences-dialog.c:446
+#: ../src/preferences-dialog.c:445
msgid "Artist - Album - Title"
msgstr "ElÅadó - Album - CÃm"
-#: ../src/preferences-dialog.c:447
+#: ../src/preferences-dialog.c:446
msgid "Artist - Album - Track. Title"
msgstr "ElÅadó - Album - Sorszám. CÃm"
-#: ../src/preferences-dialog.c:448
+#: ../src/preferences-dialog.c:447
msgid "Custom..."
msgstr "Egyéniâ¦"
-#: ../src/preferences-dialog.c:454
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Egyéni formátum:"
-#: ../src/preferences-dialog.c:467
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "ElérhetŠparaméterek:"
-#: ../src/preferences-dialog.c:473
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: elÅadó"
-#: ../src/preferences-dialog.c:478
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: album"
-#: ../src/preferences-dialog.c:483
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: dátum"
-#: ../src/preferences-dialog.c:488
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: lemez"
-#: ../src/preferences-dialog.c:493
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: fájl"
-#: ../src/preferences-dialog.c:498
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: műfaj"
-#: ../src/preferences-dialog.c:503
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: cÃm"
-#: ../src/preferences-dialog.c:508
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: sorszám"
-#: ../src/song-dialog.c:118
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Fájl"
-#: ../src/song-dialog.c:130
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "ElÅadó"
-#: ../src/song-dialog.c:150
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:160
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Dátum"
-#: ../src/song-dialog.c:167
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Sorszám"
-#: ../src/song-dialog.c:177
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Műfaj"
@@ -258,3 +264,6 @@ msgstr "MPD-kliens"
msgid "Xfmpc"
msgstr "Xfmpc"
+#, fuzzy
+#~ msgid "Song format:"
+#~ msgstr "Számformátum:"
diff --git a/po/id.po b/po/id.po
index 15b60a5..02318d4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-04-11 16:02-0400\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,125 +15,107 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Ganti"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Ramban"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Ulangi"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Acak"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Klien MPD ditulis dalam GTK+ untuk Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Andhika Padmawan <andhika.padmawan at gmail.com>, 2009.\t"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Bersihkan Senarai Putar"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Segarkan Basis Data"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menu Konteks"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Senarai Putar Saat Ini"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Ramban basis data"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Ulangi"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Acak"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Klien MPD ditulis dalam GTK+ untuk Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Andhika Padmawan <andhika.padmawan at gmail.com>, 2009. "
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Tak tersambung"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "oleh \"%s\" dari \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Terhenti"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Tak tersambung"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d lagu, %d jam dan %d menit"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d lagu, %d menit"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "tak tersedia"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Judul"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Judul"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artis - Judul"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artis - Judul (Tanggal)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artis - Album - Judul"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artis - Album - Lagu. Judul"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Suai..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Koneksi"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Pengaturan Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "tak tersedia"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Koneksi"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Gunakan _pengaturan sistem standar"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -141,108 +123,134 @@ msgstr ""
"Jika diperiksa, Xfmpc akan coba untuk membaca variabel lingkungan MPD_HOST "
"dan MPD_PORT atau akan menggunakan localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nama host:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Pangkalan:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Sandi:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Tampilan"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Batang Status"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Tampilkan batang _status"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Format Lagu"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Format lagu:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Format Lagu"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Judul"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Judul"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artis - Judul"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artis - Judul (Tanggal)"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artis - Album - Judul"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artis - Album - Lagu. Judul"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Suai..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Format suai:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parameter tersedia:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artis"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Tanggal"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Cakram"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Berkas"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Genre"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Judul"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Lagu"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Berkas"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artis"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Tanggal"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Lagu"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
@@ -250,5 +258,15 @@ msgstr "Genre"
msgid "MPD client"
msgstr "Klien MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Pengaturan Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Format lagu:"
+
#~ msgid "MPD Settings"
#~ msgstr "Pengaturan MPD"
diff --git a/po/it.po b/po/it.po
index ce7cfed..dd363a3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-04-01 08:56+0100\n"
"Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
"Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
@@ -19,238 +19,242 @@ msgstr ""
# GLOSSARIO
# playlist = scaletta
# random = casuale
-
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Sostituisci"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Sfoglia"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Ripeti"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Casuale"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Client MPD scritto in GTK+ per Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Traduzione Italiana a cura di Cristian Marchi"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Svuota la scaletta"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Aggiorna il database"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menu contestuale"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Scaletta corrente"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Sfoglia il database"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Ripeti"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Casuale"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Client MPD scritto in GTK+ per Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Traduzione Italiana a cura di Cristian Marchi"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "Non connesso"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "di « %s » da « %s » (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Interrotto"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Non connesso"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d canzoni, %d ore e %d minuti"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d canzoni, %d minuti"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/d"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Titolo"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - titolo"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - titolo"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - titolo (data)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - album - titolo"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - album - traccia. Titolo"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalizzato..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Connessione"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferenze di Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/d"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Connessione"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Usa le impostazioni _predefinite di sistema"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Se abilitata, Xfmpc tenterà di leggere le variabili MPD_HOST e MPD_PORT; diversamente utilizzerà localhost"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Se abilitata, Xfmpc tenterà di leggere le variabili MPD_HOST e MPD_PORT; "
+"diversamente utilizzerà localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nome dell'host:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Porta:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Password:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Aspetto"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra di stato"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Visualizza la barra di _stato"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formato della canzone"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formato della canzone:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formato della canzone"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Titolo"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - titolo"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - titolo"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - titolo (data)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - album - titolo"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - album - traccia. Titolo"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalizzato..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Formato personalizzato:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parametri disponibili:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: data"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: disco"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: file"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: genere"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: titolo"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: traccia"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "File"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Data"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Traccia"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genere"
@@ -258,3 +262,12 @@ msgstr "Genere"
msgid "MPD client"
msgstr "Client MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferenze di Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formato della canzone:"
diff --git a/po/ja.po b/po/ja.po
index 7ba98b4..2b813dc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 01:41+0900\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-07-19 01:03+0900\n"
"Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
"Language-Team: JAPANESE <xfce-i18n at xfce.org>\n"
@@ -17,49 +17,51 @@ msgstr ""
"X-Poedit-Language: Japanese\n"
"X-Poedit-Country: JAPAN\n"
-#: ../src/dbbrowser.c:914
+#: ../src/dbbrowser.c:913
+#, fuzzy
msgid "Replace"
msgstr "ç½®æ"
-#: ../src/dbbrowser.c:920 ../src/playlist.c:885
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
msgid "Browse"
msgstr "åç
§"
-#: ../src/extended-interface.c:289
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "ãªãã¼ã"
-#: ../src/extended-interface.c:294
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "ã©ã³ãã "
-#: ../src/extended-interface.c:398 ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "Xfce åãã® GTK+ ã§æ¸ããã MPD ã¯ã©ã¤ã¢ã³ãã§ãã"
-#: ../src/extended-interface.c:398
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
"Masato Hashimoto <hashimo at xfce.org>"
-#: ../src/extended-interface.c:467
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "ãã¬ã¤ãªã¹ãã®ã¯ãªã¢"
-#: ../src/extended-interface.c:474
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "ãã¼ã¿ãã¼ã¹ã®æ´æ°"
-#: ../src/extended-interface.c:482
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "ã³ã³ããã¹ãã¡ãã¥ã¼"
-#: ../src/extended-interface.c:500
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "ç¾å¨ã®ãã¬ã¤ãªã¹ã"
-#: ../src/extended-interface.c:502
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "ãã¼ã¿ãã¼ã¹ã表示"
@@ -69,25 +71,25 @@ msgstr "ãã¼ã¿ãã¼ã¹ã表示"
#. text = get_subtitle (interface);
#.
#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:264
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "by \"%s\" from \"%s\" (%s)"
-#: ../src/interface.c:269
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "åæ¢"
-#: ../src/interface.c:273 ../src/interface.c:471
+#: ../src/interface.c:272 ../src/interface.c:470
msgid "Not connected"
msgstr "æªæ¥ç¶"
-#: ../src/main-window.c:384
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d æ²ã%d æé %d å"
-#: ../src/main-window.c:386
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d æ²ã%d å"
@@ -104,19 +106,19 @@ msgstr "MPD ã«æ¥ç¶ãã¾ãã"
msgid "n/a"
msgstr "N/A"
-#: ../src/preferences-dialog.c:360
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:364
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "æ¥ç¶"
-#: ../src/preferences-dialog.c:367
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "ããã©ã«ãã®ã·ã¹ãã è¨å®ã使ç¨ãã(_D)"
-#: ../src/preferences-dialog.c:368
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -124,132 +126,133 @@ msgstr ""
"ãã®ãªãã·ã§ã³ãæå¹ã«ããã¨ãXfmpc ã¯ç°å¢å¤æ° MPD_HOST ããã³ MPD_PORT ãèª"
"ã¿è¾¼ããã¨ãããªããã° localhost ã使ç¨ãã¾ã"
-#: ../src/preferences-dialog.c:379
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "ãã¹ãå:"
-#: ../src/preferences-dialog.c:387
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "ãã¼ã:"
-#: ../src/preferences-dialog.c:398
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "ãã¹ã¯ã¼ã:"
-#: ../src/preferences-dialog.c:415
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "å¤è¦³"
-#: ../src/preferences-dialog.c:421
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "ã¹ãã¼ã¿ã¹ãã¼"
-#: ../src/preferences-dialog.c:424
+#: ../src/preferences-dialog.c:423
+#, fuzzy
msgid "Show _stastusbar"
msgstr "ã¹ãã¼ã¿ã¹ãã¼ã表示ãã(_S)"
-#: ../src/preferences-dialog.c:432
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "楽æ²ã®ãã©ã¼ããã"
-#: ../src/preferences-dialog.c:437
+#: ../src/preferences-dialog.c:436
msgid "Song Format:"
msgstr "楽æ²ã®ãã©ã¼ããã"
-#: ../src/preferences-dialog.c:442 ../src/song-dialog.c:140
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
msgid "Title"
msgstr "ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:443
+#: ../src/preferences-dialog.c:442
msgid "Album - Title"
msgstr "ã¢ã«ãã - ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:444
+#: ../src/preferences-dialog.c:443
msgid "Artist - Title"
msgstr "ã¢ã¼ãã£ã¹ã - ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:445
+#: ../src/preferences-dialog.c:444
msgid "Artist - Title (Date)"
msgstr "ã¢ã¼ãã£ã¹ã - ã¿ã¤ãã« (æ¥ä»)"
-#: ../src/preferences-dialog.c:446
+#: ../src/preferences-dialog.c:445
msgid "Artist - Album - Title"
msgstr "ã¢ã¼ãã£ã¹ã - ã¢ã«ãã - ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:447
+#: ../src/preferences-dialog.c:446
msgid "Artist - Album - Track. Title"
msgstr "ã¢ã¼ãã£ã¹ã - ã¢ã«ãã - ãã©ãã¯. ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:448
+#: ../src/preferences-dialog.c:447
msgid "Custom..."
msgstr "ã«ã¹ã¿ã ..."
-#: ../src/preferences-dialog.c:454
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "ã«ã¹ã¿ã ãã©ã¼ããã:"
-#: ../src/preferences-dialog.c:467
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "å©ç¨å¯è½ãªãã©ã¡ã¼ã¿:"
-#: ../src/preferences-dialog.c:473
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: ã¢ã¼ãã£ã¹ã"
-#: ../src/preferences-dialog.c:478
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: ã¢ã«ãã "
-#: ../src/preferences-dialog.c:483
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: æ¥ä»"
-#: ../src/preferences-dialog.c:488
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: ãã£ã¹ã¯"
-#: ../src/preferences-dialog.c:493
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: ãã¡ã¤ã«"
-#: ../src/preferences-dialog.c:498
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: ã¸ã£ã³ã«"
-#: ../src/preferences-dialog.c:503
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: ã¿ã¤ãã«"
-#: ../src/preferences-dialog.c:508
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: ãã©ãã¯"
-#: ../src/song-dialog.c:118
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "ãã¡ã¤ã«"
-#: ../src/song-dialog.c:130
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "ã¢ã¼ãã£ã¹ã"
-#: ../src/song-dialog.c:150
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "ã¢ã«ãã "
-#: ../src/song-dialog.c:160
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "æ¥ä»"
-#: ../src/song-dialog.c:167
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "ãã©ãã¯"
-#: ../src/song-dialog.c:177
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "ã¸ã£ã³ã«"
diff --git a/po/nl.po b/po/nl.po
index e56c9d9..6992f31 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-02-03 21:49+0200\n"
"Last-Translator: Mike Massonnet <mmassonnet at xfce.org>\n"
"Language-Team: Dutch\n"
@@ -18,235 +18,239 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Vervangen"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Herhalen"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Willekeurig"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "MPD client geschreven in GTK+ voor Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Afspeellijst legen"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Database vernieuwen"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Contextmenu"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Huidige afspeellijst"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Databasebrowser"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Herhalen"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Willekeurig"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "MPD client geschreven in GTK+ voor Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Niet verbonden"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "door \"%s\" van \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Gestopt"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Niet verbonden"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-#, fuzzy
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:43
-msgid "Artist - Title"
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr ""
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr ""
-
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr ""
-
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr ""
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+#, fuzzy
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
#, fuzzy
msgid "Use _default system settings"
msgstr "Standaard systeeminstellingen gebruiken"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
#, fuzzy
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
msgstr "Indien geselecteerd, "
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Hostnaam:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Poort:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Wachtwoord:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr ""
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
@@ -254,5 +258,9 @@ msgstr ""
msgid "MPD client"
msgstr "MPD client"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
#~ msgid "MPD Settings"
#~ msgstr "MPD-instellingen"
diff --git a/po/pt.po b/po/pt.po
index 3654a74..891e9f6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-09-02 12:53+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -16,237 +16,242 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Substituir"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Navegar"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aleatório"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Cliente MPD escrito em GTK+ para Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Nuno Miguel <nuni at netcabo.pt>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Limpar lista de reprodução"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Actualizar base de dados"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menu de Contexto"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Lista de reprodução actual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Explorar base de dados"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aleatório"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Cliente MPD escrito em GTK+ para Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Nuno Miguel <nuni at netcabo.pt>"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "Não ligado"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "por \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Parado"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Não ligado"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d canções, %d horas e %d minutos"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d canções, %d minutos"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/d"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "TÃtulo"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artista - TÃtulo"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artista - TÃtulo (Data)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artista - Ãlbum - TÃtulo"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artista - Ãlbum - Pista. TÃtulo"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Personalizar..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Ligação"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Preferências Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/d"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Ligação"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Usar as _definições por omissão do sistema"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Se activo, Xfmpc irá tentar ler as variáveis de ambiente MPD_HOST e MPD_PORT caso contrário usará o localhost"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Se activo, Xfmpc irá tentar ler as variáveis de ambiente MPD_HOST e MPD_PORT "
+"caso contrário usará o localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nome do host:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Porta:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Senha:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Aparência"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Barra de estado"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Mostrar barra de e_stado"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Formato da Canção"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Formato da canção:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Formato da Canção"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "TÃtulo"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artista - TÃtulo"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artista - TÃtulo (Data)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artista - Ãlbum - TÃtulo"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artista - Ãlbum - Pista. TÃtulo"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Personalizar..."
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Formato personalizado:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parâmetros disponÃveis:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artista"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Ãlbum"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Data"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disco"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Ficheiro"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Género"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: TÃtulo"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Pista"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Ficheiro"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artista"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Ãlbum"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Data"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Pista"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Género"
@@ -254,3 +259,12 @@ msgstr "Género"
msgid "MPD client"
msgstr "Cliente MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Preferências Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "Formato da canção:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ab49197..95f8297 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2008-04-21 19:47-0300\n"
"Last-Translator: Filipe Rosset <rosset.filipe at gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -18,126 +18,106 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "Substitui_r"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Aleatório"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Cliente MPD escrito em GTK+ para o Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "Limpar lista de reprodução"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Atualizar o banco de dados"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "Menu de contexto"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Lista de reprodução atual"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Navegar no banco de dados"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Aleatório"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Cliente MPD escrito em GTK+ para o Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Não conectado"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "por \"%s\" de \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Parado"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Não conectado"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/d"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:43
-msgid "Artist - Title"
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr ""
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr ""
-
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr ""
-
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr ""
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/d"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
#, fuzzy
msgid "Use _default system settings"
msgstr "Usar configurações padrão do sistema"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -145,108 +125,132 @@ msgstr ""
"Se marcado, o Xfmpc tentará ler as variáveis de ambiente MPD_HOST e "
"MPD_PORT, caso contrario ele usará localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Nome do host:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Porta:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Senha:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr ""
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
@@ -254,5 +258,9 @@ msgstr ""
msgid "MPD client"
msgstr "Cliente MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
#~ msgid "MPD Settings"
#~ msgstr "Configurações do MPD"
diff --git a/po/sl.po b/po/sl.po
index 40be92d..132445a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,249 +8,255 @@ msgid ""
msgstr ""
"Project-Id-Version: Xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-05-08 18:36+0100\n"
"Last-Translator: Alan Pepelko <alan.pepelko at gmail.com>\n"
"Language-Team: Slovenian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-Country: SLOVENIA\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Zamenjaj"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Prebrskaj"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "Ponovi"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "NakljuÄno"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "MPD odjemalec spisan v GTK+ za Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Alan Pepelko <alan.pepelko at gmail.com>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "PoÄisti seznam predvajanja"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "Osveži podatkovno zbirko"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr ""
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "Trenutni seznam predvajanja"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "Prebrskaj podatkovno zbirko"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "Ponovi"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "NakljuÄno"
-
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "MPD odjemalec spisan v GTK+ za Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr "Alan Pepelko <alan.pepelko at gmail.com>"
-
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "Ni povezave"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "od \"%s\" z albuma \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Zaustavljeno"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Ni povezave"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "ni na voljo"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Naslov"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Naslov"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Izvajalec - Naslov"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Izvajalec - Naslov (Datum)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Izvajalec - Album - Naslov"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Izvajalec - Album - Sled. Naslov"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Po meri ..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Povezava"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Xfmpc nastavitve"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "ni na voljo"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Povezava"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Uporabi _privzete nastavitve za sistem"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Äe je oznaÄeno, bo Xfmpc poskusil prebrati spremenljivke okolja MPD_HOST in MPD_PORT, sicer bo uporabil localhost."
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Äe je oznaÄeno, bo Xfmpc poskusil prebrati spremenljivke okolja MPD_HOST in "
+"MPD_PORT, sicer bo uporabil localhost."
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Ime gostitelja:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Vrata:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Geslo:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Videz"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Vrstica stanja"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Pokaži vrstico _stanja"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Oblika skladbe"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Oblika skladbe:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Oblika skladbe"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Naslov"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Naslov"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Izvajalec - Naslov"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Izvajalec - Naslov (Datum)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Izvajalec - Album - Naslov"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Izvajalec - Album - Sled. Naslov"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Po meri ..."
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Oblika po meri:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Parametri na voljo:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Izvajalec"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Datum"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disk"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Datoteka"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Žanr"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Naslov"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Sled"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Datoteka"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Izvajalec"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Datum"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Sled"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Žanr"
@@ -258,3 +264,12 @@ msgstr "Žanr"
msgid "MPD client"
msgstr "MPD odjemalec"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Xfmpc nastavitve"
+
+#~ msgid "Song format:"
+#~ msgstr "Oblika skladbe:"
diff --git a/po/sv.po b/po/sv.po
index 5498843..29c2baf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-19 23:10+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-03-19 23:13+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,51 +16,29 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_Ersätt"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:250
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_Bläddra"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Töm spellista"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "Uppdatera databas"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Sammanhangsmeny"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "Aktuell spellista"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "Bläddra i databas"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "Upprepa"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "Slumpmässigt"
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "MPD-klient skriven i GTK+ för Xfce"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po at danielnylander.se>\n"
@@ -68,189 +46,216 @@ msgstr ""
"Skicka synpunkter på översättningen till\n"
"<tp-sv at listor.tp-sv.se>."
-#: ../src/interface.c:158
-#: ../src/interface.c:366
-msgid "Not connected"
-msgstr "Inte ansluten"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Töm spellista"
+
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "Uppdatera databas"
+
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Sammanhangsmeny"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "Aktuell spellista"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "Bläddra i databas"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:404
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "av \"%s\" från \"%s\" (%s)"
-#: ../src/interface.c:450
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Stoppad"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Inte ansluten"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d låtar, %d timmar och %d minuter"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d låtar, %d minuter"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "inte tillgänglig"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:171
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Album - Titel"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Artist - Titel"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Artist - Titel (Datum)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Artist - Album - Titel"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Artist - Album - Spår. Titel"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Anpassad..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Anslutning"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Inställningar för Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "inte tillgänglig"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Anslutning"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Använd s_ystemets standardinställningar"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Om kryssad kommer Xfmpc att försöka att läsa miljövariablerna MPD_HOST och MPD_PORT, annars kommer localhost att användas"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Om kryssad kommer Xfmpc att försöka att läsa miljövariablerna MPD_HOST och "
+"MPD_PORT, annars kommer localhost att användas"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Värdnamn:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Lösenord:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Utseende"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Statusrad"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Visa _statusrad"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "LÃ¥tformat"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "LÃ¥tformat:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "LÃ¥tformat"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Album - Titel"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Artist - Titel"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Artist - Titel (Datum)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Artist - Album - Titel"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Artist - Album - Spår. Titel"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Anpassad..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Anpassat format:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Tillgängliga parametrar:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Artist"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Album"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Datum"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Skiva"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Fil"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Genre"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Titel"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Spår"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Fil"
-#: ../src/song-dialog.c:162
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Artist"
-#: ../src/song-dialog.c:180
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Album"
-#: ../src/song-dialog.c:189
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Datum"
-#: ../src/song-dialog.c:194
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Spår"
-#: ../src/song-dialog.c:203
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Genre"
@@ -258,6 +263,15 @@ msgstr "Genre"
msgid "MPD client"
msgstr "MPD-klient"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Inställningar för Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "LÃ¥tformat:"
+
#~ msgid "MPD Settings"
#~ msgstr "Inställningar för MPD"
-
diff --git a/po/tr.po b/po/tr.po
index 34d90dc..15082a9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-03-14 11:41+0200\n"
"Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
"Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -16,239 +16,244 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_DeÄiÅtir"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_AraÅtır"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Ãalma Listesini Temizle"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "Veritabanını Yenile"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Toplu Menü"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "Etkin Ãalma Listesi"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "Veritabanında Arama"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "Yinele"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "Rasgele"
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "Xfce için GTK+ ile yazılmıŠMPD istemcisi"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Gökmen Görgen <gkmngrgn at gmail.com>, 2008\n"
"Samed Beyribey <ras0ir at eventualis.org>, 2009"
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "BaÄlantı yok"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Ãalma Listesini Temizle"
+
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "Veritabanını Yenile"
+
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Toplu Menü"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "Etkin Ãalma Listesi"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "Veritabanında Arama"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "söyleyen \"%s\" albüm \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "Durduruldu"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "BaÄlantı yok"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d Åarkı, %d saat %d dakika"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d Åarkı, %d dakika"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "n/a"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "Åarkı"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "Albüm - Åarkı"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "Sanatçı - Åarkı"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "Sanatçı - Åarkı (Tarih)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "Sanatçı - Albüm - Åarkı"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "Sanatçı - Albüm - Sıra. Åarkı"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "Ãzel..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "BaÄlantı"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Xfmpc Tercihleri"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "n/a"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "BaÄlantı"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "Ãntanımlı sistem ayarlarını _kullan"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "Seçili ise, Xfmpc MPD_HOST ve MPD_PORT ortam deÄiÅkenlerini okuyacaktır, aksi takdirde localhost kullanacaktır"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"Seçili ise, Xfmpc MPD_HOST ve MPD_PORT ortam deÄiÅkenlerini okuyacaktır, "
+"aksi takdirde localhost kullanacaktır"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Host:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Port:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "Parola:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Görünüm"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "Durum çubuÄu"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "Durum çubuÄunu gö_ster"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "Åarkı Biçimi"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "Åarkı Biçimi:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "Åarkı Biçimi"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "Åarkı"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "Albüm - Åarkı"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "Sanatçı - Åarkı"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "Sanatçı - Åarkı (Tarih)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "Sanatçı - Albüm - Åarkı"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "Sanatçı - Albüm - Sıra. Åarkı"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "Ãzel..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "Ãzel biçim:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "Kullanılabilir parametreler:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: Sanatçı"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: Albüm"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: Tarih"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Disk"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: Dosya"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: Tür"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: Åarkı"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: Sıra"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "Dosya"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "Sanatçı"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "Albüm"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "Tarih"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "Sıra"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "Tür"
@@ -256,6 +261,15 @@ msgstr "Tür"
msgid "MPD client"
msgstr "MPD istemcisi"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Xfmpc Tercihleri"
+
+#~ msgid "Song format:"
+#~ msgstr "Åarkı Biçimi:"
+
#~ msgid "MPD Settings"
#~ msgstr "MPD Ayarları"
-
diff --git a/po/uk.po b/po/uk.po
index 3c8bc04..1eb50ef 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-02-24 20:34+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
"Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -16,126 +16,106 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_ÐамÑниÑи"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "ÐовÑоÑиÑи"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "Ðипадково"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "ÐлÑÑÐ½Ñ MPD напиÑаний в GTK+ Ð´Ð»Ñ Xfce"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "ÐÑиÑÑиÑи ÑпиÑок пÑогÑаваннÑ"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "ÐновиÑи Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð¸Ñ
"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "ÐонÑекÑÑне менÑ"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "ÐоÑоÑний ÑпиÑок пÑогÑаваннÑ"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "ÐибÑаÑи Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð¸Ñ
"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "ÐовÑоÑиÑи"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "Ðипадково"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "ÐлÑÑÐ½Ñ MPD напиÑаний в GTK+ Ð´Ð»Ñ Xfce"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "Ðе з'Ñднаний"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "вÑд \"%s\" з \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "ÐÑпинено"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "Ðе з'Ñднаний"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "н/д"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:43
-msgid "Artist - Title"
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr ""
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr ""
-
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr ""
-
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr ""
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "н/д"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
#, fuzzy
msgid "Use _default system settings"
msgstr "ÐикоÑиÑÑовÑваÑи ÑÐ¸Ð¿Ð¾Ð²Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑиÑÑеми"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
@@ -143,108 +123,132 @@ msgstr ""
"ЯкÑо вÑдмÑÑено, Xfmpc ÑпÑобÑÑ Ð¿ÑоÑиÑаÑи змÑÐ½Ð½Ñ ÑеÑедовиÑа MPD_HOST Ñ "
"MPD_PORT ÑнакÑе бÑде викоÑиÑÑовÑваÑи localhost"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "Ðазва Ñ
оÑÑа:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "ÐоÑÑ:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "ÐаÑолÑ:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr ""
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "ÐÑогÑама Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
@@ -252,5 +256,9 @@ msgstr ""
msgid "MPD client"
msgstr "ÐлÑÑÐ½Ñ MPD"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "ÐÑогÑама Xfmpc"
+
#~ msgid "MPD Settings"
#~ msgstr "ÐалаÑÑÑÐ²Ð°Ð½Ð½Ñ MPD"
diff --git a/po/ur.po b/po/ur.po
index 8821b1c..31f2c75 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-05-14 03:31+0500\n"
"Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,51 +19,29 @@ msgstr ""
"X-Poedit-Country: PAKISTAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_تبدÛ٠کرÛÚº"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_اÙتخاب"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Ù¾ÙÛ Ùسٹ صا٠کرÛÚº"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "ÚÛٹا بÛس ØªØ§Ø²Û Ú©Ø±ÛÚº"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Ú©ÙÙÙ¹Ûکسٹ Ù
ÛÙÛÙ"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "ØاÙÛÛ Ù¾ÙÛ Ùسٹ"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "ÚÛٹا بÛس براؤز کرÛÚº"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "دÛرائÛÚº"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "رÛÙÚÙ
"
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "اÛÙ
Ù¾Û ÚÛ MPD Ú©ÙائÙÙ¹ ج٠اÛکسÙس Ú©Û ÙÛÛ GTK+ Ù
ÛÚº Ùکھا Ú¯Ûا ÛÛ"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Ù
ØÙ
د عÙÛ Ù
Ú©Û\n"
@@ -73,189 +51,216 @@ msgstr ""
"Ù
Ú©Û Ú©Ø§ بÙاگ\n"
"http://makki.urducoder.com"
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "غÛر Ù
تص٠ÛÛ"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Ù¾ÙÛ Ùسٹ صا٠کرÛÚº"
+
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "ÚÛٹا بÛس ØªØ§Ø²Û Ú©Ø±ÛÚº"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Ú©ÙÙÙ¹Ûکسٹ Ù
ÛÙÛÙ"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "ØاÙÛÛ Ù¾ÙÛ Ùسٹ"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "ÚÛٹا بÛس براؤز کرÛÚº"
+
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "\"%s\" Ú©Û Ø·Ø±Ù Ø³Û Ø§Ø² \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "رکا ÛÙا"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "غÛر Ù
تص٠ÛÛ"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d گاÙÛØ %d Ú¯Ú¾ÙÙ¹Û Ø§Ùر %d Ù
ÙÙ¹"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d گاÙÛØ %d Ù
ÙÙ¹"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "غ/Ù
"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "عÙÙاÙ"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "اÛÙبÙ
- عÙÙاÙ"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "ÙÙکار - عÙÙاÙ"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "ÙÙکار - عÙÙا٠(تارÛØ®)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "ÙÙکار - اÛÙبÙ
- عÙÙاÙ"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "ÙÙکار - اÛÙبÙ
- ٹرÛÚ©. عÙÙاÙ"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "صÙابدÛدÛ..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Ú©ÙÚ©Ø´Ù"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "ترجÛØات Ø¨Ø±Ø§Ø¦Û Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "غ/Ù
"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "اÛÙ
Ù¾Û ÚÛ"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Ú©ÙÚ©Ø´Ù"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "ÙظاÙ
Ú©Û _Ø·Û Ø´Ø¯Û ØªØ±ØªÛبات استعÙ
ا٠کرÛÚº"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "اگر Ù
Ùتخب Ú©Ûا Ú¯Ûا ت٠Xfmpc Ù
اØÙÙ Ù
تغÛر MPD_HOST اÙر MPD_PORT Ù¾ÚÚ¾ÙÛ Ú©Û Ú©Ùشش Ú©Ø±Û Ú¯Ø§Ø Ø¯ÙØ³Ø±Û ØµÙرت Ù
ÛÚº ÛÛ localhost استعÙ
Ø§Ù Ú©Ø±Û Ú¯Ø§"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"اگر Ù
Ùتخب Ú©Ûا Ú¯Ûا ت٠Xfmpc Ù
اØÙÙ Ù
تغÛر MPD_HOST اÙر MPD_PORT Ù¾ÚÚ¾ÙÛ Ú©Û Ú©Ùشش "
+"Ú©Ø±Û Ú¯Ø§Ø Ø¯ÙØ³Ø±Û ØµÙرت Ù
ÛÚº ÛÛ localhost استعÙ
Ø§Ù Ú©Ø±Û Ú¯Ø§"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "ÛÙسٹ ÙÛÙ
:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Ù¾Ùرٹ:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "پاس ÙرÚ:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Ù
ظÛر"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "ØاÙت پٹÛ"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "_ØاÙت Ù¾Ù¹Û Ø¯Ú©Ú¾Ø§Ø¦ÛÚº"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "اÛÙبÙ
- عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "ÙÙکار - عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "ÙÙکار - عÙÙا٠(تارÛØ®)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "ÙÙکار - اÛÙبÙ
- عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "ÙÙکار - اÛÙبÙ
- ٹرÛÚ©. عÙÙاÙ"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "صÙابدÛدÛ..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "صÙابدÛØ¯Û ÙارÙ
ÛÙ¹:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "دستÛاب Ù¾ÛراÙ
Ûٹر:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: ÙÙکار"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: اÛÙبÙ
"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: تارÛØ®"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Úسک"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: ÙائÙ"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: ÙÙعÛت"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: عÙÙاÙ"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: ٹرÛÚ©"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "ÙائÙ"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "ÙÙکار"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "اÛÙبÙ
"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "تارÛØ®"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "ٹرÛÚ©"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "ÙÙعÛت"
@@ -263,3 +268,12 @@ msgstr "ÙÙعÛت"
msgid "MPD client"
msgstr "اÛÙ
Ù¾Û ÚÛ Ú©ÙائÙÙ¹"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "ترجÛØات Ø¨Ø±Ø§Ø¦Û Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹:"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 8821b1c..31f2c75 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-05-14 03:31+0500\n"
"Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,51 +19,29 @@ msgstr ""
"X-Poedit-Country: PAKISTAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "_تبدÛ٠کرÛÚº"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230
-#: ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "_اÙتخاب"
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr "Ù¾ÙÛ Ùسٹ صا٠کرÛÚº"
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
-msgstr "ÚÛٹا بÛس ØªØ§Ø²Û Ú©Ø±ÛÚº"
-
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
-msgstr "Ú©ÙÙÙ¹Ûکسٹ Ù
ÛÙÛÙ"
-
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
-msgstr "ØاÙÛÛ Ù¾ÙÛ Ùسٹ"
-
-#: ../src/extended-interface.c:220
-msgid "Browse database"
-msgstr "ÚÛٹا بÛس براؤز کرÛÚº"
-
-#: ../src/extended-interface.c:303
+#: ../src/extended-interface.c:288
msgid "Repeat"
msgstr "دÛرائÛÚº"
-#: ../src/extended-interface.c:310
+#: ../src/extended-interface.c:293
msgid "Random"
msgstr "رÛÙÚÙ
"
-#: ../src/extended-interface.c:402
-#: ../xfmpc.desktop.in.h:2
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
msgstr "اÛÙ
Ù¾Û ÚÛ MPD Ú©ÙائÙÙ¹ ج٠اÛکسÙس Ú©Û ÙÛÛ GTK+ Ù
ÛÚº Ùکھا Ú¯Ûا ÛÛ"
-#: ../src/extended-interface.c:406
+#: ../src/extended-interface.c:397
msgid "translator-credits"
msgstr ""
"Ù
ØÙ
د عÙÛ Ù
Ú©Û\n"
@@ -73,189 +51,216 @@ msgstr ""
"Ù
Ú©Û Ú©Ø§ بÙاگ\n"
"http://makki.urducoder.com"
-#: ../src/interface.c:156
-#: ../src/interface.c:364
-msgid "Not connected"
-msgstr "غÛر Ù
تص٠ÛÛ"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
+msgstr "Ù¾ÙÛ Ùسٹ صا٠کرÛÚº"
+
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
+msgstr "ÚÛٹا بÛس ØªØ§Ø²Û Ú©Ø±ÛÚº"
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
+msgstr "Ú©ÙÙÙ¹Ûکسٹ Ù
ÛÙÛÙ"
+
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
+msgstr "ØاÙÛÛ Ù¾ÙÛ Ùسٹ"
+
+#: ../src/extended-interface.c:501
+msgid "Browse database"
+msgstr "ÚÛٹا بÛس براؤز کرÛÚº"
+
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "\"%s\" Ú©Û Ø·Ø±Ù Ø³Û Ø§Ø² \"%s\" (%s)"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "رکا ÛÙا"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "غÛر Ù
تص٠ÛÛ"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d گاÙÛØ %d Ú¯Ú¾ÙÙ¹Û Ø§Ùر %d Ù
ÙÙ¹"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d گاÙÛØ %d Ù
ÙÙ¹"
-#: ../src/mpdclient.c:515
-#: ../src/mpdclient.c:545
-#: ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "غ/Ù
"
-
-#: ../src/preferences.c:41
-#: ../src/song-dialog.c:173
-msgid "Title"
-msgstr "عÙÙاÙ"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "اÛÙبÙ
- عÙÙاÙ"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "ÙÙکار - عÙÙاÙ"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "ÙÙکار - عÙÙا٠(تارÛØ®)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "ÙÙکار - اÛÙبÙ
- عÙÙاÙ"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "ÙÙکار - اÛÙبÙ
- ٹرÛÚ©. عÙÙاÙ"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "صÙابدÛدÛ..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "Ú©ÙÚ©Ø´Ù"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "ترجÛØات Ø¨Ø±Ø§Ø¦Û Xfmpc"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "غ/Ù
"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "اÛÙ
Ù¾Û ÚÛ"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "Ú©ÙÚ©Ø´Ù"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "ÙظاÙ
Ú©Û _Ø·Û Ø´Ø¯Û ØªØ±ØªÛبات استعÙ
ا٠کرÛÚº"
-#: ../src/preferences-dialog.c:206
-msgid "If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost"
-msgstr "اگر Ù
Ùتخب Ú©Ûا Ú¯Ûا ت٠Xfmpc Ù
اØÙÙ Ù
تغÛر MPD_HOST اÙر MPD_PORT Ù¾ÚÚ¾ÙÛ Ú©Û Ú©Ùشش Ú©Ø±Û Ú¯Ø§Ø Ø¯ÙØ³Ø±Û ØµÙرت Ù
ÛÚº ÛÛ localhost استعÙ
Ø§Ù Ú©Ø±Û Ú¯Ø§"
+#: ../src/preferences-dialog.c:367
+msgid ""
+"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
+"MPD_PORT otherwise it will use localhost"
+msgstr ""
+"اگر Ù
Ùتخب Ú©Ûا Ú¯Ûا ت٠Xfmpc Ù
اØÙÙ Ù
تغÛر MPD_HOST اÙر MPD_PORT Ù¾ÚÚ¾ÙÛ Ú©Û Ú©Ùشش "
+"Ú©Ø±Û Ú¯Ø§Ø Ø¯ÙØ³Ø±Û ØµÙرت Ù
ÛÚº ÛÛ localhost استعÙ
Ø§Ù Ú©Ø±Û Ú¯Ø§"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "ÛÙسٹ ÙÛÙ
:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "Ù¾Ùرٹ:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "پاس ÙرÚ:"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "Ù
ظÛر"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "ØاÙت پٹÛ"
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "_ØاÙت Ù¾Ù¹Û Ø¯Ú©Ú¾Ø§Ø¦ÛÚº"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "اÛÙبÙ
- عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "ÙÙکار - عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "ÙÙکار - عÙÙا٠(تارÛØ®)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "ÙÙکار - اÛÙبÙ
- عÙÙاÙ"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "ÙÙکار - اÛÙبÙ
- ٹرÛÚ©. عÙÙاÙ"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "صÙابدÛدÛ..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "صÙابدÛØ¯Û ÙارÙ
ÛÙ¹:"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "دستÛاب Ù¾ÛراÙ
Ûٹر:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: ÙÙکار"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: اÛÙبÙ
"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: تارÛØ®"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: Úسک"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: ÙائÙ"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: ÙÙعÛت"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: عÙÙاÙ"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: ٹرÛÚ©"
-#: ../src/song-dialog.c:133
-#: ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "ÙائÙ"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "ÙÙکار"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "اÛÙبÙ
"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "تارÛØ®"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "ٹرÛÚ©"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "ÙÙعÛت"
@@ -263,3 +268,12 @@ msgstr "ÙÙعÛت"
msgid "MPD client"
msgstr "اÛÙ
Ù¾Û ÚÛ Ú©ÙائÙÙ¹"
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "ترجÛØات Ø¨Ø±Ø§Ø¦Û Xfmpc"
+
+#~ msgid "Song format:"
+#~ msgstr "گاÙÛ Ú©Ø§ ÙارÙ
ÛÙ¹:"
diff --git a/po/xfmpc.pot b/po/xfmpc.pot
index e718b84..fa25409 100644
--- a/po/xfmpc.pot
+++ b/po/xfmpc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,235 +16,242 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+msgid "Replace"
msgstr ""
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+msgid "Browse"
msgstr ""
-#: ../src/extended-interface.c:165
-msgid "Clear Playlist"
-msgstr ""
-
-#: ../src/extended-interface.c:175
-msgid "Refresh Database"
+#: ../src/extended-interface.c:288
+msgid "Repeat"
msgstr ""
-#: ../src/extended-interface.c:185
-msgid "Context Menu"
+#: ../src/extended-interface.c:293
+msgid "Random"
msgstr ""
-#: ../src/extended-interface.c:217
-msgid "Current Playlist"
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
msgstr ""
-#: ../src/extended-interface.c:220
-msgid "Browse database"
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
msgstr ""
-#: ../src/extended-interface.c:303
-msgid "Repeat"
+#: ../src/extended-interface.c:466
+msgid "Clear Playlist"
msgstr ""
-#: ../src/extended-interface.c:310
-msgid "Random"
+#: ../src/extended-interface.c:473
+msgid "Refresh Database"
msgstr ""
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
+#: ../src/extended-interface.c:481
+msgid "Context Menu"
msgstr ""
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
+#: ../src/extended-interface.c:499
+msgid "Current Playlist"
msgstr ""
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
+#: ../src/extended-interface.c:501
+msgid "Browse database"
msgstr ""
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr ""
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr ""
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr ""
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr ""
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr ""
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr ""
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr ""
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr ""
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
msgstr ""
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr ""
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
+#: ../src/mpdclient.c:353
+msgid "Connected to MPD"
msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr ""
-
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
msgstr ""
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr ""
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr ""
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr ""
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
msgstr ""
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr ""
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr ""
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr ""
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr ""
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr ""
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+msgid "Show _stastusbar"
msgstr ""
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr ""
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
+#: ../src/preferences-dialog.c:436
+msgid "Song Format:"
+msgstr ""
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr ""
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr ""
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
msgstr ""
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr ""
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr ""
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr ""
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr ""
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr ""
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr ""
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr ""
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr ""
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr ""
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr ""
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr ""
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr ""
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr ""
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr ""
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr ""
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr ""
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr ""
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr ""
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51d2d14..83adcd7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfmpc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 09:31+0100\n"
+"POT-Creation-Date: 2009-09-03 13:24+0200\n"
"PO-Revision-Date: 2009-05-09 03:40+0800\n"
"Last-Translator: Hunt Xu <huntxu at live.cn>\n"
"Language-Team: Chinese (simplified)\n"
@@ -16,237 +16,253 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Menu -> Replace
-#: ../src/dbbrowser.c:222
-msgid "_Replace"
+#: ../src/dbbrowser.c:913
+#, fuzzy
+msgid "Replace"
msgstr "æ¿æ¢(_R)"
-#. Menu -> Browse (only shown on a search)
-#: ../src/dbbrowser.c:230 ../src/playlist.c:237
-msgid "_Browse"
+#: ../src/dbbrowser.c:919 ../src/playlist.c:884
+#, fuzzy
+msgid "Browse"
msgstr "æµè§(_B)"
-#: ../src/extended-interface.c:165
+#: ../src/extended-interface.c:288
+msgid "Repeat"
+msgstr "éå¤ææ¾"
+
+#: ../src/extended-interface.c:293
+msgid "Random"
+msgstr "éæºææ¾"
+
+#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "使ç¨GTK+ç¼åçç¨äºXfceçMPD客æ·ç«¯"
+
+#: ../src/extended-interface.c:397
+msgid "translator-credits"
+msgstr "Hunt Xu <huntxu at live.cn>"
+
+#: ../src/extended-interface.c:466
msgid "Clear Playlist"
msgstr "æ¸
é¤ææ¾å表"
-#: ../src/extended-interface.c:175
+#: ../src/extended-interface.c:473
msgid "Refresh Database"
msgstr "å·æ°æ°æ®åº"
-#: ../src/extended-interface.c:185
+#: ../src/extended-interface.c:481
msgid "Context Menu"
msgstr "èå"
-#: ../src/extended-interface.c:217
+#: ../src/extended-interface.c:499
msgid "Current Playlist"
msgstr "å½åææ¾å表"
-#: ../src/extended-interface.c:220
+#: ../src/extended-interface.c:501
msgid "Browse database"
msgstr "æµè§æ°æ®åº"
-#: ../src/extended-interface.c:303
-msgid "Repeat"
-msgstr "éå¤ææ¾"
-
-#: ../src/extended-interface.c:310
-msgid "Random"
-msgstr "éæºææ¾"
-
-#: ../src/extended-interface.c:402 ../xfmpc.desktop.in.h:2
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "使ç¨GTK+ç¼åçç¨äºXfceçMPD客æ·ç«¯"
-
-#: ../src/extended-interface.c:406
-msgid "translator-credits"
-msgstr ""
-"Hunt Xu <huntxu at live.cn>"
-
-#: ../src/interface.c:156 ../src/interface.c:364
-msgid "Not connected"
-msgstr "æªè¿æ¥"
-
-#. subtitle "by \"artist\" from \"album\" (year)"
-#: ../src/interface.c:395
+#.
+#. // write private function in case it is wished to avoid the
+#. // "n/a" values, but no big deal IMO
+#. text = get_subtitle (interface);
+#.
+#. TRANSLATORS: subtitle "by \"artist\" from \"album\" (year)"
+#: ../src/interface.c:263
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
msgstr "èºæ¯å®¶: \"%s\"; ä¸è¾: \"%s\"; 年份: %s"
-#: ../src/interface.c:441
+#: ../src/interface.c:268
msgid "Stopped"
msgstr "å·²åæ¢"
-#: ../src/main-window.c:393
+#: ../src/interface.c:272 ../src/interface.c:470
+msgid "Not connected"
+msgstr "æªè¿æ¥"
+
+#: ../src/main-window.c:383
#, c-format
msgid "%d songs, %d hours and %d minutes"
msgstr "%d é¦æ, %d å°æ¶ %d åé"
-#: ../src/main-window.c:395
+#: ../src/main-window.c:385
#, c-format
msgid "%d songs, %d minutes"
msgstr "%d é¦æ, %d åé"
-#: ../src/mpdclient.c:515 ../src/mpdclient.c:545 ../src/mpdclient.c:560
-msgid "n/a"
-msgstr "æªç¥"
-
-#: ../src/preferences.c:41 ../src/song-dialog.c:173
-msgid "Title"
-msgstr "æ é¢"
-
-#: ../src/preferences.c:42
-msgid "Album - Title"
-msgstr "ä¸è¾ - æ é¢"
-
-#: ../src/preferences.c:43
-msgid "Artist - Title"
-msgstr "èºæ¯å®¶ - æ é¢"
-
-#: ../src/preferences.c:44
-msgid "Artist - Title (Date)"
-msgstr "èºæ¯å®¶ - æ é¢ (æ¥æ)"
-
-#: ../src/preferences.c:45
-msgid "Artist - Album - Title"
-msgstr "èºæ¯å®¶ - ä¸è¾ - æ é¢"
-
-#: ../src/preferences.c:46
-msgid "Artist - Album - Track. Title"
-msgstr "èºæ¯å®¶ - ä¸è¾ - é³è½¨. æ é¢"
+#: ../src/mpdclient.c:348
+msgid "Failed to connect to MPD"
+msgstr ""
-#: ../src/preferences.c:47
-msgid "Custom..."
-msgstr "èªå®ä¹..."
+#: ../src/mpdclient.c:353
+#, fuzzy
+msgid "Connected to MPD"
+msgstr "è¿æ¥"
-#: ../src/preferences-dialog.c:181
-msgid "Xfmpc Preferences"
-msgstr "Xfmpc é¦é项"
+#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614
+msgid "n/a"
+msgstr "æªç¥"
-#: ../src/preferences-dialog.c:197
+#: ../src/preferences-dialog.c:359
msgid "MPD"
msgstr "MPD"
-#: ../src/preferences-dialog.c:201
+#: ../src/preferences-dialog.c:363
msgid "Connection"
msgstr "è¿æ¥"
-#: ../src/preferences-dialog.c:204
+#: ../src/preferences-dialog.c:366
msgid "Use _default system settings"
msgstr "使ç¨ç³»ç»é»è®¤è®¾ç½®(_D)"
-#: ../src/preferences-dialog.c:206
+#: ../src/preferences-dialog.c:367
msgid ""
"If checked, Xfmpc will try to read the environment variables MPD_HOST and "
"MPD_PORT otherwise it will use localhost"
-msgstr ""
-"éä¸æ¤é¡¹ï¼Xfmpcå°å°è¯è¯»åç¯å¢åéMPD_HOSTåMPD_PORTï¼å¦å使ç¨æ¬å°ä¸»æº"
+msgstr "éä¸æ¤é¡¹ï¼Xfmpcå°å°è¯è¯»åç¯å¢åéMPD_HOSTåMPD_PORTï¼å¦å使ç¨æ¬å°ä¸»æº"
-#: ../src/preferences-dialog.c:221
+#: ../src/preferences-dialog.c:378
msgid "Hostname:"
msgstr "主æºå:"
-#: ../src/preferences-dialog.c:228
+#: ../src/preferences-dialog.c:386
msgid "Port:"
msgstr "端å£:"
-#: ../src/preferences-dialog.c:238
+#: ../src/preferences-dialog.c:397
msgid "Password:"
msgstr "å¯ç :"
-#: ../src/preferences-dialog.c:256
+#: ../src/preferences-dialog.c:414
msgid "Appearance"
msgstr "å¤è§"
-#: ../src/preferences-dialog.c:260
+#: ../src/preferences-dialog.c:420
msgid "Statusbar"
msgstr "ç¶ææ "
-#: ../src/preferences-dialog.c:263
-msgid "Show _statusbar"
+#: ../src/preferences-dialog.c:423
+#, fuzzy
+msgid "Show _stastusbar"
msgstr "æ¾ç¤ºç¶ææ (_S)"
-#: ../src/preferences-dialog.c:270
+#: ../src/preferences-dialog.c:431
msgid "Song Format"
msgstr "ææ²æ ¼å¼"
-#: ../src/preferences-dialog.c:275
-msgid "Song format:"
-msgstr "ææ²æ ¼å¼:"
+#: ../src/preferences-dialog.c:436
+#, fuzzy
+msgid "Song Format:"
+msgstr "ææ²æ ¼å¼"
+
+#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139
+msgid "Title"
+msgstr "æ é¢"
-#: ../src/preferences-dialog.c:295
+#: ../src/preferences-dialog.c:442
+msgid "Album - Title"
+msgstr "ä¸è¾ - æ é¢"
+
+#: ../src/preferences-dialog.c:443
+msgid "Artist - Title"
+msgstr "èºæ¯å®¶ - æ é¢"
+
+#: ../src/preferences-dialog.c:444
+msgid "Artist - Title (Date)"
+msgstr "èºæ¯å®¶ - æ é¢ (æ¥æ)"
+
+#: ../src/preferences-dialog.c:445
+msgid "Artist - Album - Title"
+msgstr "èºæ¯å®¶ - ä¸è¾ - æ é¢"
+
+#: ../src/preferences-dialog.c:446
+msgid "Artist - Album - Track. Title"
+msgstr "èºæ¯å®¶ - ä¸è¾ - é³è½¨. æ é¢"
+
+#: ../src/preferences-dialog.c:447
+msgid "Custom..."
+msgstr "èªå®ä¹..."
+
+#: ../src/preferences-dialog.c:453
msgid "Custom format:"
msgstr "èªå®ä¹æ ¼å¼"
-#: ../src/preferences-dialog.c:312
+#: ../src/preferences-dialog.c:466
msgid "Available parameters:"
msgstr "å¯ç¨åæ°:"
-#: ../src/preferences-dialog.c:321
+#: ../src/preferences-dialog.c:472
#, c-format
msgid "%a: Artist"
msgstr "%a: èºæ¯å®¶"
-#: ../src/preferences-dialog.c:325
+#: ../src/preferences-dialog.c:477
#, c-format
msgid "%A: Album"
msgstr "%A: ä¸è¾"
-#: ../src/preferences-dialog.c:330
+#: ../src/preferences-dialog.c:482
#, c-format
msgid "%d: Date"
msgstr "%d: æ¥æ"
-#: ../src/preferences-dialog.c:334
+#: ../src/preferences-dialog.c:487
msgid "%D: Disc"
msgstr "%D: å
ç"
-#: ../src/preferences-dialog.c:339
+#: ../src/preferences-dialog.c:492
#, c-format
msgid "%f: File"
msgstr "%f: æ件"
-#: ../src/preferences-dialog.c:343
+#: ../src/preferences-dialog.c:497
#, c-format
msgid "%g: Genre"
msgstr "%g: ç±»å"
-#: ../src/preferences-dialog.c:348
+#: ../src/preferences-dialog.c:502
msgid "%t: Title"
msgstr "%t: æ é¢"
-#: ../src/preferences-dialog.c:352
+#: ../src/preferences-dialog.c:507
msgid "%T: Track"
msgstr "%T: é³è½¨"
-#: ../src/song-dialog.c:133 ../xfmpc.desktop.in.h:3
-msgid "Xfmpc"
-msgstr "Xfmpc"
-
-#: ../src/song-dialog.c:153
+#: ../src/song-dialog.c:117
msgid "File"
msgstr "æ件"
-#: ../src/song-dialog.c:163
+#: ../src/song-dialog.c:129
msgid "Artist"
msgstr "èºæ¯å®¶"
-#: ../src/song-dialog.c:183
+#: ../src/song-dialog.c:149
msgid "Album"
msgstr "ä¸è¾"
-#: ../src/song-dialog.c:193
+#: ../src/song-dialog.c:159
msgid "Date"
msgstr "æ¥æ"
-#: ../src/song-dialog.c:200
+#: ../src/song-dialog.c:166
msgid "Track"
msgstr "é³è½¨"
-#: ../src/song-dialog.c:211
+#: ../src/song-dialog.c:176
msgid "Genre"
msgstr "ç±»å"
#: ../xfmpc.desktop.in.h:1
msgid "MPD client"
msgstr "MPD客æ·ç«¯"
+
+#: ../xfmpc.desktop.in.h:3
+msgid "Xfmpc"
+msgstr "Xfmpc"
+
+#~ msgid "Xfmpc Preferences"
+#~ msgstr "Xfmpc é¦é项"
+
+#~ msgid "Song format:"
+#~ msgstr "ææ²æ ¼å¼:"
diff --git a/src/dbbrowser.c b/src/dbbrowser.c
index 0115210..8ca90ea 100644
--- a/src/dbbrowser.c
+++ b/src/dbbrowser.c
@@ -133,8 +133,7 @@ static gboolean _xfmpc_dbbrowser_timeout_search_gsource_func (gpointer self);
static void xfmpc_dbbrowser_cb_search_entry_changed (XfmpcDbbrowser* self);
XfmpcDbbrowser* xfmpc_dbbrowser_new (void);
XfmpcDbbrowser* xfmpc_dbbrowser_construct (GType object_type);
-XfmpcDbbrowser* xfmpc_dbbrowser_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
const char* xfmpc_preferences_get_dbbrowser_last_path (XfmpcPreferences* self);
static void _xfmpc_dbbrowser_add_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void _xfmpc_dbbrowser_cb_replace_with_selected_rows_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
@@ -176,8 +175,8 @@ void xfmpc_dbbrowser_reload (XfmpcDbbrowser* self) {
XfmpcPlaylist* _tmp0_;
XfmpcPlaylist* playlist;
g_return_if_fail (self != NULL);
- filename = g_strdup ("");
- basename = g_strdup ("");
+ filename = NULL;
+ basename = NULL;
is_dir = FALSE;
is_bold = FALSE;
i = 0;
@@ -360,8 +359,8 @@ void xfmpc_dbbrowser_search (XfmpcDbbrowser* self, const char* query) {
gboolean _tmp1_;
g_return_if_fail (self != NULL);
g_return_if_fail (query != NULL);
- filename = g_strdup ("");
- basename = g_strdup ("");
+ filename = NULL;
+ basename = NULL;
is_bold = FALSE;
i = 0;
_tmp0_ = NULL;
@@ -873,8 +872,8 @@ static GObject * xfmpc_dbbrowser_constructor (GType type, guint n_construct_prop
GtkImageMenuItem* _tmp8_;
GtkImage* _tmp9_;
GtkEntry* _tmp10_;
- self->priv->mpdclient = xfmpc_mpdclient_get ();
- self->priv->preferences = xfmpc_preferences_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
_tmp1_ = NULL;
_tmp0_ = NULL;
self->priv->wdir = (_tmp1_ = (_tmp0_ = xfmpc_preferences_get_dbbrowser_last_path (self->priv->preferences), (_tmp0_ == NULL) ? NULL : g_strdup (_tmp0_)), self->priv->wdir = (g_free (self->priv->wdir), NULL), _tmp1_);
diff --git a/src/extended-interface.c b/src/extended-interface.c
index 8c49d7e..13d4905 100644
--- a/src/extended-interface.c
+++ b/src/extended-interface.c
@@ -153,8 +153,7 @@ XfmpcPreferencesDialog* xfmpc_preferences_dialog_construct (GType object_type);
GType xfmpc_preferences_dialog_get_type (void);
XfmpcExtendedInterface* xfmpc_extended_interface_new (void);
XfmpcExtendedInterface* xfmpc_extended_interface_construct (GType object_type);
-XfmpcExtendedInterface* xfmpc_extended_interface_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
static void _xfmpc_extended_interface_cb_playlist_clear_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_extended_interface_cb_database_refresh_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_extended_interface_popup_context_menu_gtk_button_pressed (GtkButton* _sender, gpointer self);
@@ -395,7 +394,7 @@ static void xfmpc_extended_interface_cb_about (XfmpcExtendedInterface* self) {
_tmp1_ = NULL;
_tmp0_ = NULL;
authors = (_tmp1_ = (_tmp0_ = g_new0 (char*, 2 + 1), _tmp0_[0] = g_strdup ("Mike Massonnet <mmassonnet at xfce.org>"), _tmp0_[1] = g_strdup ("Vincent Legout <vincent at xfce.org>"), _tmp0_), authors_length1 = 2, authors_size = authors_length1, _tmp1_);
- gtk_show_about_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), "artists", NULL, "authors", authors, "comments", _ ("MPD client written in GTK+ for Xfce"), "copyright", "Copyright \302\251 2008-2009 Mike Massonnet, Vincent Legout", "documenters", NULL, "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), "translator-credits", _ ("translator-credits"), "version", PACKAGE_VERSION, "website", "http://goodies.xfce.org/projects/applications/xfmpc", NULL, NULL);
+ gtk_show_about_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), "artists", NULL, "authors", authors, "comments", _ ("MPD client written in GTK+ for Xfce"), "copyright", "Copyright \xc2\xa9 2008-2009 Mike Massonnet, Vincent Legout", "documenters", NULL, "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), "translator-credits", _ ("translator-credits"), "version", PACKAGE_VERSION, "website", "http://goodies.xfce.org/projects/applications/xfmpc", NULL, NULL);
authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
}
@@ -459,8 +458,8 @@ static GObject * xfmpc_extended_interface_constructor (GType type, guint n_const
GtkNotebook* _tmp5_;
GtkWidget* playlist;
GtkWidget* dbbrowser;
- self->priv->mpdclient = xfmpc_mpdclient_get ();
- self->priv->preferences = xfmpc_preferences_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
hbox = g_object_ref_sink ((GtkHBox*) gtk_hbox_new (FALSE, 2));
gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) hbox, FALSE, FALSE, (guint) 2);
button = g_object_ref_sink ((GtkButton*) gtk_button_new ());
diff --git a/src/extended-interface.vala b/src/extended-interface.vala
index dc83e56..0087012 100644
--- a/src/extended-interface.vala
+++ b/src/extended-interface.vala
@@ -238,7 +238,7 @@ namespace Xfmpc {
"artists", null,
"authors", authors,
"comments", _("MPD client written in GTK+ for Xfce"),
- "copyright", "Copyright \302\251 2008-2009 Mike Massonnet, Vincent Legout",
+ "copyright", "Copyright \xc2\xa9 2008-2009 Mike Massonnet, Vincent Legout",
"documenters", null,
"license", Xfce.get_license_text (Xfce.LicenseTextType.GPL),
"translator-credits", _("translator-credits"),
diff --git a/src/interface.c b/src/interface.c
index 21c78a4..80ec651 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -103,8 +103,7 @@ static void xfmpc_interface_cb_mpdclient_previous (XfmpcInterface* self);
static void xfmpc_interface_cb_mpdclient_next (XfmpcInterface* self);
XfmpcInterface* xfmpc_interface_new (void);
XfmpcInterface* xfmpc_interface_construct (GType object_type);
-XfmpcInterface* xfmpc_interface_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
static void _xfmpc_interface_cb_mpdclient_previous_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_interface_pp_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void _xfmpc_interface_cb_mpdclient_next_gtk_button_clicked (GtkButton* _sender, gpointer self);
@@ -423,8 +422,8 @@ static GObject * xfmpc_interface_constructor (GType type, guint n_construct_prop
GtkLabel* _tmp10_;
GtkHBox* box;
GtkVBox* vbox;
- self->priv->mpdclient = xfmpc_mpdclient_get ();
- self->priv->preferences = xfmpc_preferences_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
gtk_container_set_border_width ((GtkContainer*) self, (guint) 4);
image = g_object_ref_sink ((GtkImage*) gtk_image_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, GTK_ICON_SIZE_BUTTON));
_tmp0_ = NULL;
diff --git a/src/main-window.c b/src/main-window.c
index c39f74d..d8e6106 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -148,8 +148,7 @@ gboolean xfmpc_preferences_get_show_statusbar (XfmpcPreferences* self);
static void xfmpc_main_window_cb_show_statusbar_changed (XfmpcMainWindow* self, GParamSpec* pspec);
XfmpcMainWindow* xfmpc_main_window_new (void);
XfmpcMainWindow* xfmpc_main_window_construct (GType object_type);
-XfmpcMainWindow* xfmpc_main_window_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
static gboolean _xfmpc_main_window_cb_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEvent* event, gpointer self);
static gboolean _xfmpc_main_window_cb_window_state_event_gtk_widget_window_state_event (GtkWidget* _sender, const GdkEventWindowState* event, gpointer self);
gint xfmpc_preferences_get_last_window_posx (XfmpcPreferences* self);
@@ -460,7 +459,6 @@ static GObject * xfmpc_main_window_constructor (GType type, guint n_construct_pr
self = XFMPC_MAIN_WINDOW (obj);
_inner_error_ = NULL;
{
- XfmpcPreferences* preferences1;
GtkVBox* _tmp0_;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -471,9 +469,8 @@ static GObject * xfmpc_main_window_constructor (GType type, guint n_construct_pr
GtkActionGroup* _tmp6_;
GtkAccelGroup* _tmp7_;
GtkAccelGroup* accel_group;
- self->priv->mpdclient = xfmpc_mpdclient_get ();
- self->priv->preferences = xfmpc_preferences_get ();
- preferences1 = xfmpc_preferences_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
/* Window */
gtk_window_set_default_icon_name ("xfmpc");
gtk_window_set_icon_name ((GtkWindow*) self, "stock_volume");
diff --git a/src/mpdclient.vapi b/src/mpdclient.vapi
index d907299..c0f489d 100644
--- a/src/mpdclient.vapi
+++ b/src/mpdclient.vapi
@@ -4,7 +4,6 @@
[CCode (cprefix = "Xfmpc", lower_case_cprefix = "xfmpc_")]
namespace Xfmpc {
- [Compact]
[CCode (cheader_filename = "mpdclient.h")]
public class Mpdclient {
public bool connect ();
diff --git a/src/playlist.c b/src/playlist.c
index 4e800fa..28aed64 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -166,8 +166,7 @@ static void xfmpc_playlist_cb_filter_entry_changed (XfmpcPlaylist* self);
gboolean xfmpc_playlist_has_filename (XfmpcPlaylist* self, const char* filename, gboolean is_dir);
XfmpcPlaylist* xfmpc_playlist_new (void);
XfmpcPlaylist* xfmpc_playlist_construct (GType object_type);
-XfmpcPlaylist* xfmpc_playlist_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
gboolean xfmpc_preferences_get_playlist_autocenter (XfmpcPreferences* self);
static void _xfmpc_playlist_delete_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
static void _xfmpc_playlist_cb_browse_selection_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
@@ -223,11 +222,11 @@ static gboolean xfmpc_playlist_visible_func_filter_tree (GtkTreeModel* model, Gt
_tmp0_ = NULL;
search = (_tmp1_ = (_tmp0_ = gtk_entry_get_text (xfmpc_playlist_filter_entry), (_tmp0_ == NULL) ? NULL : g_strdup (_tmp0_)), search = (g_free (search), NULL), _tmp1_);
_tmp2_ = NULL;
- search = (_tmp2_ = g_utf8_casefold (search, (glong) (-1)), search = (g_free (search), NULL), _tmp2_);
+ search = (_tmp2_ = g_utf8_casefold (search, (gssize) (-1)), search = (g_free (search), NULL), _tmp2_);
if (_vala_strcmp0 (search, "") != 0) {
char* _tmp3_;
_tmp3_ = NULL;
- song = (_tmp3_ = g_utf8_casefold (song, (glong) (-1)), song = (g_free (song), NULL), _tmp3_);
+ song = (_tmp3_ = g_utf8_casefold (song, (gssize) (-1)), song = (g_free (song), NULL), _tmp3_);
if (strstr (song, search) == NULL) {
_result_ = FALSE;
}
@@ -396,9 +395,9 @@ static void xfmpc_playlist_cb_playlist_changed (XfmpcPlaylist* self) {
gint id;
gint pos;
g_return_if_fail (self != NULL);
- filename = g_strdup ("");
- song = g_strdup ("");
- length = g_strdup ("");
+ filename = NULL;
+ song = NULL;
+ length = NULL;
id = 0;
pos = 0;
self->priv->current = xfmpc_mpdclient_get_id (self->priv->mpdclient);
@@ -842,8 +841,8 @@ static GObject * xfmpc_playlist_constructor (GType type, guint n_construct_prope
GtkImage* image;
GtkImageMenuItem* _tmp10_;
GtkEntry* _tmp11_;
- self->priv->mpdclient = xfmpc_mpdclient_get ();
- self->priv->preferences = xfmpc_preferences_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
self->priv->autocenter = xfmpc_preferences_get_playlist_autocenter (self->priv->preferences);
_tmp0_ = NULL;
self->priv->store = (_tmp0_ = gtk_list_store_new ((gint) XFMPC_PLAYLIST_COLUMNS_N_COLUMNS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, NULL), (self->priv->store == NULL) ? NULL : (self->priv->store = (g_object_unref (self->priv->store), NULL)), _tmp0_);
diff --git a/src/preferences-dialog.c b/src/preferences-dialog.c
index d2c5c3d..f30f48d 100644
--- a/src/preferences-dialog.c
+++ b/src/preferences-dialog.c
@@ -112,8 +112,7 @@ static void xfmpc_preferences_dialog_cb_entry_custom_changed (XfmpcPreferencesDi
void xfmpc_preferences_set_song_format_custom (XfmpcPreferences* self, const char* value);
XfmpcPreferencesDialog* xfmpc_preferences_dialog_new (void);
XfmpcPreferencesDialog* xfmpc_preferences_dialog_construct (GType object_type);
-XfmpcPreferencesDialog* xfmpc_preferences_dialog_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
gboolean xfmpc_preferences_get_mpd_use_defaults (XfmpcPreferences* self);
static void _xfmpc_preferences_dialog_cb_use_defaults_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
const char* xfmpc_preferences_get_mpd_hostname (XfmpcPreferences* self);
@@ -157,7 +156,7 @@ static void xfmpc_preferences_dialog_cb_update_mpd (XfmpcPreferencesDialog* self
XfmpcMpdclient* mpdclient;
g_return_if_fail (self != NULL);
g_return_if_fail (source != NULL);
- mpdclient = xfmpc_mpdclient_get ();
+ mpdclient = xfmpc_mpdclient_get_default ();
xfmpc_preferences_set_mpd_hostname (self->priv->preferences, gtk_entry_get_text (self->priv->entry_host));
xfmpc_preferences_set_mpd_port (self->priv->preferences, gtk_spin_button_get_value_as_int (self->priv->entry_port));
xfmpc_preferences_set_mpd_password (self->priv->preferences, gtk_entry_get_text (self->priv->entry_passwd));
@@ -350,7 +349,7 @@ static GObject * xfmpc_preferences_dialog_constructor (GType type, guint n_const
gtk_window_set_icon_name ((GtkWindow*) self, "stock_volume");
gtk_window_set_resizable ((GtkWindow*) self, FALSE);
gtk_window_set_title ((GtkWindow*) self, "Xfmpc Preferences");
- self->priv->preferences = xfmpc_preferences_get ();
+ self->priv->preferences = xfmpc_preferences_get_default ();
notebook = g_object_ref_sink ((GtkNotebook*) gtk_notebook_new ());
gtk_container_set_border_width ((GtkContainer*) notebook, (guint) 6);
gtk_box_pack_start ((GtkBox*) ((GtkDialog*) self)->vbox, (GtkWidget*) notebook, TRUE, TRUE, (guint) 0);
diff --git a/src/preferences.c b/src/preferences.c
index f71b169..0bd364d 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -101,8 +101,7 @@ enum {
static void xfmpc_preferences_load (XfmpcPreferences* self);
XfmpcPreferences* xfmpc_preferences_new (void);
XfmpcPreferences* xfmpc_preferences_construct (GType object_type);
-XfmpcPreferences* xfmpc_preferences_new (void);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
static void xfmpc_preferences_store (XfmpcPreferences* self);
gint xfmpc_preferences_get_last_window_posx (XfmpcPreferences* self);
void xfmpc_preferences_set_last_window_posx (XfmpcPreferences* self, gint value);
@@ -132,6 +131,7 @@ XfmpcPreferencesSongFormat xfmpc_preferences_get_song_format (XfmpcPreferences*
void xfmpc_preferences_set_song_format (XfmpcPreferences* self, XfmpcPreferencesSongFormat value);
const char* xfmpc_preferences_get_song_format_custom (XfmpcPreferences* self);
void xfmpc_preferences_set_song_format_custom (XfmpcPreferences* self, const char* value);
+static GObject * xfmpc_preferences_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static void xfmpc_preferences_finalize (GObject* obj);
static void xfmpc_preferences_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void xfmpc_preferences_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
@@ -152,29 +152,7 @@ GType xfmpc_preferences_song_format_get_type (void) {
XfmpcPreferences* xfmpc_preferences_construct (GType object_type) {
XfmpcPreferences * self;
- char* _tmp0_;
- char* _tmp1_;
- char* _tmp2_;
- char* _tmp3_;
self = g_object_newv (object_type, 0, NULL);
- self->priv->_last_window_posx = 200;
- self->priv->_last_window_posy = 100;
- self->priv->_last_window_width = 330;
- self->priv->_last_window_height = 330;
- self->priv->_last_window_state_sticky = TRUE;
- self->priv->_playlist_autocenter = TRUE;
- _tmp0_ = NULL;
- self->priv->_dbbrowser_last_path = (_tmp0_ = g_strdup (""), self->priv->_dbbrowser_last_path = (g_free (self->priv->_dbbrowser_last_path), NULL), _tmp0_);
- _tmp1_ = NULL;
- self->priv->_mpd_hostname = (_tmp1_ = g_strdup ("localhost"), self->priv->_mpd_hostname = (g_free (self->priv->_mpd_hostname), NULL), _tmp1_);
- self->priv->_mpd_port = 6600;
- _tmp2_ = NULL;
- self->priv->_mpd_password = (_tmp2_ = g_strdup (""), self->priv->_mpd_password = (g_free (self->priv->_mpd_password), NULL), _tmp2_);
- self->priv->_mpd_use_defaults = TRUE;
- self->priv->_show_statusbar = TRUE;
- self->priv->_song_format = XFMPC_PREFERENCES_SONG_FORMAT_ARTIST_TITLE;
- _tmp3_ = NULL;
- self->priv->_song_format_custom = (_tmp3_ = g_strdup (""), self->priv->_song_format_custom = (g_free (self->priv->_song_format_custom), NULL), _tmp3_);
xfmpc_preferences_load (self);
return self;
}
@@ -185,12 +163,13 @@ XfmpcPreferences* xfmpc_preferences_new (void) {
}
-XfmpcPreferences* xfmpc_preferences_get (void) {
+XfmpcPreferences* xfmpc_preferences_get_default (void) {
XfmpcPreferences* result;
if (xfmpc_preferences_preferences == NULL) {
XfmpcPreferences* _tmp0_;
_tmp0_ = NULL;
xfmpc_preferences_preferences = (_tmp0_ = xfmpc_preferences_new (), (xfmpc_preferences_preferences == NULL) ? NULL : (xfmpc_preferences_preferences = (g_object_unref (xfmpc_preferences_preferences), NULL)), _tmp0_);
+ g_object_add_weak_pointer ((GObject*) xfmpc_preferences_preferences, &xfmpc_preferences_preferences);
} else {
g_object_ref ((GObject*) xfmpc_preferences_preferences);
}
@@ -207,7 +186,7 @@ static void xfmpc_preferences_load (XfmpcPreferences* self) {
g_return_if_fail (self != NULL);
rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/xfmpcrc", FALSE);
if (rc == NULL) {
- g_warning ("preferences.vala:142: Failed to load the preferences");
+ g_warning ("preferences.vala:146: Failed to load the preferences");
(rc == NULL) ? NULL : (rc = (xfce_rc_close (rc), NULL));
return;
}
@@ -258,7 +237,7 @@ static void xfmpc_preferences_store (XfmpcPreferences* self) {
g_return_if_fail (self != NULL);
rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/xfmpcrc", FALSE);
if (rc == NULL) {
- g_warning ("preferences.vala:170: Failed to save the preferences");
+ g_warning ("preferences.vala:174: Failed to save the preferences");
(rc == NULL) ? NULL : (rc = (xfce_rc_close (rc), NULL));
return;
}
@@ -546,11 +525,49 @@ void xfmpc_preferences_set_song_format_custom (XfmpcPreferences* self, const cha
}
+static GObject * xfmpc_preferences_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
+ GObject * obj;
+ XfmpcPreferencesClass * klass;
+ GObjectClass * parent_class;
+ XfmpcPreferences * self;
+ klass = XFMPC_PREFERENCES_CLASS (g_type_class_peek (XFMPC_TYPE_PREFERENCES));
+ parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
+ obj = parent_class->constructor (type, n_construct_properties, construct_properties);
+ self = XFMPC_PREFERENCES (obj);
+ {
+ char* _tmp0_;
+ char* _tmp1_;
+ char* _tmp2_;
+ char* _tmp3_;
+ self->priv->_last_window_posx = 200;
+ self->priv->_last_window_posy = 100;
+ self->priv->_last_window_width = 330;
+ self->priv->_last_window_height = 330;
+ self->priv->_last_window_state_sticky = TRUE;
+ self->priv->_playlist_autocenter = TRUE;
+ _tmp0_ = NULL;
+ self->priv->_dbbrowser_last_path = (_tmp0_ = g_strdup (""), self->priv->_dbbrowser_last_path = (g_free (self->priv->_dbbrowser_last_path), NULL), _tmp0_);
+ _tmp1_ = NULL;
+ self->priv->_mpd_hostname = (_tmp1_ = g_strdup ("localhost"), self->priv->_mpd_hostname = (g_free (self->priv->_mpd_hostname), NULL), _tmp1_);
+ self->priv->_mpd_port = 6600;
+ _tmp2_ = NULL;
+ self->priv->_mpd_password = (_tmp2_ = g_strdup (""), self->priv->_mpd_password = (g_free (self->priv->_mpd_password), NULL), _tmp2_);
+ self->priv->_mpd_use_defaults = TRUE;
+ self->priv->_show_statusbar = TRUE;
+ self->priv->_song_format = XFMPC_PREFERENCES_SONG_FORMAT_ARTIST_TITLE;
+ _tmp3_ = NULL;
+ self->priv->_song_format_custom = (_tmp3_ = g_strdup ("%a - %t"), self->priv->_song_format_custom = (g_free (self->priv->_song_format_custom), NULL), _tmp3_);
+ }
+ return obj;
+}
+
+
static void xfmpc_preferences_class_init (XfmpcPreferencesClass * klass) {
xfmpc_preferences_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (XfmpcPreferencesPrivate));
G_OBJECT_CLASS (klass)->get_property = xfmpc_preferences_get_property;
G_OBJECT_CLASS (klass)->set_property = xfmpc_preferences_set_property;
+ G_OBJECT_CLASS (klass)->constructor = xfmpc_preferences_constructor;
G_OBJECT_CLASS (klass)->finalize = xfmpc_preferences_finalize;
g_object_class_install_property (G_OBJECT_CLASS (klass), XFMPC_PREFERENCES_LAST_WINDOW_POSX, g_param_spec_int ("last-window-posx", "last-window-posx", "last-window-posx", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), XFMPC_PREFERENCES_LAST_WINDOW_POSY, g_param_spec_int ("last-window-posy", "last-window-posy", "last-window-posy", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
diff --git a/src/song-dialog.c b/src/song-dialog.c
index 9b8cbaf..6e77758 100644
--- a/src/song-dialog.c
+++ b/src/song-dialog.c
@@ -63,7 +63,6 @@ static void xfmpc_song_dialog_cb_response (XfmpcSongDialog* self, gint response)
static void _xfmpc_song_dialog_cb_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
XfmpcSongDialog* xfmpc_song_dialog_new (gint song_id);
XfmpcSongDialog* xfmpc_song_dialog_construct (GType object_type, gint song_id);
-XfmpcSongDialog* xfmpc_song_dialog_new (gint song_id);
static void xfmpc_song_dialog_finalize (GObject* obj);
@@ -105,7 +104,7 @@ XfmpcSongDialog* xfmpc_song_dialog_construct (GType object_type, gint song_id) {
gtk_window_set_skip_taskbar_hint ((GtkWindow*) self, TRUE);
gtk_window_set_icon_name ((GtkWindow*) self, "stock_volume");
gtk_window_set_resizable ((GtkWindow*) self, FALSE);
- self->priv->mpdclient = xfmpc_mpdclient_get ();
+ self->priv->mpdclient = xfmpc_mpdclient_get_default ();
self->priv->song = xfmpc_mpdclient_get_song_info (self->priv->mpdclient, song_id);
gtk_window_set_title ((GtkWindow*) self, self->priv->song->title);
gtk_box_set_spacing ((GtkBox*) ((GtkDialog*) self)->vbox, 0);
diff --git a/src/statusbar.c b/src/statusbar.c
index 8b9601d..0ba443c 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -60,7 +60,6 @@ enum {
};
XfmpcStatusbar* xfmpc_statusbar_new (void);
XfmpcStatusbar* xfmpc_statusbar_construct (GType object_type);
-XfmpcStatusbar* xfmpc_statusbar_new (void);
void xfmpc_statusbar_set_text (XfmpcStatusbar* self, const char* value);
static GObject * xfmpc_statusbar_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
static void xfmpc_statusbar_finalize (GObject* obj);
diff --git a/src/xfmpc.h b/src/xfmpc.h
index 649658f..0a90328 100644
--- a/src/xfmpc.h
+++ b/src/xfmpc.h
@@ -267,7 +267,7 @@ GType xfmpc_preferences_get_type (void);
GType xfmpc_preferences_song_format_get_type (void);
XfmpcPreferences* xfmpc_preferences_new (void);
XfmpcPreferences* xfmpc_preferences_construct (GType object_type);
-XfmpcPreferences* xfmpc_preferences_get (void);
+XfmpcPreferences* xfmpc_preferences_get_default (void);
gint xfmpc_preferences_get_last_window_posx (XfmpcPreferences* self);
void xfmpc_preferences_set_last_window_posx (XfmpcPreferences* self, gint value);
gint xfmpc_preferences_get_last_window_posy (XfmpcPreferences* self);
More information about the Xfce4-commits
mailing list