diff -ru po/de.po /export/git/alsa/alsa-utils/po/de.po
--- a/po/de.po	2010-04-16 13:19:27.000000000 +0200
+++ b/po/de.po	2010-11-26 08:47:09.204870692 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: alsa-utils 1.0.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-16 13:19+0200\n"
+"POT-Creation-Date: 2009-05-24 19:56+0200\n"
 "PO-Revision-Date: 2009-05-24 12:34+0200\n"
 "Last-Translator: Clemens Ladisch <clemens@ladisch.de>\n"
 "Language-Team: German\n"
@@ -179,47 +179,47 @@
 msgstr "Dieses Gerät hat keine Regler."
 
 #. TRANSLATORS: playback on; one character
-#: alsamixer/mixer_display.c:537 alsamixer/mixer_display.c:542
+#: alsamixer/mixer_display.c:512 alsamixer/mixer_display.c:517
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: playback muted; one character
-#: alsamixer/mixer_display.c:539 alsamixer/mixer_display.c:543
+#: alsamixer/mixer_display.c:514 alsamixer/mixer_display.c:518
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: "left"; no more than two characters
-#: alsamixer/mixer_display.c:557
+#: alsamixer/mixer_display.c:532
 msgid "L"
 msgstr "L"
 
 #. TRANSLATORS: "right"; no more than two characters
-#: alsamixer/mixer_display.c:561
+#: alsamixer/mixer_display.c:536
 msgid "R"
 msgstr "R"
 
 #. TRANSLATORS: no more than eight characters
-#: alsamixer/mixer_display.c:563
+#: alsamixer/mixer_display.c:538
 msgid "CAPTURE"
 msgstr "AUFNAHME"
 
-#: alsamixer/mixer_display.c:613
+#: alsamixer/mixer_display.c:588
 msgid "Front"
 msgstr "Vorne"
 
-#: alsamixer/mixer_display.c:616
+#: alsamixer/mixer_display.c:591
 msgid "Rear"
 msgstr "Hinten"
 
-#: alsamixer/mixer_display.c:619 speaker-test/speaker-test.c:107
+#: alsamixer/mixer_display.c:594 speaker-test/speaker-test.c:106
 msgid "Center"
 msgstr "Mitte"
 
-#: alsamixer/mixer_display.c:622
+#: alsamixer/mixer_display.c:597
 msgid "Woofer"
 msgstr "Bass"
 
-#: alsamixer/mixer_display.c:625
+#: alsamixer/mixer_display.c:600
 msgid "Side"
 msgstr "Seiten"
 
@@ -364,24 +364,24 @@
 msgid "Cannot open file \"%s\"."
 msgstr "Fehler beim Öffnen der Datei \"%s\"."
 
-#: aplay/aplay.c:147
+#: aplay/aplay.c:139
 msgid "raw data"
 msgstr "Rohdaten"
 
-#: aplay/aplay.c:148
+#: aplay/aplay.c:140
 msgid "VOC"
 msgstr "VOC"
 
-#: aplay/aplay.c:150
+#: aplay/aplay.c:142
 msgid "WAVE"
 msgstr "WAVE"
 
-#: aplay/aplay.c:151
+#: aplay/aplay.c:143
 msgid "Sparc Audio"
 msgstr "Sparc-Audio"
 
-#: aplay/aplay.c:172
-#, fuzzy, c-format
+#: aplay/aplay.c:164
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "\n"
@@ -419,11 +419,6 @@
 "                        expression for validation is: coef * (buffer_size / "
 "2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
-"    --max-file-time=#   start another output file when the old file has "
-"recorded\n"
-"                        for this many seconds\n"
-"    --process-id-file   write the process ID here\n"
-"    --use-strftime      apply the strftime facility to the output file name\n"
 msgstr ""
 "Verwendung: %s [Option]... [Datei]...\n"
 "\n"
@@ -462,12 +457,12 @@
 "    --test-nowait       kein Warten auf Ringpuffer; beansprucht volle CPU-"
 "Leistung\n"
 
-#: aplay/aplay.c:211 speaker-test/speaker-test.c:750
+#: aplay/aplay.c:199 speaker-test/speaker-test.c:740
 #, c-format
 msgid "Recognized sample formats are:"
 msgstr "Unterstützte Sample-Formate:"
 
-#: aplay/aplay.c:217
+#: aplay/aplay.c:205
 #, c-format
 msgid ""
 "\n"
@@ -476,120 +471,115 @@
 "\n"
 "Nicht alle davon sind auf jeder Hardware verfügbar.\n"
 
-#: aplay/aplay.c:218
+#: aplay/aplay.c:206
 #, c-format
 msgid "The availabled format shortcuts are:\n"
 msgstr "Unterstütze Format-Abkürzungen:\n"
 
-#: aplay/aplay.c:219
+#: aplay/aplay.c:207
 #, c-format
 msgid "-f cd (16 bit little endian, 44100, stereo)\n"
 msgstr "-f cd (16 Bits, Little Endian, 44100 Hz, stereo)\n"
 
-#: aplay/aplay.c:220
+#: aplay/aplay.c:208
 #, c-format
 msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
 msgstr "-f cdr (16 Bits, Big Endian, 44100 Hz, stereo)\n"
 
-#: aplay/aplay.c:221
+#: aplay/aplay.c:209
 #, c-format
 msgid "-f dat (16 bit little endian, 48000, stereo)\n"
 msgstr "-f dat (16 Bits, Little Endian, 48000 Hz, stereo)\n"
 
-#: aplay/aplay.c:235
+#: aplay/aplay.c:223
 msgid "no soundcards found..."
 msgstr "keine Soundkarten gefunden ..."
 
-#: aplay/aplay.c:238
+#: aplay/aplay.c:226
 #, c-format
 msgid "**** List of %s Hardware Devices ****\n"
 msgstr "**** Liste der Hardware-Geräte (%s) ****\n"
 
-#: aplay/aplay.c:267
+#: aplay/aplay.c:255
 #, c-format
 msgid "card %i: %s [%s], device %i: %s [%s]\n"
 msgstr "Karte %i: %s [%s], Gerät %i: %s [%s]\n"
 
-#: aplay/aplay.c:273
+#: aplay/aplay.c:261
 #, c-format
 msgid "  Subdevices: %i/%i\n"
 msgstr "  Sub-Geräte: %i/%i\n"
 
-#: aplay/aplay.c:280
+#: aplay/aplay.c:268
 #, c-format
 msgid "  Subdevice #%i: %s\n"
 msgstr "  Sub-Gerät #%i: %s\n"
 
-#: aplay/aplay.c:356
+#: aplay/aplay.c:332
 #, c-format
 msgid "Aborted by signal %s...\n"
 msgstr "Abbruch durch Signal %s ...\n"
 
-#: aplay/aplay.c:467
+#: aplay/aplay.c:430
 msgid "command should be named either arecord or aplay"
 msgstr "Befehl sollte arecord oder aplay sein"
 
-#: aplay/aplay.c:506
+#: aplay/aplay.c:469
 #, c-format
 msgid "unrecognized file format %s"
 msgstr "unbekanntes Dateiformat %s"
 
-#: aplay/aplay.c:513
+#: aplay/aplay.c:476
 #, c-format
 msgid "value %i for channels is invalid"
 msgstr "Kanalanzahl %i ist ungültig"
 
-#: aplay/aplay.c:532
+#: aplay/aplay.c:495
 #, c-format
 msgid "wrong extended format '%s'"
 msgstr "erweitertes Format '%s' ist ungültig"
 
-#: aplay/aplay.c:543
+#: aplay/aplay.c:506
 #, c-format
 msgid "bad speed value %i"
 msgstr "ungültige Rate %i"
 
-#: aplay/aplay.c:638
+#: aplay/aplay.c:592
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Siehe `%s --help' für mehr Informationen.\n"
 
-#: aplay/aplay.c:654
+#: aplay/aplay.c:608
 #, c-format
 msgid "audio open error: %s"
 msgstr "Fehler beim Öffnen des Gerätes: %s"
 
-#: aplay/aplay.c:659
+#: aplay/aplay.c:613
 #, c-format
 msgid "info error: %s"
 msgstr "Fehler beim Lesen der Geräteinformationen: %s"
 
-#: aplay/aplay.c:666
+#: aplay/aplay.c:620
 #, c-format
 msgid "nonblock setting error: %s"
 msgstr "Fehler beim Setzen des nonblock-Modus: %s"
 
-#: aplay/aplay.c:676 aplay/aplay.c:800 aplay/aplay.c:1167
+#: aplay/aplay.c:630 aplay/aplay.c:737 aplay/aplay.c:1092
 msgid "not enough memory"
 msgstr "nicht genug Speicher"
 
-#: aplay/aplay.c:700
-#, fuzzy, c-format
-msgid "Cannot create process ID file %s: %s"
-msgstr "Kann WAV-Datei %s nicht öffnen\n"
-
-#: aplay/aplay.c:790
+#: aplay/aplay.c:727
 #, c-format
 msgid "read error (called from line %i)"
 msgstr "Lesefehler (aufgerufen von Zeile %i)"
 
-#: aplay/aplay.c:848
+#: aplay/aplay.c:785
 #, c-format
 msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 "unbekannte Länge des 'fmt '-Blocks (gelesen: %u, sollte mindestens %u sein)"
 
-#: aplay/aplay.c:858
+#: aplay/aplay.c:795
 #, c-format
 msgid ""
 "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"
@@ -597,198 +587,198 @@
 "unbekannte Länge des erweiterten 'fmt '-Blocks (gelesen: %u, sollte "
 "mindestens %u sein)"
 
-#: aplay/aplay.c:863
+#: aplay/aplay.c:800
 msgid "wrong format tag in extensible 'fmt ' chunk"
 msgstr "ungültiger Format-Wert im erweiterten 'fmt '-Block"
 
-#: aplay/aplay.c:870
+#: aplay/aplay.c:807
 #, c-format
 msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"
 msgstr ""
 "kann WAVE-Datei-Format 0x%04x nicht abspielen; ist weder PCM noch FLOAT"
 
-#: aplay/aplay.c:874
+#: aplay/aplay.c:811
 #, c-format
 msgid "can't play WAVE-files with %d tracks"
 msgstr "kann WAVE-Datei mit %d Kanälen nicht abspielen"
 
-#: aplay/aplay.c:882 aplay/aplay.c:982
+#: aplay/aplay.c:819 aplay/aplay.c:919
 #, c-format
 msgid "Warning: format is changed to U8\n"
 msgstr "Warnung: benutztes Format ist U8\n"
 
-#: aplay/aplay.c:888
+#: aplay/aplay.c:825
 #, c-format
 msgid "Warning: format is changed to S16_LE\n"
 msgstr "Warnung: benutztes Format ist S16_LE\n"
 
-#: aplay/aplay.c:896
+#: aplay/aplay.c:833
 #, c-format
 msgid "Warning: format is changed to S24_3LE\n"
 msgstr "Warnung: benutztes Format ist S24_3LE\n"
 
-#: aplay/aplay.c:902
+#: aplay/aplay.c:839
 #, c-format
 msgid "Warning: format is changed to S24_LE\n"
 msgstr "Warnung: benutztes Format ist S24_LE\n"
 
-#: aplay/aplay.c:906
+#: aplay/aplay.c:843
 #, c-format
 msgid ""
 " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
 msgstr ""
 "kann WAVE-Datei mit %d-Bit-Samples in %d Bytes (%d Kanäle) nicht abspielen"
 
-#: aplay/aplay.c:918
+#: aplay/aplay.c:855
 #, c-format
 msgid " can't play WAVE-files with sample %d bits wide"
 msgstr "kann WAVE-Datei mit %d-Bit-Samples nicht abspielen"
 
-#: aplay/aplay.c:976
+#: aplay/aplay.c:913
 #, c-format
 msgid "Warning: format is changed to MU_LAW\n"
 msgstr "Warnung: benutztes Format ist MU_LAW\n"
 
-#: aplay/aplay.c:988
+#: aplay/aplay.c:925
 #, c-format
 msgid "Warning: format is changed to S16_BE\n"
 msgstr "Warnung: benutztes Format ist S16_BE\n"
 
-#: aplay/aplay.c:1001 aplay/aplay.c:1843 aplay/aplay.c:1850 aplay/aplay.c:2372
-#: aplay/aplay.c:2384
+#: aplay/aplay.c:938 aplay/aplay.c:1768 aplay/aplay.c:1775 aplay/aplay.c:2297
+#: aplay/aplay.c:2309
 msgid "read error"
 msgstr "Lesefehler"
 
-#: aplay/aplay.c:1031
+#: aplay/aplay.c:957
 msgid "Broken configuration for this PCM: no configurations available"
 msgstr ""
 "ungültige Konfiguration für dieses Gerät: keine unterstützte Konfiguration"
 
-#: aplay/aplay.c:1048
+#: aplay/aplay.c:974
 msgid "Access type not available"
 msgstr "Zugriffs-Modus nicht unterstützt"
 
-#: aplay/aplay.c:1053
+#: aplay/aplay.c:979
 msgid "Sample format non available"
 msgstr "Sample-Format nicht unterstützt"
 
-#: aplay/aplay.c:1059
+#: aplay/aplay.c:984
 msgid "Channels count non available"
 msgstr "Kanalanzahl nicht unterstützt"
 
-#: aplay/aplay.c:1074
+#: aplay/aplay.c:999
 #, c-format
 msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
 msgstr ""
 "Warnung: Rate ist nicht exakt (angefordert: %i Hz, unterstützt: %i Hz)\n"
 
-#: aplay/aplay.c:1080
+#: aplay/aplay.c:1005
 #, c-format
 msgid "         please, try the plug plugin %s\n"
 msgstr "         probieren Sie bitte das plug-Plugin: %s\n"
 
-#: aplay/aplay.c:1116
+#: aplay/aplay.c:1041
 msgid "Unable to install hw params:"
 msgstr "Fehler beim Setzen der Hardware-Parameter:"
 
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1048
 #, c-format
 msgid "Can't use period equal to buffer size (%lu == %lu)"
 msgstr "Periode gleich der Puffer-Größe wird nicht unterstützt (%lu == %lu)"
 
-#: aplay/aplay.c:1154
+#: aplay/aplay.c:1079
 msgid "unable to install sw params:"
 msgstr "Fehler beim Setzen der Software-Parameter:"
 
-#: aplay/aplay.c:1229
+#: aplay/aplay.c:1154
 #, c-format
 msgid "status error: %s"
 msgstr "Status-Fehler: %s"
 
-#: aplay/aplay.c:1239 aplay/aplay.c:1250
+#: aplay/aplay.c:1164 aplay/aplay.c:1175
 #, c-format
 msgid "%s!!! (at least %.3f ms long)\n"
 msgstr "%s!!! (mindestens %.3f ms)\n"
 
-#: aplay/aplay.c:1240 aplay/aplay.c:1243 aplay/aplay.c:1251
+#: aplay/aplay.c:1165 aplay/aplay.c:1168 aplay/aplay.c:1176
 msgid "underrun"
 msgstr "Unterlauf"
 
-#: aplay/aplay.c:1240 aplay/aplay.c:1251
+#: aplay/aplay.c:1165 aplay/aplay.c:1176
 msgid "overrun"
 msgstr "Überlauf"
 
-#: aplay/aplay.c:1255
+#: aplay/aplay.c:1180
 #, c-format
 msgid "Status:\n"
 msgstr "Status:\n"
 
-#: aplay/aplay.c:1259
+#: aplay/aplay.c:1184
 #, c-format
 msgid "xrun: prepare error: %s"
 msgstr "Unter-/Überlauf: Fehler beim Re-Initialisieren des Gerätes: %s"
 
-#: aplay/aplay.c:1265
+#: aplay/aplay.c:1190
 #, c-format
 msgid "Status(DRAINING):\n"
 msgstr "Status (DRAINING):\n"
 
-#: aplay/aplay.c:1269
+#: aplay/aplay.c:1194
 #, c-format
 msgid "capture stream format change? attempting recover...\n"
 msgstr "Format-Wechsel der Aufnahme-Daten? Versuche Wiederherstellung ...\n"
 
-#: aplay/aplay.c:1271
+#: aplay/aplay.c:1196
 #, c-format
 msgid "xrun(DRAINING): prepare error: %s"
 msgstr "XRUN (DRAINING): Fehler beim Re-Initialisieren des Gerätes: %s"
 
-#: aplay/aplay.c:1278
+#: aplay/aplay.c:1203
 #, c-format
 msgid "Status(R/W):\n"
 msgstr "Status (R/W):\n"
 
-#: aplay/aplay.c:1281
+#: aplay/aplay.c:1206
 #, c-format
 msgid "read/write error, state = %s"
 msgstr "Lese-/Schreibfehler, Status = %s"
 
-#: aplay/aplay.c:1291
+#: aplay/aplay.c:1216
 #, c-format
 msgid "Suspended. Trying resume. "
 msgstr "Ruhezustand. Versuche, aufzuwecken. "
 
-#: aplay/aplay.c:1296
+#: aplay/aplay.c:1221
 #, c-format
 msgid "Failed. Restarting stream. "
 msgstr "Fehlgeschlagen. Re-Initialisierung. "
 
-#: aplay/aplay.c:1298
+#: aplay/aplay.c:1223
 #, c-format
 msgid "suspend: prepare error: %s"
 msgstr "Ruhezustand: Fehler beim Re-Initialisieren: %s"
 
-#: aplay/aplay.c:1303
+#: aplay/aplay.c:1228
 #, c-format
 msgid "Done.\n"
 msgstr "Fertig.\n"
 
-#: aplay/aplay.c:1325
+#: aplay/aplay.c:1250
 #, c-format
 msgid " !clip  "
 msgstr " !clip  "
 
-#: aplay/aplay.c:1472
+#: aplay/aplay.c:1397
 #, c-format
 msgid "Unsupported bit size %d.\n"
 msgstr "%d-Bit-Samples werden nicht unterstützt.\n"
 
-#: aplay/aplay.c:1506
+#: aplay/aplay.c:1431
 #, c-format
 msgid "Max peak (%li samples): 0x%08x "
 msgstr "Höchstwert (%li Samples): 0x%08x "
 
-#: aplay/aplay.c:1540
+#: aplay/aplay.c:1465
 #, c-format
 msgid ""
 "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %"
@@ -797,108 +787,108 @@
 "verdächtige Puffer-Position (total %li): avail = %li, delay = %li, buffer = %"
 "li\n"
 
-#: aplay/aplay.c:1603
+#: aplay/aplay.c:1528
 #, c-format
 msgid "write error: %s"
 msgstr "Schreibfehler: %s"
 
-#: aplay/aplay.c:1649
+#: aplay/aplay.c:1574
 #, c-format
 msgid "writev error: %s"
 msgstr "Vektor-Schreib-Fehler: %s"
 
-#: aplay/aplay.c:1692
+#: aplay/aplay.c:1617
 #, c-format
 msgid "read error: %s"
 msgstr "Lesefehler: %s"
 
-#: aplay/aplay.c:1735
+#: aplay/aplay.c:1660
 #, c-format
 msgid "readv error: %s"
 msgstr "Vektor-Lese-Fehler: %s"
 
-#: aplay/aplay.c:1783
+#: aplay/aplay.c:1708
 msgid "can't allocate buffer for silence"
 msgstr "nicht genug Speicher für Stille-Block"
 
-#: aplay/aplay.c:1792 aplay/aplay.c:2018 aplay/aplay.c:2023 aplay/aplay.c:2070
-#: aplay/aplay.c:2079 aplay/aplay.c:2086 aplay/aplay.c:2096 aplay/aplay.c:2102
-#: aplay/aplay.c:2174 aplay/aplay.c:2204 aplay/aplay.c:2218
+#: aplay/aplay.c:1717 aplay/aplay.c:1943 aplay/aplay.c:1948 aplay/aplay.c:1995
+#: aplay/aplay.c:2004 aplay/aplay.c:2011 aplay/aplay.c:2021 aplay/aplay.c:2027
+#: aplay/aplay.c:2099 aplay/aplay.c:2129 aplay/aplay.c:2143
 msgid "write error"
 msgstr "Schreibfehler"
 
-#: aplay/aplay.c:1805
+#: aplay/aplay.c:1730
 #, c-format
 msgid "voc_pcm_flush - silence error"
 msgstr "voc_pcm_flush - Fehler in set_silence"
 
-#: aplay/aplay.c:1808
+#: aplay/aplay.c:1733
 msgid "voc_pcm_flush error"
 msgstr "Schreibfehler"
 
-#: aplay/aplay.c:1834
+#: aplay/aplay.c:1759
 msgid "malloc error"
 msgstr "nicht genug Speicher"
 
-#: aplay/aplay.c:1838
+#: aplay/aplay.c:1763
 #, c-format
 msgid "Playing Creative Labs Channel file '%s'...\n"
 msgstr "Spiele Creative Labs Channel-Datei '%s'...\n"
 
-#: aplay/aplay.c:1906 aplay/aplay.c:1998
+#: aplay/aplay.c:1831 aplay/aplay.c:1923
 msgid "can't play packed .voc files"
 msgstr "kann komprimierte .voc-Dateien nicht abspielen"
 
-#: aplay/aplay.c:1958
+#: aplay/aplay.c:1883
 #, c-format
 msgid "can't play loops; %s isn't seekable\n"
 msgstr ""
 "kann Schleife nicht abspielen; Dateiposition in %s ist nicht änderbar\n"
 
-#: aplay/aplay.c:2007
+#: aplay/aplay.c:1932
 #, c-format
 msgid "unknown blocktype %d. terminate."
 msgstr "Unbekannter Block-Typ %d. Abbruch."
 
-#: aplay/aplay.c:2138
+#: aplay/aplay.c:2063
 #, c-format
 msgid "Wave doesn't support %s format..."
 msgstr "Format %s wird in WAVE nicht unterstützt ..."
 
-#: aplay/aplay.c:2198
+#: aplay/aplay.c:2123
 #, c-format
 msgid "Sparc Audio doesn't support %s format..."
 msgstr "Format %s wird in Sparc-Audio nicht unterstützt ..."
 
-#: aplay/aplay.c:2279
+#: aplay/aplay.c:2204
 msgid "Playing"
 msgstr "Wiedergabe:"
 
-#: aplay/aplay.c:2279
+#: aplay/aplay.c:2204
 msgid "Recording"
 msgstr "Aufnahme:"
 
-#: aplay/aplay.c:2283
+#: aplay/aplay.c:2208
 #, c-format
 msgid "Rate %d Hz, "
 msgstr "Rate: %d Hz, "
 
-#: aplay/aplay.c:2285
+#: aplay/aplay.c:2210
 #, c-format
 msgid "Mono"
 msgstr "mono"
 
-#: aplay/aplay.c:2287
+#: aplay/aplay.c:2212
 #, c-format
 msgid "Stereo"
 msgstr "stereo"
 
-#: aplay/aplay.c:2289
+#: aplay/aplay.c:2214
 #, c-format
 msgid "Channels %i"
 msgstr "%i Kanäle"
 
-#: aplay/aplay.c:2798 aplay/aplay.c:2851
+#: aplay/aplay.c:2573 aplay/aplay.c:2626
 #, c-format
 msgid "You need to specify %d files"
 msgstr "Es werden %d Dateien benötigt."
@@ -1009,47 +999,47 @@
 msgid "kernel"
 msgstr "Kernel"
 
-#: seq/aconnect/aconnect.c:307
+#: seq/aconnect/aconnect.c:326
 #, c-format
 msgid "can't open sequencer\n"
 msgstr "Fehler beim Öffnen des Sequenzers\n"
 
-#: seq/aconnect/aconnect.c:335
+#: seq/aconnect/aconnect.c:354
 #, c-format
 msgid "can't get client id\n"
 msgstr "Fehler beim Lesen der Client-ID\n"
 
-#: seq/aconnect/aconnect.c:342
+#: seq/aconnect/aconnect.c:361
 #, c-format
 msgid "can't set client info\n"
 msgstr "Fehler beim Setzen des Client-Namens\n"
 
-#: seq/aconnect/aconnect.c:349
+#: seq/aconnect/aconnect.c:368
 #, c-format
 msgid "invalid sender address %s\n"
 msgstr "ungültige Sender-Adresse %s\n"
 
-#: seq/aconnect/aconnect.c:354 seq/aseqnet/aseqnet.c:290
+#: seq/aconnect/aconnect.c:373 seq/aseqnet/aseqnet.c:290
 #, c-format
 msgid "invalid destination address %s\n"
 msgstr "ungültige Ziel-Adresse %s\n"
 
-#: seq/aconnect/aconnect.c:368
+#: seq/aconnect/aconnect.c:387
 #, c-format
 msgid "No subscription is found\n"
 msgstr "keine Verbindung gefunden\n"
 
-#: seq/aconnect/aconnect.c:373
+#: seq/aconnect/aconnect.c:392
 #, c-format
 msgid "Disconnection failed (%s)\n"
 msgstr "Verbindungs-Trennung fehlgeschlagen (%s)\n"
 
-#: seq/aconnect/aconnect.c:379
+#: seq/aconnect/aconnect.c:398
 #, c-format
 msgid "Connection is already subscribed\n"
 msgstr "Verbindung ist bereits vorhanden\n"
 
-#: seq/aconnect/aconnect.c:384
+#: seq/aconnect/aconnect.c:403
 #, c-format
 msgid "Connection failed (%s)\n"
 msgstr "Verbindung fehlgeschlagen (%s)\n"
@@ -1179,262 +1169,262 @@
 msgid "disconnected\n"
 msgstr "Verbindung getrennt\n"
 
-#: speaker-test/speaker-test.c:103
+#: speaker-test/speaker-test.c:102
 msgid "Front Left"
 msgstr "Vorne links"
 
-#: speaker-test/speaker-test.c:104
+#: speaker-test/speaker-test.c:103
 msgid "Front Right"
 msgstr "Vorne rechts"
 
-#: speaker-test/speaker-test.c:105
+#: speaker-test/speaker-test.c:104
 msgid "Rear Left"
 msgstr "Hinten links"
 
-#: speaker-test/speaker-test.c:106
+#: speaker-test/speaker-test.c:105
 msgid "Rear Right"
 msgstr "Hinten rechts"
 
-#: speaker-test/speaker-test.c:108
+#: speaker-test/speaker-test.c:107
 msgid "LFE"
 msgstr "Bass"
 
-#: speaker-test/speaker-test.c:109
+#: speaker-test/speaker-test.c:108
 msgid "Side Left"
 msgstr "Seitlich links"
 
-#: speaker-test/speaker-test.c:110
+#: speaker-test/speaker-test.c:109
 msgid "Side Right"
 msgstr "Seitlich rechts"
 
-#: speaker-test/speaker-test.c:111
+#: speaker-test/speaker-test.c:110
 msgid "Channel 9"
 msgstr "Kanal 9"
 
-#: speaker-test/speaker-test.c:112
+#: speaker-test/speaker-test.c:111
 msgid "Channel 10"
 msgstr "Kanal 10"
 
-#: speaker-test/speaker-test.c:113
+#: speaker-test/speaker-test.c:112
 msgid "Channel 11"
 msgstr "Kanal 11"
 
-#: speaker-test/speaker-test.c:114
+#: speaker-test/speaker-test.c:113
 msgid "Channel 12"
 msgstr "Kanal 12"
 
-#: speaker-test/speaker-test.c:115
+#: speaker-test/speaker-test.c:114
 msgid "Channel 13"
 msgstr "Kanal 13"
 
-#: speaker-test/speaker-test.c:116
+#: speaker-test/speaker-test.c:115
 msgid "Channel 14"
 msgstr "Kanal 14"
 
-#: speaker-test/speaker-test.c:117
+#: speaker-test/speaker-test.c:116
 msgid "Channel 15"
 msgstr "Kanal 15"
 
-#: speaker-test/speaker-test.c:118
+#: speaker-test/speaker-test.c:117
 msgid "Channel 16"
 msgstr "Kanal 16"
 
-#: speaker-test/speaker-test.c:317
+#: speaker-test/speaker-test.c:307
 #, c-format
 msgid "Broken configuration for playback: no configurations available: %s\n"
 msgstr "Ungültige Konfiguration: keine unterstützte Konfiguration: %s\n"
 
-#: speaker-test/speaker-test.c:324
+#: speaker-test/speaker-test.c:314
 #, c-format
 msgid "Access type not available for playback: %s\n"
 msgstr "Zugriffsmodus nicht unterstützt: %s\n"
 
-#: speaker-test/speaker-test.c:331
+#: speaker-test/speaker-test.c:321
 #, c-format
 msgid "Sample format not available for playback: %s\n"
 msgstr "Sample-Format nicht unterstützt: %s\n"
 
-#: speaker-test/speaker-test.c:338
+#: speaker-test/speaker-test.c:328
 #, c-format
 msgid "Channels count (%i) not available for playbacks: %s\n"
 msgstr "Kanal-Anzahl %i nicht unterstützt: %s\n"
 
-#: speaker-test/speaker-test.c:346
+#: speaker-test/speaker-test.c:336
 #, c-format
 msgid "Rate %iHz not available for playback: %s\n"
 msgstr "Rate %i Hz nicht unterstützt: %s\n"
 
-#: speaker-test/speaker-test.c:351
+#: speaker-test/speaker-test.c:341
 #, c-format
 msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n"
 msgstr ""
 "Rate ist nicht exakt (angefordert: %i Hz, unterstützt: %i Hz, Fehlercode %"
 "d)\n"
 
-#: speaker-test/speaker-test.c:355
+#: speaker-test/speaker-test.c:345
 #, c-format
 msgid "Rate set to %iHz (requested %iHz)\n"
 msgstr "Rate ist %i Hz (angefordert: %i Hz)\n"
 
-#: speaker-test/speaker-test.c:361
+#: speaker-test/speaker-test.c:351
 #, c-format
 msgid "Buffer size range from %lu to %lu\n"
 msgstr "Puffergröße von %lu bis %lu\n"
 
-#: speaker-test/speaker-test.c:362
+#: speaker-test/speaker-test.c:352
 #, c-format
 msgid "Period size range from %lu to %lu\n"
 msgstr "Periodengröße von %lu bis %lu\n"
 
-#: speaker-test/speaker-test.c:364
+#: speaker-test/speaker-test.c:354
 #, c-format
 msgid "Requested period time %u us\n"
 msgstr "Angeforderte Periodenzeit %u µs\n"
 
-#: speaker-test/speaker-test.c:367
+#: speaker-test/speaker-test.c:357
 #, c-format
 msgid "Unable to set period time %u us for playback: %s\n"
 msgstr "Fehler beim Setzen der Periodenzeit %u µs: %s\n"
 
-#: speaker-test/speaker-test.c:373
+#: speaker-test/speaker-test.c:363
 #, c-format
 msgid "Requested buffer time %u us\n"
 msgstr "Angeforderte Pufferlänge %u µs\n"
 
-#: speaker-test/speaker-test.c:376
+#: speaker-test/speaker-test.c:366
 #, c-format
 msgid "Unable to set buffer time %u us for playback: %s\n"
 msgstr "Fehler beim Setzen der Pufferlänge %u µs: %s\n"
 
-#: speaker-test/speaker-test.c:385
+#: speaker-test/speaker-test.c:375
 #, c-format
 msgid "Using max buffer size %lu\n"
 msgstr "Verwende maximale Puffergröße %lu\n"
 
-#: speaker-test/speaker-test.c:388
+#: speaker-test/speaker-test.c:378
 #, c-format
 msgid "Unable to set buffer size %lu for playback: %s\n"
 msgstr "Fehler beim Setzen der Puffergröße %lu: %s\n"
 
-#: speaker-test/speaker-test.c:394
+#: speaker-test/speaker-test.c:384
 #, c-format
 msgid "Periods = %u\n"
 msgstr "Perioden = %u\n"
 
-#: speaker-test/speaker-test.c:397
+#: speaker-test/speaker-test.c:387
 #, c-format
 msgid "Unable to set nperiods %u for playback: %s\n"
 msgstr "Fehler beim Setzen der Periodenanzahl %u: %s\n"
 
-#: speaker-test/speaker-test.c:406
+#: speaker-test/speaker-test.c:396
 #, c-format
 msgid "Unable to set hw params for playback: %s\n"
 msgstr "Fehler beim Setzen der Hardware-Parameter: %s\n"
 
-#: speaker-test/speaker-test.c:412
+#: speaker-test/speaker-test.c:402
 #, c-format
 msgid "was set period_size = %lu\n"
 msgstr "gesetzt: period_size = %lu\n"
 
-#: speaker-test/speaker-test.c:413
+#: speaker-test/speaker-test.c:403
 #, c-format
 msgid "was set buffer_size = %lu\n"
 msgstr "gesetzt: buffer_size = %lu\n"
 
-#: speaker-test/speaker-test.c:415
+#: speaker-test/speaker-test.c:405
 #, c-format
 msgid "buffer to small, could not use\n"
 msgstr "Puffer zu klein, kann nicht benutzt werden\n"
 
-#: speaker-test/speaker-test.c:428
+#: speaker-test/speaker-test.c:418
 #, c-format
 msgid "Unable to determine current swparams for playback: %s\n"
 msgstr "Fehler beim Lesen der Software-Parameter: %s\n"
 
-#: speaker-test/speaker-test.c:435
+#: speaker-test/speaker-test.c:425
 #, c-format
 msgid "Unable to set start threshold mode for playback: %s\n"
 msgstr "Fehler beim Setzen des Start-Schwellenwertes: %s\n"
 
-#: speaker-test/speaker-test.c:442
+#: speaker-test/speaker-test.c:432
 #, c-format
 msgid "Unable to set avail min for playback: %s\n"
 msgstr "Fehler beim Setzen des Mindest-verfügbar-Wertes: %s\n"
 
-#: speaker-test/speaker-test.c:449
+#: speaker-test/speaker-test.c:439
 #, c-format
 msgid "Unable to set sw params for playback: %s\n"
 msgstr "Fehler beim Setzen der Software-Parameter: %s\n"
 
-#: speaker-test/speaker-test.c:464
+#: speaker-test/speaker-test.c:454
 #, c-format
 msgid "Can't recovery from underrun, prepare failed: %s\n"
 msgstr ""
 "Fehler bei Unterlauf-Behandlung, Re-Initialisierung fehlgeschlagen: %s\n"
 
-#: speaker-test/speaker-test.c:475
+#: speaker-test/speaker-test.c:465
 #, c-format
 msgid "Can't recovery from suspend, prepare failed: %s\n"
 msgstr ""
 "Fehler beim Aufwachen aus dem Ruhezustand, Re-Initialisierung "
 "fehlgeschlagen: %s\n"
 
-#: speaker-test/speaker-test.c:539 speaker-test/speaker-test.c:954
+#: speaker-test/speaker-test.c:529 speaker-test/speaker-test.c:926
 #, c-format
 msgid "No enough memory\n"
 msgstr "Nicht genug Speicher\n"
 
-#: speaker-test/speaker-test.c:544
+#: speaker-test/speaker-test.c:534
 #, c-format
 msgid "Cannot open WAV file %s\n"
 msgstr "Kann WAV-Datei %s nicht öffnen\n"
 
-#: speaker-test/speaker-test.c:548 speaker-test/speaker-test.c:577
+#: speaker-test/speaker-test.c:538 speaker-test/speaker-test.c:567
 #, c-format
 msgid "Invalid WAV file %s\n"
 msgstr "Ungültige WAV-Datei %s\n"
 
-#: speaker-test/speaker-test.c:553
+#: speaker-test/speaker-test.c:543
 #, c-format
 msgid "Not a WAV file: %s\n"
 msgstr "Keine WAV-Datei: %s\n"
 
-#: speaker-test/speaker-test.c:557
+#: speaker-test/speaker-test.c:547
 #, c-format
 msgid "Unsupported WAV format %d for %s\n"
 msgstr "Nicht unterstütztes WAV-Format %d in %s\n"
 
-#: speaker-test/speaker-test.c:562
+#: speaker-test/speaker-test.c:552
 #, c-format
 msgid "%s is not a mono stream (%d channels)\n"
 msgstr "%s ist keine Mono-Datei (%d Kanäle)\n"
 
-#: speaker-test/speaker-test.c:567
+#: speaker-test/speaker-test.c:557
 #, c-format
 msgid "Sample rate doesn't match (%d) for %s\n"
 msgstr "Sample-Rate (%d) stimmt nicht überein in %s\n"
 
-#: speaker-test/speaker-test.c:572
+#: speaker-test/speaker-test.c:562
 #, c-format
 msgid "Unsupported sample format bits %d for %s\n"
 msgstr "Nicht unterstütztes Sample-Format mit %d Bits in %s\n"
 
-#: speaker-test/speaker-test.c:622
+#: speaker-test/speaker-test.c:612
 #, c-format
 msgid "Undefined channel %d\n"
 msgstr "Kanal %d nicht definiert\n"
 
-#: speaker-test/speaker-test.c:673
+#: speaker-test/speaker-test.c:663
 #, c-format
 msgid "Write error: %d,%s\n"
 msgstr "Schreibfehler: %d, %s\n"
 
-#: speaker-test/speaker-test.c:675
+#: speaker-test/speaker-test.c:665
 #, c-format
 msgid "xrun_recovery failed: %d,%s\n"
 msgstr "xrun_recovery fehlgeschlagen: %d, %s\n"
 
-#: speaker-test/speaker-test.c:734
+#: speaker-test/speaker-test.c:723
 #, c-format
 msgid ""
 "Usage: speaker-test [OPTION]... \n"
@@ -1471,72 +1461,72 @@
 "-W,--wavdir     benutze Verzeichnis mit darin enthaltenen WAV-Dateien\n"
 "\n"
 
-#: speaker-test/speaker-test.c:852
+#: speaker-test/speaker-test.c:835
 #, c-format
 msgid "Invalid number of periods %d\n"
 msgstr "Ungültige Periodenanzahl %d\n"
 
-#: speaker-test/speaker-test.c:866 speaker-test/speaker-test.c:870
+#: speaker-test/speaker-test.c:849 speaker-test/speaker-test.c:853
 #, c-format
 msgid "Invalid test type %s\n"
 msgstr "Ungültiger Test-Typ %s\n"
 
-#: speaker-test/speaker-test.c:882
+#: speaker-test/speaker-test.c:865
 #, c-format
 msgid "Invalid parameter for -s option.\n"
 msgstr "Ungültiger Wert für Option -s\n"
 
-#: speaker-test/speaker-test.c:896
+#: speaker-test/speaker-test.c:876
 #, c-format
 msgid "Unknown option '%c'\n"
 msgstr "Unbekannte Options '%c'\n"
 
-#: speaker-test/speaker-test.c:910
+#: speaker-test/speaker-test.c:890
 #, c-format
 msgid "Playback device is %s\n"
 msgstr "Wiedergabe-Gerät ist %s\n"
 
-#: speaker-test/speaker-test.c:911
+#: speaker-test/speaker-test.c:891
 #, c-format
 msgid "Stream parameters are %iHz, %s, %i channels\n"
 msgstr "Stream-Parameter sind %i Hz, %s, %i Kanäle\n"
 
-#: speaker-test/speaker-test.c:914
+#: speaker-test/speaker-test.c:894
 #, c-format
 msgid "Using 16 octaves of pink noise\n"
 msgstr "Verwende 16 Oktaven rosa Rauschen\n"
 
-#: speaker-test/speaker-test.c:917
+#: speaker-test/speaker-test.c:897
 #, c-format
 msgid "Sine wave rate is %.4fHz\n"
 msgstr "Sinuswelle mit Frequenz %.4f Hz\n"
 
-#: speaker-test/speaker-test.c:920
+#: speaker-test/speaker-test.c:900
 #, c-format
 msgid "WAV file(s)\n"
 msgstr "WAV-Datei(en)\n"
 
-#: speaker-test/speaker-test.c:926
+#: speaker-test/speaker-test.c:906
 #, c-format
 msgid "Playback open error: %d,%s\n"
 msgstr "Fehler beim Öffnen des Gerätes: %d, %s\n"
 
-#: speaker-test/speaker-test.c:931
+#: speaker-test/speaker-test.c:911
 #, c-format
 msgid "Setting of hwparams failed: %s\n"
 msgstr "Fehler beim Setzen der Hardware-Parameter: %s\n"
 
-#: speaker-test/speaker-test.c:936
+#: speaker-test/speaker-test.c:916
 #, c-format
 msgid "Setting of swparams failed: %s\n"
 msgstr "Fehler beim Setzen der Software-Parameter: %s\n"
 
-#: speaker-test/speaker-test.c:985 speaker-test/speaker-test.c:1007
+#: speaker-test/speaker-test.c:957 speaker-test/speaker-test.c:979
 #, c-format
 msgid "Transfer failed: %s\n"
 msgstr "Schreibfehler: %s\n"
 
-#: speaker-test/speaker-test.c:995
+#: speaker-test/speaker-test.c:967
 #, c-format
 msgid "Time per period = %lf\n"
 msgstr "Zeit pro Periode = %lf\n"
diff -ru po/ja.po /export/git/alsa/alsa-utils/po/ja.po
--- a/po/ja.po	2010-04-16 13:19:26.000000000 +0200
+++ b/po/ja.po	2009-05-27 15:09:03.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: alsa-utils 1.0.9a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-16 13:19+0200\n"
+"POT-Creation-Date: 2009-05-24 19:56+0200\n"
 "PO-Revision-Date: 2009-05-27 15:08+0200\n"
 "Last-Translator: Takashi Iwai <tiwai@suse.de>\n"
 "Language-Team: Japanese\n"
@@ -180,47 +180,47 @@
 msgstr "このカードには制御可能なミキサーがありません"
 
 #. TRANSLATORS: playback on; one character
-#: alsamixer/mixer_display.c:537 alsamixer/mixer_display.c:542
+#: alsamixer/mixer_display.c:512 alsamixer/mixer_display.c:517
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: playback muted; one character
-#: alsamixer/mixer_display.c:539 alsamixer/mixer_display.c:543
+#: alsamixer/mixer_display.c:514 alsamixer/mixer_display.c:518
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: "left"; no more than two characters
-#: alsamixer/mixer_display.c:557
+#: alsamixer/mixer_display.c:532
 msgid "L"
 msgstr ""
 
 #. TRANSLATORS: "right"; no more than two characters
-#: alsamixer/mixer_display.c:561
+#: alsamixer/mixer_display.c:536
 msgid "R"
 msgstr ""
 
 #. TRANSLATORS: no more than eight characters
-#: alsamixer/mixer_display.c:563
+#: alsamixer/mixer_display.c:538
 msgid "CAPTURE"
 msgstr "録音"
 
-#: alsamixer/mixer_display.c:613
+#: alsamixer/mixer_display.c:588
 msgid "Front"
 msgstr "フロント"
 
-#: alsamixer/mixer_display.c:616
+#: alsamixer/mixer_display.c:591
 msgid "Rear"
 msgstr "リア"
 
-#: alsamixer/mixer_display.c:619 speaker-test/speaker-test.c:107
+#: alsamixer/mixer_display.c:594 speaker-test/speaker-test.c:106
 msgid "Center"
 msgstr "センター"
 
-#: alsamixer/mixer_display.c:622
+#: alsamixer/mixer_display.c:597
 msgid "Woofer"
 msgstr "低音"
 
-#: alsamixer/mixer_display.c:625
+#: alsamixer/mixer_display.c:600
 msgid "Side"
 msgstr "サイド"
 
@@ -366,24 +366,24 @@
 msgid "Cannot open file \"%s\"."
 msgstr "\"%s\"をオープンできません"
 
-#: aplay/aplay.c:147
+#: aplay/aplay.c:139
 msgid "raw data"
 msgstr "raw データ"
 
-#: aplay/aplay.c:148
+#: aplay/aplay.c:140
 msgid "VOC"
 msgstr "VOC"
 
-#: aplay/aplay.c:150
+#: aplay/aplay.c:142
 msgid "WAVE"
 msgstr "WAVE"
 
-#: aplay/aplay.c:151
+#: aplay/aplay.c:143
 msgid "Sparc Audio"
 msgstr "Sparc オーディオ"
 
-#: aplay/aplay.c:172
-#, fuzzy, c-format
+#: aplay/aplay.c:164
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
 "\n"
@@ -421,11 +421,6 @@
 "                        expression for validation is: coef * (buffer_size / "
 "2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
-"    --max-file-time=#   start another output file when the old file has "
-"recorded\n"
-"                        for this many seconds\n"
-"    --process-id-file   write the process ID here\n"
-"    --use-strftime      apply the strftime facility to the output file name\n"
 msgstr ""
 "使用法: %s [オプション]... [ファイル]...\n"
 "\n"
@@ -462,12 +457,12 @@
 "                        テスト範囲: coef * (buffer_size / 2)\n"
 "    --test-nowait       リングバッファのウエイトを禁止 - 注意:高CPU負荷\n"
 
-#: aplay/aplay.c:211 speaker-test/speaker-test.c:750
+#: aplay/aplay.c:199 speaker-test/speaker-test.c:740
 #, c-format
 msgid "Recognized sample formats are:"
 msgstr "認識されるサンプルフォーマット:"
 
-#: aplay/aplay.c:217
+#: aplay/aplay.c:205
 #, c-format
 msgid ""
 "\n"
@@ -476,159 +471,154 @@
 "\n"
 "これらのいくつかは指定のハードウェアで使用不可能な場合があります\n"
 
-#: aplay/aplay.c:218
+#: aplay/aplay.c:206
 #, c-format
 msgid "The availabled format shortcuts are:\n"
 msgstr "可能なフォーマットの省略形:\n"
 
-#: aplay/aplay.c:219
+#: aplay/aplay.c:207
 #, c-format
 msgid "-f cd (16 bit little endian, 44100, stereo)\n"
 msgstr "-f cd (16 ビット、リトルエンディアン、44100、ステレオ)\n"
 
-#: aplay/aplay.c:220
+#: aplay/aplay.c:208
 #, c-format
 msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
 msgstr "-f cdr (16 ビット、ビッグエンディアン、44100、ステレオ)\n"
 
-#: aplay/aplay.c:221
+#: aplay/aplay.c:209
 #, c-format
 msgid "-f dat (16 bit little endian, 48000, stereo)\n"
 msgstr "-f dat (16 ビット、リトルエンディアン、48000、ステレオ)\n"
 
-#: aplay/aplay.c:235
+#: aplay/aplay.c:223
 msgid "no soundcards found..."
 msgstr "サウンドカードが見つかりません..."
 
-#: aplay/aplay.c:238
+#: aplay/aplay.c:226
 #, c-format
 msgid "**** List of %s Hardware Devices ****\n"
 msgstr "**** ハードウェアデバイス %s のリスト ****\n"
 
-#: aplay/aplay.c:267
+#: aplay/aplay.c:255
 #, c-format
 msgid "card %i: %s [%s], device %i: %s [%s]\n"
 msgstr "カード %i: %s [%s], デバイス %i: %s [%s]\n"
 
-#: aplay/aplay.c:273
+#: aplay/aplay.c:261
 #, c-format
 msgid "  Subdevices: %i/%i\n"
 msgstr "  サブデバイス: %i/%i\n"
 
-#: aplay/aplay.c:280
+#: aplay/aplay.c:268
 #, c-format
 msgid "  Subdevice #%i: %s\n"
 msgstr "  サブデバイス #%i: %s\n"
 
-#: aplay/aplay.c:356
+#: aplay/aplay.c:332
 #, c-format
 msgid "Aborted by signal %s...\n"
 msgstr "シグナル %s で中断...\n"
 
-#: aplay/aplay.c:467
+#: aplay/aplay.c:430
 msgid "command should be named either arecord or aplay"
 msgstr "arecord または aplay コマンドのみ可能"
 
-#: aplay/aplay.c:506
+#: aplay/aplay.c:469
 #, c-format
 msgid "unrecognized file format %s"
 msgstr "不正なファイルフォーマット %s"
 
-#: aplay/aplay.c:513
+#: aplay/aplay.c:476
 #, c-format
 msgid "value %i for channels is invalid"
 msgstr "不正なチャネル数 %i"
 
-#: aplay/aplay.c:532
+#: aplay/aplay.c:495
 #, c-format
 msgid "wrong extended format '%s'"
 msgstr "不正な拡張フォーマット '%s'"
 
-#: aplay/aplay.c:543
+#: aplay/aplay.c:506
 #, c-format
 msgid "bad speed value %i"
 msgstr "不正なレート値 %i"
 
-#: aplay/aplay.c:638
+#: aplay/aplay.c:592
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "より詳しい情報は「%s --help」を実行してください\n"
 
-#: aplay/aplay.c:654
+#: aplay/aplay.c:608
 #, c-format
 msgid "audio open error: %s"
 msgstr ""
 
-#: aplay/aplay.c:659
+#: aplay/aplay.c:613
 #, c-format
 msgid "info error: %s"
 msgstr ""
 
-#: aplay/aplay.c:666
+#: aplay/aplay.c:620
 #, c-format
 msgid "nonblock setting error: %s"
 msgstr ""
 
-#: aplay/aplay.c:676 aplay/aplay.c:800 aplay/aplay.c:1167
+#: aplay/aplay.c:630 aplay/aplay.c:737 aplay/aplay.c:1092
 msgid "not enough memory"
 msgstr "メモリが足りません"
 
-#: aplay/aplay.c:700
-#, fuzzy, c-format
-msgid "Cannot create process ID file %s: %s"
-msgstr "WAVファイルがオープンできません: %s\n"
-
-#: aplay/aplay.c:790
+#: aplay/aplay.c:727
 #, c-format
 msgid "read error (called from line %i)"
 msgstr "リードエラー (%i 行)"
 
-#: aplay/aplay.c:848
+#: aplay/aplay.c:785
 #, c-format
 msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 
-#: aplay/aplay.c:858
+#: aplay/aplay.c:795
 #, c-format
 msgid ""
 "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 
-#: aplay/aplay.c:863
+#: aplay/aplay.c:800
 msgid "wrong format tag in extensible 'fmt ' chunk"
 msgstr ""
 
-#: aplay/aplay.c:870
+#: aplay/aplay.c:807
 #, c-format
 msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"
 msgstr ""
 
-#: aplay/aplay.c:874
+#: aplay/aplay.c:811
 #, c-format
 msgid "can't play WAVE-files with %d tracks"
 msgstr "%d トラックを含む WAVE ファイルは再生できません"
 
-#: aplay/aplay.c:882 aplay/aplay.c:982
+#: aplay/aplay.c:819 aplay/aplay.c:919
 #, c-format
 msgid "Warning: format is changed to U8\n"
 msgstr "警告: フォーマットは U8 に変更されます\n"
 
-#: aplay/aplay.c:888
+#: aplay/aplay.c:825
 #, c-format
 msgid "Warning: format is changed to S16_LE\n"
 msgstr "警告: フォーマットは S16_LE に変更されます\n"
 
-#: aplay/aplay.c:896
+#: aplay/aplay.c:833
 #, c-format
 msgid "Warning: format is changed to S24_3LE\n"
 msgstr "警告: フォーマットは S24_3LE に変更されます\n"
 
-#: aplay/aplay.c:902
+#: aplay/aplay.c:839
 #, c-format
 msgid "Warning: format is changed to S24_LE\n"
 msgstr "警告: フォーマットは S24_LE に変更されます\n"
 
-#: aplay/aplay.c:906
+#: aplay/aplay.c:843
 #, c-format
 msgid ""
 " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
@@ -636,261 +626,261 @@
 "%2$d バイト長 %1$d サンプルビット (%3$d チャネル) の WAVE ファイルは再生でき"
 "ません"
 
-#: aplay/aplay.c:918
+#: aplay/aplay.c:855
 #, c-format
 msgid " can't play WAVE-files with sample %d bits wide"
 msgstr "%d ビット長のサンプルの WAVE ファイルは再生できません"
 
-#: aplay/aplay.c:976
+#: aplay/aplay.c:913
 #, c-format
 msgid "Warning: format is changed to MU_LAW\n"
 msgstr "警告: フォーマットは MU_LAW に変更されます\n"
 
-#: aplay/aplay.c:988
+#: aplay/aplay.c:925
 #, c-format
 msgid "Warning: format is changed to S16_BE\n"
 msgstr "警告: フォーマットは S16_BE に変更されます\n"
 
-#: aplay/aplay.c:1001 aplay/aplay.c:1843 aplay/aplay.c:1850 aplay/aplay.c:2372
-#: aplay/aplay.c:2384
+#: aplay/aplay.c:938 aplay/aplay.c:1768 aplay/aplay.c:1775 aplay/aplay.c:2297
+#: aplay/aplay.c:2309
 msgid "read error"
 msgstr "リードエラー"
 
-#: aplay/aplay.c:1031
+#: aplay/aplay.c:957
 msgid "Broken configuration for this PCM: no configurations available"
 msgstr "指定の PCM を使用できません: 設定がありません"
 
-#: aplay/aplay.c:1048
+#: aplay/aplay.c:974
 msgid "Access type not available"
 msgstr "アクセスタイプが使用不可能"
 
-#: aplay/aplay.c:1053
+#: aplay/aplay.c:979
 msgid "Sample format non available"
 msgstr "サンプルフォーマットが使用不可能"
 
-#: aplay/aplay.c:1059
+#: aplay/aplay.c:984
 msgid "Channels count non available"
 msgstr "チャネル数が使用不可能"
 
-#: aplay/aplay.c:1074
+#: aplay/aplay.c:999
 #, c-format
 msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
 msgstr "警告: レートが不正確です (要求値 = %iHz, 使用値 = %iHz)\n"
 
-#: aplay/aplay.c:1080
+#: aplay/aplay.c:1005
 #, c-format
 msgid "         please, try the plug plugin %s\n"
 msgstr "        plug プラグイン%s を使用してください\n"
 
-#: aplay/aplay.c:1116
+#: aplay/aplay.c:1041
 msgid "Unable to install hw params:"
 msgstr "hw params のインストールに失敗しました:"
 
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1048
 #, c-format
 msgid "Can't use period equal to buffer size (%lu == %lu)"
 msgstr "period と buffer サイズには同じ値を使用できません (%lu == %lu)"
 
-#: aplay/aplay.c:1154
+#: aplay/aplay.c:1079
 msgid "unable to install sw params:"
 msgstr "sw params のインストールに失敗しました:"
 
-#: aplay/aplay.c:1229
+#: aplay/aplay.c:1154
 #, c-format
 msgid "status error: %s"
 msgstr "ステータスエラー: %s"
 
-#: aplay/aplay.c:1239 aplay/aplay.c:1250
+#: aplay/aplay.c:1164 aplay/aplay.c:1175
 #, c-format
 msgid "%s!!! (at least %.3f ms long)\n"
 msgstr "%s!!! (少なくとも %.3f ms)\n"
 
-#: aplay/aplay.c:1240 aplay/aplay.c:1243 aplay/aplay.c:1251
+#: aplay/aplay.c:1165 aplay/aplay.c:1168 aplay/aplay.c:1176
 msgid "underrun"
 msgstr "アンダーラン"
 
-#: aplay/aplay.c:1240 aplay/aplay.c:1251
+#: aplay/aplay.c:1165 aplay/aplay.c:1176
 msgid "overrun"
 msgstr "オーバーラン"
 
-#: aplay/aplay.c:1255
+#: aplay/aplay.c:1180
 #, c-format
 msgid "Status:\n"
 msgstr "ステータス:\n"
 
-#: aplay/aplay.c:1259
+#: aplay/aplay.c:1184
 #, c-format
 msgid "xrun: prepare error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1265
+#: aplay/aplay.c:1190
 #, c-format
 msgid "Status(DRAINING):\n"
 msgstr "ステータス(DRAINING):\n"
 
-#: aplay/aplay.c:1269
+#: aplay/aplay.c:1194
 #, c-format
 msgid "capture stream format change? attempting recover...\n"
 msgstr "録音ストリームのフォーマットが変更？ 修復を試みます...\n"
 
-#: aplay/aplay.c:1271
+#: aplay/aplay.c:1196
 #, c-format
 msgid "xrun(DRAINING): prepare error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1278
+#: aplay/aplay.c:1203
 #, c-format
 msgid "Status(R/W):\n"
 msgstr "ステータス(R/W):\n"
 
-#: aplay/aplay.c:1281
+#: aplay/aplay.c:1206
 #, c-format
 msgid "read/write error, state = %s"
 msgstr "読み書きエラー, ステータス = %s"
 
-#: aplay/aplay.c:1291
+#: aplay/aplay.c:1216
 #, c-format
 msgid "Suspended. Trying resume. "
 msgstr "サスペンド中です。レジュームします。"
 
-#: aplay/aplay.c:1296
+#: aplay/aplay.c:1221
 #, c-format
 msgid "Failed. Restarting stream. "
 msgstr "失敗しました。ストリームを再スタートします。"
 
-#: aplay/aplay.c:1298
+#: aplay/aplay.c:1223
 #, c-format
 msgid "suspend: prepare error: %s"
 msgstr "サスペンド: prepare エラー: %s"
 
-#: aplay/aplay.c:1303
+#: aplay/aplay.c:1228
 #, c-format
 msgid "Done.\n"
 msgstr "終了\n"
 
-#: aplay/aplay.c:1325
+#: aplay/aplay.c:1250
 #, c-format
 msgid " !clip  "
 msgstr ""
 
-#: aplay/aplay.c:1472
+#: aplay/aplay.c:1397
 #, c-format
 msgid "Unsupported bit size %d.\n"
 msgstr ""
 
-#: aplay/aplay.c:1506
+#: aplay/aplay.c:1431
 #, c-format
 msgid "Max peak (%li samples): 0x%08x "
 msgstr "最大ピーク (%li サンプル): 0x%08x "
 
-#: aplay/aplay.c:1540
+#: aplay/aplay.c:1465
 #, c-format
 msgid ""
 "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %"
 "li\n"
 msgstr ""
 
-#: aplay/aplay.c:1603
+#: aplay/aplay.c:1528
 #, c-format
 msgid "write error: %s"
 msgstr "書込エラー: %s"
 
-#: aplay/aplay.c:1649
+#: aplay/aplay.c:1574
 #, c-format
 msgid "writev error: %s"
 msgstr "書込(writev)エラー: %s"
 
-#: aplay/aplay.c:1692
+#: aplay/aplay.c:1617
 #, c-format
 msgid "read error: %s"
 msgstr "読込エラー: %s"
 
-#: aplay/aplay.c:1735
+#: aplay/aplay.c:1660
 #, c-format
 msgid "readv error: %s"
 msgstr "読込(readv)エラー: %s"
 
-#: aplay/aplay.c:1783
+#: aplay/aplay.c:1708
 msgid "can't allocate buffer for silence"
 msgstr "サイレンス用のバッファの取得に失敗しました"
 
-#: aplay/aplay.c:1792 aplay/aplay.c:2018 aplay/aplay.c:2023 aplay/aplay.c:2070
-#: aplay/aplay.c:2079 aplay/aplay.c:2086 aplay/aplay.c:2096 aplay/aplay.c:2102
-#: aplay/aplay.c:2174 aplay/aplay.c:2204 aplay/aplay.c:2218
+#: aplay/aplay.c:1717 aplay/aplay.c:1943 aplay/aplay.c:1948 aplay/aplay.c:1995
+#: aplay/aplay.c:2004 aplay/aplay.c:2011 aplay/aplay.c:2021 aplay/aplay.c:2027
+#: aplay/aplay.c:2099 aplay/aplay.c:2129 aplay/aplay.c:2143
 msgid "write error"
 msgstr "書込エラー"
 
-#: aplay/aplay.c:1805
+#: aplay/aplay.c:1730
 #, c-format
 msgid "voc_pcm_flush - silence error"
 msgstr ""
 
-#: aplay/aplay.c:1808
+#: aplay/aplay.c:1733
 msgid "voc_pcm_flush error"
 msgstr ""
 
-#: aplay/aplay.c:1834
+#: aplay/aplay.c:1759
 msgid "malloc error"
 msgstr "malloc エラー"
 
-#: aplay/aplay.c:1838
+#: aplay/aplay.c:1763
 #, c-format
 msgid "Playing Creative Labs Channel file '%s'...\n"
 msgstr "Creative Labs Channel ファイル '%s' を演奏中...\n"
 
-#: aplay/aplay.c:1906 aplay/aplay.c:1998
+#: aplay/aplay.c:1831 aplay/aplay.c:1923
 msgid "can't play packed .voc files"
 msgstr "packed .voc ファイルは演奏できません"
 
-#: aplay/aplay.c:1958
+#: aplay/aplay.c:1883
 #, c-format
 msgid "can't play loops; %s isn't seekable\n"
 msgstr "ループ演奏できません。%s はシーク不可能です\n"
 
-#: aplay/aplay.c:2007
+#: aplay/aplay.c:1932
 #, c-format
 msgid "unknown blocktype %d. terminate."
 msgstr "未知のブロックタイプ %d: 終了します。"
 
-#: aplay/aplay.c:2138
+#: aplay/aplay.c:2063
 #, c-format
 msgid "Wave doesn't support %s format..."
 msgstr "WAVE は %s フォーマットをサポートしません..."
 
-#: aplay/aplay.c:2198
+#: aplay/aplay.c:2123
 #, c-format
 msgid "Sparc Audio doesn't support %s format..."
 msgstr "Sparc オーディオは %s フォーマットをサポートしません..."
 
-#: aplay/aplay.c:2279
+#: aplay/aplay.c:2204
 msgid "Playing"
 msgstr "再生中"
 
-#: aplay/aplay.c:2279
+#: aplay/aplay.c:2204
 msgid "Recording"
 msgstr "録音中"
 
-#: aplay/aplay.c:2283
+#: aplay/aplay.c:2208
 #, c-format
 msgid "Rate %d Hz, "
 msgstr "レート %d Hz, "
 
-#: aplay/aplay.c:2285
+#: aplay/aplay.c:2210
 #, c-format
 msgid "Mono"
 msgstr "モノラル"
 
-#: aplay/aplay.c:2287
+#: aplay/aplay.c:2212
 #, c-format
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: aplay/aplay.c:2289
+#: aplay/aplay.c:2214
 #, c-format
 msgid "Channels %i"
 msgstr "チャネル数 %i"
 
-#: aplay/aplay.c:2798 aplay/aplay.c:2851
+#: aplay/aplay.c:2573 aplay/aplay.c:2626
 #, c-format
 msgid "You need to specify %d files"
 msgstr "%d 個のファイルを指定してください"
@@ -1001,47 +991,47 @@
 msgid "kernel"
 msgstr "カーネル"
 
-#: seq/aconnect/aconnect.c:307
+#: seq/aconnect/aconnect.c:326
 #, c-format
 msgid "can't open sequencer\n"
 msgstr "sequencer をオープンできません\n"
 
-#: seq/aconnect/aconnect.c:335
+#: seq/aconnect/aconnect.c:354
 #, c-format
 msgid "can't get client id\n"
 msgstr "クライアント ID を取得できません\n"
 
-#: seq/aconnect/aconnect.c:342
+#: seq/aconnect/aconnect.c:361
 #, c-format
 msgid "can't set client info\n"
 msgstr "クライアント情報を取得できません\n"
 
-#: seq/aconnect/aconnect.c:349
+#: seq/aconnect/aconnect.c:368
 #, c-format
 msgid "invalid sender address %s\n"
 msgstr "送信アドレスが不正です: %s\n"
 
-#: seq/aconnect/aconnect.c:354 seq/aseqnet/aseqnet.c:290
+#: seq/aconnect/aconnect.c:373 seq/aseqnet/aseqnet.c:290
 #, c-format
 msgid "invalid destination address %s\n"
 msgstr "受信アドレスが不正です: %s\n"
 
-#: seq/aconnect/aconnect.c:368
+#: seq/aconnect/aconnect.c:387
 #, c-format
 msgid "No subscription is found\n"
 msgstr "接続が見つかりません\n"
 
-#: seq/aconnect/aconnect.c:373
+#: seq/aconnect/aconnect.c:392
 #, c-format
 msgid "Disconnection failed (%s)\n"
 msgstr "切り離しに失敗 (%s)\n"
 
-#: seq/aconnect/aconnect.c:379
+#: seq/aconnect/aconnect.c:398
 #, c-format
 msgid "Connection is already subscribed\n"
 msgstr "既に接続されています\n"
 
-#: seq/aconnect/aconnect.c:384
+#: seq/aconnect/aconnect.c:403
 #, c-format
 msgid "Connection failed (%s)\n"
 msgstr "接続に失敗 (%s)\n"
@@ -1171,257 +1161,257 @@
 msgid "disconnected\n"
 msgstr "切り離し\n"
 
-#: speaker-test/speaker-test.c:103
+#: speaker-test/speaker-test.c:102
 msgid "Front Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:104
+#: speaker-test/speaker-test.c:103
 msgid "Front Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:105
+#: speaker-test/speaker-test.c:104
 msgid "Rear Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:106
+#: speaker-test/speaker-test.c:105
 msgid "Rear Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:108
+#: speaker-test/speaker-test.c:107
 msgid "LFE"
 msgstr ""
 
-#: speaker-test/speaker-test.c:109
+#: speaker-test/speaker-test.c:108
 msgid "Side Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:110
+#: speaker-test/speaker-test.c:109
 msgid "Side Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:111
+#: speaker-test/speaker-test.c:110
 msgid "Channel 9"
 msgstr ""
 
-#: speaker-test/speaker-test.c:112
+#: speaker-test/speaker-test.c:111
 msgid "Channel 10"
 msgstr ""
 
-#: speaker-test/speaker-test.c:113
+#: speaker-test/speaker-test.c:112
 msgid "Channel 11"
 msgstr ""
 
-#: speaker-test/speaker-test.c:114
+#: speaker-test/speaker-test.c:113
 msgid "Channel 12"
 msgstr ""
 
-#: speaker-test/speaker-test.c:115
+#: speaker-test/speaker-test.c:114
 msgid "Channel 13"
 msgstr ""
 
-#: speaker-test/speaker-test.c:116
+#: speaker-test/speaker-test.c:115
 msgid "Channel 14"
 msgstr ""
 
-#: speaker-test/speaker-test.c:117
+#: speaker-test/speaker-test.c:116
 msgid "Channel 15"
 msgstr ""
 
-#: speaker-test/speaker-test.c:118
+#: speaker-test/speaker-test.c:117
 msgid "Channel 16"
 msgstr ""
 
-#: speaker-test/speaker-test.c:317
+#: speaker-test/speaker-test.c:307
 #, c-format
 msgid "Broken configuration for playback: no configurations available: %s\n"
 msgstr "再生用に設定できません: 設定がみつかりません: %s\n"
 
-#: speaker-test/speaker-test.c:324
+#: speaker-test/speaker-test.c:314
 #, c-format
 msgid "Access type not available for playback: %s\n"
 msgstr "アクセスタイプが不正です: %s\n"
 
-#: speaker-test/speaker-test.c:331
+#: speaker-test/speaker-test.c:321
 #, c-format
 msgid "Sample format not available for playback: %s\n"
 msgstr "指定のサンプルフォーマットを使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:338
+#: speaker-test/speaker-test.c:328
 #, c-format
 msgid "Channels count (%i) not available for playbacks: %s\n"
 msgstr "チャネル数 (%i) を使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:346
+#: speaker-test/speaker-test.c:336
 #, c-format
 msgid "Rate %iHz not available for playback: %s\n"
 msgstr "レート %iHz を使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:351
+#: speaker-test/speaker-test.c:341
 #, c-format
 msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n"
 msgstr "設定レートが一致しません< (要求値 %iHz, 取得値 %iHz, エラー %d)\n"
 
-#: speaker-test/speaker-test.c:355
+#: speaker-test/speaker-test.c:345
 #, c-format
 msgid "Rate set to %iHz (requested %iHz)\n"
 msgstr "レート %iHz (要求値 %iHz)\n"
 
-#: speaker-test/speaker-test.c:361
+#: speaker-test/speaker-test.c:351
 #, c-format
 msgid "Buffer size range from %lu to %lu\n"
 msgstr "バッファサイズ範囲 %lu 〜 %lu\n"
 
-#: speaker-test/speaker-test.c:362
+#: speaker-test/speaker-test.c:352
 #, c-format
 msgid "Period size range from %lu to %lu\n"
 msgstr "ピリオドサイズ範囲 %lu 〜 %lu\n"
 
-#: speaker-test/speaker-test.c:364
+#: speaker-test/speaker-test.c:354
 #, c-format
 msgid "Requested period time %u us\n"
 msgstr "要求されたピリオド長 %u us\n"
 
-#: speaker-test/speaker-test.c:367
+#: speaker-test/speaker-test.c:357
 #, c-format
 msgid "Unable to set period time %u us for playback: %s\n"
 msgstr "ピリオド長 %u us を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:373
+#: speaker-test/speaker-test.c:363
 #, c-format
 msgid "Requested buffer time %u us\n"
 msgstr "要求されたバッファ長 %u us\n"
 
-#: speaker-test/speaker-test.c:376
+#: speaker-test/speaker-test.c:366
 #, c-format
 msgid "Unable to set buffer time %u us for playback: %s\n"
 msgstr "バッファ長 %u us を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:385
+#: speaker-test/speaker-test.c:375
 #, c-format
 msgid "Using max buffer size %lu\n"
 msgstr "最大バッファサイズ %lu を使用\n"
 
-#: speaker-test/speaker-test.c:388
+#: speaker-test/speaker-test.c:378
 #, c-format
 msgid "Unable to set buffer size %lu for playback: %s\n"
 msgstr "バッファサイズ %lu を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:394
+#: speaker-test/speaker-test.c:384
 #, c-format
 msgid "Periods = %u\n"
 msgstr "ピリオド数 = %u\n"
 
-#: speaker-test/speaker-test.c:397
+#: speaker-test/speaker-test.c:387
 #, c-format
 msgid "Unable to set nperiods %u for playback: %s\n"
 msgstr "ピリオド数 %u を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:406
+#: speaker-test/speaker-test.c:396
 #, c-format
 msgid "Unable to set hw params for playback: %s\n"
 msgstr "hw params を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:412
+#: speaker-test/speaker-test.c:402
 #, c-format
 msgid "was set period_size = %lu\n"
 msgstr "period_size = %lu で設定\n"
 
-#: speaker-test/speaker-test.c:413
+#: speaker-test/speaker-test.c:403
 #, c-format
 msgid "was set buffer_size = %lu\n"
 msgstr "buffer_size = %lu で設定\n"
 
-#: speaker-test/speaker-test.c:415
+#: speaker-test/speaker-test.c:405
 #, c-format
 msgid "buffer to small, could not use\n"
 msgstr "バッファが小さすぎます\n"
 
-#: speaker-test/speaker-test.c:428
+#: speaker-test/speaker-test.c:418
 #, c-format
 msgid "Unable to determine current swparams for playback: %s\n"
 msgstr "現在の swparams を取得できません: %s\n"
 
-#: speaker-test/speaker-test.c:435
+#: speaker-test/speaker-test.c:425
 #, c-format
 msgid "Unable to set start threshold mode for playback: %s\n"
 msgstr "start_threshold モードを設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:442
+#: speaker-test/speaker-test.c:432
 #, c-format
 msgid "Unable to set avail min for playback: %s\n"
 msgstr "avail_min を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:449
+#: speaker-test/speaker-test.c:439
 #, c-format
 msgid "Unable to set sw params for playback: %s\n"
 msgstr "再生用の sw params を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:464
+#: speaker-test/speaker-test.c:454
 #, c-format
 msgid "Can't recovery from underrun, prepare failed: %s\n"
 msgstr "アンダーランから復帰失敗: %s\n"
 
-#: speaker-test/speaker-test.c:475
+#: speaker-test/speaker-test.c:465
 #, c-format
 msgid "Can't recovery from suspend, prepare failed: %s\n"
 msgstr "サスペンドから復帰失敗: %s\n"
 
-#: speaker-test/speaker-test.c:539 speaker-test/speaker-test.c:954
+#: speaker-test/speaker-test.c:529 speaker-test/speaker-test.c:926
 #, c-format
 msgid "No enough memory\n"
 msgstr "メモリが足りません\n"
 
-#: speaker-test/speaker-test.c:544
+#: speaker-test/speaker-test.c:534
 #, c-format
 msgid "Cannot open WAV file %s\n"
 msgstr "WAVファイルがオープンできません: %s\n"
 
-#: speaker-test/speaker-test.c:548 speaker-test/speaker-test.c:577
+#: speaker-test/speaker-test.c:538 speaker-test/speaker-test.c:567
 #, c-format
 msgid "Invalid WAV file %s\n"
 msgstr "不正なWAVファイルです: %s\n"
 
-#: speaker-test/speaker-test.c:553
+#: speaker-test/speaker-test.c:543
 #, c-format
 msgid "Not a WAV file: %s\n"
 msgstr "WAVファイルではありません: %s\n"
 
-#: speaker-test/speaker-test.c:557
+#: speaker-test/speaker-test.c:547
 #, c-format
 msgid "Unsupported WAV format %d for %s\n"
 msgstr "未サポートのWAVフォーマット %d: %s\n"
 
-#: speaker-test/speaker-test.c:562
+#: speaker-test/speaker-test.c:552
 #, c-format
 msgid "%s is not a mono stream (%d channels)\n"
 msgstr "%s はモノストリームではありません (%d チャネル)\n"
 
-#: speaker-test/speaker-test.c:567
+#: speaker-test/speaker-test.c:557
 #, c-format
 msgid "Sample rate doesn't match (%d) for %s\n"
 msgstr "サンプルレートが不一致です(%d): %s\n"
 
-#: speaker-test/speaker-test.c:572
+#: speaker-test/speaker-test.c:562
 #, c-format
 msgid "Unsupported sample format bits %d for %s\n"
 msgstr "未サポートのサンプルフォーマットビット %d: %s\n"
 
-#: speaker-test/speaker-test.c:622
+#: speaker-test/speaker-test.c:612
 #, c-format
 msgid "Undefined channel %d\n"
 msgstr "未定義のチャネル %d\n"
 
-#: speaker-test/speaker-test.c:673
+#: speaker-test/speaker-test.c:663
 #, c-format
 msgid "Write error: %d,%s\n"
 msgstr "書込エラー: %d,%s\n"
 
-#: speaker-test/speaker-test.c:675
+#: speaker-test/speaker-test.c:665
 #, c-format
 msgid "xrun_recovery failed: %d,%s\n"
 msgstr "xrun_recovery 失敗: %d,%s\n"
 
-#: speaker-test/speaker-test.c:734
+#: speaker-test/speaker-test.c:723
 #, c-format
 msgid ""
 "Usage: speaker-test [OPTION]... \n"
@@ -1459,72 +1449,72 @@
 "-W,--wavdir          WAVファイルのあるディレクトリを指定\n"
 "\n"
 
-#: speaker-test/speaker-test.c:852
+#: speaker-test/speaker-test.c:835
 #, c-format
 msgid "Invalid number of periods %d\n"
 msgstr "不正なピリオド数 %d\n"
 
-#: speaker-test/speaker-test.c:866 speaker-test/speaker-test.c:870
+#: speaker-test/speaker-test.c:849 speaker-test/speaker-test.c:853
 #, c-format
 msgid "Invalid test type %s\n"
 msgstr "不正なテストタイプ %s\n"
 
-#: speaker-test/speaker-test.c:882
+#: speaker-test/speaker-test.c:865
 #, c-format
 msgid "Invalid parameter for -s option.\n"
 msgstr "-s オプションの値が不正です\n"
 
-#: speaker-test/speaker-test.c:896
+#: speaker-test/speaker-test.c:876
 #, c-format
 msgid "Unknown option '%c'\n"
 msgstr "未知のオプション '%c'\n"
 
-#: speaker-test/speaker-test.c:910
+#: speaker-test/speaker-test.c:890
 #, c-format
 msgid "Playback device is %s\n"
 msgstr "再生デバイス: %s\n"
 
-#: speaker-test/speaker-test.c:911
+#: speaker-test/speaker-test.c:891
 #, c-format
 msgid "Stream parameters are %iHz, %s, %i channels\n"
 msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n"
 
-#: speaker-test/speaker-test.c:914
+#: speaker-test/speaker-test.c:894
 #, c-format
 msgid "Using 16 octaves of pink noise\n"
 msgstr "16 オクターブのピンクノイズを使用\n"
 
-#: speaker-test/speaker-test.c:917
+#: speaker-test/speaker-test.c:897
 #, c-format
 msgid "Sine wave rate is %.4fHz\n"
 msgstr "正弦波レート: %.4fHz\n"
 
-#: speaker-test/speaker-test.c:920
+#: speaker-test/speaker-test.c:900
 #, c-format
 msgid "WAV file(s)\n"
 msgstr "WAV ファイル\n"
 
-#: speaker-test/speaker-test.c:926
+#: speaker-test/speaker-test.c:906
 #, c-format
 msgid "Playback open error: %d,%s\n"
 msgstr "再生オープンエラー: %d,%s\n"
 
-#: speaker-test/speaker-test.c:931
+#: speaker-test/speaker-test.c:911
 #, c-format
 msgid "Setting of hwparams failed: %s\n"
 msgstr "hwparams の設定に失敗: %s\n"
 
-#: speaker-test/speaker-test.c:936
+#: speaker-test/speaker-test.c:916
 #, c-format
 msgid "Setting of swparams failed: %s\n"
 msgstr "swparams の設定に失敗: %s\n"
 
-#: speaker-test/speaker-test.c:985 speaker-test/speaker-test.c:1007
+#: speaker-test/speaker-test.c:957 speaker-test/speaker-test.c:979
 #, c-format
 msgid "Transfer failed: %s\n"
 msgstr "転送に失敗しました: %s\n"
 
-#: speaker-test/speaker-test.c:995
+#: speaker-test/speaker-test.c:967
 #, c-format
 msgid "Time per period = %lf\n"
 msgstr "ピリオド時間 = %lf\n"