diff --git a/po/ja.po b/po/ja.po
index 5ffb255..6df3c16 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alsa-utils 1.0.9a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-01 00:56+0100\n"
-"PO-Revision-Date: 2005-12-01 01:00+0100\n"
+"POT-Creation-Date: 2006-03-24 00:31+0100\n"
+"PO-Revision-Date: 2006-03-24 00:39+0100\n"
 "Last-Translator: Takashi Iwai <tiwai@suse.de>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: aplay/aplay.c:128
+#: aplay/aplay.c:129
 msgid "raw data"
 msgstr "raw データ"
 
-#: aplay/aplay.c:129
+#: aplay/aplay.c:130
 msgid "VOC"
 msgstr "VOC"
 
-#: aplay/aplay.c:130
+#: aplay/aplay.c:131
 msgid "WAVE"
 msgstr "WAVE"
 
-#: aplay/aplay.c:131
+#: aplay/aplay.c:132
 msgid "Sparc Audio"
 msgstr "Sparc オーディオ"
 
-#: aplay/aplay.c:152
+#: aplay/aplay.c:153
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -91,12 +91,12 @@ msgstr ""
 "-v, --verbose           PCM の設定を表示 (複数指定可能)\n"
 "-I, --separate-channels 各チャネルに一つのファイルを用いる\n"
 
-#: aplay/aplay.c:179 speaker-test/speaker-test.c:712
+#: aplay/aplay.c:180 speaker-test/speaker-test.c:718
 #, c-format
 msgid "Recognized sample formats are:"
 msgstr "認識されるサンプルフォーマット:"
 
-#: aplay/aplay.c:185
+#: aplay/aplay.c:186
 #, c-format
 msgid ""
 "\n"
@@ -105,153 +105,153 @@ msgstr ""
 "\n"
 "これらのいくつかは指定のハードウェアで使用不可能な場合があります\n"
 
-#: aplay/aplay.c:186
+#: aplay/aplay.c:187
 #, c-format
 msgid "The availabled format shortcuts are:\n"
 msgstr "可能なフォーマットの省略形:\n"
 
-#: aplay/aplay.c:187
+#: aplay/aplay.c:188
 #, c-format
 msgid "-f cd (16 bit little endian, 44100, stereo)\n"
 msgstr "-f cd (16 ビット、リトルエンディアン、44100、ステレオ)\n"
 
-#: aplay/aplay.c:188
+#: aplay/aplay.c:189
 #, c-format
 msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
 msgstr "-f cdr (16 ビット、ビッグエンディアン、44100、ステレオ)\n"
 
-#: aplay/aplay.c:189
+#: aplay/aplay.c:190
 #, c-format
 msgid "-f dat (16 bit little endian, 48000, stereo)\n"
 msgstr "-f dat (16 ビット、リトルエンディアン、48000、ステレオ)\n"
 
-#: aplay/aplay.c:199
+#: aplay/aplay.c:200
 #, c-format
 msgid "snd_names_list error: %s"
 msgstr "snd_names_list エラー: %s"
 
-#: aplay/aplay.c:221
+#: aplay/aplay.c:222
 msgid "no soundcards found..."
 msgstr "サウンドカードが見つかりません..."
 
-#: aplay/aplay.c:224
+#: aplay/aplay.c:225
 #, c-format
 msgid "**** List of %s Hardware Devices ****\n"
 msgstr "**** ハードウェアデバイス %s のリスト ****\n"
 
-#: aplay/aplay.c:253
+#: aplay/aplay.c:254
 #, c-format
 msgid "card %i: %s [%s], device %i: %s [%s]\n"
 msgstr "カード %i: %s [%s], デバイス %i: %s [%s]\n"
 
-#: aplay/aplay.c:259
+#: aplay/aplay.c:260
 #, c-format
 msgid "  Subdevices: %i/%i\n"
 msgstr "  サブデバイス: %i/%i\n"
 
-#: aplay/aplay.c:266
+#: aplay/aplay.c:267
 #, c-format
 msgid "  Subdevice #%i: %s\n"
 msgstr "  サブデバイス #%i: %s\n"
 
-#: aplay/aplay.c:294
+#: aplay/aplay.c:295
 #, c-format
 msgid "PCM list:\n"
 msgstr "PCM リスト:\n"
 
-#: aplay/aplay.c:307
+#: aplay/aplay.c:310
 #, c-format
 msgid "Aborted by signal %s...\n"
 msgstr "シグナル %s で中断...\n"
 
-#: aplay/aplay.c:388
+#: aplay/aplay.c:391
 msgid "command should be named either arecord or aplay"
 msgstr "arecord または aplay コマンドのみ可能"
 
-#: aplay/aplay.c:430
+#: aplay/aplay.c:433
 #, c-format
 msgid "unrecognized file format %s"
 msgstr "不正なファイルフォーマット %s"
 
-#: aplay/aplay.c:437
+#: aplay/aplay.c:440
 #, c-format
 msgid "value %i for channels is invalid"
 msgstr "不正なチャネル数 %i"
 
-#: aplay/aplay.c:456
+#: aplay/aplay.c:459
 #, c-format
 msgid "wrong extended format '%s'"
 msgstr "不正な拡張フォーマット '%s'"
 
-#: aplay/aplay.c:467
+#: aplay/aplay.c:470
 #, c-format
 msgid "bad speed value %i"
 msgstr "不正なレート値 %i"
 
-#: aplay/aplay.c:523
+#: aplay/aplay.c:526
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "より詳しい情報は「%s --help」を実行してください\n"
 
-#: aplay/aplay.c:544
+#: aplay/aplay.c:547
 #, c-format
 msgid "audio open error: %s"
 msgstr ""
 
-#: aplay/aplay.c:549
+#: aplay/aplay.c:552
 #, c-format
 msgid "info error: %s"
 msgstr ""
 
-#: aplay/aplay.c:556
+#: aplay/aplay.c:559
 #, c-format
 msgid "nonblock setting error: %s"
 msgstr ""
 
-#: aplay/aplay.c:566 aplay/aplay.c:670 aplay/aplay.c:1013
+#: aplay/aplay.c:569 aplay/aplay.c:675 aplay/aplay.c:1018
 msgid "not enough memory"
 msgstr "メモリが足りません"
 
-#: aplay/aplay.c:660
+#: aplay/aplay.c:665
 #, c-format
 msgid "read error (called from line %i)"
 msgstr "リードエラー (%i 行)"
 
-#: aplay/aplay.c:718
+#: aplay/aplay.c:723
 #, c-format
 msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 
-#: aplay/aplay.c:726
+#: aplay/aplay.c:731
 msgid "can't play not PCM-coded WAVE-files"
 msgstr "PCM 以外の WAVE ファイルは再生できません"
 
-#: aplay/aplay.c:730
+#: aplay/aplay.c:735
 #, c-format
 msgid "can't play WAVE-files with %d tracks"
 msgstr "%d トラックを含む WAVE ファイルは再生できません"
 
-#: aplay/aplay.c:738 aplay/aplay.c:835
+#: aplay/aplay.c:743 aplay/aplay.c:840
 #, c-format
 msgid "Warning: format is changed to U8\n"
 msgstr "警告: フォーマットは U8 に変更されます\n"
 
-#: aplay/aplay.c:744
+#: aplay/aplay.c:749
 #, c-format
 msgid "Warning: format is changed to S16_LE\n"
 msgstr "警告: フォーマットは S16_LE に変更されます\n"
 
-#: aplay/aplay.c:752
+#: aplay/aplay.c:757
 #, c-format
 msgid "Warning: format is changed to S24_3LE\n"
 msgstr "警告: フォーマットは S24_3LE に変更されます\n"
 
-#: aplay/aplay.c:758
+#: aplay/aplay.c:763
 #, c-format
 msgid "Warning: format is changed to S24_LE\n"
 msgstr "警告: フォーマットは S24_LE に変更されます\n"
 
-#: aplay/aplay.c:762
+#: aplay/aplay.c:767
 #, c-format
 msgid ""
 " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
@@ -259,253 +259,258 @@ msgstr ""
 "%2$d バイト長 %1$d サンプルビット (%3$d チャネル) の WAVE ファイルは再生でき"
 "ません"
 
-#: aplay/aplay.c:771
+#: aplay/aplay.c:776
 #, c-format
 msgid " can't play WAVE-files with sample %d bits wide"
 msgstr "%d ビット長のサンプルの WAVE ファイルは再生できません"
 
-#: aplay/aplay.c:829
+#: aplay/aplay.c:834
 #, c-format
 msgid "Warning: format is changed to MU_LAW\n"
 msgstr "警告: フォーマットは MU_LAW に変更されます\n"
 
-#: aplay/aplay.c:841
+#: aplay/aplay.c:846
 #, c-format
 msgid "Warning: format is changed to S16_BE\n"
 msgstr "警告: フォーマットは S16_BE に変更されます\n"
 
-#: aplay/aplay.c:854 aplay/aplay.c:1452 aplay/aplay.c:1459 aplay/aplay.c:2006
-#: aplay/aplay.c:2018
+#: aplay/aplay.c:859 aplay/aplay.c:1487 aplay/aplay.c:1494 aplay/aplay.c:2014
+#: aplay/aplay.c:2026
 msgid "read error"
 msgstr "リードエラー"
 
-#: aplay/aplay.c:874
+#: aplay/aplay.c:879
 msgid "Broken configuration for this PCM: no configurations available"
 msgstr "指定の PCM を使用できません: 設定がありません"
 
-#: aplay/aplay.c:891
+#: aplay/aplay.c:896
 msgid "Access type not available"
 msgstr "アクセスタイプが使用不可能"
 
-#: aplay/aplay.c:896
+#: aplay/aplay.c:901
 msgid "Sample format non available"
 msgstr "サンプルフォーマットが使用不可能"
 
-#: aplay/aplay.c:901
+#: aplay/aplay.c:906
 msgid "Channels count non available"
 msgstr "チャネル数が使用不可能"
 
-#: aplay/aplay.c:914
+#: aplay/aplay.c:919
 #, c-format
 msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
 msgstr "警告: レートが不正確です (要求値 = %iHz, 使用値 = %iHz)\n"
 
-#: aplay/aplay.c:915
+#: aplay/aplay.c:920
 #, c-format
 msgid "         please, try the plug plugin (-Dplug:%s)\n"
 msgstr "        plug プラグイン (-Dplug:%s) を使用してください\n"
 
-#: aplay/aplay.c:949
+#: aplay/aplay.c:954
 msgid "Unable to install hw params:"
 msgstr "hw params のインストールに失敗しました:"
 
-#: aplay/aplay.c:956
+#: aplay/aplay.c:961
 #, c-format
 msgid "Can't use period equal to buffer size (%lu == %lu)"
 msgstr "period と buffer サイズには同じ値を使用できません (%lu == %lu)"
 
-#: aplay/aplay.c:963
+#: aplay/aplay.c:968
 msgid "Unable to obtain xfer align\n"
 msgstr "xfer align 値を得ることができません\n"
 
-#: aplay/aplay.c:1000
+#: aplay/aplay.c:1005
 msgid "unable to install sw params:"
 msgstr "sw params のインストールに失敗しました:"
 
-#: aplay/aplay.c:1039
+#: aplay/aplay.c:1044
 #, c-format
 msgid "status error: %s"
 msgstr "ステータスエラー: %s"
 
-#: aplay/aplay.c:1047
+#: aplay/aplay.c:1052
 #, c-format
 msgid "%s!!! (at least %.3f ms long)\n"
 msgstr "%s!!! (少なくとも %.3f ms)\n"
 
-#: aplay/aplay.c:1048
+#: aplay/aplay.c:1053
 msgid "underrun"
 msgstr "アンダーラン"
 
-#: aplay/aplay.c:1048
+#: aplay/aplay.c:1053
 msgid "overrun"
 msgstr "オーバーラン"
 
-#: aplay/aplay.c:1051
+#: aplay/aplay.c:1056
 #, c-format
 msgid "Status:\n"
 msgstr "ステータス:\n"
 
-#: aplay/aplay.c:1055
+#: aplay/aplay.c:1060
 #, c-format
 msgid "xrun: prepare error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1061
+#: aplay/aplay.c:1066
 #, c-format
 msgid "Status(DRAINING):\n"
 msgstr "ステータス(DRAINING):\n"
 
-#: aplay/aplay.c:1065
+#: aplay/aplay.c:1070
 #, c-format
 msgid "capture stream format change? attempting recover...\n"
 msgstr "録音ストリームのフォーマットが変更？ 修復を試みます...\n"
 
-#: aplay/aplay.c:1067
+#: aplay/aplay.c:1072
 #, c-format
 msgid "xrun(DRAINING): prepare error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1074
+#: aplay/aplay.c:1079
 #, c-format
 msgid "Status(R/W):\n"
 msgstr "ステータス(R/W):\n"
 
-#: aplay/aplay.c:1077
+#: aplay/aplay.c:1082
 #, c-format
 msgid "read/write error, state = %s"
 msgstr "読み書きエラー, ステータス = %s"
 
-#: aplay/aplay.c:1087
+#: aplay/aplay.c:1092
 #, c-format
 msgid "Suspended. Trying resume. "
 msgstr "サスペンド中です。レジュームします。"
 
-#: aplay/aplay.c:1092
+#: aplay/aplay.c:1097
 #, c-format
 msgid "Failed. Restarting stream. "
 msgstr "失敗しました。ストリームを再スタートします。"
 
-#: aplay/aplay.c:1094
+#: aplay/aplay.c:1099
 #, c-format
 msgid "suspend: prepare error: %s"
 msgstr "サスペンド: prepare エラー: %s"
 
-#: aplay/aplay.c:1099
+#: aplay/aplay.c:1104
 #, c-format
 msgid "Done.\n"
 msgstr "終了\n"
 
-#: aplay/aplay.c:1178
+#: aplay/aplay.c:1183
 #, c-format
 msgid "Unsupported bit size %d.\n"
 msgstr ""
 
-#: aplay/aplay.c:1186
+#: aplay/aplay.c:1219
+#, c-format
+msgid " !clip  "
+msgstr ""
+
+#: aplay/aplay.c:1224
 #, c-format
 msgid "Max peak (%li samples): 0x%08x "
 msgstr "最大ピーク (%li サンプル): 0x%08x "
 
-#: aplay/aplay.c:1222
+#: aplay/aplay.c:1257
 #, c-format
 msgid "write error: %s"
 msgstr "書込エラー: %s"
 
-#: aplay/aplay.c:1264
+#: aplay/aplay.c:1299
 #, c-format
 msgid "writev error: %s"
 msgstr "書込(writev)エラー: %s"
 
-#: aplay/aplay.c:1303
+#: aplay/aplay.c:1338
 #, c-format
 msgid "read error: %s"
 msgstr "読込エラー: %s"
 
-#: aplay/aplay.c:1342
+#: aplay/aplay.c:1377
 #, c-format
 msgid "readv error: %s"
 msgstr "読込(readv)エラー: %s"
 
-#: aplay/aplay.c:1390
+#: aplay/aplay.c:1425
 msgid "can't allocate buffer for silence"
 msgstr "サイレンス用のバッファの取得に失敗しました"
 
-#: aplay/aplay.c:1399 aplay/aplay.c:1627 aplay/aplay.c:1632 aplay/aplay.c:1679
-#: aplay/aplay.c:1688 aplay/aplay.c:1695 aplay/aplay.c:1705 aplay/aplay.c:1711
-#: aplay/aplay.c:1779 aplay/aplay.c:1809 aplay/aplay.c:1823
+#: aplay/aplay.c:1434 aplay/aplay.c:1662 aplay/aplay.c:1667 aplay/aplay.c:1714
+#: aplay/aplay.c:1723 aplay/aplay.c:1730 aplay/aplay.c:1740 aplay/aplay.c:1746
+#: aplay/aplay.c:1814 aplay/aplay.c:1844 aplay/aplay.c:1858
 msgid "write error"
 msgstr "書込エラー"
 
-#: aplay/aplay.c:1413
+#: aplay/aplay.c:1448
 #, c-format
 msgid "voc_pcm_flush - silence error"
 msgstr ""
 
-#: aplay/aplay.c:1419
+#: aplay/aplay.c:1454
 msgid "voc_pcm_flush error"
 msgstr ""
 
-#: aplay/aplay.c:1443
+#: aplay/aplay.c:1478
 msgid "malloc error"
 msgstr "malloc エラー"
 
-#: aplay/aplay.c:1447
+#: aplay/aplay.c:1482
 #, c-format
 msgid "Playing Creative Labs Channel file '%s'...\n"
 msgstr "Creative Labs Channel ファイル '%s' を演奏中...\n"
 
-#: aplay/aplay.c:1515 aplay/aplay.c:1607
+#: aplay/aplay.c:1550 aplay/aplay.c:1642
 msgid "can't play packed .voc files"
 msgstr "packed .voc ファイルは演奏できません"
 
-#: aplay/aplay.c:1567
+#: aplay/aplay.c:1602
 #, c-format
 msgid "can't play loops; %s isn't seekable\n"
 msgstr "ループ演奏できません。%s はシーク不可能です\n"
 
-#: aplay/aplay.c:1616
+#: aplay/aplay.c:1651
 #, c-format
 msgid "unknown blocktype %d. terminate."
 msgstr "未知のブロックタイプ %d: 終了します。"
 
-#: aplay/aplay.c:1746
+#: aplay/aplay.c:1781
 #, c-format
 msgid "Wave doesn't support %s format..."
 msgstr "WAVE は %s フォーマットをサポートしません..."
 
-#: aplay/aplay.c:1803
+#: aplay/aplay.c:1838
 #, c-format
 msgid "Sparc Audio doesn't support %s format..."
 msgstr "Sparc オーディオは %s フォーマットをサポートしません..."
 
-#: aplay/aplay.c:1888
+#: aplay/aplay.c:1923
 msgid "Playing"
 msgstr "再生中"
 
-#: aplay/aplay.c:1888
+#: aplay/aplay.c:1923
 msgid "Recording"
 msgstr "録音中"
 
-#: aplay/aplay.c:1892
+#: aplay/aplay.c:1927
 #, c-format
 msgid "Rate %d Hz, "
 msgstr "レート %d Hz, "
 
-#: aplay/aplay.c:1894
+#: aplay/aplay.c:1929
 #, c-format
 msgid "Mono"
 msgstr "モノラル"
 
-#: aplay/aplay.c:1896
+#: aplay/aplay.c:1931
 #, c-format
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: aplay/aplay.c:1898
+#: aplay/aplay.c:1933
 #, c-format
 msgid "Channels %i"
 msgstr "チャネル数 %i"
 
-#: aplay/aplay.c:2180 aplay/aplay.c:2233
+#: aplay/aplay.c:2280 aplay/aplay.c:2333
 #, c-format
 msgid "You need to specify %d files"
 msgstr "%d 個のファイルを指定してください"
@@ -786,261 +791,266 @@ msgstr "チャネル %2d: ノートオフ   : %5d\n"
 msgid "disconnected\n"
 msgstr "切り離し\n"
 
-#: speaker-test/speaker-test.c:86
+#: speaker-test/speaker-test.c:88
 msgid "Front Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:87
+#: speaker-test/speaker-test.c:89
 msgid "Front Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:88
+#: speaker-test/speaker-test.c:90
 msgid "Rear Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:89
+#: speaker-test/speaker-test.c:91
 msgid "Rear Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:90
+#: speaker-test/speaker-test.c:92
 msgid "Center"
 msgstr ""
 
-#: speaker-test/speaker-test.c:91
+#: speaker-test/speaker-test.c:93
 msgid "LFE"
 msgstr ""
 
-#: speaker-test/speaker-test.c:92
+#: speaker-test/speaker-test.c:94
 msgid "Side Left"
 msgstr ""
 
-#: speaker-test/speaker-test.c:93
+#: speaker-test/speaker-test.c:95
 msgid "Side Right"
 msgstr ""
 
-#: speaker-test/speaker-test.c:94
+#: speaker-test/speaker-test.c:96
 msgid "Channel 9"
 msgstr ""
 
-#: speaker-test/speaker-test.c:95
+#: speaker-test/speaker-test.c:97
 msgid "Channel 10"
 msgstr ""
 
-#: speaker-test/speaker-test.c:96
+#: speaker-test/speaker-test.c:98
 msgid "Channel 11"
 msgstr ""
 
-#: speaker-test/speaker-test.c:97
+#: speaker-test/speaker-test.c:99
 msgid "Channel 12"
 msgstr ""
 
-#: speaker-test/speaker-test.c:98
+#: speaker-test/speaker-test.c:100
 msgid "Channel 13"
 msgstr ""
 
-#: speaker-test/speaker-test.c:99
+#: speaker-test/speaker-test.c:101
 msgid "Channel 14"
 msgstr ""
 
-#: speaker-test/speaker-test.c:100
+#: speaker-test/speaker-test.c:102
 msgid "Channel 15"
 msgstr ""
 
-#: speaker-test/speaker-test.c:101
+#: speaker-test/speaker-test.c:103
 msgid "Channel 16"
 msgstr ""
 
-#: speaker-test/speaker-test.c:281
+#: speaker-test/speaker-test.c:280
 #, c-format
 msgid "Broken configuration for playback: no configurations available: %s\n"
 msgstr "再生用に設定できません: 設定がみつかりません: %s\n"
 
-#: speaker-test/speaker-test.c:288
+#: speaker-test/speaker-test.c:287
 #, c-format
 msgid "Access type not available for playback: %s\n"
 msgstr "アクセスタイプが不正です: %s\n"
 
-#: speaker-test/speaker-test.c:295
+#: speaker-test/speaker-test.c:294
 #, c-format
 msgid "Sample format not available for playback: %s\n"
 msgstr "指定のサンプルフォーマットを使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:302
+#: speaker-test/speaker-test.c:301
 #, c-format
 msgid "Channels count (%i) not available for playbacks: %s\n"
 msgstr "チャネル数 (%i) を使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:310
+#: speaker-test/speaker-test.c:309
 #, c-format
 msgid "Rate %iHz not available for playback: %s\n"
 msgstr "レート %iHz を使用できません: %s\n"
 
-#: speaker-test/speaker-test.c:315
+#: speaker-test/speaker-test.c:314
 #, c-format
 msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n"
 msgstr "設定レートが一致しません< (要求値 %iHz, 取得値 %iHz, エラー %d)\n"
 
-#: speaker-test/speaker-test.c:319
+#: speaker-test/speaker-test.c:318
 #, c-format
 msgid "Rate set to %iHz (requested %iHz)\n"
 msgstr "レート %iHz (要求値 %iHz)\n"
 
-#: speaker-test/speaker-test.c:328
+#: speaker-test/speaker-test.c:324
 #, c-format
 msgid "Buffer size range from %lu to %lu\n"
 msgstr "バッファサイズ範囲 %lu 〜 %lu\n"
 
-#: speaker-test/speaker-test.c:329
+#: speaker-test/speaker-test.c:325
 #, c-format
 msgid "Period size range from %lu to %lu\n"
 msgstr "ピリオドサイズ範囲 %lu 〜 %lu\n"
 
+#: speaker-test/speaker-test.c:327
+#, c-format
+msgid "Requested period time %u us\n"
+msgstr "要求されたピリオド長 %u us\n"
+
 #: speaker-test/speaker-test.c:330
 #, c-format
-msgid "Periods = %d\n"
-msgstr "ピリオド数 = %d\n"
+msgid "Unable to set period time %u us for playback: %s\n"
+msgstr "ピリオド長 %u us を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:331
+#: speaker-test/speaker-test.c:336
 #, c-format
-msgid "Buffer time size %lu\n"
-msgstr "バッファタイムサイズ %lu\n"
+msgid "Requested buffer time %u us\n"
+msgstr "要求されたバッファ長 %u us\n"
 
-#: speaker-test/speaker-test.c:343
+#: speaker-test/speaker-test.c:339
 #, c-format
-msgid "To choose buffer_size = %lu\n"
-msgstr "buffer_size = %lu を選択\n"
+msgid "Unable to set buffer time %u us for playback: %s\n"
+msgstr "バッファ長 %u us を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:344
+#: speaker-test/speaker-test.c:346
 #, c-format
-msgid "To choose period_size = %lu\n"
-msgstr "period_size = %lu を選択\n"
+msgid "Using max buffer size %lu\n"
+msgstr "最大バッファサイズ %lu を使用\n"
 
-#: speaker-test/speaker-test.c:348
+#: speaker-test/speaker-test.c:349
 #, c-format
-msgid "Unable to set period size %lu for playback: %s\n"
-msgstr "period_size %lu を設定できません: %s\n"
+msgid "Unable to set buffer size %lu for playback: %s\n"
+msgstr "バッファサイズ %lu を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:353
+#: speaker-test/speaker-test.c:355
 #, c-format
-msgid "Unable to get period size for playback: %s\n"
-msgstr "period_size を取得できません: %s\n"
+msgid "Periods = %u\n"
+msgstr "ピリオド数 = %u\n"
 
 #: speaker-test/speaker-test.c:358
 #, c-format
-msgid "Unable to set buffer size %lu for playback: %s\n"
-msgstr "buffer_size %lu を設定できません: %s\n"
+msgid "Unable to set nperiods %u for playback: %s\n"
+msgstr "ピリオド数 %u を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:362
+#: speaker-test/speaker-test.c:365
 #, c-format
 msgid "was set period_size = %lu\n"
 msgstr "period_size = %lu で設定\n"
 
-#: speaker-test/speaker-test.c:363
+#: speaker-test/speaker-test.c:366
 #, c-format
 msgid "was set buffer_size = %lu\n"
 msgstr "buffer_size = %lu で設定\n"
 
-#: speaker-test/speaker-test.c:365
+#: speaker-test/speaker-test.c:368
 #, c-format
 msgid "buffer to small, could not use\n"
 msgstr "バッファが小さすぎます\n"
 
-#: speaker-test/speaker-test.c:373
+#: speaker-test/speaker-test.c:375
 #, c-format
 msgid "Unable to set hw params for playback: %s\n"
 msgstr "hw params を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:386
+#: speaker-test/speaker-test.c:388
 #, c-format
 msgid "Unable to determine current swparams for playback: %s\n"
 msgstr "現在の swparams を取得できません: %s\n"
 
-#: speaker-test/speaker-test.c:393
+#: speaker-test/speaker-test.c:395
 #, c-format
 msgid "Unable to set start threshold mode for playback: %s\n"
 msgstr "start_threshold モードを設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:400
+#: speaker-test/speaker-test.c:402
 #, c-format
 msgid "Unable to set avail min for playback: %s\n"
 msgstr "avail_min を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:407
+#: speaker-test/speaker-test.c:409
 #, c-format
 msgid "Unable to set transfer align for playback: %s\n"
 msgstr "転送 align を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:414
+#: speaker-test/speaker-test.c:416
 #, c-format
 msgid "Unable to set sw params for playback: %s\n"
 msgstr "再生用の sw params を設定できません: %s\n"
 
-#: speaker-test/speaker-test.c:429
+#: speaker-test/speaker-test.c:431
 #, c-format
 msgid "Can't recovery from underrun, prepare failed: %s\n"
 msgstr "アンダーランから復帰失敗: %s\n"
 
-#: speaker-test/speaker-test.c:440
+#: speaker-test/speaker-test.c:442
 #, c-format
 msgid "Can't recovery from suspend, prepare failed: %s\n"
 msgstr "サスペンドから復帰失敗: %s\n"
 
-#: speaker-test/speaker-test.c:514 speaker-test/speaker-test.c:895
+#: speaker-test/speaker-test.c:516 speaker-test/speaker-test.c:913
 #, c-format
 msgid "No enough memory\n"
 msgstr "メモリが足りません\n"
 
-#: speaker-test/speaker-test.c:519
+#: speaker-test/speaker-test.c:521
 #, c-format
 msgid "Cannot open WAV file %s\n"
 msgstr "WAVファイルがオープンできません: %s\n"
 
-#: speaker-test/speaker-test.c:523 speaker-test/speaker-test.c:552
+#: speaker-test/speaker-test.c:525 speaker-test/speaker-test.c:554
 #, c-format
 msgid "Invalid WAV file %s\n"
 msgstr "不正なWAVファイルです: %s\n"
 
-#: speaker-test/speaker-test.c:528
+#: speaker-test/speaker-test.c:530
 #, c-format
 msgid "Not a WAV file: %s\n"
 msgstr "WAVファイルではありません: %s\n"
 
-#: speaker-test/speaker-test.c:532
+#: speaker-test/speaker-test.c:534
 #, c-format
 msgid "Unsupported WAV format %d for %s\n"
 msgstr "未サポートのWAVフォーマット %d: %s\n"
 
-#: speaker-test/speaker-test.c:537
+#: speaker-test/speaker-test.c:539
 #, c-format
 msgid "%s is not a mono stream (%d channels)\n"
 msgstr "%s はモノストリームではありません (%d チャネル)\n"
 
-#: speaker-test/speaker-test.c:542
+#: speaker-test/speaker-test.c:544
 #, c-format
 msgid "Sample rate doesn't match (%d) for %s\n"
 msgstr "サンプルレートが不一致です(%d): %s\n"
 
-#: speaker-test/speaker-test.c:547
+#: speaker-test/speaker-test.c:549
 #, c-format
 msgid "Unsupported sample format bits %d for %s\n"
 msgstr "未サポートのサンプルフォーマットビット %d: %s\n"
 
-#: speaker-test/speaker-test.c:597
+#: speaker-test/speaker-test.c:599
 #, c-format
 msgid "Undefined channel %d\n"
 msgstr "未定義のチャネル %d\n"
 
-#: speaker-test/speaker-test.c:648
+#: speaker-test/speaker-test.c:650
 #, c-format
 msgid "Write error: %d,%s\n"
 msgstr "書込エラー: %d,%s\n"
 
-#: speaker-test/speaker-test.c:650
+#: speaker-test/speaker-test.c:652
 #, c-format
 msgid "xrun_recovery failed: %d,%s\n"
 msgstr "xrun_recovery 失敗: %d,%s\n"
 
-#: speaker-test/speaker-test.c:697
+#: speaker-test/speaker-test.c:701
 #, c-format
 msgid ""
 "Usage: speaker-test [OPTION]... \n"
@@ -1052,8 +1062,10 @@ msgid ""
 "-F,--format\tsample format\n"
 "-b,--buffer\tring buffer size in us\n"
 "-p,--period\tperiod size in us\n"
+"-P,--nperiods\tnumber of periods\n"
 "-t,--test\tpink=use pink noise, sine=use sine wave, wav=WAV file\n"
-"-s,--speaker\tsingle speaker test. Values 1=Left or 2=right\n"
+"-n,--nloops\tspecify number of loops to test, 0 = infinite\n"
+"-s,--speaker\tsingle speaker test. Values 1=Left, 2=right, etc\n"
 "-w,--wavfile\tUse the given WAV file as a test sound\n"
 "-W,--wavdir\tSpecify the directory containing WAV files\n"
 "\n"
@@ -1065,81 +1077,91 @@ msgstr ""
 "-c,--channels        チャネル数\n"
 "-f,--frequency       正弦波周波数 (hz)\n"
 "-F,--format          サンプルフォーマット\n"
-"-b,--buffer          リングバッファーサイズ (μs)\n"
+"-b,--buffer          リングバッファサイズ (μs)\n"
 "-p,--period          ピリオドサイズ (μs)\n"
-"-t,--test            pink=ピンクノイズを使用, sine=正弦波を使用, wav=WAVファ"
-"イル再生\n"
+"-P,--nperiods        ピリオド数\n"
+"-t,--test            pink=ピンクノイズを使用, sine=正弦波を使用, wav=WAVファイル再生\n"
 "-s,--speaker         単一スピーカーテスト  1=左 または 2=右\n"
 "-w,--wavfile         指定のWAVファイルをテスト音源として使用\n"
 "-W,--wavdir          WAVファイルのあるディレクトリを指定\n"
 "\n"
 
-#: speaker-test/speaker-test.c:825
+#: speaker-test/speaker-test.c:813
+#, c-format
+msgid "Invalid number of periods %d\n"
+msgstr "不正なピリオド数 %d\n"
+
+#: speaker-test/speaker-test.c:827 speaker-test/speaker-test.c:831
+#, c-format
+msgid "Invalid test type %s\n"
+msgstr "不正なテストタイプ %s\n"
+
+#: speaker-test/speaker-test.c:843
 #, c-format
 msgid "Invalid parameter for -s option.\n"
 msgstr "-s オプションの値が不正です\n"
 
-#: speaker-test/speaker-test.c:836
+#: speaker-test/speaker-test.c:854
 #, c-format
 msgid "Unknown option '%c'\n"
 msgstr "未知のオプション '%c'\n"
 
-#: speaker-test/speaker-test.c:852
+#: speaker-test/speaker-test.c:870
 #, c-format
 msgid "Output failed: %s\n"
 msgstr "出力失敗: %s\n"
 
-#: speaker-test/speaker-test.c:856
+#: speaker-test/speaker-test.c:874
 #, c-format
 msgid "Playback device is %s\n"
 msgstr "再生デバイス: %s\n"
 
-#: speaker-test/speaker-test.c:857
+#: speaker-test/speaker-test.c:875
 #, c-format
 msgid "Stream parameters are %iHz, %s, %i channels\n"
 msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n"
 
-#: speaker-test/speaker-test.c:860
+#: speaker-test/speaker-test.c:878
 #, c-format
 msgid "Using 16 octaves of pink noise\n"
 msgstr "16 オクターブのピンクノイズを使用\n"
 
-#: speaker-test/speaker-test.c:863
+#: speaker-test/speaker-test.c:881
 #, c-format
 msgid "Sine wave rate is %.4fHz\n"
 msgstr "正弦波レート: %.4fHz\n"
 
-#: speaker-test/speaker-test.c:866
+#: speaker-test/speaker-test.c:884
 #, c-format
 msgid "WAV file(s)\n"
 msgstr "WAV ファイル\n"
 
-#: speaker-test/speaker-test.c:872
+#: speaker-test/speaker-test.c:890
 #, c-format
 msgid "Playback open error: %d,%s\n"
 msgstr "再生オープンエラー: %d,%s\n"
 
-#: speaker-test/speaker-test.c:877
+#: speaker-test/speaker-test.c:895
 #, c-format
 msgid "Setting of hwparams failed: %s\n"
 msgstr "hwparams の設定に失敗: %s\n"
 
-#: speaker-test/speaker-test.c:884
+#: speaker-test/speaker-test.c:902
 #, c-format
 msgid "Setting of swparams failed: %s\n"
 msgstr "swparams の設定に失敗: %s\n"
 
-#: speaker-test/speaker-test.c:926 speaker-test/speaker-test.c:953
+#: speaker-test/speaker-test.c:945 speaker-test/speaker-test.c:972
 #, c-format
 msgid "Transfer failed: %s\n"
 msgstr "転送に失敗しました: %s\n"
 
-#: speaker-test/speaker-test.c:929
+#: speaker-test/speaker-test.c:948
 #, c-format
 msgid "Pausing\n"
 msgstr "停止中\n"
 
-#: speaker-test/speaker-test.c:941
+#: speaker-test/speaker-test.c:960
 #, c-format
 msgid "Time per period = %lf\n"
 msgstr "ピリオド時間 = %lf\n"