Binary files /tmp/PFTznIdnsS/language-pack-ja-base-14.04+20140707/data/extra.tar and /tmp/Oz9RMZtYTu/language-pack-ja-base-14.04+20150219/data/extra.tar differ diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/acl.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/acl.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/acl.po 2014-07-09 09:08:35.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/acl.po 2015-02-19 15:11:55.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 11:53+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:18+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/adduser.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/adduser.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/adduser.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/adduser.po 2015-02-19 15:11:47.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:31+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:30+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/alsa-utils.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/alsa-utils.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/alsa-utils.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/alsa-utils.po 2015-02-19 15:11:47.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:31+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 @@ -214,7 +214,7 @@ msgid "Rear" msgstr "リア" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:124 msgid "Center" msgstr "センター" @@ -435,7 +435,7 @@ " --fatal-errors treat all errors as fatal\n" msgstr "" -#: aplay/aplay.c:244 speaker-test/speaker-test.c:951 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:1021 #, c-format msgid "Recognized sample formats are:" msgstr "認識されるサンプルフォーマット:" @@ -522,7 +522,7 @@ msgid "bad speed value %i" msgstr "不正なレート値 %i" -#: aplay/aplay.c:700 speaker-test/speaker-test.c:601 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:665 #, c-format msgid "Unable to parse channel map string: %s\n" msgstr "" @@ -1025,47 +1025,47 @@ msgid "kernel" msgstr "カーネル" -#: seq/aconnect/aconnect.c:307 +#: seq/aconnect/aconnect.c:308 #, c-format msgid "can't open sequencer\n" msgstr "sequencer をオープンできません\n" -#: seq/aconnect/aconnect.c:335 +#: seq/aconnect/aconnect.c:336 #, c-format msgid "can't get client id\n" msgstr "クライアント ID を取得できません\n" -#: seq/aconnect/aconnect.c:342 +#: seq/aconnect/aconnect.c:343 #, c-format msgid "can't set client info\n" msgstr "クライアント情報を取得できません\n" -#: seq/aconnect/aconnect.c:349 +#: seq/aconnect/aconnect.c:350 #, 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:355 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:369 #, c-format msgid "No subscription is found\n" msgstr "接続が見つかりません\n" -#: seq/aconnect/aconnect.c:373 +#: seq/aconnect/aconnect.c:374 #, c-format msgid "Disconnection failed (%s)\n" msgstr "切り離しに失敗 (%s)\n" -#: seq/aconnect/aconnect.c:379 +#: seq/aconnect/aconnect.c:380 #, c-format msgid "Connection is already subscribed\n" msgstr "既に接続されています\n" -#: seq/aconnect/aconnect.c:384 +#: seq/aconnect/aconnect.c:385 #, c-format msgid "Connection failed (%s)\n" msgstr "接続に失敗 (%s)\n" @@ -1195,257 +1195,257 @@ msgid "disconnected\n" msgstr "切り離し\n" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:120 msgid "Front Left" msgstr "左前方" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:121 msgid "Front Right" msgstr "右前方" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:122 msgid "Rear Left" msgstr "左後方" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:123 msgid "Rear Right" msgstr "右後方" -#: speaker-test/speaker-test.c:121 +#: speaker-test/speaker-test.c:125 msgid "LFE" msgstr "LFE" -#: speaker-test/speaker-test.c:122 +#: speaker-test/speaker-test.c:126 msgid "Side Left" msgstr "左側" -#: speaker-test/speaker-test.c:123 +#: speaker-test/speaker-test.c:127 msgid "Side Right" msgstr "右側" -#: speaker-test/speaker-test.c:124 +#: speaker-test/speaker-test.c:128 msgid "Channel 9" msgstr "チャネル ９" -#: speaker-test/speaker-test.c:125 +#: speaker-test/speaker-test.c:129 msgid "Channel 10" msgstr "チャネル 10" -#: speaker-test/speaker-test.c:126 +#: speaker-test/speaker-test.c:130 msgid "Channel 11" msgstr "チャネル 11" -#: speaker-test/speaker-test.c:127 +#: speaker-test/speaker-test.c:131 msgid "Channel 12" msgstr "チャネル 12" -#: speaker-test/speaker-test.c:128 +#: speaker-test/speaker-test.c:132 msgid "Channel 13" msgstr "チャネル 13" -#: speaker-test/speaker-test.c:129 +#: speaker-test/speaker-test.c:133 msgid "Channel 14" msgstr "チャネル 14" -#: speaker-test/speaker-test.c:130 +#: speaker-test/speaker-test.c:134 msgid "Channel 15" msgstr "チャネル 15" -#: speaker-test/speaker-test.c:131 +#: speaker-test/speaker-test.c:135 msgid "Channel 16" msgstr "チャネル １６" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:518 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "再生用に設定できません: 設定がみつかりません: %s\n" -#: speaker-test/speaker-test.c:461 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Access type not available for playback: %s\n" msgstr "アクセスタイプが不正です: %s\n" -#: speaker-test/speaker-test.c:468 +#: speaker-test/speaker-test.c:532 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "指定のサンプルフォーマットを使用できません: %s\n" -#: speaker-test/speaker-test.c:475 +#: speaker-test/speaker-test.c:539 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "チャネル数 (%i) を使用できません: %s\n" -#: speaker-test/speaker-test.c:483 +#: speaker-test/speaker-test.c:547 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "レート %iHz を使用できません: %s\n" -#: speaker-test/speaker-test.c:488 +#: speaker-test/speaker-test.c:552 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "設定レートが一致しません< (要求値 %iHz, 取得値 %iHz, エラー %d)\n" -#: speaker-test/speaker-test.c:492 +#: speaker-test/speaker-test.c:556 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "レート %iHz (要求値 %iHz)\n" -#: speaker-test/speaker-test.c:498 +#: speaker-test/speaker-test.c:562 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "バッファサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:499 +#: speaker-test/speaker-test.c:563 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "ピリオドサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Requested period time %u us\n" msgstr "要求されたピリオド長 %u us\n" -#: speaker-test/speaker-test.c:504 +#: speaker-test/speaker-test.c:568 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "ピリオド長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:510 +#: speaker-test/speaker-test.c:574 #, c-format msgid "Requested buffer time %u us\n" msgstr "要求されたバッファ長 %u us\n" -#: speaker-test/speaker-test.c:513 +#: speaker-test/speaker-test.c:577 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "バッファ長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:522 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Using max buffer size %lu\n" msgstr "最大バッファサイズ %lu を使用\n" -#: speaker-test/speaker-test.c:525 +#: speaker-test/speaker-test.c:589 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "buffer_size %lu を設定できません: %s\n" -#: speaker-test/speaker-test.c:531 +#: speaker-test/speaker-test.c:595 #, c-format msgid "Periods = %u\n" msgstr "ピリオド数 = %u\n" -#: speaker-test/speaker-test.c:534 +#: speaker-test/speaker-test.c:598 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "ピリオド数 %u を設定できません: %s\n" -#: speaker-test/speaker-test.c:543 +#: speaker-test/speaker-test.c:607 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "hw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:549 +#: speaker-test/speaker-test.c:613 #, c-format msgid "was set period_size = %lu\n" msgstr "period_size = %lu で設定\n" -#: speaker-test/speaker-test.c:550 +#: speaker-test/speaker-test.c:614 #, c-format msgid "was set buffer_size = %lu\n" msgstr "buffer_size = %lu で設定\n" -#: speaker-test/speaker-test.c:552 +#: speaker-test/speaker-test.c:616 #, c-format msgid "buffer to small, could not use\n" msgstr "バッファが小さすぎます\n" -#: speaker-test/speaker-test.c:565 +#: speaker-test/speaker-test.c:629 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "現在の swparams を取得できません: %s\n" -#: speaker-test/speaker-test.c:572 +#: speaker-test/speaker-test.c:636 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "start_threshold モードを設定できません: %s\n" -#: speaker-test/speaker-test.c:579 +#: speaker-test/speaker-test.c:643 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "avail_min を設定できません: %s\n" -#: speaker-test/speaker-test.c:586 +#: speaker-test/speaker-test.c:650 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "再生用の sw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:606 +#: speaker-test/speaker-test.c:670 #, c-format msgid "Unable to set channel map: %s\n" msgstr "" -#: speaker-test/speaker-test.c:626 +#: speaker-test/speaker-test.c:695 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "アンダーランから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:637 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "サスペンドから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1182 +#: speaker-test/speaker-test.c:770 speaker-test/speaker-test.c:1261 #, c-format msgid "No enough memory\n" msgstr "メモリが足りません\n" -#: speaker-test/speaker-test.c:706 +#: speaker-test/speaker-test.c:775 #, c-format msgid "Cannot open WAV file %s\n" msgstr "WAVファイルがオープンできません: %s\n" -#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:779 speaker-test/speaker-test.c:808 #, c-format msgid "Invalid WAV file %s\n" msgstr "不正なWAVファイルです: %s\n" -#: speaker-test/speaker-test.c:715 +#: speaker-test/speaker-test.c:784 #, c-format msgid "Not a WAV file: %s\n" msgstr "WAVファイルではありません: %s\n" -#: speaker-test/speaker-test.c:719 +#: speaker-test/speaker-test.c:788 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "未サポートのWAVフォーマット %d: %s\n" -#: speaker-test/speaker-test.c:724 +#: speaker-test/speaker-test.c:793 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s はモノストリームではありません (%d チャネル)\n" -#: speaker-test/speaker-test.c:729 +#: speaker-test/speaker-test.c:798 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "サンプルレートが不一致です(%d): %s\n" -#: speaker-test/speaker-test.c:734 +#: speaker-test/speaker-test.c:803 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "未サポートのサンプルフォーマットビット %d: %s\n" -#: speaker-test/speaker-test.c:795 +#: speaker-test/speaker-test.c:864 #, c-format msgid "Undefined channel %d\n" msgstr "未定義のチャネル %d\n" -#: speaker-test/speaker-test.c:846 +#: speaker-test/speaker-test.c:915 #, c-format msgid "Write error: %d,%s\n" msgstr "書込エラー: %d,%s\n" -#: speaker-test/speaker-test.c:848 +#: speaker-test/speaker-test.c:917 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery 失敗: %d,%s\n" @@ -1472,72 +1472,72 @@ "\n" msgstr "" -#: speaker-test/speaker-test.c:1063 +#: speaker-test/speaker-test.c:1132 #, c-format msgid "Invalid number of periods %d\n" msgstr "不正なピリオド数 %d\n" -#: speaker-test/speaker-test.c:1079 speaker-test/speaker-test.c:1083 +#: speaker-test/speaker-test.c:1148 speaker-test/speaker-test.c:1152 #, c-format msgid "Invalid test type %s\n" msgstr "不正なテストタイプ %s\n" -#: speaker-test/speaker-test.c:1095 +#: speaker-test/speaker-test.c:1164 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s オプションの値が不正です\n" -#: speaker-test/speaker-test.c:1114 +#: speaker-test/speaker-test.c:1186 #, c-format msgid "Unknown option '%c'\n" msgstr "未知のオプション '%c'\n" -#: speaker-test/speaker-test.c:1128 +#: speaker-test/speaker-test.c:1207 #, c-format msgid "Playback device is %s\n" msgstr "再生デバイス: %s\n" -#: speaker-test/speaker-test.c:1129 +#: speaker-test/speaker-test.c:1208 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n" -#: speaker-test/speaker-test.c:1132 +#: speaker-test/speaker-test.c:1211 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "16 オクターブのピンクノイズを使用\n" -#: speaker-test/speaker-test.c:1135 +#: speaker-test/speaker-test.c:1214 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "正弦波レート: %.4fHz\n" -#: speaker-test/speaker-test.c:1138 +#: speaker-test/speaker-test.c:1217 #, c-format msgid "WAV file(s)\n" msgstr "WAV ファイル\n" -#: speaker-test/speaker-test.c:1148 +#: speaker-test/speaker-test.c:1227 #, c-format msgid "Playback open error: %d,%s\n" msgstr "再生オープンエラー: %d,%s\n" -#: speaker-test/speaker-test.c:1154 +#: speaker-test/speaker-test.c:1233 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "hwparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1158 +#: speaker-test/speaker-test.c:1237 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "swparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1205 speaker-test/speaker-test.c:1227 +#: speaker-test/speaker-test.c:1284 speaker-test/speaker-test.c:1306 #, c-format msgid "Transfer failed: %s\n" msgstr "転送に失敗しました: %s\n" -#: speaker-test/speaker-test.c:1213 +#: speaker-test/speaker-test.c:1292 #, c-format msgid "Time per period = %lf\n" msgstr "ピリオド時間 = %lf\n" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apparmorapplet.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apparmorapplet.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apparmorapplet.po 2014-07-09 09:08:47.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apparmorapplet.po 2015-02-19 15:12:05.000000000 +0000 @@ -12,8 +12,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:41+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:26+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apparmor-parser.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apparmor-parser.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apparmor-parser.po 2014-07-09 09:08:47.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apparmor-parser.po 2015-02-19 15:12:05.000000000 +0000 @@ -14,14 +14,14 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:41+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:26+0000\n" +"X-Generator: Launchpad (build 17341)\n" -#: ../parser_include.c:113 +#: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" msgstr "エラー:メモリ不足\n" -#: ../parser_include.c:123 +#: ../parser_include.c:123 ../parser_include.c:121 #, c-format msgid "Error: basedir %s is not a directory, skipping.\n" msgstr "エラー:ベースディレクトリ %s はディレクトリではありません。スキップしています\n" @@ -31,97 +31,106 @@ msgid "Error: Could not add directory %s to search path.\n" msgstr "エラー:ディレクトリ %s を検索パスに追加できませんでした。\n" -#: ../parser_include.c:147 +#: ../parser_include.c:147 ../parser_include.c:151 msgid "Error: Could not allocate memory.\n" msgstr "エラー:メモリを割り当てることができませんでした。\n" -#: ../parser_interface.c:69 ../parser_interface.c:72 +#: ../parser_interface.c:69 ../parser_interface.c:72 ../parser_interface.c:49 msgid "Bad write position\n" msgstr "不正書き込み位置\n" -#: ../parser_interface.c:72 ../parser_interface.c:75 +#: ../parser_interface.c:72 ../parser_interface.c:75 ../parser_interface.c:52 msgid "Permission denied\n" msgstr "拒否されたパーミッション\n" -#: ../parser_interface.c:75 ../parser_interface.c:78 +#: ../parser_interface.c:75 ../parser_interface.c:78 ../parser_interface.c:55 msgid "Out of memory\n" msgstr "メモリ不足\n" -#: ../parser_interface.c:78 ../parser_interface.c:81 +#: ../parser_interface.c:78 ../parser_interface.c:81 ../parser_interface.c:58 msgid "Couldn't copy profile: Bad memory address\n" msgstr "" -#: ../parser_interface.c:81 ../parser_interface.c:84 +#: ../parser_interface.c:81 ../parser_interface.c:84 ../parser_interface.c:61 msgid "Profile doesn't conform to protocol\n" msgstr "プロファイルがプロトコルに準拠していません\n" -#: ../parser_interface.c:84 ../parser_interface.c:87 +#: ../parser_interface.c:84 ../parser_interface.c:87 ../parser_interface.c:64 msgid "Profile does not match signature\n" msgstr "プロファイルが署名に一致していません\n" -#: ../parser_interface.c:87 ../parser_interface.c:90 +#: ../parser_interface.c:87 ../parser_interface.c:90 ../parser_interface.c:67 msgid "Profile version not supported by Apparmor module\n" msgstr "プロファイルバージョンがApparmorモジュールでサポートされていません\n" -#: ../parser_interface.c:90 ../parser_interface.c:93 +#: ../parser_interface.c:90 ../parser_interface.c:93 ../parser_interface.c:70 msgid "Profile already exists\n" msgstr "プロファイルはすでに存在します\n" -#: ../parser_interface.c:93 ../parser_interface.c:96 +#: ../parser_interface.c:93 ../parser_interface.c:96 ../parser_interface.c:73 msgid "Profile doesn't exist\n" msgstr "プロファイルが存在しません\n" -#: ../parser_interface.c:96 ../parser_interface.c:99 +#: ../parser_interface.c:96 ../parser_interface.c:99 ../parser_interface.c:76 msgid "Permission denied; attempted to load a profile while confined?\n" msgstr "" -#: ../parser_interface.c:99 ../parser_interface.c:102 +#: ../parser_interface.c:99 ../parser_interface.c:102 ../parser_interface.c:79 #, c-format msgid "Unknown error (%d): %s\n" msgstr "" #: ../parser_interface.c:116 ../parser_interface.c:119 +#: ../parser_interface.c:96 #, c-format msgid "%s: Unable to add \"%s\". " msgstr "%s: 「%s」を追加できません。 " #: ../parser_interface.c:121 ../parser_interface.c:124 +#: ../parser_interface.c:101 #, c-format msgid "%s: Unable to replace \"%s\". " msgstr "%s: 「%s」を置換できません。 " #: ../parser_interface.c:126 ../parser_interface.c:129 +#: ../parser_interface.c:106 #, c-format msgid "%s: Unable to remove \"%s\". " msgstr "%s: 「%s」を削除できません。 " #: ../parser_interface.c:131 ../parser_interface.c:134 +#: ../parser_interface.c:111 #, c-format msgid "%s: Unable to write to stdout\n" msgstr "%s: stdoutに書き込めません\n" #: ../parser_interface.c:135 ../parser_interface.c:138 +#: ../parser_interface.c:115 #, c-format msgid "%s: Unable to write to output file\n" msgstr "" #: ../parser_interface.c:138 ../parser_interface.c:162 #: ../parser_interface.c:141 ../parser_interface.c:165 +#: ../parser_interface.c:118 ../parser_interface.c:142 #, c-format msgid "%s: ASSERT: Invalid option: %d\n" msgstr "%s: ASSERT:無効なオプション: %d\n" #: ../parser_interface.c:147 ../parser_interface.c:150 +#: ../parser_interface.c:127 #, c-format msgid "Addition succeeded for \"%s\".\n" msgstr "「%s」に続く追加。\n" #: ../parser_interface.c:151 ../parser_interface.c:154 +#: ../parser_interface.c:131 #, c-format msgid "Replacement succeeded for \"%s\".\n" msgstr "「%s」に続く置換。\n" #: ../parser_interface.c:155 ../parser_interface.c:158 +#: ../parser_interface.c:135 #, c-format msgid "Removal succeeded for \"%s\".\n" msgstr "「%s」に続く削除。\n" @@ -132,6 +141,7 @@ msgstr "PANIC 不正増分バッファ %p pos %p ext %p size %d res %p\n" #: ../parser_interface.c:656 ../parser_interface.c:658 +#: ../parser_interface.c:446 #, c-format msgid "profile %s network rules not enforced\n" msgstr "" @@ -142,16 +152,19 @@ #: ../parser_interface.c:750 ../parser_interface.c:902 #: ../parser_interface.c:743 ../parser_interface.c:894 +#: ../parser_interface.c:518 ../parser_interface.c:669 #, c-format msgid "Unable to open %s - %s\n" msgstr "開けません %s - %s\n" #: ../parser_interface.c:776 ../parser_interface.c:768 +#: ../parser_interface.c:543 #, c-format msgid "Memory Allocation Error: Unable to remove ^%s\n" msgstr "メモリ割り当てエラー: ^%s を削除できません\n" #: ../parser_interface.c:789 ../parser_interface.c:781 +#: ../parser_interface.c:556 #, c-format msgid "Memory Allocation Error: Unable to remove %s:%s." msgstr "メモリ割り当てエラー: %s:%s を削除できません。" @@ -167,21 +180,23 @@ #: ../parser_interface.c:829 ../parser_interface.c:916 #: ../parser_interface.c:821 ../parser_interface.c:908 +#: ../parser_interface.c:582 #, c-format msgid "%s: Unable to write entire profile entry\n" msgstr "%s: プロファイルエントリ全体を書き込むことができません\n" #: ../parser_interface.c:839 ../parser_interface.c:831 +#: ../parser_interface.c:593 #, c-format msgid "%s: Unable to write entire profile entry to cache\n" msgstr "" -#: parser_lex.l:100 parser_lex.l:163 +#: parser_lex.l:100 parser_lex.l:163 parser_lex.l:169 #, c-format msgid "Could not open '%s'" msgstr "" -#: parser_lex.l:104 parser_lex.l:167 +#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 #, c-format msgid "fstat failed for '%s'" msgstr "" @@ -196,18 +211,18 @@ msgid "stat failed for '%s'" msgstr "" -#: parser_lex.l:155 parser_lex.l:133 +#: parser_lex.l:155 parser_lex.l:133 parser_lex.l:139 #, c-format msgid "Could not open '%s' in '%s'" msgstr "" #: parser_lex.l:284 parser_lex.l:322 parser_lex.l:362 parser_lex.l:399 -#: parser_lex.l:469 parser_lex.l:655 parser_lex.l:586 +#: parser_lex.l:469 parser_lex.l:655 parser_lex.l:586 parser_lex.l:638 #, c-format msgid "Found unexpected character: '%s'" msgstr "予期しない文字を検出しました: '%s'" -#: parser_lex.l:386 parser_lex.l:418 +#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 msgid "Variable declarations do not accept trailing commas" msgstr "" @@ -216,7 +231,7 @@ msgid "(network_mode) Found unexpected character: '%s'" msgstr "(network_mode) 予期しない文字が見つかりました:「%s」" -#: ../parser_main.c:333 ../parser_common.c:61 +#: ../parser_main.c:333 ../parser_common.c:61 ../parser_common.c:106 #, c-format msgid "Warning from %s (%s%sline %d): %s" msgstr "" @@ -226,7 +241,7 @@ msgid "%s: Could not allocate memory for subdomainbase mount point\n" msgstr "%s: サブドメインベースマウントポイントに対してメモリを割り当てることができませんでした\n" -#: ../parser_main.c:577 ../parser_main.c:616 +#: ../parser_main.c:577 ../parser_main.c:616 ../parser_main.c:479 #, c-format msgid "" "Warning: unable to find a suitable fs in %s, is it mounted?\n" @@ -235,7 +250,7 @@ "警告:適切なfsが %s に見つかりません。マウントされているか確認してください。\n" "--subdomainfsを使用して上書きしてください。\n" -#: ../parser_main.c:597 ../parser_main.c:635 +#: ../parser_main.c:597 ../parser_main.c:635 ../parser_main.c:498 #, c-format msgid "" "%s: Sorry. You need root privileges to run this program.\n" @@ -244,7 +259,7 @@ "%s: このプログラムを実行するには、ルート特権が必要です。\n" "\n" -#: ../parser_main.c:604 ../parser_main.c:642 +#: ../parser_main.c:604 ../parser_main.c:642 ../parser_main.c:505 #, c-format msgid "" "%s: Warning! You've set this program setuid root.\n" @@ -256,7 +271,7 @@ "\n" #: ../parser_main.c:704 ../parser_main.c:813 ../parser_main.c:836 -#: ../parser_main.c:946 +#: ../parser_main.c:946 ../parser_main.c:860 #, c-format msgid "Error: Could not read profile %s: %s.\n" msgstr "エラー:プロファイル %s: %s を読み込めませんでした。\n" @@ -272,25 +287,32 @@ #: parser_yacc.y:1042 parser_yacc.y:1078 parser_yacc.y:1082 parser_yacc.y:1092 #: parser_yacc.y:1102 parser_yacc.y:1201 parser_yacc.y:1223 parser_yacc.y:1234 #: parser_yacc.y:1309 parser_yacc.y:1327 parser_yacc.y:1334 parser_yacc.y:1385 +#: ../parser_main.c:735 ../parser_main.c:923 ../parser_main.c:1133 +#: ../parser_main.c:1187 parser_yacc.y:311 parser_yacc.y:462 parser_yacc.y:472 +#: parser_yacc.y:583 parser_yacc.y:662 parser_yacc.y:669 parser_yacc.y:1130 +#: parser_yacc.y:1166 parser_yacc.y:1170 parser_yacc.y:1180 parser_yacc.y:1190 +#: parser_yacc.y:1298 parser_yacc.y:1376 parser_yacc.y:1479 parser_yacc.y:1490 +#: parser_yacc.y:1565 parser_yacc.y:1583 parser_yacc.y:1590 parser_yacc.y:1639 +#: ../network.c:314 ../af_unix.cc:203 msgid "Memory allocation error." msgstr "メモリ割り当てエラー。" -#: ../parser_main.c:740 ../parser_main.c:872 +#: ../parser_main.c:740 ../parser_main.c:872 ../parser_main.c:757 #, c-format msgid "Cached load succeeded for \"%s\".\n" msgstr "" -#: ../parser_main.c:744 ../parser_main.c:876 +#: ../parser_main.c:744 ../parser_main.c:876 ../parser_main.c:761 #, c-format msgid "Cached reload succeeded for \"%s\".\n" msgstr "" -#: ../parser_main.c:910 ../parser_main.c:1058 +#: ../parser_main.c:910 ../parser_main.c:1058 ../parser_main.c:967 #, c-format msgid "%s: Errors found in file. Aborting.\n" msgstr "%s: ファイルにエラーが検出されました。中止しています。\n" -#: ../parser_misc.c:426 ../parser_misc.c:597 +#: ../parser_misc.c:426 ../parser_misc.c:597 ../parser_misc.c:339 msgid "" "Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n" "See the apparmor.d(5) manpage for details.\n" @@ -299,15 +321,15 @@ "詳細は、apparmor.d(5)のマニュアルページを参照してください。\n" #: ../parser_misc.c:467 ../parser_misc.c:474 ../parser_misc.c:638 -#: ../parser_misc.c:645 +#: ../parser_misc.c:645 ../parser_misc.c:380 ../parser_misc.c:387 msgid "Conflict 'a' and 'w' perms are mutually exclusive." msgstr "競合:パーミッション「a」と「w」は互いに排他的です。" -#: ../parser_misc.c:491 ../parser_misc.c:662 +#: ../parser_misc.c:491 ../parser_misc.c:662 ../parser_misc.c:404 msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified" msgstr "Execクォリファイア「i」は無効です、相反するクォリファイアがすでに指定されています" -#: ../parser_misc.c:502 ../parser_misc.c:673 +#: ../parser_misc.c:502 ../parser_misc.c:673 ../parser_misc.c:415 #, c-format msgid "" "Unconfined exec qualifier (%c%c) allows some dangerous environment variables " @@ -317,24 +339,24 @@ "apparmor.d」を参照してください。\n" #: ../parser_misc.c:510 ../parser_misc.c:551 ../parser_misc.c:681 -#: ../parser_misc.c:722 +#: ../parser_misc.c:722 ../parser_misc.c:423 ../parser_misc.c:464 #, c-format msgid "Exec qualifier '%c' invalid, conflicting qualifier already specified" msgstr "Execクォリファイア「%c」は無効です。競合するクォリファイアがすで指定されています" #: ../parser_misc.c:537 ../parser_misc.c:545 ../parser_misc.c:708 -#: ../parser_misc.c:716 +#: ../parser_misc.c:716 ../parser_misc.c:450 ../parser_misc.c:458 #, c-format msgid "" "Exec qualifier '%c%c' invalid, conflicting qualifier already specified" msgstr "Execクォリファイア'%c%c' は無効です。競合するクォリファイアがすでに指定されています" -#: ../parser_misc.c:593 ../parser_misc.c:764 +#: ../parser_misc.c:593 ../parser_misc.c:764 ../parser_misc.c:506 #, c-format msgid "Internal: unexpected mode character '%c' in input" msgstr "内部:予期しないモード文字「%c」が入力されています" -#: ../parser_misc.c:615 ../parser_misc.c:786 +#: ../parser_misc.c:615 ../parser_misc.c:786 ../parser_misc.c:528 #, c-format msgid "Internal error generated invalid perm 0x%llx\n" msgstr "内部エラーが発生しました。パーミッシオンが正しくありません 0x%llx\n" @@ -345,131 +367,133 @@ msgid "AppArmor parser error: %s\n" msgstr "AppArmorパーサエラー: %s\n" -#: ../parser_merge.c:92 ../parser_merge.c:91 +#: ../parser_merge.c:92 ../parser_merge.c:91 ../parser_merge.c:83 msgid "Couldn't merge entries. Out of Memory\n" msgstr "エントリをマージできませんでした。メモリ不足\n" -#: ../parser_merge.c:111 ../parser_merge.c:113 +#: ../parser_merge.c:111 ../parser_merge.c:113 ../parser_merge.c:105 #, c-format msgid "profile %s: has merged rule %s with conflicting x modifiers\n" msgstr "" -#: parser_yacc.y:236 parser_yacc.y:277 +#: parser_yacc.y:236 parser_yacc.y:277 parser_yacc.y:320 msgid "Profile attachment must begin with a '/'." msgstr "" -#: parser_yacc.y:260 parser_yacc.y:302 +#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 msgid "" "Profile names must begin with a '/', namespace or keyword 'profile' or 'hat'." msgstr "" -#: parser_yacc.y:296 parser_yacc.y:338 +#: parser_yacc.y:296 parser_yacc.y:338 parser_yacc.y:384 #, c-format msgid "Failed to create alias %s -> %s\n" msgstr "別名 %s -> %s を作成することができませんでした\n" -#: parser_yacc.y:417 parser_yacc.y:460 +#: parser_yacc.y:417 parser_yacc.y:460 parser_yacc.y:506 msgid "Profile flag chroot_relative conflicts with namespace_relative" msgstr "" -#: parser_yacc.y:421 parser_yacc.y:464 +#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 msgid "Profile flag mediate_deleted conflicts with delegate_deleted" msgstr "" -#: parser_yacc.y:424 parser_yacc.y:467 +#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 msgid "" "Profile flag attach_disconnected conflicts with no_attach_disconnected" msgstr "" -#: parser_yacc.y:427 parser_yacc.y:470 +#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 msgid "Profile flag chroot_attach conflicts with chroot_no_attach" msgstr "" -#: parser_yacc.y:441 parser_yacc.y:484 +#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 msgid "Profile flag 'debug' is no longer valid." msgstr "プロファイルフラグ'debug'は現在は利用できません。" -#: parser_yacc.y:463 parser_yacc.y:506 +#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 #, c-format msgid "Invalid profile flag: %s." msgstr "プロファイルフラグが正しくありません: %s" -#: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 +#: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 parser_yacc.y:594 msgid "Assert: `rule' returned NULL." msgstr "Assert:「rule」はNULLを返しています。" #: parser_yacc.y:501 parser_yacc.y:546 parser_yacc.y:552 parser_yacc.y:584 +#: parser_yacc.y:598 parser_yacc.y:630 msgid "" "Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', " "'p', or 'u'" msgstr "無効なモードです。拒否ルール内では「x」の前にExecクォリファイア「i」、「p」、または「u」を付けてはいけません。" -#: parser_yacc.y:524 parser_yacc.y:556 +#: parser_yacc.y:524 parser_yacc.y:556 parser_yacc.y:602 msgid "" "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'" msgstr "無効なモードです。「x」の前には実行修飾子「i」、「p」、「c」または「u」が必要です。" -#: parser_yacc.y:549 parser_yacc.y:587 +#: parser_yacc.y:549 parser_yacc.y:587 parser_yacc.y:633 msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'" msgstr "無効なモードです。「x」の前にクォリファイア「i」、「p」、または「u」が必要です" -#: parser_yacc.y:574 parser_yacc.y:612 parser_yacc.y:614 +#: parser_yacc.y:574 parser_yacc.y:612 parser_yacc.y:614 parser_yacc.y:660 msgid "Assert: `network_rule' return invalid protocol." msgstr "Assert:「network_rule」は無効なプロトコルを返しています。" -#: parser_yacc.y:649 parser_yacc.y:696 +#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 msgid "Assert: `change_profile' returned NULL." msgstr "Assert:「change_profile」はNULLを返しています。" -#: parser_yacc.y:680 parser_yacc.y:720 +#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 msgid "Assert: 'hat rule' returned NULL." msgstr "Assert:「hat rule」はNULLを返しています。" -#: parser_yacc.y:689 parser_yacc.y:729 +#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 msgid "Assert: 'local_profile rule' returned NULL." msgstr "Assert: 「local_profile rule」は NULL を返しています。" -#: parser_yacc.y:824 parser_yacc.y:885 +#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 #, c-format msgid "Unset boolean variable %s used in if-expression" msgstr "未設定のブール値変数%sがif式に使用されています" -#: parser_yacc.y:882 parser_yacc.y:986 +#: parser_yacc.y:882 parser_yacc.y:986 parser_yacc.y:1092 msgid "unsafe rule missing exec permissions" msgstr "ルールが安全ではありません。execパーミッションがありません" -#: parser_yacc.y:901 parser_yacc.y:954 +#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 msgid "subset can only be used with link rules." msgstr "サブセットはリンクルールと共にのみ使用することができます" -#: parser_yacc.y:903 parser_yacc.y:956 +#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 msgid "link and exec perms conflict on a file rule using ->" msgstr "以下のファイルルール内でリンクとexecパーミッションが矛盾しています ->" -#: parser_yacc.y:905 parser_yacc.y:958 +#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 msgid "link perms are not allowed on a named profile transition.\n" msgstr "リンクパーミッションは名前付きプロファイルの変更で使用することはできません。\n" -#: parser_yacc.y:921 parser_yacc.y:1003 +#: parser_yacc.y:921 parser_yacc.y:1003 parser_yacc.y:1109 #, c-format msgid "missing an end of line character? (entry: %s)" msgstr "行末文字が欠けていますか?(entry: %s)" #: parser_yacc.y:975 parser_yacc.y:985 parser_yacc.y:1057 parser_yacc.y:1067 +#: parser_yacc.y:1145 parser_yacc.y:1155 msgid "Invalid network entry." msgstr "無効なネットワークエントリ" -#: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 +#: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 parser_yacc.y:1510 #, c-format msgid "Invalid capability %s." msgstr "無効な機能です %s" -#: parser_yacc.y:1066 parser_yacc.y:1269 +#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 #, c-format msgid "AppArmor parser error for %s%s%s at line %d: %s\n" msgstr "" -#: parser_yacc.y:1072 parser_yacc.y:1275 +#: parser_yacc.y:1072 parser_yacc.y:1275 parser_yacc.y:1531 #, c-format msgid "AppArmor parser error,%s%s line %d: %s\n" msgstr "" @@ -479,18 +503,18 @@ msgid "%s: Illegal open {, nesting groupings not allowed\n" msgstr "%s: 不正オープン{、入れ子グループ分けは許可されていません\n" -#: ../parser_regex.c:265 ../parser_regex.c:274 +#: ../parser_regex.c:265 ../parser_regex.c:274 ../parser_regex.c:278 #, c-format msgid "%s: Regex grouping error: Invalid number of items between {}\n" msgstr "%s: Regexグループ分けエラー:{}の間にある項目の無効数\n" -#: ../parser_regex.c:271 ../parser_regex.c:280 +#: ../parser_regex.c:271 ../parser_regex.c:280 ../parser_regex.c:284 #, c-format msgid "" "%s: Regex grouping error: Invalid close }, no matching open { detected\n" msgstr "%s: Regexグループ分けエラー:無効なクローズ}、一致するオープンがありません{ detected\n" -#: ../parser_regex.c:337 ../parser_regex.c:343 +#: ../parser_regex.c:337 ../parser_regex.c:343 ../parser_regex.c:361 #, c-format msgid "" "%s: Regex grouping error: Unclosed grouping or character class, expecting " @@ -502,17 +526,17 @@ msgid "%s: Internal buffer overflow detected, %d characters exceeded\n" msgstr "%s: 内部バッファオーバーフローが検出されました、%d文字超えています\n" -#: ../parser_regex.c:355 ../parser_regex.c:361 +#: ../parser_regex.c:355 ../parser_regex.c:361 ../parser_regex.c:377 #, c-format msgid "%s: Unable to parse input line '%s'\n" msgstr "%s: 入力行「%s」を解析できません\n" -#: ../parser_regex.c:397 ../parser_regex.c:405 +#: ../parser_regex.c:397 ../parser_regex.c:405 ../parser_regex.c:421 #, c-format msgid "%s: Invalid profile name '%s' - bad regular expression\n" msgstr "" -#: ../parser_policy.c:202 ../parser_policy.c:402 +#: ../parser_policy.c:202 ../parser_policy.c:402 ../parser_policy.c:375 #, c-format msgid "ERROR merging rules for profile %s, failed to load\n" msgstr "プロファイル %s のルールをマージ中にエラーが発生しました。ロードできませんでした\n" @@ -528,17 +552,17 @@ "\t「*」、「?」、文字範囲、交代は許可されません。\n" "\t「**」はルールの末尾にのみ使用できます。\n" -#: ../parser_policy.c:279 ../parser_policy.c:359 +#: ../parser_policy.c:279 ../parser_policy.c:359 ../parser_policy.c:332 #, c-format msgid "ERROR processing regexs for profile %s, failed to load\n" msgstr "プロファイル %s のregex処理中にエラーが発生しました。ロードできませんでした\n" -#: ../parser_policy.c:306 ../parser_policy.c:389 +#: ../parser_policy.c:306 ../parser_policy.c:389 ../parser_policy.c:362 #, c-format msgid "ERROR expanding variables for profile %s, failed to load\n" msgstr "プロファイル %s の変数の拡張中にエラーが発生しました。ロードできませんでした\n" -#: ../parser_policy.c:390 ../parser_policy.c:382 +#: ../parser_policy.c:390 ../parser_policy.c:382 ../parser_policy.c:355 #, c-format msgid "ERROR adding hat access rule for profile %s\n" msgstr "プロファイル %s にハットアクセスルールを追加する際にエラーになりました\n" @@ -568,30 +592,31 @@ msgid "%s: Errors found in combining rules postprocessing. Aborting.\n" msgstr "%s: 規則後処理の結合中にエラーが見つかりました。中断しています。\n" -#: parser_lex.l:180 +#: parser_lex.l:180 parser_lex.l:186 #, c-format msgid "Could not process include directory '%s' in '%s'" msgstr "" -#: ../parser_main.c:660 +#: ../parser_main.c:660 ../parser_main.c:523 msgid "Feature buffer full." msgstr "" -#: ../parser_main.c:1115 ../parser_main.c:1132 +#: ../parser_main.c:1115 ../parser_main.c:1132 ../parser_main.c:1024 +#: ../parser_main.c:1041 msgid "Out of memory" msgstr "" -#: ../parser_main.c:1182 +#: ../parser_main.c:1182 ../parser_main.c:1091 #, c-format msgid "Can't create cache directory: %s\n" msgstr "" -#: ../parser_main.c:1185 +#: ../parser_main.c:1185 ../parser_main.c:1094 #, c-format msgid "File in cache directory location: %s\n" msgstr "" -#: ../parser_main.c:1188 +#: ../parser_main.c:1188 ../parser_main.c:1097 #, c-format msgid "Can't update cache directory: %s\n" msgstr "" @@ -606,11 +631,11 @@ msgid "Internal error generated invalid DBus perm 0x%x\n" msgstr "" -#: parser_yacc.y:575 +#: parser_yacc.y:575 parser_yacc.y:621 msgid "deny prefix not allowed" msgstr "" -#: parser_yacc.y:612 +#: parser_yacc.y:612 parser_yacc.y:658 msgid "owner prefix not allowed" msgstr "" @@ -626,41 +651,41 @@ msgid "owner prefix not allow on capability rules" msgstr "" -#: parser_yacc.y:1357 +#: parser_yacc.y:1357 parser_yacc.y:1613 #, c-format msgid "invalid mount conditional %s%s" msgstr "" -#: parser_yacc.y:1374 +#: parser_yacc.y:1374 parser_yacc.y:1628 msgid "bad mount rule" msgstr "" -#: parser_yacc.y:1381 +#: parser_yacc.y:1381 parser_yacc.y:1635 msgid "mount point conditions not currently supported" msgstr "" -#: parser_yacc.y:1398 +#: parser_yacc.y:1398 parser_yacc.y:1650 #, c-format msgid "invalid pivotroot conditional '%s'" msgstr "" -#: ../parser_regex.c:241 +#: ../parser_regex.c:241 ../parser_regex.c:236 #, c-format msgid "" "%s: Regex grouping error: Invalid close ], no matching open [ detected\n" msgstr "" -#: ../parser_regex.c:257 +#: ../parser_regex.c:257 ../parser_regex.c:256 #, c-format msgid "%s: Regex grouping error: Exceeded maximum nesting of {}\n" msgstr "" -#: ../parser_policy.c:366 +#: ../parser_policy.c:366 ../parser_policy.c:339 #, c-format msgid "ERROR processing policydb rules for profile %s, failed to load\n" msgstr "" -#: ../parser_policy.c:396 +#: ../parser_policy.c:396 ../parser_policy.c:369 #, c-format msgid "ERROR replacing aliases for profile %s, failed to load\n" msgstr "" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/app-install-data.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/app-install-data.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/app-install-data.po 2014-07-09 09:08:47.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/app-install-data.po 2015-02-19 15:12:06.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:45+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:29+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" @@ -206,7 +206,6 @@ msgid "Xubuntu restricted extras" msgstr "Xubuntu restricted extras" -#: ../menu-data-codecs/gstreamer-bad-multiverse.desktop.in.h:1 #: ../menu-data-codecs/gstreamer-bad.desktop.in.h:1 msgid "Codecs to play" msgstr "再生用コーデック" @@ -554,12 +553,10 @@ msgid "Configure what gets logged in your Zeitgeist activity log" msgstr "Zeitgeist アクティビティログに記録する内容を設定します" -#: ../menu-data/activity-log-manager:gnome-activity-log-manager-panel.desktop.in.h:1 #: ../menu-data/activity-log-manager:unity-activity-log-manager-panel.desktop.in.h:1 msgid "Security & Privacy" -msgstr "" +msgstr "セキュリティとプライバシー" -#: ../menu-data/activity-log-manager:gnome-activity-log-manager-panel.desktop.in.h:2 #: ../menu-data/activity-log-manager:unity-activity-log-manager-panel.desktop.in.h:2 msgid "Privacy and Activity Manager" msgstr "プライバシーとアクティビティマネージャー" @@ -575,6 +572,7 @@ #: ../menu-data/address-book-app:address-book-app.desktop.in.h:1 #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1 #: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 +#: ../menu-data/sync-monitor-uoa:sync-monitor-contacts.desktop.in.h:2 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 msgid "Contacts" msgstr "連絡先" @@ -697,6 +695,7 @@ msgstr "KDE ニュースフィードリーダー" #: ../menu-data/alacarte:alacarte.desktop.in.h:1 +#: ../menu-data/mozo:mozo.desktop.in.h:1 msgid "Main Menu" msgstr "メインメニュー" @@ -727,11 +726,11 @@ #: ../menu-data/algobox:algobox.desktop.in.h:1 msgid "Algorithmics introduction software" -msgstr "" +msgstr "アルゴリズム紹介ソフトウェア" #: ../menu-data/algobox:algobox.desktop.in.h:2 msgid "AlgoBox" -msgstr "" +msgstr "AlgoBox" #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1 msgid "Alien Arena" @@ -999,7 +998,7 @@ #: ../menu-data/apper:kde4__apper_appsetup.desktop.in.h:1 msgid "Listaller Package Installer" -msgstr "" +msgstr "Listallerパッケージインストーラー" #: ../menu-data/apper:kde4__apper_appsetup.desktop.in.h:2 msgid "Tool to install new 3rd-party software" @@ -1162,7 +1161,7 @@ #: ../menu-data/ardour3:ardour3.desktop.in.h:1 msgid "Ardour3" -msgstr "" +msgstr "Ardour3" #: ../menu-data/arduino:arduino.desktop.in.h:1 msgid "Arduino IDE" @@ -1239,7 +1238,7 @@ #: ../menu-data/artikulate:kde4__artikulate.desktop.in.h:2 msgid "Artikulate" -msgstr "" +msgstr "Artikulate" #: ../menu-data/asc:asc.desktop.in.h:1 msgid "Advanced Strategic Command" @@ -1328,6 +1327,7 @@ msgstr "Attal" #: ../menu-data/attal:attal.desktop.in.h:2 +#: ../menu-data/triplea:triplea.desktop.in.h:2 msgid "Turn based strategy game" msgstr "ターン制の戦略ゲーム" @@ -1556,7 +1556,6 @@ msgid "Bangarang" msgstr "Bangarang" -#: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2 #: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1 #: ../menu-data/mediaplayer-app:mediaplayer-app.desktop.in.h:1 @@ -1675,7 +1674,7 @@ #: ../menu-data/berusky2:berusky2.desktop.in.h:1 msgid "Berusky2" -msgstr "" +msgstr "Berusky2" #: ../menu-data/berusky2:berusky2.desktop.in.h:2 msgid "Rescue the bugs!" @@ -2024,15 +2023,15 @@ #: ../menu-data/bodega-client:kde4__active-addons.desktop.in.h:1 msgid "Add Ons" -msgstr "" +msgstr "アドオン" #: ../menu-data/bodega-client:kde4__active-addons.desktop.in.h:2 msgid "Content store for Plasma Active" -msgstr "" +msgstr "Plasma Active向けコンテンツストア" #: ../menu-data/bodega-client:kde4__vivaldi-primavera.desktop.in.h:1 msgid "primavera" -msgstr "" +msgstr "primavera" #: ../menu-data/boinc-manager:boinc-manager.desktop.in.h:1 msgid "BOINC Manager" @@ -2084,7 +2083,7 @@ #: ../menu-data/bossa:bossa.desktop.in.h:1 msgid "BOSSA" -msgstr "" +msgstr "BOSSA" #: ../menu-data/bossa:bossa.desktop.in.h:2 msgid "Program Atmel's SAM ARM microcontrollers" @@ -2296,7 +2295,7 @@ #: ../menu-data/cairo-dock-core:cairo-dock.desktop.in.h:1 msgid "Cairo-Dock" -msgstr "" +msgstr "Cairo-Dock" #: ../menu-data/cairo-dock-core:cairo-dock.desktop.in.h:2 msgid "A light and eye-candy dock and desklets for your desktop." @@ -2367,6 +2366,7 @@ msgid "Write presentation documents" msgstr "プレゼンテーションのドキュメントを作成します" +#: ../menu-data/calligrawords:kde4__calligrawords_ascii.desktop.in.h:1 #: ../menu-data/calligrawords:kde4__words.desktop.in.h:1 msgid "Calligra Words" msgstr "Calligra Words" @@ -2607,11 +2607,11 @@ #: ../menu-data/chessx:chessx.desktop.in.h:1 msgid "ChessX" -msgstr "" +msgstr "ChessX" #: ../menu-data/chessx:chessx.desktop.in.h:2 msgid "Chess database" -msgstr "" +msgstr "チェスデータベース" #: ../menu-data/childsplay:childsplay.desktop.in.h:1 msgid "Childsplay" @@ -2673,6 +2673,7 @@ #: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:3 #: ../menu-data/firefox:firefox.desktop.in.h:3 +#: ../menu-data/konsole:kde4__konsole.desktop.in.h:3 #: ../menu-data/latexila-data:latexila.desktop.in.h:3 #: ../menu-data/terminator:terminator.desktop.in.h:3 msgid "Open a New Window" @@ -2704,7 +2705,7 @@ #: ../menu-data/cirkuit:kde4__cirkuit.desktop.in.h:1 msgid "Cirkuit" -msgstr "" +msgstr "Cirkuit" #: ../menu-data/cirkuit:kde4__cirkuit.desktop.in.h:2 msgid "A program to draw circuits and diagrams" @@ -2805,7 +2806,6 @@ #: ../menu-data/clementine:clementine.desktop.in.h:6 #: ../menu-data/minitube:minitube.desktop.in.h:5 #: ../menu-data/qmmp:qmmp.desktop.in.h:6 -#: ../menu-data/quodlibet:quodlibet.desktop.in.h:5 #: ../menu-data/totem:totem.desktop.in.h:5 msgid "Previous" msgstr "戻る" @@ -2813,7 +2813,6 @@ #: ../menu-data/clementine:clementine.desktop.in.h:7 #: ../menu-data/minitube:minitube.desktop.in.h:4 #: ../menu-data/qmmp:qmmp.desktop.in.h:7 -#: ../menu-data/quodlibet:quodlibet.desktop.in.h:4 #: ../menu-data/totem:totem.desktop.in.h:4 msgid "Next" msgstr "進む" @@ -2925,7 +2924,7 @@ #: ../menu-data/colobot:colobot.desktop.in.h:1 msgid "Colobot" -msgstr "" +msgstr "Colobot" #: ../menu-data/colobot:colobot.desktop.in.h:2 msgid "Colonize with bots" @@ -2949,6 +2948,7 @@ msgid "Install ICC profiles" msgstr "ICC プロファイルをインストールします" +#: ../menu-data/cinnamon-control-center:cinnamon-color-panel.desktop.in.h:1 #: ../menu-data/colord-kde:kde4__kcm_colord.desktop.in.h:1 #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-color-panel.desktop.in.h:1 @@ -3053,7 +3053,7 @@ #: ../menu-data/converseen:converseen.desktop.in.h:1 msgid "Converseen" -msgstr "" +msgstr "Converseen" #: ../menu-data/converseen:converseen.desktop.in.h:2 msgid "Batch image converter" @@ -3123,13 +3123,13 @@ msgid "Puzzle game similar to Tetris Attack" msgstr "パネルでポンに似たパズルゲーム" -#: ../menu-data/crawl-tiles:crawl-tiles.desktop.in.h:1 +#: ../menu-data/crawl:crawl.desktop.in.h:1 msgid "Dungeon Crawl" msgstr "Dungeon Crawl" #: ../menu-data/cream-melange:cream-melange.desktop.in.h:1 msgid "Melange" -msgstr "" +msgstr "Melange" #: ../menu-data/cream-melange:cream-melange.desktop.in.h:2 msgid "Widgets for your desktop" @@ -3233,7 +3233,7 @@ #: ../menu-data/cyclograph-gtk2:cyclograph-gtk.desktop.in.h:1 msgid "Cyclograph GTK" -msgstr "" +msgstr "Cyclograph GTK" #: ../menu-data/cyclograph-gtk2:cyclograph-gtk.desktop.in.h:2 #: ../menu-data/cyclograph-gtk3:cyclograph-gtk3.desktop.in.h:2 @@ -3243,11 +3243,11 @@ #: ../menu-data/cyclograph-gtk3:cyclograph-gtk3.desktop.in.h:1 msgid "Cyclograph GTK3" -msgstr "" +msgstr "Cyclograph GTK3" #: ../menu-data/cyclograph-qt4:cyclograph-qt.desktop.in.h:1 msgid "Cyclograph Qt" -msgstr "" +msgstr "Cyclograph Qt" #: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1 msgid "Cynthiune" @@ -3353,11 +3353,11 @@ msgid "GUI for Direct Connect Protocol" msgstr "直接接続プロトコル用のGUI" -#: ../menu-data/dconf-editor:dconf-editor.desktop.in.h:1 +#: ../menu-data/dconf-editor:ca.desrt.dconf-editor.desktop.in.h:1 msgid "dconf Editor" msgstr "dconf エディター" -#: ../menu-data/dconf-editor:dconf-editor.desktop.in.h:2 +#: ../menu-data/dconf-editor:ca.desrt.dconf-editor.desktop.in.h:2 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2 msgid "Directly edit your entire configuration database" msgstr "設定データベースを直接編集します" @@ -3568,7 +3568,7 @@ #: ../menu-data/dianara:dianara.desktop.in.h:1 msgid "Dianara" -msgstr "" +msgstr "Dianara" #: ../menu-data/dianara:dianara.desktop.in.h:2 msgid "A pump.io social network client" @@ -3735,6 +3735,7 @@ msgid "Dolphin" msgstr "Dolphin" +#: ../menu-data/caja:caja.desktop.in.h:2 #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2 #: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 msgid "File Manager" @@ -4011,7 +4012,7 @@ #: ../menu-data/eagle:eagle.desktop.in.h:2 msgid "Eagle" -msgstr "" +msgstr "Eagle" #: ../menu-data/easychem:easychem.desktop.in.h:1 msgid "EasyChem Chemical Structures Editor" @@ -4040,7 +4041,6 @@ msgstr "マウスジェスチャを利用してデスクトップを制御します" #: ../menu-data/easystroke:easystroke.desktop.in.h:3 -#: ../menu-data/plasma-active:kde4__active-about.desktop.in.h:1 msgid "About" msgstr "このアプリケーションについて" @@ -4348,7 +4348,7 @@ #: ../menu-data/encuentro:encuentro.desktop.in.h:1 msgid "Encuentro" -msgstr "" +msgstr "Encuentro" #: ../menu-data/encuentro:encuentro.desktop.in.h:2 msgid "" @@ -4408,7 +4408,7 @@ msgid "Image Viewer" msgstr "画像ビューアー" -#: ../menu-data/eog:eog.desktop.in.h:2 +#: ../menu-data/eog:eog.desktop.in.h:2 ../menu-data/eom:eom.desktop.in.h:2 msgid "Browse and rotate images" msgstr "画像の閲覧や回転を行います" @@ -4490,7 +4490,7 @@ #: ../menu-data/etm-qt:etm_qt.desktop.in.h:1 msgid "etm_qt" -msgstr "" +msgstr "etm_qt" #: ../menu-data/etm-qt:etm_qt.desktop.in.h:2 msgid "Manage events and tasks using simple text files" @@ -4547,15 +4547,15 @@ #: ../menu-data/evilwm:evilwm.desktop.in.h:1 msgid "evilwm" -msgstr "" +msgstr "evilwm" #: ../menu-data/evince-common:evince-previewer.desktop.in.h:1 msgid "Print Preview" -msgstr "" +msgstr "印刷プレビュー" #: ../menu-data/evince-common:evince-previewer.desktop.in.h:2 msgid "Preview before printing" -msgstr "" +msgstr "印刷前にプレビューします" #: ../menu-data/evince-common:evince.desktop.in.h:1 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2 @@ -4567,6 +4567,7 @@ msgid "Document Viewer" msgstr "ドキュメントビューアー" +#: ../menu-data/atril:atril.desktop.in.h:2 #: ../menu-data/evince-common:evince.desktop.in.h:2 msgid "View multi-page documents" msgstr "複数ページのドキュメントを閲覧します" @@ -4635,6 +4636,7 @@ #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 +#: ../menu-data/mate-terminal:mate-terminal.desktop.in.h:2 #: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2 #: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2 #: ../menu-data/rxvt-unicode-256color:rxvt-unicode.desktop.in.h:2 @@ -4771,7 +4773,7 @@ #: ../menu-data/fceux:fceux.desktop.in.h:1 msgid "Fceux" -msgstr "" +msgstr "Fceux" #: ../menu-data/fceux:fceux.desktop.in.h:2 msgid "Emulate NES ROMs" @@ -4811,17 +4813,17 @@ msgid "Start Input Method" msgstr "インプットメソッドを起動する" -#: ../menu-data/fcitx-qimpanel-configtool:fcitx-qimpanel-configtool.desktop.in.h:1 +#: ../menu-data/fcitx-ui-qimpanel:fcitx-qimpanel-configtool.desktop.in.h:1 msgid "fcitx-qimpanel-configtool" -msgstr "" +msgstr "fcitx-qimpanel-configtool" -#: ../menu-data/fcitx-qimpanel-configtool:fcitx-qimpanel-configtool.desktop.in.h:2 +#: ../menu-data/fcitx-ui-qimpanel:fcitx-qimpanel-configtool.desktop.in.h:2 msgid "fcitx皮肤配置向导-UbuntuKylin" msgstr "" #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1 msgid "Fcitx Light UI" -msgstr "" +msgstr "Fcitx Light UI" #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2 msgid "Chinese Input Method (Use Light weight UI)" @@ -4912,6 +4914,7 @@ msgid "Archive Manager" msgstr "書庫マネージャー" +#: ../menu-data/engrampa:engrampa.desktop.in.h:2 #: ../menu-data/file-roller:file-roller.desktop.in.h:2 msgid "Create and modify an archive" msgstr "書庫を作成、修正します" @@ -4973,11 +4976,11 @@ msgid "Peak fitting and data analysis" msgstr "ピーク近似およびデータ分析" -#: ../menu-data/five-or-more:glines.desktop.in.h:1 +#: ../menu-data/five-or-more:five-or-more.desktop.in.h:1 msgid "Five or More" msgstr "Five or More" -#: ../menu-data/five-or-more:glines.desktop.in.h:2 +#: ../menu-data/five-or-more:five-or-more.desktop.in.h:2 msgid "Remove colored balls from the board by forming lines" msgstr "色の付いた玉を並べて盤面から取り去ってください" @@ -5232,7 +5235,7 @@ msgid "fotoxx" msgstr "fotoxx" -#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:2 +#: ../menu-data/fotoxx:fotoxx.desktop.in.h:2 msgid "Edit photos and manage collections" msgstr "写真の編集ならびにコレクションの管理" @@ -5240,7 +5243,7 @@ msgid "Four-in-a-Row" msgstr "四目並べ" -#: ../menu-data/four-in-a-row:gnect.desktop.in.h:2 +#: ../menu-data/four-in-a-row:four-in-a-row.desktop.in.h:2 msgid "Make lines of the same color to win" msgstr "同じ色のラインを作って競い合ってください" @@ -5613,7 +5616,7 @@ msgid "FS-UAE Amiga Emulator" msgstr "" -#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1 +#: ../menu-data/fsl-5.0-core:fsl-5.0-core.desktop.in.h:1 msgid "Software Collection for (f)MRI Data Analysis" msgstr "(f)MRI データ解析用ソフトウェア集" @@ -6264,13 +6267,14 @@ #: ../menu-data/gedit:gedit.desktop.in.h:1 #: ../menu-data/jedit:jedit.desktop.in.h:2 -#: ../menu-data/scribes:scribes.desktop.in.h:2 +#: ../menu-data/pluma:pluma.desktop.in.h:2 #: ../menu-data/vim-gui-common:gvim.desktop.in.h:2 msgid "Edit text files" msgstr "テキストファイルの編集" #: ../menu-data/gedit:gedit.desktop.in.h:2 #: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 +#: ../menu-data/nedit:nedit.desktop.in.h:2 msgid "Text Editor" msgstr "テキストエディター" @@ -6902,11 +6906,11 @@ msgid "3-D finite element mesh generator" msgstr "3D 有限要素メッシュ生成器" -#: ../menu-data/gmtp:gMTP.desktop.in.h:1 +#: ../menu-data/gmtp:gmtp.desktop.in.h:1 msgid "gMTP" msgstr "gMTP" -#: ../menu-data/gmtp:gMTP.desktop.in.h:2 +#: ../menu-data/gmtp:gmtp.desktop.in.h:2 msgid "A simple MTP Client for MP3 Players" msgstr "シンプルなMP3再生用MTP クライアント" @@ -7041,7 +7045,7 @@ msgid "Perform arithmetic, scientific or financial calculations" msgstr "算術、科学、財務の計算を行います" -#: ../menu-data/gnome-chess:glchess.desktop.in.h:1 +#: ../menu-data/gnome-chess:gnome-chess.desktop.in.h:1 msgid "Chess" msgstr "チェス" @@ -7049,11 +7053,11 @@ msgid "Play the classic two-player boardgame of chess" msgstr "古典的な対戦型のチェスゲームをお楽しみください" -#: ../menu-data/gnome-clocks:gnome-clocks.desktop.in.h:1 +#: ../menu-data/gnome-clocks:org.gnome.clocks.desktop.in.h:1 msgid "GNOME Clocks" msgstr "GNOMEクロック" -#: ../menu-data/gnome-clocks:gnome-clocks.desktop.in.h:2 +#: ../menu-data/gnome-clocks:org.gnome.clocks.desktop.in.h:2 msgid "Clocks for world times, plus alarms, stopwatch and a timer" msgstr "世界時計、アラーム、ストップウォッチ、タイマー機能付き時計" @@ -7128,11 +7132,11 @@ msgstr "" "ファイル、ブックマーク、アプリケーション、音楽、コンタクトリスト、その他の操作を、可能な限り速くします(ただし、限界より速くなりません)。" -#: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:1 +#: ../menu-data/gnome-documents:org.gnome.Documents.desktop.in.h:1 msgid "Documents" msgstr "Documents" -#: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2 +#: ../menu-data/gnome-documents:org.gnome.Documents.desktop.in.h:2 msgid "Access, manage and share documents" msgstr "文書の検索・管理・共有をする" @@ -7146,6 +7150,7 @@ #: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1 #: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2 +#: ../menu-data/mate-control-center:mate-font-viewer.desktop.in.h:1 msgid "Font Viewer" msgstr "フォントビューアー" @@ -7181,11 +7186,11 @@ msgid "Play the popular Hearts card game" msgstr "人気のあるトランプゲーム「ハーツ」で遊ぶ" -#: ../menu-data/gnome-klotski:gnotski.desktop.in.h:1 +#: ../menu-data/gnome-klotski:gnome-klotski.desktop.in.h:1 msgid "Klotski" msgstr "Klotski" -#: ../menu-data/gnome-klotski:gnotski.desktop.in.h:2 +#: ../menu-data/gnome-klotski:gnome-klotski.desktop.in.h:2 msgid "Slide blocks to solve the puzzle" msgstr "ブロックをずらしながらパズルを解いてください" @@ -7197,11 +7202,11 @@ msgid "Configure your remote control" msgstr "赤外線リモコンの設定を行います" -#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:1 msgid "Mahjongg" msgstr "GNOME 上海" -#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:2 msgid "Disassemble a pile of tiles by removing matching pairs" msgstr "同じ牌を取り去って牌の山を崩してください" @@ -7246,12 +7251,12 @@ msgid "Configure defaults for GStreamer applications" msgstr "GStreamer アプリケーションのデフォルト値を設定します" -#: ../menu-data/gnome-mines:gnomine.desktop.in.h:1 +#: ../menu-data/gnome-mines:gnome-mines.desktop.in.h:1 #: ../menu-data/sgt-puzzles:sgt-mines.desktop.in.h:1 msgid "Mines" msgstr "GNOME マインスイーパー" -#: ../menu-data/gnome-mines:gnomine.desktop.in.h:2 +#: ../menu-data/gnome-mines:gnome-mines.desktop.in.h:2 #: ../menu-data/sgt-puzzles:sgt-mines.desktop.in.h:2 msgid "Clear hidden mines from a minefield" msgstr "地雷原から見えない地雷を除去してください" @@ -7352,7 +7357,7 @@ #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:1 msgid "Gnome Paint Drawing Editor" -msgstr "" +msgstr "GNOMEペイント・ドローエディター" #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2 msgid "Create and Edit Drawings or Images" @@ -7366,11 +7371,11 @@ msgid "Receive and send text messages from your mobile phone" msgstr "携帯電話からテキストメッセージを送受信します" -#: ../menu-data/gnome-photos:gnome-photos.desktop.in.h:1 +#: ../menu-data/gnome-photos:org.gnome.Photos.desktop.in.h:1 msgid "Photos" msgstr "" -#: ../menu-data/gnome-photos:gnome-photos.desktop.in.h:2 +#: ../menu-data/gnome-photos:org.gnome.Photos.desktop.in.h:2 msgid "Access, organize and share photos" msgstr "" @@ -7383,10 +7388,12 @@ msgstr "ケーキは嘘つかない" #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1 +#: ../menu-data/mate-power-manager:mate-power-statistics.desktop.in.h:1 msgid "Power Statistics" msgstr "電源の統計" #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2 +#: ../menu-data/mate-power-manager:mate-power-statistics.desktop.in.h:2 msgid "Observe power management" msgstr "電源管理を監視します" @@ -7428,6 +7435,8 @@ msgid "GNOME Shell Classic" msgstr "" +#: ../menu-data/cinnamon:cinnamon.desktop.in.h:2 +#: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:2 #: ../menu-data/gnome-shell-extensions:gnome-shell-classic.desktop.in.h:2 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2 msgid "Window management and application launching" @@ -7494,6 +7503,7 @@ msgstr "GNOMEシステムモニター" #: ../menu-data/gnome-system-monitor:gnome-system-monitor-kde.desktop.in.h:2 +#: ../menu-data/mate-system-monitor:mate-system-monitor.desktop.in.h:2 msgid "View current processes and monitor system state" msgstr "現在のプロセスを表示してシステムの状態を監視します" @@ -7533,10 +7543,12 @@ msgstr "GNOME 3の詳細設定を行います" #: ../menu-data/gnome-user-share:gnome-user-share-properties.desktop.in.h:1 +#: ../menu-data/mate-user-share:mate-user-share-properties.desktop.in.h:1 msgid "Personal File Sharing" msgstr "パーソナルファイル共有" #: ../menu-data/gnome-user-share:gnome-user-share-properties.desktop.in.h:2 +#: ../menu-data/mate-user-share:mate-user-share-properties.desktop.in.h:2 msgid "Preferences for sharing of files" msgstr "ファイル共有の設定" @@ -8394,7 +8406,7 @@ #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2 msgid "Save vector images of application windows" -msgstr "" +msgstr "アプリケーションウィンドウのベクター画像を保存する" #: ../menu-data/gtkam:gtkam.desktop.in.h:1 msgid "Gtkam Digital Camera Browser" @@ -8910,7 +8922,6 @@ msgid "HexChat" msgstr "" -#: ../menu-data/hexchat:hexchat.desktop.in.h:2 #: ../menu-data/xchat:xchat.desktop.in.h:2 msgid "Chat with other people using Internet Relay Chat" msgstr "Internet Relay Chat を利用して他の人とチャットする" @@ -9335,7 +9346,7 @@ msgid "IDLE" msgstr "IDLE" -#: ../menu-data/idle:idle.desktop.in.h:2 +#: ../menu-data/eric:eric.desktop.in.h:2 ../menu-data/idle:idle.desktop.in.h:2 msgid "Integrated Development Environment for Python" msgstr "Python 用統合開発環境" @@ -9453,7 +9464,7 @@ #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:1 msgid "Insanity testing system" -msgstr "" +msgstr "システムを徹底的にテストする" #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:2 msgid "Run automated tests" @@ -9512,7 +9523,7 @@ #: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4 #: ../menu-data/ipython3-qtconsole:ipython3-qtconsole.desktop.in.h:4 msgid "Pylab (inline plots)" -msgstr "" +msgstr "Pylab (インラインでグラフ描画する)" #: ../menu-data/ipython3-qtconsole:ipython3-qtconsole.desktop.in.h:2 msgid "IPython3 Qt console" @@ -9537,7 +9548,7 @@ #: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2 msgid "A simple OBEX file transfer applet" -msgstr "" +msgstr "OBEXファイルを転送するシンプルなアプレット" #: ../menu-data/iriverter:iriverter.desktop.in.h:1 msgid "iriverter" @@ -9553,7 +9564,7 @@ #: ../menu-data/isag:isag.desktop.in.h:2 msgid "Interactive System Activity Grapher for sysstat" -msgstr "" +msgstr "sysstat向けにインタラクティブなシステム動作グラフを作成します" #: ../menu-data/isenkram:isenkramd.desktop.in.h:1 msgid "Isenkram" @@ -9561,7 +9572,7 @@ #: ../menu-data/isenkram:isenkramd.desktop.in.h:2 msgid "Suggest new packages when hardware devices are plugged in" -msgstr "" +msgstr "ハードウェア機器を接続した際に新しいパッケージを提案します" #: ../menu-data/isomaster:isomaster.desktop.in.h:1 msgid "ISO Master" @@ -9637,7 +9648,7 @@ #: ../menu-data/jackeq:jackeq.desktop.in.h:2 msgid "routes and manipulates audio from/to multiple sources" -msgstr "" +msgstr "複数ソースのオーディオのルーティングと操作" #: ../menu-data/jajuk:jajuk.desktop.in.h:1 msgid "Jajuk" @@ -9733,7 +9744,7 @@ msgid "" "Graphical user interface for the European Molecular Biology Open Software " "Suite." -msgstr "" +msgstr "ヨーロッパ製のオープンソース分子生物学用環境向けのGUI" #: ../menu-data/jester:jester.desktop.in.h:1 msgid "Jester" @@ -9741,7 +9752,7 @@ #: ../menu-data/jester:jester.desktop.in.h:2 msgid "board game similar to Othello" -msgstr "" +msgstr "オセロに似たボードゲーム" #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:1 msgid "JFractionLab" @@ -9798,7 +9809,7 @@ #: ../menu-data/jmeter:jmeter.desktop.in.h:2 msgid "Load testing application" -msgstr "" +msgstr "テストアプリケーションを読み込みます" #: ../menu-data/jmeters:jmeters.desktop.in.h:1 msgid "Jmeters" @@ -9806,7 +9817,7 @@ #: ../menu-data/jmeters:jmeters.desktop.in.h:2 msgid "Multichannel audio level meter for JACK" -msgstr "" +msgstr "JACK用マルチチャンネルオーディオレベルメーター" #: ../menu-data/jmol:jmol.desktop.in.h:1 msgid "Jmol" @@ -9862,7 +9873,7 @@ #: ../menu-data/jscribble:jscribble.desktop.in.h:2 msgid "Infinite Notepad" -msgstr "" +msgstr "Intiniteノートパッド" #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1 msgid "jstest-gtk" @@ -9954,7 +9965,7 @@ #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2 msgid "Directory statistics and disk usage" -msgstr "" +msgstr "ディレクトリの統計とディスク使用率" #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:1 msgid "Kabikaboo" @@ -9962,7 +9973,7 @@ #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:2 msgid "Manage large collections of notes" -msgstr "" +msgstr "大量のメモを管理する" #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1 msgid "KAddressBook" @@ -9970,7 +9981,7 @@ #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2 msgid "Contact Manager" -msgstr "" +msgstr "連絡先管理ツール" #: ../menu-data/kadu:kadu.desktop.in.h:1 msgid "Kadu" @@ -9978,7 +9989,7 @@ #: ../menu-data/kadu:kadu.desktop.in.h:2 msgid "Gadu-Gadu/XMPP protocol client" -msgstr "" +msgstr "Gadu-Gadu/XMPP プロトコルクライアント" #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:1 msgid "Kaffeine" @@ -9990,7 +10001,7 @@ #: ../menu-data/kajongg:kde4__kajongg.desktop.in.h:2 msgid "The ancient Chinese board game for 4 players" -msgstr "" +msgstr "4人対戦麻雀ゲーム" #: ../menu-data/kalarm:kde4__kalarm.desktop.in.h:1 msgid "KAlarm" @@ -10010,11 +10021,11 @@ #: ../menu-data/kalgebramobile:kde4__kalgebramobile.desktop.in.h:1 msgid "KAlgebra Mobile" -msgstr "" +msgstr "KAlgebraモバイル" #: ../menu-data/kalgebramobile:kde4__kalgebramobile.desktop.in.h:2 msgid "Pocket Math Expression Solver and Plotter" -msgstr "" +msgstr "ポケット数式ソルバー＆プロッター" #: ../menu-data/kalzium:kde4__kalzium.desktop.in.h:1 msgid "KDE Periodic Table of Elements" @@ -10031,7 +10042,7 @@ #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2 msgid "Fancy-looking animated application for taking photos from webcam" -msgstr "" +msgstr "ウェブカメラで写真を撮って手の込んだアニメーションを作る" #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1 msgid "Kamoso" @@ -10039,7 +10050,7 @@ #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:2 msgid "Take any picture with your web cam" -msgstr "" +msgstr "ウェブカメラで写真を撮る" #: ../menu-data/kanadic:kanadic-fullkatahira.desktop.in.h:1 msgid "Hira Drill" @@ -10051,11 +10062,11 @@ #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2 msgid "KDE Letter Order Game" -msgstr "" +msgstr "KDE文字並べ替えゲーム" #: ../menu-data/kanatest:kanatest.desktop.in.h:1 msgid "Kana test" -msgstr "" +msgstr "Kana test" #: ../menu-data/kanatest:kanatest.desktop.in.h:2 msgid "Drill game to learn Japanese kana characters" @@ -10075,7 +10086,7 @@ #: ../menu-data/kapman:kde4__kapman.desktop.in.h:2 msgid "Eat pills escaping ghosts" -msgstr "" +msgstr "薬を食べてお化けから逃げよう" #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1 msgid "KDE Template Generator" @@ -10083,7 +10094,7 @@ #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2 msgid "KAppTemplate" -msgstr "" +msgstr "KAppTemplate" #: ../menu-data/kasumi:kasumi.desktop.in.h:1 msgid "Anthy Dictionary editor" @@ -10171,7 +10182,7 @@ #: ../menu-data/kbibtex:kde4__kbibtex.desktop.in.h:2 msgid "KDE-based editor for bibliographic files" -msgstr "" +msgstr "KDEベースの書誌ファイル用エディター" #: ../menu-data/kblackbox:kde4__kblackbox.desktop.in.h:1 msgid "Blackbox Logic Game" @@ -10255,11 +10266,11 @@ #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:1 msgid "KDE collectd database-viewer" -msgstr "" +msgstr "KDE collectdデータベースサーバー" #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:2 msgid "Viewer for collectd-databases" -msgstr "" +msgstr "collectdデータベース用のビューアー" #: ../menu-data/kcolorchooser:kde4__kcolorchooser.desktop.in.h:1 msgid "Color Chooser" @@ -10283,7 +10294,7 @@ #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2 msgid "Debug programs" -msgstr "" +msgstr "プログラムをデバッグする" #: ../menu-data/kde-config-fcitx:kde4__kbd-layout-viewer.desktop.in.h:1 msgid "Keyboard layout viewer" @@ -10307,23 +10318,23 @@ #: ../menu-data/kde-runtime:kde4__knetattach.desktop.in.h:2 msgid "Network Folder Wizard" -msgstr "" +msgstr "ネットワークファルダーウィザード" #: ../menu-data/kde-telepathy-contact-list:kde4__ktp-contactlist.desktop.in.h:1 msgid "KDE IM Contacts" -msgstr "" +msgstr "KDE IM Contacts" #: ../menu-data/kde-telepathy-contact-list:kde4__ktp-contactlist.desktop.in.h:2 msgid "Displays your instant messenger contacts" -msgstr "" +msgstr "インスタントメッセンジャーの連絡先を表示します" #: ../menu-data/kde-telepathy-text-ui:kde4__ktp-log-viewer.desktop.in.h:1 msgid "KDE IM Log Viewer" -msgstr "" +msgstr "KDE IMログビューアー" #: ../menu-data/kde-telepathy-text-ui:kde4__ktp-log-viewer.desktop.in.h:2 msgid "Displays your KDE Instant Messenger logs" -msgstr "" +msgstr "KDEインスタントメッセンジャーのログを表示します" #: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1 msgid "KFontView" @@ -10347,6 +10358,7 @@ #. KMailService is the handler for mailto URLs #: ../menu-data/kdelibs5-data:kde4__kmailservice.desktop.in.h:2 +#: ../menu-data/kio:kmailservice5.desktop.in.h:2 msgid "KMailService" msgstr "" @@ -10368,7 +10380,7 @@ #: ../menu-data/kdepim-runtime:kde4__accountwizard.desktop.in.h:2 msgid "Launch the account wizard to configure PIM accounts." -msgstr "" +msgstr "PIMアカウントを設定するウィザードを起動します" #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:1 msgid "Akonaditray" @@ -10392,7 +10404,7 @@ #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1 msgid "KDE Source Builder" -msgstr "" +msgstr "KDEソースビルダー" #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2 msgid "" @@ -10449,7 +10461,7 @@ #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2 msgid "A File And Directory Comparison And Merge Tool" -msgstr "" +msgstr "ファイルとディレクトリの比較・マージツール" #: ../menu-data/kdocker:kdocker.desktop.in.h:1 msgid "KDocker" @@ -10489,7 +10501,7 @@ #: ../menu-data/keepnote:keepnote.desktop.in.h:2 msgid "Note-taking Application" -msgstr "" +msgstr "メモを取るアプリケーション" #: ../menu-data/kepas:kde4__kepas.desktop.in.h:1 msgid "Kepas" @@ -10497,7 +10509,7 @@ #: ../menu-data/kepas:kde4__kepas.desktop.in.h:2 msgid "Kepas - KDE Easy Publish and Share" -msgstr "" +msgstr "Kepas - KDEの簡単ファイル公開・共有ツール" #: ../menu-data/ketm:ketm.desktop.in.h:1 msgid "KETM" @@ -10537,7 +10549,7 @@ #: ../menu-data/keyboardcast:keyboardcast.desktop.in.h:2 msgid "Send keys to multiple windows simultaneously" -msgstr "" +msgstr "複数のウィンドウに同時にキーを送る" #: ../menu-data/keysync:keysync.desktop.in.h:1 msgid "KeySync" @@ -10549,11 +10561,11 @@ #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1 msgid "KeyTouch Editor" -msgstr "" +msgstr "KeyTouchエディター" #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2 msgid "Edit keyboard maps for keytouch" -msgstr "" +msgstr "keytouch用にキーボード配列を編集します" #: ../menu-data/kfilereplace:kde4__kfilereplace.desktop.in.h:1 msgid "KFileReplace" @@ -10607,7 +10619,7 @@ #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2 msgid "A Geography Learning Program" -msgstr "" +msgstr "地理学学習プログラム" #: ../menu-data/kget:kde4__kget.desktop.in.h:1 msgid "KGet" @@ -10644,7 +10656,7 @@ #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:1 msgid "Screen Grabbing Program" -msgstr "" +msgstr "スクリーンショットを撮るプログラムです" #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2 msgid "KGrab" @@ -10660,25 +10672,25 @@ #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:1 msgid "Khmer Converter" -msgstr "" +msgstr "クメール語コンバーター" #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2 msgid "Convert Khmer between Unicode and legacy Khmer encodings." -msgstr "" +msgstr "クメール語を、ユニコードとレガシーなクメールエンコーディングの間で変換します" -#: ../menu-data/kicad-common:eeschema.desktop.in.h:1 +#: ../menu-data/kicad:eeschema.desktop.in.h:1 msgid "Design an electronic schematic" -msgstr "" +msgstr "電気接続図の設計" -#: ../menu-data/kicad-common:eeschema.desktop.in.h:2 +#: ../menu-data/kicad:eeschema.desktop.in.h:2 msgid "Eeschema" msgstr "" -#: ../menu-data/kicad-common:kicad.desktop.in.h:1 +#: ../menu-data/kicad:kicad.desktop.in.h:1 msgid "Design a printed circuit board" -msgstr "" +msgstr "プリント回路基板を設計する" -#: ../menu-data/kicad-common:kicad.desktop.in.h:2 +#: ../menu-data/kicad:kicad.desktop.in.h:2 msgid "KiCad" msgstr "" @@ -10733,7 +10745,7 @@ #: ../menu-data/kildclient:kildclient.desktop.in.h:1 msgid "KildClient" -msgstr "" +msgstr "KildClient" #: ../menu-data/kildclient:kildclient.desktop.in.h:2 msgid "Connect to MUDs (Multi User Dungeons)" @@ -10761,7 +10773,7 @@ #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1 msgid "KInfoCenter" -msgstr "" +msgstr "KInfoCenter" #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2 msgid "Info Center" @@ -10789,7 +10801,7 @@ #: ../menu-data/kipi-plugins:kde4__panoramagui.desktop.in.h:2 msgid "Panorama" -msgstr "" +msgstr "パノラマ" #: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:1 msgid "Photo Layouts Editor" @@ -10829,7 +10841,7 @@ #: ../menu-data/kiten:kde4__kitenkanjibrowser.desktop.in.h:1 msgid "Kanji Browser" -msgstr "" +msgstr "Kanjiブラウザー" #: ../menu-data/kiten:kde4__kitenradselect.desktop.in.h:1 msgid "Radical Selector" @@ -10841,7 +10853,7 @@ #: ../menu-data/kitsune:kitsune.desktop.in.h:2 msgid "Countdown" -msgstr "" +msgstr "カウントダウン" #: ../menu-data/kjots:kde4__Kjots.desktop.in.h:1 msgid "KJots" @@ -10907,11 +10919,11 @@ #: ../menu-data/klickety:kde4__ksame.desktop.in.h:2 msgid "Board Game" -msgstr "" +msgstr "ボードゲーム" #: ../menu-data/klines:kde4__klines.desktop.in.h:1 msgid "Tactical Game" -msgstr "" +msgstr "戦略ゲーム" #: ../menu-data/klines:kde4__klines.desktop.in.h:2 msgid "Kolor Lines" @@ -10939,7 +10951,7 @@ #: ../menu-data/klog:kde4__klog.desktop.in.h:2 msgid "KDE Ham Radio logging program" -msgstr "" +msgstr "アマチュア無線のログを取るKDEのプログラム" #: ../menu-data/kluppe:kluppe.desktop.in.h:1 msgid "Kluppe" @@ -10947,13 +10959,14 @@ #: ../menu-data/kluppe:kluppe.desktop.in.h:2 msgid "audio loop-player and recorder" -msgstr "" +msgstr "オーディオのループプレイヤーとレコーダー" #: ../menu-data/kmag:kde4__kmag.desktop.in.h:1 msgid "KMag" msgstr "" #: ../menu-data/kmag:kde4__kmag.desktop.in.h:2 +#: ../menu-data/xzoom:xzoom.desktop.in.h:1 msgid "Screen Magnifier" msgstr "画面拡大鏡" @@ -10967,7 +10980,7 @@ #: ../menu-data/kmail-mobile:kde4__kmail-mobile.desktop.in.h:1 msgid "Mail" -msgstr "" +msgstr "メール" #: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1 msgid "KMail" @@ -11042,7 +11055,7 @@ #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2 msgid "An MLDonkey frontend for KDE" -msgstr "" +msgstr "KDE向けMLDonkeyフロントエンド" #: ../menu-data/kmousetool:kde4__kmousetool.desktop.in.h:1 msgid "Clicks the mouse for you, reducing the effects of RSI" @@ -11086,7 +11099,7 @@ #: ../menu-data/knavalbattle:kde4__knavalbattle.desktop.in.h:1 msgid "Naval Battle" -msgstr "" +msgstr "Naval Battle" #: ../menu-data/knavalbattle:kde4__knavalbattle.desktop.in.h:2 msgid "Ship Sinking Game" @@ -11110,7 +11123,7 @@ #: ../menu-data/knights:kde4__knights.desktop.in.h:1 msgid "Knights" -msgstr "" +msgstr "Knights" #: ../menu-data/knights:kde4__knights.desktop.in.h:2 msgid "Chess game" @@ -11138,7 +11151,7 @@ #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1 msgid "Kobo Deluxe" -msgstr "" +msgstr "Kobo Deluxe" #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2 msgid "Destroy enemy bases in space" @@ -11190,7 +11203,7 @@ #: ../menu-data/konquest:kde4__konquest.desktop.in.h:2 msgid "Galactic Strategy Game" -msgstr "" +msgstr "銀河戦略ゲーム" #: ../menu-data/konsole:kde4__konsole.desktop.in.h:1 msgid "Konsole" @@ -11235,12 +11248,13 @@ msgstr "インスタント・メッセンジャー" #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1 +#: ../menu-data/sync-monitor-uoa:sync-monitor-calendar.desktop.in.h:2 msgid "Calendar" msgstr "カレンダー" #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1 msgid "Calendar and Scheduling Program" -msgstr "" +msgstr "カレンダーとスケジュール管理プログラム" #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:2 msgid "KOrganizer" @@ -11268,7 +11282,7 @@ #: ../menu-data/kpat:kde4__kpat.desktop.in.h:2 msgid "Patience Card Game" -msgstr "" +msgstr "Patienceカードゲーム" #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1 msgid "KPhotoAlbum" @@ -11336,11 +11350,11 @@ #: ../menu-data/krb5-auth-dialog:krb5-auth-dialog.desktop.in.h:1 msgid "Kerberos Authentication" -msgstr "" +msgstr "Kerberos認証" #: ../menu-data/krb5-auth-dialog:krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "" +msgstr "Kerberos ネットワーク認証ダイアログ" #: ../menu-data/krdc:kde4__krdc.desktop.in.h:1 msgid "KRDC" @@ -11364,7 +11378,7 @@ #: ../menu-data/kredentials:kde4__kredentials.desktop.in.h:2 msgid "Panel Applet to renew authentication credentials" -msgstr "" +msgstr "認証局を更新するパネルアプレット" #: ../menu-data/kremotecontrol:kde4__krcdnotifieritem.desktop.in.h:1 msgid "KRemoteControl Notifier Item" @@ -11372,7 +11386,7 @@ #: ../menu-data/krename:kde4__krename.desktop.in.h:1 msgid "A batch renamer" -msgstr "" +msgstr "A batch renamer" #: ../menu-data/krename:kde4__krename.desktop.in.h:2 msgid "KRename" @@ -11384,7 +11398,7 @@ #: ../menu-data/kreversi:kde4__kreversi.desktop.in.h:2 msgid "Reversi Board Game" -msgstr "" +msgstr "リバーシ - ボードゲーム" #: ../menu-data/krfb:kde4__krfb.desktop.in.h:1 msgid "Krfb" @@ -11448,7 +11462,7 @@ #: ../menu-data/kscope:kscope.desktop.in.h:2 msgid "Source editing environment" -msgstr "" +msgstr "ソースコード編集環境" #: ../menu-data/kshisen:kde4__kshisen.desktop.in.h:1 msgid "Shisen-Sho" @@ -11464,7 +11478,7 @@ #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2 msgid "A graphical shutdown utility" -msgstr "" +msgstr "グラフィカルなシャットダウンユーティリティ" #: ../menu-data/ksirk:kde4__ksirk.desktop.in.h:1 msgid "KsirK" @@ -11500,7 +11514,7 @@ #: ../menu-data/kspaceduel:kde4__kspaceduel.desktop.in.h:2 msgid "Space Arcade Game" -msgstr "" +msgstr "宇宙アーケードゲーム" #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1 msgid "KSquares" @@ -11677,11 +11691,11 @@ #: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:2 msgid "KDE Volume Partition Manager" -msgstr "" +msgstr "KDEボリュームパーティションマネージャー" #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:1 msgid "GUI for various VPN clients" -msgstr "" +msgstr "様々なVPSクライアント向けのGUI" #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:2 msgid "KVpnc" @@ -11705,7 +11719,7 @@ #: ../menu-data/kwordquiz:kde4__kwordquiz.desktop.in.h:1 msgid "A flashcard and vocabulary learning program" -msgstr "" +msgstr "フラッシュカードと語彙学習プログラム" #: ../menu-data/kwordquiz:kde4__kwordquiz.desktop.in.h:2 msgid "KWordQuiz" @@ -11721,7 +11735,7 @@ #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:2 msgid "Manage and change your L2TP IPsec VPN connection settings" -msgstr "" +msgstr "L2TP IPsec VPN 接続の設定を管理・変更します" #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:1 msgid "L2TP Ipsec VPN Applet" @@ -11793,7 +11807,7 @@ #: ../menu-data/landell:landell.desktop.in.h:2 msgid "Audio and video streams manager" -msgstr "" +msgstr "オーディオとビデオストリームマネージャー" #: ../menu-data/landscape-client-ui-install:landscape-client-settings.desktop.in.h:1 msgid "Landscape Service" @@ -11829,7 +11843,7 @@ #: ../menu-data/lat:lat.desktop.in.h:1 msgid "LDAP Administration Tool" -msgstr "" +msgstr "LDAP 管理ツール" #: ../menu-data/lat:lat.desktop.in.h:2 msgid "Manage LDAP-based directories" @@ -11841,7 +11855,7 @@ #: ../menu-data/latexdraw:latexdraw.desktop.in.h:2 msgid "Graphical editor for PSTricks" -msgstr "" +msgstr "PSTricks向けのグラフィカルエディター" #: ../menu-data/latexila-data:latexila.desktop.in.h:1 msgid "LaTeXila" @@ -11952,7 +11966,9 @@ msgid "Computer Assisted Medical Intervention ToolKit Wizard" msgstr "" +#: ../menu-data/cinnamon:cinnamon-settings-default.desktop.in.h:1 #: ../menu-data/libfm-tools:libfm-pref-apps.desktop.in.h:1 +#: ../menu-data/mate-control-center:mate-default-applications-properties.desktop.in.h:1 msgid "Preferred Applications" msgstr "お気に入りのアプリケーション" @@ -12034,11 +12050,11 @@ #: ../menu-data/libreoffice-common:libreoffice-xsltfilter.desktop.in.h:1 msgid "LibreOffice XSLT based filters" -msgstr "" +msgstr "LibreOffice XSLTベースのフィルター" #: ../menu-data/libreoffice-common:libreoffice-xsltfilter.desktop.in.h:2 msgid "XSLT based filters" -msgstr "" +msgstr "XSLTベースのフィルター" #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:1 msgid "LibreOffice Draw" @@ -12046,7 +12062,7 @@ #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2 msgid "Create and edit drawings, flow charts and logos by using Draw." -msgstr "" +msgstr "画像、フローチャート、ロゴを作成・編集します" #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:3 msgid "New Drawing" @@ -12143,7 +12159,7 @@ #: ../menu-data/lightsoff:lightsoff.desktop.in.h:1 msgid "Lights Off" -msgstr "" +msgstr "Lights Off" #: ../menu-data/lightsoff:lightsoff.desktop.in.h:2 msgid "Turn off all the lights" @@ -12159,7 +12175,7 @@ #: ../menu-data/lightyears:lightyears.desktop.in.h:1 msgid "20.000 Light Years Into Space" -msgstr "" +msgstr "宇宙へ2万光年" #: ../menu-data/lightyears:lightyears.desktop.in.h:2 msgid "" @@ -12177,7 +12193,7 @@ #: ../menu-data/lincity-ng:lincity-ng.desktop.in.h:1 msgid "Lincity-NG" -msgstr "" +msgstr "Lincity-NG" #: ../menu-data/lincity-ng:lincity-ng.desktop.in.h:2 msgid "" @@ -12240,7 +12256,7 @@ #: ../menu-data/linsmith:linsmith.desktop.in.h:2 msgid "Smith Chart Generator" -msgstr "" +msgstr "スミスチャート作成ツール" #: ../menu-data/linthesia:linthesia.desktop.in.h:1 msgid "Linthesia" @@ -12412,7 +12428,7 @@ #: ../menu-data/lottanzb:lottanzb.desktop.in.h:1 msgid "LottaNZB Usenet Downloader" -msgstr "" +msgstr "LottaNZB Usenetダウンローダー" #: ../menu-data/lottanzb:lottanzb.desktop.in.h:2 msgid "Download from the Usenet with the help of NZB files" @@ -12474,7 +12490,7 @@ #: ../menu-data/lubuntu-nexus7-extra-files:lubuntu-nexus7-rotate.desktop.in.h:1 msgid "Rotate your screen" -msgstr "" +msgstr "画面を回転する" #: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1 msgid "Lubuntu Software Center" @@ -12507,7 +12523,7 @@ #: ../menu-data/luminance-hdr:luminance-hdr.desktop.in.h:2 msgid "Create and tonemap HDR images" -msgstr "" +msgstr "HDR画像の作成とトーンマップ" #: ../menu-data/luola:luola.desktop.in.h:1 msgid "Luola" @@ -12619,7 +12635,7 @@ #: ../menu-data/madbomber:madbomber.desktop.in.h:1 msgid "Mad Bomber" -msgstr "" +msgstr "Mad Bomber" #: ../menu-data/madbomber:madbomber.desktop.in.h:2 msgid "Catch the Bombs" @@ -12627,7 +12643,7 @@ #: ../menu-data/maelstrom:maelstrom.desktop.in.h:1 msgid "Maelstrom" -msgstr "" +msgstr "Maelstrom" #: ../menu-data/maelstrom:maelstrom.desktop.in.h:2 msgid "Play an Asteroids like game" @@ -12643,7 +12659,7 @@ #: ../menu-data/magicor:magicor.desktop.in.h:1 msgid "Magicor" -msgstr "" +msgstr "Magicor" #: ../menu-data/magicor:magicor.desktop.in.h:2 msgid "Puzzle game in the spirit of solomon's key" @@ -12651,7 +12667,7 @@ #: ../menu-data/magictouch:magictouch.desktop.in.h:1 msgid "MagicTouch" -msgstr "" +msgstr "MagicTouch" #: ../menu-data/magictouch:magictouch.desktop.in.h:2 msgid "Retro game goes multitouch: use two knobs to paint a picture" @@ -12673,7 +12689,7 @@ msgid "Get notified when new mail arrives" msgstr "新着メールが届いたときに通知します" -#: ../menu-data/mailnag:mailnag_config.desktop.in.h:1 +#: ../menu-data/mailnag:mailnag-config.desktop.in.h:1 msgid "Mailnag Configuration" msgstr "" @@ -12687,7 +12703,7 @@ #: ../menu-data/maitreya:maitreya7.desktop.in.h:2 msgid "Astrology Software" -msgstr "" +msgstr "占星学ソフト" #: ../menu-data/makehuman:makehuman.desktop.in.h:1 msgid "MakeHuman" @@ -12695,17 +12711,16 @@ #: ../menu-data/mame:mame.desktop.in.h:1 msgid "MAME™ Arcade Emulator" -msgstr "" +msgstr "MAKE(TM) アーケードゲームのエミュレーター" #: ../menu-data/mame:mame.desktop.in.h:2 msgid "Play vintage arcade games using the MAME emulator" -msgstr "" +msgstr "MAKEエミュレーターを使って懐かしいアーケードゲームを遊ぼう" #: ../menu-data/mana:mana.desktop.in.h:1 msgid "Mana" msgstr "" -#: ../menu-data/mana:mana.desktop.in.h:2 #: ../menu-data/manaplus:manaplus.desktop.in.h:2 msgid "A 2D MMORPG client" msgstr "2D MMORPG クライアント" @@ -12746,21 +12761,23 @@ msgid "Share mouse and pointer with other Computers" msgstr "他のコンピューターとマウスやポインタを共有します" +#: ../menu-data/marble-mobile:kde4__marble-mobile.desktop.in.h:1 #: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:1 #: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:1 -#: ../menu-data/marble:kde4__marble-mobile.desktop.in.h:1 #: ../menu-data/marble:kde4__marble.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_geo.desktop.in.h:1 #: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:1 #: ../menu-data/marble:kde4__marble_kml.desktop.in.h:1 #: ../menu-data/marble:kde4__marble_kmz.desktop.in.h:1 #: ../menu-data/marble:kde4__marble_osm.desktop.in.h:1 #: ../menu-data/marble:kde4__marble_shp.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_worldwind.desktop.in.h:1 msgid "Marble" msgstr "Marble" +#: ../menu-data/marble-mobile:kde4__marble-mobile.desktop.in.h:2 #: ../menu-data/marble-qt:kde4__marble-qt.desktop.in.h:2 #: ../menu-data/marble-touch:kde4__marble-touch.desktop.in.h:2 -#: ../menu-data/marble:kde4__marble-mobile.desktop.in.h:2 #: ../menu-data/marble:kde4__marble.desktop.in.h:2 #: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:2 #: ../menu-data/marble:kde4__marble_kml.desktop.in.h:2 @@ -12786,11 +12803,11 @@ msgid "Bio-polymer mass spectrometry software" msgstr "" -#: ../menu-data/mat:mat.desktop.in.h:1 +#: ../menu-data/mat:mat.desktop.in.h:2 msgid "MAT" msgstr "" -#: ../menu-data/mat:mat.desktop.in.h:2 +#: ../menu-data/mat:mat.desktop.in.h:1 msgid "Metadata Anonymisation Toolkit" msgstr "" @@ -12802,7 +12819,9 @@ msgid "Space ascii war game" msgstr "" +#: ../menu-data/cinnamon:cinnamon-settings-keyboard.desktop.in.h:1 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1 +#: ../menu-data/mate-control-center:mate-keyboard.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-keyboard-panel.desktop.in.h:1 msgid "Keyboard" msgstr "キーボード" @@ -12932,7 +12951,6 @@ msgstr "" #: ../menu-data/medit:medit.desktop.in.h:2 -#: ../menu-data/nedit:nedit.desktop.in.h:2 msgid "Text editor" msgstr "テキストエディター" @@ -13182,7 +13200,7 @@ #: ../menu-data/midori:midori-private.desktop.in.h:1 msgid "Midori Private Browsing" -msgstr "" +msgstr "Midori プライベートブラウジング" #: ../menu-data/midori:midori-private.desktop.in.h:2 msgid "Open a new private browsing window" @@ -13258,7 +13276,6 @@ #: ../menu-data/minitube:minitube.desktop.in.h:3 #: ../menu-data/parole:parole.desktop.in.h:3 -#: ../menu-data/quodlibet:quodlibet.desktop.in.h:3 #: ../menu-data/totem:totem.desktop.in.h:3 msgid "Play/Pause" msgstr "再生/一時停止" @@ -13579,7 +13596,6 @@ msgid "MPlayer Media Player" msgstr "MPlayerメディアプレイヤー" -#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2 #: ../menu-data/mpv:mpv.desktop.in.h:2 msgid "Play movies and songs" msgstr "動画や音楽を再生します" @@ -13680,6 +13696,7 @@ msgid "Muffin" msgstr "" +#: ../menu-data/mate-control-center:mate-about-me.desktop.in.h:1 #: ../menu-data/mugshot:mugshot.desktop.in.h:1 msgid "About Me" msgstr "" @@ -13714,7 +13731,7 @@ #: ../menu-data/muon-discover:kde4__muon-discover-category.desktop.in.h:1 msgid "Install More..." -msgstr "" +msgstr "追加インストール..." #: ../menu-data/muon-discover:kde4__muon-discover.desktop.in.h:1 msgid "Muon Discover" @@ -13989,12 +14006,12 @@ msgid "Debug Applications" msgstr "" +#: ../menu-data/caja:caja-autorun-software.desktop.in.h:1 #: ../menu-data/nemo:nemo-autorun-software.desktop.in.h:1 msgid "Autorun Prompt" msgstr "" #: ../menu-data/nemo:nemo.desktop.in.h:1 -#: ../menu-data/plasma-active:kde4__active-filebrowser.desktop.in.h:1 msgid "Files" msgstr "ファイル" @@ -14082,6 +14099,8 @@ msgid "Play a game of Tic Tac Toe." msgstr "" +#: ../menu-data/caja:mate-network-scheme.desktop.in.h:1 +#: ../menu-data/cinnamon-control-center:cinnamon-network-panel.desktop.in.h:1 #: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:1 msgid "Network" @@ -14572,11 +14591,11 @@ msgid "Structured Storage Explorer" msgstr "" -#: ../menu-data/openmsx-catapult:openmsx-catapult.desktop.in.h:1 +#: ../menu-data/openmsx-catapult:openMSX-Catapult.desktop.in.h:1 msgid "openMSX Catapult" msgstr "" -#: ../menu-data/openmsx-catapult:openmsx-catapult.desktop.in.h:2 +#: ../menu-data/openmsx-catapult:openMSX-Catapult.desktop.in.h:2 msgid "Graphical interface for openMSX" msgstr "" @@ -14705,6 +14724,7 @@ msgstr "" #: ../menu-data/orage:xfcalendar.desktop.in.h:2 +#: ../menu-data/plan:plan.desktop.in.h:2 msgid "Desktop calendar" msgstr "デスクトップカレンダー" @@ -15511,7 +15531,6 @@ msgid "Handle the tasks, resources, and cost of your projects" msgstr "プロジェクトのタスクや資源、コストを扱います" -#: ../menu-data/plasma-active-settings:kde4__active-settings.desktop.in.h:1 #: ../menu-data/steam:steam.desktop.in.h:9 msgid "Settings" msgstr "設定" @@ -15520,7 +15539,6 @@ msgid "Settings for Plasma Active" msgstr "Plasma Active の設定" -#: ../menu-data/plasma-active-webbrowser:kde4__active-web-browser.desktop.in.h:1 #: ../menu-data/webbrowser-app:webbrowser-app.desktop.in.h:1 msgid "Browser" msgstr "ブラウザー" @@ -15931,6 +15949,7 @@ #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2 #: ../menu-data/psi-plus:psi-plus.desktop.in.h:2 +#: ../menu-data/psi:psi.desktop.in.h:2 msgid "Communicate over the XMPP network" msgstr "" @@ -16049,6 +16068,7 @@ msgstr "" #: ../menu-data/pycorrfit:pycorrfit.desktop.in.h:2 +#: ../menu-data/pyscanfcs:pyscanfcs.desktop.in.h:2 msgid "FCS Data Analysis" msgstr "" @@ -18407,11 +18427,11 @@ msgid "Capture the current active window" msgstr "現在アクティブなウィンドウをキャプチャ" -#: ../menu-data/signon-ui:signon-ui-browser-process.desktop.in.h:1 +#: ../menu-data/signon-ui-x11:signon-ui.desktop.in.h:1 msgid "Account authentication" msgstr "" -#: ../menu-data/signon-ui:signon-ui-browser-process.desktop.in.h:2 +#: ../menu-data/signon-ui-x11:signon-ui.desktop.in.h:2 msgid "Login to online accounts" msgstr "オンライン・アカウントにログインします" @@ -19448,7 +19468,7 @@ #: ../menu-data/synaptic:synaptic.desktop.in.h:1 msgid "Synaptic Package Manager" -msgstr "Synaptic パッケージマネージャー" +msgstr "Synapticパッケージマネージャー" #: ../menu-data/synaptic:synaptic.desktop.in.h:2 msgid "Install, remove and upgrade software packages" @@ -19462,7 +19482,6 @@ msgid "Up to date" msgstr "" -#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1 #: ../menu-data/syncmaildir-applet:smd-applet.desktop.in.h:1 msgid "Sync Mail Dir" msgstr "" @@ -19515,6 +19534,8 @@ msgid "A system-wide linux profiler" msgstr "システム全体の Linux プロファイラー" +#: ../menu-data/cinnamon-control-center:cinnamon-datetime-panel.desktop.in.h:1 +#: ../menu-data/cinnamon:cinnamon-settings-calendar.desktop.in.h:1 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1 msgid "Date & Time" msgstr "" @@ -19559,6 +19580,7 @@ msgid "KDE System Settings" msgstr "KDE システム設定" +#: ../menu-data/cinnamon:cinnamon-settings.desktop.in.h:1 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1 #: ../menu-data/ubuntu-system-settings:ubuntu-system-settings.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-control-center.desktop.in.h:1 @@ -20891,6 +20913,7 @@ msgid "Account update tool" msgstr "アカウントアップデートツール" +#: ../menu-data/mate-control-center:mate-appearance-properties.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-appearance-panel.desktop.in.h:1 #: ../menu-data/unity-tweak-tool:unity-tweak-tool.desktop.in.h:5 msgid "Appearance" @@ -20900,14 +20923,17 @@ msgid "Change the background and the theme" msgstr "背景とテーマの変更" +#: ../menu-data/cinnamon-bluetooth:cinnamon-bluetooth-properties.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:1 msgid "Bluetooth" msgstr "Bluetooth" +#: ../menu-data/cinnamon-bluetooth:cinnamon-bluetooth-properties.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-bluetooth-panel.desktop.in.h:2 msgid "Configure Bluetooth settings" msgstr "Bluetooth を設定します" +#: ../menu-data/cinnamon-control-center:cinnamon-color-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-color-panel.desktop.in.h:2 msgid "Color management settings" msgstr "" @@ -20920,10 +20946,12 @@ msgid "Change your clock and date settings" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-display-panel.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:1 msgid "Displays" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-display-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-display-panel.desktop.in.h:2 msgid "Change resolution and position of monitors and projectors" msgstr "" @@ -20944,6 +20972,7 @@ msgid "Mouse & Touchpad" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-network-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-network-panel.desktop.in.h:2 msgid "Network settings" msgstr "" @@ -20972,18 +21001,27 @@ msgid "Screen brightness and lock settings" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-sound-nua-panel.desktop.in.h:1 +#: ../menu-data/cinnamon-control-center:cinnamon-sound-panel.desktop.in.h:1 +#: ../menu-data/mate-media-pulse:mate-volume-control.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:1 msgid "Sound" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-sound-nua-panel.desktop.in.h:2 +#: ../menu-data/cinnamon-control-center:cinnamon-sound-panel.desktop.in.h:2 +#: ../menu-data/mate-media-gstreamer:mate-volume-control.desktop.in.h:2 +#: ../menu-data/mate-media-pulse:mate-volume-control.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-sound-panel.desktop.in.h:2 msgid "Change sound volume and sound events" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-universal-access-panel.desktop.in.h:1 #: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:1 msgid "Universal Access" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-universal-access-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-universal-access-panel.desktop.in.h:2 msgid "Universal Access Preferences" msgstr "" @@ -21000,6 +21038,7 @@ msgid "Wacom Tablet" msgstr "" +#: ../menu-data/cinnamon-control-center:cinnamon-wacom-panel.desktop.in.h:2 #: ../menu-data/unity-control-center:unity-wacom-panel.desktop.in.h:2 msgid "" "Set button mappings and adjust stylus sensitivity for graphics tablets" @@ -22116,12 +22155,12 @@ msgid "File manager for X." msgstr "X用ファイルマネージャー" -#: ../menu-data/workrave:workrave.desktop.in.h:1 +#: ../menu-data/workrave:workrave.desktop.in.h:2 msgid "" "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)" msgstr "反復運動過多損傷(RSI)の予防と回復を補助します" -#: ../menu-data/workrave:workrave.desktop.in.h:2 +#: ../menu-data/workrave:workrave.desktop.in.h:1 msgid "Workrave" msgstr "Workrave" @@ -22465,6 +22504,7 @@ msgid "Fine-tune window behaviour and effects" msgstr "" +#: ../menu-data/cinnamon:cinnamon-settings-workspaces.desktop.in.h:1 #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1 msgid "Workspaces" msgstr "ワークスペース" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apport.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apport.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apport.po 2014-07-09 09:08:45.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apport.po 2015-02-19 15:12:03.000000000 +0000 @@ -7,205 +7,234 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-16 23:11+0000\n" +"POT-Creation-Date: 2015-02-07 15:59+0000\n" "PO-Revision-Date: 2014-03-28 14:51+0000\n" "Last-Translator: Shushi Kurose \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:24+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:15+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429 -#: ../debian/tmp/usr/share/apport/apport-kde.py:169 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 ../kde/apport-kde.py:169 -#: ../gtk/apport-gtk.py:177 ../bin/apport-cli.py:178 -#: ../debian/tmp/usr/bin/apport-cli.py:178 -msgid "Send problem report to the developers?" -msgstr "問題のレポートを開発者に送信しますか?" +#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "詳細はmanページをご覧ください。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437 -#: ../debian/tmp/usr/share/apport/apport-kde.py:177 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 ../kde/apport-kde.py:177 -#: ../gtk/apport-gtk.py:186 -msgid "Send" -msgstr "送信" +#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "valgrind によって生成されたログファイルの名前を指定" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300 -#: ../debian/tmp/usr/share/apport/apport-kde.py:183 -#: ../debian/tmp/usr/share/apport/apport-kde.py:224 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 ../kde/apport-kde.py:183 -#: ../kde/apport-kde.py:224 ../gtk/apport-gtk.py:165 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "残念ながら、%s で内部エラーが発生しました。" +#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +msgid "" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" +msgstr "以前作成されたサンドボックスディレクトリ (SDIR) を再利用するか、もし存在しない場合には作成する" -#: ../debian/tmp/usr/share/apport/apport-kde.py:191 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:191 -#: ../gtk/apport-gtk.py:257 -#, python-format -msgid "Package: %s" -msgstr "パッケージ: %s" +#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 +msgid "" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." +msgstr "追加のデバッグシンボル用にサンドボックスディレクトリを作成または再利用せず、インストールされたデバッグシンボルのみを利用する。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137 -#: ../debian/tmp/usr/share/apport/apport-kde.py:197 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 ../kde/apport-kde.py:197 -#: ../gtk/apport-gtk.py:264 -msgid "Sorry, a problem occurred while installing software." -msgstr "残念ながら、ソフトウェアのインストール中に問題が発生しました。" +#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 +msgid "" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" +msgstr "以前作成されたキャッシュディレクトリ (CDIR) を再利用するか、もし存在しない場合には作成する" -#: ../debian/tmp/usr/share/apport/apport-kde.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:273 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:204 -#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "アプリケーション %s は内部エラーに遭遇しました。" +#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 +msgid "" +"report download/install progress when installing packages into sandbox" +msgstr "サンドボックス内にパッケージをインストールする際、ダウンロードおよびインストールの進捗状況を報告する" + +#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 +msgid "" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" +msgstr "メモリリーク検出のためvalgrindのメモリチェックツールにより実行されているプログラム" + +#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +msgid "" +"Install an extra package into the sandbox (can be specified multiple times)" +msgstr "サンドボックスに追加のパッケージをインストールする (複数回指定可)" -#: ../debian/tmp/usr/share/apport/apport-kde.py:208 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:208 -#: ../gtk/apport-gtk.py:276 +#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 #, python-format -msgid "The application %s has closed unexpectedly." -msgstr "アプリケーション %s が突然終了しました。" +msgid "Error: %s is not an executable. Stopping." +msgstr "エラー: %s は実行ファイルではありません。中止します。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479 -#: ../debian/tmp/usr/share/apport/apport-kde.py:217 -#: ../debian/tmp/usr/share/apport/apport-kde.py:230 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:284 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 ../kde/apport-kde.py:217 -#: ../kde/apport-kde.py:230 ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284 -#: ../gtk/apport-gtk.py:303 ../gtk/apport-gtk.ui.h:10 -msgid "Continue" -msgstr "続行" +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "システム情報を収集" -#: ../debian/tmp/usr/share/apport/apport-kde.py:220 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 ../kde/apport-kde.py:220 -#: ../gtk/apport-gtk.py:287 ../gtk/apport-gtk.ui.h:9 -msgid "Leave Closed" -msgstr "閉じて終了する" +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +msgstr "この問題を報告するには、システム情報を収集するための認証が必要です" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273 -#: ../debian/tmp/usr/share/apport/apport-kde.py:221 -#: ../debian/tmp/usr/share/apport/apport-kde.py:368 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 ../kde/apport-kde.py:221 -#: ../kde/apport-kde.py:368 ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288 -msgid "Relaunch" -msgstr "再起動する" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "システムの問題の報告" + +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" +msgstr "システムプログラムの問題レポートにアクセスするにはパスワードを入力してください" + +#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:457 ../kde/apport-kde.py:493 +#: ../debian/tmp/usr/share/apport/apport-kde.py:457 +#: ../debian/tmp/usr/share/apport/apport-kde.py:493 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 +msgid "Apport" +msgstr "Apport" + +#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 +msgid "Crash report" +msgstr "クラッシュレポート" + +#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 +msgid "Sorry, an internal error happened." +msgstr "残念ながら、内部エラーが発生しました。" +#: ../gtk/apport-gtk.ui.h:4 ../kde/apport-kde.py:227 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 +#: ../debian/tmp/usr/share/apport/apport-kde.py:227 ../gtk/apport-gtk.py:300 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342 -#: ../debian/tmp/usr/share/apport/apport-kde.py:227 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:227 -#: ../gtk/apport-gtk.py:300 ../gtk/apport-gtk.ui.h:4 msgid "If you notice further problems, try restarting the computer." msgstr "さらに問題が発生する場合は、コンピューターを再起動してみてください。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:231 -#: ../gtk/apport-gtk.py:304 -msgid "Ignore future problems of this type" -msgstr "今後、この種類の問題は無視する" +#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 +msgid "Send an error report to help fix this problem" +msgstr "エラーレポートを送信してこの問題の修正に協力する" -#: ../debian/tmp/usr/share/apport/apport-kde.py:275 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:275 -#: ../gtk/apport-gtk.py:577 -msgid "Hide Details" -msgstr "詳細を隠す" +#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 +msgid "Ignore future problems of this program version" +msgstr "今後このバージョンのプログラムの問題を無視する" -#: ../debian/tmp/usr/share/apport/apport-kde.py:278 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.ui.h:7 ../kde/apport-kde.py:278 #: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:278 -#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 ../gtk/apport-gtk.ui.h:7 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 +#: ../debian/tmp/usr/share/apport/apport-kde.py:278 ../gtk/apport-gtk.py:204 +#: ../gtk/apport-gtk.py:573 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 msgid "Show Details" msgstr "詳細を表示" -#: ../debian/tmp/usr/share/apport/apport-kde.py:301 ../kde/apport-kde.py:301 -msgid "Username:" -msgstr "ユーザー名:" - -#: ../debian/tmp/usr/share/apport/apport-kde.py:302 ../kde/apport-kde.py:302 -msgid "Password:" -msgstr "パスワード:" +#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 +msgid "_Examine locally" +msgstr "ローカルで解析する(_E)" -#: ../debian/tmp/usr/share/apport/apport-kde.py:349 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:349 -#: ../gtk/apport-gtk.py:142 ../bin/apport-cli.py:150 -#: ../debian/tmp/usr/bin/apport-cli.py:150 -msgid "(binary data)" -msgstr "(バイナリデータ)" +#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../gtk/apport-gtk.py:287 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 +msgid "Leave Closed" +msgstr "閉じて終了する" -#: ../debian/tmp/usr/share/apport/apport-kde.py:393 ../kde/apport-kde.py:393 -msgid "Collecting Problem Information" -msgstr "問題の情報を集めています" +#: ../gtk/apport-gtk.ui.h:10 ../kde/apport-kde.py:217 ../kde/apport-kde.py:230 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:284 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 +#: ../debian/tmp/usr/share/apport/apport-kde.py:217 +#: ../debian/tmp/usr/share/apport/apport-kde.py:230 ../gtk/apport-gtk.py:216 +#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 +msgid "Continue" +msgstr "続行" -#: ../debian/tmp/usr/share/apport/apport-kde.py:394 ../kde/apport-kde.py:394 -#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 -msgid "Collecting problem information" -msgstr "問題の情報を集めています" +#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +msgid "Collecting problem information" +msgstr "問題の情報を集めています" -#: ../debian/tmp/usr/share/apport/apport-kde.py:395 ../kde/apport-kde.py:395 +#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 msgid "" -"The collected information can be sent to the developers to improve the " -"application. This might take a few minutes." -msgstr "収集された情報はアプリケーションを改善するために開発者へ送られます。しばらくお待ちください。" - -#: ../debian/tmp/usr/share/apport/apport-kde.py:421 ../kde/apport-kde.py:421 -msgid "Uploading Problem Information" -msgstr "問題の情報をアップロードしています" +"Information is being collected that may help the developers fix the problem " +"you report." +msgstr "あなたの報告する問題を開発者が修正するのに、手助けとなるような情報を収集します。" +#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:422 #: ../debian/tmp/usr/share/apport/apport-kde.py:422 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../kde/apport-kde.py:422 -#: ../bin/apport-cli.py:251 ../gtk/apport-gtk.ui.h:13 #: ../debian/tmp/usr/bin/apport-cli.py:251 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../bin/apport-cli.py:251 msgid "Uploading problem information" msgstr "問題の情報をアップロードしています" +#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 +msgid "Uploading problem information" +msgstr "問題の情報をアップロードしています" + +#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:423 #: ../debian/tmp/usr/share/apport/apport-kde.py:423 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../kde/apport-kde.py:423 -#: ../gtk/apport-gtk.ui.h:15 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "収集された情報はバグトラッキングシステムに送信されます。しばらくお待ちください。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:457 -#: ../debian/tmp/usr/share/apport/apport-kde.py:493 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../kde/apport-kde.py:457 -#: ../kde/apport-kde.py:493 ../gtk/apport-gtk.ui.h:1 -msgid "Apport" -msgstr "Apport" +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "使用法 : %s <レポート> <対象ディレクトリ>" + +#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 +msgid "Destination directory exists and is not empty." +msgstr "目的のディレクトリは存在しますが、空ではありません。" + +#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" + +#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "問題を報告する..." + +#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "開発者に異常動作を報告してください" + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130 +#: ../data/general-hooks/ubuntu.py:130 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package" +msgstr "Ubuntuパッケージのファイルが純正のUbuntuパッケージではないパッケージと衝突しています。" + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147 +#: ../data/general-hooks/ubuntu.py:147 +msgid "" +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" +msgstr "" +"このシステムは当初はgrub バージョン 2に設定されていましたが、grub " +"1を選んだため設定なしのままでシステムから削除されています。新しいカーネルが入手可能となったときにブートローダの設定が更新されるよう、端末を開いて以下のコ" +"マンドを実行してください:\n" +"\n" +" sudo apt-get install grub-pc\n" #: ../apport/ui.py:124 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:124 @@ -244,9 +273,9 @@ msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "残念ながら、プログラム \"%s\" が不意に終了しました" -#: ../apport/ui.py:272 ../apport/ui.py:1298 +#: ../apport/ui.py:272 ../apport/ui.py:1303 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1298 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1303 #, python-format msgid "Problem in %s" msgstr "%s に問題があります" @@ -258,19 +287,19 @@ "problem and send a report to the developers." msgstr "コンピューターに、問題を自動的に解析して開発者にレポートを送るための十分な空きメモリーがありません。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049 #: ../apport/ui.py:321 ../apport/ui.py:329 ../apport/ui.py:456 -#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1104 -#: ../apport/ui.py:1270 ../apport/ui.py:1274 +#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1109 +#: ../apport/ui.py:1275 ../apport/ui.py:1279 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:321 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:329 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:456 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:459 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:660 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1104 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1274 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1109 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1279 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049 msgid "Invalid problem report" msgstr "無効な問題のレポートです" @@ -550,68 +579,68 @@ "occurred." msgstr "この問題はプログラム%sに発生したものですが、このプログラムはクラッシュしてから変更されています。" -#: ../apport/ui.py:1036 ../apport/ui.py:1276 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1036 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276 +#: ../apport/ui.py:1041 ../apport/ui.py:1281 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1041 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1281 msgid "This problem report is damaged and cannot be processed." msgstr "この問題の報告は破損しており、処理することができません。" #. package does not exist -#: ../apport/ui.py:1039 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1039 +#: ../apport/ui.py:1044 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1044 msgid "The report belongs to a package that is not installed." msgstr "この報告はインストールされていないパッケージによるものです" -#: ../apport/ui.py:1042 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1042 +#: ../apport/ui.py:1047 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1047 msgid "An error occurred while attempting to process this problem report:" msgstr "この問題の報告の処理中にエラーが発生しました:" -#: ../apport/ui.py:1105 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1105 +#: ../apport/ui.py:1110 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1110 msgid "Could not determine the package or source package name." msgstr "パッケージまたはソースパッケージ名を特定できませんでした。" -#: ../apport/ui.py:1123 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1123 +#: ../apport/ui.py:1128 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1128 msgid "Unable to start web browser" msgstr "ウェブブラウザーを起動できません" -#: ../apport/ui.py:1124 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1124 +#: ../apport/ui.py:1129 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1129 #, python-format msgid "Unable to start web browser to open %s." msgstr "%s を開くためのウェブブラウザーを起動できません" -#: ../apport/ui.py:1224 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1224 +#: ../apport/ui.py:1229 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1229 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "バグ追跡システム %s にあなたのアカウント情報を入力してください" -#: ../apport/ui.py:1236 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1236 +#: ../apport/ui.py:1241 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1241 msgid "Network problem" msgstr "ネットワークの問題" -#: ../apport/ui.py:1238 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1238 +#: ../apport/ui.py:1243 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1243 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "クラッシュデータベースに接続できませんでした。インターネット接続を確認してください。" -#: ../apport/ui.py:1265 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1265 +#: ../apport/ui.py:1270 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270 msgid "Memory exhaustion" msgstr "メモリー不足" -#: ../apport/ui.py:1266 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1266 +#: ../apport/ui.py:1271 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1271 msgid "Your system does not have enough memory to process this crash report." msgstr "コンピューターには、このクラッシュレポートを処理するのに十分なメモリーがありません。" -#: ../apport/ui.py:1301 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1301 +#: ../apport/ui.py:1306 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1306 #, python-format msgid "" "The problem cannot be reported:\n" @@ -622,14 +651,14 @@ "\n" "%s" -#: ../apport/ui.py:1357 ../apport/ui.py:1364 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1357 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1364 +#: ../apport/ui.py:1362 ../apport/ui.py:1369 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1362 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1369 msgid "Problem already known" msgstr "問題は既知のものです" -#: ../apport/ui.py:1358 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1358 +#: ../apport/ui.py:1363 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1363 msgid "" "This problem was already reported in the bug report displayed in the web " "browser. Please check if you can add any further information that might be " @@ -637,244 +666,124 @@ msgstr "" "この問題は、ブラウザーに表示されたバグレポートですでに報告されています。開発者にとって役立つような、より詳しい情報を追加できるかどうか確認してください。" -#: ../apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1365 +#: ../apport/ui.py:1370 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1370 msgid "This problem was already reported to developers. Thank you!" msgstr "この問題はすでに開発者にレポートされています。ありがとうございます!" -#: ../data/apportcheckresume.py:73 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73 -msgid "" -"This occured during a previous suspend and prevented it from resuming " -"properly." -msgstr "これは前回のサスペンドの間に起き、適切に再開することができませんでした。" +#: ../kde/apport-kde.py:169 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 +#: ../debian/tmp/usr/share/apport/apport-kde.py:169 ../gtk/apport-gtk.py:177 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429 +#: ../debian/tmp/usr/bin/apport-cli.py:178 ../bin/apport-cli.py:178 +msgid "Send problem report to the developers?" +msgstr "問題のレポートを開発者に送信しますか?" -#: ../data/apportcheckresume.py:75 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75 -msgid "" -"This occured during a previous hibernate and prevented it from resuming " -"properly." -msgstr "これは前回のハイバネートの間に起き、適切に再開することができませんでした。" +#: ../kde/apport-kde.py:177 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 +#: ../debian/tmp/usr/share/apport/apport-kde.py:177 ../gtk/apport-gtk.py:186 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437 +msgid "Send" +msgstr "送信" -#: ../data/apportcheckresume.py:80 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80 -msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "リジューム処理が終わる寸前でハングしましたが、通常通り完了していると思われます。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 -msgid "Crash report" -msgstr "クラッシュレポート" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 -msgid "Sorry, an internal error happened." -msgstr "残念ながら、内部エラーが発生しました。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 -msgid "Send an error report to help fix this problem" -msgstr "エラーレポートを送信してこの問題の修正に協力する" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 -msgid "Ignore future problems of this program version" -msgstr "今後このバージョンのプログラムの問題を無視する" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 -msgid "_Examine locally" -msgstr "ローカルで解析する(_E)" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 -msgid "Collecting problem information" -msgstr "問題の情報を集めています" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 -msgid "" -"Information is being collected that may help the developers fix the problem " -"you report." -msgstr "あなたの報告する問題を開発者が修正するのに、手助けとなるような情報を収集します。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 -msgid "Uploading problem information" -msgstr "問題の情報をアップロードしています" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "詳細はmanページをご覧ください。" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "valgrind によって生成されたログファイルの名前を指定" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46 -msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" -msgstr "以前作成されたサンドボックスディレクトリ (SDIR) を再利用するか、もし存在しない場合には作成する" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50 -msgid "" -"do not create or reuse a sandbox directory for additional debug symbols " -"but rely only on installed debug symbols." -msgstr "追加のデバッグシンボル用にサンドボックスディレクトリを作成または再利用せず、インストールされたデバッグシンボルのみを利用する。" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54 -msgid "" -"reuse a previously created cache dir (CDIR) or, if it does not exist, create " -"it" -msgstr "以前作成されたキャッシュディレクトリ (CDIR) を再利用するか、もし存在しない場合には作成する" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58 -msgid "" -"report download/install progress when installing packages into sandbox" -msgstr "サンドボックス内にパッケージをインストールする際、ダウンロードおよびインストールの進捗状況を報告する" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62 -msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" -msgstr "メモリリーク検出のためvalgrindのメモリチェックツールにより実行されているプログラム" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:59 -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-valgrind.py:66 -msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" -msgstr "サンドボックスに追加のパッケージをインストールする (複数回指定可)" - -#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." -msgstr "エラー: %s は実行ファイルではありません。中止します。" - -#: ../bin/apport-cli.py:74 ../debian/tmp/usr/bin/apport-cli.py:74 -msgid "Press any key to continue..." -msgstr "続けるには何かキーを押してください..." - -#: ../bin/apport-cli.py:81 ../debian/tmp/usr/bin/apport-cli.py:81 -msgid "What would you like to do? Your options are:" -msgstr "対処方法を選択してください:" - -#: ../bin/apport-cli.py:85 ../debian/tmp/usr/bin/apport-cli.py:85 +#: ../kde/apport-kde.py:183 ../kde/apport-kde.py:224 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 +#: ../debian/tmp/usr/share/apport/apport-kde.py:183 +#: ../debian/tmp/usr/share/apport/apport-kde.py:224 ../gtk/apport-gtk.py:165 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300 #, python-format -msgid "Please choose (%s):" -msgstr "選択してください(%s):" +msgid "Sorry, %s has experienced an internal error." +msgstr "残念ながら、%s で内部エラーが発生しました。" -#: ../bin/apport-cli.py:148 ../debian/tmp/usr/bin/apport-cli.py:148 +#: ../kde/apport-kde.py:191 ../debian/tmp/usr/share/apport/apport-gtk.py:257 +#: ../debian/tmp/usr/share/apport/apport-kde.py:191 ../gtk/apport-gtk.py:257 #, python-format -msgid "(%i bytes)" -msgstr "(%i バイト)" +msgid "Package: %s" +msgstr "パッケージ: %s" -#: ../bin/apport-cli.py:179 ../debian/tmp/usr/bin/apport-cli.py:179 -msgid "" -"After the problem report has been sent, please fill out the form in the\n" -"automatically opened web browser." -msgstr "問題のレポートが送信された後で、フォームに入力してください（入力用ページをウェブブラウザーで自動的に開きます）。" +#: ../kde/apport-kde.py:197 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 +#: ../debian/tmp/usr/share/apport/apport-kde.py:197 ../gtk/apport-gtk.py:264 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137 +msgid "Sorry, a problem occurred while installing software." +msgstr "残念ながら、ソフトウェアのインストール中に問題が発生しました。" -#: ../bin/apport-cli.py:182 ../debian/tmp/usr/bin/apport-cli.py:182 +#: ../kde/apport-kde.py:204 ../debian/tmp/usr/share/apport/apport-gtk.py:273 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:204 ../gtk/apport-gtk.py:273 +#: ../gtk/apport-gtk.py:292 #, python-format -msgid "&Send report (%s)" -msgstr "レポートの送信(&S) (%s)" - -#: ../bin/apport-cli.py:186 ../debian/tmp/usr/bin/apport-cli.py:186 -msgid "&Examine locally" -msgstr "ローカルで解析する(&E)" - -#: ../bin/apport-cli.py:190 ../debian/tmp/usr/bin/apport-cli.py:190 -msgid "&View report" -msgstr "レポートの表示(&V)" - -#: ../bin/apport-cli.py:191 ../debian/tmp/usr/bin/apport-cli.py:191 -msgid "&Keep report file for sending later or copying to somewhere else" -msgstr "後で送信もしくは他の場所にコピーするためにレポートファイルを保持する(&K)" - -#: ../bin/apport-cli.py:192 ../debian/tmp/usr/bin/apport-cli.py:192 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "中止し、このプログラムバージョンでは今後クラッシュしても無視する(&I)" - -#: ../bin/apport-cli.py:194 ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 -#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:271 -#: ../debian/tmp/usr/bin/apport-cli.py:303 -#: ../debian/tmp/usr/bin/apport-cli.py:324 -msgid "&Cancel" -msgstr "キャンセル(&C)" - -#: ../bin/apport-cli.py:222 ../debian/tmp/usr/bin/apport-cli.py:222 -msgid "Problem report file:" -msgstr "問題報告ファイル:" - -#: ../bin/apport-cli.py:228 ../bin/apport-cli.py:233 -#: ../debian/tmp/usr/bin/apport-cli.py:228 -#: ../debian/tmp/usr/bin/apport-cli.py:233 -msgid "&Confirm" -msgstr "確認(&C)" +msgid "The application %s has experienced an internal error." +msgstr "アプリケーション %s は内部エラーに遭遇しました。" -#: ../bin/apport-cli.py:232 ../debian/tmp/usr/bin/apport-cli.py:232 +#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-gtk.py:276 +#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../gtk/apport-gtk.py:276 #, python-format -msgid "Error: %s" -msgstr "エラー: %s" - -#: ../bin/apport-cli.py:239 ../debian/tmp/usr/bin/apport-cli.py:239 -msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." -msgstr "" -"収集された情報はアプリケーションを改善するために開発者へ送られます。\n" -"しばらくお待ちください。" - -#: ../bin/apport-cli.py:252 ../debian/tmp/usr/bin/apport-cli.py:252 -msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." -msgstr "" -"収集された情報はバグトラッキングシステムに送信されます。\n" -"しばらくお待ちください。" +msgid "The application %s has closed unexpectedly." +msgstr "アプリケーション %s が突然終了しました。" -#: ../bin/apport-cli.py:302 ../debian/tmp/usr/bin/apport-cli.py:302 -msgid "&Done" -msgstr "完了(&D)" +#: ../kde/apport-kde.py:221 ../kde/apport-kde.py:368 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:229 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 +#: ../debian/tmp/usr/share/apport/apport-kde.py:221 +#: ../debian/tmp/usr/share/apport/apport-kde.py:368 ../gtk/apport-gtk.py:229 +#: ../gtk/apport-gtk.py:288 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273 +msgid "Relaunch" +msgstr "再起動する" -#: ../bin/apport-cli.py:308 ../debian/tmp/usr/bin/apport-cli.py:308 -msgid "none" -msgstr "なし" +#: ../kde/apport-kde.py:231 ../debian/tmp/usr/share/apport/apport-gtk.py:304 +#: ../debian/tmp/usr/share/apport/apport-kde.py:231 ../gtk/apport-gtk.py:304 +msgid "Ignore future problems of this type" +msgstr "今後、この種類の問題は無視する" -#: ../bin/apport-cli.py:309 ../debian/tmp/usr/bin/apport-cli.py:309 -#, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "現在の設定: %s。複数選択:" +#: ../kde/apport-kde.py:275 ../debian/tmp/usr/share/apport/apport-gtk.py:577 +#: ../debian/tmp/usr/share/apport/apport-kde.py:275 ../gtk/apport-gtk.py:577 +msgid "Hide Details" +msgstr "詳細を隠す" -#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 -msgid "Choices:" -msgstr "選択肢：" +#: ../kde/apport-kde.py:301 ../debian/tmp/usr/share/apport/apport-kde.py:301 +msgid "Username:" +msgstr "ユーザー名:" -#: ../bin/apport-cli.py:339 ../debian/tmp/usr/bin/apport-cli.py:339 -msgid "Path to file (Enter to cancel):" -msgstr "ファイルへのパス（Enterでキャンセル）：" +#: ../kde/apport-kde.py:302 ../debian/tmp/usr/share/apport/apport-kde.py:302 +msgid "Password:" +msgstr "パスワード:" -#: ../bin/apport-cli.py:345 ../debian/tmp/usr/bin/apport-cli.py:345 -msgid "File does not exist." -msgstr "ファイルが存在しません。" +#: ../kde/apport-kde.py:349 ../debian/tmp/usr/share/apport/apport-gtk.py:142 +#: ../debian/tmp/usr/share/apport/apport-kde.py:349 ../gtk/apport-gtk.py:142 +#: ../debian/tmp/usr/bin/apport-cli.py:150 ../bin/apport-cli.py:150 +msgid "(binary data)" +msgstr "(バイナリデータ)" -#: ../bin/apport-cli.py:347 ../debian/tmp/usr/bin/apport-cli.py:347 -msgid "This is a directory." -msgstr "これはディレクトリです。" +#: ../kde/apport-kde.py:393 ../debian/tmp/usr/share/apport/apport-kde.py:393 +msgid "Collecting Problem Information" +msgstr "問題の情報を集めています" -#: ../bin/apport-cli.py:353 ../debian/tmp/usr/bin/apport-cli.py:353 -msgid "To continue, you must visit the following URL:" -msgstr "続行するには、以下のURLを開いてください:" +#: ../kde/apport-kde.py:394 ../debian/tmp/usr/share/apport/apport-kde.py:394 +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 +msgid "Collecting problem information" +msgstr "問題の情報を集めています" -#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 +#: ../kde/apport-kde.py:395 ../debian/tmp/usr/share/apport/apport-kde.py:395 msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" - -#: ../bin/apport-cli.py:357 ../debian/tmp/usr/bin/apport-cli.py:357 -msgid "Launch a browser now" -msgstr "今すぐブラウザーを起動する" +"The collected information can be sent to the developers to improve the " +"application. This might take a few minutes." +msgstr "収集された情報はアプリケーションを改善するために開発者へ送られます。しばらくお待ちください。" -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 -msgid "No pending crash reports. Try --help for more information." -msgstr "未解決のクラッシュレポートはありません。詳しくは --help を試してみてください。" +#: ../kde/apport-kde.py:421 ../debian/tmp/usr/share/apport/apport-kde.py:421 +msgid "Uploading Problem Information" +msgstr "問題の情報をアップロードしています" #: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148 @@ -888,6 +797,35 @@ msgid "The application Apport has closed unexpectedly." msgstr "Apportアプリケーションが予期せず終了しました。" +#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157 +#, python-format +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "残念ながら、アプリケーション%sが予期せず停止しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "残念ながら、%s は予期せず終了しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276 +msgid "Force Closed" +msgstr "強制終了" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238 +#, python-format +msgid "The application %s has stopped responding." +msgstr "アプリケーション %s は応答していません。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "プログラム \"%s\" は応答していません。" + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "クラッシュしたファイルをApportする" + #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263 msgid "The application Apport has stopped responding." msgstr "Apportアプリケーションは反応していません。" @@ -896,11 +834,6 @@ msgid "You can wait to see if it wakes up, or close or relaunch it." msgstr "起動するかどうか待つか、閉じるか、再起動できます。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228 -msgid "Force Closed" -msgstr "強制終了" - #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340 msgid "Sorry, the application apport has stopped unexpectedly." msgstr "残念ながら、アプリケーションapportが予期せず停止しました。" @@ -909,34 +842,26 @@ msgid "Sorry, apport has closed unexpectedly." msgstr "残念ながら、apportは予期せず終了しました。" -#: ../data/general-hooks/ubuntu.py:130 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130 +#: ../data/apportcheckresume.py:73 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73 msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package" -msgstr "Ubuntuパッケージのファイルが純正のUbuntuパッケージではないパッケージと衝突しています。" +"This occured during a previous suspend and prevented it from resuming " +"properly." +msgstr "これは前回のサスペンドの間に起き、適切に再開することができませんでした。" -#: ../data/general-hooks/ubuntu.py:147 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147 +#: ../data/apportcheckresume.py:75 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75 msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" -msgstr "" -"このシステムは当初はgrub バージョン 2に設定されていましたが、grub " -"1を選んだため設定なしのままでシステムから削除されています。新しいカーネルが入手可能となったときにブートローダの設定が更新されるよう、端末を開いて以下のコ" -"マンドを実行してください:\n" -"\n" -" sudo apt-get install grub-pc\n" +"This occured during a previous hibernate and prevented it from resuming " +"properly." +msgstr "これは前回のハイバネートの間に起き、適切に再開することができませんでした。" -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091 -msgid "Problem in bash" -msgstr "bashでの問題" +#: ../data/apportcheckresume.py:80 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +msgstr "リジューム処理が終わる寸前でハングしましたが、通常通り完了していると思われます。" #: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31 msgid "%prog [options] " @@ -1052,68 +977,139 @@ msgid "OK to send these as attachments? [y/n]" msgstr "これらを添付ファイルとして送ってよろしいですか？ [y/n]" -#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "問題を報告する..." - -#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "開発者に異常動作を報告してください" +#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74 +msgid "Press any key to continue..." +msgstr "続けるには何かキーを押してください..." -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "クラッシュしたファイルをApportする" +#: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81 +msgid "What would you like to do? Your options are:" +msgstr "対処方法を選択してください:" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157 +#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85 #, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "残念ながら、アプリケーション%sが予期せず停止しました。" +msgid "Please choose (%s):" +msgstr "選択してください(%s):" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160 +#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148 #, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "残念ながら、%s は予期せず終了しました。" +msgid "(%i bytes)" +msgstr "(%i バイト)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238 +#: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179 +msgid "" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." +msgstr "問題のレポートが送信された後で、フォームに入力してください（入力用ページをウェブブラウザーで自動的に開きます）。" + +#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182 #, python-format -msgid "The application %s has stopped responding." -msgstr "アプリケーション %s は応答していません。" +msgid "&Send report (%s)" +msgstr "レポートの送信(&S) (%s)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242 +#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186 +msgid "&Examine locally" +msgstr "ローカルで解析する(&E)" + +#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190 +msgid "&View report" +msgstr "レポートの表示(&V)" + +#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191 +msgid "&Keep report file for sending later or copying to somewhere else" +msgstr "後で送信もしくは他の場所にコピーするためにレポートファイルを保持する(&K)" + +#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "中止し、このプログラムバージョンでは今後クラッシュしても無視する(&I)" + +#: ../debian/tmp/usr/bin/apport-cli.py:194 +#: ../debian/tmp/usr/bin/apport-cli.py:271 +#: ../debian/tmp/usr/bin/apport-cli.py:303 +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194 +#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324 +msgid "&Cancel" +msgstr "キャンセル(&C)" + +#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222 +msgid "Problem report file:" +msgstr "問題報告ファイル:" + +#: ../debian/tmp/usr/bin/apport-cli.py:228 +#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228 +#: ../bin/apport-cli.py:233 +msgid "&Confirm" +msgstr "確認(&C)" + +#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232 #, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "プログラム \"%s\" は応答していません。" +msgid "Error: %s" +msgstr "エラー: %s" -#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" +#: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239 +msgid "" +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." +msgstr "" +"収集された情報はアプリケーションを改善するために開発者へ送られます。\n" +"しばらくお待ちください。" -#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252 +msgid "" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." +msgstr "" +"収集された情報はバグトラッキングシステムに送信されます。\n" +"しばらくお待ちください。" + +#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302 +msgid "&Done" +msgstr "完了(&D)" + +#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308 +msgid "none" +msgstr "なし" + +#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309 #, python-format -msgid "Usage: %s " -msgstr "使用法 : %s <レポート> <対象ディレクトリ>" +msgid "Selected: %s. Multiple choices:" +msgstr "現在の設定: %s。複数選択:" -#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 -msgid "Destination directory exists and is not empty." -msgstr "目的のディレクトリは存在しますが、空ではありません。" +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 +msgid "Choices:" +msgstr "選択肢：" -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "システム情報を収集" +#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339 +msgid "Path to file (Enter to cancel):" +msgstr "ファイルへのパス（Enterでキャンセル）：" -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" -msgstr "この問題を報告するには、システム情報を収集するための認証が必要です" +#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345 +msgid "File does not exist." +msgstr "ファイルが存在しません。" -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "システムの問題の報告" +#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347 +msgid "This is a directory." +msgstr "これはディレクトリです。" -#: ../apport/com.ubuntu.apport.policy.in.h:4 +#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353 +msgid "To continue, you must visit the following URL:" +msgstr "続行するには、以下のURLを開いてください:" + +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 msgid "" -"Please enter your password to access problem reports of system programs" -msgstr "システムプログラムの問題レポートにアクセスするにはパスワードを入力してください" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." +msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" + +#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357 +msgid "Launch a browser now" +msgstr "今すぐブラウザーを起動する" + +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 +msgid "No pending crash reports. Try --help for more information." +msgstr "未解決のクラッシュレポートはありません。詳しくは --help を試してみてください。" + +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091 +msgid "Problem in bash" +msgstr "bashでの問題" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/aptitude.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/aptitude.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/aptitude.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/aptitude.po 2015-02-19 15:11:47.000000000 +0000 @@ -194,17 +194,21 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:34+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:32+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" +#. TRANSLATORS: These strings describing config items +#. should be the same width. #: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 -#: src/apt_config_treeitems.cc:394 +#: src/apt_config_treeitems.cc:396 msgid "%BOption:%b " msgstr "%Bオプション:%b " +#. TRANSLATORS: These strings describing config items +#. should be the same width. #: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 -#: src/apt_config_treeitems.cc:396 +#: src/apt_config_treeitems.cc:400 msgid "%BDefault:%b " msgstr "%Bデフォルト:%b " @@ -216,17 +220,21 @@ msgid "False" msgstr "いいえ" +#. TRANSLATORS: These strings describing config items +#. should be the same width. #: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 -#: src/apt_config_treeitems.cc:398 +#: src/apt_config_treeitems.cc:404 msgid "%BValue:%b " msgstr "%B値:%b " #: src/apt_config_treeitems.cc:280 #, c-format msgid "Editing \"%ls\": " -msgstr "\"%ls\" を編集中: " +msgstr "「%ls」を編集しています: " -#: src/apt_config_treeitems.cc:402 +#. TRANSLATORS: These strings describing config items +#. should be the same width. +#: src/apt_config_treeitems.cc:410 msgid "%BChoice:%b " msgstr "%B選んだ選択肢:%b " @@ -517,6 +525,8 @@ "This option controls the server used to download changelogs. You should " "only need to change this if the changelogs move to a different URL." msgstr "" +"このオプションを用いると、変更履歴をダウンロードするのに用いられるサーバを調整できます。設定の変更が必要になるのは、変更履歴 (changelog) " +"ファイルの URL が変更になったときのみでしょう。" #: src/apt_options.cc:300 msgid "Display a preview of what will be done before doing it" @@ -716,7 +726,7 @@ msgid "Dependency handling" msgstr "依存関係の処理" -#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064 +#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1063 msgid "Miscellaneous" msgstr "その他" @@ -797,7 +807,7 @@ msgid_plural "%d downgrades" msgstr[0] "%d 個のダウングレード" -#. ForTranslators: %F is replaced with a comma separated list such as +#. TRANSLATORS: %F is replaced with a comma separated list such as #. "n1 installs, n2 removals", ... #. #: src/broken_indicator.cc:430 @@ -824,7 +834,7 @@ "注意: 仮想パッケージ \"%2$s\" を提供する\n" " \"%1$s\" は既にインストールされています。\n" -#: src/cmdline/cmdline_action.cc:256 +#: src/cmdline/cmdline_action.cc:257 #, c-format msgid "" "Note: \"%s\", providing the virtual package\n" @@ -833,7 +843,7 @@ "注意: 仮想パッケージ \"%2$s\" を提供する\n" " \"%1$s\" は既にインストール予定です。\n" -#: src/cmdline/cmdline_action.cc:278 +#: src/cmdline/cmdline_action.cc:280 #, c-format msgid "" "\"%s\" exists in the package database, but it is not a\n" @@ -842,17 +852,17 @@ "\"%s\" はパッケージデータベースには存在します。\n" "しかし実在するパッケージではなく、どのパッケージからも提供されていません。\n" -#: src/cmdline/cmdline_action.cc:286 +#: src/cmdline/cmdline_action.cc:288 #, c-format msgid "\"%s\" is a virtual package provided by:\n" msgstr "\"%s\" は、以下のパッケージから提供されている仮想パッケージです:\n" -#: src/cmdline/cmdline_action.cc:289 +#: src/cmdline/cmdline_action.cc:291 #, c-format msgid "You must choose one to install.\n" msgstr "インストールするものを一つ選んでください。\n" -#: src/cmdline/cmdline_action.cc:297 +#: src/cmdline/cmdline_action.cc:299 #, c-format msgid "" "Note: selecting \"%s\" instead of the\n" @@ -861,60 +871,60 @@ "注意: 仮想パッケージ \"%2$s\" の代わりに\n" " \"%1$s\" を選択します\n" -#: src/cmdline/cmdline_action.cc:318 +#: src/cmdline/cmdline_action.cc:321 #, c-format msgid "%s is already installed at the requested version (%s)\n" msgstr "%s は、要求されたバージョン (%s) で既にインストールされています\n" -#: src/cmdline/cmdline_action.cc:328 +#: src/cmdline/cmdline_action.cc:331 #, c-format msgid "%s is not currently installed, so it will not be upgraded.\n" msgstr "%s は現在インストールされていないので更新されません。\n" -#: src/cmdline/cmdline_action.cc:332 +#: src/cmdline/cmdline_action.cc:335 #, c-format msgid "" "%s is already installed at the latest version, so it will not be upgraded.\n" -msgstr "%s はすでに最新バージョンがインストールされているので更新されません。\n" +msgstr "%s は最新バージョンなので更新されません。\n" -#: src/cmdline/cmdline_action.cc:338 +#: src/cmdline/cmdline_action.cc:341 #, c-format msgid "%s is not currently installed, so it will not be reinstalled.\n" msgstr "%s は現在インストールされていないので再インストールされません。\n" -#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353 +#: src/cmdline/cmdline_action.cc:349 src/cmdline/cmdline_action.cc:356 #, c-format msgid "Package %s is not installed, so it will not be removed\n" msgstr "%s パッケージはインストールされていないので削除されません\n" -#: src/cmdline/cmdline_action.cc:372 +#: src/cmdline/cmdline_action.cc:375 #, c-format msgid "Package %s is not installed, cannot forbid an upgrade\n" msgstr "%s パッケージはインストールされていないので更新を禁止できません\n" -#: src/cmdline/cmdline_action.cc:375 +#: src/cmdline/cmdline_action.cc:378 #, c-format msgid "Package %s is not upgradable, cannot forbid an upgrade\n" msgstr "%s パッケージは更新可能ではないので更新を禁止できません\n" -#: src/cmdline/cmdline_action.cc:480 +#: src/cmdline/cmdline_action.cc:483 #, c-format msgid "Note: selecting the task \"%s: %s\" for installation\n" msgstr "注意: タスク \"%s: %s\" をインストールするよう選択します\n" -#: src/cmdline/cmdline_action.cc:510 +#: src/cmdline/cmdline_action.cc:513 #, c-format msgid "" "You can only specify a package version with an 'install' command or a " "'forbid-version' command.\n" msgstr "'install' コマンドや 'forbid-version' コマンドで指定できるのはパッケージのバージョンだけです。\n" -#: src/cmdline/cmdline_action.cc:519 +#: src/cmdline/cmdline_action.cc:522 #, c-format msgid "You can only specify a package archive with an 'install' command.\n" msgstr "'install' コマンドで指定できるのはパッケージのアーカイブだけです。\n" -#: src/cmdline/cmdline_action.cc:557 +#: src/cmdline/cmdline_action.cc:560 #, c-format msgid "" "Couldn't find package \"%s\", and more than 40\n" @@ -923,7 +933,7 @@ "\"%s\" パッケージは見つかりませんでした。\n" "パッケージ名に \"%s\" を含むものは 40 以上あります。\n" -#: src/cmdline/cmdline_action.cc:560 +#: src/cmdline/cmdline_action.cc:563 #, c-format msgid "" "Couldn't find package \"%s\". However, the following\n" @@ -932,12 +942,12 @@ "\"%s\" パッケージは見つかりませんでした。\n" "しかし、以下のパッケージ名に \"%s\" が含まれています:\n" -#: src/cmdline/cmdline_action.cc:582 +#: src/cmdline/cmdline_action.cc:585 #, c-format msgid "Couldn't find any package whose name or description matched \"%s\"\n" msgstr "名前か説明が \"%s\" にマッチするパッケージは見つかりませんでした\n" -#: src/cmdline/cmdline_action.cc:584 +#: src/cmdline/cmdline_action.cc:587 #, c-format msgid "" "Couldn't find any package matching \"%s\", and more than 40\n" @@ -946,7 +956,7 @@ "\"%s\" にマッチするパッケージは見つかりませんでした。\n" "パッケージ説明に \"%s\" を含むものは 40 以上あります。\n" -#: src/cmdline/cmdline_action.cc:587 +#: src/cmdline/cmdline_action.cc:590 #, c-format msgid "" "Couldn't find any package matching \"%s\". However, the following\n" @@ -955,46 +965,46 @@ "\"%s\" にマッチするパッケージは見つかりませんでした。\n" "しかし、以下のパッケージ説明に \"%s\" が含まれています:\n" -#: src/cmdline/cmdline_action.cc:729 +#: src/cmdline/cmdline_action.cc:732 #, c-format msgid "Bad action character '%c'\n" msgstr "不正なアクション文字です: '%c'\n" -#: src/cmdline/cmdline_changelog.cc:136 +#: src/cmdline/cmdline_changelog.cc:134 #: src/cmdline/cmdline_download_progress_display.cc:131 msgid "Get:" msgstr "取得:" -#. ForTranslators: this stands for "error" and should be the +#. TRANSLATORS: this stands for "error" and should be the #. same width as the translation of "Ign". -#: src/cmdline/cmdline_changelog.cc:146 +#: src/cmdline/cmdline_changelog.cc:144 #: src/cmdline/cmdline_download_progress_display.cc:185 msgid "Err" -msgstr "" +msgstr "エラー" -#: src/cmdline/cmdline_changelog.cc:179 +#: src/cmdline/cmdline_changelog.cc:177 #, c-format msgid "Changelog download failed: %s" -msgstr "" +msgstr "変更履歴のダウンロードに失敗しました: %s" -#: src/cmdline/cmdline_changelog.cc:283 +#: src/cmdline/cmdline_changelog.cc:296 msgid "Can't execute sensible-pager, is this a working Debian system?" msgstr "sensible-pager が実行できません。これは正常に機能している Debian システムですか?" -#: src/cmdline/cmdline_changelog.cc:333 +#: src/cmdline/cmdline_changelog.cc:347 #, c-format msgid "%s is not an official Debian package, cannot display its changelog." msgstr "%s は公式の Debian パッケージではないので、変更履歴を表示できません。" -#: src/cmdline/cmdline_changelog.cc:394 +#: src/cmdline/cmdline_changelog.cc:408 #, c-format msgid "Couldn't find a changelog for %s" msgstr "%s の変更履歴が見つかりません" -#: src/cmdline/cmdline_changelog.cc:398 +#: src/cmdline/cmdline_changelog.cc:412 #, c-format msgid "Couldn't run pager %s" -msgstr "" +msgstr "ページャー %s を実行できません" #: src/cmdline/cmdline_clean.cc:60 #, c-format @@ -1007,9 +1017,9 @@ msgstr "%s* %spartial/* を削除\n" #: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146 -#: src/ui.cc:1787 src/ui.cc:1875 +#: src/ui.cc:1788 src/ui.cc:1876 msgid "Unable to lock the download directory" -msgstr "" +msgstr "ダウンロードディレクトリをロックできません" #: src/cmdline/cmdline_clean.cc:106 #, c-format @@ -1077,29 +1087,29 @@ #: src/cmdline/cmdline_download_progress_display.cc:154 msgid "Hit" -msgstr "" +msgstr "発見" -#. ForTranslators: this stands for "ignored" and should be +#. TRANSLATORS: this stands for "ignored" and should be #. the same width as the translation of "Err". #: src/cmdline/cmdline_download_progress_display.cc:181 msgid "Ign" -msgstr "" +msgstr "無視" #: src/cmdline/cmdline_download_progress_display.cc:211 #, c-format msgid "Fetched %sB in %s (%sB/s)" -msgstr "" +msgstr "%sB を %s 秒で取得しました (%sB/s)" #: src/cmdline/cmdline_download_progress_display.cc:230 #, c-format msgid "" "Media change: Please insert the disc labeled '%s' into the drive '%s' and " "press [Enter]." -msgstr "" +msgstr "メディアの交換: '%s' というラベルのディスクを '%s' ドライブに入れ、Enter を押してください。" #: src/cmdline/cmdline_download_progress_display.cc:436 msgid "[Working]" -msgstr "[処理中]" +msgstr "[作業中]" #: src/cmdline/cmdline_extract_cache_subset.cc:57 #, c-format @@ -1171,11 +1181,11 @@ msgid "Done" msgstr "完了" -#. ForTranslators: the string replacing "DONE" +#. TRANSLATORS: the string replacing "DONE" #. be truncated or padded to 4 characters. #: src/cmdline/cmdline_progress_display.cc:173 msgid "DONE" -msgstr "" +msgstr "完了" #: src/cmdline/cmdline_prompt.cc:84 msgid "Couldn't read list of sources" @@ -1233,17 +1243,17 @@ msgid "The following partially installed packages will be configured:" msgstr "以下の、インストールが完了していないパッケージが設定されます:" -#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574 +#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1575 #, c-format msgid "The following ESSENTIAL packages will be REMOVED!\n" msgstr "以下の必須パッケージが削除されます!\n" -#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589 +#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1590 #, c-format msgid "The following ESSENTIAL packages will be BROKEN by this action:\n" msgstr "このアクションによって以下の必須パッケージの依存関係が壊れます:\n" -#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602 +#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1603 #, c-format msgid "" "WARNING: Performing this action will probably cause your system to break!\n" @@ -1256,7 +1266,7 @@ msgid "I am aware that this is a very bad idea" msgstr "I am aware that this is a very bad idea" -#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603 +#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1604 #, c-format msgid "To continue, type the phrase \"%s\":\n" msgstr "先に進む場合は '%s' というフレーズを入力してください:\n" @@ -1295,7 +1305,7 @@ "*** 警告*** Apt::Get::AllowUnauthenticated が 'true' と\n" " なっているので、これらの信頼侵害を無視しています!\n" -#. ForTranslators: This string is a confirmation message, which +#. TRANSLATORS: This string is a confirmation message, which #. users (especially CJK users) should be able to input without #. input methods. Please include nothing but ASCII characters. #. The text preceding the pipe character (|) will be ignored and @@ -1304,7 +1314,7 @@ msgid "Go ahead and ignore the warning|Yes" msgstr "Go ahead and ignore the warning|Yes" -#. ForTranslators: This string is a confirmation message, which +#. TRANSLATORS: This string is a confirmation message, which #. users (especially CJK users) should be able to input without #. input methods. Please include nothing but ASCII characters. #. The text preceding the pipe character (|) will be ignored and @@ -1390,7 +1400,7 @@ msgstr "表示するパッケージがありません -- 'i' に続けてパッケージ名を入力してください。\n" #: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792 -#: src/pkg_item.cc:411 src/ui.cc:1219 +#: src/pkg_item.cc:411 src/ui.cc:1220 msgid "Press Return to continue." msgstr "先に進むには Return を押してください。" @@ -1571,23 +1581,25 @@ "These characters provide extra information about the package's state, and " "can include any combination of the following:" msgstr "" +"行われた操作一覧の中で、パッケージによっては文字が「{}」で囲まれ、例えば「aptitude{u}」のように続くものがあります。こういった文字はそのパッケ" +"ージの状態についての追加の情報を提供し、以下の任意の組み合わせがあり得ます:" #: src/cmdline/cmdline_prompt.cc:909 msgid "'a': the package was automatically installed or removed." -msgstr "" +msgstr "「a」: パッケージが自動でインストールまたは削除されたことを示します。" #: src/cmdline/cmdline_prompt.cc:911 msgid "" "'b': some of the package's dependencies are violated by the proposed changes." -msgstr "" +msgstr "「b」: 提案された変更によりそのパッケージの依存関係に破綻している部分があります。" #: src/cmdline/cmdline_prompt.cc:913 msgid "'p': the package will be purged in addition to being removed." -msgstr "" +msgstr "「p」: そのパッケージは削除されていますが、さらに完全削除されます。" #: src/cmdline/cmdline_prompt.cc:915 msgid "'u': the package is being removed because it is unused." -msgstr "" +msgstr "「u」: そのパッケージは利用されないため削除されています。" #: src/cmdline/cmdline_prompt.cc:920 msgid "Commands:" @@ -1688,7 +1700,7 @@ "\n" #: src/cmdline/cmdline_resolver.cc:149 src/cmdline/cmdline_resolver.cc:1002 -#: src/generic/apt/apt.cc:288 +#: src/generic/apt/apt.cc:289 #, c-format msgid "Unable to open %s for writing" msgstr "%s を書き込み可能な状態で開けません" @@ -1708,6 +1720,8 @@ "y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n: %F%n pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|パッケージ バージョン) ...: %F%na " +"(ID|パッケージ バージョン) ...: %F%n: %F%n<アクション> パッケージ... : %F%n%F%F%F%F%F%F%F%F" # * Case: 'y' #: src/cmdline/cmdline_resolver.cc:243 @@ -1752,25 +1766,31 @@ "abort automatic dependency resolution; resolve dependencies by hand instead" msgstr "依存関係の自動解決を中断します。代わりに手動で依存関係を解決してください" +# * Case: 'r' #: src/cmdline/cmdline_resolver.cc:259 msgid "" "reject the given package versions; don't display any solutions in which they " "occur. Enter UNINST instead of a version to reject removing the package. " "ID is the integer printed to the left of the action." msgstr "" +"指定されたパッケージバージョンを拒否します。その解決方法は一切表示しません。パッケージの削除を拒否するには、バージョンの代わりに UNINST " +"を指定してください。IDは操作の左側に表示されている整数です。" +# * Case: 'a' #: src/cmdline/cmdline_resolver.cc:261 msgid "" "accept the given package versions; display only solutions in which they " "occur. Enter UNINST instead of a version to accept removing the package. " "ID is the integer printed to the left of the action." msgstr "" +"指定されたパッケージバージョンを受け入れます。そのパッケージバージョンを含む解決方法以外は表示しません。パッケージの削除を受け入れるには、バージョンの代わ" +"りに UNINST を指定してください。IDは操作の左側に表示されている整数です。" #: src/cmdline/cmdline_resolver.cc:263 msgid "" "display information about the action labeled ID from the solution. The " "label is the integer printed to the left of the action." -msgstr "" +msgstr "解決方法からIDに該当する操作についての情報を表示します。IDは操作の左側に表示されている整数です。" # * Case: '' #: src/cmdline/cmdline_resolver.cc:265 @@ -1856,47 +1876,50 @@ #: src/cmdline/cmdline_resolver.cc:496 #, c-format msgid "Allowing this recommendation to be ignored: %s" -msgstr "" +msgstr "この推奨を無視できるようにする: %s" +# * Item #: src/cmdline/cmdline_resolver.cc:502 #, c-format msgid "Always obeying this recommendation: %s" -msgstr "" +msgstr "この推奨に常に従う: %s" #: src/cmdline/cmdline_resolver.cc:511 #, c-format msgid "No longer ignoring this recommendation: %s" -msgstr "" +msgstr "この推奨を今後無視しません: %s" +# * Item #: src/cmdline/cmdline_resolver.cc:517 #, c-format msgid "Ignoring this recommendation: %s" -msgstr "" +msgstr "この推奨を無視します: %s" +# * Menu item on the first line. #: src/cmdline/cmdline_resolver.cc:576 #, c-format msgid "Action \"%s\"" -msgstr "" +msgstr "アクション「%s」" -#. ForTranslators: the substitution is +#. TRANSLATORS: the substitution is #. replaced in English with something #. like "Pkg1 depends upon Pkg2". #: src/cmdline/cmdline_resolver.cc:589 #, c-format msgid "This action was selected because %ls." -msgstr "" +msgstr "%ls という理由でこのアクションが選択されました。" #: src/cmdline/cmdline_resolver.cc:591 msgid "" "This action is currently rejected; it will not appear in new solutions." -msgstr "" +msgstr "このアクションは現在拒否されています。新しい解決方法としては表示されません。" #: src/cmdline/cmdline_resolver.cc:592 msgid "" "This action is currently approved; it will be selected whenever possible." -msgstr "" +msgstr "このアクションは現在承認されています。可能なときには選択されます。" -#. ForTranslators: the "r" here is +#. TRANSLATORS: the "r" here is #. for "reject", but should not be #. translated since the commands in #. aptitude's internal command-line @@ -1904,9 +1927,9 @@ #: src/cmdline/cmdline_resolver.cc:599 #, c-format msgid "Enter \"r %s\" to allow this action to appear in new solutions." -msgstr "" +msgstr "「r %s」と入力するとこのアクションが新しい解決方法に表示されるようになります。" -#. ForTranslators: the "r" here is +#. TRANSLATORS: the "r" here is #. for "reject", but should not be #. translated since the commands in #. aptitude's internal command-line @@ -1915,9 +1938,9 @@ #, c-format msgid "" "Enter \"r %s\" to prevent this action from appearing in new solutions." -msgstr "" +msgstr "「r %s」と入力するとこのアクションが新しい解決方法に表示されないようになります。" -#. ForTranslators: the "a" here is +#. TRANSLATORS: the "a" here is #. for "approve", but should not be #. translated since the commands in #. aptitude's internal command-line @@ -1927,9 +1950,9 @@ msgid "" "Enter \"a %s\" to cease requiring that new solutions include this action if " "possible." -msgstr "" +msgstr "「a %s」と入力すると可能な場合に新しい解決方法にこのアクションが含まれることを必須としなくなります。" -#. ForTranslators: the "a" here is +#. TRANSLATORS: the "a" here is #. for "approve", but should not be #. translated since the commands in #. aptitude's internal command-line @@ -1938,7 +1961,7 @@ #, c-format msgid "" "Enter \"a %s\" to require that new solutions include this action if possible." -msgstr "" +msgstr "「a %s」と入力すると可能な場合に新しい解決方法にこのアクションが含まれることを必須とするようになります。" #: src/cmdline/cmdline_resolver.cc:790 #, c-format @@ -1987,7 +2010,7 @@ msgid "The following commands are available:" msgstr "以下のコマンドが利用可能です:" -#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316 +#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2317 msgid "File to write resolver state to: " msgstr "依存関係解決器の状態を書き込む出力ファイル: " @@ -2027,22 +2050,25 @@ " You may be able to solve this problem by increasing\n" " Aptitude::ProblemResolver::StepLimit (currently %d)." msgstr "" +"依存関係解決器がタイムアウトしたために更新のための依存を解決できませんでした\n" +" Aptitude::ProblemResolver::StepLimit の値 (現在 %d)\n" +" を増やすとこの問題を解決できるかもしれません。" #: src/cmdline/cmdline_resolver.cc:1201 msgid "Unable to resolve dependencies for the upgrade: no solution found." -msgstr "" +msgstr "更新のための依存関係の解決ができません: 解決方法が見つかりませんでした。" #: src/cmdline/cmdline_resolver.cc:1207 #, c-format msgid "Unable to resolve dependencies for the upgrade: %s" -msgstr "" +msgstr "更新のための依存関係の解決ができません: %s" -#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567 +#: src/cmdline/cmdline_search.cc:199 src/cmdline/cmdline_versions.cc:567 #, c-format msgid "iconv of %s failed.\n" msgstr "%s の iconv に失敗しました。\n" -#: src/cmdline/cmdline_search.cc:215 +#: src/cmdline/cmdline_search.cc:216 #, c-format msgid "search: You must provide at least one search term\n" msgstr "search: 検索語を少なくとも一つ与えなければなりません\n" @@ -2227,7 +2253,7 @@ #: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:125 msgid "Multi-Arch: " -msgstr "" +msgstr "複数アーキテクチャ対応: " #: src/cmdline/cmdline_show.cc:423 src/gtk/entitysummary.cc:361 #: src/gtk/previewtab.cc:230 @@ -2310,7 +2336,7 @@ #: src/cmdline/cmdline_show.cc:469 msgid "Enhances" -msgstr "" +msgstr "拡張" #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230 #: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205 @@ -2346,7 +2372,7 @@ msgid "Internal Error, Ordering didn't finish" msgstr "内部エラーです。並び換えが終わりませんでした" -#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880 +#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1712 src/ui.cc:1881 msgid "Deleting obsolete downloaded files" msgstr "ダウンロードされた廃止済みのファイルを削除しています" @@ -2403,7 +2429,7 @@ #: src/cmdline/cmdline_util.cc:273 #, c-format msgid "Couldn't find task '%s'" -msgstr "" +msgstr "タスク「%s」を見つけられませんでした" #: src/cmdline/cmdline_util.cc:361 #, c-format @@ -2443,43 +2469,43 @@ #: src/cmdline/cmdline_versions.cc:125 #, c-format msgid "Package %s:" -msgstr "" +msgstr "パッケージ %s:" #: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191 #, c-format msgid "Source package %s:" -msgstr "" +msgstr "ソースパッケージ %s:" #: src/cmdline/cmdline_versions.cc:213 #, c-format msgid "Archive %s:" -msgstr "" +msgstr "アーカイブ %s" #: src/cmdline/cmdline_versions.cc:502 msgid "--group-by|archive" -msgstr "" +msgstr "--group-by|archive" #: src/cmdline/cmdline_versions.cc:506 msgid "--group-by|auto" -msgstr "" +msgstr "--group-by|auto" #: src/cmdline/cmdline_versions.cc:510 msgid "--group-by|none" -msgstr "" +msgstr "--group-by|none" #: src/cmdline/cmdline_versions.cc:514 msgid "--group-by|package" -msgstr "" +msgstr "--group-by|package" #: src/cmdline/cmdline_versions.cc:518 msgid "--group-by|source-package" -msgstr "" +msgstr "--group-by|source-package" #: src/cmdline/cmdline_versions.cc:522 msgid "--group-by|source-version" -msgstr "" +msgstr "--group-by|source-version" -#. ForTranslators: --group-by is the argument name and shouldn't +#. TRANSLATORS: --group-by is the argument name and shouldn't #. be translated. #: src/cmdline/cmdline_versions.cc:528 #, c-format @@ -2487,11 +2513,13 @@ "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", " "\"package\", or \"source-package\")" msgstr "" +"パッケージのグループ分けモード「%s」が無効です (「auto」、「none」、「package」、「source-" +"package」のどれかでないといけません)" #: src/cmdline/cmdline_versions.cc:584 #, c-format msgid "versions: You must provide at least one package selector\n" -msgstr "" +msgstr "versions: パッケージセレクターを少なくとも一つ指定しないといけません\n" #: src/cmdline/cmdline_why.cc:290 msgid "dep_level" @@ -2593,7 +2621,7 @@ #: src/cmdline/cmdline_why.cc:1130 #, c-format msgid " ++ --> ENQUEUING %s Provides %s\n" -msgstr " ++ --> 「%s 提案 %s」をキューに投入します\n" +msgstr " ++ --> 「%s 提供 %s」をキューに投入します\n" #: src/cmdline/cmdline_why.cc:1138 #, c-format @@ -2639,13 +2667,13 @@ msgid "Unexpected end-of-file on standard input" msgstr "標準入力中に想定外のファイル終端記号が含まれています" -#. ForTranslators: the text between [] should be +#. TRANSLATORS: the text between [] should be #. exactly 4 character cells wide; "ERR" is short #. for "ERROR". #: src/cmdline/text_progress.cc:96 #, c-format msgid "[ ERR] %s" -msgstr "" +msgstr "[ ERR] %s" #: src/dep_item.cc:151 msgid "UNSATISFIED" @@ -2655,11 +2683,11 @@ msgid "UNAVAILABLE" msgstr "入手不可能" -#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051 +#: src/desc_render.cc:124 src/gtk/aptitude.glade:1051 msgid "Tags" msgstr "タグ" -#: src/desc_render.cc:149 +#: src/desc_render.cc:139 msgid "User Tags" msgstr "ユーザタグ" @@ -2689,7 +2717,7 @@ msgid "Continue" msgstr "先に進む" -#: src/download_list.cc:100 src/mine/cmine.cc:303 src/mine/cmine.cc:368 +#: src/download_list.cc:100 src/mine/cmine.cc:301 src/mine/cmine.cc:366 msgid "Cancel" msgstr "キャンセル" @@ -2748,7 +2776,7 @@ #: src/edit_pkg_hier.cc:340 msgid "Unable to look up your home directory!" -msgstr "" +msgstr "ホームディレクトリを検索できません!" #: src/generic/apt/aptcache.cc:271 #, c-format @@ -2825,7 +2853,7 @@ "You may want to update the package lists to correct these missing files" msgstr "これらの行方不明のファイルを修正するためにパッケージ一覧を更新したほうがよいでしょう" -#. ForTranslators: Set this string to the name of a configuration +#. TRANSLATORS: Set this string to the name of a configuration #. file in $pkgdatadir/aptitude that overrides defaults for your #. language. This is particularly intended for overriding entries #. in the Aptitude::Sections::Descriptions tree. @@ -2835,21 +2863,21 @@ #. indicated by translating "Localized defaults|" below to #. "aptitude-defaults.ww". If you use this mechanism, you should #. also add your defaults file to pkgdata_DATA in Makefile.am. -#: src/generic/apt/apt.cc:187 +#: src/generic/apt/apt.cc:188 msgid "Localized defaults|" msgstr "aptitude-defaults.ja" -#: src/generic/apt/apt.cc:260 +#: src/generic/apt/apt.cc:261 #, c-format msgid "%s is readable but not writable; unable to write configuration file." msgstr "%s は読み取り可能ですが書き込み可能ではありません。設定ファイルに書き込めません。" -#: src/generic/apt/apt.cc:305 +#: src/generic/apt/apt.cc:306 #, c-format msgid "Unable to replace %s with new configuration file" msgstr "%s を新しい設定ファイルと入れ替えることができません" -#: src/generic/apt/apt.cc:456 +#: src/generic/apt/apt.cc:457 msgid "" "Could not lock the cache file; this usually means that dpkg or another apt " "tool is already installing packages. Opening in read-only mode; any changes " @@ -2858,97 +2886,97 @@ "キャッシュファイルにロックをかけられません。これは通常、dpkg や別の apt " "ツールが既にパッケージをインストール中だという意味です。読み取り専用モードで開いています。パッケージの状態を変更してもそれは保存されません!" -#: src/generic/apt/apt.cc:1272 +# TRANSLATOR'S NOTE: these 3 (foreign,same,allowed) are about multiarch +#: src/generic/apt/apt.cc:1269 msgid "foreign" -msgstr "" +msgstr "他" -#: src/generic/apt/apt.cc:1274 +#: src/generic/apt/apt.cc:1271 msgid "same" -msgstr "" +msgstr "同一" -#: src/generic/apt/apt.cc:1277 +#: src/generic/apt/apt.cc:1274 msgid "allowed" -msgstr "" +msgstr "許可しました" -#: src/generic/apt/apt.cc:1366 +#: src/generic/apt/apt.cc:1363 msgid "main" -msgstr "メイン" +msgstr "main" -#: src/generic/apt/apt.cc:1366 +#: src/generic/apt/apt.cc:1363 msgid "contrib" -msgstr "" +msgstr "contrib" -#: src/generic/apt/apt.cc:1366 +#: src/generic/apt/apt.cc:1363 msgid "non-free" -msgstr "" +msgstr "non-free" -#: src/generic/apt/apt.cc:1366 +#: src/generic/apt/apt.cc:1363 msgid "non-US" -msgstr "" +msgstr "non-US" #: src/generic/apt/aptitude_resolver.cc:441 #, c-format msgid "Invalid hint \"%s\": expected an action, but found nothing." -msgstr "ヒント \"%s\" は不正です: アクションを期待しましたが見つかりませんでした。" +msgstr "ヒント「%s」は不正です: アクションを期待しましたが見つかりませんでした。" #: src/generic/apt/aptitude_resolver.cc:466 #, c-format msgid "" "Invalid hint \"%s\": expected a component name and a number, but found " "nothing." -msgstr "" +msgstr "ヒント「%s」は不正です: 構成要素と番号を期待しましたが見つかりませんでした。" #: src/generic/apt/aptitude_resolver.cc:485 #, c-format msgid "" "Invalid hint \"%s\": expected the numeric value following the component " "name, but found nothing." -msgstr "" +msgstr "ヒント「%s」は不正です: 構成要素に続く番号を期待しましたが見つかりませんでした。" #: src/generic/apt/aptitude_resolver.cc:505 #, c-format msgid "Invalid hint \"%s\": the numeric component \"%s\" cannot be parsed." -msgstr "" +msgstr "ヒント「%s」は不正です: 数字の構成要素「%s」を解析できません。" #: src/generic/apt/aptitude_resolver.cc:516 #, c-format msgid "Invalid hint \"%s\": expected a level, but found nothing." -msgstr "" +msgstr "ヒント「%s」は不正です: ラベルを期待しましたが見つかりませんでした。" #: src/generic/apt/aptitude_resolver.cc:538 #, c-format msgid "Invalid hint \"%s\": expected a target, but found nothing." -msgstr "ヒント \"%s\" は不正です: ターゲットを期待しましたが見つかりませんでした。" +msgstr "ヒント「%s」は不正です: ターゲットを期待しましたが見つかりませんでした。" #: src/generic/apt/aptitude_resolver.cc:565 #, c-format msgid "Invalid hint \"%s\": invalid target: %s" -msgstr "ヒント \"%s\" は不正です: 不正なターゲットです: %s" +msgstr "ヒント「%s」は不正です: 不正なターゲットです: %s" #: src/generic/apt/aptitude_resolver.cc:585 #, c-format msgid "Invalid hint \"%s\": trailing junk after the version." -msgstr "ヒント \"%s\" は不正です: バージョンの後ろにごみがついています。" +msgstr "ヒント「%s」は不正です: バージョンの後ろにごみがついています。" -#: src/generic/apt/aptitude_resolver.cc:680 +#: src/generic/apt/aptitude_resolver.cc:682 #, c-format msgid "" "Invalid hint \"%s\": the action \"%s\" should be \"approve\", \"reject\", or " "a number." -msgstr "" -"ヒント \"%s\" は不正です: アクション \"%s\" は \"approve\"、\"reject\"、あるいは番号であるべきです。" +msgstr "ヒント「%s」は不正です: アクション「%s」は「approve」、「reject」、あるいは番号でないといけません。" #: src/generic/apt/aptitude_resolver_cost_settings.cc:130 #, c-format msgid "Conflicting types for the cost component %s." -msgstr "" +msgstr "コストの構成要素の種類 %s が競合しています。" -#: src/generic/apt/aptitude_resolver_universe.cc:838 +#: src/generic/apt/aptitude_resolver_universe.cc:837 #, c-format msgid "" "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or " "an integer)." -msgstr "" +msgstr "安全レベル「%s」は不正です (「discard」、「maximum」、「minimum」、整数のいずれでもありません)。" #: src/generic/apt/download_install_manager.cc:60 msgid "" @@ -2967,7 +2995,7 @@ #: src/generic/apt/download_install_manager.cc:129 msgid "Some files failed to download" -msgstr "" +msgstr "一部のファイルのダウンロードに失敗しました" #: src/generic/apt/download_install_manager.cc:140 msgid "Unable to correct for unavailable packages" @@ -2995,7 +3023,7 @@ msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." -msgstr "" +msgstr "一部のインデックスファイルのダウンロードに失敗しました。無視されたか古いものを代わりに利用しています。" #: src/generic/apt/download_update_manager.cc:178 msgid "Couldn't rebuild package cache" @@ -3004,12 +3032,12 @@ #: src/generic/apt/dpkg.cc:102 #, c-format msgid "Couldn't chroot into %s for %s" -msgstr "" +msgstr "%s に chroot して %s を実行できませんでした" #: src/generic/apt/dpkg.cc:124 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "" +msgstr "%s を待ちましたがありませんでした" #: src/generic/apt/dump_packages.cc:539 src/generic/apt/dump_packages.cc:629 #, c-format @@ -3026,10 +3054,10 @@ msgid "Unable to open %s to log actions" msgstr "アクション記録用に %s を開けません" -#. ForTranslators: This is a date and time format. See strftime(3). +#. TRANSLATORS: This is a date and time format. See strftime(3). #: src/generic/apt/log.cc:66 msgid "%a, %b %e %Y %T %z" -msgstr "" +msgstr "%Y/%m/%d %T (%a) %z" #: src/generic/apt/log.cc:68 #, c-format @@ -3159,15 +3187,16 @@ "\n" "ログ完了。\n" -#: src/generic/apt/matching/match.cc:3095 -#: src/generic/apt/matching/match.cc:3212 +#: src/generic/apt/matching/match.cc:3054 +#: src/generic/apt/matching/match.cc:3171 msgid "Accessing index" -msgstr "" +msgstr "インデックスにアクセスしています" -#: src/generic/apt/matching/match.cc:3105 -#: src/generic/apt/matching/match.cc:3219 +# * Message used as 'title' for the ui_download_manager. +#: src/generic/apt/matching/match.cc:3064 +#: src/generic/apt/matching/match.cc:3178 msgid "Filtering packages" -msgstr "" +msgstr "パッケージをふるい分けしています" #: src/generic/apt/matching/parse.cc:315 #, c-format @@ -3177,7 +3206,7 @@ #: src/generic/apt/matching/parse.cc:330 #, c-format msgid "Unknown multiarch type: %s" -msgstr "" +msgstr "multiarch の種類が不明です: %s" #: src/generic/apt/matching/parse.cc:370 #, c-format @@ -3211,7 +3240,7 @@ msgid "Unknown term type: \"%s\"." msgstr "語句の種類が不明です: \"%s\"。" -#. ForTranslators: Question marks ("?") are used as prefix for function names. +#. TRANSLATORS: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. #: src/generic/apt/matching/parse.cc:928 src/generic/apt/matching/parse.cc:937 #, c-format @@ -3272,8 +3301,8 @@ "The package index files are corrupted. No Filename: field for package %s." msgstr "パッケージインデックスファイルが壊されています。%s パッケージにファイル名 (Filename:) フィールドがありません。" -#: src/generic/apt/pkg_changelog.cc:442 src/generic/apt/pkg_changelog.cc:596 -#: src/view_changelog.cc:272 +#: src/cmdline/cmdline_changelog.cc:198 src/generic/apt/pkg_changelog.cc:442 +#: src/generic/apt/pkg_changelog.cc:596 src/view_changelog.cc:272 #, c-format msgid "Changelog of %s" msgstr "%s の変更履歴" @@ -3281,11 +3310,11 @@ #: src/generic/apt/pkg_changelog.cc:572 src/generic/apt/pkg_changelog.cc:577 #, c-format msgid "Failed to download changelogs: %s" -msgstr "" +msgstr "変更履歴のダウンロードに失敗しました: %s" #: src/generic/apt/pkg_changelog.cc:582 msgid "Failed to download changelogs: unexpected exception." -msgstr "" +msgstr "変更履歴のダウンロードに失敗しました: 想定外の例外が起きました。" #: src/generic/apt/pkg_hier.cc:28 src/generic/apt/pkg_hier.cc:49 #, c-format @@ -3329,31 +3358,34 @@ #: src/generic/apt/resolver_manager.cc:912 #, c-format msgid "Failed to parse the cost settings string: %s" -msgstr "" +msgstr "コスト設定文字列の解析に失敗しました: %s" -#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225 +#: src/generic/apt/tags.cc:211 src/generic/apt/tags.cc:219 +#: src/generic/apt/tags.cc:264 src/generic/apt/tags.cc:272 msgid "Building tag database" msgstr "タグのデータベースを構築しています" -#: src/generic/apt/tags.cc:400 +#: src/generic/apt/tags.cc:401 msgid "legacy" -msgstr "" +msgstr "legacy" #: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445 #: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491 msgid "No tag descriptions are available." -msgstr "" +msgstr "利用可能なタグの説明はありません。" #: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451 #: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497 #, c-format msgid "No description available for %s." -msgstr "" +msgstr "%s の利用可能な説明はありません。" +# Translator's NOTE: method is task-field or list; others are TODO +# Translator's NOTE: first is task.name, second is method #: src/generic/apt/tasks.cc:123 #, c-format msgid "Unhandled packages method in task %s: %s" -msgstr "" +msgstr "タスク %s のパッケージの方法 %s は処理しません" #: src/generic/apt/tasks.cc:484 msgid "Reading task descriptions" @@ -3365,88 +3397,90 @@ #: src/generic/problemresolver/exceptions.h:105 msgid "Cost increments must be strictly positive." -msgstr "" +msgstr "コスト増分は絶対に正の数でないといけません。" #: src/generic/problemresolver/exceptions.h:114 msgid "The maximum cost value was exceeded." -msgstr "" +msgstr "コスト最大値を超えました。" +# Translator's NOTE: incompatible operations were applied to a cost. #: src/generic/problemresolver/exceptions.h:124 msgid "A single cost level was both added and lower-bounded." -msgstr "" +msgstr "単一のコストレベルが追加され、さらに下限を下回りました。" #: src/generic/util/parsers.h:735 #, c-format msgid "Expected '%s', but got EOF." -msgstr "" +msgstr "「%s」を期待しましたが EOF が与えられました。" #: src/generic/util/parsers.h:737 #, c-format msgid "Expected '%s', but got '%s'." -msgstr "" +msgstr "「%s」を期待しましたが「%s」が与えられました。" #: src/generic/util/parsers.h:778 msgid "Expected any character, but got EOF." -msgstr "" +msgstr "文字を期待しましたが EOF が与えられました。" #: src/generic/util/parsers.h:791 msgid "any character" -msgstr "" +msgstr "任意の文字" #: src/generic/util/parsers.h:832 #, c-format msgid "Expected %s, but got EOF." -msgstr "" +msgstr "%s を期待しましたが EOF が与えられました。" #: src/generic/util/parsers.h:843 #, c-format msgid "Expected %s, but got '%c'." -msgstr "" +msgstr "%s を期待しましたが「%c」が与えられました。" #: src/generic/util/parsers.h:1017 msgid "Expected an integer, got EOF." -msgstr "" +msgstr "整数を期待しましたが EOF が与えられました。" #: src/generic/util/parsers.h:1026 msgid "Expected an integer following '-', got EOF." -msgstr "" +msgstr "「-」に続いて整数を期待しましたが EOF が与えられました。" #: src/generic/util/parsers.h:1032 #, c-format msgid "Expected an integer, got '%c'." -msgstr "" +msgstr "整数を期待しましたが「%c」が与えられました。" +# Should never happen. #: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054 #, c-format msgid "Invalid integer: \"%s\"." -msgstr "" +msgstr "「%s」は整数として不正です。" #: src/generic/util/parsers.h:1077 #, c-format msgid "Expected EOF, got '%c'." -msgstr "" +msgstr "EOF を期待しましたが「%c」が与えられました。" #: src/generic/util/parsers.h:1191 msgid "anything" -msgstr "" +msgstr "何でも" -#. ForTranslators: this is used to generate an error +#. TRANSLATORS: this is used to generate an error #. message; a brief description of what we expected to see #. is inserted into it. #: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034 #: src/generic/util/parsers.h:2085 #, c-format msgid "Expected %s" -msgstr "" +msgstr "期待したのは %s" #: src/generic/util/parsers.h:2007 msgid " or " -msgstr "" +msgstr " か " #: src/generic/util/parsers.h:2770 #, c-format msgid "Unexpected %s" -msgstr "" +msgstr "想定外の %s" #: src/generic/util/temp.cc:201 src/generic/util/temp.cc:275 #, c-format @@ -3456,29 +3490,29 @@ #: src/generic/util/temp.cc:342 #, c-format msgid "Unable to create temporary filename from prefix \"%s\"" -msgstr "" +msgstr "接頭部「%s」から一時ファイル名を作成できません" -#: src/generic/util/util.cc:364 +#: src/generic/util/util.cc:377 #, c-format msgid "Unable to stat \"%s\"" msgstr "\"%s\" の状態を取得できません" -#: src/generic/util/util.cc:370 +#: src/generic/util/util.cc:383 #, c-format msgid "Unable to remove \"%s\"" msgstr "\"%s\" を削除できません" -#: src/generic/util/util.cc:380 +#: src/generic/util/util.cc:393 #, c-format msgid "Unable to list files in \"%s\"" msgstr "\"%s\" 内のファイルの一覧を取得できません" -#: src/generic/util/util.cc:397 +#: src/generic/util/util.cc:410 #, c-format msgid "Failure closing directory \"%s\"" msgstr "ディレクトリを閉じられませんでした: \"%s\"" -#: src/generic/util/util.cc:403 +#: src/generic/util/util.cc:416 #, c-format msgid "Unable to remove directory \"%s\"" msgstr "ディレクトリを削除できません: \"%s\"" @@ -3493,51 +3527,52 @@ msgstr "ファイル(_F)" # * Description of an item. -#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347 +#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2348 msgid "Perform all pending installs and removals" msgstr "実行されていないインストールや削除を実行します" # * Description of an item. -#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350 +#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2351 msgid "Check for new versions of packages" msgstr "パッケージの新しいバージョンがないか確認します" # * Description of an item. -#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355 +#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2356 msgid "Mark all upgradable packages which are not held for upgrade" msgstr "更新時に固定されない更新可能パッケージすべてに印をつけます" # * Description of an item. -#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360 +#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2361 msgid "Forget which packages are \"new\"" msgstr "どのパッケージが「新規」かの情報を消去します" # * Description of an item. -#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364 +#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2365 msgid "Cancel all pending installations, removals, holds, and upgrades." msgstr "実行されていないインストール・削除・固定・更新を取り消します" # * Description of an item. -#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368 +#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2369 msgid "Delete package files which were previously downloaded" msgstr "以前ダウンロードしたパッケージファイルを削除します" # * Description of an item. -#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372 +#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2373 msgid "Delete package files which can no longer be downloaded" msgstr "もはやダウンロードできないパッケージファイルを削除します" # * Description of an item. -#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379 +#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2380 msgid "Reload the package cache" msgstr "パッケージのキャッシュを再度読み込みます" -#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389 +# * Description of an item. +#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2390 msgid "Restart the program as root; your settings will be preserved" -msgstr "" +msgstr "プログラムを root で再起動します。現在の設定は保持されます" # * Description of an item. -#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392 +#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2393 msgid "Exit the program" msgstr "プログラムを終了します" @@ -3546,7 +3581,7 @@ msgstr "編集(_D)" # * Description of an item. -#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399 +#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2400 msgid "Undo the last package operation or group of operations" msgstr "最後に行ったパッケージ管理操作、または一連の操作を取り消します" @@ -3588,19 +3623,19 @@ msgstr "更新" #: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323 -#: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901 -#: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954 +#: src/qt/tabs_manager.cc:241 src/ui.cc:855 src/ui.cc:857 src/ui.cc:902 +#: src/ui.cc:904 src/ui.cc:930 src/ui.cc:932 src/ui.cc:953 src/ui.cc:955 msgid "Packages" msgstr "パッケージ" #: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033 -#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395 +#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1396 msgid "Preview" msgstr "プレビュー" # * Menu item on the first line. #: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028 -#: src/qt/tabs_manager.cc:263 src/ui.cc:2783 +#: src/qt/tabs_manager.cc:263 src/ui.cc:2788 msgid "Resolver" msgstr "問題解決" @@ -3677,7 +3712,7 @@ #: src/gtk/aptitude.glade:1076 msgid "Screenshot" -msgstr "" +msgstr "スクリーンショット" #: src/gtk/aptitude.glade:1128 msgid "Fixing upgrade manually:" @@ -3822,41 +3857,50 @@ "これらの変更を適用しますか?\n" "手動でファイルを変更することもできます。その場合は \"いいえ\" をクリックしてください。" +# Translator's NOTE: title:"Upgrade"; description:"Keep your computer up-to-date." #: src/gtk/areas.cc:73 msgid "Keep your computer up-to-date." -msgstr "" +msgstr "コンピュータを最新に保ちます。" +# Translator's NOTE: title:"Browse"; description:"Explore the available packages." #: src/gtk/areas.cc:75 msgid "Browse" -msgstr "" +msgstr "ブラウズ" +# Translator's NOTE: title:"Browse"; description:"Explore the available packages." #: src/gtk/areas.cc:76 msgid "Explore the available packages." -msgstr "" +msgstr "入手可能なパッケージを探索します。" +# Translator's NOTE: title:"Find"; description:"Search for packages." +# * Item. #: src/gtk/areas.cc:78 msgid "Find" -msgstr "" +msgstr "検索" +# Translator's NOTE: title:"Find"; description:"Search for packages." #: src/gtk/areas.cc:79 msgid "Search for packages." -msgstr "" +msgstr "パッケージを検索します。" +# Translator's NOTE: title:"Go"; description:"Finalize and apply your changes to the system." #: src/gtk/areas.cc:81 msgid "Go" -msgstr "" +msgstr "進む" +# Translator's NOTE: title:"Go"; description:"Finalize and apply your changes to the system." #: src/gtk/areas.cc:82 msgid "Finalize and apply your changes to the system." -msgstr "" +msgstr "設定を完了し、変更をシステムに適用します。" -#: src/gtk/areas.cc:84 src/ui.cc:713 src/ui.cc:715 +#: src/gtk/areas.cc:84 src/ui.cc:714 src/ui.cc:716 msgid "Preferences" msgstr "設定" +# Translator's NOTE: title:"Preferences"; description:"Configure aptitude." #: src/gtk/areas.cc:85 msgid "Configure aptitude." -msgstr "" +msgstr "aptitude 設定" #: src/gtk/changelog.cc:284 msgid "The changelog is empty." @@ -3882,7 +3926,7 @@ #: src/gtk/changelog.cc:554 src/gtk/changelog.cc:692 #, c-format msgid "Parsing the changelog of %s version %s..." -msgstr "" +msgstr "%s バージョン %s の変更履歴を解析しています..." #: src/gtk/changelog.cc:659 #, c-format @@ -3900,12 +3944,12 @@ #: src/gtk/changelog.cc:739 #, c-format msgid "Downloading the changelog of %s version %s..." -msgstr "%s バージョン %s の changelog をダウンロード中..." +msgstr "%s バージョン %s の変更履歴をダウンロードしています..." #: src/gtk/changelog.cc:931 #, c-format msgid "Preparing to download the changelog of %s version %s." -msgstr "" +msgstr "%s バージョン %s の変更履歴のダウンロードを準備しています..." #: src/gtk/dashboardtab.cc:215 msgid "Resolve Upgrade Manually" @@ -4332,7 +4376,7 @@ msgid "Download already running." msgstr "ダウンロードは既に実行中です。" -#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765 +#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1527 src/ui.cc:1766 msgid "A package-list update or install run is already taking place." msgstr "パッケージ一覧の更新またはインストールの実行が現在行われています。" @@ -4398,7 +4442,7 @@ msgstr "設定ファイル %s を置き換えるかどうかを尋ねます" # * Message used as 'title' for the ui_download_manager. -#: src/gtk/gui.cc:962 src/ui.cc:1266 +#: src/gtk/gui.cc:962 src/ui.cc:1267 msgid "Downloading packages" msgstr "パッケージをダウンロード中" @@ -4428,7 +4472,7 @@ msgid "Apply changes" msgstr "変更の適用" -#. ForTranslators: any numbers in this +#. TRANSLATORS: any numbers in this #. string will be displayed in a larger #. font. #: src/gtk/gui.cc:1192 @@ -4437,7 +4481,7 @@ msgid_plural "%d packages to install" msgstr[0] "%d 個のパッケージのインストール" -#. ForTranslators: any numbers in this +#. TRANSLATORS: any numbers in this #. string will be displayed in a larger #. font. #: src/gtk/gui.cc:1207 @@ -4529,7 +4573,7 @@ #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375 -#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275 +#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:269 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224 #: src/qt/version.cc:114 @@ -4587,7 +4631,7 @@ msgid "Building view" msgstr "画面を構築しています" -#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:678 +#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:677 msgid "" "Packages with unsatisfied dependencies\n" " The dependency requirements of these packages will be unmet after the " @@ -4601,7 +4645,7 @@ ".\n" " このツリーの存在は、システムと Debian アーカイブのどちらかがどこかで壊れていることを示します。" -#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:679 +#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:678 msgid "" "Packages being removed because they are no longer used\n" " These packages are being deleted because they were automatically installed " @@ -4613,7 +4657,7 @@ "これらのパッケージは、依存関係を満たすために自動的にインストールされましたが、これから行われるアクションでインストールされるどのパッケージからも「重要な」" "依存関係があると明示されていません。\n" -#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:680 +#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:679 msgid "" "Packages being automatically held in their current state\n" " These packages could be upgraded, but they have been kept in their current " @@ -4622,7 +4666,7 @@ "現在の状態に自動的に固定されるパッケージ\n" " これらのパッケージは更新可能ですが、依存関係が壊れるのを防ぐために現在の状態に一時的に固定されます。" -#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:681 +#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:680 msgid "" "Packages being automatically installed to satisfy dependencies\n" " These packages are being installed because they are required by another " @@ -4631,7 +4675,7 @@ "依存関係を満たすため自動的にインストールされるパッケージ\n" " これらのパッケージは、インストール対象として選択されている他のパッケージから必要とされているため、インストールされます。" -#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:682 +#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:681 msgid "" "Packages being deleted due to unsatisfied dependencies\n" " These packages are being deleted because one or more of their dependencies " @@ -4640,7 +4684,7 @@ "依存関係が満たされていないために削除されるパッケージ\n" " これらのパッケージは削除予定です。それは、依存パッケージのうち一つ以上がもはや利用できないため、またはこれらと他のパッケージが競合しているためです。" -#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:683 +#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:682 msgid "" "Packages to be downgraded\n" " An older version of these packages than is currently installed will be " @@ -4649,7 +4693,7 @@ "ダウングレードされるパッケージ\n" " これらのパッケージは、現在インストールされているバージョンよりも古いものがインストールされます。" -#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:684 +#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:683 msgid "" "Packages being held back\n" " These packages could be upgraded, but you have asked for them to be held at " @@ -4658,7 +4702,7 @@ "固定されるパッケージ\n" " これらのパッケージは更新可能ですが、あなたの要求で現在のバージョンに固定されます。" -#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:685 +#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:684 msgid "" "Packages to be reinstalled\n" " These packages will be reinstalled." @@ -4666,7 +4710,7 @@ "再インストールされるパッケージ\n" " これらのパッケージは再インストールされます。" -#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:686 +#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:685 msgid "" "Packages to be installed\n" " These packages have been manually selected for installation on your " @@ -4675,7 +4719,7 @@ "インストールされるパッケージ\n" " これらのパッケージは、コンピュータにインストールする対象として手動で選択されました。" -#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:687 +#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:686 msgid "" "Packages to be removed\n" " These packages have been manually selected for removal." @@ -4683,7 +4727,7 @@ "削除されるパッケージ\n" " これらのパッケージは、削除対象として手動で選択されました。" -#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:688 +#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:687 msgid "" "Packages to be upgraded\n" " These packages will be upgraded to a newer version." @@ -4691,7 +4735,7 @@ "更新されるパッケージ\n" " これらのパッケージは新しいバージョンに更新されます。" -#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:689 +#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:688 msgid "" "Packages that are partially installed\n" " These packages are not fully installed and configured; an attempt will be " @@ -4804,7 +4848,7 @@ #, c-format msgid "" "Upgrading %s to version %s is preferred over all un-accepted alternatives." -msgstr "" +msgstr "%s のバージョン %s への更新はすべての未受諾の代替に優先します。" #: src/gtk/resolver.cc:484 #, c-format @@ -4887,7 +4931,7 @@ #: src/gtk/resolver.cc:1264 src/solution_fragment.cc:155 #, c-format msgid "%s enhances %s" -msgstr "" +msgstr "%s が %s を拡張" #: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 @@ -5081,10 +5125,10 @@ msgid "%u solutions." msgstr "%u の解決方法。" -#: src/gtk/resolver.cc:2109 +#: src/gtk/resolver.cc:2111 #, c-format msgid "Solution %s of %s." -msgstr "" +msgstr "解決方法 %s/%s。" #: src/gtk/tab.cc:68 msgid "Download" @@ -5156,7 +5200,7 @@ #: src/load_grouppolicy.cc:385 msgid "Unmatched '(' in grouping policy" -msgstr "" +msgstr "分類規則内で '(' が対応していません" #: src/load_grouppolicy.cc:413 #, c-format @@ -5172,7 +5216,7 @@ #: src/load_grouppolicy.cc:621 #, c-format msgid "Too many arguments to '%s' grouping policy" -msgstr "" +msgstr "分類規則「%s」に渡す引数が多すぎます" #: src/load_grouppolicy.cc:441 src/load_grouppolicy.cc:521 #: src/load_grouppolicy.cc:532 src/load_grouppolicy.cc:555 @@ -5180,7 +5224,7 @@ #: src/load_grouppolicy.cc:608 src/load_grouppolicy.cc:766 #, c-format msgid "Grouping policy '%s' takes no arguments" -msgstr "" +msgstr "分類規則「%s」に引数は不要です" #: src/load_grouppolicy.cc:460 src/load_grouppolicy.cc:636 #, c-format @@ -5195,12 +5239,12 @@ #: src/load_grouppolicy.cc:502 msgid "" "Exactly one filter must be provided as an argument to a 'filter' policy" -msgstr "" +msgstr "「filter」規則にはフィルタを一つだけ引数として与えなければなりません" #: src/load_grouppolicy.cc:644 #, c-format msgid "Missing arguments to '%s' grouping policy" -msgstr "" +msgstr "分類規則「%s」に渡す引数が不足しています" #: src/load_grouppolicy.cc:667 #, c-format @@ -5220,7 +5264,7 @@ #: src/load_grouppolicy.cc:750 #, c-format msgid "Unmatched '(' in '%s' grouping policy" -msgstr "" +msgstr "分類規則「%s」内で '(' が対応していません" #: src/load_pkgview.cc:64 msgid "Couldn't parse layout: No column format specified for static item" @@ -5254,63 +5298,64 @@ #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90 +#: src/load_sortpolicy.cc:103 src/load_sortpolicy.cc:117 #, c-format msgid "Sorting policy '%s' takes no arguments" -msgstr "" +msgstr "並べ替え規則「%s」に引数は不要です" -#: src/load_sortpolicy.cc:148 +#: src/load_sortpolicy.cc:178 msgid "Invalid zero-length sorting policy name" msgstr "長さがゼロの文字列は並び替え規則の名前として無効です" -#: src/load_sortpolicy.cc:166 +#: src/load_sortpolicy.cc:196 msgid "Unmatched '(' in sorting policy description" msgstr "並び替え規則の記述内で '(' が対応していません" -#: src/load_sortpolicy.cc:193 +#: src/load_sortpolicy.cc:223 #, c-format msgid "Invalid sorting policy type '%s'" msgstr "並び替え規則の種類が不正です: '%s'" -#: src/main.cc:134 +#: src/main.cc:133 #, c-format msgid "Can't decode multibyte string after \"%ls\"" msgstr "\"%ls\" の後のマルチバイト文字列をデコードできません" -#: src/main.cc:143 +#: src/main.cc:142 #, c-format msgid "Can't decode wide-character string after \"%s\"" msgstr "\"%s\" の後のワイドキャラクタをデコードできません" -#: src/main.cc:151 +#: src/main.cc:150 #, c-format msgid "%s %s compiled at %s %s\n" msgstr "%s %s (コンパイル日時: %s %s)\n" -#: src/main.cc:154 +#: src/main.cc:153 #, c-format msgid "Compiler: g++ %s\n" msgstr "コンパイラ: g++ %s\n" -#: src/main.cc:156 +#: src/main.cc:155 msgid "Compiled against:\n" msgstr "コンパイル環境:\n" -#: src/main.cc:157 +#: src/main.cc:156 #, c-format msgid " apt version %d.%d.%d\n" msgstr " apt のバージョン: %d.%d.%d\n" -#: src/main.cc:160 +#: src/main.cc:159 #, c-format msgid " NCurses version: Unknown\n" msgstr " NCurses のバージョン: 不明\n" -#: src/main.cc:162 +#: src/main.cc:161 #, c-format msgid " NCurses version %s\n" msgstr " NCurses のバージョン: %s\n" -#: src/main.cc:164 +#: src/main.cc:163 #, c-format msgid " libsigc++ version: %s\n" msgstr " libsigc++ のバージョン: %s\n" @@ -5325,37 +5370,38 @@ msgid " Ept support disabled.\n" msgstr " Ept サポート: 無効\n" -#: src/main.cc:171 +#: src/main.cc:165 #, c-format msgid " Gtk+ version %d.%d.%d\n" -msgstr "" +msgstr " Gtk+ のバージョン: %d.%d.%d\n" -#: src/main.cc:173 +#: src/main.cc:167 #, c-format msgid " Gtk-- version %d.%d.%d\n" -msgstr "" +msgstr " Gtk-- のバージョン: %d.%d.%d\n" -#: src/main.cc:176 +# Translator's NOTE: ! #ifdef HAVE_GTK +#: src/main.cc:170 #, c-format msgid " Gtk+ support disabled.\n" -msgstr "" +msgstr " Gtk+ サポート: 無効\n" -#: src/main.cc:179 +#: src/main.cc:173 #, c-format msgid " Compiled with Qt %s\n" -msgstr "" +msgstr " Qt %s によりコンパイル\n" -#: src/main.cc:180 +#: src/main.cc:174 #, c-format msgid " Running on Qt %s\n" -msgstr "" +msgstr " Qt %s で実行中\n" -#: src/main.cc:182 +#: src/main.cc:176 #, c-format msgid " Qt support disabled.\n" -msgstr "" +msgstr " Qt サポート: 無効\n" -#: src/main.cc:184 +#: src/main.cc:178 msgid "" "\n" "Current library versions:\n" @@ -5363,35 +5409,35 @@ "\n" "現在の各ライブラリのバージョン:\n" -#: src/main.cc:185 +#: src/main.cc:179 #, c-format msgid " NCurses version: %s\n" msgstr " NCurses のバージョン: %s\n" -#: src/main.cc:186 +#: src/main.cc:180 #, c-format msgid " cwidget version: %s\n" msgstr " cwidget のバージョン: %s\n" -#: src/main.cc:187 +#: src/main.cc:181 #, c-format msgid " Apt version: %s\n" msgstr " apt のバージョン: %s\n" # * Description of action in the commandline help. -#: src/main.cc:193 +#: src/main.cc:187 #, c-format msgid "Usage: aptitude [-S fname] [-u|-i]" msgstr "使用方法: aptitude [-S ファイル名] [-u|-i]" # * Description of action in the commandline help. -#: src/main.cc:195 +#: src/main.cc:189 #, c-format msgid " aptitude [options] ..." msgstr " aptitude [オプション] <アクション> ..." # * Description of action in the commandline help. -#: src/main.cc:197 +#: src/main.cc:191 #, c-format msgid "" " Actions (if none is specified, aptitude will enter interactive mode):\n" @@ -5401,51 +5447,51 @@ "\n" # * Description of action in the commandline help. -#: src/main.cc:198 +#: src/main.cc:192 #, c-format msgid " install - Install/upgrade packages.\n" msgstr " install - パッケージをインストール・更新します。\n" # * Description of action in the commandline help. -#: src/main.cc:199 +#: src/main.cc:193 #, c-format msgid " remove - Remove packages.\n" msgstr " remove - パッケージを削除します。\n" # * Description of action in the commandline help. -#: src/main.cc:200 +#: src/main.cc:194 #, c-format msgid " purge - Remove packages and their configuration files.\n" msgstr " purge - パッケージと設定ファイルを削除します。\n" # * Description of action in the commandline help. -#: src/main.cc:201 +#: src/main.cc:195 #, c-format msgid " hold - Place packages on hold.\n" msgstr " hold - パッケージを固定します。\n" # * Description of action in the commandline help. -#: src/main.cc:202 +#: src/main.cc:196 #, c-format msgid " unhold - Cancel a hold command for a package.\n" msgstr " unhold - パッケージの固定を解除します。\n" # * Description of action in the commandline help. -#: src/main.cc:203 +#: src/main.cc:197 #, c-format msgid "" " markauto - Mark packages as having been automatically installed.\n" msgstr " markauto - 自動的にインストールされたという印をパッケージにつけます。\n" # * Description of action in the commandline help. -#: src/main.cc:204 +#: src/main.cc:198 #, c-format msgid " unmarkauto - Mark packages as having been manually installed.\n" msgstr " unmarkauto - 手動でインストールされたという印をパッケージにつけます。\n" # * Description of action in the commandline help. # TRANSLATION-FIXME: 原文の文末のピリオドは不要 -#: src/main.cc:205 +#: src/main.cc:199 #, c-format msgid "" " forbid-version - Forbid aptitude from upgrading to a specific package " @@ -5453,79 +5499,80 @@ msgstr " forbid-version - aptitude に特定のパッケージバージョンの更新を禁止させます。\n" # * Description of action in the commandline help. -#: src/main.cc:206 +#: src/main.cc:200 #, c-format msgid " update - Download lists of new/upgradable packages.\n" msgstr " update - 新規および更新可能なパッケージの一覧をダウンロードします。\n" # * Description of action in the commandline help. -#: src/main.cc:207 +#: src/main.cc:201 #, c-format msgid " safe-upgrade - Perform a safe upgrade.\n" msgstr " safe-upgrade - 安全な更新を行います。\n" # * Description of action in the commandline help. -#: src/main.cc:208 +#: src/main.cc:202 #, c-format msgid "" " full-upgrade - Perform an upgrade, possibly installing and removing " "packages.\n" msgstr " full-upgrade - パッケージのインストールや削除を伴う可能性のある更新を行います。\n" -#: src/main.cc:209 +#: src/main.cc:203 #, c-format msgid " build-dep - Install the build-dependencies of packages.\n" msgstr " build-dep - パッケージの構築依存関係をインストールします。\n" # * Description of action in the commandline help. -#: src/main.cc:210 +#: src/main.cc:204 #, c-format msgid " forget-new - Forget what packages are \"new\".\n" msgstr " forget-new - どのパッケージが「新規」かの情報を消去します。\n" # * Description of action in the commandline help. -#: src/main.cc:211 +#: src/main.cc:205 #, c-format msgid " search - Search for a package by name and/or expression.\n" msgstr " search - 名前や正規表現でパッケージを検索します。\n" # * Description of action in the commandline help. -#: src/main.cc:212 +#: src/main.cc:206 #, c-format msgid " show - Display detailed information about a package.\n" msgstr " show - パッケージについての詳細な情報を表示します。\n" -#: src/main.cc:213 +# * Description of action in the commandline help. +#: src/main.cc:207 #, c-format msgid " versions - Displays the versions of specified packages.\n" -msgstr "" +msgstr " versions - 指定したパッケージのバージョンを表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:214 +#: src/main.cc:208 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - ダウンロード済みのパッケージファイルを消去します。\n" # * Description of action in the commandline help. -#: src/main.cc:215 +#: src/main.cc:209 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - 古い、ダウンロード済みのパッケージファイルを消去します。\n" # * Description of action in the commandline help. -#: src/main.cc:216 +#: src/main.cc:210 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - パッケージの変更履歴を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:217 +#: src/main.cc:211 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - パッケージの .deb ファイルをダウンロードします。\n" # * Description of action in the commandline help. -#: src/main.cc:218 +#: src/main.cc:212 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " @@ -5534,16 +5581,20 @@ " reinstall - 現在インストールされているパッケージをダウンロードし (場合によっ\n" " ては) 再インストールします。\n" -#: src/main.cc:219 +# * Description of action in the commandline help. +#: src/main.cc:213 #, c-format msgid "" " why - Show the manually installed packages that require a package, " "or\n" " why one or more packages would require the given package.\n" msgstr "" +" why - 指定したパッケージについて、手作業でインストールしたパッケー\n" +" ジの中でそれを必要とするものや、そのパッケージを必要とする理\n" +" 由を表示します\n" # * Description of action in the commandline help. -#: src/main.cc:221 +#: src/main.cc:215 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5557,68 +5608,70 @@ " いった説明を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:225 +#: src/main.cc:219 #, c-format msgid " Options:\n" msgstr " オプション：\n" # * Description of action in the commandline help. -#: src/main.cc:226 +#: src/main.cc:220 #, c-format msgid " -h This help text.\n" msgstr " -h このヘルプの文章です。\n" -#: src/main.cc:228 +#: src/main.cc:222 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" -msgstr " --gui 設定で無効にされていても GTK GUIを使用します。\n" +msgstr " --gui 設定で無効にされていても GTK GUIを使用します。\n" -#: src/main.cc:230 +#: src/main.cc:224 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" -msgstr " --no-gui 利用可能だとしても GTK GUI を使いません。\n" +msgstr " --no-gui 利用可能だとしても GTK GUI を使いません。\n" -#: src/main.cc:232 +# * Description of action in the commandline help. +#: src/main.cc:226 #, c-format msgid " --qt Use the Qt GUI.\n" -msgstr "" +msgstr " --qt Qt GUI を利用します。\n" -#: src/main.cc:233 +#: src/main.cc:227 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" -msgstr "" +msgstr " --no-qt 設定で無効にされていても Qt GUIを使用します。\n" # * Description of action in the commandline help. -#: src/main.cc:235 +#: src/main.cc:229 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s アクションのシミュレートのみ行い、実際には実行しません。\n" # * Description of action in the commandline help. -#: src/main.cc:236 +#: src/main.cc:230 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr "" -" -d パッケージのダウンロードのみ行い、インストールや削除は行い\n" -" ません。\n" +" -d パッケージのダウンロードのみ行い、インストールや削除は\n" +" 行いません。\n" -#: src/main.cc:237 +# * Description of action in the commandline help. +#: src/main.cc:231 #, c-format msgid " -P Always prompt for confirmation of actions.\n" -msgstr "" +msgstr " -P アクションの確認のため、常にプロンプトを出します。\n" # * Description of action in the commandline help. -#: src/main.cc:238 +#: src/main.cc:232 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y すべての yes/no の質問に対して 'yes' と答えたと見なします。\n" # * Description of action in the commandline help. -#: src/main.cc:239 +#: src/main.cc:233 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " @@ -5628,7 +5681,7 @@ " てください。\n" # * Description of action in the commandline help. -#: src/main.cc:240 +#: src/main.cc:234 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " @@ -5638,40 +5691,40 @@ " い。\n" # * Description of action in the commandline help. -#: src/main.cc:241 +#: src/main.cc:235 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w <幅> 検索結果の表示フォーマットの幅を指定します。\n" # * Description of action in the commandline help. -#: src/main.cc:242 +#: src/main.cc:236 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f 依存関係が壊れたパッケージを積極的に修復しようとします。\n" # * Description of action in the commandline help. -#: src/main.cc:243 +#: src/main.cc:237 #, c-format msgid "" " -V Show which versions of packages are to be installed.\n" -msgstr " -V パッケージのどのバージョンがインストールされるか表示します。\n" +msgstr " -V パッケージのどのバージョンがインストールされるか表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:244 +#: src/main.cc:238 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D 自動的に変更されたパッケージの依存関係を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:245 +#: src/main.cc:239 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z 各パッケージのインストールサイズの変更を表示します。\n" # * Description of action in the commandline help. -#: src/main.cc:246 +#: src/main.cc:240 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " @@ -5679,14 +5732,14 @@ msgstr " -v 付加的な情報を表示します (何倍もの情報が提供されます)。\n" # * Description of action in the commandline help. -#: src/main.cc:247 +#: src/main.cc:241 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [<リリース>] インストールするパッケージが基づくリリースを設定します。\n" # * Description of action in the commandline help. -#: src/main.cc:248 +#: src/main.cc:242 #, c-format msgid "" " -q In command-line mode, suppress the incremental progress\n" @@ -5694,92 +5747,95 @@ msgstr " -q コマンドラインモードで進行状況を逐一表示しません。\n" # * Description of action in the commandline help. -#: src/main.cc:250 +#: src/main.cc:244 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o <キー>=<値> 名前「<キー>」を持つ設定オプションを直接設定します。\n" -#: src/main.cc:251 +# * Description of action in the commandline help. +#: src/main.cc:245 #, c-format msgid "" " --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr "" +" --with(out)-recommends 推奨パッケージを強い依存関係として扱うかどうかを指\n" +" 定します。\n" # * Description of action in the commandline help. -#: src/main.cc:253 +#: src/main.cc:247 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" -msgstr " -S <ファイル名> : <ファイル名> から aptitude の拡張状態情報を読み込みます。\n" +msgstr " -S <ファイル名> ファイルから aptitude の拡張状態情報を読み込みます。\n" # * Description of action in the commandline help. -#: src/main.cc:254 +#: src/main.cc:248 #, c-format msgid " -u Download new package lists on startup.\n" -msgstr " -u : 起動時に新しいパッケージ一覧をダウンロードします。\n" +msgstr " -u 起動時に新しいパッケージ一覧をダウンロードします。\n" -#: src/main.cc:255 src/main.cc:257 +#: src/main.cc:249 src/main.cc:251 #, c-format msgid " (terminal interface only)\n" -msgstr "" +msgstr " (端末インタフェースのみ)\n" # * Description of action in the commandline help. -#: src/main.cc:256 +#: src/main.cc:250 #, c-format msgid " -i Perform an install run on startup.\n" -msgstr " -i : 起動時にインストールを行います。\n" +msgstr " -i 起動時にインストールを行います。\n" # * Description of action in the commandline help. -#: src/main.cc:259 +#: src/main.cc:253 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " この aptitude にはスーパー牛さんパワーなどはありません。\n" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:393 +#: src/main.cc:377 msgid "trace" msgstr "trace" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:396 +#: src/main.cc:380 msgid "debug" msgstr "debug" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:399 +#: src/main.cc:383 msgid "info" msgstr "info" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:402 +#: src/main.cc:386 msgid "warn" msgstr "warn" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:405 +#: src/main.cc:389 msgid "error" msgstr "error" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:408 +#: src/main.cc:392 msgid "fatal" msgstr "fatal" -#. ForTranslators: This is a log level that the user can pass on +#. TRANSLATORS: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:411 +#: src/main.cc:395 msgid "off" msgstr "off" -#. ForTranslators: both the translated and the untranslated +#. TRANSLATORS: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:479 +#: src/main.cc:463 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5790,77 +5846,92 @@ "のいずれかが期待されます)。" # Should never happen. -#: src/main.cc:488 +#. TRANSLATORS: following paragraph copied from src/generic/util/logging.h +#. * +#. * A category consists of one or more nonempty components +#. * separated by ".", such as "aptitude.util.logging", with +#. * the exception that the root logger is indicated by the +#. * empty string (""). +#. * +#. * A list of the used ones in src/loggers.h +#. * +#. * So 'logger' here is the name of the 'category', 'component' or +#. * 'module', in the case that users want to configure different logging +#. * levels for different categories (e.g. level 'warn' for +#. * 'aptitude.changelog', debug for 'aptitude.why'), etc. +#. +#: src/main.cc:486 #, c-format msgid "Invalid logger name \"%s\"." msgstr "ロガー名 \"%s\" は不正です。" -#: src/main.cc:765 +#: src/main.cc:763 #, c-format msgid "Expected a number after -q=\n" msgstr "-q= の後に番号が期待されます\n" -#: src/main.cc:774 +#: src/main.cc:772 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "-q= の後に番号が期待されますが、%s が与えられました\n" -#: src/main.cc:798 +#: src/main.cc:796 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o には <キー>=<値> の形式の引数が必要ですが、%s が与えられました\n" -#: src/main.cc:888 +#: src/main.cc:886 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "タグ名 \"%s\" の後にコンマがありません。\n" -#: src/main.cc:980 src/main.cc:990 +#: src/main.cc:978 src/main.cc:988 msgid "WEIRDNESS: unknown option code received\n" msgstr "不可思議: 未知のオプションコードを受け取りました\n" -#: src/main.cc:1008 +#: src/main.cc:1006 msgid "--show-package-names|never" -msgstr "" +msgstr "--show-package-names|never" -#: src/main.cc:1011 +#: src/main.cc:1009 msgid "--show-package-names|auto" -msgstr "" +msgstr "--show-package-names|auto" -#: src/main.cc:1014 +#: src/main.cc:1012 msgid "--show-package-names|always" -msgstr "" +msgstr "--show-package-names|always" -#: src/main.cc:1019 +#: src/main.cc:1017 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." -msgstr "" +msgstr "パッケージ名表示モード「%s」は不正です (「never」、「auto」、「always」のどれかでないといけません)。" -#: src/main.cc:1025 +#: src/main.cc:1023 msgid "no-summary" msgstr "no-summary" -#: src/main.cc:1027 +#: src/main.cc:1025 msgid "first-package" msgstr "first-package" -#: src/main.cc:1029 +#: src/main.cc:1027 msgid "first-package-and-type" msgstr "first-package-and-type" -#: src/main.cc:1031 +#: src/main.cc:1029 msgid "all-packages" msgstr "all-packages" -#: src/main.cc:1033 +#: src/main.cc:1031 msgid "all-packages-with-dep-versions" msgstr "依存バージョン付きのすべてのパッケージ" -#. ForTranslators: "why" here is the aptitude command name and -#. should not be translated. -#: src/main.cc:1039 +#. TRANSLATORS: "why" here is the aptitude command name and should not +#. be translated. Both the translated and the untranslated log level +#. names are accepted here. +#: src/main.cc:1038 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-" @@ -5907,16 +5978,16 @@ "バックトレース:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:232 src/ui.cc:260 #: src/view_changelog.cc:168 msgid "Search for: " msgstr "検索: " -#: src/menu_text_layout.cc:75 src/menu_tree.cc:244 src/view_changelog.cc:180 +#: src/menu_text_layout.cc:75 src/menu_tree.cc:249 src/view_changelog.cc:180 msgid "Search backwards for: " msgstr "後方を検索: " -#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770 +#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1771 msgid "Minesweeper" msgstr "マインスイーパー" @@ -5962,171 +6033,171 @@ msgid "The board height must be a positive integer" msgstr "ボードの高さは正の整数でなければいけません" -#: src/mine/cmine.cc:259 +#: src/mine/cmine.cc:258 msgid "The board width must be a positive integer" msgstr "ボードの幅は正の整数でなければいけません" -#: src/mine/cmine.cc:271 +#: src/mine/cmine.cc:269 msgid "Invalid mine count; please enter a positive integer" msgstr "地雷の数が不正です。正の整数を入力してください" -#: src/mine/cmine.cc:291 +#: src/mine/cmine.cc:289 msgid "Setup custom game" msgstr "カスタムゲームを設定" -#: src/mine/cmine.cc:293 +#: src/mine/cmine.cc:291 msgid "Height of board: " msgstr "ボードの高さ: " -#: src/mine/cmine.cc:296 +#: src/mine/cmine.cc:294 msgid "Width of board: " msgstr "ボードの幅: " -#: src/mine/cmine.cc:299 +#: src/mine/cmine.cc:297 msgid "Number of mines: " msgstr "地雷の数: " -#: src/mine/cmine.cc:302 src/mine/cmine.cc:367 src/ui.cc:292 src/ui.cc:364 +#: src/mine/cmine.cc:300 src/mine/cmine.cc:365 src/ui.cc:293 src/ui.cc:365 msgid "Ok" msgstr "OK" -#: src/mine/cmine.cc:360 +#: src/mine/cmine.cc:358 msgid "Choose difficulty level" msgstr "難度レベルを選択してください" -#: src/mine/cmine.cc:362 +#: src/mine/cmine.cc:360 msgid "Easy" msgstr "易しい" -#: src/mine/cmine.cc:363 +#: src/mine/cmine.cc:361 msgid "Medium" msgstr "普通" -#: src/mine/cmine.cc:364 +#: src/mine/cmine.cc:362 msgid "Hard" msgstr "難しい" -#: src/mine/cmine.cc:365 +#: src/mine/cmine.cc:363 msgid "Custom" msgstr "カスタム" -#: src/mine/cmine.cc:463 +#: src/mine/cmine.cc:461 msgid "You have won." msgstr "あなたの勝ちです。" -#: src/mine/cmine.cc:466 +#: src/mine/cmine.cc:464 msgid "You lose!" msgstr "あなたの負け!" -#: src/mine/cmine.cc:471 +#: src/mine/cmine.cc:469 msgid "You die... --More--" -msgstr "あなたは死にました……。--More--" +msgstr "あなたは死にました... --More--" -#: src/mine/cmine.cc:484 +#: src/mine/cmine.cc:482 msgid "The spikes were poisoned! The poison was deadly... --More--" -msgstr "くぎには毒が塗られていました! 致死量でした……。--More--" +msgstr "くぎには毒が塗られていました! 致死量でした... --More--" -#: src/mine/cmine.cc:487 +#: src/mine/cmine.cc:485 msgid "You land on a set of sharp iron spikes! --More--" msgstr "鉄のくぎの上に着地しました! --More--" -#: src/mine/cmine.cc:490 +#: src/mine/cmine.cc:488 msgid "You fall into a pit! --More--" msgstr "落とし穴に落ちました! --More--" -#: src/mine/cmine.cc:493 +#: src/mine/cmine.cc:491 msgid "KABOOM! You step on a land mine. --More--" msgstr "ドッカーン! 地雷を踏みました。--More--" -#: src/mine/cmine.cc:498 +#: src/mine/cmine.cc:496 msgid "The dart was poisoned! The poison was deadly... --More--" -msgstr "投げ矢には毒が塗られていました! 致死量でした……。--More--" +msgstr "投げ矢には毒が塗られていました! 致死量でした... --More--" -#: src/mine/cmine.cc:500 +#: src/mine/cmine.cc:498 msgid "" "A little dart shoots out at you! You are hit by a little dart! --More--" msgstr "あなためがけて小さな投げ矢が飛んできました! 小さな投げ矢はあなたに命中しました! --More--" -#: src/mine/cmine.cc:504 +#: src/mine/cmine.cc:502 msgid "You turn to stone... --More--" -msgstr "あなたは石になってしまいました……。--More--" +msgstr "あなたは石になってしまいました... --More--" -#: src/mine/cmine.cc:506 +#: src/mine/cmine.cc:504 msgid "Touching the cockatrice corpse was a fatal mistake. --More--" msgstr "コカトリスの死骸に触ったのは致命的なミスでした。--More--" -#: src/mine/cmine.cc:508 +#: src/mine/cmine.cc:506 msgid "You feel here a cockatrice corpse. --More--" msgstr "コカトリスの死骸に触った気がしました。--More--" -#: src/mine/cmine.cc:512 +#: src/mine/cmine.cc:510 msgid "" "Click! You trigger a rolling boulder trap! You are hit by a boulder! --" "More--" msgstr "カチッ! 転がる岩の罠のスイッチを押してしまいました! 岩があなたに当たりました! --More--" -#: src/mine/cmine.cc:522 +#: src/mine/cmine.cc:520 msgid "sleep" msgstr "眠り" -#: src/mine/cmine.cc:525 +#: src/mine/cmine.cc:523 msgid "striking" msgstr "打撃" -#: src/mine/cmine.cc:528 +#: src/mine/cmine.cc:526 msgid "death" msgstr "死亡" -#: src/mine/cmine.cc:531 +#: src/mine/cmine.cc:529 msgid "polymorph" msgstr "変異" -#: src/mine/cmine.cc:534 +#: src/mine/cmine.cc:532 msgid "magic missile" msgstr "魔法のミサイル" -#: src/mine/cmine.cc:537 +#: src/mine/cmine.cc:535 msgid "secret door detection" msgstr "秘密の扉の発見" -#: src/mine/cmine.cc:540 +#: src/mine/cmine.cc:538 msgid "invisibility" msgstr "見えない度合" -#: src/mine/cmine.cc:543 +#: src/mine/cmine.cc:541 msgid "cold" msgstr "冷気" -#: src/mine/cmine.cc:547 +#: src/mine/cmine.cc:545 #, c-format msgid "Your wand of %s breaks apart and explodes! --More--" msgstr "あなたの%sの杖はバラバラに砕け散った! --More--" -#: src/mine/cmine.cc:553 +#: src/mine/cmine.cc:551 msgid "You are jolted by a surge of electricity! --More--" msgstr "電流による衝撃があなたの体に走った! --More--" -#: src/mine/cmine.cc:657 +#: src/mine/cmine.cc:655 msgid "Enter the filename to load: " msgstr "読み込むファイル名を入力してください: " -#: src/mine/cmine.cc:664 +#: src/mine/cmine.cc:662 msgid "Enter the filename to save: " msgstr "保存するファイル名を入力してください: " -#: src/mine/cmine.cc:672 +#: src/mine/cmine.cc:670 msgid "mine-help.txt" msgstr "mine-help-ja.txt" -#: src/mine/cmine.cc:674 +#: src/mine/cmine.cc:672 msgid "Encoding of mine-help.txt|UTF-8" msgstr "Encoding of mine-help-ja.txt|UTF-8" #: src/pkg_columnizer.cc:86 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15" -msgstr "" +msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15" -#: src/pkg_columnizer.cc:89 src/ui.cc:2782 +#: src/pkg_columnizer.cc:89 src/ui.cc:2787 msgid "Package" msgstr "パッケージ" @@ -6207,8 +6278,8 @@ msgid "" msgstr "<なし>" -#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269 -#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234 +#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264 +#: src/pkg_grouppolicy.cc:1747 src/qt/package.cc:234 #: src/qt/widgets/packages_tab.cc:73 msgid "virtual" msgstr "仮想" @@ -6237,7 +6308,7 @@ msgid "triggers-pending" msgstr "トリガ保留" -#: src/pkg_columnizer.cc:266 src/pkg_columnizer.cc:546 src/pkg_ver_item.cc:237 +#: src/pkg_columnizer.cc:266 src/pkg_columnizer.cc:551 src/pkg_ver_item.cc:237 msgid "ERROR" msgstr "エラー" @@ -6279,27 +6350,27 @@ msgid "none" msgstr "なし" -#. ForTranslators: Imp = Important +#. TRANSLATORS: Imp = Important #: src/pkg_columnizer.cc:362 src/pkg_ver_item.cc:354 msgid "Imp" msgstr "Imp（重要）" -#. ForTranslators: Req = Required +#. TRANSLATORS: Req = Required #: src/pkg_columnizer.cc:364 src/pkg_ver_item.cc:357 msgid "Req" msgstr "Req（要求）" -#. ForTranslators: Std = Standard +#. TRANSLATORS: Std = Standard #: src/pkg_columnizer.cc:366 src/pkg_ver_item.cc:360 msgid "Std" msgstr "Std（標準）" -#. ForTranslators: Opt = Optional +#. TRANSLATORS: Opt = Optional #: src/pkg_columnizer.cc:368 src/pkg_ver_item.cc:363 msgid "Opt" msgstr "Opt（オプション）" -#. ForTranslators: Xtr = Extra +#. TRANSLATORS: Xtr = Extra #: src/pkg_columnizer.cc:370 src/pkg_ver_item.cc:366 msgid "Xtr" msgstr "特" @@ -6311,42 +6382,42 @@ #: src/pkg_columnizer.cc:394 #, c-format msgid "#Broken: %ld" -msgstr "#依存関係破損: %ld" +msgstr "#依存破: %ld" #: src/pkg_columnizer.cc:409 #, c-format msgid "Will use %sB of disk space" -msgstr "%sB のディスク領域を新たに使用します" +msgstr "%sB の容量を新たに使用" #: src/pkg_columnizer.cc:417 #, c-format msgid "Will free %sB of disk space" -msgstr "%sB のディスク領域を解放します" +msgstr "%sB の容量を解放します" #: src/pkg_columnizer.cc:431 #, c-format msgid "DL Size: %sB" -msgstr "DL サイズ: %sB" +msgstr "DL 容量: %sB" -#. ForTranslators: Hostname -#: src/pkg_columnizer.cc:498 +#. TRANSLATORS: Hostname +#: src/pkg_columnizer.cc:499 msgid "HN too long" msgstr "HN が長すぎます" -#: src/pkg_columnizer.cc:671 src/pkg_columnizer.cc:680 +#: src/pkg_columnizer.cc:676 src/pkg_columnizer.cc:685 #, c-format msgid "Unable to transcode package display format after \"%ls\"" msgstr "\"%ls\" の後のパッケージ表示フォーマットをコード変換できません" -#: src/pkg_columnizer.cc:687 +#: src/pkg_columnizer.cc:692 msgid "Internal error: Default column string is unparsable" msgstr "内部エラー: デフォルトの行文字列が解析不可能です" -#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127 +#: src/pkg_grouppolicy.cc:274 src/pkg_grouppolicy.cc:1124 msgid "Tasks" msgstr "タスク" -#: src/pkg_grouppolicy.cc:468 +#: src/pkg_grouppolicy.cc:467 msgid "" "Security Updates\n" " Security updates for these packages are available from security.debian.org." @@ -6354,7 +6425,7 @@ "セキュリティアップデート\n" " これらのパッケージのセキュリティアップデートが security.debian.org から入手可能です。" -#: src/pkg_grouppolicy.cc:469 +#: src/pkg_grouppolicy.cc:468 msgid "" "Upgradable Packages\n" " A newer version of these packages is available." @@ -6362,7 +6433,7 @@ "更新可能なパッケージ\n" " これらのパッケージは新しいバージョンが利用可能です。" -#: src/pkg_grouppolicy.cc:470 +#: src/pkg_grouppolicy.cc:469 msgid "" "New Packages\n" " These packages have been added to Debian since the last time you cleared " @@ -6373,7 +6444,7 @@ " これらのパッケージは、「新規」パッケージ一覧を最後に消してから Debian に追加されました " "(この一覧を空にするには、「新規パッケージ一覧を消去」をアクションメニューから選んでください)。" -#: src/pkg_grouppolicy.cc:471 +#: src/pkg_grouppolicy.cc:470 msgid "" "Installed Packages\n" " These packages are currently installed on your computer." @@ -6381,7 +6452,7 @@ "インストール済みのパッケージ\n" " これらのパッケージは現在コンピュータにインストールされています。" -#: src/pkg_grouppolicy.cc:472 +#: src/pkg_grouppolicy.cc:471 msgid "" "Not Installed Packages\n" " These packages are not installed on your computer." @@ -6389,7 +6460,7 @@ "インストールされていないパッケージ\n" " これらのパッケージはコンピュータにインストールされていません。" -#: src/pkg_grouppolicy.cc:473 +#: src/pkg_grouppolicy.cc:472 msgid "" "Obsolete and Locally Created Packages\n" " These packages are currently installed on your computer, but they are not " @@ -6400,7 +6471,7 @@ " これらのパッケージは現在コンピュータにインストールされていますが、apt " "のどの入手先からも入手できません。おそらくそれらは、古いためにアーカイブから削除されたか、または自分でビルドした独自バージョンなのでしょう。" -#: src/pkg_grouppolicy.cc:474 +#: src/pkg_grouppolicy.cc:473 msgid "" "Virtual Packages\n" " These packages do not exist; they are names other packages use to require " @@ -6409,7 +6480,7 @@ "仮想パッケージ\n" " これらのパッケージには実体がありません。これらは、他のパッケージに何らかの機能を必要とさせたり提供させたりするのに用いられる名前です。" -#: src/pkg_grouppolicy.cc:629 +#: src/pkg_grouppolicy.cc:628 msgid "" "Packages which are recommended by other packages\n" " These packages are not strictly required, but they may be necessary to " @@ -6421,7 +6492,7 @@ "これらのパッケージは、厳密には必須というほどではありませんが、インストールや更新をしようとしている他のプログラムに完全な機能を提供するために必要となるでし" "ょう。" -#: src/pkg_grouppolicy.cc:650 +#: src/pkg_grouppolicy.cc:649 msgid "" "Packages which are suggested by other packages\n" " These packages are not required in order to make your system function " @@ -6433,44 +6504,44 @@ "これらのパッケージは、システムをきちんと機能させるためには必須ではありませんが、現在インストールしようとしているいくつかのプログラムの機能を強化してくれる" "でしょう。" -#: src/pkg_grouppolicy.cc:807 +#: src/pkg_grouppolicy.cc:806 msgid "unknown" msgstr "不明" -#: src/pkg_grouppolicy.cc:818 +#: src/pkg_grouppolicy.cc:817 #, c-format msgid "Priority %s" msgstr "優先度 %s" -#: src/pkg_grouppolicy.cc:932 +#: src/pkg_grouppolicy.cc:931 msgid "UNCATEGORIZED" msgstr "カテゴリ分けされていません" -#: src/pkg_grouppolicy.cc:1059 +#: src/pkg_grouppolicy.cc:1058 msgid "End-user" msgstr "エンドユーザ" -#: src/pkg_grouppolicy.cc:1060 +#: src/pkg_grouppolicy.cc:1059 msgid "Servers" msgstr "サーバ" -#: src/pkg_grouppolicy.cc:1061 +#: src/pkg_grouppolicy.cc:1060 msgid "Development" msgstr "開発用" -#: src/pkg_grouppolicy.cc:1062 +#: src/pkg_grouppolicy.cc:1061 msgid "Localization" msgstr "地域化" -#: src/pkg_grouppolicy.cc:1063 +#: src/pkg_grouppolicy.cc:1062 msgid "Hardware Support" msgstr "ハードウェアサポート" -#: src/pkg_grouppolicy.cc:1065 +#: src/pkg_grouppolicy.cc:1064 msgid "Unrecognized tasks" msgstr "認識できないタスク" -#: src/pkg_grouppolicy.cc:1128 +#: src/pkg_grouppolicy.cc:1125 msgid "" "\n" " Tasks are groups of packages which provide an easy way to select a " @@ -6479,26 +6550,26 @@ "\n" " タスクはパッケージのグループで、これを用いると、特定の目的のためにあらかじめ定義したパッケージセットを容易に選択できるようになります。" -#: src/pkg_grouppolicy.cc:1257 +#: src/pkg_grouppolicy.cc:1254 #, c-format msgid "Bad number in format string: %ls" msgstr "フォーマット文字列中に不正な数字があります: %ls" -#: src/pkg_grouppolicy.cc:1266 +#: src/pkg_grouppolicy.cc:1263 #, c-format msgid "Match indices must be 1 or greater, not \"%s\"" msgstr "match の添字は 1 以上でなくてはいけないので、\"%s\" ではいけません" -#: src/pkg_grouppolicy.cc:1284 +#: src/pkg_grouppolicy.cc:1281 #, c-format msgid "Match index %ls is too large; available groups are (%s)" msgstr "match の添字 %ls は大きすぎます。利用可能なグループは (%s) です" -#: src/pkg_grouppolicy.cc:1560 +#: src/pkg_grouppolicy.cc:1520 msgid "TAGLESS PACKAGES" msgstr "タグのないパッケージ" -#: src/pkg_grouppolicy.cc:1561 +#: src/pkg_grouppolicy.cc:1521 msgid "" "\n" " These packages have not yet been classified in debtags, or the debtags " @@ -6629,51 +6700,58 @@ #: src/qt/tabs_manager.cc:254 msgid "Perform Changes" -msgstr "" +msgstr "変更を実施" +# Translator's NOTE: show_tems ... "all","installed","installed locally", +# Translator's NOTE: "new","not installed","virtual" #: src/qt/widgets/packages_tab.cc:72 msgid "all" -msgstr "" +msgstr "全て" #: src/qt/widgets/packages_tab.cc:72 msgid "installed locally" -msgstr "" +msgstr "ローカル版をインストール済み" #: src/qt/widgets/packages_tab.cc:72 msgid "new" -msgstr "" +msgstr "新規" #: src/qt/widgets/packages_tab.cc:78 msgid "Show:" -msgstr "" +msgstr "表示:" #: src/qt/widgets/packages_tab.cc:84 msgid "Manage Filters" -msgstr "" +msgstr "フィルタ管理" #: src/qt/widgets/packages_tab.cc:105 msgid "Name and Description" -msgstr "" +msgstr "名前と説明" +# Translator's NOTE: 111 search_layout->addWidget(new QLabel(_("Find:"))); +# Translator's NOTE: 112 search_layout->addWidget(search_edit); +# * Item. #: src/qt/widgets/packages_tab.cc:111 msgid "Find:" -msgstr "" +msgstr "検索文字列:" +# Translator's NOTE: search_layout->addWidget(new QLabel(_("by"))); +# Translator's NOTE: "Name","Name and Description","Maintainer","Version" #: src/qt/widgets/packages_tab.cc:113 msgid "by" -msgstr "" +msgstr "検索対象" #: src/qt/windows/main_window.cc:96 msgid "&File" -msgstr "" +msgstr "ファイル(_F)" #: src/qt/windows/main_window.cc:104 msgid "&Packages" -msgstr "" +msgstr "パッケージ(_P)" #: src/qt/windows/main_window.cc:112 msgid "&Help" -msgstr "" +msgstr "ヘルプ(_H)" #: src/reason_fragment.cc:31 msgid "depends on" @@ -6709,7 +6787,7 @@ #: src/reason_fragment.cc:44 msgid "enhances" -msgstr "" +msgstr "拡張" #: src/reason_fragment.cc:155 #, c-format @@ -7027,26 +7105,26 @@ "%F: このバージョンの %s は%B信頼できないソース%bに由来するものです! " "このパッケージをインストールすると、あなたのシステムが悪意のある人間に破壊されたり掌握されたりする可能性があります。" -#. ForTranslators: This string is a confirmation message, which users +#. TRANSLATORS: This string is a confirmation message, which users #. (especially CJK users) should be able to input without input #. methods. Please include nothing but ASCII characters. -#: src/ui.cc:210 +#: src/ui.cc:211 msgid "Yes, I am aware this is a very bad idea" msgstr "Hai, korega totemo yokunai kotodato wakatteimasu" -#: src/ui.cc:237 +#: src/ui.cc:238 msgid "Er, there aren't any errors, this shouldn't have happened.." msgstr "おっと、予期せぬエラーです。こういうことは起きてほしくなかったのですが……" -#: src/ui.cc:243 +#: src/ui.cc:244 msgid "E:" msgstr "エラー:" -#: src/ui.cc:245 +#: src/ui.cc:246 msgid "W:" msgstr "警告:" -#: src/ui.cc:341 +#: src/ui.cc:342 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " "subsequent changes will not be saved unless you stop all other running apt-" @@ -7055,111 +7133,111 @@ "警告: パッケージキャッシュが読み取り専用モードで開かれています! 実行中の、APT " "ベースの他のプログラムをすべて止めてから、アクションメニューから「root になる」を選択しない限り、この変更やこれから行う変更はすべて保存されません。" -#: src/ui.cc:347 +#: src/ui.cc:348 msgid "Never display this message again." msgstr "このメッセージを二度と表示しない。" -#: src/ui.cc:393 +#: src/ui.cc:394 msgid "" "You may not modify the state of any package while a download is underway." msgstr "ダウンロードが行われているときはどのパッケージの状態も変更しないほうがよいでしょう。" -#: src/ui.cc:424 +#: src/ui.cc:425 msgid "You already are root!" msgstr "既に root になっています!" -#: src/ui.cc:439 +#: src/ui.cc:440 msgid "Invalid Get-Root-Command; it should start with su: or sudo:" msgstr "Get-Root-Command の設定値が不正です。設定値は su: または sudo: で始めてください" -#: src/ui.cc:446 +#: src/ui.cc:447 #, c-format msgid "Invalid Get-Root-Command; it should start with su: or sudo:, not %s:" msgstr "Get-Root-Command の設定値が不正です。設定値は %s: ではなく su: または sudo: で始めてください" -#: src/ui.cc:475 +#: src/ui.cc:476 #, c-format msgid "Unable to fork: %s" msgstr "fork できません: %s" -#: src/ui.cc:579 +#: src/ui.cc:580 msgid "" "Subprocess exited with an error -- did you type your password correctly?" msgstr "サブプロセスはエラーで終了しました。入力したパスワードは正しいですか?" -#: src/ui.cc:618 +#: src/ui.cc:619 msgid "Loading cache" msgstr "キャッシュを読み込んでいます" -#: src/ui.cc:660 +#: src/ui.cc:661 msgid "Really quit Aptitude?" msgstr "本当に Aptitude を終了しますか?" -#: src/ui.cc:714 src/ui.cc:2545 +#: src/ui.cc:715 src/ui.cc:2550 msgid "Change the behavior of aptitude" msgstr "aptitude の振舞いを変更します" -#: src/ui.cc:750 +#: src/ui.cc:751 msgid "Really discard your personal settings and reload the defaults?" msgstr "本当に個人設定を破棄してデフォルトの設定を読み込み直しますか?" -#: src/ui.cc:855 src/ui.cc:902 src/ui.cc:930 src/ui.cc:953 +#: src/ui.cc:856 src/ui.cc:903 src/ui.cc:931 src/ui.cc:954 msgid "View available packages and choose actions to perform" msgstr "利用可能なパッケージを表示し、実行するアクションを選択します" -#: src/ui.cc:884 +#: src/ui.cc:885 msgid "Recommended Packages" msgstr "推奨パッケージ" -#: src/ui.cc:885 +#: src/ui.cc:886 msgid "View packages that it is recommended that you install" msgstr "インストールするよう推奨されているパッケージを表示します" -#: src/ui.cc:886 +#: src/ui.cc:887 msgid "Recommendations" msgstr "推奨" -#: src/ui.cc:981 +#: src/ui.cc:982 #, c-format msgid "Information about %s" msgstr "%s に関する情報" -#: src/ui.cc:983 +#: src/ui.cc:984 #, c-format msgid "%s info" msgstr "%s 情報" -#: src/ui.cc:1004 +#: src/ui.cc:1005 #, c-format msgid "Packages depending on %s" msgstr "%s に依存しているパッケージ" -#: src/ui.cc:1005 +#: src/ui.cc:1006 #, c-format msgid "Dependencies of %s" msgstr "%s の依存関係" -#: src/ui.cc:1008 +#: src/ui.cc:1009 #, c-format msgid "%s reverse deps" msgstr "%s 逆依存" -#: src/ui.cc:1009 +#: src/ui.cc:1010 #, c-format msgid "%s deps" msgstr "%s 依存" -#: src/ui.cc:1027 +#: src/ui.cc:1028 #, c-format msgid "Available versions of %s" msgstr "%s の利用可能なバージョン" -#: src/ui.cc:1029 +#: src/ui.cc:1030 #, c-format msgid "%s versions" msgstr "%s バージョン" -#: src/ui.cc:1035 +#: src/ui.cc:1036 msgid "" "Aptitude %s%n%nCopyright 2000-2008 Daniel Burrows.%n%naptitude comes with " "%BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. " @@ -7170,89 +7248,89 @@ "は%B無保証%bです。詳しくは「ヘルプ」メニュー内の「ライセンス」を参照してください。このソフトはフリーソフトウェアなので、特定の条件下で再配布してかまい" "ません。詳しくは「ライセンス」を参照してください" -#: src/ui.cc:1085 src/ui.cc:1087 +#: src/ui.cc:1086 src/ui.cc:1088 msgid "License" msgstr "ライセンス" -#: src/ui.cc:1086 src/ui.cc:2637 +#: src/ui.cc:1087 src/ui.cc:2642 msgid "View the terms under which you may copy and distribute aptitude" msgstr "aptitude のコピーや配布を行う際に従うべき条件を表示します" -#. ForTranslators: You can translate help.txt and set the filename here. -#: src/ui.cc:1101 +#. TRANSLATORS: You can translate help.txt and set the filename here. +#: src/ui.cc:1102 msgid "Localized file|help.txt" msgstr "help-ja.txt" -#: src/ui.cc:1103 +#: src/ui.cc:1104 msgid "Encoding of help.txt|UTF-8" msgstr "Encoding of help-ja.txt|UTF-8" -#: src/ui.cc:1114 +#: src/ui.cc:1115 msgid "Online Help" msgstr "オンラインヘルプ" -#: src/ui.cc:1115 +#: src/ui.cc:1116 msgid "View a brief introduction to aptitude" msgstr "aptitude の使い方に関する簡単な手引きを表示します" -#: src/ui.cc:1116 src/ui.cc:2787 +#: src/ui.cc:1117 src/ui.cc:2792 msgid "Help" msgstr "ヘルプ" # * README is translatable!! -#. ForTranslators: You can translate README and set the filename here. -#: src/ui.cc:1125 +#. TRANSLATORS: You can translate README and set the filename here. +#: src/ui.cc:1126 msgid "Localized file|README" msgstr "README.ja" # * README is translatable!! -#: src/ui.cc:1126 +#: src/ui.cc:1127 msgid "Encoding of README|ISO_8859-1" msgstr "Encoding of README.ja|UTF-8" -#: src/ui.cc:1137 +#: src/ui.cc:1138 msgid "User's Manual" msgstr "ユーザーマニュアル" -#: src/ui.cc:1138 +#: src/ui.cc:1139 msgid "Read the full user's manual of aptitude" msgstr "aptitude の完全なユーザマニュアルを表示します" -#: src/ui.cc:1139 +#: src/ui.cc:1140 msgid "Manual" msgstr "マニュアル" -#: src/ui.cc:1146 src/ui.cc:1148 +#: src/ui.cc:1147 src/ui.cc:1149 msgid "FAQ" msgstr "FAQ" -#: src/ui.cc:1147 src/ui.cc:2629 +#: src/ui.cc:1148 src/ui.cc:2634 msgid "View a list of frequently asked questions" msgstr "よくある質問の一覧を表示します" -#: src/ui.cc:1156 src/ui.cc:1158 +#: src/ui.cc:1157 src/ui.cc:1159 msgid "News" msgstr "お知らせ" -#: src/ui.cc:1157 +#: src/ui.cc:1158 #, c-format msgid "View the important changes made in each version of %s" msgstr "%s の各バージョンにおける重要な変更点を表示します" -#: src/ui.cc:1164 +#: src/ui.cc:1165 #, c-format msgid "" "Unable to remove the old temporary directory; you should remove %s by hand." msgstr "古い一時ディレクトリを削除できません。%s を手動で削除してください。" -#: src/ui.cc:1169 +#: src/ui.cc:1170 #, c-format msgid "" "Will not remove %s; you should examine the files in it and remove them by " "hand." msgstr "%s を削除しません。その中のファイルを調べて手動で削除してください。" -#: src/ui.cc:1195 +#: src/ui.cc:1196 #, c-format msgid "" "It appears that a previous version of aptitude left files behind in %s. " @@ -7265,16 +7343,16 @@ "を選んだ場合にはこのメッセージは二度と表示されなくなります。" # * Message used as 'longtitle' for the ui_download_manager. -#: src/ui.cc:1267 +#: src/ui.cc:1268 msgid "View the progress of the package download" msgstr "パッケージダウンロードの進行状況を表示します" # * Message used as 'tablabel' for the ui_download_manager. -#: src/ui.cc:1268 +#: src/ui.cc:1269 msgid "Package Download" msgstr "パッケージのダウンロード" -#: src/ui.cc:1315 +#: src/ui.cc:1316 msgid "" "%BWARNING%b: untrusted versions of the following packages will be " "installed!%n%nUntrusted packages could %Bcompromise your system's " @@ -7285,60 +7363,60 @@ "以下のパッケージは、信頼できないバージョンがインストールされます!%n%n信頼できないパッケージは%Bシステムのセキュリティを損なう%b可能性があります。" "それが自分がしようとしていることだとわかっている場合にのみ、インストールを続けるべきでしょう。%n%n" -#: src/ui.cc:1321 +#: src/ui.cc:1322 msgid " %S*%N %s [version %s]%n" msgstr " %S*%N %s [バージョン %s]%n" -#: src/ui.cc:1327 +#: src/ui.cc:1328 msgid "Really Continue" msgstr "本当に先に進む" -#: src/ui.cc:1329 +#: src/ui.cc:1330 msgid "Abort Installation" msgstr "インストールを中断する" -#: src/ui.cc:1393 +#: src/ui.cc:1394 msgid "Preview of package installation" msgstr "インストールするパッケージをプレビューします" -#: src/ui.cc:1394 +#: src/ui.cc:1395 msgid "View and/or adjust the actions that will be performed" msgstr "実行するアクションの表示・調整を行います" -#: src/ui.cc:1456 +#: src/ui.cc:1457 msgid "Some packages were broken and have been fixed:" msgstr "一部のパッケージは依存関係が壊れていたので修復されました:" -#: src/ui.cc:1464 +#: src/ui.cc:1465 msgid "No solution to these dependency problems exists!" msgstr "これらの依存関係の問題を解決する方法は存在しません!" -#: src/ui.cc:1470 +#: src/ui.cc:1471 #, c-format msgid "" "Ran out of time while trying to resolve dependencies (press \"%s\" to try " "harder)" msgstr "依存関係の解決を試みましたがタイムアウトになりました (再試行するには \"%s\" と入力してください)" -#: src/ui.cc:1516 +#: src/ui.cc:1517 msgid "" "Installing/removing packages requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "パッケージのインストールや削除に必要な管理者権限が現在ありません。root になりますか?" -#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914 +#: src/ui.cc:1520 src/ui.cc:1759 src/ui.cc:1820 src/ui.cc:1915 msgid "Become root" msgstr "root になる" -#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916 +#: src/ui.cc:1522 src/ui.cc:1761 src/ui.cc:1822 src/ui.cc:1917 msgid "Don't become root" msgstr "root にならない" -#: src/ui.cc:1642 +#: src/ui.cc:1643 msgid "No packages are scheduled to be installed, removed, or upgraded." msgstr "インストール・削除・更新予定のパッケージがありません。" -#: src/ui.cc:1648 +#: src/ui.cc:1649 msgid "" "No packages will be installed, removed or upgraded. Some packages could be " "upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an " @@ -7348,214 +7426,214 @@ "と入力して更新の準備をしてください。" # * Message used as 'title' for the ui_download_manager. -#: src/ui.cc:1728 +#: src/ui.cc:1729 msgid "Updating package lists" msgstr "パッケージ一覧を更新中" # * Message used as 'longtitle' for the ui_download_manager. -#: src/ui.cc:1729 +#: src/ui.cc:1730 msgid "View the progress of the package list update" msgstr "パッケージ一覧更新の進行状況を表示します" # * Message used as 'tablabel' for the ui_download_manager. -#: src/ui.cc:1730 +#: src/ui.cc:1731 msgid "List Update" msgstr "一覧の更新" -#: src/ui.cc:1755 +#: src/ui.cc:1756 msgid "" "Updating the package lists requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "パッケージ一覧の更新に必要な管理者権限が現在ありません。root になりますか?" -#: src/ui.cc:1770 src/ui.cc:2384 +#: src/ui.cc:1771 src/ui.cc:2385 msgid "Waste time trying to find mines" msgstr "地雷探しにかまけます" -#: src/ui.cc:1777 src/ui.cc:1865 +#: src/ui.cc:1778 src/ui.cc:1866 msgid "Cleaning while a download is in progress is not allowed" msgstr "ダウンロードが進行している間は廃止されたファイルの消去はできません" -#: src/ui.cc:1792 +#: src/ui.cc:1793 msgid "Deleting downloaded files" msgstr "ダウンロードしたファイルを削除しています" -#: src/ui.cc:1806 +#: src/ui.cc:1807 msgid "Downloaded package files have been deleted" msgstr "ダウンロードしたパッケージファイルは既に削除されています" -#: src/ui.cc:1816 +#: src/ui.cc:1817 msgid "" "Cleaning the package cache requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "パッケージキャッシュの消去には管理者権限が必要ですが、あなたはまだそれを得ていません。root になりますか?" -#: src/ui.cc:1862 +#: src/ui.cc:1863 msgid "The apt cache file is not available; cannot auto-clean." msgstr "apt のキャッシュファイルが入手不可能です。autoclean できません。" -#: src/ui.cc:1900 +#: src/ui.cc:1901 #, c-format msgid "" "Obsolete downloaded package files have been deleted, freeing %sB of disk " "space." msgstr "ダウンロードされた廃止済みのパッケージファイルを削除し、%s バイトのディスク領域を解放しました。" -#: src/ui.cc:1911 +#: src/ui.cc:1912 msgid "" "Deleting obsolete files requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "廃止済みのファイルの削除には管理者権限が必要ですが、あなたはまだそれを得ていません。root になりますか?" -#: src/ui.cc:2013 +#: src/ui.cc:2014 msgid "No more solutions." msgstr "解決方法はこれ以上ありません。" -#: src/ui.cc:2221 +#: src/ui.cc:2222 msgid "Unable to find a solution to apply." msgstr "適用する解決方法が見つかりません。" -#: src/ui.cc:2227 +#: src/ui.cc:2228 msgid "Ran out of time while trying to find a solution." msgstr "解決方法を探そうとしましたがタイムアウトになりました。" -#: src/ui.cc:2287 src/ui.cc:2289 +#: src/ui.cc:2288 src/ui.cc:2290 msgid "Resolve Dependencies" msgstr "依存関係を解決する" -#: src/ui.cc:2288 +#: src/ui.cc:2289 msgid "Search for solutions to unsatisfied dependencies" msgstr "解決されていない依存関係の解決方法を探す" -#: src/ui.cc:2300 +#: src/ui.cc:2301 #, c-format msgid "Unable to open %ls" msgstr "%ls を開けません" -#: src/ui.cc:2306 +#: src/ui.cc:2307 msgid "Error while dumping resolver state" msgstr "依存関係解決器の状態のダンプ中にエラーが生じました" # * Item. -#: src/ui.cc:2346 +#: src/ui.cc:2347 msgid "^Install/remove packages" msgstr "パッケージのインストール・削除 (^I)" # * Item. -#: src/ui.cc:2349 +#: src/ui.cc:2350 msgid "^Update package list" msgstr "パッケージ一覧の更新 (^U)" # * Item. -#: src/ui.cc:2354 +#: src/ui.cc:2355 msgid "Mark Up^gradable" msgstr "更新可能パッケージという印を添付 (^G)" # * Item. -#: src/ui.cc:2359 +#: src/ui.cc:2360 msgid "^Forget new packages" msgstr "新規パッケージ一覧の消去 (^F)" -#: src/ui.cc:2363 +#: src/ui.cc:2364 msgid "Canc^el pending actions" msgstr "未実行アクションの取り消し (^E)" # * Item. -#: src/ui.cc:2367 +#: src/ui.cc:2368 msgid "^Clean package cache" msgstr "パッケージのキャッシュの消去 (^C)" # * Item. -#: src/ui.cc:2371 +#: src/ui.cc:2372 msgid "Clean ^obsolete files" msgstr "廃止されたファイルを一掃する (^O)" # * Item. -#: src/ui.cc:2378 +#: src/ui.cc:2379 msgid "^Reload package cache" msgstr "パッケージのキャッシュの再読み込み (^R)" # * Item. -#: src/ui.cc:2383 +#: src/ui.cc:2384 msgid "^Play Minesweeper" msgstr "マインスイーパで遊ぶ (^P)" # * Item. -#: src/ui.cc:2388 +#: src/ui.cc:2389 msgid "^Become root" msgstr "root になる (^B)" # * Item. -#: src/ui.cc:2391 +#: src/ui.cc:2392 msgid "^Quit" msgstr "終了 (^Q)" # * Menu item on the first line. # * Item. -#: src/ui.cc:2398 src/ui.cc:2781 +#: src/ui.cc:2399 src/ui.cc:2786 msgid "Undo" msgstr "取り消し" # * Item. -#: src/ui.cc:2407 +#: src/ui.cc:2408 msgid "^Install" msgstr "インストール (^I)" # * Description of an item. -#: src/ui.cc:2408 +#: src/ui.cc:2409 msgid "Flag the currently selected package for installation or upgrade" msgstr "現在選択中のパッケージに、インストールまたは更新用の印をつけます" # * Item. -#: src/ui.cc:2411 +#: src/ui.cc:2416 msgid "^Remove" msgstr "削除 (^R)" # * Description of an item. -#: src/ui.cc:2412 +#: src/ui.cc:2417 msgid "Flag the currently selected package for removal" msgstr "現在選択中のパッケージに削除用の印をつけます" # * Item. -#: src/ui.cc:2415 +#: src/ui.cc:2420 msgid "^Purge" msgstr "完全削除 (^P)" # * Description of an item. -#: src/ui.cc:2416 +#: src/ui.cc:2421 msgid "" "Flag the currently selected package and its configuration files for removal" msgstr "現在選択中のパッケージとその設定ファイルに、削除用の印をつけます" # * Item. -#: src/ui.cc:2419 +#: src/ui.cc:2424 msgid "^Keep" msgstr "一時固定 (^K)" # * Description of an item. -#: src/ui.cc:2420 +#: src/ui.cc:2425 msgid "Cancel any action on the selected package" msgstr "選択中のパッケージへのあらゆるアクションを取り消します" # * Item. -#: src/ui.cc:2423 +#: src/ui.cc:2428 msgid "^Hold" msgstr "固定 (^H)" # * Description of an item. -#: src/ui.cc:2424 +#: src/ui.cc:2429 msgid "" "Cancel any action on the selected package, and protect it from future " "upgrades" msgstr "選択中のパッケージへのあらゆるアクションを取り消し、今後の更新からも防ぎます" # * Item. -#: src/ui.cc:2427 +#: src/ui.cc:2432 msgid "Mark ^Auto" msgstr "自動的にインストールされたという印を添付 (^A)" # * Description of an item. -#: src/ui.cc:2428 +#: src/ui.cc:2433 msgid "" "Mark the selected package as having been automatically installed; it will " "automatically be removed if no other packages depend on it" @@ -7564,24 +7642,24 @@ "ります" # * Item. -#: src/ui.cc:2431 +#: src/ui.cc:2436 msgid "Mark ^Manual" msgstr "手動でインストールしたという印を添付 (^M)" # * Description of an item. -#: src/ui.cc:2432 +#: src/ui.cc:2437 msgid "" "Mark the selected package as having been manually installed; it will not be " "removed unless you manually remove it" msgstr "選択中のパッケージに、手動でインストールされたという印をつけます。すると、手動で削除しない限りパッケージは削除されないようになります" # * Item. -#: src/ui.cc:2435 +#: src/ui.cc:2440 msgid "^Forbid Version" msgstr "バージョンの禁止 (^F)" # * Description of an item. -#: src/ui.cc:2436 +#: src/ui.cc:2441 msgid "" "Forbid the candidate version of the selected package from being installed; " "newer versions of the package will be installed as usual" @@ -7590,22 +7668,22 @@ "トールされます" # * Item. -#: src/ui.cc:2440 +#: src/ui.cc:2445 msgid "I^nformation" msgstr "情報 (^N)" # * Description of an item. -#: src/ui.cc:2441 +#: src/ui.cc:2446 msgid "Display more information about the selected package" msgstr "選択中のパッケージに関する、より詳細な情報を表示します" # * Item. -#: src/ui.cc:2444 +#: src/ui.cc:2449 msgid "C^ycle Package Information" msgstr "パッケージ情報の切り替え (^Y)" # * Description of an item. -#: src/ui.cc:2445 +#: src/ui.cc:2450 msgid "" "Cycle through the modes of the package information area: it can show the " "package's long description, a summary of its dependency status, or an " @@ -7615,398 +7693,398 @@ "できます" # * Item. -#: src/ui.cc:2448 +#: src/ui.cc:2453 msgid "^Changelog" msgstr "変更履歴 (^C)" # * Description of an item. -#: src/ui.cc:2449 +#: src/ui.cc:2454 msgid "Display the Debian changelog of the selected package" msgstr "選択中のパッケージの更新履歴を表示します" # * Item. -#: src/ui.cc:2456 +#: src/ui.cc:2461 msgid "^Examine Solution" msgstr "解決方法の検討 (^E)" # * Description of an item. -#: src/ui.cc:2457 +#: src/ui.cc:2462 msgid "Examine the currently selected solution to the dependency problems." msgstr "依存関係の問題に対して、現在選択中の解決方法を試します。" # * Item. -#: src/ui.cc:2460 +#: src/ui.cc:2465 msgid "Apply ^Solution" msgstr "解決方法の適用 (^S)" # * Description of an item. -#: src/ui.cc:2461 +#: src/ui.cc:2466 msgid "Perform the actions contained in the currently selected solution." msgstr "現在選択中の解決方法に含まれるアクションを実行します。" # * Item. -#: src/ui.cc:2464 +#: src/ui.cc:2469 msgid "^Next Solution" msgstr "次の解決方法 (^N)" # * Description of an item. -#: src/ui.cc:2465 +#: src/ui.cc:2470 msgid "Select the next solution to the dependency problems." msgstr "依存関係の問題に対して、次の解決方法を選択します。" # * Item. -#: src/ui.cc:2468 +#: src/ui.cc:2473 msgid "^Previous Solution" msgstr "前の解決方法 (^P)" # * Description of an item. -#: src/ui.cc:2469 +#: src/ui.cc:2474 msgid "Select the previous solution to the dependency problems." msgstr "依存関係の問題に対して、前の解決方法を選択します。" # * Item. -#: src/ui.cc:2472 +#: src/ui.cc:2477 msgid "^First Solution" msgstr "最初の解決方法 (^F)" # * Description of an item. -#: src/ui.cc:2473 +#: src/ui.cc:2478 msgid "Select the first solution to the dependency problems." msgstr "依存関係の問題に対して、最初の解決方法を選択します。" # * Item. -#: src/ui.cc:2476 +#: src/ui.cc:2481 msgid "^Last Solution" msgstr "最後の解決方法 (^L)" # * Description of an item. -#: src/ui.cc:2477 +#: src/ui.cc:2482 msgid "" "Select the last solution to the dependency problems that has been generated " "so far." msgstr "発生した依存関係の問題に対して、今のところ最後となる解決方法を選択します。" # * Item. -#: src/ui.cc:2483 +#: src/ui.cc:2488 msgid "Toggle ^Rejected" msgstr "拒否する・しないを切り替え (^R)" # * Description of an item. -#: src/ui.cc:2484 +#: src/ui.cc:2489 msgid "Toggle whether the currently selected action is rejected." msgstr "現在選択中のアクションを拒否する・しないを切り替えます。" # * Item. -#: src/ui.cc:2488 +#: src/ui.cc:2493 msgid "Toggle ^Approved" msgstr "承認する・しないを切り替え (^A)" # * Description of an item. -#: src/ui.cc:2489 +#: src/ui.cc:2494 msgid "Toggle whether the currently selected action is approved." msgstr "現在選択中のアクションを承認する・しないを切り替えます。" # * Item. -#: src/ui.cc:2493 +#: src/ui.cc:2498 msgid "^View Target" msgstr "対象を表示 (^V)" # * Description of an item. -#: src/ui.cc:2494 +#: src/ui.cc:2499 msgid "View the package which will be affected by the selected action" msgstr "選択中のアクションによって影響を受けるパッケージを表示します" # * Item. -#: src/ui.cc:2500 +#: src/ui.cc:2505 msgid "Reject Breaking ^Holds" msgstr "破損につながる固定を拒否 (^H)" # * Description of an item. -#: src/ui.cc:2502 +#: src/ui.cc:2507 msgid "" "Reject all actions that would change the state of held packages or install " "forbidden versions" msgstr "固定されたパッケージの状態に変更を加えたり、禁止されたバージョンをインストールしたりするアクションをすべて拒否します" # * Item. -#: src/ui.cc:2510 +#: src/ui.cc:2515 msgid "^Find" msgstr "下を検索 (^F)" # * Description of an item. -#: src/ui.cc:2511 +#: src/ui.cc:2516 msgid "Search forwards" msgstr "下方を検索します" # * Item. -#: src/ui.cc:2514 +#: src/ui.cc:2519 msgid "^Find Backwards" msgstr "上を検索 (^F)" # * Description of an item. -#: src/ui.cc:2515 +#: src/ui.cc:2520 msgid "Search backwards" msgstr "上方を検索します" # * Item. -#: src/ui.cc:2518 +#: src/ui.cc:2523 msgid "Find ^Again" msgstr "前の検索を繰り返す (^A)" # * Description of an item. -#: src/ui.cc:2519 +#: src/ui.cc:2524 msgid "Repeat the last search" msgstr "最後に行った検索を繰り返します" # * Item. -#: src/ui.cc:2522 +#: src/ui.cc:2527 msgid "Find Again ^Backwards" msgstr "前の検索を逆方向に繰り返す (^B)" # * Description of an item. -#: src/ui.cc:2523 +#: src/ui.cc:2528 msgid "Repeat the last search in the opposite direction" msgstr "最後に行った検索を逆方向に繰り返します" # * Item. -#: src/ui.cc:2527 +#: src/ui.cc:2532 msgid "^Limit Display" msgstr "表示を制限 (^L)" # * Description of an item. -#: src/ui.cc:2528 +#: src/ui.cc:2533 msgid "Apply a filter to the package list" msgstr "パッケージ一覧にフィルタをかけます" # * Item. -#: src/ui.cc:2531 +#: src/ui.cc:2536 msgid "^Un-Limit Display" msgstr "表示制限を解除 (^U)" # * Description of an item. -#: src/ui.cc:2532 +#: src/ui.cc:2537 msgid "Remove the filter from the package list" msgstr "パッケージ一覧のフィルタを解除します" # * Item. -#: src/ui.cc:2536 +#: src/ui.cc:2541 msgid "Find ^Broken" msgstr "壊れた依存関係を検索 (^B)" # * Description of an item. -#: src/ui.cc:2537 +#: src/ui.cc:2542 msgid "Find the next package with unsatisfied dependencies" msgstr "解決できない依存関係がある、次のパッケージを探します" # * Item. -#: src/ui.cc:2544 +#: src/ui.cc:2549 msgid "^Preferences" msgstr "設定 (^P)" # * Item. -#: src/ui.cc:2549 +#: src/ui.cc:2554 msgid "^UI options" msgstr "UI オプション (^U)" # * Description of an item. -#: src/ui.cc:2550 +#: src/ui.cc:2555 msgid "Change the settings which affect the user interface" msgstr "ユーザインターフェースに影響する設定を変更します" # * Item. -#: src/ui.cc:2553 +#: src/ui.cc:2558 msgid "^Dependency handling" msgstr "依存関係の処理 (^D)" # * Description of an item. -#: src/ui.cc:2554 +#: src/ui.cc:2559 msgid "Change the settings which affect how package dependencies are handled" msgstr "パッケージ依存関係の処理方法に関する設定を変更します" # * Item. -#: src/ui.cc:2557 +#: src/ui.cc:2562 msgid "^Miscellaneous" msgstr "その他 (^M)" # * Description of an item. -#: src/ui.cc:2558 +#: src/ui.cc:2563 msgid "Change miscellaneous program settings" msgstr "その他の設定を変更します" # * Item. -#: src/ui.cc:2564 +#: src/ui.cc:2569 msgid "^Revert options" msgstr "オプションを元に戻す (^R)" # * Description of an item. -#: src/ui.cc:2565 +#: src/ui.cc:2570 msgid "Reset all settings to the system defaults" msgstr "すべての設定をシステムのデフォルトに戻します" # * Item. -#: src/ui.cc:2576 +#: src/ui.cc:2581 msgid "^Next" msgstr "次 (^N)" # * Description of an item. -#: src/ui.cc:2577 +#: src/ui.cc:2582 msgid "View next display" msgstr "次の画面を表示します" # * Item. -#: src/ui.cc:2580 +#: src/ui.cc:2585 msgid "^Prev" msgstr "前 (^P)" # * Description of an item. -#: src/ui.cc:2581 +#: src/ui.cc:2586 msgid "View previous display" msgstr "前の画面を表示します" # * Item. -#: src/ui.cc:2584 +#: src/ui.cc:2589 msgid "^Close" msgstr "閉じる (^C)" # * Description of an item. -#: src/ui.cc:2585 +#: src/ui.cc:2590 msgid "Close this display" msgstr "この画面を閉じます" # * Item. -#: src/ui.cc:2590 +#: src/ui.cc:2595 msgid "New Package ^View" msgstr "新規パッケージ画面 (^V)" # * Description of an item. -#: src/ui.cc:2591 +#: src/ui.cc:2596 msgid "Create a new default package view" msgstr "デフォルトのパッケージ画面を新規に作成します" # * Item -#: src/ui.cc:2594 +#: src/ui.cc:2599 msgid "Audit ^Recommendations" msgstr "推奨を監査 (^R)" # * Description of an item -#: src/ui.cc:2595 +#: src/ui.cc:2600 msgid "" "View packages which it is recommended that you install, but which are not " "currently installed." msgstr "インストールするよう推奨されているのに現在インストールされていないパッケージを表示します" # * Item. -#: src/ui.cc:2598 +#: src/ui.cc:2603 msgid "New ^Flat Package List" msgstr "平坦なパッケージ一覧を新規に作成 (^F)" # * Description of an item. -#: src/ui.cc:2599 +#: src/ui.cc:2604 msgid "View all the packages on the system in a single uncategorized list" msgstr "システムの全パッケージをカテゴリ分けせず、単一の一覧表で表示します" # * Item. -#: src/ui.cc:2602 +#: src/ui.cc:2607 msgid "New ^Debtags Browser" msgstr "Debtags 表示を新規に作成 (^D)" # * Description of an item. -#: src/ui.cc:2604 +#: src/ui.cc:2609 msgid "Browse packages using Debtags data" msgstr "Debtags のデータを用いてパッケージを表示します" # * Item. -#: src/ui.cc:2607 +#: src/ui.cc:2612 msgid "New Categorical ^Browser" msgstr "カテゴリ別表示を新規に作成 (^B)" # * Description of an item. -#: src/ui.cc:2609 +#: src/ui.cc:2614 msgid "Browse packages by category" msgstr "カテゴリ別にパッケージを表示します" # * Item. -#: src/ui.cc:2617 +#: src/ui.cc:2622 msgid "^About" msgstr "このプログラムについて (^A)" # * Description of an item. -#: src/ui.cc:2618 +#: src/ui.cc:2623 msgid "View information about this program" msgstr "このプログラムについての情報を表示します" # * Item. -#: src/ui.cc:2621 +#: src/ui.cc:2626 msgid "^Help" msgstr "ヘルプ (^H)" # * Description of an item. -#: src/ui.cc:2622 +#: src/ui.cc:2627 msgid "View the on-line help" msgstr "オンラインヘルプを表示します" # * Item. -#: src/ui.cc:2624 +#: src/ui.cc:2629 msgid "User's ^Manual" msgstr "ユーザマニュアル (^M)" # * Description of an item. -#: src/ui.cc:2625 +#: src/ui.cc:2630 msgid "View the detailed program manual" msgstr "プログラムの詳細なマニュアルを表示します" # * Item. -#: src/ui.cc:2628 +#: src/ui.cc:2633 msgid "^FAQ" msgstr "FAQ (^F)" -#: src/ui.cc:2632 +#: src/ui.cc:2637 msgid "^News" msgstr "お知らせ (^N)" # TRANSLATION-FIXME: The original message should be fixed, but... -#: src/ui.cc:2633 +#: src/ui.cc:2638 msgid "View the important changes made in each version of " msgstr "の各バージョンにおける重要な変更点を表示します " # * Item. -#: src/ui.cc:2636 +#: src/ui.cc:2641 msgid "^License" msgstr "ライセンス (^L)" # * Menu item on the first line. -#: src/ui.cc:2780 +#: src/ui.cc:2785 msgid "Actions" msgstr "アクション" # * Menu item on the first line. -#: src/ui.cc:2784 +#: src/ui.cc:2789 msgid "Search" msgstr "検索" # * Menu item on the first line. -#: src/ui.cc:2785 +#: src/ui.cc:2790 msgid "Options" msgstr "オプション" # * Menu item on the first line. -#: src/ui.cc:2786 +#: src/ui.cc:2791 msgid "Views" msgstr "表示" # * Menu item on the second line. -#: src/ui.cc:2852 +#: src/ui.cc:2857 #, c-format msgid "" "%ls: Menu %ls: Help %ls: Quit %ls: Update %ls: Download/Install/Remove " "Pkgs" msgstr "%ls: メニュー %ls: ヘルプ %ls: 終了 %ls: 更新 %ls: パッケージの 取得/導入/削除" -#: src/ui.cc:3211 +#: src/ui.cc:3216 msgid "yes_key" msgstr "y" -#: src/ui.cc:3212 +#: src/ui.cc:3217 msgid "no_key" msgstr "n" @@ -8022,17 +8100,17 @@ #: src/view_changelog.cc:343 #, c-format msgid "Preparing to download the changelog of %s" -msgstr "" +msgstr "%s の変更履歴のダウンロードを準備しています" #: src/view_changelog.cc:371 #, c-format msgid "Failed to download the changelog of %s: %s" -msgstr "" +msgstr "%s の変更履歴のダウンロードに失敗しました: %s" #: src/view_changelog.cc:382 #, c-format msgid "Downloading the changelog of %s" -msgstr "%s の changelog をダウンロード中" +msgstr "%s の変更履歴をダウンロードしています" #: src/view_changelog.cc:415 msgid "You can only view changelogs of official Debian packages." diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apt-listchanges.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apt-listchanges.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apt-listchanges.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apt-listchanges.po 2015-02-19 15:11:47.000000000 +0000 @@ -13,8 +13,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:33+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:85 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apt.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apt.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apt.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apt.po 2015-02-19 15:11:47.000000000 +0000 @@ -9,15 +9,15 @@ "Project-Id-Version: apt 0.9.16.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2014-06-19 04:20+0000\n" +"PO-Revision-Date: 2014-11-07 13:54+0000\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:32+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:31+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: cmdline/apt-cache.cc:141 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apturl.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apturl.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/apturl.po 2014-07-09 09:08:48.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/apturl.po 2015-02-19 15:12:07.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:59+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:38+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/aspell.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/aspell.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/aspell.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/aspell.po 2015-02-19 15:11:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:36+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:32+0000\n" +"X-Generator: Launchpad (build 17341)\n" "X-Poedit-Country: JAPAN\n" "Language: ja\n" "X-Poedit-Language: Japanese\n" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/attr.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/attr.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/attr.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/attr.po 2015-02-19 15:11:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:36+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:32+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: ../attr/attr.c:46 #, c-format diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/avahi.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/avahi.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/avahi.po 2014-07-09 09:08:43.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/avahi.po 2015-02-19 15:12:02.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 12:57+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:58+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: ../avahi-common/error.c:30 @@ -421,7 +421,7 @@ #: ../avahi-ui/avahi-ui.c:717 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "Avahi サーバへの接続が失敗ました: %s" +msgstr "Avahiサーバーへの接続に失敗しました: %s" #: ../avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" @@ -453,11 +453,11 @@ #: ../avahi-ui/avahi-ui.c:1039 ../avahi-ui/avahi-ui.c:1178 msgid "Browsing..." -msgstr "検索中…" +msgstr "検索中..." #: ../avahi-ui/avahi-ui.c:1132 msgid "Initializing..." -msgstr "初期化中…" +msgstr "初期化中..." #: ../avahi-ui/avahi-ui.c:1160 msgid "Location" @@ -473,7 +473,7 @@ #: ../avahi-ui/avahi-ui.c:1182 msgid "_Domain..." -msgstr "ドメイン(_D)…" +msgstr "ドメイン(_D)..." #: ../avahi-ui/bssh.c:55 #, c-format @@ -489,10 +489,10 @@ "%s [オプション]\n" "\n" " -h --help このヘルプを表示する\n" -" -s --ssh SSH サーバの検索\n" -" -v --vnc VNC サーバの検索\n" -" -S --shell SSH と VNC を検索する\n" -" -d --domain=DOMAIN 検索するドメインを指定\n" +" -s --ssh SSHサーバーの検索\n" +" -v --vnc VNCサーバーの検索\n" +" -S --shell SSHとVNCを検索する\n" +" -d --domain=DOMAIN 検索するドメインを指定\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -501,7 +501,7 @@ #: ../avahi-ui/bssh.c:149 msgid "Choose Shell Server" -msgstr "シェルサーバを選択" +msgstr "シェルサーバーを選択" #: ../avahi-ui/bssh.c:151 msgid "Desktop" @@ -513,16 +513,16 @@ #: ../avahi-ui/bssh.c:156 msgid "Choose VNC server" -msgstr "VNC サーバを選択" +msgstr "VNCサーバーを選択" #: ../avahi-ui/bssh.c:161 msgid "Choose SSH server" -msgstr "SSH サーバを選択" +msgstr "SSHサーバーを選択" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "'%s' へ接続中…\n" +msgstr "'%s' へ接続中...\n" #: ../avahi-ui/bssh.c:240 #, c-format @@ -536,19 +536,19 @@ #: ../avahi-ui/bssh.desktop.in.in.h:1 msgid "Avahi SSH Server Browser" -msgstr "Avahi SSH サーバの検索" +msgstr "Avahi SSHサーバーブラウザー" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Zeroconf を有効にした SSH サーバを検索" +msgstr "Zeroconfを有効にしたSSHサーバーを検索" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" -msgstr "Avahi VNC サーバの検索" +msgstr "Avahi VNCサーバーブラウザー" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Zeroconf を有効にした VNC サーバを検索" +msgstr "Zeroconf を有効にしたVNCサーバーを検索" #: ../avahi-utils/avahi-browse.c:107 #, c-format @@ -607,7 +607,7 @@ #: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" -msgstr "サーバのバージョン: %1$s; ホスト名: %2$s\n" +msgstr "サーバーのバージョン: %1$s; ホスト名: %2$s\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain @@ -627,7 +627,7 @@ #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "切断されました。再接続しています…\n" +msgstr "切断されました。再接続しています...\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bacula.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bacula.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bacula.po 2014-07-09 09:08:40.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bacula.po 2015-02-19 15:12:00.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 12:39+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:46+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: src/dird/jobq.c:74 #, c-format @@ -1529,16 +1529,16 @@ #: src/dird/next_vol.c:149 #, c-format msgid "Purging oldest volume \"%s\"\n" -msgstr "" +msgstr "最も古いボリューム \"%s\" を消去しています\n" #: src/dird/next_vol.c:155 #, c-format msgid "Pruning oldest volume \"%s\"\n" -msgstr "" +msgstr "最も古いボリューム \"%s\" を取り除いています\n" #: src/dird/next_vol.c:174 msgid "We seem to be looping trying to find the next volume. I give up.\n" -msgstr "" +msgstr "次のボリュームを検索しようとしましたがループしています。作業を中止します。\n" #: src/dird/next_vol.c:201 #, c-format @@ -1548,7 +1548,7 @@ #: src/dird/next_vol.c:209 #, c-format msgid "Volume used once. Marking Volume \"%s\" as Used.\n" -msgstr "" +msgstr "ボリュームは一度使用されています。ボリューム \"%s\" は使用済みであることを登録しています。\n" #: src/dird/next_vol.c:216 #, c-format @@ -1570,24 +1570,24 @@ #: src/dird/next_vol.c:249 #, c-format msgid "Catalog error updating volume \"%s\". ERR=%s" -msgstr "" +msgstr "ボリューム\"%s\"の更新時にカタログエラーが発生しました。ERR=%s" #: src/dird/next_vol.c:271 msgid "volume has expired" -msgstr "" +msgstr "ボリュームは有効期限が切れました" #: src/dird/next_vol.c:289 src/dird/next_vol.c:333 #, c-format msgid "Recycled current volume \"%s\"\n" -msgstr "" +msgstr "再利用された現在のボリューム \"%s\"\n" #: src/dird/next_vol.c:294 msgid "and recycling of current volume failed" -msgstr "" +msgstr "そして現在のボリュームの再利用に失敗しました" #: src/dird/next_vol.c:300 msgid "but should be Append, Purged or Recycle" -msgstr "" +msgstr "しかし付加、消去、または再利用する必要があります" #: src/dird/next_vol.c:309 msgid "volume has recycling disabled" @@ -3129,7 +3129,7 @@ #: src/dird/fd_cmds.c:150 #, c-format msgid "Error updating Client record. ERR=%s\n" -msgstr "" +msgstr "クライアントレコードの更新エラーです。ERR=%s\n" #: src/dird/fd_cmds.c:155 #, c-format @@ -3143,7 +3143,7 @@ #: src/dird/fd_cmds.c:249 msgid "" "No prior or suitable Full backup found in catalog. Doing FULL backup.\n" -msgstr "" +msgstr "以前のまたは適切なフルバックアップがカタログ内にありません。フルバックアップを行います。\n" #: src/dird/fd_cmds.c:250 src/dird/fd_cmds.c:256 src/dird/fd_cmds.c:265 #, c-format @@ -3159,7 +3159,7 @@ #: src/dird/fd_cmds.c:263 #, c-format msgid "Prior failed job found in catalog. Upgrading to %s.\n" -msgstr "" +msgstr "カタログ内に以前失敗したジョブが存在します。%s にアップグレードします。\n" #: src/dird/fd_cmds.c:328 #, c-format @@ -3380,12 +3380,12 @@ #: src/dird/ua_label.c:688 #, c-format msgid "Sending relabel command from \"%s\" to \"%s\" ...\n" -msgstr "" +msgstr "\"%s\" から \"%s\" へ 再ラベルコマンドを送信中です...\n" #: src/dird/ua_label.c:695 #, c-format msgid "Sending label command for Volume \"%s\" Slot %d ...\n" -msgstr "" +msgstr "ボリューム \"%s\" スロット %d へ ラベルコマンドを送信中です...\n" #: src/dird/ua_label.c:736 #, c-format diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bash.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bash.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bash.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bash.po 2015-02-19 15:11:47.000000000 +0000 @@ -16,54 +16,54 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:37+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:33+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: Japanese\n" -#: arrayfunc.c:50 +#: arrayfunc.c:51 msgid "bad array subscript" msgstr "誤った配列の添字" -#: arrayfunc.c:313 builtins/declare.def:487 +#: arrayfunc.c:356 builtins/declare.def:566 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: インデックス配列から連想配列に変換することはできません" -#: arrayfunc.c:480 +#: arrayfunc.c:539 #, c-format msgid "%s: invalid associative array key" msgstr "%s: 無効な連想配列のキーです" -#: arrayfunc.c:482 +#: arrayfunc.c:541 #, c-format msgid "%s: cannot assign to non-numeric index" msgstr "%s: 配列の添字に非数字を設定できません" -#: arrayfunc.c:518 +#: arrayfunc.c:586 #, c-format msgid "%s: %s: must use subscript when assigning associative array" msgstr "%s: %s: 連想配列を設定するときには添字をつけなければいけません" -#: bashhist.c:387 +#: bashhist.c:388 #, c-format msgid "%s: cannot create: %s" msgstr "%s: %s を作成できません" -#: bashline.c:3498 +#: bashline.c:3982 msgid "bash_execute_unix_command: cannot find keymap for command" msgstr "bash_execute_unix_command: コマンドのキーマップがありません" -#: bashline.c:3584 +#: bashline.c:4069 #, c-format msgid "%s: first non-whitespace character is not `\"'" msgstr "%s: 最初の非空白類文字が `\"' ではありません" -#: bashline.c:3613 +#: bashline.c:4098 #, c-format msgid "no closing `%c' in %s" msgstr "閉じる `%c' が %s にありません" -#: bashline.c:3647 +#: bashline.c:4132 #, c-format msgid "%s: missing colon separator" msgstr "%s: 区切り文字コロン(:)がありません" @@ -73,36 +73,36 @@ msgid "`%s': invalid alias name" msgstr "`%s': 無効なエイリアス名です" -#: builtins/bind.def:120 builtins/bind.def:123 +#: builtins/bind.def:123 builtins/bind.def:126 msgid "line editing not enabled" msgstr "行編集が有効になっていません" -#: builtins/bind.def:206 +#: builtins/bind.def:212 #, c-format msgid "`%s': invalid keymap name" msgstr "`%s': 無効なキーマップ名です" -#: builtins/bind.def:245 +#: builtins/bind.def:251 #, c-format msgid "%s: cannot read: %s" msgstr "%s: %s を読み込めません" -#: builtins/bind.def:260 +#: builtins/bind.def:266 #, c-format msgid "`%s': cannot unbind" msgstr "`%s': 割り当て解除できません" -#: builtins/bind.def:295 builtins/bind.def:325 +#: builtins/bind.def:304 builtins/bind.def:334 #, c-format msgid "`%s': unknown function name" msgstr "`%s': 不明な関数名です" -#: builtins/bind.def:303 +#: builtins/bind.def:312 #, c-format msgid "%s is not bound to any keys.\n" msgstr "%s はどのキーにも割り当てられていません。\n" -#: builtins/bind.def:307 +#: builtins/bind.def:316 #, c-format msgid "%s can be invoked via " msgstr "%s は次を通して起動します " @@ -115,7 +115,7 @@ msgid "only meaningful in a `for', `while', or `until' loop" msgstr "`for'、`while' または `until' ループでのみ意味があります" -#: builtins/caller.def:133 +#: builtins/caller.def:134 msgid "" "Returns the context of the current subroutine call.\n" " \n" @@ -125,11 +125,11 @@ " \n" " EXPR が無い場合、次を返します " -#: builtins/cd.def:235 +#: builtins/cd.def:319 msgid "HOME not set" msgstr "HOME が設定されていません" -#: builtins/cd.def:247 +#: builtins/cd.def:338 msgid "OLDPWD not set" msgstr "OLDPWD が設定されていません" @@ -138,7 +138,7 @@ msgid "line %d: " msgstr "%d 行: " -#: builtins/common.c:139 error.c:261 +#: builtins/common.c:139 error.c:265 #, c-format msgid "warning: " msgstr "警告: " @@ -148,11 +148,11 @@ msgid "%s: usage: " msgstr "%s: 使用法: " -#: builtins/common.c:166 test.c:832 +#: builtins/cd.def:327 builtins/common.c:166 test.c:876 msgid "too many arguments" msgstr "引数が多すぎます" -#: builtins/common.c:191 shell.c:500 shell.c:782 +#: builtins/common.c:191 shell.c:506 shell.c:788 #, c-format msgid "%s: option requires an argument" msgstr "%s: オプションには引数が必要です" @@ -167,7 +167,7 @@ msgid "%s: not found" msgstr "%s: 見つかりません" -#: builtins/common.c:214 shell.c:795 +#: builtins/common.c:214 shell.c:801 #, c-format msgid "%s: invalid option" msgstr "%s: 無効なオプションです" @@ -177,7 +177,7 @@ msgid "%s: invalid option name" msgstr "%s: 無効なオプション名です" -#: builtins/common.c:228 general.c:231 general.c:236 +#: builtins/common.c:228 general.c:235 general.c:240 #, c-format msgid "`%s': not a valid identifier" msgstr "`%s': 有効な識別子ではありません" @@ -190,7 +190,7 @@ msgid "invalid hex number" msgstr "無効な十六進数です" -#: builtins/common.c:242 expr.c:1362 +#: builtins/common.c:242 expr.c:1470 msgid "invalid number" msgstr "無効な数字です" @@ -204,7 +204,7 @@ msgid "`%s': not a pid or valid job spec" msgstr "`%s': pid または有効なジョブ指定ではありません" -#: builtins/common.c:264 error.c:454 +#: builtins/common.c:264 error.c:488 #, c-format msgid "%s: readonly variable" msgstr "%s: 読み取り専用の変数です" @@ -276,48 +276,48 @@ msgid "%s: ambiguous job spec" msgstr "%s: 曖昧なジョブ指定です" -#: builtins/complete.def:276 +#: builtins/complete.def:277 #, c-format msgid "%s: invalid action name" msgstr "%s: 無効なアクション名です" -#: builtins/complete.def:449 builtins/complete.def:644 -#: builtins/complete.def:853 +#: builtins/complete.def:450 builtins/complete.def:645 +#: builtins/complete.def:855 #, c-format msgid "%s: no completion specification" msgstr "%s: 補完指定がありません" -#: builtins/complete.def:696 +#: builtins/complete.def:697 msgid "warning: -F option may not work as you expect" msgstr "警告: -F オプションは期待通りに動作しないかもしれません" -#: builtins/complete.def:698 +#: builtins/complete.def:699 msgid "warning: -C option may not work as you expect" msgstr "警告: -C オプションは期待通りに動作しないかもしれません" -#: builtins/complete.def:826 +#: builtins/complete.def:828 msgid "not currently executing completion function" msgstr "補完機能は現在実行されていません" -#: builtins/declare.def:124 +#: builtins/declare.def:126 msgid "can only be used in a function" msgstr "関数の中でのみ使用できます" -#: builtins/declare.def:366 +#: builtins/declare.def:398 msgid "cannot use `-f' to make functions" msgstr "関数作成時に `-f' を使用できません" -#: builtins/declare.def:378 execute_cmd.c:5105 +#: builtins/declare.def:410 execute_cmd.c:5361 #, c-format msgid "%s: readonly function" msgstr "%s: 読み取り専用関数です" -#: builtins/declare.def:474 +#: builtins/declare.def:553 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: この方法で配列変数を消去することはできません" -#: builtins/declare.def:481 +#: builtins/declare.def:560 builtins/read.def:733 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: 連想配列からインデックス配列に変換することはできません" @@ -346,24 +346,23 @@ msgid "%s: cannot delete: %s" msgstr "%s: 削除できません: %s" -#: builtins/evalfile.c:135 builtins/hash.def:171 execute_cmd.c:4961 -#: shell.c:1457 +#: builtins/evalfile.c:140 builtins/hash.def:171 execute_cmd.c:5208 +#: shell.c:1481 #, c-format msgid "%s: is a directory" msgstr "%s: ディレクトリです" -#: builtins/evalfile.c:140 +#: builtins/evalfile.c:146 #, c-format msgid "%s: not a regular file" msgstr "%s: 通常ファイルではありません" -#: builtins/evalfile.c:148 +#: builtins/evalfile.c:155 #, c-format msgid "%s: file is too large" msgstr "%s: ファイルが大きすぎます" -#: builtins/evalfile.c:182 builtins/evalfile.c:200 execute_cmd.c:5032 -#: shell.c:1467 +#: builtins/evalfile.c:190 builtins/evalfile.c:208 shell.c:1491 #, c-format msgid "%s: cannot execute binary file" msgstr "%s: バイナリファイルを実行できません" @@ -396,11 +395,11 @@ msgid "no command found" msgstr "コマンドが見つかりません" -#: builtins/fc.def:312 builtins/fc.def:359 +#: builtins/fc.def:320 builtins/fc.def:369 msgid "history specification" msgstr "ヒストリ指定" -#: builtins/fc.def:380 +#: builtins/fc.def:390 #, c-format msgid "%s: cannot open temp file: %s" msgstr "%s: 一時ファイルを開くことができません: %s" @@ -444,18 +443,18 @@ msgid_plural "Shell commands matching keywords `" msgstr[0] "キーワードに一致したシェルコマンド `" -#: builtins/help.def:168 +#: builtins/help.def:182 #, c-format msgid "" "no help topics match `%s'. Try `help help' or `man -k %s' or `info %s'." msgstr "`%s' に一致するヘルプ項目がありません。`help help'、`man -k %s' または `info %s' を試してください" -#: builtins/help.def:185 +#: builtins/help.def:199 #, c-format msgid "%s: cannot open: %s" msgstr "%s: 開くことができません: %s" -#: builtins/help.def:337 +#: builtins/help.def:485 #, c-format msgid "" "These shell commands are defined internally. Type `help' to see this list.\n" @@ -482,7 +481,7 @@ msgid "history position" msgstr "ヒストリ位置" -#: builtins/history.def:365 +#: builtins/history.def:366 #, c-format msgid "%s: history expansion failed" msgstr "%s: ヒストリの展開に失敗しました" @@ -496,16 +495,16 @@ msgid "no other options allowed with `-x'" msgstr "`-x' は他のオプションを同時に使用できません" -#: builtins/kill.def:198 +#: builtins/kill.def:200 #, c-format msgid "%s: arguments must be process or job IDs" msgstr "%s: 引数はプロセスIDかジョブIDでなければいけません" -#: builtins/kill.def:261 +#: builtins/kill.def:263 msgid "Unknown error" msgstr "不明なエラーです" -#: builtins/let.def:95 builtins/let.def:120 expr.c:552 expr.c:567 +#: builtins/let.def:95 builtins/let.def:120 expr.c:583 expr.c:598 msgid "expression expected" msgstr "式が予期されます" @@ -514,64 +513,64 @@ msgid "%s: not an indexed array" msgstr "%s: インデックス配列ではありません" -#: builtins/mapfile.def:256 builtins/read.def:279 +#: builtins/mapfile.def:259 builtins/read.def:302 #, c-format msgid "%s: invalid file descriptor specification" msgstr "%s: 無効なファイル記述子指定です" -#: builtins/mapfile.def:264 builtins/read.def:286 +#: builtins/mapfile.def:267 builtins/read.def:309 #, c-format msgid "%d: invalid file descriptor: %s" -msgstr "%d: %s は無効なファイル記述子です" +msgstr "%d: 無効なファイル記述子: %s" -#: builtins/mapfile.def:273 builtins/mapfile.def:311 +#: builtins/mapfile.def:276 builtins/mapfile.def:314 #, c-format msgid "%s: invalid line count" msgstr "%s: 無効な行数です" -#: builtins/mapfile.def:284 +#: builtins/mapfile.def:287 #, c-format msgid "%s: invalid array origin" msgstr "%s: 無効な配列の原点です" -#: builtins/mapfile.def:301 +#: builtins/mapfile.def:304 #, c-format msgid "%s: invalid callback quantum" msgstr "%s: コールバックの quantum が無効です" -#: builtins/mapfile.def:333 +#: builtins/mapfile.def:336 msgid "empty array variable name" msgstr "空の配列変数名です" -#: builtins/mapfile.def:354 +#: builtins/mapfile.def:357 msgid "array variable support required" msgstr "配列変数のサポートが必要です" -#: builtins/printf.def:394 +#: builtins/printf.def:402 #, c-format msgid "`%s': missing format character" msgstr "`%s': 書式指定文字がありません" -#: builtins/printf.def:448 +#: builtins/printf.def:456 #, c-format msgid "`%c': invalid time format specification" msgstr "`%c': 無効な時間書式指定です" -#: builtins/printf.def:635 +#: builtins/printf.def:658 #, c-format msgid "`%c': invalid format character" msgstr "`%c': 無効な書式指定文字です" -#: builtins/printf.def:662 +#: builtins/printf.def:684 #, c-format msgid "warning: %s: %s" msgstr "警告: %s: %s" -#: builtins/printf.def:840 +#: builtins/printf.def:865 msgid "missing hex digit for \\x" msgstr "\\x 用の十六進数字がありません" -#: builtins/printf.def:855 +#: builtins/printf.def:880 #, c-format msgid "missing unicode digit for \\%c" msgstr "\\%c 用のユニコード数値がありません" @@ -580,19 +579,19 @@ msgid "no other directory" msgstr "他のディレクトリはありません" -#: builtins/pushd.def:462 +#: builtins/pushd.def:468 msgid "" msgstr "<カレントディレクトリがありません>" -#: builtins/pushd.def:506 +#: builtins/pushd.def:512 msgid "directory stack empty" msgstr "ディレクトリスタックが空です" -#: builtins/pushd.def:508 +#: builtins/pushd.def:514 msgid "directory stack index" msgstr "ディレクトリスタックのインデックス" -#: builtins/pushd.def:683 +#: builtins/pushd.def:689 msgid "" "Display the list of currently remembered directories. Directories\n" " find their way onto the list with the `pushd' command; you can get\n" @@ -634,7 +633,7 @@ " -N\tオプションなしで起動された場合にリストの末尾から数えて\n" "\tN番目の要素を表示します。開始番号は0です。" -#: builtins/pushd.def:705 +#: builtins/pushd.def:711 msgid "" "Adds a directory to the top of the directory stack, or rotates\n" " the stack, making the new top of the stack the current working\n" @@ -678,7 +677,7 @@ " \n" " `dirs' ビルトインコマンドでディレクトリスタックを表示します。" -#: builtins/pushd.def:730 +#: builtins/pushd.def:736 msgid "" "Removes entries from the directory stack. With no arguments, removes\n" " the top directory from the stack, and changes to the new top directory.\n" @@ -716,40 +715,40 @@ " \n" " `dirs' ビルトインコマンドでディレクトリスタックを表示します。" -#: builtins/read.def:252 +#: builtins/read.def:275 #, c-format msgid "%s: invalid timeout specification" msgstr "%s: 無効なタイムアウト指定です" -#: builtins/read.def:588 +#: builtins/read.def:678 #, c-format msgid "read error: %d: %s" msgstr "読み込みエラー: %d: %s" -#: builtins/return.def:73 +#: builtins/return.def:75 msgid "can only `return' from a function or sourced script" msgstr "`return' は関数または source されたスクリプト内のみで利用できます" -#: builtins/set.def:771 +#: builtins/set.def:782 msgid "cannot simultaneously unset a function and a variable" msgstr "変数と関数を同時に消去することはできません" -#: builtins/set.def:808 +#: builtins/set.def:826 #, c-format msgid "%s: cannot unset" msgstr "%s: 消去できません" -#: builtins/set.def:815 +#: builtins/set.def:843 #, c-format msgid "%s: cannot unset: readonly %s" msgstr "%s: 消去できません: %s は読み取り専用です" -#: builtins/set.def:826 +#: builtins/set.def:854 #, c-format msgid "%s: not an array variable" msgstr "%s: 配列変数ではありません" -#: builtins/setattr.def:186 +#: builtins/setattr.def:187 #, c-format msgid "%s: not a function" msgstr "%s: 関数ではありません" @@ -758,11 +757,11 @@ msgid "shift count" msgstr "シフト回数" -#: builtins/shopt.def:264 +#: builtins/shopt.def:279 msgid "cannot set and unset shell options simultaneously" msgstr "シェルオプションを同時に有効かつ無効にできません" -#: builtins/shopt.def:329 +#: builtins/shopt.def:346 #, c-format msgid "%s: invalid shell option name" msgstr "%s: 無効なシェルオプション名です" @@ -804,7 +803,7 @@ msgid "%s is a shell builtin\n" msgstr "%s はシェル組み込み関数です\n" -#: builtins/type.def:317 builtins/type.def:391 +#: builtins/type.def:317 builtins/type.def:393 #, c-format msgid "%s is %s\n" msgstr "%s は %s です\n" @@ -814,45 +813,45 @@ msgid "%s is hashed (%s)\n" msgstr "%s はハッシュされています (%s)\n" -#: builtins/ulimit.def:376 +#: builtins/ulimit.def:383 #, c-format msgid "%s: invalid limit argument" msgstr "%s: limit の無効な引数です" -#: builtins/ulimit.def:402 +#: builtins/ulimit.def:409 #, c-format msgid "`%c': bad command" msgstr "`%c': 誤ったコマンドです" -#: builtins/ulimit.def:431 +#: builtins/ulimit.def:438 #, c-format msgid "%s: cannot get limit: %s" msgstr "%s: limit を取得できません: %s" -#: builtins/ulimit.def:457 +#: builtins/ulimit.def:464 msgid "limit" msgstr "limit" -#: builtins/ulimit.def:469 builtins/ulimit.def:769 +#: builtins/ulimit.def:476 builtins/ulimit.def:776 #, c-format msgid "%s: cannot modify limit: %s" msgstr "%s: limit を変更できません : %s" -#: builtins/umask.def:118 +#: builtins/umask.def:114 msgid "octal number" msgstr "八進数" -#: builtins/umask.def:231 +#: builtins/umask.def:227 #, c-format msgid "`%c': invalid symbolic mode operator" msgstr "`%c': 無効なシンボリックモード演算子です" -#: builtins/umask.def:286 +#: builtins/umask.def:282 #, c-format msgid "`%c': invalid symbolic mode character" msgstr "`%c': 無効なシンボリックモード文字です" -#: error.c:90 error.c:321 error.c:323 error.c:325 +#: error.c:90 error.c:325 error.c:327 error.c:329 msgid " line " msgstr " 行 " @@ -866,298 +865,298 @@ msgid "Aborting..." msgstr "中止しています..." -#: error.c:406 +#: error.c:440 msgid "unknown command error" msgstr "不明なコマンドエラーです" -#: error.c:407 +#: error.c:441 msgid "bad command type" msgstr "誤ったコマンドタイプです" -#: error.c:408 +#: error.c:442 msgid "bad connector" msgstr "誤った接続です" -#: error.c:409 +#: error.c:443 msgid "bad jump" msgstr "誤ったジャンプです" -#: error.c:447 +#: error.c:481 #, c-format msgid "%s: unbound variable" msgstr "%s: 未割り当ての変数です" -#: eval.c:181 +#: eval.c:189 #, c-format msgid "timed out waiting for input: auto-logout\n" msgstr "入力待ちがタイムアウトしました: 自動ログアウト\n" -#: execute_cmd.c:504 +#: execute_cmd.c:512 #, c-format msgid "cannot redirect standard input from /dev/null: %s" msgstr "/dev/null から標準入力に対してリダイレクトできません: %s" -#: execute_cmd.c:1168 +#: execute_cmd.c:1233 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: `%c': 無効な書式文字です" -#: execute_cmd.c:2121 +#: execute_cmd.c:2287 msgid "pipe error" msgstr "パイプエラー" -#: execute_cmd.c:4640 +#: execute_cmd.c:4884 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: 制限されています: `/' をコマンド名の中に指定できません" -#: execute_cmd.c:4735 +#: execute_cmd.c:4973 #, c-format msgid "%s: command not found" msgstr "%s: コマンドが見つかりません" -#: execute_cmd.c:4959 +#: execute_cmd.c:5206 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: execute_cmd.c:4995 +#: execute_cmd.c:5243 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: 誤ったインタプリタです" -#: execute_cmd.c:5144 +#: execute_cmd.c:5404 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "fd %d を fd %d に複製できません" -#: expr.c:256 +#: expr.c:259 msgid "expression recursion level exceeded" msgstr "式の再帰可能レベルを越えました" -#: expr.c:280 +#: expr.c:283 msgid "recursion stack underflow" msgstr "再帰スタックがアンダーフローしました" -#: expr.c:422 +#: expr.c:431 msgid "syntax error in expression" msgstr "式に構文エラーがあります" -#: expr.c:463 +#: expr.c:475 msgid "attempted assignment to non-variable" msgstr "非変数に割り当てを行おうとしてます" -#: expr.c:486 expr.c:491 expr.c:807 +#: expr.c:495 expr.c:858 msgid "division by 0" msgstr "0 による除算です" -#: expr.c:517 +#: expr.c:542 msgid "bug: bad expassign token" msgstr "バグ: 誤った式のトークンです" -#: expr.c:564 +#: expr.c:595 msgid "`:' expected for conditional expression" msgstr "条件式には `:' が予期されます" -#: expr.c:832 +#: expr.c:919 msgid "exponent less than 0" msgstr "0より小さい指数部です" -#: expr.c:887 +#: expr.c:976 msgid "identifier expected after pre-increment or pre-decrement" msgstr "識別子は前置インクリメントまたは前置デクリメントが予期されます" -#: expr.c:910 +#: expr.c:1002 msgid "missing `)'" msgstr "`)' がありません" -#: expr.c:959 expr.c:1282 +#: expr.c:1053 expr.c:1390 msgid "syntax error: operand expected" msgstr "構文エラー: オペランドが予期されます" -#: expr.c:1284 +#: expr.c:1392 msgid "syntax error: invalid arithmetic operator" msgstr "構文エラー: 無効な計算演算子です" -#: expr.c:1308 +#: expr.c:1416 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s: %s (エラーのあるトークンは \"%s\")" -#: expr.c:1366 +#: expr.c:1474 msgid "invalid arithmetic base" msgstr "無効な基底の数値です" -#: expr.c:1386 +#: expr.c:1494 msgid "value too great for base" msgstr "基底の値が大きすぎます" -#: expr.c:1435 +#: expr.c:1543 #, c-format msgid "%s: expression error\n" msgstr "%s: 式のエラー\n" -#: general.c:61 +#: general.c:62 msgid "getcwd: cannot access parent directories" msgstr "getcwd: 親ディレクトリにアクセスできません" -#: input.c:94 subst.c:5082 +#: input.c:102 subst.c:5168 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "ファイル記述子(fd) %d を無遅延モードに再設定できません" -#: input.c:260 +#: input.c:271 #, c-format msgid "cannot allocate new file descriptor for bash input from fd %d" msgstr "新規ファイル記述子(fd) %d を bash の入力として割り当てられません" -#: input.c:268 +#: input.c:279 #, c-format msgid "save_bash_input: buffer already exists for new fd %d" msgstr "save_bash_input: 新規 fd %d のバッファはすでに存在します" -#: jobs.c:468 +#: jobs.c:471 msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp pipe" -#: jobs.c:889 +#: jobs.c:893 #, c-format msgid "forked pid %d appears in running job %d" msgstr "実行中のジョブ %2$d で fork した pid %1$d が出現しました" -#: jobs.c:1007 +#: jobs.c:1012 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "プロセスグループ %2$ld のジョブ %1$d を削除しています" -#: jobs.c:1112 +#: jobs.c:1117 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: プロセス %5ld (%s) が the_pipeline にあります" -#: jobs.c:1115 +#: jobs.c:1120 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) はまだ存在しているとマークされています" -#: jobs.c:1430 +#: jobs.c:1435 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: そのような pid は存在しません" -#: jobs.c:1445 +#: jobs.c:1450 #, c-format msgid "Signal %d" msgstr "シグナル %d" -#: jobs.c:1459 jobs.c:1484 +#: jobs.c:1464 jobs.c:1489 msgid "Done" msgstr "終了" -#: jobs.c:1464 siglist.c:123 +#: jobs.c:1469 siglist.c:123 msgid "Stopped" msgstr "停止" -#: jobs.c:1468 +#: jobs.c:1473 #, c-format msgid "Stopped(%s)" msgstr "停止 (%s)" -#: jobs.c:1472 +#: jobs.c:1477 msgid "Running" msgstr "実行中" -#: jobs.c:1486 +#: jobs.c:1491 #, c-format msgid "Done(%d)" msgstr "終了(%d)" -#: jobs.c:1488 +#: jobs.c:1493 #, c-format msgid "Exit %d" msgstr "終了 %d" -#: jobs.c:1491 +#: jobs.c:1496 msgid "Unknown status" msgstr "不明なステータス" -#: jobs.c:1578 +#: jobs.c:1583 #, c-format msgid "(core dumped) " msgstr "(コアダンプ) " -#: jobs.c:1597 +#: jobs.c:1602 #, c-format msgid " (wd: %s)" msgstr " (wd: %s)" -#: jobs.c:1805 +#: jobs.c:1819 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "子プロセス setpgid (%ld から %ld)" -#: jobs.c:2133 nojobs.c:585 +#: jobs.c:2138 nojobs.c:605 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld はこのシェルの子プロセスではありません" -#: jobs.c:2360 +#: jobs.c:2385 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: プロセス %ld の記録がありません" -#: jobs.c:2637 +#: jobs.c:2694 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: ジョブ %d は停止しています" -#: jobs.c:2859 +#: jobs.c:2986 #, c-format msgid "%s: job has terminated" msgstr "%s: ジョブは終了しました" -#: jobs.c:2868 +#: jobs.c:2995 #, c-format msgid "%s: job %d already in background" msgstr "%s: ジョブ %d はすでにバックグラウンドで動作しています" -#: jobs.c:3089 +#: jobs.c:3220 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: 不定のブロックを避けるために WNOHANG をオンにしました。" -#: jobs.c:3538 +#: jobs.c:3711 #, c-format msgid "%s: line %d: " msgstr "%s: %d 行: " -#: jobs.c:3552 nojobs.c:814 +#: jobs.c:3725 nojobs.c:843 #, c-format msgid " (core dumped)" msgstr " (コアダンプ)" -#: jobs.c:3564 jobs.c:3577 +#: jobs.c:3737 jobs.c:3750 #, c-format msgid "(wd now: %s)\n" msgstr "(wd now: %s)\n" -#: jobs.c:3609 +#: jobs.c:3782 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp が失敗しました" -#: jobs.c:3669 +#: jobs.c:3843 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: line discipline" -#: jobs.c:3679 +#: jobs.c:3853 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3707 +#: jobs.c:3874 jobs.c:3883 #, c-format msgid "cannot set terminal process group (%d)" msgstr "端末プロセスグループを設定できません (%d)" -#: jobs.c:3712 +#: jobs.c:3888 msgid "no job control in this shell" msgstr "このシェルではジョブ制御が無効になっています" @@ -1179,54 +1178,54 @@ msgid "unknown" msgstr "不明" -#: lib/malloc/malloc.c:797 +#: lib/malloc/malloc.c:801 msgid "malloc: block on free list clobbered" msgstr "malloc: free ブロックリストが壊れています" -#: lib/malloc/malloc.c:874 +#: lib/malloc/malloc.c:878 msgid "free: called with already freed block argument" msgstr "free: 既に free されたブロックを引数として呼び出されました" -#: lib/malloc/malloc.c:877 +#: lib/malloc/malloc.c:881 msgid "free: called with unallocated block argument" msgstr "free: 未割当のブロックを引数として呼び出されました" -#: lib/malloc/malloc.c:896 +#: lib/malloc/malloc.c:900 msgid "free: underflow detected; mh_nbytes out of range" msgstr "free: アンダーフローを検出しました。 mh_nbytes が範囲外です" -#: lib/malloc/malloc.c:902 +#: lib/malloc/malloc.c:906 msgid "free: start and end chunk sizes differ" msgstr "free: 開始と終了の塊の大きさが異なっています" -#: lib/malloc/malloc.c:1001 +#: lib/malloc/malloc.c:1005 msgid "realloc: called with unallocated block argument" msgstr "realloc: 未割当のブロックを引数として呼び出されました" -#: lib/malloc/malloc.c:1016 +#: lib/malloc/malloc.c:1020 msgid "realloc: underflow detected; mh_nbytes out of range" msgstr "realloc: アンダーフローを検出しました。 mh_nbytes が範囲外です" -#: lib/malloc/malloc.c:1022 +#: lib/malloc/malloc.c:1026 msgid "realloc: start and end chunk sizes differ" msgstr "realloc: 開始と終了の塊の大きさが異なっています" -#: lib/malloc/table.c:177 +#: lib/malloc/table.c:194 #, c-format msgid "register_alloc: alloc table is full with FIND_ALLOC?\n" msgstr "register_alloc: FIND_ALLOC で割り当てテーブルがいっぱいです\n" -#: lib/malloc/table.c:184 +#: lib/malloc/table.c:203 #, c-format msgid "register_alloc: %p already in table as allocated?\n" msgstr "register_alloc: %p 既にテーブル上では割り当てられています\n" -#: lib/malloc/table.c:220 +#: lib/malloc/table.c:256 #, c-format msgid "register_free: %p already in table as free?\n" msgstr "register_free: %p テーブル上では既に解放されています\n" -#: lib/sh/fmtulong.c:101 +#: lib/sh/fmtulong.c:102 msgid "invalid base" msgstr "無効な基底" @@ -1249,35 +1248,35 @@ msgid "network operations not supported" msgstr "ネットワーク操作はサポートされていません" -#: locale.c:192 +#: locale.c:200 #, c-format msgid "setlocale: LC_ALL: cannot change locale (%s)" msgstr "setlocale: LC_ALL: ロケールを変更できません (%s)" -#: locale.c:194 +#: locale.c:202 #, c-format msgid "setlocale: LC_ALL: cannot change locale (%s): %s" msgstr "setlocale: LC_ALL: ロケールを変更できません (%s): %s" -#: locale.c:247 +#: locale.c:259 #, c-format msgid "setlocale: %s: cannot change locale (%s)" msgstr "setlocale: %s: ロケールを変更できません (%s)" -#: locale.c:249 +#: locale.c:261 #, c-format msgid "setlocale: %s: cannot change locale (%s): %s" msgstr "setlocale: %s: ロケールを変更できません (%s): %s" -#: mailcheck.c:433 +#: mailcheck.c:439 msgid "You have mail in $_" msgstr "メールが $_ にあります" -#: mailcheck.c:458 +#: mailcheck.c:464 msgid "You have new mail in $_" msgstr "新しいメールが $_ にあります" -#: mailcheck.c:474 +#: mailcheck.c:480 #, c-format msgid "The mail in %s has been read\n" msgstr "%s のメールは既読です\n" @@ -1295,118 +1294,118 @@ msgid "syntax error: `((%s))'" msgstr "構文エラー: `((%s))'" -#: make_cmd.c:575 +#: make_cmd.c:578 #, c-format msgid "make_here_document: bad instruction type %d" msgstr "make_here_document: 誤った指定の種類 %d" -#: make_cmd.c:659 +#: make_cmd.c:662 #, c-format msgid "here-document at line %d delimited by end-of-file (wanted `%s')" msgstr "ヒアドキュメントの %d 行目でファイル終了 (EOF) に達しました (`%s' が必要)" -#: make_cmd.c:756 +#: make_cmd.c:759 #, c-format msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: リダイレクト指定 `%d' は範囲外です" -#: parse.y:3173 parse.y:3444 +#: parse.y:3278 parse.y:3561 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "対応する `%c' を探索中に予期しないファイル終了 (EOF) です" -#: parse.y:4025 +#: parse.y:4170 msgid "unexpected EOF while looking for `]]'" msgstr "`]]' を探索中に予期しないファイル終了 (EOF) です" -#: parse.y:4030 +#: parse.y:4175 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "条件式に構文エラー: 予期しないトークン `%s' です" -#: parse.y:4034 +#: parse.y:4179 msgid "syntax error in conditional expression" msgstr "条件式に構文エラーがあります" -#: parse.y:4112 +#: parse.y:4257 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "予期しないトークン `%s' です。`)' が予期されます" -#: parse.y:4116 +#: parse.y:4261 msgid "expected `)'" msgstr "`)' が予期されます" -#: parse.y:4144 +#: parse.y:4289 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "条件単項演算子に予期しない引数 `%s' です" -#: parse.y:4148 +#: parse.y:4293 msgid "unexpected argument to conditional unary operator" msgstr "条件単項演算子に予期しない引数です" -#: parse.y:4194 +#: parse.y:4339 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "`%s` は予期しないトークンです。条件二項演算子が予期されます" -#: parse.y:4198 +#: parse.y:4343 msgid "conditional binary operator expected" msgstr "条件二項演算子が予期されます" -#: parse.y:4220 +#: parse.y:4365 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "条件二項演算子に予期しない引数 `%s' です" -#: parse.y:4224 +#: parse.y:4369 msgid "unexpected argument to conditional binary operator" msgstr "条件二項演算子に予期しない引数です" -#: parse.y:4235 +#: parse.y:4380 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "条件コマンドに予期しないトークン `%c' があります" -#: parse.y:4238 +#: parse.y:4383 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "条件コマンドに予期しないトークン `%s' があります" -#: parse.y:4242 +#: parse.y:4387 #, c-format msgid "unexpected token %d in conditional command" msgstr "条件コマンドに予期しないトークン %d があります" -#: parse.y:5566 +#: parse.y:5737 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "予期しないトークン `%s' 周辺に構文エラーがあります" -#: parse.y:5584 +#: parse.y:5755 #, c-format msgid "syntax error near `%s'" msgstr "`%s' 周辺に構文エラーがあります" -#: parse.y:5594 +#: parse.y:5765 msgid "syntax error: unexpected end of file" msgstr "構文エラー: 予期しないファイル終了 (EOF) です" -#: parse.y:5594 +#: parse.y:5765 msgid "syntax error" msgstr "構文エラー" -#: parse.y:5656 +#: parse.y:5827 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "シェルから脱出するには \"%s\" を使用してください。\n" -#: parse.y:5818 +#: parse.y:5989 msgid "unexpected EOF while looking for matching `)'" msgstr "対応する `)' を探索中に予期しないファイル終了(EOF)です" -#: pcomplete.c:1030 +#: pcomplete.c:1094 #, c-format msgid "completion: function `%s' not found" msgstr "completion: 関数 `%s' が見つかりません" @@ -1416,90 +1415,90 @@ msgid "progcomp_insert: %s: NULL COMPSPEC" msgstr "progcomp_insert: %s: NULL COMPSPEC" -#: print_cmd.c:296 +#: print_cmd.c:300 #, c-format msgid "print_command: bad connector `%d'" msgstr "print_command: 誤った接続 `%d'" -#: print_cmd.c:368 +#: print_cmd.c:373 #, c-format msgid "xtrace_set: %d: invalid file descriptor" msgstr "xtrace_set: %d: 無効なファイル記述子です" -#: print_cmd.c:373 +#: print_cmd.c:378 msgid "xtrace_set: NULL file pointer" msgstr "xtrace_set: NULL ファイルポインタです" -#: print_cmd.c:377 +#: print_cmd.c:382 #, c-format msgid "xtrace fd (%d) != fileno xtrace fp (%d)" msgstr "xtrace fd (%d) != fileno xtrace fp (%d)" -#: print_cmd.c:1478 +#: print_cmd.c:1518 #, c-format msgid "cprintf: `%c': invalid format character" msgstr "cprintf: `%c': 無効な書式文字です" -#: redir.c:122 +#: redir.c:123 redir.c:170 msgid "file descriptor out of range" msgstr "ファイル記述子が範囲外です" -#: redir.c:178 +#: redir.c:177 #, c-format msgid "%s: ambiguous redirect" msgstr "%s: 曖昧なリダイレクトです" -#: redir.c:182 +#: redir.c:181 #, c-format msgid "%s: cannot overwrite existing file" msgstr "%s: 存在するファイルを上書きできません" -#: redir.c:187 +#: redir.c:186 #, c-format msgid "%s: restricted: cannot redirect output" msgstr "%s: 制限されています: 出力をリダイレクト出来ません" -#: redir.c:192 +#: redir.c:191 #, c-format msgid "cannot create temp file for here-document: %s" msgstr "ヒアドキュメント用一時ファイルを作成できません: %s" -#: redir.c:196 +#: redir.c:195 #, c-format msgid "%s: cannot assign fd to variable" msgstr "%s: ファイル記述子 (fd) を変数に設定することはできません" -#: redir.c:548 +#: redir.c:582 msgid "/dev/(tcp|udp)/host/port not supported without networking" msgstr "ネットワークが無効な場合 /dev/(tcp|udp)/host/port はサポートされません" -#: redir.c:818 redir.c:930 redir.c:993 redir.c:1136 +#: redir.c:861 redir.c:973 redir.c:1034 redir.c:1199 msgid "redirection error: cannot duplicate fd" msgstr "リダイレクトエラー: ファイル記述子を複製できません" -#: shell.c:333 +#: shell.c:339 msgid "could not find /tmp, please create!" msgstr "/tmp が見つかりません。作成してください!" -#: shell.c:337 +#: shell.c:343 msgid "/tmp must be a valid directory name" msgstr "/tmp は有効なディレクトリ名でなければいけません" -#: shell.c:884 +#: shell.c:890 #, c-format msgid "%c%c: invalid option" msgstr "%c%c: 無効なオプション" -#: shell.c:1652 +#: shell.c:1682 msgid "I have no name!" msgstr "私は名前がありません!" -#: shell.c:1795 +#: shell.c:1827 #, c-format msgid "GNU bash, version %s-(%s)\n" msgstr "GNU bash, バージョン %s-(%s)\n" -#: shell.c:1796 +#: shell.c:1828 #, c-format msgid "" "Usage:\t%s [GNU long option] [option] ...\n" @@ -1508,40 +1507,40 @@ "使用法:\t%s [GNU long option] [option] ...\n" "\t%s [GNU long option] [option] script-file ...\n" -#: shell.c:1798 +#: shell.c:1830 msgid "GNU long options:\n" msgstr "GNU 形式の長いオプション:\n" -#: shell.c:1802 +#: shell.c:1834 msgid "Shell options:\n" msgstr "シェルオプション:\n" -#: shell.c:1803 +#: shell.c:1801 msgid "\t-irsD or -c command or -O shopt_option\t\t(invocation only)\n" msgstr "\t-irsD または -c command または -O shopt_option\t\t(起動時のみ)\n" -#: shell.c:1818 +#: shell.c:1850 #, c-format msgid "\t-%s or -o option\n" msgstr "\t-%s または -o option\n" -#: shell.c:1824 +#: shell.c:1856 #, c-format msgid "Type `%s -c \"help set\"' for more information about shell options.\n" msgstr "シェルオプションの詳細については `%s -c \"help set\"'と入力してください。\n" -#: shell.c:1825 +#: shell.c:1857 #, c-format msgid "" "Type `%s -c help' for more information about shell builtin commands.\n" msgstr "シェル組み込みコマンドについては `%s -c help' と入力してください。\n" -#: shell.c:1826 +#: shell.c:1858 #, c-format msgid "Use the `bashbug' command to report bugs.\n" msgstr "バグ報告をする場合は `bashbug' コマンドを使用してください。\n" -#: sig.c:638 +#: sig.c:691 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: 無効な操作です" @@ -1715,190 +1714,190 @@ msgid "Unknown Signal #%d" msgstr "不明なシグナル番号 %d" -#: subst.c:1333 subst.c:1502 +#: subst.c:1362 subst.c:1520 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "誤った代入: 閉じる `%s' が %s に存在しません" -#: subst.c:2795 +#: subst.c:2847 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: リストを配列要素に割り当てできません" -#: subst.c:4979 subst.c:4995 +#: subst.c:5065 subst.c:5081 msgid "cannot make pipe for process substitution" msgstr "プロセス代入ではパイプを作成できません" -#: subst.c:5027 +#: subst.c:5113 msgid "cannot make child for process substitution" msgstr "プロセス代入では子プロセスを作成できません" -#: subst.c:5072 +#: subst.c:5158 #, c-format msgid "cannot open named pipe %s for reading" msgstr "名前付きパイプ %s を読み込み用に開けません" -#: subst.c:5074 +#: subst.c:5160 #, c-format msgid "cannot open named pipe %s for writing" msgstr "名前付きパイプ %s を書き込み用に開けません" -#: subst.c:5092 +#: subst.c:5178 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "名前付きパイプ %s をファイル記述子(fd) %d として複製できません" -#: subst.c:5284 +#: subst.c:5376 msgid "cannot make pipe for command substitution" msgstr "コマンド代入ではパイプを作成できません" -#: subst.c:5322 +#: subst.c:5414 msgid "cannot make child for command substitution" msgstr "コマンド代入では子プロセスを作成できません" -#: subst.c:5339 +#: subst.c:5433 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: パイプを fd 1 として複製できません" -#: subst.c:5859 +#: subst.c:6048 #, c-format msgid "%s: parameter null or not set" msgstr "%s: パラメータが null または設定されていません" -#: subst.c:6125 subst.c:6140 +#: subst.c:6320 subst.c:6335 #, c-format msgid "%s: substring expression < 0" msgstr "%s: substring expression < 0" -#: subst.c:7271 +#: subst.c:7506 #, c-format msgid "%s: bad substitution" msgstr "%s: 誤った代入です" -#: subst.c:7347 +#: subst.c:7583 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: この方法で割当はできません" -#: subst.c:7684 +#: subst.c:7917 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "将来のバージョンのシェルでは強制的に数値代入として評価されます" -#: subst.c:8149 +#: subst.c:8421 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "誤った代入: %s に閉じる \"`\" がありません" -#: subst.c:9036 +#: subst.c:9322 #, c-format msgid "no match: %s" msgstr "一致しません: %s" -#: test.c:146 +#: test.c:147 msgid "argument expected" msgstr "引数が予期されます" -#: test.c:155 +#: test.c:156 #, c-format msgid "%s: integer expression expected" msgstr "%s: 整数の式が予期されます" -#: test.c:263 +#: test.c:264 msgid "`)' expected" msgstr "`)' が予期されます" -#: test.c:265 +#: test.c:266 #, c-format msgid "`)' expected, found %s" msgstr "`)' が予期されますが、見つかったのは %s です" -#: test.c:280 test.c:698 test.c:701 +#: test.c:281 test.c:742 test.c:745 #, c-format msgid "%s: unary operator expected" msgstr "%s: 単項演算子が予期されます" -#: test.c:449 test.c:741 +#: test.c:468 test.c:785 #, c-format msgid "%s: binary operator expected" msgstr "%s: 二項演算子が予期されます" -#: test.c:816 +#: test.c:860 msgid "missing `]'" msgstr "`]'がありません" -#: trap.c:207 +#: trap.c:217 msgid "invalid signal number" msgstr "無効なシグナル番号" -#: trap.c:337 +#: trap.c:371 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: trap_list[%d] に誤った値があります: %p" -#: trap.c:341 +#: trap.c:375 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: シグナルハンドラーは SIG_DFLです。, %d (%s) を自身に再送します。" -#: trap.c:393 +#: trap.c:428 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: 誤ったシグナル %d" -#: variables.c:363 +#: variables.c:382 #, c-format msgid "error importing function definition for `%s'" msgstr "`%s' の関数定義をインポート中にエラーが発生しました" -#: variables.c:755 +#: variables.c:780 #, c-format msgid "shell level (%d) too high, resetting to 1" msgstr "シェルレベル (%d) は高すぎます。1に再設定されました" -#: variables.c:1932 +#: variables.c:2228 msgid "make_local_variable: no function context at current scope" msgstr "make_local_variable: 現在のスコープは関数コンテキストではありません" -#: variables.c:3182 +#: variables.c:3646 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: 現在のスコープは関数コンテキストではありません" -#: variables.c:3427 +#: variables.c:3891 #, c-format msgid "%s has null exportstr" msgstr "%s は null の exportstr を持っています" -#: variables.c:3432 variables.c:3441 +#: variables.c:3896 variables.c:3905 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "%2$s に対する exportstr で %1$d は無効な文字です" -#: variables.c:3447 +#: variables.c:3911 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s に対する exportstr に `=' がありません" -#: variables.c:3891 +#: variables.c:4344 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: shell_variables の先頭です。関数コンテキストではありません" -#: variables.c:3904 +#: variables.c:4357 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: global_variables コンテキストではありません" -#: variables.c:3978 +#: variables.c:4431 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: shell_variables の先頭です。一時環境スコープではありません" -#: variables.c:4786 +#: variables.c:5257 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s: %s: ファイルとして開くことができません" -#: variables.c:4791 +#: variables.c:5262 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s: %s: トレースファイル記述子として無効な値です" @@ -1907,14 +1906,14 @@ msgid "Copyright (C) 2011 Free Software Foundation, Inc." msgstr "Copyright (C) 2011 Free Software Foundation, Inc." -#: version.c:47 +#: version.c:47 version2.c:47 msgid "" "License GPLv3+: GNU GPL version 3 or later " "\n" msgstr "" "ライセンス GPLv3+: GNU GPL バージョン 3 またはそれ以降 \n" -#: version.c:86 version2.c:83 +#: version.c:86 version2.c:86 #, c-format msgid "GNU bash, version %s (%s)\n" msgstr "GNU bash, バージョン %s (%s)\n" @@ -2433,7 +2432,7 @@ " bind は解釈できないオプションが渡された場合およびエラーが発生した場合\n" " を除き 0 を返します。" -#: builtins.c:326 +#: builtins.c:328 msgid "" "Exit for, while, or until loops.\n" " \n" @@ -2451,7 +2450,7 @@ " 終了ステータス:\n" " N が1未満の場合を除き、終了ステータスは 0 です。" -#: builtins.c:338 +#: builtins.c:340 msgid "" "Resume for, while, or until loops.\n" " \n" @@ -2469,7 +2468,7 @@ " 終了ステータス:\n" " N が1未満の場合を除き、終了ステータスは 0 です。" -#: builtins.c:350 +#: builtins.c:352 msgid "" "Execute shell builtins.\n" " \n" @@ -2492,7 +2491,7 @@ " シェル組み込みコマンドの終了ステータスを返します。シェル組み込みコマ\n" " ンドが無い場合は false を返します。" -#: builtins.c:365 +#: builtins.c:367 msgid "" "Return the context of the current subroutine call.\n" " \n" @@ -2581,7 +2580,7 @@ " ディレクトリを変更した場合、および -P が使用されている時に $PWD が正しく\n" " 設定された場合は 0、それ以外は 0 以外の値です。" -#: builtins.c:414 +#: builtins.c:422 msgid "" "Print the name of the current working directory.\n" " \n" @@ -2609,7 +2608,7 @@ " 無効なオプションまたはカレントディレクトリを読み込めない場合を除き\n" " 0を返します。" -#: builtins.c:431 +#: builtins.c:439 msgid "" "Null command.\n" " \n" @@ -2625,7 +2624,7 @@ " 終了ステータス:\n" " 常に成功です。" -#: builtins.c:442 +#: builtins.c:450 msgid "" "Return a successful result.\n" " \n" @@ -2637,7 +2636,7 @@ " 終了ステータス:\n" " 常に成功です。" -#: builtins.c:451 +#: builtins.c:459 msgid "" "Return an unsuccessful result.\n" " \n" @@ -2649,7 +2648,7 @@ " 終了ステータス:\n" " 常に失敗です。" -#: builtins.c:460 +#: builtins.c:468 msgid "" "Execute a simple command or display information about commands.\n" " \n" @@ -2753,7 +2752,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられたかエラーが発生しない限り成功を返します。" -#: builtins.c:517 +#: builtins.c:527 msgid "" "Set variable values and attributes.\n" " \n" @@ -2763,7 +2762,7 @@ " \n" " 旧式です。`help declare'を参照してください。" -#: builtins.c:525 +#: builtins.c:520 msgid "" "Define local variables.\n" " \n" @@ -2789,7 +2788,7 @@ " 無効なオプションが与えられる、エラーが発生する、またはシェルが関数を実行できない\n" " 場合を除き成功を返します。" -#: builtins.c:542 +#: builtins.c:537 msgid "" "Write arguments to the standard output.\n" " \n" @@ -2845,7 +2844,7 @@ " 終了ステータス:\n" " 書き込みエラーが発生しない限り成功を返します。" -#: builtins.c:576 +#: builtins.c:588 msgid "" "Write arguments to the standard output.\n" " \n" @@ -2867,7 +2866,7 @@ " 終了ステータス:\n" " 書き込みエラーが発生しない限り成功を返します。" -#: builtins.c:591 +#: builtins.c:603 msgid "" "Enable and disable shell builtins.\n" " \n" @@ -2917,7 +2916,7 @@ " 終了ステータス:\n" " NAME が組み込み関数ではないかエラーが発生しない限り成功を返します。" -#: builtins.c:619 +#: builtins.c:631 msgid "" "Execute arguments as a shell command.\n" " \n" @@ -2937,7 +2936,7 @@ " コマンドの終了ステータスを返します。コマンドが null の場合は成功を\n" " 返します。" -#: builtins.c:631 +#: builtins.c:643 msgid "" "Parse option arguments.\n" " \n" @@ -3014,7 +3013,7 @@ " オプションが見つかった場合に成功を返します。オプションの終わり\n" " に到達するかエラーが発生した時に失敗を返します。" -#: builtins.c:673 +#: builtins.c:685 msgid "" "Replace the shell with the given command.\n" " \n" @@ -3053,7 +3052,7 @@ " 終了ステータス:\n" " COMMAND が見つからないかリダイレクトエラーが発生しない限り成功を返します。" -#: builtins.c:694 +#: builtins.c:706 msgid "" "Exit the shell.\n" " \n" @@ -3065,7 +3064,7 @@ " 終了ステータス N でシェルを終了します。 N を指定しない場合は\n" " 最後に実行したコマンドの終了ステータスになります。" -#: builtins.c:703 +#: builtins.c:715 msgid "" "Exit a login shell.\n" " \n" @@ -3078,7 +3077,7 @@ " 終了ステータス N でログインシェルを終了します。実行したのがログインシェル\n" " 内で無い場合はエラーを返します。" -#: builtins.c:713 +#: builtins.c:725 msgid "" "Display or execute commands from the history list.\n" " \n" @@ -3131,7 +3130,7 @@ " 実行したコマンドのステータスまたは成功が帰ります。エラーが発生した場合は 0 \n" " 以外の値になります。" -#: builtins.c:743 +#: builtins.c:755 msgid "" "Move job to the foreground.\n" " \n" @@ -3153,7 +3152,7 @@ " フォアグラウンドになったコマンドのステータスを返します。または、エラーが\n" " 発生した時に失敗を返します。" -#: builtins.c:758 +#: builtins.c:770 msgid "" "Move jobs to the background.\n" " \n" @@ -3175,7 +3174,7 @@ " 終了ステータス:\n" " ジョブ制御が有効になっていないかエラーが発生しない限り成功を返します。" -#: builtins.c:772 +#: builtins.c:767 msgid "" "Remember or display program locations.\n" " \n" @@ -3217,7 +3216,7 @@ " 終了ステータス:\n" " NAME が見つからないか、無効なオプションが与えられない限り成功を返します。" -#: builtins.c:797 +#: builtins.c:809 msgid "" "Display information about builtin commands.\n" " \n" @@ -3256,7 +3255,7 @@ " 終了ステータス:\n" " PATTERN が見つからないか無効なオプションが与えられない限り成功を返します。" -#: builtins.c:821 +#: builtins.c:833 msgid "" "Display or manipulate the history list.\n" " \n" @@ -3319,7 +3318,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:857 +#: builtins.c:852 msgid "" "Display status of jobs.\n" " \n" @@ -3362,7 +3361,7 @@ " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。\n" " もし -x が使用された場合、COMMAND の終了ステータスを返します。" -#: builtins.c:884 +#: builtins.c:896 msgid "" "Remove jobs from current shell.\n" " \n" @@ -3392,7 +3391,7 @@ " 終了ステータス:\n" " 無効なオプションか JOBSPEC が与えられない限り成功を返します。" -#: builtins.c:903 +#: builtins.c:915 msgid "" "Send a signal to a job.\n" " \n" @@ -3432,7 +3431,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:926 +#: builtins.c:938 msgid "" "Evaluate arithmetic expressions.\n" " \n" @@ -3515,7 +3514,7 @@ " ARG の最終的な評価値が 0 の場合 let は 1 を返します。それ以外の場合は\n" " let は 0 を返します。" -#: builtins.c:971 +#: builtins.c:966 msgid "" "Read a line from the standard input and split it into fields.\n" " \n" @@ -3599,7 +3598,7 @@ " ファイル終了(EOF)、読み込みタイムアウト、-u に無効なファイル記述子が与え\n" " られた場合を除き0を返します。" -#: builtins.c:1014 +#: builtins.c:1028 msgid "" "Return from a shell function.\n" " \n" @@ -3783,7 +3782,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられない限り成功を返します。" -#: builtins.c:1112 +#: builtins.c:1104 msgid "" "Unset values and attributes of shell variables and functions.\n" " \n" @@ -3818,7 +3817,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるか NAME が読み取り専用の場合を除き成功を返します。" -#: builtins.c:1132 +#: builtins.c:1148 msgid "" "Set export attribute for shell variables.\n" " \n" @@ -3853,7 +3852,7 @@ " 無効なオプションが与えられるか、無効な NAME が与えられない限り成功\n" " を返します。" -#: builtins.c:1151 +#: builtins.c:1143 msgid "" "Mark shell variables as unchangeable.\n" " \n" @@ -3890,7 +3889,7 @@ " 無効なオプションが与えられるか、与えられた NAME が無効な場合を除き成功\n" " を返します。" -#: builtins.c:1172 +#: builtins.c:1189 msgid "" "Shift positional parameters.\n" " \n" @@ -3908,7 +3907,7 @@ " 終了ステータス:\n" " Nが負の値または $# より大きい場合を除き成功を返します。" -#: builtins.c:1184 builtins.c:1199 +#: builtins.c:1201 builtins.c:1216 msgid "" "Execute commands from a file in the current shell.\n" " \n" @@ -3932,7 +3931,7 @@ " FILENAME で最後に実行したコマンドのステータスを返します。FILENAME が\n" " 読み込めなかった場合は失敗を返します。" -#: builtins.c:1215 +#: builtins.c:1232 msgid "" "Suspend shell execution.\n" " \n" @@ -4109,7 +4108,7 @@ " 式 EXPR の評価値が真(true)の時に成功を返します。EXPR の評価値が偽(false) または\n" " 引数が無効な場合に失敗を返します。" -#: builtins.c:1311 +#: builtins.c:1329 msgid "" "Evaluate conditional expression.\n" " \n" @@ -4121,7 +4120,7 @@ " これは test 組み込み関数と同義語です。ただし、最後の引数に開始の`['と一致\n" " するように文字`]'を与えなければいけません。" -#: builtins.c:1320 +#: builtins.c:1338 msgid "" "Display process times.\n" " \n" @@ -4140,7 +4139,7 @@ " 終了ステータス:\n" " 常に成功を返します。" -#: builtins.c:1332 +#: builtins.c:1350 msgid "" "Trap signals and other events.\n" " \n" @@ -4215,7 +4214,7 @@ " 終了ステータス:\n" " SIGSPEC が無効か、無効なオプションを与えられない限り成功を返します。" -#: builtins.c:1368 +#: builtins.c:1386 msgid "" "Display information about command type.\n" " \n" @@ -4271,7 +4270,7 @@ " 全ての NAME が見つかった場合に成功を返します。どれかが見つからなかった場合\n" " は失敗を返します。" -#: builtins.c:1399 +#: builtins.c:1383 msgid "" "Modify shell resource limits.\n" " \n" @@ -4353,7 +4352,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:1444 +#: builtins.c:1465 msgid "" "Display or set file mode mask.\n" " \n" @@ -4385,7 +4384,7 @@ " 終了ステータス:\n" " MODE が無効か、無効なオプションが与えられない限り成功を返します。" -#: builtins.c:1464 +#: builtins.c:1448 msgid "" "Wait for job completion and return exit status.\n" " \n" @@ -4412,7 +4411,7 @@ " ID の終了ステータスを返します。IDが無効であるか、無効なオプションが\n" " 与えられた場合には失敗を返します。" -#: builtins.c:1482 +#: builtins.c:1466 msgid "" "Wait for process completion and return exit status.\n" " \n" @@ -4435,7 +4434,7 @@ " IDの終了ステータスを返します。IDが無効か、無効なオプションが与えられた\n" " 場合はエラーを返します。" -#: builtins.c:1497 +#: builtins.c:1521 msgid "" "Execute commands for each member in a list.\n" " \n" @@ -4456,7 +4455,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1511 +#: builtins.c:1535 msgid "" "Arithmetic for loop.\n" " \n" @@ -4486,7 +4485,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1529 +#: builtins.c:1553 msgid "" "Select words from a list and execute commands.\n" " \n" @@ -4521,7 +4520,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1550 +#: builtins.c:1574 msgid "" "Report time consumed by pipeline's execution.\n" " \n" @@ -4549,7 +4548,7 @@ " 終了ステータス:\n" " PIPELINE の戻り値が終了ステータスとなります。" -#: builtins.c:1567 +#: builtins.c:1591 msgid "" "Execute commands based on pattern matching.\n" " \n" @@ -4567,7 +4566,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1579 +#: builtins.c:1603 msgid "" "Execute commands based on conditional.\n" " \n" @@ -4599,7 +4598,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドの終了ステータスを返します。" -#: builtins.c:1596 +#: builtins.c:1620 msgid "" "Execute commands as long as a test succeeds.\n" " \n" @@ -4617,7 +4616,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1608 +#: builtins.c:1632 msgid "" "Execute commands as long as a test does not succeed.\n" " \n" @@ -4635,7 +4634,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1620 +#: builtins.c:1644 msgid "" "Create a coprocess named NAME.\n" " \n" @@ -4657,7 +4656,7 @@ " 終了ステータス:\n" " COMMAND の終了ステータスを返します。" -#: builtins.c:1634 +#: builtins.c:1658 msgid "" "Define shell function.\n" " \n" @@ -4680,7 +4679,7 @@ " 終了ステータス:\n" " NAME が読み取り専用でない限り成功を返します。" -#: builtins.c:1648 +#: builtins.c:1672 msgid "" "Group commands as a unit.\n" " \n" @@ -4698,7 +4697,7 @@ " 終了ステータス:\n" " 最後に実行したコマンドのステータスを返します。" -#: builtins.c:1660 +#: builtins.c:1684 msgid "" "Resume job in foreground.\n" " \n" @@ -4721,7 +4720,7 @@ " 終了ステータス:\n" " 再開されたジョブの終了ステータスを返します。" -#: builtins.c:1675 +#: builtins.c:1699 msgid "" "Evaluate arithmetic expression.\n" " \n" @@ -4739,7 +4738,7 @@ " 終了ステータス:\n" " EXPRESSION の評価値が 0 の場合は 1、それ以外は 0 を返します。" -#: builtins.c:1687 +#: builtins.c:1711 msgid "" "Execute conditional command.\n" " \n" @@ -4791,7 +4790,7 @@ " 終了ステータス:\n" " EXPRESSION の値に基づいて 0 または 1 を返します。" -#: builtins.c:1713 +#: builtins.c:1737 msgid "" "Common shell variable names and usage.\n" " \n" @@ -4892,7 +4891,7 @@ " HISTIGNORE\tヒストリ一覧に保存されるコマンドを決める時に使用される\n" " \t\tコロン (:) で区切られたパターンの一覧。\n" -#: builtins.c:1770 +#: builtins.c:1794 msgid "" "Add directories to stack.\n" " \n" @@ -4951,7 +4950,7 @@ " 無効な引数が与えられるかディレクトリ変更が失敗しない限り成功を\n" " 返します。" -#: builtins.c:1804 +#: builtins.c:1828 msgid "" "Remove directories from stack.\n" " \n" @@ -5001,7 +5000,7 @@ " 無効な引数が与えられるかディレクトリ変更が失敗しない限り成功を\n" " 返します。" -#: builtins.c:1834 +#: builtins.c:1858 msgid "" "Display directory stack.\n" " \n" @@ -5053,7 +5052,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:1863 +#: builtins.c:1887 msgid "" "Set and unset shell options.\n" " \n" @@ -5140,7 +5139,7 @@ " 終了ステータス:\n" " 無効な引数が与えられるか、書き込み、代入エラーが発生しない限り成功を返します。" -#: builtins.c:1913 +#: builtins.c:1942 msgid "" "Specify how arguments are to be completed by Readline.\n" " \n" @@ -5187,7 +5186,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:1941 +#: builtins.c:1970 msgid "" "Display possible completions depending on the options.\n" " \n" @@ -5208,7 +5207,7 @@ " 終了ステータス:\n" " 無効なオプションが与えられるかエラーが発生しない限り成功を返します。" -#: builtins.c:1956 +#: builtins.c:1985 msgid "" "Modify or display completion options.\n" " \n" @@ -5262,7 +5261,7 @@ " 無効なオプションが与えられるか、 NAME が補完指定として定義されていない場合\n" " を除き、成功を返します。" -#: builtins.c:1986 +#: builtins.c:2015 msgid "" "Read lines from the standard input into an indexed array variable.\n" " \n" @@ -5330,7 +5329,7 @@ " 無効なオプションが与えられる、配列が読み取り専用、またはインデックス型配列で無い\n" " 場合を除き成功を返します。" -#: builtins.c:2020 +#: builtins.c:2049 msgid "" "Read lines from a file into an array variable.\n" " \n" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bfd.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bfd.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bfd.po 2014-07-09 09:08:27.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bfd.po 2015-02-19 15:11:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:38+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:33+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: aout-adobe.c:127 @@ -544,7 +544,7 @@ msgid "Dwarf Error: Offset (%lu) greater than or equal to %s size (%lu)." msgstr "Dwarf エラー: オフセット (%lu) が %s のサイズ (%lu) 以上です。" -#: dwarf2.c:949 +#: dwarf2.c:940 #, c-format msgid "Dwarf Error: Invalid or unhandled FORM value: %u." msgstr "Dwarf エラー: 無効または扱えない FORM 値です: %u" @@ -976,7 +976,7 @@ msgid "Invalid TARGET2 relocation type '%s'." msgstr "無効な TARGET2 再配置型 '%s' です。" -#: elf32-arm.c:6933 +#: elf32-arm.c:6890 msgid "" "%B(%s): warning: interworking not enabled.\n" " first occurrence: %B: thumb call to arm" @@ -1130,7 +1130,7 @@ msgid "error: fp16 format mismatch between %B and %B" msgstr "エラー: fp16 の形式が %B と %B の間で一致しません" -#: elf32-arm.c:11675 +#: elf32-arm.c:11621 msgid "DIV usage mismatch between %B and %B" msgstr "DIV の使用法が %B と %B の間で一致しません" @@ -2185,12 +2185,12 @@ msgid "%B(%A): internal error: unknown error" msgstr "%B(%A): 内部エラー: 不明なエラーです" -#: elf32-rx.c:3004 +#: elf32-rx.c:2940 #, c-format msgid " [64-bit doubles]" msgstr " [64 ビット倍精度浮動小数]" -#: elf32-rx.c:3006 +#: elf32-rx.c:2942 #, c-format msgid " [dsp]" msgstr " [dsp]" @@ -2942,7 +2942,7 @@ msgid "%P: stubs don't match calculated size\n" msgstr "" -#: elf64-ppc.c:11756 +#: elf64-ppc.c:11469 #, c-format msgid "" "linker stubs in %u group%s\n" @@ -3147,7 +3147,7 @@ msgid "%B: undefined reference to symbol '%s'" msgstr "%B: シンボル '%s' への未定義参照です" -#: elflink.c:4466 +#: elflink.c:4492 msgid "" "note: '%s' is defined in DSO %B so try adding it to the linker command line" msgstr "注: '%s' は DSO %B 内で定義されているのでリンカのコマンドラインに追加してみてください" @@ -3285,7 +3285,7 @@ msgid "MIPS16 and microMIPS functions cannot call each other" msgstr "" -#: elfxx-mips.c:5856 +#: elfxx-mips.c:5628 msgid "" "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider " "recompiling with interlinking enabled." @@ -3337,15 +3337,15 @@ msgid "%s: illegal section name `%s'" msgstr "%s: 不正なセクション名 `%s' です" -#: elfxx-mips.c:13645 elfxx-mips.c:13671 +#: elfxx-mips.c:12417 elfxx-mips.c:12443 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float" msgstr "警告: %B は -msingle-float を使用しています。%B は -mdouble-float を使用しています" -#: elfxx-mips.c:13657 elfxx-mips.c:13713 +#: elfxx-mips.c:12429 elfxx-mips.c:12485 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64" msgstr "警告: %B は -msingle-float を使用しています。%B は -mips32r2 -mfp64 を使用しています" -#: elfxx-mips.c:13683 elfxx-mips.c:13719 +#: elfxx-mips.c:12455 elfxx-mips.c:12491 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64" msgstr "警告: %B は -mdouble-float を使用しています。%B は -mips32r2 -mfp64 を使用しています" @@ -3594,7 +3594,7 @@ "bfd_mach_o_read_symtab_symbol: シンボル \"%s\" が無効なセクション %d (最大 %lu) に指定されています: " "未定義に設定されました" -#: mach-o.c:1900 +#: mach-o.c:1764 #, c-format msgid "" "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' " @@ -3615,12 +3615,12 @@ msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols" msgstr "bfd_mach_o_read_symtab_symbols: シンボル用のメモリを配置できません" -#: mach-o.c:2014 +#: mach-o.c:1874 #, c-format msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu" msgstr "bfd_mach_o_read_dysymtab_symbol: %lu バイト (位置 %lu) を読み込めません" -#: mach-o.c:2734 +#: mach-o.c:2556 #, c-format msgid "unable to read unknown load command 0x%lx" msgstr "不明なコマンド 0x%lx をロードできません" @@ -3635,41 +3635,41 @@ msgid "unknown header byte-order value 0x%lx" msgstr "不明なヘッダバイト順の値 0x%lx です" -#: mach-o.c:3577 +#: mach-o.c:3402 msgid "Mach-O header:\n" msgstr "Mach-O ヘッダ:\n" -#: mach-o.c:3578 +#: mach-o.c:3403 #, c-format msgid " magic : %08lx\n" msgstr " マジック番号: %08lx\n" -#: mach-o.c:3579 +#: mach-o.c:3404 #, c-format msgid " cputype : %08lx (%s)\n" msgstr " CPU タイプ : %08lx (%s)\n" -#: mach-o.c:3581 +#: mach-o.c:3406 #, c-format msgid " cpusubtype: %08lx\n" msgstr " CPU サブタイプ: %08lx\n" -#: mach-o.c:3582 +#: mach-o.c:3407 #, c-format msgid " filetype : %08lx (%s)\n" msgstr " ファイルタイプ: %08lx (%s)\n" -#: mach-o.c:3585 +#: mach-o.c:3410 #, c-format msgid " ncmds : %08lx (%lu)\n" msgstr " コマンド数 : %08lx (%lu)\n" -#: mach-o.c:3586 +#: mach-o.c:3411 #, c-format msgid " sizeofcmds: %08lx\n" msgstr " コマンドサイズ: %08lx\n" -#: mach-o.c:3587 +#: mach-o.c:3412 #, c-format msgid " flags : %08lx (" msgstr " フラグ : %08lx (" @@ -3678,16 +3678,16 @@ msgid ")\n" msgstr ")\n" -#: mach-o.c:3590 +#: mach-o.c:3415 #, c-format msgid " reserved : %08x\n" msgstr " 予約 : %08x\n" -#: mach-o.c:3600 +#: mach-o.c:3425 msgid "Segments and Sections:\n" msgstr "セグメントとセクション:\n" -#: mach-o.c:3601 +#: mach-o.c:3426 msgid " #: Segment name Section name Address\n" msgstr " #: セグメント名 セクション名 アドレス\n" @@ -3830,7 +3830,7 @@ #: mmo.c:3081 #, c-format msgid "%s: internal error, internal register section %s had contents\n" -msgstr "" +msgstr "%s: 内部エラー、内部レジスタセクション %s は内容を持ちます\n" #: mmo.c:3132 #, c-format @@ -4049,12 +4049,12 @@ #: vms-alpha.c:1762 #, c-format msgid "bad section index in %s" -msgstr "" +msgstr "%s のセクションインデックスが不正です" #: vms-alpha.c:1775 #, c-format msgid "unsupported STA cmd %s" -msgstr "" +msgstr "サポートされていない STA cmd %s です" #. Insert field. #. Unsigned shift. @@ -4064,7 +4064,7 @@ #: vms-alpha.c:1951 vms-alpha.c:1982 vms-alpha.c:2229 #, c-format msgid "%s: not supported" -msgstr "" +msgstr "%s: サポートされていません" #: vms-alpha.c:1957 #, c-format @@ -5888,7 +5888,7 @@ msgid " Code Address Reference Fixups:\n" msgstr " コードアドレス参照修正:\n" -#: vms-alpha.c:7852 +#: vms-alpha.c:7849 #, c-format msgid " Linkage Pairs Referece Fixups:\n" msgstr "" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/binutils.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/binutils.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/binutils.po 2014-07-09 09:08:28.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/binutils.po 2015-02-19 15:11:48.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: binutils 2.21.53\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2011-10-25 11:20+0100\n" -"PO-Revision-Date: 2014-04-16 15:07+0000\n" +"PO-Revision-Date: 2015-02-10 22:10+0000\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:39+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:34+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: addr2line.c:81 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bison.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bison.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bison.po 2014-07-09 09:08:28.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bison.po 2015-02-19 15:11:48.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:43+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:37+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: src/complain.c:322 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bison-runtime.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bison-runtime.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bison-runtime.po 2014-07-09 09:08:28.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bison-runtime.po 2015-02-19 15:11:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:43+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:37+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: data/glr.c:770 data/yacc.c:643 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bootloader.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bootloader.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bootloader.po 2014-07-09 09:08:44.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bootloader.po 2015-02-19 15:12:03.000000000 +0000 @@ -12,8 +12,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:12+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:07+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: \n" #. ok button label diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/byobu.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/byobu.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/byobu.po 2014-07-09 09:08:50.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/byobu.po 2015-02-19 15:12:08.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 14:23+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:54+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bzr.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bzr.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/bzr.po 2014-07-09 09:08:43.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/bzr.po 2015-02-19 15:12:02.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 12:59+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:58+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: bzrlib/add.py:93 msgid "skipping {0} (larger than {1} of {2} bytes)" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cinder.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cinder.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cinder.po 2014-07-09 09:08:56.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cinder.po 2015-02-19 15:12:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 15:27+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 13:39+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Generated-By: Babel 1.3\n" #: cinder/context.py:63 @@ -23,707 +23,707 @@ msgid "Arguments dropped when creating context: %s" msgstr "" -#: cinder/context.py:107 +#: cinder/context.py:102 #, python-format msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r" msgstr "" -#: cinder/exception.py:66 cinder/brick/exception.py:31 +#: cinder/exception.py:67 cinder/brick/exception.py:31 msgid "An unknown exception occurred." msgstr "" -#: cinder/exception.py:88 +#: cinder/exception.py:93 msgid "Exception in string format operation" msgstr "" -#: cinder/exception.py:107 +#: cinder/exception.py:118 #, python-format msgid "" "Bad or unexpected response from the storage volume backend API: %(data)s" msgstr "" -#: cinder/exception.py:112 +#: cinder/exception.py:123 #, python-format msgid "Volume driver reported an error: %(message)s" msgstr "" -#: cinder/exception.py:116 +#: cinder/exception.py:127 #, python-format msgid "Backup driver reported an error: %(message)s" msgstr "" -#: cinder/exception.py:120 +#: cinder/exception.py:131 #, python-format msgid "Connection to glance failed: %(reason)s" msgstr "" -#: cinder/exception.py:124 +#: cinder/exception.py:135 msgid "Not authorized." msgstr "" -#: cinder/exception.py:129 +#: cinder/exception.py:140 msgid "User does not have admin privileges" msgstr "" -#: cinder/exception.py:133 +#: cinder/exception.py:144 #, python-format msgid "Policy doesn't allow %(action)s to be performed." msgstr "" -#: cinder/exception.py:137 +#: cinder/exception.py:148 #, python-format msgid "Not authorized for image %(image_id)s." msgstr "" -#: cinder/exception.py:141 +#: cinder/exception.py:152 msgid "Volume driver not ready." msgstr "" -#: cinder/exception.py:145 cinder/brick/exception.py:77 +#: cinder/exception.py:156 cinder/brick/exception.py:77 msgid "Unacceptable parameters." msgstr "" -#: cinder/exception.py:150 +#: cinder/exception.py:161 #, python-format msgid "Invalid snapshot: %(reason)s" msgstr "" -#: cinder/exception.py:154 +#: cinder/exception.py:165 #, python-format msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s." msgstr "" -#: cinder/exception.py:159 +#: cinder/exception.py:170 #, python-format msgid "Volume %(volume_id)s is still attached, detach volume first." msgstr "" -#: cinder/exception.py:163 +#: cinder/exception.py:174 msgid "Failed to load data into json format" msgstr "" -#: cinder/exception.py:167 +#: cinder/exception.py:178 msgid "The results are invalid." msgstr "" -#: cinder/exception.py:171 +#: cinder/exception.py:182 #, python-format msgid "Invalid input received: %(reason)s" msgstr "" -#: cinder/exception.py:175 +#: cinder/exception.py:186 #, python-format msgid "Invalid volume type: %(reason)s" msgstr "" -#: cinder/exception.py:179 +#: cinder/exception.py:190 #, python-format msgid "Invalid volume: %(reason)s" msgstr "" -#: cinder/exception.py:183 +#: cinder/exception.py:194 #, python-format msgid "Invalid content type %(content_type)s." msgstr "" -#: cinder/exception.py:187 +#: cinder/exception.py:198 #, python-format msgid "Invalid host: %(reason)s" msgstr "" -#: cinder/exception.py:193 cinder/brick/exception.py:84 +#: cinder/exception.py:204 cinder/brick/exception.py:84 #, python-format msgid "%(err)s" msgstr "" -#: cinder/exception.py:197 +#: cinder/exception.py:208 #, python-format msgid "Invalid auth key: %(reason)s" msgstr "" -#: cinder/exception.py:201 +#: cinder/exception.py:212 #, python-format msgid "" "Value \"%(value)s\" is not valid for configuration option \"%(option)s\"" msgstr "" -#: cinder/exception.py:206 +#: cinder/exception.py:217 msgid "Service is unavailable at this time." msgstr "" -#: cinder/exception.py:210 +#: cinder/exception.py:221 #, python-format msgid "Image %(image_id)s is unacceptable: %(reason)s" msgstr "" -#: cinder/exception.py:214 +#: cinder/exception.py:225 #, python-format msgid "The device in the path %(path)s is unavailable: %(reason)s" msgstr "" -#: cinder/exception.py:218 +#: cinder/exception.py:229 #, python-format msgid "Expected a uuid but received %(uuid)s." msgstr "" -#: cinder/exception.py:222 cinder/brick/exception.py:71 +#: cinder/exception.py:246 cinder/brick/exception.py:71 msgid "Resource could not be found." msgstr "" -#: cinder/exception.py:228 +#: cinder/exception.py:252 #, python-format msgid "Volume %(volume_id)s could not be found." msgstr "" -#: cinder/exception.py:232 +#: cinder/exception.py:256 #, python-format msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s." msgstr "" -#: cinder/exception.py:237 +#: cinder/exception.py:261 #, python-format msgid "" "Volume %(volume_id)s has no administration metadata with key " "%(metadata_key)s." msgstr "" -#: cinder/exception.py:242 +#: cinder/exception.py:266 #, python-format msgid "Invalid metadata: %(reason)s" msgstr "" -#: cinder/exception.py:246 +#: cinder/exception.py:270 #, python-format msgid "Invalid metadata size: %(reason)s" msgstr "" -#: cinder/exception.py:250 +#: cinder/exception.py:274 #, python-format msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s." msgstr "" -#: cinder/exception.py:255 +#: cinder/exception.py:279 #, python-format msgid "Volume type %(volume_type_id)s could not be found." msgstr "" -#: cinder/exception.py:259 +#: cinder/exception.py:283 #, python-format msgid "Volume type with name %(volume_type_name)s could not be found." msgstr "" -#: cinder/exception.py:264 +#: cinder/exception.py:293 #, python-format msgid "" "Volume Type %(volume_type_id)s has no extra specs with key " "%(extra_specs_key)s." msgstr "" -#: cinder/exception.py:269 +#: cinder/exception.py:298 #, python-format msgid "" "Volume Type %(volume_type_id)s deletion is not allowed with volumes present " "with the type." msgstr "" -#: cinder/exception.py:274 +#: cinder/exception.py:303 #, python-format msgid "Snapshot %(snapshot_id)s could not be found." msgstr "" -#: cinder/exception.py:278 +#: cinder/exception.py:311 #, python-format msgid "deleting volume %(volume_name)s that has snapshot" msgstr "" -#: cinder/exception.py:282 +#: cinder/exception.py:315 #, python-format msgid "deleting snapshot %(snapshot_name)s that has dependent volumes" msgstr "" -#: cinder/exception.py:287 +#: cinder/exception.py:320 #, python-format msgid "No target id found for volume %(volume_id)s." msgstr "" -#: cinder/exception.py:291 +#: cinder/exception.py:324 #, python-format msgid "Invalid image href %(image_href)s." msgstr "" -#: cinder/exception.py:295 +#: cinder/exception.py:328 #, python-format msgid "Image %(image_id)s could not be found." msgstr "" -#: cinder/exception.py:299 +#: cinder/exception.py:332 #, python-format msgid "Service %(service_id)s could not be found." msgstr "" -#: cinder/exception.py:303 +#: cinder/exception.py:336 #, python-format msgid "Host %(host)s could not be found." msgstr "" -#: cinder/exception.py:307 +#: cinder/exception.py:340 #, python-format msgid "Scheduler Host Filter %(filter_name)s could not be found." msgstr "" -#: cinder/exception.py:311 +#: cinder/exception.py:344 #, python-format msgid "Scheduler Host Weigher %(weigher_name)s could not be found." msgstr "" -#: cinder/exception.py:315 +#: cinder/exception.py:348 #, python-format msgid "Could not find binary %(binary)s on host %(host)s." msgstr "" -#: cinder/exception.py:319 +#: cinder/exception.py:352 #, python-format msgid "Invalid reservation expiration %(expire)s." msgstr "" -#: cinder/exception.py:323 +#: cinder/exception.py:356 #, python-format msgid "" "Change would make usage less than 0 for the following resources: %(unders)s" msgstr "" -#: cinder/exception.py:328 +#: cinder/exception.py:361 msgid "Quota could not be found" msgstr "" -#: cinder/exception.py:332 +#: cinder/exception.py:365 #, python-format msgid "Unknown quota resources %(unknown)s." msgstr "" -#: cinder/exception.py:336 +#: cinder/exception.py:369 #, python-format msgid "Quota for project %(project_id)s could not be found." msgstr "" -#: cinder/exception.py:340 +#: cinder/exception.py:373 #, python-format msgid "Quota class %(class_name)s could not be found." msgstr "" -#: cinder/exception.py:344 +#: cinder/exception.py:377 #, python-format msgid "Quota usage for project %(project_id)s could not be found." msgstr "" -#: cinder/exception.py:348 +#: cinder/exception.py:381 #, python-format msgid "Quota reservation %(uuid)s could not be found." msgstr "" -#: cinder/exception.py:352 +#: cinder/exception.py:385 #, python-format msgid "Quota exceeded for resources: %(overs)s" msgstr "" -#: cinder/exception.py:356 +#: cinder/exception.py:389 #, python-format msgid "File %(file_path)s could not be found." msgstr "" -#: cinder/exception.py:365 +#: cinder/exception.py:398 #, python-format msgid "Volume Type %(id)s already exists." msgstr "" -#: cinder/exception.py:369 +#: cinder/exception.py:407 #, python-format msgid "Volume type encryption for type %(type_id)s already exists." msgstr "" -#: cinder/exception.py:373 +#: cinder/exception.py:411 #, python-format msgid "Volume type encryption for type %(type_id)s does not exist." msgstr "" -#: cinder/exception.py:377 +#: cinder/exception.py:415 #, python-format msgid "Malformed message body: %(reason)s" msgstr "" -#: cinder/exception.py:381 +#: cinder/exception.py:419 #, python-format msgid "Could not find config at %(path)s" msgstr "" -#: cinder/exception.py:385 +#: cinder/exception.py:423 #, python-format msgid "Could not find parameter %(param)s" msgstr "" -#: cinder/exception.py:389 +#: cinder/exception.py:427 #, python-format msgid "Could not load paste app '%(name)s' from %(path)s" msgstr "" -#: cinder/exception.py:393 +#: cinder/exception.py:431 #, python-format msgid "No valid host was found. %(reason)s" msgstr "" -#: cinder/exception.py:402 +#: cinder/exception.py:440 #, python-format msgid "Quota exceeded: code=%(code)s" msgstr "" -#: cinder/exception.py:409 +#: cinder/exception.py:447 #, python-format msgid "" "Requested volume or snapshot exceeds allowed Gigabytes quota. Requested " "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed." msgstr "" -#: cinder/exception.py:415 +#: cinder/exception.py:459 #, python-format msgid "Maximum number of volumes allowed (%(allowed)d) exceeded" msgstr "" -#: cinder/exception.py:419 +#: cinder/exception.py:463 #, python-format msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded" msgstr "" -#: cinder/exception.py:423 +#: cinder/exception.py:471 #, python-format msgid "Detected more than one volume with name %(vol_name)s" msgstr "" -#: cinder/exception.py:427 +#: cinder/exception.py:475 #, python-format msgid "" "Cannot create volume_type with name %(name)s and specs %(extra_specs)s" msgstr "" -#: cinder/exception.py:432 +#: cinder/exception.py:484 #, python-format msgid "Unknown or unsupported command %(cmd)s" msgstr "" -#: cinder/exception.py:436 +#: cinder/exception.py:488 #, python-format msgid "Malformed response to command %(cmd)s: %(reason)s" msgstr "" -#: cinder/exception.py:440 +#: cinder/exception.py:492 #, python-format msgid "Operation failed with status=%(status)s. Full dump: %(data)s" msgstr "" -#: cinder/exception.py:444 +#: cinder/exception.py:500 #, python-format msgid "" "Glance metadata cannot be updated, key %(key)s exists for volume id " "%(volume_id)s" msgstr "" -#: cinder/exception.py:449 +#: cinder/exception.py:505 #, python-format msgid "Glance metadata for volume/snapshot %(id)s cannot be found." msgstr "" -#: cinder/exception.py:453 +#: cinder/exception.py:509 #, python-format msgid "Failed to export for volume: %(reason)s" msgstr "" -#: cinder/exception.py:457 +#: cinder/exception.py:517 #, python-format msgid "Failed to create metadata for volume: %(reason)s" msgstr "" -#: cinder/exception.py:461 +#: cinder/exception.py:521 #, python-format msgid "Failed to update metadata for volume: %(reason)s" msgstr "" -#: cinder/exception.py:465 +#: cinder/exception.py:525 #, python-format msgid "Failed to copy metadata to volume: %(reason)s" msgstr "" -#: cinder/exception.py:469 +#: cinder/exception.py:529 #, python-format msgid "Failed to copy image to volume: %(reason)s" msgstr "" -#: cinder/exception.py:473 +#: cinder/exception.py:533 msgid "Invalid Ceph args provided for backup rbd operation" msgstr "" -#: cinder/exception.py:477 +#: cinder/exception.py:537 msgid "An error has occurred during backup operation" msgstr "" -#: cinder/exception.py:481 +#: cinder/exception.py:541 msgid "Unsupported backup metadata version requested" msgstr "" -#: cinder/exception.py:485 +#: cinder/exception.py:549 msgid "Metadata backup already exists for this volume" msgstr "" -#: cinder/exception.py:489 +#: cinder/exception.py:553 msgid "Backup RBD operation failed" msgstr "" -#: cinder/exception.py:493 +#: cinder/exception.py:561 #, python-format msgid "Backup %(backup_id)s could not be found." msgstr "" -#: cinder/exception.py:497 +#: cinder/exception.py:565 msgid "Failed to identify volume backend." msgstr "" -#: cinder/exception.py:501 +#: cinder/exception.py:569 #, python-format msgid "Invalid backup: %(reason)s" msgstr "" -#: cinder/exception.py:505 +#: cinder/exception.py:573 #, python-format msgid "Connection to swift failed: %(reason)s" msgstr "" -#: cinder/exception.py:509 +#: cinder/exception.py:577 #, python-format msgid "Transfer %(transfer_id)s could not be found." msgstr "" -#: cinder/exception.py:513 +#: cinder/exception.py:581 #, python-format msgid "Volume migration failed: %(reason)s" msgstr "" -#: cinder/exception.py:517 +#: cinder/exception.py:585 #, python-format msgid "SSH command injection detected: %(command)s" msgstr "" -#: cinder/exception.py:521 +#: cinder/exception.py:589 #, python-format msgid "QoS Specs %(specs_id)s already exists." msgstr "" -#: cinder/exception.py:525 +#: cinder/exception.py:593 #, python-format msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s." msgstr "" -#: cinder/exception.py:530 +#: cinder/exception.py:598 #, python-format msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s." msgstr "" -#: cinder/exception.py:535 +#: cinder/exception.py:603 #, python-format msgid "No such QoS spec %(specs_id)s." msgstr "" -#: cinder/exception.py:539 +#: cinder/exception.py:607 #, python-format msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s." msgstr "" -#: cinder/exception.py:544 +#: cinder/exception.py:612 #, python-format msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s." msgstr "" -#: cinder/exception.py:549 +#: cinder/exception.py:617 #, python-format msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s." msgstr "" -#: cinder/exception.py:554 +#: cinder/exception.py:622 #, python-format msgid "Invalid qos specs: %(reason)s" msgstr "" -#: cinder/exception.py:558 +#: cinder/exception.py:626 #, python-format msgid "QoS Specs %(specs_id)s is still associated with entities." msgstr "" -#: cinder/exception.py:562 +#: cinder/exception.py:630 #, python-format msgid "key manager error: %(reason)s" msgstr "" -#: cinder/exception.py:566 +#: cinder/exception.py:634 #, python-format msgid "" "Manage existing volume failed due to invalid backend reference " "%(existing_ref)s: %(reason)s" msgstr "" -#: cinder/exception.py:571 +#: cinder/exception.py:649 #, python-format msgid "Manage existing volume failed due to volume type mismatch: %(reason)s" msgstr "" -#: cinder/exception.py:578 +#: cinder/exception.py:664 msgid "Coraid Cinder Driver exception." msgstr "" -#: cinder/exception.py:582 +#: cinder/exception.py:668 msgid "Failed to encode json data." msgstr "" -#: cinder/exception.py:586 +#: cinder/exception.py:672 msgid "Login on ESM failed." msgstr "" -#: cinder/exception.py:590 +#: cinder/exception.py:676 msgid "Relogin on ESM failed." msgstr "" -#: cinder/exception.py:594 +#: cinder/exception.py:680 #, python-format msgid "Group with name \"%(group_name)s\" not found." msgstr "" -#: cinder/exception.py:598 +#: cinder/exception.py:684 #, python-format msgid "ESM configure request failed: %(reason)s" msgstr "" -#: cinder/exception.py:602 +#: cinder/exception.py:688 #, python-format msgid "Coraid ESM not available with reason: %(reason)s" msgstr "" -#: cinder/exception.py:607 +#: cinder/exception.py:698 msgid "Zadara Cinder Driver exception." msgstr "" -#: cinder/exception.py:611 +#: cinder/exception.py:702 #, python-format msgid "Unable to create server object for initiator %(name)s" msgstr "" -#: cinder/exception.py:615 +#: cinder/exception.py:706 #, python-format msgid "Unable to find server object for initiator %(name)s" msgstr "" -#: cinder/exception.py:619 +#: cinder/exception.py:710 msgid "Unable to find any active VPSA controller" msgstr "" -#: cinder/exception.py:623 +#: cinder/exception.py:714 #, python-format msgid "Failed to retrieve attachments for volume %(name)s" msgstr "" -#: cinder/exception.py:627 +#: cinder/exception.py:718 #, python-format msgid "Invalid attachment info for volume %(name)s: %(reason)s" msgstr "" -#: cinder/exception.py:631 +#: cinder/exception.py:722 #, python-format msgid "Bad HTTP response status %(status)s" msgstr "" -#: cinder/exception.py:636 +#: cinder/exception.py:727 msgid "Bad response from SolidFire API" msgstr "" -#: cinder/exception.py:640 +#: cinder/exception.py:731 msgid "SolidFire Cinder Driver exception" msgstr "" -#: cinder/exception.py:644 +#: cinder/exception.py:735 #, python-format msgid "Error in SolidFire API response: data=%(data)s" msgstr "" -#: cinder/exception.py:648 +#: cinder/exception.py:739 #, python-format msgid "Unable to locate account %(account_name)s on Solidfire device" msgstr "" -#: cinder/exception.py:654 +#: cinder/exception.py:749 #, python-format msgid "Invalid 3PAR Domain: %(err)s" msgstr "" -#: cinder/exception.py:659 +#: cinder/exception.py:767 msgid "Unknown NFS exception" msgstr "" -#: cinder/exception.py:663 +#: cinder/exception.py:771 msgid "No mounted NFS shares found" msgstr "" -#: cinder/exception.py:667 cinder/exception.py:680 +#: cinder/exception.py:762 cinder/exception.py:775 cinder/exception.py:801 #, python-format msgid "There is no share which can host %(volume_size)sG" msgstr "" -#: cinder/exception.py:672 +#: cinder/exception.py:793 msgid "Unknown Gluster exception" msgstr "" -#: cinder/exception.py:676 +#: cinder/exception.py:797 msgid "No mounted Gluster shares found" msgstr "" -#: cinder/exception.py:684 +#: cinder/exception.py:513 #, python-format msgid "Failed to remove export for volume %(volume)s: %(reason)s" msgstr "" -#: cinder/exception.py:689 +#: cinder/exception.py:806 msgid "HP MSA Volume Driver exception" msgstr "" -#: cinder/exception.py:693 +#: cinder/exception.py:810 #, python-format msgid "VDisk doesn't exist (%(vdisk)s)" msgstr "" -#: cinder/exception.py:697 +#: cinder/exception.py:814 msgid "Unable to connect to MSA array" msgstr "" -#: cinder/exception.py:701 +#: cinder/exception.py:818 #, python-format msgid "Not enough space on VDisk (%(vdisk)s)" msgstr "" -#: cinder/exception.py:706 +#: cinder/exception.py:823 #, python-format msgid "Fibre Channel connection control failure: %(reason)s" msgstr "" -#: cinder/exception.py:710 +#: cinder/exception.py:827 #, python-format msgid "Fibre Channel Zone operation failed: %(reason)s" msgstr "" -#: cinder/exception.py:714 +#: cinder/exception.py:831 #, python-format msgid "Fibre Channel SAN Lookup failure: %(reason)s" msgstr "" -#: cinder/exception.py:718 +#: cinder/exception.py:835 cinder/exception.py:839 #, python-format msgid "Fibre Channel Zoning CLI error: %(reason)s" msgstr "" -#: cinder/exception.py:722 +#: cinder/exception.py:843 msgid "NetApp Cinder Driver exception." msgstr "" @@ -752,40 +752,40 @@ msgid "Created reservations %s" msgstr "" -#: cinder/quota.py:770 +#: cinder/quota.py:783 #, python-format msgid "Failed to commit reservations %s" msgstr "" -#: cinder/quota.py:790 +#: cinder/quota.py:803 #, python-format msgid "Failed to roll back reservations %s" msgstr "" -#: cinder/quota.py:874 +#: cinder/quota.py:891 cinder/quota.py:915 msgid "Cannot register resource" msgstr "" -#: cinder/quota.py:877 +#: cinder/quota.py:894 cinder/quota.py:918 msgid "Cannot register resources" msgstr "" -#: cinder/quota_utils.py:46 +#: cinder/quota_utils.py:47 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume - " "(%(d_consumed)dG of %(d_quota)dG already consumed)" msgstr "" -#: cinder/quota_utils.py:56 cinder/transfer/api.py:168 -#: cinder/volume/flows/api/create_volume.py:520 +#: cinder/quota_utils.py:57 cinder/transfer/api.py:174 +#: cinder/volume/flows/api/create_volume.py:586 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d volumes " "already consumed)" msgstr "" -#: cinder/service.py:100 +#: cinder/service.py:139 #, python-format msgid "Starting %(topic)s node (version %(version_string)s)" msgstr "" @@ -795,7 +795,7 @@ msgid "Creating RPC server for service %s" msgstr "" -#: cinder/service.py:144 +#: cinder/service.py:185 #, python-format msgid "" "Report interval must be less than service down time. Current config " @@ -804,7 +804,7 @@ "%(new_down_time)s" msgstr "" -#: cinder/service.py:212 +#: cinder/service.py:253 msgid "Service killed that has no database entry" msgstr "データベースにエントリの存在しないサービスを終了します。" @@ -812,11 +812,11 @@ msgid "The service database object disappeared, Recreating it." msgstr "サービスデータベースオブジェクトが消滅しました。再作成します。" -#: cinder/service.py:265 +#: cinder/service.py:306 msgid "Recovered model server connection!" msgstr "モデルサーバへの接続を復旧しました。" -#: cinder/service.py:271 +#: cinder/service.py:311 msgid "model server went away" msgstr "モデルサーバが消滅しました。" @@ -827,7 +827,7 @@ "Input value ignored." msgstr "" -#: cinder/service.py:368 +#: cinder/service.py:420 msgid "serve() can only be called once" msgstr "" @@ -841,26 +841,26 @@ msgid "%s : FLAG SET " msgstr "" -#: cinder/utils.py:97 +#: cinder/utils.py:96 #, python-format msgid "Can not translate %s to integer." msgstr "" -#: cinder/utils.py:128 +#: cinder/utils.py:135 #, python-format msgid "May specify only one of %s" msgstr "" -#: cinder/utils.py:213 +#: cinder/ssh_utils.py:135 msgid "Specify a password or private_key" msgstr "" -#: cinder/utils.py:229 +#: cinder/ssh_utils.py:151 #, python-format msgid "Error connecting via ssh: %s" msgstr "" -#: cinder/utils.py:413 +#: cinder/utils.py:292 #, python-format msgid "Invalid backend: %s" msgstr "不正なバックエンドです: %s" @@ -875,48 +875,48 @@ msgid "Could not remove tmpdir: %s" msgstr "" -#: cinder/utils.py:760 +#: cinder/utils.py:618 #, python-format msgid "Volume driver %s not initialized" msgstr "" -#: cinder/utils.py:782 +#: cinder/utils.py:687 #, python-format msgid "%s is not a string or unicode" msgstr "" -#: cinder/utils.py:786 +#: cinder/utils.py:691 #, python-format msgid "%(name)s has a minimum character requirement of %(min_length)s." msgstr "" -#: cinder/utils.py:791 +#: cinder/utils.py:696 #, python-format msgid "%(name)s has more than %(max_length)s characters." msgstr "" -#: cinder/wsgi.py:136 cinder/openstack/common/sslutils.py:50 +#: cinder/wsgi.py:157 #, python-format msgid "Unable to find cert_file : %s" msgstr "" -#: cinder/wsgi.py:139 cinder/openstack/common/sslutils.py:53 +#: cinder/wsgi.py:161 #, python-format msgid "Unable to find ca_file : %s" msgstr "" -#: cinder/wsgi.py:142 cinder/openstack/common/sslutils.py:56 +#: cinder/wsgi.py:164 #, python-format msgid "Unable to find key_file : %s" msgstr "" -#: cinder/wsgi.py:145 cinder/openstack/common/sslutils.py:59 +#: cinder/openstack/common/sslutils.py:59 msgid "" "When running server in SSL mode, you must specify both a cert_file and " "key_file option value in your configuration file" msgstr "" -#: cinder/wsgi.py:178 +#: cinder/wsgi.py:184 #, python-format msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" msgstr "" @@ -926,47 +926,49 @@ msgid "Started %(name)s on %(host)s:%(port)s" msgstr "" -#: cinder/wsgi.py:235 +#: cinder/wsgi.py:254 msgid "Stopping WSGI server." msgstr "" -#: cinder/wsgi.py:253 +#: cinder/wsgi.py:272 msgid "WSGI server has stopped." msgstr "" -#: cinder/wsgi.py:322 +#: cinder/wsgi.py:364 msgid "You must implement __call__" msgstr "__call__ を実装しなければなりません" -#: cinder/api/auth.py:26 +#: cinder/api/auth.py:27 msgid "" "cinder.api.auth:CinderKeystoneContext is deprecated. Please use " "cinder.api.middleware.auth:CinderKeystoneContext instead." msgstr "" -#: cinder/api/auth.py:34 +#: cinder/api/auth.py:35 msgid "" "cinder.api.auth:pipeline_factory is deprecated. Please use " "cinder.api.middleware.auth:pipeline_factory instead." msgstr "" -#: cinder/api/common.py:92 cinder/api/common.py:126 cinder/volume/api.py:282 +#: cinder/api/common.py:95 cinder/api/common.py:129 +#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:392 msgid "limit param must be an integer" msgstr "" -#: cinder/api/common.py:95 cinder/api/common.py:130 cinder/volume/api.py:279 +#: cinder/api/common.py:98 cinder/api/common.py:133 +#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:389 msgid "limit param must be positive" msgstr "" -#: cinder/api/common.py:120 +#: cinder/api/common.py:123 msgid "offset param must be an integer" msgstr "" -#: cinder/api/common.py:134 +#: cinder/api/common.py:137 msgid "offset param must be positive" msgstr "" -#: cinder/api/common.py:162 +#: cinder/api/common.py:165 #, python-format msgid "marker [%s] not found" msgstr "" @@ -976,11 +978,11 @@ msgid "href %s does not contain version" msgstr "" -#: cinder/api/extensions.py:183 +#: cinder/api/extensions.py:184 msgid "Initializing extension manager." msgstr "" -#: cinder/api/extensions.py:198 +#: cinder/api/extensions.py:199 #, python-format msgid "Loaded extension: %s" msgstr "" @@ -1010,7 +1012,7 @@ msgid "Ext updated: %s" msgstr "" -#: cinder/api/extensions.py:243 +#: cinder/api/extensions.py:244 #, python-format msgid "Exception loading extension: %s" msgstr "" @@ -1025,58 +1027,58 @@ msgid "Calling extension factory %s" msgstr "" -#: cinder/api/extensions.py:277 +#: cinder/api/extensions.py:278 #, python-format msgid "osapi_volume_extension is set to deprecated path: %s" msgstr "" -#: cinder/api/extensions.py:279 +#: cinder/api/extensions.py:280 #, python-format msgid "" "Please set your flag or cinder.conf settings for osapi_volume_extension to: " "%s" msgstr "" -#: cinder/api/extensions.py:288 +#: cinder/api/extensions.py:289 #, python-format msgid "Failed to load extension %(ext_factory)s: %(exc)s" msgstr "" -#: cinder/api/extensions.py:357 +#: cinder/api/extensions.py:345 #, python-format msgid "Failed to load extension %(classpath)s: %(exc)s" msgstr "" -#: cinder/api/extensions.py:382 +#: cinder/api/extensions.py:370 #, python-format msgid "Failed to load extension %(ext_name)s: %(exc)s" msgstr "" -#: cinder/api/sizelimit.py:25 +#: cinder/api/sizelimit.py:26 msgid "" "cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use " "cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead" msgstr "" -#: cinder/api/xmlutil.py:266 +#: cinder/api/xmlutil.py:271 msgid "element is not a child" msgstr "" -#: cinder/api/xmlutil.py:463 +#: cinder/api/xmlutil.py:473 msgid "root element selecting a list" msgstr "" -#: cinder/api/xmlutil.py:786 +#: cinder/api/xmlutil.py:796 #, python-format msgid "" "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s" msgstr "" -#: cinder/api/xmlutil.py:907 +#: cinder/api/xmlutil.py:917 msgid "subclasses must implement construct()!" msgstr "" -#: cinder/api/contrib/admin_actions.py:82 +#: cinder/api/contrib/admin_actions.py:84 #, python-format msgid "Updating %(resource)s '%(id)s' with '%(update)r'" msgstr "" @@ -1091,7 +1093,7 @@ msgid "delete called for member %s" msgstr "" -#: cinder/api/contrib/backups.py:176 +#: cinder/api/contrib/backups.py:177 #, python-format msgid "Delete backup with id: %s" msgstr "" @@ -1101,13 +1103,15 @@ msgid "Creating new backup %s" msgstr "" -#: cinder/api/contrib/backups.py:228 cinder/api/contrib/backups.py:260 -#: cinder/api/contrib/volume_transfer.py:157 -#: cinder/api/contrib/volume_transfer.py:193 +#: cinder/api/contrib/backups.py:246 cinder/api/contrib/backups.py:278 +#: cinder/api/contrib/cgsnapshots.py:168 +#: cinder/api/contrib/consistencygroups.py:173 +#: cinder/api/contrib/volume_transfer.py:158 +#: cinder/api/contrib/volume_transfer.py:194 msgid "Incorrect request body format" msgstr "" -#: cinder/api/contrib/backups.py:234 +#: cinder/api/contrib/backups.py:250 #, python-format msgid "Creating backup of volume %(volume_id)s in container %(container)s" msgstr "" @@ -1117,7 +1121,7 @@ msgid "Restoring backup %(backup_id)s (%(body)s)" msgstr "" -#: cinder/api/contrib/backups.py:267 +#: cinder/api/contrib/backups.py:283 #, python-format msgid "Restoring backup %(backup_id)s to volume %(volume_id)s" msgstr "" @@ -1137,7 +1141,7 @@ msgid "Importing record from %s." msgstr "" -#: cinder/api/contrib/backups.py:322 cinder/api/contrib/backups.py:331 +#: cinder/api/contrib/backups.py:340 cinder/api/contrib/backups.py:349 msgid "Incorrect request body format." msgstr "" @@ -1155,64 +1159,64 @@ msgid "Snapshot not found." msgstr "" -#: cinder/api/contrib/hosts.py:86 cinder/api/openstack/wsgi.py:237 +#: cinder/api/contrib/hosts.py:87 cinder/api/openstack/wsgi.py:320 msgid "cannot understand XML" msgstr "" -#: cinder/api/contrib/hosts.py:136 +#: cinder/api/contrib/hosts.py:137 #, python-format msgid "Host '%s' could not be found." msgstr "" -#: cinder/api/contrib/hosts.py:165 +#: cinder/api/contrib/hosts.py:166 #, python-format msgid "Invalid status: '%s'" msgstr "" -#: cinder/api/contrib/hosts.py:168 +#: cinder/api/contrib/hosts.py:169 #, python-format msgid "Invalid update setting: '%s'" msgstr "" -#: cinder/api/contrib/hosts.py:180 +#: cinder/api/contrib/hosts.py:181 #, python-format msgid "Setting host %(host)s to %(state)s." msgstr "" -#: cinder/api/contrib/hosts.py:206 +#: cinder/api/contrib/hosts.py:207 msgid "Describe-resource is admin only functionality" msgstr "" -#: cinder/api/contrib/hosts.py:214 +#: cinder/api/contrib/hosts.py:215 msgid "Host not found" msgstr "" -#: cinder/api/contrib/qos_specs_manage.py:110 +#: cinder/api/contrib/qos_specs_manage.py:132 msgid "Please specify a name for QoS specs." msgstr "" -#: cinder/api/contrib/qos_specs_manage.py:221 +#: cinder/api/contrib/qos_specs_manage.py:243 msgid "Failed to disassociate qos specs." msgstr "" -#: cinder/api/contrib/qos_specs_manage.py:223 +#: cinder/api/contrib/qos_specs_manage.py:245 msgid "Qos specs still in use." msgstr "" -#: cinder/api/contrib/qos_specs_manage.py:299 -#: cinder/api/contrib/qos_specs_manage.py:353 +#: cinder/api/contrib/qos_specs_manage.py:322 +#: cinder/api/contrib/qos_specs_manage.py:376 msgid "Volume Type id must not be None." msgstr "" -#: cinder/api/contrib/quota_classes.py:72 +#: cinder/api/contrib/quota_classes.py:73 msgid "Missing required element quota_class_set in request body." msgstr "" -#: cinder/api/contrib/quota_classes.py:81 +#: cinder/api/contrib/quota_classes.py:82 msgid "Quota class limit must be specified as an integer value." msgstr "" -#: cinder/api/contrib/quota_classes.py:85 +#: cinder/api/contrib/quota_classes.py:86 msgid "Quota class limit must be -1 or greater." msgstr "" @@ -1233,140 +1237,141 @@ msgid "Bad key(s) in quota set: %s" msgstr "" -#: cinder/api/contrib/scheduler_hints.py:36 +#: cinder/api/contrib/scheduler_hints.py:37 msgid "Malformed scheduler_hints attribute" msgstr "" -#: cinder/api/contrib/services.py:91 +#: cinder/api/contrib/services.py:92 msgid "" "Query by service parameter is deprecated. Please use binary parameter " "instead." msgstr "" -#: cinder/api/contrib/services.py:161 +#: cinder/api/contrib/services.py:162 msgid "Disabled reason contains invalid characters or is too long" msgstr "" -#: cinder/api/contrib/snapshot_actions.py:51 +#: cinder/api/contrib/snapshot_actions.py:52 msgid "'status' must be specified." msgstr "" -#: cinder/api/contrib/snapshot_actions.py:61 +#: cinder/api/contrib/snapshot_actions.py:62 #, python-format msgid "Snapshot status %(cur)s not allowed for update_snapshot_status" msgstr "" -#: cinder/api/contrib/snapshot_actions.py:67 +#: cinder/api/contrib/snapshot_actions.py:68 #, python-format msgid "" "Provided snapshot status %(provided)s not allowed for snapshot with status " "%(current)s." msgstr "" -#: cinder/api/contrib/snapshot_actions.py:79 +#: cinder/api/contrib/snapshot_actions.py:80 msgid "progress must be an integer percentage" msgstr "" -#: cinder/api/contrib/types_extra_specs.py:101 +#: cinder/api/contrib/types_extra_specs.py:102 msgid "Request body empty" msgstr "" -#: cinder/api/contrib/types_extra_specs.py:105 -#: cinder/api/v1/snapshot_metadata.py:75 cinder/api/v1/volume_metadata.py:75 -#: cinder/api/v2/snapshot_metadata.py:75 cinder/api/v2/volume_metadata.py:74 +#: cinder/api/contrib/types_extra_specs.py:106 +#: cinder/api/v1/snapshot_metadata.py:76 cinder/api/v1/volume_metadata.py:76 +#: cinder/api/v2/snapshot_metadata.py:76 cinder/api/v2/volume_metadata.py:75 msgid "Request body and URI mismatch" msgstr "" -#: cinder/api/contrib/types_extra_specs.py:108 -#: cinder/api/v1/snapshot_metadata.py:79 cinder/api/v1/volume_metadata.py:79 -#: cinder/api/v2/snapshot_metadata.py:79 cinder/api/v2/volume_metadata.py:78 +#: cinder/api/contrib/types_extra_specs.py:109 +#: cinder/api/v1/snapshot_metadata.py:80 cinder/api/v1/volume_metadata.py:80 +#: cinder/api/v2/snapshot_metadata.py:80 cinder/api/v2/volume_metadata.py:79 msgid "Request body contains too many items" msgstr "" -#: cinder/api/contrib/types_extra_specs.py:152 +#: cinder/api/contrib/types_extra_specs.py:153 msgid "" "Key names can only contain alphanumeric characters, underscores, periods, " "colons and hyphens." msgstr "" -#: cinder/api/contrib/types_manage.py:99 +#: cinder/api/contrib/types_manage.py:148 msgid "Target volume type is still in use." msgstr "" -#: cinder/api/contrib/volume_actions.py:100 +#: cinder/api/contrib/volume_actions.py:101 #, python-format msgid "" "Invalid request to attach volume to an instance %(instance_uuid)s and a host " "%(host_name)s simultaneously" msgstr "" -#: cinder/api/contrib/volume_actions.py:108 +#: cinder/api/contrib/volume_actions.py:109 msgid "Invalid request to attach volume to an invalid target" msgstr "" -#: cinder/api/contrib/volume_actions.py:112 +#: cinder/api/contrib/volume_actions.py:113 msgid "" "Invalid request to attach volume with an invalid mode. Attaching mode should " "be 'rw' or 'ro'" msgstr "" -#: cinder/api/contrib/volume_actions.py:197 +#: cinder/api/contrib/volume_actions.py:202 msgid "Unable to fetch connection information from backend." msgstr "" -#: cinder/api/contrib/volume_actions.py:217 +#: cinder/api/contrib/volume_actions.py:223 msgid "Unable to terminate volume connection from backend." msgstr "" -#: cinder/api/contrib/volume_actions.py:230 +#: cinder/api/contrib/volume_actions.py:236 msgid "No image_name was specified in request." msgstr "" -#: cinder/api/contrib/volume_actions.py:238 +#: cinder/api/contrib/volume_actions.py:244 msgid "Bad value for 'force' parameter." msgstr "" -#: cinder/api/contrib/volume_actions.py:241 +#: cinder/api/contrib/volume_actions.py:247 msgid "'force' is not string or bool." msgstr "" -#: cinder/api/contrib/volume_actions.py:281 +#: cinder/api/contrib/volume_actions.py:289 msgid "New volume size must be specified as an integer." msgstr "" -#: cinder/api/contrib/volume_actions.py:300 +#: cinder/api/contrib/volume_actions.py:308 msgid "Must specify readonly in request." msgstr "" -#: cinder/api/contrib/volume_actions.py:308 +#: cinder/api/contrib/volume_actions.py:316 msgid "Bad value for 'readonly'" msgstr "" -#: cinder/api/contrib/volume_actions.py:312 +#: cinder/api/contrib/volume_actions.py:320 msgid "'readonly' not string or bool" msgstr "" -#: cinder/api/contrib/volume_actions.py:326 +#: cinder/api/contrib/volume_actions.py:334 msgid "New volume type must be specified." msgstr "" -#: cinder/api/contrib/volume_manage.py:98 cinder/api/v2/snapshots.py:174 -#: cinder/api/v2/snapshots.py:234 cinder/api/v2/volumes.py:266 -#: cinder/api/v2/volumes.py:373 +#: cinder/api/contrib/volume_manage.py:100 cinder/api/v2/snapshots.py:176 +#: cinder/api/v2/snapshots.py:237 cinder/api/v2/volumes.py:303 +#: cinder/api/v2/volumes.py:443 #, python-format msgid "Missing required element '%s' in request body" msgstr "" -#: cinder/api/contrib/volume_manage.py:109 +#: cinder/api/contrib/volume_manage.py:111 #, python-format msgid "The following elements are required: %s" msgstr "" -#: cinder/api/contrib/volume_manage.py:127 cinder/api/v2/volumes.py:297 +#: cinder/api/contrib/volume_manage.py:129 +#: cinder/api/contrib/volume_type_access.py:96 cinder/api/v2/volumes.py:338 msgid "Volume type not found." msgstr "" -#: cinder/api/contrib/volume_manage.py:143 +#: cinder/api/contrib/volume_manage.py:145 msgid "Service not found." msgstr "" @@ -1379,7 +1384,7 @@ msgid "Creating new volume transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:162 +#: cinder/api/contrib/volume_transfer.py:163 #, python-format msgid "Creating transfer of volume %s" msgstr "" @@ -1389,105 +1394,107 @@ msgid "Accepting volume transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:196 +#: cinder/api/contrib/volume_transfer.py:197 #, python-format msgid "Accepting transfer %s" msgstr "" -#: cinder/api/contrib/volume_transfer.py:217 +#: cinder/api/contrib/volume_transfer.py:218 #, python-format msgid "Delete transfer with id: %s" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:64 +#: cinder/api/contrib/volume_type_encryption.py:65 msgid "key_size must be non-negative" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:67 +#: cinder/api/contrib/volume_type_encryption.py:68 msgid "key_size must be an integer" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:73 +#: cinder/api/contrib/volume_type_encryption.py:74 msgid "provider must be defined" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:75 +#: cinder/api/contrib/volume_type_encryption.py:76 msgid "control_location must be defined" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:83 +#: cinder/api/contrib/volume_type_encryption.py:84 #, python-format msgid "Valid control location are: %s" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:111 +#: cinder/api/contrib/volume_type_encryption.py:112 msgid "Cannot create encryption specs. Volume type in use." msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:115 +#: cinder/api/contrib/volume_type_encryption.py:116 msgid "Create body is not valid." msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:141 +#: cinder/api/contrib/volume_type_encryption.py:142 msgid "Request body empty." msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:144 +#: cinder/api/contrib/volume_type_encryption.py:145 msgid "Update body is not valid. It must contain \"encryption.\"" msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:147 +#: cinder/api/contrib/volume_type_encryption.py:148 msgid "Request body contains too many items." msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:153 +#: cinder/api/contrib/volume_type_encryption.py:154 msgid "Cannot update encryption specs. Volume type in use." msgstr "" -#: cinder/api/contrib/volume_type_encryption.py:187 +#: cinder/api/contrib/volume_type_encryption.py:188 msgid "Cannot delete encryption specs. Volume type in use." msgstr "" -#: cinder/api/contrib/volume_unmanage.py:53 +#: cinder/api/contrib/volume_unmanage.py:54 #, python-format msgid "Unmanage volume with id: %s" msgstr "" -#: cinder/api/contrib/volume_unmanage.py:59 cinder/api/v2/snapshots.py:190 -#: cinder/api/v2/volumes.py:170 cinder/api/v2/volumes.py:187 -#: cinder/api/v2/volumes.py:405 +#: cinder/api/contrib/volume_replication.py:76 +#: cinder/api/contrib/volume_replication.py:94 +#: cinder/api/contrib/volume_unmanage.py:60 cinder/api/v2/snapshots.py:192 +#: cinder/api/v2/volumes.py:177 cinder/api/v2/volumes.py:194 +#: cinder/api/v2/volumes.py:477 msgid "Volume could not be found" msgstr "" -#: cinder/api/contrib/volume_unmanage.py:62 cinder/api/v2/volumes.py:190 +#: cinder/api/contrib/volume_unmanage.py:63 cinder/api/v2/volumes.py:197 msgid "Volume cannot be deleted while in attached state" msgstr "" -#: cinder/api/middleware/auth.py:112 +#: cinder/api/middleware/auth.py:113 msgid "Invalid service catalog json." msgstr "" -#: cinder/api/middleware/fault.py:44 +#: cinder/api/middleware/fault.py:46 #, python-format msgid "Caught error: %s" msgstr "エラー %s をキャッチしました。" -#: cinder/api/middleware/fault.py:53 cinder/api/openstack/wsgi.py:978 +#: cinder/api/openstack/wsgi.py:1061 #, python-format msgid "%(url)s returned with HTTP %(status)d" msgstr "" -#: cinder/api/middleware/fault.py:69 +#: cinder/api/middleware/fault.py:70 #, python-format msgid "%(exception)s: %(explanation)s" msgstr "" -#: cinder/api/middleware/sizelimit.py:55 cinder/api/middleware/sizelimit.py:64 -#: cinder/api/middleware/sizelimit.py:78 +#: cinder/api/middleware/sizelimit.py:56 cinder/api/middleware/sizelimit.py:65 +#: cinder/api/middleware/sizelimit.py:79 msgid "Request is too large." msgstr "" -#: cinder/api/openstack/__init__.py:69 +#: cinder/api/openstack/__init__.py:79 msgid "Must specify an ExtensionManager class" msgstr "" @@ -1496,7 +1503,7 @@ msgid "Extended resource: %s" msgstr "" -#: cinder/api/openstack/__init__.py:104 +#: cinder/api/openstack/__init__.py:114 #, python-format msgid "" "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such " @@ -1508,37 +1515,37 @@ msgid "Extension %(ext_name)s extending resource: %(collection)s" msgstr "" -#: cinder/api/openstack/__init__.py:126 +#: cinder/api/openstack/__init__.py:136 msgid "" "cinder.api.openstack:FaultWrapper is deprecated. Please use " "cinder.api.middleware.fault:FaultWrapper instead." msgstr "" -#: cinder/api/openstack/urlmap.py:25 +#: cinder/api/openstack/urlmap.py:26 msgid "" "cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use " "cinder.api.urlmap:urlmap_factory instead." msgstr "" -#: cinder/api/openstack/wsgi.py:212 cinder/api/openstack/wsgi.py:628 +#: cinder/api/openstack/wsgi.py:295 cinder/api/openstack/wsgi.py:711 msgid "cannot understand JSON" msgstr "" -#: cinder/api/openstack/wsgi.py:633 +#: cinder/api/openstack/wsgi.py:716 msgid "too many body keys" msgstr "" -#: cinder/api/openstack/wsgi.py:671 +#: cinder/api/openstack/wsgi.py:673 #, python-format msgid "Exception handling resource: %s" msgstr "" -#: cinder/api/openstack/wsgi.py:676 +#: cinder/api/openstack/wsgi.py:678 #, python-format msgid "Fault thrown: %s" msgstr "" -#: cinder/api/openstack/wsgi.py:679 +#: cinder/api/openstack/wsgi.py:681 #, python-format msgid "HTTP exception thrown: %s" msgstr "" @@ -1555,125 +1562,125 @@ msgid "No Content-Type provided in request" msgstr "" -#: cinder/api/openstack/wsgi.py:908 +#: cinder/api/openstack/wsgi.py:991 #, python-format msgid "There is no such action: %s" msgstr "" -#: cinder/api/openstack/wsgi.py:911 cinder/api/openstack/wsgi.py:924 -#: cinder/api/v1/snapshot_metadata.py:53 cinder/api/v1/snapshot_metadata.py:71 -#: cinder/api/v1/snapshot_metadata.py:96 cinder/api/v1/snapshot_metadata.py:121 -#: cinder/api/v1/volume_metadata.py:53 cinder/api/v1/volume_metadata.py:71 -#: cinder/api/v1/volume_metadata.py:96 cinder/api/v1/volume_metadata.py:121 -#: cinder/api/v2/snapshot_metadata.py:53 cinder/api/v2/snapshot_metadata.py:71 -#: cinder/api/v2/snapshot_metadata.py:96 cinder/api/v2/snapshot_metadata.py:121 -#: cinder/api/v2/volume_metadata.py:52 cinder/api/v2/volume_metadata.py:70 -#: cinder/api/v2/volume_metadata.py:95 cinder/api/v2/volume_metadata.py:120 +#: cinder/api/openstack/wsgi.py:994 cinder/api/openstack/wsgi.py:1007 +#: cinder/api/v1/snapshot_metadata.py:54 cinder/api/v1/snapshot_metadata.py:72 +#: cinder/api/v1/snapshot_metadata.py:97 cinder/api/v1/snapshot_metadata.py:122 +#: cinder/api/v1/volume_metadata.py:54 cinder/api/v1/volume_metadata.py:72 +#: cinder/api/v1/volume_metadata.py:97 cinder/api/v1/volume_metadata.py:122 +#: cinder/api/v2/snapshot_metadata.py:54 cinder/api/v2/snapshot_metadata.py:72 +#: cinder/api/v2/snapshot_metadata.py:97 cinder/api/v2/snapshot_metadata.py:122 +#: cinder/api/v2/volume_metadata.py:53 cinder/api/v2/volume_metadata.py:71 +#: cinder/api/v2/volume_metadata.py:96 cinder/api/v2/volume_metadata.py:121 msgid "Malformed request body" msgstr "" -#: cinder/api/openstack/wsgi.py:921 +#: cinder/api/openstack/wsgi.py:1004 msgid "Unsupported Content-Type" msgstr "" -#: cinder/api/openstack/wsgi.py:933 +#: cinder/api/openstack/wsgi.py:1016 msgid "Malformed request url" msgstr "" -#: cinder/api/openstack/wsgi.py:981 +#: cinder/api/openstack/wsgi.py:1064 #, python-format msgid "%(url)s returned a fault: %(e)s" msgstr "" -#: cinder/api/openstack/volume/__init__.py:25 +#: cinder/api/openstack/volume/__init__.py:26 msgid "" "cinder.api.openstack.volume:APIRouter is deprecated. Please use " "cinder.api.v1.router:APIRouter instead." msgstr "" -#: cinder/api/openstack/volume/versions.py:26 +#: cinder/api/openstack/volume/versions.py:27 msgid "" "cinder.api.openstack.volume.versions.Versions is deprecated. Please use " "cinder.api.versions.Versions instead." msgstr "" -#: cinder/api/v1/limits.py:139 cinder/api/v2/limits.py:138 +#: cinder/api/v1/limits.py:139 cinder/api/v2/limits.py:139 #, python-format msgid "" "Only %(value)s %(verb)s request(s) can be made to %(uri)s every " "%(unit_string)s." msgstr "" -#: cinder/api/v1/limits.py:264 cinder/api/v2/limits.py:261 +#: cinder/api/v1/limits.py:264 cinder/api/v2/limits.py:262 msgid "This request was rate-limited." msgstr "" -#: cinder/api/v1/snapshot_metadata.py:37 cinder/api/v1/snapshot_metadata.py:117 -#: cinder/api/v1/snapshot_metadata.py:156 cinder/api/v2/snapshot_metadata.py:37 -#: cinder/api/v2/snapshot_metadata.py:117 -#: cinder/api/v2/snapshot_metadata.py:156 +#: cinder/api/v1/snapshot_metadata.py:38 cinder/api/v1/snapshot_metadata.py:118 +#: cinder/api/v1/snapshot_metadata.py:157 cinder/api/v2/snapshot_metadata.py:38 +#: cinder/api/v2/snapshot_metadata.py:118 +#: cinder/api/v2/snapshot_metadata.py:157 msgid "snapshot does not exist" msgstr "" -#: cinder/api/v1/snapshot_metadata.py:139 -#: cinder/api/v1/snapshot_metadata.py:149 cinder/api/v1/volume_metadata.py:139 -#: cinder/api/v1/volume_metadata.py:149 cinder/api/v2/snapshot_metadata.py:139 -#: cinder/api/v2/snapshot_metadata.py:149 cinder/api/v2/volume_metadata.py:138 -#: cinder/api/v2/volume_metadata.py:148 +#: cinder/api/v1/snapshot_metadata.py:140 +#: cinder/api/v1/snapshot_metadata.py:150 cinder/api/v1/volume_metadata.py:140 +#: cinder/api/v1/volume_metadata.py:150 cinder/api/v2/snapshot_metadata.py:140 +#: cinder/api/v2/snapshot_metadata.py:150 cinder/api/v2/volume_metadata.py:139 +#: cinder/api/v2/volume_metadata.py:149 msgid "Metadata item was not found" msgstr "" -#: cinder/api/v1/snapshots.py:119 cinder/api/v2/snapshots.py:120 +#: cinder/api/v1/snapshots.py:120 cinder/api/v2/snapshots.py:121 #, python-format msgid "Delete snapshot with id: %s" msgstr "" -#: cinder/api/v1/snapshots.py:173 cinder/api/v2/snapshots.py:184 +#: cinder/api/v1/snapshots.py:175 cinder/api/v2/snapshots.py:186 msgid "'volume_id' must be specified" msgstr "" -#: cinder/api/v1/snapshots.py:182 cinder/api/v2/snapshots.py:193 +#: cinder/api/v1/snapshots.py:184 cinder/api/v2/snapshots.py:195 #, python-format msgid "Create snapshot from volume %s" msgstr "" -#: cinder/api/v1/snapshots.py:186 cinder/api/v2/snapshots.py:202 +#: cinder/api/v1/snapshots.py:188 cinder/api/v2/snapshots.py:204 #, python-format msgid "Invalid value '%s' for force. " msgstr "" -#: cinder/api/v1/volume_metadata.py:37 cinder/api/v1/volume_metadata.py:117 -#: cinder/api/v1/volume_metadata.py:156 cinder/api/v2/volume_metadata.py:36 -#: cinder/api/v2/volume_metadata.py:116 cinder/api/v2/volume_metadata.py:155 +#: cinder/api/v1/volume_metadata.py:38 cinder/api/v1/volume_metadata.py:118 +#: cinder/api/v1/volume_metadata.py:157 cinder/api/v2/volume_metadata.py:37 +#: cinder/api/v2/volume_metadata.py:117 cinder/api/v2/volume_metadata.py:156 msgid "volume does not exist" msgstr "" -#: cinder/api/v1/volumes.py:114 +#: cinder/api/v1/volumes.py:116 #, python-format msgid "vol=%s" msgstr "" -#: cinder/api/v1/volumes.py:293 cinder/api/v2/volumes.py:181 +#: cinder/api/v1/volumes.py:247 cinder/api/v2/volumes.py:186 #, python-format msgid "Delete volume with id: %s" msgstr "" -#: cinder/api/v1/volumes.py:347 cinder/api/v1/volumes.py:351 -#: cinder/api/v2/volumes.py:251 cinder/api/v2/volumes.py:255 +#: cinder/api/v1/volumes.py:306 cinder/api/v1/volumes.py:310 +#: cinder/api/v2/volumes.py:264 msgid "Invalid imageRef provided." msgstr "" -#: cinder/api/v1/volumes.py:391 cinder/api/v2/volumes.py:308 +#: cinder/api/v1/volumes.py:350 cinder/api/v2/volumes.py:349 #, python-format msgid "snapshot id:%s not found" msgstr "" -#: cinder/api/v1/volumes.py:404 +#: cinder/api/v1/volumes.py:363 #, python-format msgid "source vol id:%s not found" msgstr "" -#: cinder/api/v1/volumes.py:415 cinder/api/v2/volumes.py:331 +#: cinder/api/v1/volumes.py:371 cinder/api/v2/volumes.py:370 #, python-format msgid "Create volume of %s GB" msgstr "Create volume: %s GBのボリュームを作成します。" @@ -1683,20 +1690,20 @@ msgid "Removing options '%(bad_options)s' from query" msgstr "" -#: cinder/api/v2/snapshots.py:111 cinder/api/v2/snapshots.py:126 -#: cinder/api/v2/snapshots.py:267 +#: cinder/api/v2/snapshots.py:112 cinder/api/v2/snapshots.py:127 +#: cinder/api/v2/snapshots.py:270 msgid "Snapshot could not be found" msgstr "" -#: cinder/api/v2/snapshots.py:230 cinder/api/v2/volumes.py:369 +#: cinder/api/v2/snapshots.py:233 cinder/api/v2/volumes.py:439 msgid "Missing request body" msgstr "" -#: cinder/api/v2/types.py:70 +#: cinder/api/v2/types.py:83 msgid "Volume type not found" msgstr "" -#: cinder/api/v2/volumes.py:320 +#: cinder/api/v2/volumes.py:361 #, python-format msgid "source volume id:%s not found" msgstr "" @@ -1706,48 +1713,48 @@ msgid "Removing options '%s' from query" msgstr "" -#: cinder/backup/api.py:66 +#: cinder/backup/api.py:69 msgid "Backup status must be available or error" msgstr "" -#: cinder/backup/api.py:115 +#: cinder/backup/api.py:120 msgid "Volume to be backed up must be available" msgstr "" -#: cinder/backup/api.py:150 +#: cinder/backup/api.py:198 msgid "Backup status must be available" msgstr "" -#: cinder/backup/api.py:155 +#: cinder/backup/api.py:203 msgid "Backup to be restored has invalid size" msgstr "" -#: cinder/backup/api.py:164 +#: cinder/backup/api.py:212 #, python-format msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s" msgstr "" -#: cinder/backup/api.py:180 +#: cinder/backup/api.py:228 msgid "Volume to be restored to must be available" msgstr "" -#: cinder/backup/api.py:186 +#: cinder/backup/api.py:234 #, python-format msgid "" "volume size %(volume_size)d is too small to restore backup of size %(size)d." msgstr "" -#: cinder/backup/api.py:191 +#: cinder/backup/api.py:239 #, python-format msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s" msgstr "" -#: cinder/backup/api.py:225 +#: cinder/backup/api.py:290 #, python-format msgid "Backup status must be available and not %s." msgstr "" -#: cinder/backup/driver.py:53 +#: cinder/backup/driver.py:58 #, python-format msgid "Value with type=%s is not serializable" msgstr "" @@ -1758,8 +1765,8 @@ msgid "Getting metadata type '%s'" msgstr "" -#: cinder/backup/driver.py:73 cinder/backup/driver.py:96 -#: cinder/backup/driver.py:120 +#: cinder/backup/driver.py:78 cinder/backup/driver.py:101 +#: cinder/backup/driver.py:125 #, python-format msgid "Unable to serialize field '%s' - excluding from backup" msgstr "" @@ -1793,7 +1800,7 @@ msgid "Restoring volume glance metadata" msgstr "" -#: cinder/backup/driver.py:229 +#: cinder/backup/driver.py:307 #, python-format msgid "Unsupported backup metadata version (%s)" msgstr "" @@ -1803,7 +1810,7 @@ msgid "No metadata of type '%s' to restore" msgstr "" -#: cinder/backup/manager.py:102 +#: cinder/backup/manager.py:108 msgid "NULL host not allowed for volume backend lookup." msgstr "" @@ -1812,7 +1819,7 @@ msgid "Checking hostname '%s' for backend info." msgstr "" -#: cinder/backup/manager.py:112 +#: cinder/backup/manager.py:118 #, python-format msgid "Backend not found in hostname (%s) so using default." msgstr "" @@ -1826,7 +1833,7 @@ msgid "Fetching default backend." msgstr "" -#: cinder/backup/manager.py:128 +#: cinder/backup/manager.py:134 #, python-format msgid "Volume manager for backend '%s' does not exist." msgstr "" @@ -1848,89 +1855,89 @@ msgid "Registering default backend %s." msgstr "" -#: cinder/backup/manager.py:163 +#: cinder/backup/manager.py:169 #, python-format msgid "Starting volume driver %(driver_name)s (%(version)s)." msgstr "" -#: cinder/backup/manager.py:170 +#: cinder/backup/manager.py:176 #, python-format msgid "Error encountered during initialization of driver: %(name)s." msgstr "" -#: cinder/backup/manager.py:189 +#: cinder/backup/manager.py:195 msgid "Cleaning up incomplete backup operations." msgstr "" -#: cinder/backup/manager.py:194 +#: cinder/backup/manager.py:201 #, python-format msgid "Resetting volume %s to available (was backing-up)." msgstr "" -#: cinder/backup/manager.py:199 +#: cinder/backup/manager.py:206 #, python-format msgid "Resetting volume %s to error_restoring (was restoring-backup)." msgstr "" -#: cinder/backup/manager.py:211 +#: cinder/backup/manager.py:218 #, python-format msgid "Resetting backup %s to error (was creating)." msgstr "" -#: cinder/backup/manager.py:217 +#: cinder/backup/manager.py:224 #, python-format msgid "Resetting backup %s to available (was restoring)." msgstr "" -#: cinder/backup/manager.py:222 +#: cinder/backup/manager.py:229 #, python-format msgid "Resuming delete on backup: %s." msgstr "" -#: cinder/backup/manager.py:230 +#: cinder/backup/manager.py:237 #, python-format msgid "Create backup started, backup: %(backup_id)s volume: %(volume_id)s." msgstr "" -#: cinder/backup/manager.py:242 +#: cinder/backup/manager.py:253 #, python-format msgid "" "Create backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:254 +#: cinder/backup/manager.py:265 #, python-format msgid "" "Create backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:287 +#: cinder/backup/manager.py:295 #, python-format msgid "Create backup finished. backup: %s." msgstr "" -#: cinder/backup/manager.py:291 +#: cinder/backup/manager.py:299 #, python-format msgid "Restore backup started, backup: %(backup_id)s volume: %(volume_id)s." msgstr "" -#: cinder/backup/manager.py:304 +#: cinder/backup/manager.py:318 #, python-format msgid "" "Restore backup aborted, expected volume status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:314 +#: cinder/backup/manager.py:328 #, python-format msgid "" "Restore backup aborted: expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:332 +#: cinder/backup/manager.py:349 #, python-format msgid "" "Restore backup aborted, the backup service currently configured " @@ -1938,26 +1945,26 @@ "this backup [%(backup_service)s]." msgstr "" -#: cinder/backup/manager.py:363 +#: cinder/backup/manager.py:375 #, python-format msgid "" "Restore backup finished, backup %(backup_id)s restored to volume " "%(volume_id)s." msgstr "" -#: cinder/backup/manager.py:382 +#: cinder/backup/manager.py:394 #, python-format msgid "Delete backup started, backup: %s." msgstr "" -#: cinder/backup/manager.py:389 +#: cinder/backup/manager.py:409 #, python-format msgid "" "Delete_backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:402 +#: cinder/backup/manager.py:421 #, python-format msgid "" "Delete backup aborted, the backup service currently configured " @@ -1965,24 +1972,24 @@ "this backup [%(backup_service)s]." msgstr "" -#: cinder/backup/manager.py:425 +#: cinder/backup/manager.py:454 #, python-format msgid "Delete backup finished, backup %s deleted." msgstr "" -#: cinder/backup/manager.py:440 +#: cinder/backup/manager.py:469 #, python-format msgid "Export record started, backup: %s." msgstr "" -#: cinder/backup/manager.py:447 +#: cinder/backup/manager.py:495 #, python-format msgid "" "Export backup aborted, expected backup status %(expected_status)s but got " "%(actual_status)s." msgstr "" -#: cinder/backup/manager.py:458 +#: cinder/backup/manager.py:506 #, python-format msgid "" "Export record aborted, the backup service currently configured " @@ -1990,41 +1997,41 @@ "this backup [%(backup_service)s]." msgstr "" -#: cinder/backup/manager.py:476 +#: cinder/backup/manager.py:505 #, python-format msgid "Export record finished, backup %s exported." msgstr "" -#: cinder/backup/manager.py:495 +#: cinder/backup/manager.py:524 #, python-format msgid "Import record started, backup_url: %s." msgstr "" -#: cinder/backup/manager.py:511 +#: cinder/backup/manager.py:559 #, python-format msgid "" "Import record failed, cannot find backup service to perform the import. " "Request service %(service)s" msgstr "" -#: cinder/backup/manager.py:546 +#: cinder/backup/manager.py:594 #, python-format msgid "Backup metadata received from driver for import is missing %s." msgstr "" -#: cinder/backup/manager.py:561 +#: cinder/backup/manager.py:591 #, python-format msgid "" "Backup service %(service)s does not support verify. Backup id %(id)s is not " "verified. Skipping verify." msgstr "" -#: cinder/backup/manager.py:572 +#: cinder/backup/manager.py:603 #, python-format msgid "Import record id %s metadata from driver finished." msgstr "" -#: cinder/backup/drivers/ceph.py:127 cinder/tests/test_backup_ceph.py:827 +#: cinder/backup/drivers/ceph.py:129 cinder/tests/test_backup_ceph.py:945 #, python-format msgid "Metadata backup object '%s' already exists" msgstr "" @@ -2039,17 +2046,17 @@ msgid "Metadata backup object '%s' not found - ignoring" msgstr "" -#: cinder/backup/drivers/ceph.py:178 +#: cinder/backup/drivers/ceph.py:180 msgid "" "RBD striping not supported - ignoring configuration settings for rbd striping" msgstr "" -#: cinder/backup/drivers/ceph.py:201 +#: cinder/backup/drivers/ceph.py:203 #, python-format msgid "invalid user '%s'" msgstr "" -#: cinder/backup/drivers/ceph.py:267 +#: cinder/backup/drivers/ceph.py:270 msgid "Backup id required" msgstr "" @@ -2073,7 +2080,7 @@ msgid "%(chunks)s chunks of %(bytes)s bytes to be transferred" msgstr "" -#: cinder/backup/drivers/ceph.py:324 +#: cinder/backup/drivers/ceph.py:327 #, python-format msgid "Transferred chunk %(chunk)s of %(chunks)s (%(rate)dK/s)" msgstr "" @@ -2102,7 +2109,7 @@ msgid "Trying diff format name format basename='%s'" msgstr "" -#: cinder/backup/drivers/ceph.py:424 +#: cinder/backup/drivers/ceph.py:428 #, python-format msgid "image %s not found" msgstr "" @@ -2141,7 +2148,7 @@ msgid "Performing differential transfer from '%(src)s' to '%(dest)s'" msgstr "" -#: cinder/backup/drivers/ceph.py:536 +#: cinder/backup/drivers/ceph.py:554 #, python-format msgid "RBD diff op failed - (ret=%(ret)s stderr=%(stderr)s)" msgstr "" @@ -2166,7 +2173,7 @@ msgid "Source snapshot '%s' is stale so deleting" msgstr "" -#: cinder/backup/drivers/ceph.py:613 +#: cinder/backup/drivers/ceph.py:634 #, python-format msgid "" "Snapshot='%(snap)s' does not exist in base image='%(base)s' - aborting " @@ -2211,7 +2218,7 @@ msgid "Backup '%s' has no snapshot" msgstr "" -#: cinder/backup/drivers/ceph.py:767 +#: cinder/backup/drivers/ceph.py:790 #, python-format msgid "Backup should only have one snapshot but instead has %s" msgstr "" @@ -2221,11 +2228,11 @@ msgid "Found snapshot '%s'" msgstr "" -#: cinder/backup/drivers/ceph.py:793 +#: cinder/backup/drivers/ceph.py:816 msgid "Need non-zero volume size" msgstr "" -#: cinder/backup/drivers/ceph.py:817 +#: cinder/backup/drivers/ceph.py:842 #, python-format msgid "Failed to backup volume metadata - %s" msgstr "" @@ -2253,7 +2260,7 @@ msgid "Attempting incremental restore from base='%(base)s' snap='%(snap)s'" msgstr "" -#: cinder/backup/drivers/ceph.py:948 +#: cinder/backup/drivers/ceph.py:972 msgid "Differential restore failed, trying full restore" msgstr "" @@ -2289,8 +2296,8 @@ msgid "Volume has no backed up metadata" msgstr "" -#: cinder/backup/drivers/ceph.py:1114 cinder/backup/drivers/swift.py:457 -#: cinder/tests/test_backup_ceph.py:816 +#: cinder/backup/drivers/ceph.py:1145 cinder/backup/drivers/swift.py:564 +#: cinder/tests/test_backup_ceph.py:934 msgid "Metadata restore failed due to incompatible version" msgstr "" @@ -2333,12 +2340,12 @@ msgid "Delete '%s' finished" msgstr "" -#: cinder/backup/drivers/swift.py:105 +#: cinder/backup/drivers/swift.py:130 #, python-format msgid "unsupported compression algorithm: %s" msgstr "" -#: cinder/backup/drivers/swift.py:122 +#: cinder/backup/drivers/swift.py:160 #, python-format msgid "single_user auth mode enabled, but %(param)s not set" msgstr "" @@ -2366,7 +2373,7 @@ "%(filename)s" msgstr "" -#: cinder/backup/drivers/swift.py:197 +#: cinder/backup/drivers/swift.py:249 #, python-format msgid "" "error writing metadata file to swift, MD5 of metadata file in swift " @@ -2389,7 +2396,7 @@ msgid "_read_metadata finished (%s)" msgstr "" -#: cinder/backup/drivers/swift.py:222 +#: cinder/backup/drivers/swift.py:274 #, python-format msgid "volume size %d is invalid." msgstr "" @@ -2431,7 +2438,7 @@ msgid "backup MD5 for %(object_name)s: %(md5)s" msgstr "" -#: cinder/backup/drivers/swift.py:293 +#: cinder/backup/drivers/swift.py:345 #, python-format msgid "" "error writing object to swift, MD5 of object in swift %(etag)s is not the " @@ -2447,7 +2454,7 @@ msgid "backup %s finished." msgstr "" -#: cinder/backup/drivers/swift.py:352 +#: cinder/backup/drivers/swift.py:395 #, python-format msgid "Backup volume metadata to swift failed: %s" msgstr "" @@ -2462,7 +2469,7 @@ msgid "metadata_object_names = %s" msgstr "" -#: cinder/backup/drivers/swift.py:373 +#: cinder/backup/drivers/swift.py:479 msgid "" "restore_backup aborted, actual swift object list in swift does not match " "object list stored in metadata" @@ -2497,7 +2504,7 @@ msgid "Restoring swift backup version %s" msgstr "" -#: cinder/backup/drivers/swift.py:445 +#: cinder/backup/drivers/swift.py:552 #, python-format msgid "No support to restore swift backup version %s" msgstr "" @@ -2507,11 +2514,11 @@ msgid "restore %(backup_id)s to %(volume_id)s finished." msgstr "" -#: cinder/backup/drivers/swift.py:475 +#: cinder/backup/drivers/swift.py:517 msgid "swift error while listing objects, continuing with delete" msgstr "" -#: cinder/backup/drivers/swift.py:484 +#: cinder/backup/drivers/swift.py:526 #, python-format msgid "swift error while deleting object %s, continuing with delete" msgstr "" @@ -2527,7 +2534,7 @@ msgid "delete %s finished" msgstr "" -#: cinder/backup/drivers/tsm.py:78 +#: cinder/backup/drivers/tsm.py:79 #, python-format msgid "" "%(op)s: backup %(bck_id)s, volume %(vol_id)s failed. Backup object has " @@ -2535,7 +2542,7 @@ "%(vol_mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:113 +#: cinder/backup/drivers/tsm.py:114 #, python-format msgid "" "backup: %(vol_id)s failed to create device hardlink from %(vpath)s to " @@ -2544,25 +2551,25 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:211 +#: cinder/backup/drivers/tsm.py:212 #, python-format msgid "" "backup: %(vol_id)s failed. %(path)s is unexpected file type. Block or " "regular files supported, actual file mode is %(vol_mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:221 +#: cinder/backup/drivers/tsm.py:222 #, python-format msgid "" "backup: %(vol_id)s failed. Cannot obtain real path to volume at %(path)s." msgstr "" -#: cinder/backup/drivers/tsm.py:228 +#: cinder/backup/drivers/tsm.py:229 #, python-format msgid "backup: %(vol_id)s failed. %(path)s is not a file." msgstr "" -#: cinder/backup/drivers/tsm.py:251 +#: cinder/backup/drivers/tsm.py:252 #, python-format msgid "" "backup: %(vol_id)s failed to remove backup hardlink from %(vpath)s to " @@ -2571,7 +2578,7 @@ " stderr: %(err)s." msgstr "" -#: cinder/backup/drivers/tsm.py:298 +#: cinder/backup/drivers/tsm.py:299 #, python-format msgid "" "backup: %(vol_id)s failed to obtain backup success notification from " @@ -2580,7 +2587,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:339 +#: cinder/backup/drivers/tsm.py:340 #, python-format msgid "" "restore: %(vol_id)s failed.\n" @@ -2588,7 +2595,7 @@ " stderr: %(err)s." msgstr "" -#: cinder/backup/drivers/tsm.py:362 +#: cinder/backup/drivers/tsm.py:363 msgid "" "Volume metadata backup requested but this driver does not yet support this " "feature." @@ -2601,7 +2608,7 @@ "%(volume_path)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:391 +#: cinder/backup/drivers/tsm.py:392 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc on %(bpath)s.\n" @@ -2609,7 +2616,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:401 +#: cinder/backup/drivers/tsm.py:402 #, python-format msgid "" "backup: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2630,7 +2637,7 @@ "%(backup_id)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:452 +#: cinder/backup/drivers/tsm.py:453 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc on %(bpath)s.\n" @@ -2638,7 +2645,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:462 +#: cinder/backup/drivers/tsm.py:463 #, python-format msgid "" "restore: %(vol_id)s failed to run dsmc due to invalid arguments on " @@ -2657,14 +2664,14 @@ msgid "Delete started for backup: %(backup)s, mode: %(mode)s." msgstr "" -#: cinder/backup/drivers/tsm.py:508 +#: cinder/backup/drivers/tsm.py:509 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc with stdout: %(out)s\n" " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:516 +#: cinder/backup/drivers/tsm.py:517 #, python-format msgid "" "delete: %(vol_id)s failed to run dsmc due to invalid arguments with stdout: " @@ -2672,7 +2679,7 @@ " stderr: %(err)s" msgstr "" -#: cinder/backup/drivers/tsm.py:530 +#: cinder/backup/drivers/tsm.py:531 #, python-format msgid "" "delete: %(vol_id)s failed with stdout: %(out)s\n" @@ -2712,17 +2719,17 @@ msgid "Failed to create Volume Group: %(vg_name)s" msgstr "" -#: cinder/brick/exception.py:108 +#: cinder/exception.py:913 cinder/brick/exception.py:108 #, python-format msgid "Failed to create iscsi target for volume %(volume_id)s." msgstr "" -#: cinder/brick/exception.py:112 +#: cinder/exception.py:917 cinder/brick/exception.py:112 #, python-format msgid "Failed to remove iscsi target for volume %(volume_id)s." msgstr "" -#: cinder/brick/exception.py:116 +#: cinder/exception.py:921 cinder/brick/exception.py:116 #, python-format msgid "Failed to attach iSCSI target for volume %(volume_id)s." msgstr "" @@ -2732,7 +2739,7 @@ msgid "Connect to volume via protocol %(protocol)s not supported." msgstr "" -#: cinder/brick/initiator/connector.py:127 +#: cinder/brick/initiator/connector.py:135 #, python-format msgid "Invalid InitiatorConnector protocol specified %(protocol)s" msgstr "" @@ -2754,12 +2761,12 @@ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)" msgstr "" -#: cinder/brick/initiator/connector.py:317 +#: cinder/brick/initiator/connector.py:326 #, python-format msgid "Could not find the iSCSI Initiator File %s" msgstr "" -#: cinder/brick/initiator/connector.py:609 +#: cinder/brick/initiator/connector.py:620 msgid "We are unable to locate any Fibre Channel devices" msgstr "" @@ -2768,11 +2775,11 @@ msgid "Looking for Fibre Channel dev %(device)s" msgstr "" -#: cinder/brick/initiator/connector.py:629 +#: cinder/brick/initiator/connector.py:640 msgid "Fibre Channel volume device not found." msgstr "" -#: cinder/brick/initiator/connector.py:633 +#: cinder/brick/initiator/connector.py:636 #, python-format msgid "" "Fibre volume not yet found. Will rescan & retry. Try number: %(tries)s" @@ -2788,7 +2795,7 @@ msgid "Multipath device discovered %(device)s" msgstr "" -#: cinder/brick/initiator/connector.py:776 +#: cinder/brick/initiator/connector.py:780 #, python-format msgid "AoE volume not yet found at: %(path)s. Try number: %(tries)s" msgstr "" @@ -2813,12 +2820,12 @@ msgid "aoe-flush %(dev)s: stdout=%(out)s stderr%(err)s" msgstr "" -#: cinder/brick/initiator/connector.py:858 +#: cinder/brick/initiator/connector.py:862 msgid "" "Connection details not present. RemoteFsClient may not initialize properly." msgstr "" -#: cinder/brick/initiator/connector.py:915 +#: cinder/brick/initiator/connector.py:927 msgid "Invalid connection_properties specified no device_path attribute" msgstr "" @@ -2826,14 +2833,14 @@ msgid "systool is not installed" msgstr "" -#: cinder/brick/initiator/linuxscsi.py:99 -#: cinder/brick/initiator/linuxscsi.py:107 -#: cinder/brick/initiator/linuxscsi.py:124 +#: cinder/brick/initiator/linuxscsi.py:114 +#: cinder/brick/initiator/linuxscsi.py:122 +#: cinder/brick/initiator/linuxscsi.py:139 #, python-format msgid "multipath call failed exit (%(code)s)" msgstr "" -#: cinder/brick/initiator/linuxscsi.py:145 +#: cinder/brick/initiator/linuxscsi.py:160 #, python-format msgid "Couldn't find multipath device %(line)s" msgstr "" @@ -2843,18 +2850,18 @@ msgid "Found multipath device = %(mdev)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:135 +#: cinder/brick/iscsi/iscsi.py:139 msgid "Attempting recreate of backing lun..." msgstr "" -#: cinder/brick/iscsi/iscsi.py:153 +#: cinder/brick/iscsi/iscsi.py:157 #, python-format msgid "" "Failed to recover attempt to create iscsi backing lun for volume " "id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:172 +#: cinder/brick/iscsi/iscsi.py:178 #, python-format msgid "Creating iscsi_target for: %s" msgstr "" @@ -2866,114 +2873,114 @@ "content: %(vc)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:211 cinder/brick/iscsi/iscsi.py:367 +#: cinder/brick/iscsi/iscsi.py:217 cinder/brick/iscsi/iscsi.py:375 #, python-format msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:222 +#: cinder/brick/iscsi/iscsi.py:228 #, python-format msgid "" "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure your " "tgtd config file contains 'include %(volumes_dir)s/*'" msgstr "" -#: cinder/brick/iscsi/iscsi.py:252 +#: cinder/brick/iscsi/iscsi.py:258 #, python-format msgid "Removing iscsi_target for: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:256 +#: cinder/brick/iscsi/iscsi.py:262 #, python-format msgid "Volume path %s does not exist, nothing to remove." msgstr "" -#: cinder/brick/iscsi/iscsi.py:274 +#: cinder/brick/iscsi/iscsi.py:280 cinder/brick/iscsi/iscsi.py:304 #, python-format msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:292 cinder/brick/iscsi/iscsi.py:546 +#: cinder/volume/targets/lio.py:149 cinder/volume/targets/tgt.py:420 msgid "valid iqn needed for show_target" msgstr "" -#: cinder/brick/iscsi/iscsi.py:374 +#: cinder/brick/iscsi/iscsi.py:382 #, python-format msgid "Removing iscsi_target for volume: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:468 +#: cinder/brick/iscsi/iscsi.py:476 msgid "cinder-rtstool is not installed correctly" msgstr "" -#: cinder/brick/iscsi/iscsi.py:488 +#: cinder/brick/iscsi/iscsi.py:496 #, python-format msgid "Creating iscsi_target for volume: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:512 cinder/brick/iscsi/iscsi.py:521 +#: cinder/brick/iscsi/iscsi.py:520 cinder/brick/iscsi/iscsi.py:529 #, python-format msgid "Failed to create iscsi target for volume id:%s." msgstr "" -#: cinder/brick/iscsi/iscsi.py:528 +#: cinder/brick/iscsi/iscsi.py:536 #, python-format msgid "Removing iscsi_target: %s" msgstr "" -#: cinder/brick/iscsi/iscsi.py:538 +#: cinder/brick/iscsi/iscsi.py:546 #, python-format msgid "Failed to remove iscsi target for volume id:%s." msgstr "" -#: cinder/brick/iscsi/iscsi.py:567 +#: cinder/brick/iscsi/iscsi.py:575 #, python-format msgid "Failed to add initiator iqn %s to target" msgstr "" -#: cinder/brick/local_dev/lvm.py:75 +#: cinder/brick/local_dev/lvm.py:74 msgid "Error creating Volume Group" msgstr "" -#: cinder/brick/local_dev/lvm.py:76 cinder/brick/local_dev/lvm.py:158 -#: cinder/brick/local_dev/lvm.py:478 cinder/brick/local_dev/lvm.py:508 -#: cinder/brick/local_dev/lvm.py:551 cinder/brick/local_dev/lvm.py:643 -#: cinder/brick/local_dev/lvm.py:681 +#: cinder/brick/local_dev/lvm.py:75 cinder/brick/local_dev/lvm.py:157 +#: cinder/brick/local_dev/lvm.py:477 cinder/brick/local_dev/lvm.py:507 +#: cinder/brick/local_dev/lvm.py:550 cinder/brick/local_dev/lvm.py:631 +#: cinder/brick/local_dev/lvm.py:669 #, python-format msgid "Cmd :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:77 cinder/brick/local_dev/lvm.py:159 -#: cinder/brick/local_dev/lvm.py:479 cinder/brick/local_dev/lvm.py:509 -#: cinder/brick/local_dev/lvm.py:552 cinder/brick/local_dev/lvm.py:644 -#: cinder/brick/local_dev/lvm.py:682 +#: cinder/brick/local_dev/lvm.py:76 cinder/brick/local_dev/lvm.py:158 +#: cinder/brick/local_dev/lvm.py:478 cinder/brick/local_dev/lvm.py:508 +#: cinder/brick/local_dev/lvm.py:551 cinder/brick/local_dev/lvm.py:632 +#: cinder/brick/local_dev/lvm.py:670 #, python-format msgid "StdOut :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:78 cinder/brick/local_dev/lvm.py:160 -#: cinder/brick/local_dev/lvm.py:480 cinder/brick/local_dev/lvm.py:510 -#: cinder/brick/local_dev/lvm.py:553 cinder/brick/local_dev/lvm.py:645 -#: cinder/brick/local_dev/lvm.py:683 +#: cinder/brick/local_dev/lvm.py:77 cinder/brick/local_dev/lvm.py:159 +#: cinder/brick/local_dev/lvm.py:479 cinder/brick/local_dev/lvm.py:509 +#: cinder/brick/local_dev/lvm.py:552 cinder/brick/local_dev/lvm.py:633 +#: cinder/brick/local_dev/lvm.py:671 #, python-format msgid "StdErr :%s" msgstr "" -#: cinder/brick/local_dev/lvm.py:82 +#: cinder/brick/local_dev/lvm.py:81 #, python-format msgid "Unable to locate Volume Group %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:157 +#: cinder/brick/local_dev/lvm.py:156 msgid "Error querying thin pool about data_percent" msgstr "" -#: cinder/brick/local_dev/lvm.py:370 +#: cinder/brick/local_dev/lvm.py:369 #, python-format msgid "Unable to find VG: %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:420 +#: cinder/brick/local_dev/lvm.py:419 msgid "" "Requested to setup thin provisioning, however current LVM version does not " "support it." @@ -2984,20 +2991,20 @@ msgid "Created thin pool '%(pool)s' with size %(size)s of total %(free)sg" msgstr "" -#: cinder/brick/local_dev/lvm.py:477 +#: cinder/brick/local_dev/lvm.py:476 msgid "Error creating Volume" msgstr "" -#: cinder/brick/local_dev/lvm.py:493 +#: cinder/brick/local_dev/lvm.py:492 #, python-format msgid "Trying to create snapshot by non-existent LV: %s" msgstr "" -#: cinder/brick/local_dev/lvm.py:507 +#: cinder/brick/local_dev/lvm.py:506 msgid "Error creating snapshot" msgstr "" -#: cinder/brick/local_dev/lvm.py:550 +#: cinder/brick/local_dev/lvm.py:549 msgid "Error activating LV" msgstr "" @@ -3006,7 +3013,7 @@ msgid "Error during lvchange -an: CMD: %(command)s, RESPONSE: %(response)s" msgstr "" -#: cinder/brick/local_dev/lvm.py:599 +#: cinder/brick/local_dev/lvm.py:649 #, python-format msgid "" "Error reported running lvremove: CMD: %(command)s, RESPONSE: %(response)s" @@ -3016,23 +3023,23 @@ msgid "Attempting udev settle and retry of lvremove..." msgstr "" -#: cinder/brick/local_dev/lvm.py:642 +#: cinder/brick/local_dev/lvm.py:630 msgid "Error extending Volume" msgstr "" -#: cinder/brick/local_dev/lvm.py:680 +#: cinder/brick/local_dev/lvm.py:668 msgid "Error renaming logical volume" msgstr "" -#: cinder/brick/remotefs/remotefs.py:41 +#: cinder/brick/remotefs/remotefs.py:42 msgid "nfs_mount_point_base required" msgstr "" -#: cinder/brick/remotefs/remotefs.py:48 +#: cinder/brick/remotefs/remotefs.py:55 msgid "glusterfs_mount_point_base required" msgstr "" -#: cinder/brick/remotefs/remotefs.py:89 +#: cinder/brick/remotefs/remotefs.py:96 #, python-format msgid "Already mounted: %s" msgstr "" @@ -3056,17 +3063,15 @@ msgid "Deploy v1 of the Cinder API." msgstr "" -#: cinder/common/config.py:123 +#: cinder/common/config.py:125 msgid "Deploy v2 of the Cinder API." msgstr "" -#: cinder/common/sqlalchemyutils.py:66 -#: cinder/openstack/common/db/sqlalchemy/utils.py:72 +#: cinder/common/sqlalchemyutils.py:67 msgid "Id not in sort_keys; is sort_keys unique?" msgstr "" -#: cinder/common/sqlalchemyutils.py:114 -#: cinder/openstack/common/db/sqlalchemy/utils.py:120 +#: cinder/common/sqlalchemyutils.py:115 msgid "Unknown sort direction, must be 'desc' or 'asc'" msgstr "" @@ -3075,238 +3080,239 @@ msgid "Novaclient connection created using URL: %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:65 +#: cinder/db/sqlalchemy/api.py:102 msgid "Use of empty request context is deprecated" msgstr "Request context を空とすることは非推奨です。" -#: cinder/db/sqlalchemy/api.py:192 +#: cinder/db/sqlalchemy/api.py:247 #, python-format msgid "Unrecognized read_deleted value '%s'" msgstr "" -#: cinder/db/sqlalchemy/api.py:845 +#: cinder/db/sqlalchemy/api.py:892 #, python-format msgid "Change will make usage less than 0 for the following resources: %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:1274 +#: cinder/db/sqlalchemy/api.py:1306 msgid "'migration_status' column could not be found." msgstr "" -#: cinder/db/sqlalchemy/api.py:1284 +#: cinder/db/sqlalchemy/api.py:1316 msgid "'metadata' filter value is not valid." msgstr "" -#: cinder/db/sqlalchemy/api.py:1294 +#: cinder/db/sqlalchemy/api.py:1326 #, python-format msgid "'%s' filter key is not valid, it maps to a relationship." msgstr "" -#: cinder/db/sqlalchemy/api.py:1299 +#: cinder/db/sqlalchemy/api.py:1331 #, python-format msgid "'%s' filter key is not valid." msgstr "" -#: cinder/db/sqlalchemy/api.py:1965 +#: cinder/db/sqlalchemy/api.py:2128 #, python-format msgid "VolumeType %s deletion failed, VolumeType in use." msgstr "" -#: cinder/db/sqlalchemy/api.py:2666 +#: cinder/db/sqlalchemy/api.py:2896 #, python-format msgid "No backup with id %s" msgstr "" -#: cinder/db/sqlalchemy/api.py:2751 +#: cinder/db/sqlalchemy/api.py:2980 msgid "Volume must be available" msgstr "" -#: cinder/db/sqlalchemy/api.py:2775 +#: cinder/db/sqlalchemy/api.py:3006 #, python-format msgid "Volume in unexpected state %s, expected awaiting-transfer" msgstr "" -#: cinder/db/sqlalchemy/api.py:2798 +#: cinder/db/sqlalchemy/api.py:3028 #, python-format msgid "" "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state " "%(status)s, expected awaiting-transfer" msgstr "" -#: cinder/db/sqlalchemy/migration.py:37 +#: cinder/db/sqlalchemy/migration.py:38 msgid "version should be an integer" msgstr "" -#: cinder/db/sqlalchemy/migration.py:64 +#: cinder/db/sqlalchemy/migration.py:65 msgid "Upgrade DB using Essex release first." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:240 +#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:244 msgid "Exception while creating table." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:269 +#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:271 msgid "Downgrade from initial Cinder install is unsupported." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:49 -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:74 -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:105 -#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:56 -#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:45 -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:48 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:80 -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:46 +#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:57 +#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:46 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:81 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47 +#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:53 +#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:79 +#: cinder/db/sqlalchemy/migrate_repo/versions/032_add_volume_type_projects.py:53 #, python-format msgid "Table |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:127 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:128 msgid "Dropping foreign key reservations_ibfk_1 failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:133 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:134 msgid "quota_classes table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:140 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:141 msgid "quota_usages table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:147 +#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:148 msgid "reservations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:59 msgid "Exception while creating table 'volume_glance_metadata'" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:75 +#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:74 msgid "volume_glance_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:68 +#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:69 msgid "backups table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:58 +#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:59 msgid "snapshot_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:61 +#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62 msgid "transfers table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:31 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:32 msgid "migrations table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:61 +#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62 #, python-format msgid "Table |%s| not created" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:37 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:38 #, python-format msgid "Exception while dropping table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:100 +#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:101 #, python-format msgid "Exception while creating table %s." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:34 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:43 -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:35 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:44 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:50 +#: cinder/db/sqlalchemy/migrate_repo/versions/032_add_volume_type_projects.py:33 #, python-format msgid "Column |%s| not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:92 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:93 msgid "encryption_key_id column not dropped from volumes" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:100 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:101 msgid "encryption_key_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:105 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:106 msgid "volume_type_id column not dropped from snapshots" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:113 +#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:114 msgid "encryption table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:50 msgid "Table quality_of_service_specs not created!" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:61 msgid "Added qos_specs_id column to volume type table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:85 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:86 msgid "Dropping foreign key volume_types_ibfk_1 failed" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:93 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:94 msgid "Dropping qos_specs_id column failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:100 +#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:101 msgid "Dropping quality_of_service_specs table failed." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:59 +#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60 msgid "volume_admin_metadata table not dropped" msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:48 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:50 msgid "" "Found existing 'default' entries in the quota_classes table. Skipping " "insertion of default values." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:72 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:74 msgid "Added default quota class data into the DB." msgstr "" -#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:74 +#: cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py:76 msgid "Default quota class data not inserted into the DB." msgstr "" -#: cinder/image/glance.py:162 cinder/image/glance.py:170 +#: cinder/image/glance.py:180 cinder/image/glance.py:188 #, python-format msgid "" "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s." msgstr "" -#: cinder/image/image_utils.py:94 cinder/image/image_utils.py:199 +#: cinder/image/image_utils.py:156 cinder/image/image_utils.py:261 msgid "'qemu-img info' parsing failed." msgstr "" -#: cinder/image/image_utils.py:101 +#: cinder/image/image_utils.py:163 #, python-format msgid "fmt=%(fmt)s backed by: %(backing_file)s" msgstr "" -#: cinder/image/image_utils.py:109 cinder/image/image_utils.py:192 +#: cinder/image/image_utils.py:171 cinder/image/image_utils.py:254 #, python-format msgid "" "Size is %(image_size)dGB and doesn't fit in a volume of size " "%(volume_size)dGB." msgstr "" -#: cinder/image/image_utils.py:157 +#: cinder/image/image_utils.py:218 #, python-format msgid "" "qemu-img is not installed and image is of type %s. Only RAW images can be " "used if qemu-img is not installed." msgstr "" -#: cinder/image/image_utils.py:164 +#: cinder/image/image_utils.py:225 msgid "" "qemu-img is not installed and the disk format is not specified. Only RAW " "images can be used if qemu-img is not installed." @@ -3317,17 +3323,17 @@ msgid "Copying image from %(tmp)s to volume %(dest)s - size: %(size)s" msgstr "" -#: cinder/image/image_utils.py:206 +#: cinder/image/image_utils.py:268 #, python-format msgid "fmt=%(fmt)s backed by:%(backing_file)s" msgstr "" -#: cinder/image/image_utils.py:224 +#: cinder/image/image_utils.py:288 #, python-format msgid "Converted to %(vol_format)s, but format is now %(file_format)s" msgstr "" -#: cinder/image/image_utils.py:260 +#: cinder/image/image_utils.py:320 #, python-format msgid "Converted to %(f1)s, but format is now %(f2)s" msgstr "" @@ -3367,22 +3373,22 @@ msgid "Reloading cached file %s" msgstr "" -#: cinder/openstack/common/gettextutils.py:271 +#: cinder/openstack/common/gettextutils.py:301 msgid "Message objects do not support addition." msgstr "" -#: cinder/openstack/common/gettextutils.py:280 +#: cinder/openstack/common/gettextutils.py:311 msgid "" "Message objects do not support str() because they may contain non-ascii " "characters. Please use unicode() or translate() instead." msgstr "" -#: cinder/openstack/common/imageutils.py:75 +#: cinder/openstack/common/imageutils.py:76 #, python-format msgid "Invalid input value \"%s\"." msgstr "" -#: cinder/openstack/common/imageutils.py:104 +#: cinder/openstack/common/imageutils.py:105 msgid "Snapshot list encountered but no header found!" msgstr "" @@ -3413,22 +3419,22 @@ "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..." msgstr "" -#: cinder/openstack/common/log.py:326 +#: cinder/openstack/common/log.py:298 #, python-format msgid "Deprecated: %s" msgstr "" -#: cinder/openstack/common/log.py:437 +#: cinder/openstack/common/log.py:406 #, python-format msgid "Error loading logging config %(log_config)s: %(err_msg)s" msgstr "" -#: cinder/openstack/common/log.py:488 +#: cinder/openstack/common/log.py:467 #, python-format msgid "syslog facility must be one of: %s" msgstr "" -#: cinder/openstack/common/log.py:709 +#: cinder/openstack/common/log.py:715 #, python-format msgid "Fatal call to deprecated config: %(msg)s" msgstr "" @@ -3438,8 +3444,7 @@ msgid "task run outlasted interval by %s sec" msgstr "" -#: cinder/openstack/common/loopingcall.py:89 -#: cinder/tests/brick/test_brick_connector.py:466 +#: cinder/tests/brick/test_brick_connector.py:492 msgid "in fixed duration looping call" msgstr "" @@ -3452,7 +3457,7 @@ msgid "in dynamic looping call" msgstr "" -#: cinder/openstack/common/periodic_task.py:43 +#: cinder/openstack/common/periodic_task.py:46 #, python-format msgid "Unexpected argument for periodic task creation: %(arg)s." msgstr "" @@ -3503,7 +3508,7 @@ msgid "Got unknown keyword args to utils.execute: %r" msgstr "" -#: cinder/openstack/common/processutils.py:142 +#: cinder/openstack/common/processutils.py:158 #, python-format msgid "Running cmd (subprocess): %s" msgstr "コマンド実行(subprocess): %s" @@ -3515,7 +3520,7 @@ msgid "Result was %s" msgstr "コマンド実行結果： %s" -#: cinder/openstack/common/processutils.py:179 +#: cinder/openstack/common/processutils.py:206 #, python-format msgid "%r failed. Retrying." msgstr "" @@ -3525,11 +3530,11 @@ msgid "Running cmd (SSH): %s" msgstr "コマンド（SSH)を実行: %s" -#: cinder/openstack/common/processutils.py:220 +#: cinder/openstack/common/processutils.py:248 msgid "Environment not supported over SSH" msgstr "" -#: cinder/openstack/common/processutils.py:224 +#: cinder/openstack/common/processutils.py:252 msgid "process_input not supported over SSH" msgstr "" @@ -3612,29 +3617,29 @@ msgid "Invalid SSL version : %s" msgstr "" -#: cinder/openstack/common/strutils.py:92 +#: cinder/openstack/common/strutils.py:125 #, python-format msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" msgstr "" -#: cinder/openstack/common/strutils.py:202 +#: cinder/openstack/common/strutils.py:230 #, python-format msgid "Invalid unit system: \"%s\"" msgstr "" -#: cinder/openstack/common/strutils.py:211 +#: cinder/openstack/common/strutils.py:239 #, python-format msgid "Invalid string format: %s" msgstr "" -#: cinder/openstack/common/versionutils.py:69 +#: cinder/openstack/common/versionutils.py:90 #, python-format msgid "" "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s and may " "be removed in %(remove_in)s." msgstr "" -#: cinder/openstack/common/versionutils.py:73 +#: cinder/openstack/common/versionutils.py:94 #, python-format msgid "" "%(what)s is deprecated as of %(as_of)s and may be removed in %(remove_in)s. " @@ -3696,19 +3701,19 @@ msgid "Host %(host)s %(pass_msg)s. Previously tried hosts: %(hosts)s" msgstr "" -#: cinder/scheduler/driver.py:69 +#: cinder/scheduler/driver.py:80 msgid "Must implement host_passes_filters" msgstr "" -#: cinder/scheduler/driver.py:74 +#: cinder/scheduler/driver.py:85 msgid "Must implement find_retype_host" msgstr "" -#: cinder/scheduler/driver.py:78 +#: cinder/scheduler/driver.py:89 msgid "Must implement a fallback schedule" msgstr "予備の(fallback)スケジューラを実装する必要があります。" -#: cinder/scheduler/driver.py:82 +#: cinder/scheduler/driver.py:93 msgid "Must implement schedule_create_volume" msgstr "" @@ -3717,29 +3722,29 @@ msgid "cannot place volume %(id)s on %(host)s" msgstr "" -#: cinder/scheduler/filter_scheduler.py:114 +#: cinder/scheduler/filter_scheduler.py:136 #, python-format msgid "No valid hosts for volume %(id)s with type %(type)s" msgstr "" -#: cinder/scheduler/filter_scheduler.py:125 +#: cinder/scheduler/filter_scheduler.py:162 #, python-format msgid "" "Current host not valid for volume %(id)s with type %(type)s, migration not " "allowed" msgstr "" -#: cinder/scheduler/filter_scheduler.py:156 +#: cinder/scheduler/filter_scheduler.py:197 msgid "Invalid value for 'scheduler_max_attempts', must be >=1" msgstr "" -#: cinder/scheduler/filter_scheduler.py:174 +#: cinder/scheduler/filter_scheduler.py:215 #, python-format msgid "" "Error scheduling %(volume_id)s from last vol-service: %(last_host)s : %(exc)s" msgstr "" -#: cinder/scheduler/filter_scheduler.py:207 +#: cinder/scheduler/filter_scheduler.py:248 #, python-format msgid "" "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s" @@ -3770,12 +3775,12 @@ msgid "volume service is down or disabled. (host: %s)" msgstr "" -#: cinder/scheduler/host_manager.py:319 +#: cinder/scheduler/host_manager.py:474 #, python-format msgid "Removing non-active host: %(host)s from scheduler cache." msgstr "" -#: cinder/scheduler/manager.py:66 +#: cinder/scheduler/manager.py:68 msgid "" "ChanceScheduler and SimpleScheduler have been deprecated due to lack of " "support for advanced features like: volume types, volume encryption, QoS " @@ -3783,35 +3788,35 @@ "certain combination of filters and weighers." msgstr "" -#: cinder/scheduler/manager.py:101 cinder/scheduler/manager.py:103 +#: cinder/scheduler/manager.py:130 msgid "Failed to create scheduler manager volume flow" msgstr "" -#: cinder/scheduler/manager.py:162 +#: cinder/scheduler/manager.py:191 msgid "New volume type not specified in request_spec." msgstr "" -#: cinder/scheduler/manager.py:177 +#: cinder/scheduler/manager.py:206 #, python-format msgid "Could not find a host for volume %(volume_id)s with type %(type_id)s." msgstr "" -#: cinder/scheduler/manager.py:219 +#: cinder/scheduler/manager.py:252 #, python-format msgid "Failed to schedule_%(method)s: %(ex)s" msgstr "" -#: cinder/scheduler/scheduler_options.py:68 +#: cinder/scheduler/scheduler_options.py:69 #, python-format msgid "Could not stat scheduler options file %(filename)s: '%(e)s'" msgstr "" -#: cinder/scheduler/scheduler_options.py:78 +#: cinder/scheduler/scheduler_options.py:79 #, python-format msgid "Could not decode scheduler options: '%s'" msgstr "" -#: cinder/scheduler/filters/capacity_filter.py:43 +#: cinder/scheduler/filters/capacity_filter.py:44 msgid "Free capacity not set: volume node info collection broken." msgstr "" @@ -3831,7 +3836,7 @@ msgid "Failed to schedule_create_volume: %(cause)s" msgstr "" -#: cinder/scheduler/flows/create_volume.py:133 +#: cinder/scheduler/flows/create_volume.py:120 #, python-format msgid "Failed notifying on %(topic)s payload %(payload)s" msgstr "" @@ -3846,7 +3851,7 @@ msgid "FAKE ISER: %s" msgstr "" -#: cinder/tests/fake_driver.py:97 +#: cinder/tests/fake_driver.py:135 msgid "local_path not implemented" msgstr "" @@ -3875,43 +3880,43 @@ msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'" msgstr "" -#: cinder/tests/test_backup_ceph.py:840 +#: cinder/tests/test_backup_ceph.py:958 #, python-format msgid "" "Failed to backup volume metadata - Metadata backup object 'backup.%s.meta' " "already exists" msgstr "" -#: cinder/tests/test_ibm_xiv_ds8k.py:102 +#: cinder/tests/test_ibm_xiv_ds8k.py:133 #, python-format msgid "Volume not found for instance %(instance_id)s." msgstr "" -#: cinder/tests/test_misc.py:58 +#: cinder/tests/test_misc.py:59 #, python-format msgid "" "The following migrations are missing a downgrade:\n" "\t%s" msgstr "" -#: cinder/tests/test_netapp.py:1327 +#: cinder/tests/volume/drivers/netapp/dataontap/client/test_api.py:146 msgid "Error not a TypeError." msgstr "" -#: cinder/tests/test_netapp.py:1336 +#: cinder/tests/volume/drivers/netapp/dataontap/client/test_api.py:155 msgid "Error not a KeyError." msgstr "" -#: cinder/tests/test_netapp_nfs.py:362 +#: cinder/tests/test_netapp_nfs.py:366 #, python-format msgid "Share %(share)s and file name %(file_name)s" msgstr "" -#: cinder/tests/test_rbd.py:837 cinder/volume/drivers/rbd.py:176 +#: cinder/tests/test_rbd.py:1014 msgid "flush() not supported in this version of librbd" msgstr "" -#: cinder/tests/test_storwize_svc.py:252 +#: cinder/tests/test_storwize_svc.py:257 #, python-format msgid "unrecognized argument %s" msgstr "" @@ -3937,25 +3942,25 @@ " stderr: %(err)s" msgstr "" -#: cinder/tests/test_volume_types.py:60 +#: cinder/tests/test_volume_types.py:66 #, python-format msgid "Given data: %s" msgstr "" -#: cinder/tests/test_volume_types.py:61 +#: cinder/tests/test_volume_types.py:67 #, python-format msgid "Result data: %s" msgstr "" -#: cinder/tests/api/contrib/test_backups.py:737 +#: cinder/tests/api/contrib/test_backups.py:777 msgid "Invalid input" msgstr "" -#: cinder/tests/brick/test_brick_remotefs.py:99 +#: cinder/tests/brick/test_brick_remotefs.py:100 msgid "Unexpected call to _execute." msgstr "" -#: cinder/tests/brick/test_brick_remotefs.py:132 +#: cinder/tests/brick/test_brick_remotefs.py:133 msgid "mount failed." msgstr "" @@ -4018,22 +4023,22 @@ msgid "In Add GlobalVars._active_cfg: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:126 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:127 #, python-format msgid "In Add GlobalVars._is_normal_test: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:128 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:129 #, python-format msgid "In Add GlobalVars._zone_state: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:179 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:184 #, python-format msgid "User: %s" msgstr "" -#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:180 +#: cinder/tests/zonemanager/test_brcd_fc_zone_driver.py:185 #, python-format msgid "_zone_state: %s" msgstr "" @@ -4047,21 +4052,21 @@ msgid "Volume in unexpected state" msgstr "" -#: cinder/transfer/api.py:102 cinder/volume/api.py:350 +#: cinder/transfer/api.py:107 msgid "status must be available" msgstr "" -#: cinder/transfer/api.py:119 +#: cinder/transfer/api.py:124 #, python-format msgid "Failed to create transfer record for %s" msgstr "" -#: cinder/transfer/api.py:136 +#: cinder/transfer/api.py:142 #, python-format msgid "Attempt to transfer %s with invalid auth key." msgstr "" -#: cinder/transfer/api.py:156 cinder/volume/flows/api/create_volume.py:508 +#: cinder/transfer/api.py:162 cinder/volume/flows/api/create_volume.py:574 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume " @@ -4073,18 +4078,18 @@ msgid "Failed to update quota donating volumetransfer id %s" msgstr "" -#: cinder/transfer/api.py:199 +#: cinder/transfer/api.py:204 #, python-format msgid "Volume %s has been transferred." msgstr "" -#: cinder/volume/api.py:141 +#: cinder/volume/api.py:188 msgid "" "Invalid volume_type provided (requested type must match source volume, or be " "omitted). You should omit the argument." msgstr "" -#: cinder/volume/api.py:148 +#: cinder/volume/api.py:201 msgid "" "Invalid volume_type provided (requested type must match source snapshot, or " "be omitted). You should omit the argument." @@ -4095,24 +4100,24 @@ msgid "Unable to query if %s is in the availability zone set" msgstr "" -#: cinder/volume/api.py:185 cinder/volume/api.py:187 +#: cinder/volume/api.py:241 msgid "Failed to create api volume flow" msgstr "" -#: cinder/volume/api.py:216 +#: cinder/volume/api.py:274 msgid "Failed to update quota for deleting volume" msgstr "" -#: cinder/volume/api.py:228 +#: cinder/volume/api.py:292 #, python-format msgid "Volume status must be available or error, but current status is: %s" msgstr "" -#: cinder/volume/api.py:238 +#: cinder/volume/api.py:305 msgid "Volume cannot be deleted while migrating" msgstr "" -#: cinder/volume/api.py:243 +#: cinder/volume/api.py:319 #, python-format msgid "Volume still has %d dependent snapshots" msgstr "" @@ -4131,146 +4136,147 @@ msgid "status must be in-use to detach" msgstr "" -#: cinder/volume/api.py:371 +#: cinder/volume/api.py:466 msgid "Volume status must be available to reserve" msgstr "" -#: cinder/volume/api.py:447 +#: cinder/volume/api.py:569 cinder/volume/api.py:687 msgid "Snapshot cannot be created while volume is migrating" msgstr "" -#: cinder/volume/api.py:451 +#: cinder/volume/api.py:578 msgid "must be available" msgstr "" -#: cinder/volume/api.py:473 +#: cinder/volume/api.py:600 cinder/volume/api.py:728 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot " "(%(d_consumed)dG of %(d_quota)dG already consumed)" msgstr "" -#: cinder/volume/api.py:485 +#: cinder/volume/api.py:612 cinder/volume/api.py:740 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d " "snapshots already consumed)" msgstr "" -#: cinder/volume/api.py:536 +#: cinder/volume/api.py:788 msgid "Volume Snapshot status must be available or error" msgstr "" -#: cinder/volume/api.py:564 cinder/volume/flows/api/create_volume.py:208 +#: cinder/volume/api.py:827 cinder/volume/flows/api/create_volume.py:266 msgid "Metadata property key blank" msgstr "" -#: cinder/volume/api.py:568 +#: cinder/volume/api.py:831 msgid "Metadata property key greater than 255 characters" msgstr "" -#: cinder/volume/api.py:572 +#: cinder/volume/api.py:835 msgid "Metadata property value greater than 255 characters" msgstr "" -#: cinder/volume/api.py:703 cinder/volume/api.py:777 +#: cinder/volume/api.py:966 cinder/volume/api.py:1062 msgid "Volume status must be available/in-use." msgstr "" -#: cinder/volume/api.py:706 +#: cinder/volume/api.py:969 msgid "Volume status is in-use." msgstr "" -#: cinder/volume/api.py:735 +#: cinder/volume/api.py:1017 msgid "Volume status must be available to extend." msgstr "" -#: cinder/volume/api.py:740 +#: cinder/volume/api.py:1022 #, python-format msgid "" "New size for extend must be greater than current size. (current: %(size)s, " "extended: %(new_size)s)" msgstr "" -#: cinder/volume/api.py:755 +#: cinder/volume/api.py:1040 #, python-format msgid "" "Quota exceeded for %(s_pid)s, tried to extend volume by %(s_size)sG, " "(%(d_consumed)dG of %(d_quota)dG already consumed)." msgstr "" -#: cinder/volume/api.py:783 +#: cinder/volume/api.py:1068 msgid "Volume is already part of an active migration" msgstr "" -#: cinder/volume/api.py:789 +#: cinder/volume/api.py:1074 msgid "volume must not have snapshots" msgstr "" -#: cinder/volume/api.py:802 +#: cinder/volume/api.py:1103 #, python-format msgid "No available service named %s" msgstr "" -#: cinder/volume/api.py:808 +#: cinder/volume/api.py:1109 msgid "Destination host must be different than current host" msgstr "" -#: cinder/volume/api.py:838 +#: cinder/volume/api.py:1139 msgid "Source volume not mid-migration." msgstr "" -#: cinder/volume/api.py:842 +#: cinder/volume/api.py:1143 msgid "Destination volume not mid-migration." msgstr "" -#: cinder/volume/api.py:847 +#: cinder/volume/api.py:1148 #, python-format msgid "Destination has migration_status %(stat)s, expected %(exp)s." msgstr "" -#: cinder/volume/api.py:858 +#: cinder/volume/api.py:1159 msgid "Volume status must be available to update readonly flag." msgstr "" -#: cinder/volume/api.py:867 +#: cinder/volume/api.py:1168 #, python-format msgid "Unable to update type due to incorrect status on volume: %s" msgstr "" -#: cinder/volume/api.py:873 +#: cinder/volume/api.py:1174 #, python-format msgid "Volume %s is already part of an active migration." msgstr "" -#: cinder/volume/api.py:879 +#: cinder/volume/api.py:1180 #, python-format msgid "migration_policy must be 'on-demand' or 'never', passed: %s" msgstr "" -#: cinder/volume/api.py:892 +#: cinder/volume/api.py:1199 #, python-format msgid "Invalid volume_type passed: %s" msgstr "" -#: cinder/volume/api.py:905 +#: cinder/volume/api.py:1212 #, python-format msgid "New volume_type same as original: %s" msgstr "" -#: cinder/volume/api.py:920 +#: cinder/volume/api.py:1227 msgid "Retype cannot change encryption requirements" msgstr "" -#: cinder/volume/api.py:932 +#: cinder/volume/api.py:1239 msgid "Retype cannot change front-end qos specs for in-use volumes" msgstr "" -#: cinder/volume/api.py:963 +#: cinder/volume/api.py:1236 msgid "Unable to find service for given host." msgstr "" -#: cinder/volume/driver.py:195 cinder/volume/drivers/netapp/nfs.py:176 +#: cinder/volume/driver.py:231 cinder/volume/drivers/hds/nfs.py:352 +#: cinder/volume/drivers/netapp/nfs.py:186 #, python-format msgid "Recovering from a failed execute. Try number %s" msgstr "実行失敗からリカバリーします。%s 回目のトライ。" @@ -4280,7 +4286,7 @@ msgid "copy_data_between_volumes %(src)s -> %(dest)s." msgstr "" -#: cinder/volume/driver.py:291 cinder/volume/driver.py:305 +#: cinder/volume/driver.py:392 cinder/volume/driver.py:406 #, python-format msgid "Failed to attach volume %(vol)s" msgstr "" @@ -4305,30 +4311,29 @@ msgid "Volume %s: creating export" msgstr "" -#: cinder/volume/driver.py:385 cinder/volume/manager.py:789 +#: cinder/volume/driver.py:474 cinder/volume/manager.py:887 #, python-format msgid "" "Failed updating model of volume %(volume_id)s with driver provided model " "%(model)s" msgstr "" -#: cinder/volume/driver.py:396 cinder/volume/manager.py:773 -#: cinder/volume/manager.py:798 +#: cinder/volume/driver.py:497 cinder/volume/manager.py:927 #, python-format msgid "Unable to fetch connection information from backend: %(err)s" msgstr "" -#: cinder/volume/driver.py:402 +#: cinder/volume/driver.py:503 #, python-format msgid "Error encountered during cleanup of a failed attach: %(ex)s" msgstr "" -#: cinder/volume/driver.py:422 +#: cinder/volume/driver.py:528 cinder/volume/drivers/ibm/flashsystem.py:881 #, python-format msgid "Unable to access the backend storage via the path %(path)s." msgstr "" -#: cinder/volume/driver.py:450 cinder/volume/manager.py:861 +#: cinder/volume/driver.py:268 cinder/volume/manager.py:978 #, python-format msgid "Unable to terminate volume connection: %(err)s" msgstr "" @@ -4339,7 +4344,7 @@ msgid "volume %s: removing export" msgstr "ボリューム %s のエクスポートを解除します。" -#: cinder/volume/driver.py:459 cinder/volume/manager.py:870 +#: cinder/volume/driver.py:265 cinder/volume/manager.py:755 #, python-format msgid "Error detaching volume %(volume)s, due to remove export failure." msgstr "" @@ -4354,19 +4359,20 @@ msgid "Restoring backup %(backup)s to volume %(volume)s." msgstr "" -#: cinder/volume/driver.py:529 +#: cinder/volume/driver.py:614 msgid "Extend volume not implemented" msgstr "" -#: cinder/volume/driver.py:593 cinder/volume/driver.py:601 +#: cinder/volume/driver.py:695 cinder/volume/driver.py:703 msgid "Manage existing volume not implemented." msgstr "" -#: cinder/volume/driver.py:639 cinder/volume/drivers/emc/emc_smis_iscsi.py:154 +#: cinder/volume/driver.py:854 +#: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:150 msgid "ISCSI provider_location not stored, using discovery" msgstr "" -#: cinder/volume/driver.py:652 +#: cinder/volume/driver.py:867 #, python-format msgid "ISCSI discovery attempt failed for:%s" msgstr "" @@ -4376,7 +4382,7 @@ msgid "Error from iscsiadm -m discovery: %s" msgstr "" -#: cinder/volume/driver.py:701 +#: cinder/volume/driver.py:981 cinder/volume/targets/iscsi.py:79 #, python-format msgid "Could not find iSCSI export for volume %s" msgstr "" @@ -4387,7 +4393,7 @@ msgid "ISCSI Discovery: Found %s" msgstr "" -#: cinder/volume/driver.py:802 +#: cinder/volume/driver.py:1018 msgid "The volume driver requires the iSCSI initiator name in the connector." msgstr "" @@ -4405,28 +4411,27 @@ msgid "Updating volume stats" msgstr "" -#: cinder/volume/driver.py:1023 +#: cinder/volume/driver.py:1352 msgid "Driver must implement initialize_connection" msgstr "" -#: cinder/volume/iscsi.py:65 cinder/volume/iscsi.py:91 -#: cinder/volume/iscsi.py:234 +#: cinder/volume/iscsi.py:69 cinder/volume/iscsi.py:95 +#: cinder/volume/iscsi.py:240 #, python-format msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s" msgstr "" -#: cinder/volume/iscsi.py:80 +#: cinder/volume/iscsi.py:84 #, python-format msgid "" "Skipping remove_export. No iscsi_target is presently exported for volume: %s" msgstr "" -#: cinder/volume/iscsi.py:100 +#: cinder/volume/iscsi.py:104 msgid "Detected inconsistency in provider_location id" msgstr "" -#: cinder/volume/iscsi.py:101 cinder/volume/drivers/lvm.py:572 -#: cinder/volume/drivers/huawei/rest_common.py:1225 +#: cinder/cmd/manage.py:375 #, python-format msgid "%s" msgstr "" @@ -4441,12 +4446,12 @@ msgid "volume_info:%s" msgstr "" -#: cinder/volume/iscsi.py:252 +#: cinder/volume/iscsi.py:258 #, python-format msgid "Skipping ensure_export. No iscsi_target provision for volume: %s" msgstr "" -#: cinder/volume/manager.py:193 +#: cinder/volume/manager.py:176 #, python-format msgid "" "Driver path %s is deprecated, update your configuration to the new path." @@ -4464,12 +4469,12 @@ "Starting FC Zone Manager %(zm_version)s, Driver %(drv_name)s %(drv_version)s" msgstr "" -#: cinder/volume/manager.py:238 +#: cinder/volume/manager.py:246 #, python-format msgid "Starting volume driver %(driver_name)s (%(version)s)" msgstr "" -#: cinder/volume/manager.py:245 +#: cinder/volume/manager.py:253 #, python-format msgid "Error encountered during initialization of driver: %(name)s" msgstr "" @@ -4479,22 +4484,22 @@ msgid "Re-exporting %s volumes" msgstr "%s 個のボリュームを再エクスポートします。" -#: cinder/volume/manager.py:267 +#: cinder/volume/manager.py:277 #, python-format msgid "Failed to re-export volume %s: setting to error state" msgstr "" -#: cinder/volume/manager.py:274 +#: cinder/volume/manager.py:284 #, python-format msgid "volume %s stuck in a downloading state" msgstr "" -#: cinder/volume/manager.py:281 +#: cinder/volume/manager.py:291 #, python-format msgid "volume %s: skipping export" msgstr "ボリューム %s のエキスポートをスキップします。" -#: cinder/volume/manager.py:283 +#: cinder/volume/manager.py:293 #, python-format msgid "" "Error encountered during re-exporting phase of driver initialization: " @@ -4505,39 +4510,39 @@ msgid "Resuming any in progress delete operations" msgstr "" -#: cinder/volume/manager.py:296 +#: cinder/volume/manager.py:306 #, python-format msgid "Resuming delete on volume: %s" msgstr "" -#: cinder/volume/manager.py:338 cinder/volume/manager.py:340 +#: cinder/volume/manager.py:351 msgid "Failed to create manager volume flow" msgstr "" -#: cinder/volume/manager.py:384 cinder/volume/manager.py:401 +#: cinder/volume/manager.py:422 #, python-format msgid "volume %s: deleting" msgstr "ボリューム %s を削除します。" -#: cinder/volume/manager.py:390 +#: cinder/volume/manager.py:457 msgid "volume is not local to this node" msgstr "" -#: cinder/volume/manager.py:407 +#: cinder/volume/manager.py:445 #, python-format msgid "Cannot delete volume %s: volume is busy" msgstr "" -#: cinder/volume/manager.py:434 +#: cinder/volume/manager.py:472 msgid "Failed to update usages deleting volume" msgstr "" -#: cinder/volume/manager.py:440 +#: cinder/volume/manager.py:478 #, python-format msgid "volume %s: deleted successfully" msgstr "ボリューム %s の削除に成功しました。" -#: cinder/volume/manager.py:457 +#: cinder/volume/manager.py:508 #, python-format msgid "snapshot %s: creating" msgstr "" @@ -4547,54 +4552,54 @@ msgid "snapshot %(snap_id)s: creating" msgstr "" -#: cinder/volume/manager.py:496 +#: cinder/volume/manager.py:543 cinder/volume/manager.py:1834 #, python-format msgid "" "Failed updating %(snapshot_id)s metadata using the provided volumes " "%(volume_id)s metadata" msgstr "" -#: cinder/volume/manager.py:502 +#: cinder/volume/manager.py:558 #, python-format msgid "snapshot %s: created successfully" msgstr "" -#: cinder/volume/manager.py:514 cinder/volume/manager.py:524 +#: cinder/volume/manager.py:570 #, python-format msgid "snapshot %s: deleting" msgstr "" -#: cinder/volume/manager.py:532 +#: cinder/volume/manager.py:588 #, python-format msgid "Cannot delete snapshot %s: snapshot is busy" msgstr "" -#: cinder/volume/manager.py:562 +#: cinder/volume/manager.py:618 cinder/volume/manager.py:1934 msgid "Failed to update usages deleting snapshot" msgstr "" -#: cinder/volume/manager.py:565 +#: cinder/volume/manager.py:621 #, python-format msgid "snapshot %s: deleted successfully" msgstr "" -#: cinder/volume/manager.py:585 +#: cinder/volume/manager.py:670 msgid "being attached by another instance" msgstr "" -#: cinder/volume/manager.py:589 +#: cinder/volume/manager.py:674 msgid "being attached by another host" msgstr "" -#: cinder/volume/manager.py:593 +#: cinder/volume/manager.py:678 msgid "being attached by different mode" msgstr "" -#: cinder/volume/manager.py:596 +#: cinder/volume/manager.py:682 msgid "status must be available or attaching" msgstr "" -#: cinder/volume/manager.py:689 +#: cinder/volume/manager.py:751 #, python-format msgid "Error detaching volume %(volume)s, due to uninitialized driver." msgstr "" @@ -4609,34 +4614,34 @@ msgid "Zoning Mode: %s" msgstr "" -#: cinder/volume/manager.py:917 +#: cinder/volume/manager.py:1055 msgid "failed to create new_volume on destination host" msgstr "" -#: cinder/volume/manager.py:920 +#: cinder/volume/manager.py:1058 msgid "timeout creating new_volume on destination host" msgstr "" -#: cinder/volume/manager.py:943 +#: cinder/volume/manager.py:1082 #, python-format msgid "Failed to copy volume %(vol1)s to %(vol2)s" msgstr "" -#: cinder/volume/manager.py:972 +#: cinder/volume/manager.py:1111 #, python-format msgid "" "migrate_volume_completion: completing migration for volume %(vol1)s " "(temporary volume %(vol2)s" msgstr "" -#: cinder/volume/manager.py:984 +#: cinder/volume/manager.py:1121 #, python-format msgid "" "migrate_volume_completion is cleaning up an error for volume %(vol1)s " "(temporary volume %(vol2)s" msgstr "" -#: cinder/volume/manager.py:1003 +#: cinder/volume/manager.py:1140 #, python-format msgid "Failed to delete migration source vol %(vol)s: %(err)s" msgstr "" @@ -4646,76 +4651,75 @@ msgid "volume %s: calling driver migrate_volume" msgstr "" -#: cinder/volume/manager.py:1079 cinder/volume/drivers/emc/emc_cli_iscsi.py:247 -#: cinder/volume/drivers/emc/emc_vnx_cli.py:226 +#: cinder/volume/manager.py:1192 msgid "Updating volume status" msgstr "" -#: cinder/volume/manager.py:1087 +#: cinder/volume/manager.py:1200 #, python-format msgid "" "Unable to update stats, %(driver_name)s -%(driver_version)s %(config_group)s " "driver is uninitialized." msgstr "" -#: cinder/volume/manager.py:1109 +#: cinder/volume/manager.py:1236 #, python-format msgid "Notification {%s} received" msgstr "" -#: cinder/volume/manager.py:1144 +#: cinder/volume/manager.py:1304 #, python-format msgid "volume %s: extending" msgstr "" -#: cinder/volume/manager.py:1146 +#: cinder/volume/manager.py:1306 #, python-format msgid "volume %s: extended successfully" msgstr "" -#: cinder/volume/manager.py:1148 +#: cinder/volume/manager.py:1308 #, python-format msgid "volume %s: Error trying to extend volume" msgstr "" -#: cinder/volume/manager.py:1153 +#: cinder/volume/manager.py:1353 #, python-format msgid "Volume %s: Error trying to extend volume" msgstr "" -#: cinder/volume/manager.py:1213 +#: cinder/volume/manager.py:1387 msgid "Failed to update usages while retyping volume." msgstr "" -#: cinder/volume/manager.py:1214 +#: cinder/volume/manager.py:1428 msgid "Failed to get old volume type quota reservations" msgstr "" -#: cinder/volume/manager.py:1234 +#: cinder/volume/manager.py:1419 #, python-format msgid "Volume %s: retyped successfully" msgstr "" -#: cinder/volume/manager.py:1237 +#: cinder/volume/manager.py:1422 #, python-format msgid "" "Volume %s: driver error when trying to retype, falling back to generic " "mechanism." msgstr "" -#: cinder/volume/manager.py:1248 +#: cinder/volume/manager.py:1473 msgid "Retype requires migration but is not allowed." msgstr "" -#: cinder/volume/manager.py:1256 +#: cinder/volume/manager.py:1481 msgid "Volume must not have snapshots." msgstr "" -#: cinder/volume/manager.py:1292 +#: cinder/volume/manager.py:1489 msgid "Failed to create manage_existing flow." msgstr "" -#: cinder/volume/manager.py:1294 +#: cinder/volume/manager.py:1531 msgid "Failed to create manage existing flow." msgstr "" @@ -4729,98 +4733,98 @@ msgid "Zoning op: %s" msgstr "" -#: cinder/volume/qos_specs.py:57 +#: cinder/volume/qos_specs.py:58 #, python-format msgid "Valid consumer of QoS specs are: %s" msgstr "" -#: cinder/volume/qos_specs.py:84 cinder/volume/qos_specs.py:105 -#: cinder/volume/qos_specs.py:155 cinder/volume/qos_specs.py:197 -#: cinder/volume/qos_specs.py:211 cinder/volume/qos_specs.py:225 -#: cinder/volume/volume_types.py:43 +#: cinder/volume/qos_specs.py:85 cinder/volume/qos_specs.py:106 +#: cinder/volume/qos_specs.py:156 cinder/volume/qos_specs.py:198 +#: cinder/volume/qos_specs.py:212 cinder/volume/qos_specs.py:226 +#: cinder/volume/volume_types.py:45 #, python-format msgid "DB error: %s" msgstr "" -#: cinder/volume/qos_specs.py:123 cinder/volume/qos_specs.py:140 -#: cinder/volume/qos_specs.py:272 cinder/volume/volume_types.py:52 -#: cinder/volume/volume_types.py:99 +#: cinder/volume/qos_specs.py:124 cinder/volume/qos_specs.py:141 +#: cinder/volume/qos_specs.py:274 cinder/volume/volume_types.py:64 +#: cinder/volume/volume_types.py:79 cinder/volume/volume_types.py:133 msgid "id cannot be None" msgstr "" -#: cinder/volume/qos_specs.py:156 +#: cinder/volume/qos_specs.py:157 #, python-format msgid "Failed to get all associations of qos specs %s" msgstr "" -#: cinder/volume/qos_specs.py:189 +#: cinder/volume/qos_specs.py:190 #, python-format msgid "" "Type %(type_id)s is already associated with another qos specs: " "%(qos_specs_id)s" msgstr "" -#: cinder/volume/qos_specs.py:198 +#: cinder/volume/qos_specs.py:199 #, python-format msgid "Failed to associate qos specs %(id)s with type: %(vol_type_id)s" msgstr "" -#: cinder/volume/qos_specs.py:212 +#: cinder/volume/qos_specs.py:213 #, python-format msgid "Failed to disassociate qos specs %(id)s with type: %(vol_type_id)s" msgstr "" -#: cinder/volume/qos_specs.py:226 +#: cinder/volume/qos_specs.py:227 #, python-format msgid "Failed to disassociate qos specs %s." msgstr "" -#: cinder/volume/qos_specs.py:284 cinder/volume/volume_types.py:111 +#: cinder/volume/qos_specs.py:286 cinder/volume/volume_types.py:145 msgid "name cannot be None" msgstr "" -#: cinder/volume/utils.py:115 +#: cinder/volume/utils.py:309 #, python-format msgid "" "Incorrect value error: %(blocksize)s, it may indicate that " "'volume_dd_blocksize' was configured incorrectly. Fall back to default." msgstr "" -#: cinder/volume/utils.py:176 +#: cinder/volume/utils.py:363 #, python-format msgid "Performing secure delete on volume: %s" msgstr "" -#: cinder/volume/volume_types.py:130 +#: cinder/volume/volume_types.py:133 #, python-format msgid "" "Default volume type is not found, please check default_volume_type config: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:138 cinder/volume/drivers/lvm.py:284 -#: cinder/volume/drivers/zadara.py:509 cinder/volume/drivers/nexenta/nfs.py:189 +#: cinder/volume/drivers/block_device.py:142 cinder/volume/drivers/lvm.py:285 +#: cinder/volume/drivers/nexenta/nfs.py:191 #, python-format msgid "Creating clone of volume: %s" msgstr "" -#: cinder/volume/drivers/block_device.py:206 +#: cinder/volume/drivers/block_device.py:174 msgid "No free disk" msgstr "" -#: cinder/volume/drivers/block_device.py:219 +#: cinder/volume/drivers/block_device.py:187 msgid "No big enough free disk" msgstr "" -#: cinder/volume/drivers/coraid.py:84 +#: cinder/volume/drivers/coraid.py:88 #, python-format msgid "Invalid ESM url scheme \"%s\". Supported https only." msgstr "" -#: cinder/volume/drivers/coraid.py:111 +#: cinder/volume/drivers/coraid.py:115 msgid "Invalid REST handle name. Expected path." msgstr "" -#: cinder/volume/drivers/coraid.py:134 +#: cinder/volume/drivers/coraid.py:138 #, python-format msgid "Call to json.loads() failed: %(ex)s. Response: %(resp)s" msgstr "" @@ -4829,11 +4833,11 @@ msgid "Session is expired. Relogin on ESM." msgstr "" -#: cinder/volume/drivers/coraid.py:244 +#: cinder/volume/drivers/coraid.py:248 msgid "Reply is empty." msgstr "" -#: cinder/volume/drivers/coraid.py:246 +#: cinder/volume/drivers/coraid.py:250 msgid "Error message is empty." msgstr "" @@ -4867,7 +4871,7 @@ msgid "Volume \"%(name)s\" resized. New size is %(size)s GB." msgstr "" -#: cinder/volume/drivers/coraid.py:385 +#: cinder/volume/drivers/coraid.py:394 msgid "Cannot create clone volume in different repository." msgstr "" @@ -4897,7 +4901,7 @@ msgid "Sending CLI command: '%s'" msgstr "" -#: cinder/volume/drivers/eqlx.py:169 +#: cinder/volume/drivers/eqlx.py:183 msgid "Error executing EQL command" msgstr "" @@ -4906,14 +4910,16 @@ msgid "EQL-driver: executing \"%s\"" msgstr "" -#: cinder/volume/drivers/eqlx.py:208 +#: cinder/volume/drivers/eqlx.py:227 #, python-format msgid "" "SSH Command failed after '%(total_attempts)r' attempts : '%(command)s'" msgstr "" -#: cinder/volume/drivers/eqlx.py:215 cinder/volume/drivers/san/san.py:149 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:414 +#: cinder/volume/drivers/san/san.py:151 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:417 +#: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:271 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:397 #, python-format msgid "Error running SSH command: %s" msgstr "" @@ -4932,7 +4938,8 @@ msgid "Failed to setup the Dell EqualLogic driver" msgstr "" -#: cinder/volume/drivers/eqlx.py:320 +#: cinder/volume/drivers/dell/dell_storagecenter_common.py:201 +#: cinder/volume/drivers/dell/dell_storagecenter_common.py:231 #, python-format msgid "Failed to create volume %s" msgstr "" @@ -4993,36 +5000,36 @@ "Failed to extend_volume %(name)s from %(current_size)sGB to %(new_size)sGB" msgstr "" -#: cinder/volume/drivers/glusterfs.py:101 +#: cinder/volume/drivers/glusterfs.py:135 #, python-format msgid "There's no Gluster config file configured (%s)" msgstr "" -#: cinder/volume/drivers/glusterfs.py:106 +#: cinder/volume/drivers/glusterfs.py:140 #, python-format msgid "Gluster config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/glusterfs.py:118 +#: cinder/volume/drivers/glusterfs.py:152 msgid "mount.glusterfs is not installed" msgstr "" -#: cinder/volume/drivers/glusterfs.py:176 +#: cinder/volume/drivers/remotefs.py:616 #, python-format msgid "Cloning volume %(src)s to volume %(dst)s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:181 +#: cinder/volume/drivers/remotefs.py:792 msgid "Volume status must be 'available'." msgstr "" -#: cinder/volume/drivers/glusterfs.py:217 cinder/volume/drivers/nfs.py:141 -#: cinder/volume/drivers/netapp/nfs.py:787 +#: cinder/volume/drivers/glusterfs.py:183 cinder/volume/drivers/remotefs.py:115 +#: cinder/volume/drivers/netapp/nfs.py:820 #, python-format msgid "casted to %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:231 +#: cinder/volume/drivers/remotefs.py:1025 msgid "Snapshot status must be \"available\" to clone." msgstr "" @@ -5036,12 +5043,12 @@ msgid "will copy from snapshot at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:290 cinder/volume/drivers/nfs.py:191 +#: cinder/volume/drivers/glusterfs.py:238 cinder/volume/drivers/remotefs.py:167 #, python-format msgid "Volume %s does not have provider_location specified, skipping" msgstr "" -#: cinder/volume/drivers/glusterfs.py:388 +#: cinder/volume/drivers/remotefs.py:1155 #, python-format msgid "" "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)" @@ -5052,11 +5059,11 @@ msgid "nova call result: %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:420 +#: cinder/volume/drivers/glusterfs.py:605 msgid "Call to Nova to create snapshot failed" msgstr "" -#: cinder/volume/drivers/glusterfs.py:442 +#: cinder/volume/drivers/remotefs.py:1222 msgid "Nova returned \"error\" status while creating snapshot." msgstr "" @@ -5065,7 +5072,7 @@ msgid "Status of snapshot %(id)s is now %(status)s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:459 +#: cinder/volume/drivers/remotefs.py:1239 #, python-format msgid "Timed out while waiting for Nova update for creation of snapshot %s." msgstr "" @@ -5080,7 +5087,7 @@ msgid "volume id: %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:549 +#: cinder/volume/drivers/remotefs.py:591 msgid "'active' must be present when writing snap_info." msgstr "" @@ -5089,11 +5096,11 @@ msgid "deleting snapshot %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:583 +#: cinder/volume/drivers/remotefs.py:855 msgid "Volume status must be \"available\" or \"in-use\"." msgstr "" -#: cinder/volume/drivers/glusterfs.py:599 +#: cinder/volume/drivers/remotefs.py:700 #, python-format msgid "" "Snapshot record for %s is not present, allowing snapshot_delete to proceed." @@ -5114,12 +5121,12 @@ msgid "No %(base_id)s found for %(file)s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:697 +#: cinder/volume/drivers/remotefs.py:972 #, python-format msgid "No file found with %s as backing file." msgstr "" -#: cinder/volume/drivers/glusterfs.py:707 +#: cinder/volume/drivers/remotefs.py:981 #, python-format msgid "No snap found with %s as backing file." msgstr "" @@ -5129,12 +5136,12 @@ msgid "No file depends on %s." msgstr "" -#: cinder/volume/drivers/glusterfs.py:744 +#: cinder/volume/drivers/remotefs.py:1010 #, python-format msgid "Check condition failed: %s expected to be None." msgstr "" -#: cinder/volume/drivers/glusterfs.py:795 +#: cinder/volume/drivers/glusterfs.py:317 msgid "Call to Nova delete snapshot failed" msgstr "" @@ -5143,28 +5150,29 @@ msgid "status of snapshot %s is still \"deleting\"... waiting" msgstr "" -#: cinder/volume/drivers/glusterfs.py:819 +#: cinder/volume/drivers/remotefs.py:1311 #, python-format msgid "Unable to delete snapshot %(id)s, status: %(status)s." msgstr "" -#: cinder/volume/drivers/glusterfs.py:832 +#: cinder/volume/drivers/remotefs.py:1324 #, python-format msgid "" "Timed out while waiting for Nova update for deletion of snapshot %(id)s." msgstr "" -#: cinder/volume/drivers/glusterfs.py:921 +#: cinder/volume/drivers/glusterfs.py:345 cinder/volume/drivers/quobyte.py:242 #, python-format msgid "%s must be a valid raw or qcow2 image." msgstr "" -#: cinder/volume/drivers/glusterfs.py:985 +#: cinder/volume/drivers/glusterfs.py:388 cinder/volume/drivers/quobyte.py:264 +#: cinder/volume/drivers/smbfs.py:446 msgid "" "Extend volume is only supported for this driver when no snapshots exist." msgstr "" -#: cinder/volume/drivers/glusterfs.py:993 +#: cinder/volume/drivers/glusterfs.py:396 cinder/volume/drivers/quobyte.py:272 #, python-format msgid "Unrecognized backing format: %s" msgstr "" @@ -5174,12 +5182,12 @@ msgid "creating new volume at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:1011 +#: cinder/volume/drivers/glusterfs.py:414 #, python-format msgid "file already exists at %s" msgstr "" -#: cinder/volume/drivers/glusterfs.py:1037 cinder/volume/drivers/nfs.py:178 +#: cinder/volume/drivers/glusterfs.py:481 cinder/volume/drivers/remotefs.py:152 #, python-format msgid "Exception during mounting %s" msgstr "" @@ -5196,47 +5204,47 @@ "Snapshot operations will not be supported." msgstr "" -#: cinder/volume/drivers/glusterfs.py:1162 +#: cinder/volume/drivers/glusterfs.py:512 msgid "Backup is not supported for GlusterFS volumes with snapshots." msgstr "" -#: cinder/volume/drivers/glusterfs.py:1177 +#: cinder/volume/drivers/glusterfs.py:527 #, python-format msgid "" "No snapshots found in database, but %(path)s has backing file " "%(backing_file)s!" msgstr "" -#: cinder/volume/drivers/glusterfs.py:1185 +#: cinder/volume/drivers/glusterfs.py:535 msgid "Backup is only supported for raw-formatted GlusterFS volumes." msgstr "" -#: cinder/volume/drivers/lvm.py:152 +#: cinder/volume/drivers/lvm.py:153 #, python-format msgid "Volume device file path %s does not exist." msgstr "" -#: cinder/volume/drivers/lvm.py:159 +#: cinder/volume/drivers/lvm.py:160 #, python-format msgid "Size for volume: %s not found, cannot secure delete." msgstr "" -#: cinder/volume/drivers/lvm.py:229 +#: cinder/volume/drivers/lvm.py:230 #, python-format msgid "Unabled to delete due to existing snapshot for volume: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:246 +#: cinder/volume/drivers/lvm.py:247 #, python-format msgid "snapshot: %s not found, skipping delete operations" msgstr "" -#: cinder/volume/drivers/lvm.py:347 +#: cinder/volume/drivers/lvm.py:349 #, python-format msgid "Unable to update stats on non-initialized Volume Group: %s" msgstr "" -#: cinder/volume/drivers/lvm.py:403 +#: cinder/volume/drivers/lvm.py:446 #, python-format msgid "" "Failed to rename logical volume %(name)s, error message was: %(err_msg)s" @@ -5246,14 +5254,14 @@ msgid "Reference must contain lv_name element." msgstr "" -#: cinder/volume/drivers/lvm.py:436 +#: cinder/volume/drivers/lvm.py:479 cinder/volume/drivers/rbd.py:979 #, python-format msgid "" "Failed to manage existing volume %(name)s, because reported size %(size)s " "was not a floating-point number." msgstr "" -#: cinder/volume/drivers/lvm.py:505 +#: cinder/volume/drivers/lvm.py:526 #, python-format msgid "Error creating iSCSI target, retrying creation for target: %s" msgstr "" @@ -5262,37 +5270,37 @@ msgid "Driver specific implementation needs to return mount_point_base." msgstr "" -#: cinder/volume/drivers/nfs.py:282 +#: cinder/volume/drivers/remotefs.py:346 cinder/volume/drivers/smbfs.py:529 #, python-format msgid "Expected volume size was %d" msgstr "" -#: cinder/volume/drivers/nfs.py:283 +#: cinder/volume/drivers/remotefs.py:347 #, python-format msgid " but size is now %d" msgstr "" -#: cinder/volume/drivers/nfs.py:380 +#: cinder/volume/drivers/remotefs.py:365 #, python-format msgid "%s is already mounted" msgstr "" -#: cinder/volume/drivers/nfs.py:432 +#: cinder/volume/drivers/nfs.py:113 #, python-format msgid "There's no NFS config file configured (%s)" msgstr "" -#: cinder/volume/drivers/nfs.py:437 +#: cinder/volume/drivers/nfs.py:118 #, python-format msgid "NFS config file at %(config)s doesn't exist" msgstr "" -#: cinder/volume/drivers/nfs.py:442 +#: cinder/volume/drivers/nfs.py:123 #, python-format msgid "NFS config 'nfs_oversub_ratio' invalid. Must be > 0: %s" msgstr "" -#: cinder/volume/drivers/nfs.py:450 +#: cinder/volume/drivers/nfs.py:131 #, python-format msgid "NFS config 'nfs_used_ratio' invalid. Must be > 0 and <= 1.0: %s" msgstr "" @@ -5317,37 +5325,37 @@ msgid "%s reserved space is above nfs_oversub_ratio" msgstr "" -#: cinder/volume/drivers/rbd.py:161 +#: cinder/volume/drivers/rbd.py:163 #, python-format msgid "Invalid argument - whence=%s not supported" msgstr "" -#: cinder/volume/drivers/rbd.py:165 +#: cinder/volume/drivers/rbd.py:167 msgid "Invalid argument" msgstr "" -#: cinder/volume/drivers/rbd.py:184 +#: cinder/volume/drivers/rbd.py:187 msgid "fileno() not supported by RBD()" msgstr "" -#: cinder/volume/drivers/rbd.py:211 +#: cinder/volume/drivers/rbd.py:215 #, python-format msgid "error opening rbd image %s" msgstr "" -#: cinder/volume/drivers/rbd.py:260 +#: cinder/volume/drivers/rbd.py:274 msgid "rados and rbd python libraries not found" msgstr "" -#: cinder/volume/drivers/rbd.py:266 +#: cinder/volume/drivers/rbd.py:280 msgid "error connecting to ceph cluster" msgstr "" -#: cinder/volume/drivers/rbd.py:347 cinder/volume/drivers/sheepdog.py:178 +#: cinder/volume/drivers/rbd.py:369 cinder/volume/drivers/sheepdog.py:179 msgid "error refreshing volume stats" msgstr "" -#: cinder/volume/drivers/rbd.py:378 +#: cinder/volume/drivers/rbd.py:403 #, python-format msgid "clone depth exceeds limit of %s" msgstr "" @@ -5410,7 +5418,7 @@ msgid "deleting parent %s" msgstr "" -#: cinder/volume/drivers/rbd.py:596 +#: cinder/volume/drivers/rbd.py:617 #, python-format msgid "volume %s no longer exists in backend" msgstr "" @@ -5424,7 +5432,7 @@ msgid "deleting rbd volume %s" msgstr "" -#: cinder/volume/drivers/rbd.py:632 +#: cinder/volume/drivers/rbd.py:660 msgid "" "ImageBusy error raised while deleting rbd volume. This may have been caused " "by a connection from a client that has crashed and, if so, may be resolved " @@ -5440,15 +5448,15 @@ msgid "connection data: %s" msgstr "" -#: cinder/volume/drivers/rbd.py:711 +#: cinder/volume/drivers/rbd.py:769 msgid "Not stored in rbd" msgstr "" -#: cinder/volume/drivers/rbd.py:715 +#: cinder/volume/drivers/rbd.py:773 msgid "Blank components" msgstr "" -#: cinder/volume/drivers/rbd.py:718 +#: cinder/volume/drivers/rbd.py:776 msgid "Not an rbd snapshot" msgstr "" @@ -5480,7 +5488,7 @@ msgid "volume restore complete." msgstr "" -#: cinder/volume/drivers/rbd.py:846 cinder/volume/drivers/sheepdog.py:195 +#: cinder/volume/drivers/rbd.py:916 cinder/volume/drivers/sheepdog.py:188 #, python-format msgid "Failed to Extend Volume %(volname)s" msgstr "" @@ -5491,34 +5499,34 @@ msgid "Extend volume from %(old_size)s GB to %(new_size)s GB." msgstr "" -#: cinder/volume/drivers/scality.py:67 +#: cinder/volume/drivers/scality.py:75 msgid "Value required for 'scality_sofs_config'" msgstr "" -#: cinder/volume/drivers/scality.py:78 +#: cinder/volume/drivers/scality.py:86 #, python-format msgid "Cannot access 'scality_sofs_config': %s" msgstr "" -#: cinder/volume/drivers/scality.py:84 +#: cinder/volume/drivers/scality.py:92 msgid "Cannot execute /sbin/mount.sofs" msgstr "" -#: cinder/volume/drivers/scality.py:105 +#: cinder/volume/drivers/scality.py:114 msgid "Cannot mount Scality SOFS, check syslog for errors" msgstr "" -#: cinder/volume/drivers/scality.py:139 +#: cinder/volume/drivers/scality.py:146 #, python-format msgid "Cannot find volume dir for Scality SOFS at '%s'" msgstr "" -#: cinder/volume/drivers/sheepdog.py:59 +#: cinder/volume/drivers/sheepdog.py:58 #, python-format msgid "Sheepdog is not working: %s" msgstr "Sheepdog が動作していません: %s" -#: cinder/volume/drivers/sheepdog.py:64 +#: cinder/volume/drivers/sheepdog.py:63 msgid "Sheepdog is not working" msgstr "Sheepdog が機能していません" @@ -5527,31 +5535,31 @@ msgid "Payload for SolidFire API call: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:149 +#: cinder/volume/drivers/solidfire.py:153 #, python-format msgid "" "Failed to make httplib connection SolidFire Cluster: %s (verify san_ip " "settings)" msgstr "" -#: cinder/volume/drivers/solidfire.py:152 +#: cinder/volume/drivers/solidfire.py:156 #, python-format msgid "Failed to make httplib connection: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:159 +#: cinder/volume/drivers/solidfire.py:163 #, python-format msgid "" "Request to SolidFire cluster returned bad status: %(status)s / %(reason)s " "(check san_login/san_password settings)" msgstr "" -#: cinder/volume/drivers/solidfire.py:164 +#: cinder/volume/drivers/solidfire.py:168 #, python-format msgid "HTTP request failed, with status: %(status)s and reason: %(reason)s" msgstr "" -#: cinder/volume/drivers/solidfire.py:175 +#: cinder/volume/drivers/solidfire.py:179 #, python-format msgid "Call to json.loads() raised an exception: %s" msgstr "" @@ -5561,24 +5569,24 @@ msgid "Results of SolidFire API call: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:185 +#: cinder/volume/drivers/solidfire.py:189 #, python-format msgid "Clone operation encountered: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:187 +#: cinder/volume/drivers/solidfire.py:191 #, python-format msgid "Waiting for outstanding operation before retrying snapshot: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:193 +#: cinder/volume/drivers/solidfire.py:197 #, python-format msgid "Detected xDBVersionMismatch, retry %s of 5" msgstr "" -#: cinder/volume/drivers/solidfire.py:200 -#: cinder/volume/drivers/solidfire.py:269 -#: cinder/volume/drivers/solidfire.py:364 +#: cinder/volume/drivers/solidfire.py:194 +#: cinder/volume/drivers/solidfire.py:267 +#: cinder/volume/drivers/solidfire.py:363 #, python-format msgid "API response: %s" msgstr "" @@ -5593,26 +5601,27 @@ msgid "solidfire account: %s does not exist, create it..." msgstr "" -#: cinder/volume/drivers/solidfire.py:313 +#: cinder/volume/drivers/solidfire.py:317 #, python-format msgid "Failed to retrieve volume SolidFire-ID: %s in get_by_account!" msgstr "" -#: cinder/volume/drivers/solidfire.py:396 +#: cinder/volume/drivers/solidfire.py:395 msgid "Failed to get model update from clone" msgstr "" -#: cinder/volume/drivers/solidfire.py:408 +#: cinder/volume/drivers/solidfire.py:416 #, python-format msgid "Failed volume create: %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:423 +#: cinder/volume/drivers/solidfire.py:427 +#: cinder/volume/drivers/fusionio/ioControl.py:254 #, python-format msgid "More than one valid preset was detected, using %s" msgstr "" -#: cinder/volume/drivers/solidfire.py:458 +#: cinder/volume/drivers/solidfire.py:469 #, python-format msgid "Failed to get SolidFire Volume: %s" msgstr "" @@ -5622,12 +5631,12 @@ msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s." msgstr "" -#: cinder/volume/drivers/solidfire.py:476 +#: cinder/volume/drivers/solidfire.py:489 #, python-format msgid "Volume %s, not found on SF Cluster." msgstr "" -#: cinder/volume/drivers/solidfire.py:479 +#: cinder/volume/drivers/solidfire.py:492 #, python-format msgid "Found %(count)s volumes mapped to id: %(uuid)s." msgstr "" @@ -5641,11 +5650,11 @@ msgid "Account for Volume ID %s was not found on the SolidFire Cluster!" msgstr "" -#: cinder/volume/drivers/solidfire.py:554 +#: cinder/volume/drivers/solidfire.py:568 msgid "This usually means the volume was never successfully created." msgstr "" -#: cinder/volume/drivers/solidfire.py:567 +#: cinder/volume/drivers/solidfire.py:748 #, python-format msgid "Failed to delete SolidFire Volume: %s" msgstr "" @@ -5682,7 +5691,7 @@ msgid "Updating cluster status info" msgstr "" -#: cinder/volume/drivers/solidfire.py:671 +#: cinder/volume/drivers/solidfire.py:687 msgid "Failed to get updated stats" msgstr "" @@ -5710,7 +5719,7 @@ msgid "Pool %(name)s: %(total)sGB total, %(free)sGB free" msgstr "" -#: cinder/volume/drivers/zadara.py:408 cinder/volume/drivers/zadara.py:531 +#: cinder/volume/drivers/zadara.py:409 cinder/volume/drivers/zadara.py:532 #, python-format msgid "Volume %(name)s could not be found. It might be already deleted" msgstr "" @@ -5720,8 +5729,8 @@ msgid "Create snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:445 cinder/volume/drivers/zadara.py:490 -#: cinder/volume/drivers/zadara.py:516 +#: cinder/volume/drivers/zadara.py:446 cinder/volume/drivers/zadara.py:491 +#: cinder/volume/drivers/zadara.py:517 #, python-format msgid "Volume %(name)s not found" msgstr "" @@ -5731,12 +5740,12 @@ msgid "Delete snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:464 +#: cinder/volume/drivers/zadara.py:465 #, python-format msgid "snapshot: original volume %s not found, skipping delete operation" msgstr "" -#: cinder/volume/drivers/zadara.py:472 +#: cinder/volume/drivers/zadara.py:473 #, python-format msgid "snapshot: snapshot %s not found, skipping delete operation" msgstr "" @@ -5746,7 +5755,7 @@ msgid "Creating volume from snapshot: %s" msgstr "" -#: cinder/volume/drivers/zadara.py:496 +#: cinder/volume/drivers/zadara.py:497 #, python-format msgid "Snapshot %(name)s not found" msgstr "" @@ -5761,14 +5770,12 @@ msgid "iSCSI provider_location not stored for volume %s, using discovery." msgstr "" -#: cinder/volume/drivers/emc/emc_cli_iscsi.py:165 -#: cinder/volume/drivers/emc/emc_smis_iscsi.py:193 +#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:190 #, python-format msgid "Could not find iSCSI export for volume %s" msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません" -#: cinder/volume/drivers/emc/emc_cli_iscsi.py:176 -#: cinder/volume/drivers/emc/emc_smis_iscsi.py:202 +#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:199 #, python-format msgid "Cannot find device number for volume %s" msgstr "" @@ -5789,7 +5796,8 @@ msgid "update_volume_status:%s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:40 +#: cinder/volume/drivers/emc/emc_vmax_common.py:82 +#: cinder/volume/drivers/emc/emc_vmax_utils.py:60 msgid "" "Module PyWBEM not installed. Install PyWBEM using the python-pywbem package." msgstr "" @@ -5799,7 +5807,7 @@ msgid "Entering create_volume." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:86 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:160 #, python-format msgid "Create Volume: %(volume)s Size: %(size)lu" msgstr "" @@ -5815,7 +5823,7 @@ "Create Volume: %(volume)s Pool: %(pool)s Storage System: %(storage_system)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:110 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:184 #, python-format msgid "" "Error Create Volume: %(volumename)s. Storage Configuration Service not found " @@ -5835,7 +5843,7 @@ msgid "Create Volume: %(volumename)s Return code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:143 +#: cinder/volume/drivers/emc/emc_vmax_provision.py:382 #, python-format msgid "" "Error Create Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" @@ -5853,7 +5861,7 @@ msgid "Entering create_volume_from_snapshot." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:181 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:290 #, python-format msgid "" "Create Volume from Snapshot: Volume: %(volumename)s Snapshot: " @@ -5875,7 +5883,7 @@ "%(snapshotname)s. Create Volume from Snapshot is NOT supported on VMAX." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:212 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:310 #, python-format msgid "" "Error Create Volume from Snapshot: Volume: %(volumename)s Snapshot: " @@ -5892,7 +5900,7 @@ "%(sourceelement)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:242 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:350 #, python-format msgid "" "Error Create Volume from Snapshot: Volume: %(volumename)s " @@ -5941,7 +5949,7 @@ msgid "Entering create_cloned_volume." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:333 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:399 #, python-format msgid "" "Create a Clone from Volume: Volume: %(volumename)s Source Volume: " @@ -5955,7 +5963,7 @@ "Source Instance: %(src_instance)s Storage System: %(storage_system)s." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:353 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:419 #, python-format msgid "" "Error Create Cloned Volume: Volume: %(volumename)s Source Volume: " @@ -5970,7 +5978,7 @@ "%(elementname)s SyncType: 8 SourceElement: %(sourceelement)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:383 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:459 #, python-format msgid "" "Error Create Cloned Volume: Volume: %(volumename)s Source " @@ -6019,17 +6027,18 @@ msgid "Entering delete_volume." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:471 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:503 #, python-format msgid "Delete Volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:478 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:519 +#: cinder/volume/drivers/emc/emc_vmax_common.py:1989 #, python-format msgid "Volume %(name)s not found on the array. No volume to delete." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:488 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:527 #, python-format msgid "" "Error Delete Volume: %(volumename)s. Storage Configuration Service not found." @@ -6047,13 +6056,13 @@ "%(service)s TheElement: %(vol_instance)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:514 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:556 #, python-format msgid "" "Error Delete Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:523 +#: cinder/volume/drivers/emc/emc_vmax_common.py:238 #, python-format msgid "Leaving delete_volume: %(volumename)s Return code: %(rc)lu" msgstr "" @@ -6063,8 +6072,8 @@ msgid "Entering create_snapshot." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:534 -#: cinder/volume/drivers/emc/emc_vnx_cli.py:278 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577 +#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863 #, python-format msgid "Create snapshot: %(snapshot)s: volume: %(volume)s" msgstr "" @@ -6075,9 +6084,8 @@ msgid "Device ID: %(deviceid)s: Storage System: %(storagesystem)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:551 -#: cinder/volume/drivers/emc/emc_smis_common.py:553 -#: cinder/volume/drivers/emc/emc_smis_common.py:639 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:598 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:727 #, python-format msgid "Cannot find Replication Service to create snapshot for volume %s." msgstr "" @@ -6097,7 +6105,7 @@ "code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:583 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:665 #, python-format msgid "" "Error Create Snapshot: %(snapshot)s Volume: %(volume)s Error: %(errordesc)s" @@ -6115,8 +6123,7 @@ msgid "Entering delete_snapshot." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:617 -#: cinder/volume/drivers/emc/emc_vnx_cli.py:306 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:705 #, python-format msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s" msgstr "" @@ -6128,7 +6135,7 @@ "StorageSychronization_SV_SV." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:631 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:719 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s not found on the array. No " @@ -6150,27 +6157,27 @@ "code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:671 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:759 #, python-format msgid "" "Error Delete Snapshot: Volume: %(volumename)s Snapshot: %(snapshotname)s. " "Return code: %(rc)lu. Error: %(error)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:696 -#: cinder/volume/drivers/emc/emc_smis_common.py:711 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:786 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:800 #, python-format msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:703 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:792 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but cleanup " "timed out." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:716 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:805 #, python-format msgid "" "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but error " @@ -6231,7 +6238,7 @@ "Members: %(vol)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:836 +#: cinder/volume/drivers/emc/emc_vmax_provision.py:263 #, python-format msgid "Error mapping volume %(vol)s. %(error)s" msgstr "" @@ -6258,38 +6265,42 @@ msgid "RemoveMembers for volume %s completed successfully." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:878 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:934 #, python-format msgid "Map volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:887 -#: cinder/volume/drivers/emc/emc_smis_common.py:917 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:943 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:969 #, python-format msgid "Cannot find Controller Configuration Service for storage system %s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:901 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:953 +#: cinder/volume/drivers/emc/emc_vmax_common.py:299 #, python-format msgid "Unmap volume: %(volume)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:907 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:959 +#: cinder/volume/drivers/emc/emc_vmax_common.py:305 #, python-format msgid "Volume %s is not mapped. No volume to unmap." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:931 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978 +#: cinder/volume/drivers/emc/emc_vmax_common.py:352 #, python-format msgid "Initialize connection: %(volume)s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:937 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:984 #, python-format msgid "Volume %s is already mapped." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:949 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996 +#: cinder/volume/drivers/emc/emc_vmax_common.py:412 #, python-format msgid "Terminate connection: %(volume)s" msgstr "" @@ -6299,12 +6310,12 @@ msgid "Entering extend_volume." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:960 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1013 #, python-format msgid "Extend Volume: %(volume)s New size: %(size)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:980 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1033 #, python-format msgid "" "Error Extend Volume: %(volumename)s. Storage Configuration Service not found." @@ -6323,7 +6334,7 @@ msgid "Extend Volume: %(volumename)s Return code: %(rc)lu" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1011 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1069 #, python-format msgid "" "Error Extend Volume: %(volumename)s. Return code: %(rc)lu. Error: %(error)s" @@ -6344,7 +6355,7 @@ msgid "Found Storage Type in config file: %s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1063 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1124 msgid "Storage type not found." msgstr "" @@ -6379,7 +6390,8 @@ msgid "Ecom server not found." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1153 +#: cinder/volume/drivers/emc/emc_vmax_common.py:1154 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1219 msgid "Cannot connect to ECOM server" msgstr "" @@ -6403,12 +6415,12 @@ msgid "Found Storage Hardware ID Management Service: %s" msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1248 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1301 #, python-format msgid "Pool %(storage_type)s is not found." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1254 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1307 #, python-format msgid "Storage system not found for pool %(storage_type)s." msgstr "" @@ -6451,7 +6463,9 @@ "Storage system: %(storage_system)s Storage Synchronized instance: %(sync)s." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1353 +#: cinder/volume/drivers/emc/emc_vmax_common.py:1290 +#: cinder/volume/drivers/emc/emc_vmax_masking.py:466 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1398 #, python-format msgid "Error finding %s." msgstr "" @@ -6475,7 +6489,8 @@ "%(initiator)s is %(ctrl)s." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1472 +#: cinder/volume/drivers/emc/emc_vmax_common.py:2265 +#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1601 #, python-format msgid "" "Volume %(name)s not found on the array. Cannot determine if there are " @@ -6508,7 +6523,7 @@ "%(connector)s is %(ctrl)s." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1592 +#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1671 #, python-format msgid "Device number not found for volume %(volumename)s %(vol_instance)s." msgstr "" @@ -6552,7 +6567,7 @@ "%(hardwareids)s." msgstr "" -#: cinder/volume/drivers/emc/emc_smis_common.py:1738 +#: cinder/volume/drivers/emc/emc_vmax_provision.py:655 msgid "Error finding Target WWNs." msgstr "" @@ -6877,37 +6892,41 @@ msgid "setting LU upper (end) limit to %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:92 +#: cinder/volume/drivers/hds/hds.py:95 cinder/volume/drivers/hds/iscsi.py:73 +#: cinder/volume/drivers/hds/nfs.py:62 #, python-format msgid "%(element)s: %(val)s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:103 cinder/volume/drivers/hds/hds.py:105 +#: cinder/volume/drivers/hds/hds.py:106 cinder/volume/drivers/hds/hds.py:108 +#: cinder/volume/drivers/hds/iscsi.py:84 cinder/volume/drivers/hds/iscsi.py:86 +#: cinder/volume/drivers/hds/nfs.py:73 cinder/volume/drivers/hds/nfs.py:75 #, python-format msgid "XML exception reading parameter: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:178 +#: cinder/volume/drivers/hds/hds.py:181 #, python-format msgid "portal: %(ip)s:%(ipp)s, CTL: %(ctl)s, port: %(port)s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:197 +#: cinder/volume/drivers/hds/hds.py:200 cinder/volume/drivers/hds/iscsi.py:271 +#: cinder/volume/drivers/hds/nfs.py:192 #, python-format msgid "No configuration found for service: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:250 +#: cinder/volume/drivers/hds/hds.py:253 cinder/volume/drivers/hds/iscsi.py:349 #, python-format msgid "HDP not found: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:289 +#: cinder/volume/drivers/hds/hds.py:292 cinder/volume/drivers/hds/iscsi.py:396 #, python-format msgid "iSCSI portal not found for service: %s" msgstr "" -#: cinder/volume/drivers/hds/hds.py:327 +#: cinder/volume/drivers/hds/iscsi.py:448 #, python-format msgid "LUN %(lun)s of size %(sz)s MB is created." msgstr "" @@ -6917,7 +6936,7 @@ msgid "LUN %(lun)s of size %(size)s MB is cloned." msgstr "" -#: cinder/volume/drivers/hds/hds.py:372 +#: cinder/volume/drivers/hds/iscsi.py:499 #, python-format msgid "LUN %(lun)s extended to %(size)s GB." msgstr "" @@ -6942,7 +6961,7 @@ msgid "LUN %s is deleted." msgstr "" -#: cinder/volume/drivers/huawei/__init__.py:57 +#: cinder/volume/drivers/huawei/__init__.py:61 msgid "_instantiate_driver: configuration not found." msgstr "" @@ -6953,7 +6972,7 @@ "%(product)s series storage arrays." msgstr "" -#: cinder/volume/drivers/huawei/__init__.py:84 +#: cinder/volume/drivers/huawei/__init__.py:86 #, python-format msgid "" "\"Product\" or \"Protocol\" is illegal. \"Product\" should be set to either " @@ -6980,8 +6999,8 @@ "%(ini)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:159 -#: cinder/volume/drivers/huawei/rest_common.py:1278 +#: cinder/volume/drivers/huawei/huawei_t.py:161 +#: cinder/volume/drivers/huawei/rest_common.py:1523 #, python-format msgid "" "_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please " @@ -6999,7 +7018,7 @@ msgid "_get_tgt_iqn: iSCSI target iqn is %s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:248 +#: cinder/volume/drivers/huawei/huawei_t.py:250 #, python-format msgid "" "_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure " @@ -7014,7 +7033,7 @@ "%(initiator)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:351 +#: cinder/volume/drivers/huawei/huawei_t.py:353 #, python-format msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s." msgstr "" @@ -7030,12 +7049,12 @@ "%(wwn)s" msgstr "" -#: cinder/volume/drivers/huawei/huawei_t.py:578 +#: cinder/volume/drivers/huawei/huawei_t.py:582 #, python-format msgid "_remove_fc_ports: FC port was not found on host %(hostid)s." msgstr "" -#: cinder/volume/drivers/huawei/huawei_utils.py:40 +#: cinder/volume/drivers/huawei/huawei_utils.py:41 #, python-format msgid "parse_xml_file: %s" msgstr "" @@ -7081,7 +7100,7 @@ "result: %(res)s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:173 +#: cinder/volume/drivers/huawei/rest_common.py:143 #, python-format msgid "%s \"data\" was not in result." msgstr "" @@ -7206,15 +7225,14 @@ msgid "The config parameters are: %s" msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1239 -#: cinder/volume/drivers/huawei/ssh_common.py:118 -#: cinder/volume/drivers/huawei/ssh_common.py:1265 +#: cinder/volume/drivers/huawei/ssh_common.py:120 +#: cinder/volume/drivers/huawei/ssh_common.py:1268 #, python-format msgid "_check_conf_file: Config file invalid. %s must be set." msgstr "" -#: cinder/volume/drivers/huawei/rest_common.py:1246 -#: cinder/volume/drivers/huawei/ssh_common.py:125 +#: cinder/volume/drivers/huawei/rest_common.py:1502 +#: cinder/volume/drivers/huawei/ssh_common.py:127 msgid "_check_conf_file: Config file invalid. StoragePool must be set." msgstr "" @@ -7229,12 +7247,12 @@ msgid "Can not find lun in array" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:54 +#: cinder/volume/drivers/huawei/ssh_common.py:56 #, python-format msgid "ssh_read: Read SSH timeout. %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:70 +#: cinder/volume/drivers/huawei/ssh_common.py:72 msgid "No response message. Please check system status." msgstr "" @@ -7243,15 +7261,15 @@ msgid "do_setup" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:135 -#: cinder/volume/drivers/huawei/ssh_common.py:1287 +#: cinder/volume/drivers/huawei/ssh_common.py:137 +#: cinder/volume/drivers/huawei/ssh_common.py:1290 #, python-format msgid "" "_check_conf_file: Config file invalid. Host OSType is invalid.\n" "The valid values are: %(os_list)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:169 +#: cinder/volume/drivers/huawei/ssh_common.py:170 #, python-format msgid "_get_login_info: %s" msgstr "" @@ -7267,7 +7285,7 @@ "_name_translate: Name in cinder: %(old)s, new name in storage system: %(new)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:279 +#: cinder/volume/drivers/huawei/ssh_common.py:280 #, python-format msgid "" "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key in " @@ -7275,8 +7293,8 @@ "%(conf)s." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:373 -#: cinder/volume/drivers/huawei/ssh_common.py:1451 +#: cinder/volume/drivers/huawei/ssh_common.py:376 +#: cinder/volume/drivers/huawei/ssh_common.py:1454 #, python-format msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s" msgstr "" @@ -7286,7 +7304,7 @@ "_parse_conf_lun_params: Use default prefetch type. Prefetch type: Intelligent" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:421 +#: cinder/volume/drivers/huawei/ssh_common.py:422 #, python-format msgid "" "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config " @@ -7315,7 +7333,7 @@ msgid "delete_volume: volume name: %s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:516 +#: cinder/volume/drivers/huawei/ssh_common.py:518 #, python-format msgid "delete_volume: Volume %(name)s does not exist." msgstr "" @@ -7327,12 +7345,13 @@ "%(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:580 +#: cinder/volume/drivers/huawei/rest_common.py:546 +#: cinder/volume/drivers/huawei/ssh_common.py:582 #, python-format msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:650 +#: cinder/volume/drivers/huawei/ssh_common.py:652 #, python-format msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s." msgstr "" @@ -7342,7 +7361,7 @@ msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:697 +#: cinder/volume/drivers/huawei/ssh_common.py:699 #, python-format msgid "Source volume %(name)s does not exist." msgstr "" @@ -7354,7 +7373,7 @@ "name: %(added_name)s new added volume size: %(added_size)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:747 +#: cinder/volume/drivers/huawei/ssh_common.py:749 #, python-format msgid "extend_volume: volume %s does not exist." msgstr "" @@ -7364,11 +7383,11 @@ msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:785 +#: cinder/volume/drivers/huawei/ssh_common.py:787 msgid "create_snapshot: Resource pool needs 1GB valid size at least." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:792 +#: cinder/volume/drivers/huawei/ssh_common.py:794 #, python-format msgid "create_snapshot: Volume %(name)s does not exist." msgstr "" @@ -7378,19 +7397,19 @@ msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s" msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:865 +#: cinder/volume/drivers/huawei/ssh_common.py:867 #, python-format msgid "" "delete_snapshot: Can not delete snapshot %s for it is a source LUN of " "LUNCopy." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:873 +#: cinder/volume/drivers/huawei/ssh_common.py:875 #, python-format msgid "delete_snapshot: Snapshot %(snap)s does not exist." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:916 +#: cinder/volume/drivers/huawei/ssh_common.py:918 #, python-format msgid "" "%(func)s: %(msg)s\n" @@ -7430,7 +7449,7 @@ "%(mapid)s 10s later." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1146 +#: cinder/volume/drivers/huawei/ssh_common.py:1149 #, python-format msgid "" "_delete_map: Failed to delete host map %(mapid)s.\n" @@ -7441,7 +7460,7 @@ msgid "_update_volume_stats: Updating volume stats." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1277 +#: cinder/volume/drivers/huawei/ssh_common.py:1280 msgid "_check_conf_file: Config file invalid. StoragePool must be specified." msgstr "" @@ -7450,144 +7469,144 @@ "_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 now." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1389 +#: cinder/volume/drivers/huawei/ssh_common.py:1392 #, python-format msgid "" "create_volume_from_snapshot: %(device)s does not support create volume from " "snapshot." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1396 +#: cinder/volume/drivers/huawei/ssh_common.py:1399 #, python-format msgid "create_cloned_volume: %(device)s does not support clone volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1404 +#: cinder/volume/drivers/huawei/ssh_common.py:1407 #, python-format msgid "extend_volume: %(device)s does not support extend volume." msgstr "" -#: cinder/volume/drivers/huawei/ssh_common.py:1413 +#: cinder/volume/drivers/huawei/ssh_common.py:1416 #, python-format msgid "create_snapshot: %(device)s does not support snapshot." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:125 +#: cinder/volume/drivers/ibm/gpfs.py:126 #, python-format msgid "Failed to issue mmgetstate command, error: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:136 +#: cinder/volume/drivers/ibm/gpfs.py:137 #, python-format msgid "GPFS is not active. Detailed output: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:137 +#: cinder/volume/drivers/ibm/gpfs.py:135 #, python-format msgid "GPFS is not running, state: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:149 +#: cinder/volume/drivers/ibm/gpfs.py:150 #, python-format msgid "Failed to issue df command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:165 cinder/volume/drivers/ibm/gpfs.py:254 +#: cinder/volume/drivers/ibm/gpfs.py:166 cinder/volume/drivers/ibm/gpfs.py:255 #, python-format msgid "Failed to issue mmlsconfig command, error: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:176 +#: cinder/volume/drivers/ibm/gpfs.py:177 #, python-format msgid "Failed to issue mmlsattr command on path %(path)s, error: %(error)s" msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:185 +#: cinder/volume/drivers/ibm/gpfs.py:183 #, python-format msgid "Failed to find fileset for path %(path)s, command output: %(cmdout)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:207 +#: cinder/volume/drivers/ibm/gpfs.py:205 #, python-format msgid "Invalid storage pool %s requested. Retype failed." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:234 +#: cinder/volume/drivers/ibm/gpfs.py:235 #, python-format msgid "Failed to issue mmlsfs command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:271 +#: cinder/volume/drivers/ibm/gpfs.py:272 #, python-format msgid "Failed to issue mmlsattr command for path %(path)s, error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:321 +#: cinder/volume/drivers/ibm/gpfs.py:320 #, python-format msgid "Could not find GPFS cluster id: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:329 +#: cinder/volume/drivers/ibm/gpfs.py:328 #, python-format msgid "Could not find GPFS file system device: %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:337 +#: cinder/volume/drivers/ibm/gpfs.py:336 #, python-format msgid "Invalid storage pool %s specificed." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:347 +#: cinder/volume/drivers/ibm/gpfs.py:346 msgid "Option gpfs_mount_point_base is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:354 +#: cinder/volume/drivers/ibm/gpfs.py:353 msgid "Option gpfs_images_share_mode is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:360 +#: cinder/volume/drivers/ibm/gpfs.py:359 msgid "Option gpfs_images_dir is not set correctly." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:367 +#: cinder/volume/drivers/ibm/gpfs.py:366 #, python-format msgid "" "gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s " "belong to different file systems." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:378 +#: cinder/volume/drivers/ibm/gpfs.py:377 #, python-format msgid "" "gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s " "belong to different filesets." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:387 +#: cinder/volume/drivers/ibm/gpfs.py:386 #, python-format msgid "" "Downlevel GPFS Cluster Detected. GPFS Clone feature not enabled in cluster " "daemon level %(cur)s - must be at least at level %(min)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:401 +#: cinder/volume/drivers/ibm/gpfs.py:400 #, python-format msgid "%s must be an absolute path." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:406 +#: cinder/volume/drivers/ibm/gpfs.py:405 #, python-format msgid "%s is not a directory." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:416 +#: cinder/volume/drivers/ibm/gpfs.py:415 #, python-format msgid "" "The GPFS filesystem %(fs)s is not at the required release level. Current " "level is %(cur)s, must be at least %(min)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:797 +#: cinder/volume/drivers/ibm/gpfs.py:798 #, python-format msgid "Failed to resize volume %(volume_id)s, error: %(error)s." msgstr "" @@ -7602,34 +7621,33 @@ msgid "Begin restore of backup %s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:871 +#: cinder/volume/drivers/ibm/gpfs.py:872 #, python-format msgid "" "Driver-based migration of volume %(vol)s failed. Move from %(src)s to " "%(dst)s failed with error: %(error)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:943 +#: cinder/volume/drivers/ibm/gpfs.py:955 #, python-format msgid "mkfs failed on volume %(vol)s, error message was: %(err)s." msgstr "" -#: cinder/volume/drivers/ibm/gpfs.py:976 +#: cinder/volume/drivers/ibm/gpfs.py:988 #, python-format msgid "" "%s cannot be accessed. Verify that GPFS is active and file system is mounted." msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:85 -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:232 -#: cinder/volume/drivers/netapp/iscsi.py:122 -#: cinder/volume/drivers/netapp/nfs.py:669 -#: cinder/volume/drivers/san/hp/hp_3par_common.py:169 +#: cinder/volume/drivers/fusionio/ioControl.py:284 +#: cinder/volume/drivers/ibm/ibmnas.py:110 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:260 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:215 #, python-format msgid "%s is not set" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:91 +#: cinder/volume/drivers/ibm/ibmnas.py:116 msgid "" "Password or SSH private key is required for authentication: set either " "nas_password or nas_private_key option" @@ -7675,19 +7693,18 @@ msgid "Failed in _create_ibmnas_copy. Error: %s" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:181 -#: cinder/volume/drivers/netapp/nfs.py:485 +#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:494 #, python-format msgid "Resizing file to %sG" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:185 +#: cinder/volume/drivers/ibm/ibmnas.py:223 #, python-format msgid "Failed to resize volume %(volume_id)s, error: %(error)s" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:195 -#: cinder/volume/drivers/netapp/nfs.py:611 +#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/smbfs.py:407 +#: cinder/volume/drivers/netapp/nfs.py:620 #, python-format msgid "Extending volume %s." msgstr "" @@ -7698,12 +7715,12 @@ "Enter _delete_snapfiles: fchild %(fchild)s, mount_point %(mount_point)s" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:208 +#: cinder/volume/drivers/ibm/ibmnas.py:249 #, python-format msgid "Failed in _delete_snapfiles. Error: %s" msgstr "" -#: cinder/volume/drivers/ibm/ibmnas.py:246 +#: cinder/volume/drivers/smbfs.py:208 cinder/volume/drivers/ibm/ibmnas.py:287 #, python-format msgid "Volume %s does not have provider_location specified, skipping." msgstr "" @@ -7712,12 +7729,12 @@ msgid "enter: do_setup" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:153 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:181 #, python-format msgid "Failed getting details for pool %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:189 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:217 msgid "do_setup: No configured nodes." msgstr "" @@ -7729,21 +7746,21 @@ msgid "enter: check_for_setup_error" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:222 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:250 msgid "Unable to determine system name" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:225 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:253 msgid "Unable to determine system id" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:238 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:266 msgid "" "Password or SSH private key is required for authentication: set either " "san_password or san_private_key option" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:246 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:274 #, python-format msgid "" "Illegal value %d specified for storwize_svc_flashcopy_timeout: valid values " @@ -7754,12 +7771,12 @@ msgid "leave: check_for_setup_error" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:264 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:292 #, python-format msgid "ensure_export: Volume %s not found on storage" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:283 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:311 msgid "The connector does not contain the required information." msgstr "" @@ -7768,43 +7785,43 @@ msgid "enter: initialize_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:338 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:369 msgid "CHAP secret exists for host but CHAP is disabled" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:343 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:375 #, python-format msgid "initialize_connection: Failed to get attributes for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:355 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:386 #, python-format msgid "Did not find expected column name in lsvdisk: %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:357 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:389 #, python-format msgid "initialize_connection: Missing volume attribute for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:374 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:406 #, python-format msgid "" "initialize_connection: No node found in I/O group %(gid)s for volume %(vol)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:383 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:414 #, python-format msgid "initialize_connection: Did not find a preferred node for volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:406 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:447 msgid "" "Could not get FC connection information for the host-volume connection. Is " "the host configured properly for FC connections?" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:425 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:485 #, python-format msgid "" "initialize_connection: Failed to collect return properties for volume " @@ -7825,7 +7842,7 @@ msgid "enter: terminate_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:464 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:537 msgid "terminate_connection: Failed to get host name from connector." msgstr "" @@ -7834,15 +7851,17 @@ msgid "leave: terminate_connection: volume %(vol)s with connector %(conn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:501 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:591 msgid "create_snapshot: get source volume failed." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:514 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:604 msgid "create_volume_from_snapshot: Source and destination size differ." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:526 +#: cinder/volume/drivers/ibm/flashsystem.py:1339 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:626 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:749 msgid "create_cloned_volume: Source and destination size differ." msgstr "" @@ -7851,7 +7870,7 @@ msgid "enter: extend_volume: volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:541 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:651 msgid "extend_volume: Extending a volume with snapshots is not supported." msgstr "" @@ -7860,28 +7879,28 @@ msgid "leave: extend_volume: volume %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:584 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:699 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %s does not have any registered vdisk copy " "operations." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:589 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:704 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %(vol)s does not have the specified vdisk copy " "operation: orig=%(orig)s new=%(new)s." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:601 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:716 #, python-format msgid "" "_rm_vdisk_copy_op: Volume metadata %s does not have any registered vdisk " "copy operations." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:609 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:724 #, python-format msgid "" "_rm_vdisk_copy_op: Volume %(vol)s metadata does not have the specified vdisk " @@ -7892,7 +7911,7 @@ msgid "enter: update volume copy status" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:637 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:783 #, python-format msgid "" "_check_volume_copy_ops: Volume %(vol)s does not have the specified vdisk " @@ -7935,39 +7954,39 @@ msgid "Reference must contain vdisk_UID element." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:791 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:992 msgid "The specified vdisk is mapped to a host." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:831 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1029 msgid "Could not get pool data from the storage" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:832 +#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1033 msgid "_update_volume_stats: Could not get storage pool data" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:44 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:56 #, python-format msgid "Could not find key in output of command %(cmd)s: %(out)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:64 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:76 #, python-format msgid "Failed to get code level (%s)." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:86 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:98 #, python-format msgid "Expected integer for node_count, svcinfo lsiogrp returned: %(node)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:143 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:155 #, python-format msgid "WWPN on node %(node)s: %(wwpn)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:165 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:177 #, python-format msgid "Failed to find host %s" msgstr "" @@ -7987,11 +8006,11 @@ msgid "enter: create_host: host %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:229 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:250 msgid "create_host: Host name is not unicode or string" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:240 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:261 msgid "create_host: No initiators or wwpns supplied." msgstr "" @@ -8018,20 +8037,20 @@ "enter: unmap_vol_from_host: volume %(volume_name)s from host %(host_name)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:323 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:344 #, python-format msgid "" "unmap_vol_from_host: No mapping of volume %(vol_name)s to any host found." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:329 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:350 #, python-format msgid "" "unmap_vol_from_host: Multiple mappings of volume %(vol_name)s found, no host " "specified." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:341 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:362 #, python-format msgid "" "unmap_vol_from_host: No mapping of volume %(vol_name)s to host %(host)s " @@ -8044,46 +8063,46 @@ "leave: unmap_vol_from_host: volume %(volume_name)s from host %(host_name)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:382 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:407 msgid "" "Illegal value specified for storwize_svc_vol_rsize: set to either a " "percentage (0-100) or -1" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:388 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:413 msgid "" "Illegal value specified for storwize_svc_vol_warning: set to a percentage (0-" "100)" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:395 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:420 msgid "" "Illegal value specified for storwize_svc_vol_grainsize: set to either 32, " "64, 128, or 256" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:402 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:427 msgid "System does not support compression" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:407 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:432 msgid "" "If compression is set to True, rsize must also be set (not equal to -1)" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:413 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:438 #, python-format msgid "" "Illegal value %(prot)s specified for storwize_svc_connection_protocol: valid " "values are %(enabled)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:422 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:447 #, python-format msgid "I/O group %(iogrp)d is not valid; available I/O groups are %(avail)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:458 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:474 msgid "Protocol must be specified as ' iSCSI' or ' FC'." msgstr "" @@ -8097,13 +8116,13 @@ msgid "leave: _create_vdisk: volume %s " msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:531 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:684 #, python-format msgid "" "Unexecpted mapping status %(status)s for mapping%(id)s. Attributes: %(attr)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:541 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:694 #, python-format msgid "" "Mapping %(id)s prepare failed to complete within theallotted %(to)d seconds " @@ -8127,7 +8146,7 @@ msgid "Loopcall: _check_vdisk_fc_mappings(), vdisk %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:601 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:754 #, python-format msgid "Vdisk %(name)s not involved in mapping %(src)s -> %(tgt)s" msgstr "" @@ -8142,7 +8161,7 @@ msgid "enter: delete_vdisk: vdisk %s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:647 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:800 #, python-format msgid "Tried to delete non-existant vdisk %s." msgstr "" @@ -8157,7 +8176,7 @@ msgid "enter: create_copy: snapshot %(src)s to %(tgt)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:660 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:814 #, python-format msgid "create_copy: Source vdisk %(src)s (%(src_id)s) does not exist" msgstr "" @@ -8167,7 +8186,7 @@ msgid "leave: _create_copy: snapshot %(tgt)s from vdisk %(src)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:692 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:849 msgid "add_vdisk_copy started without a vdisk copy in the expected pool." msgstr "" @@ -8178,15 +8197,16 @@ "6.4.0.0" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:762 +#: cinder/volume/drivers/ibm/storwize_svc/helpers.py:953 msgid "" "Expected single vdisk returned from lsvdisk when filtering on vdisk_UID. " "%{count}s were returned." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:35 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:213 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:250 +#: cinder/volume/drivers/ibm/flashsystem.py:94 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:37 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:215 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:252 #, python-format msgid "" "CLI Exception output:\n" @@ -8195,13 +8215,13 @@ " stderr: %(err)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:53 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:55 #, python-format msgid "Expected no output from CLI command %(cmd)s, got %(out)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:65 -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:262 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:67 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:264 #, python-format msgid "" "Failed to parse CLI output:\n" @@ -8210,96 +8230,96 @@ " stderr: %(err)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:144 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:146 msgid "Must pass wwpn or host to lsfabric." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:160 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:162 #, python-format msgid "Did not find success message nor error for %(fun)s: %(out)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:165 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:166 msgid "" "storwize_svc_multihostmap_enabled is set to False, not allowing multi host " "mapping." msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:353 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:368 #, python-format msgid "Did not find expected key %(key)s in %(fun)s: %(raw)s" msgstr "" -#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:388 +#: cinder/volume/drivers/ibm/storwize_svc/ssh.py:403 #, python-format msgid "" "Unexpected CLI response: header/row mismatch. header: %(header)s, row: " "%(row)s" msgstr "" -#: cinder/volume/drivers/netapp/api.py:424 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:435 #, python-format msgid "No element by given name %s." msgstr "" -#: cinder/volume/drivers/netapp/api.py:444 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:455 msgid "Not a valid value for NaElement." msgstr "" -#: cinder/volume/drivers/netapp/api.py:448 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:459 msgid "NaElement name cannot be null." msgstr "" -#: cinder/volume/drivers/netapp/api.py:491 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:502 msgid "Type cannot be converted into NaElement." msgstr "" -#: cinder/volume/drivers/netapp/common.py:80 +#: cinder/volume/drivers/netapp/common.py:70 msgid "Required configuration not found" msgstr "" -#: cinder/volume/drivers/netapp/common.py:108 +#: cinder/volume/drivers/netapp/common.py:111 #, python-format msgid "Requested unified config: %(storage_family)s and %(storage_protocol)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:114 +#: cinder/volume/drivers/netapp/common.py:117 #, python-format msgid "Storage family %s is not supported" msgstr "" -#: cinder/volume/drivers/netapp/common.py:121 +#: cinder/volume/drivers/netapp/common.py:124 #, python-format msgid "" "No default storage protocol found for storage family %(storage_family)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:128 +#: cinder/volume/drivers/netapp/common.py:131 #, python-format msgid "" "Protocol %(storage_protocol)s is not supported for storage family " "%(storage_family)s" msgstr "" -#: cinder/volume/drivers/netapp/common.py:135 +#: cinder/volume/drivers/netapp/common.py:138 #, python-format msgid "" "NetApp driver of family %(storage_family)s and protocol %(storage_protocol)s " "loaded" msgstr "" -#: cinder/volume/drivers/netapp/common.py:144 +#: cinder/volume/drivers/netapp/common.py:147 msgid "Only loading netapp drivers supported." msgstr "" -#: cinder/volume/drivers/netapp/common.py:163 +#: cinder/volume/drivers/netapp/common.py:166 #, python-format msgid "" "The configured NetApp driver is deprecated. Please refer the link to resolve " "the issue '%s'." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:69 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:58 #, python-format msgid "No metadata property %(prop)s defined for the LUN %(name)s" msgstr "" @@ -8318,7 +8338,7 @@ msgid "Created LUN with name %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:175 +#: cinder/volume/drivers/netapp/iscsi.py:212 #, python-format msgid "No entry in LUN table for volume/snapshot %(name)s." msgstr "" @@ -8328,29 +8348,30 @@ msgid "Destroyed LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:227 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:519 #, python-format msgid "Mapped LUN %(name)s to the initiator %(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:232 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:523 #, python-format msgid "" "Successfully fetched target details for LUN %(name)s and initiator " "%(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:238 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:529 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:635 #, python-format msgid "Failed to get LUN target details for the LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:249 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:542 #, python-format msgid "Failed to get target portal for the LUN %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:252 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:547 #, python-format msgid "Failed to get target IQN for the LUN %s" msgstr "" @@ -8360,54 +8381,54 @@ msgid "Snapshot %s deletion successful" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:310 -#: cinder/volume/drivers/netapp/iscsi.py:557 -#: cinder/volume/drivers/netapp/nfs.py:101 -#: cinder/volume/drivers/netapp/nfs.py:208 +#: cinder/volume/drivers/netapp/iscsi.py:347 +#: cinder/volume/drivers/netapp/iscsi.py:601 +#: cinder/volume/drivers/netapp/nfs.py:111 +#: cinder/volume/drivers/netapp/nfs.py:218 #, python-format msgid "Resizing %s failed. Cleaning volume." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:325 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:568 #, python-format msgid "Unmapped LUN %(name)s from the initiator %(initiator_name)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:414 +#: cinder/volume/drivers/netapp/iscsi.py:458 #, python-format msgid "Error mapping lun. Code :%(code)s, Message:%(message)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:433 +#: cinder/volume/drivers/netapp/iscsi.py:477 #, python-format msgid "Error unmapping lun. Code :%(code)s, Message:%(message)s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:503 +#: cinder/volume/drivers/netapp/dataontap/block_base.py:320 msgid "Object is not a NetApp LUN." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:535 +#: cinder/volume/drivers/netapp/iscsi.py:579 #, python-format msgid "Message: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:537 +#: cinder/volume/drivers/netapp/iscsi.py:581 #, python-format msgid "Error getting lun attribute. Exception: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:593 +#: cinder/volume/drivers/netapp/iscsi.py:638 #, python-format msgid "No need to extend volume %s as it is already the requested new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:599 +#: cinder/volume/drivers/netapp/iscsi.py:644 #, python-format msgid "Resizing lun %s directly to new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:626 +#: cinder/volume/drivers/netapp/iscsi.py:671 #, python-format msgid "Lun %(path)s geometry failed. Message - %(msg)s" msgstr "" @@ -8417,47 +8438,47 @@ msgid "Moving lun %(name)s to %(new_name)s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:670 +#: cinder/volume/drivers/netapp/iscsi.py:715 #, python-format msgid "Resizing lun %s using sub clone to new size." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:677 +#: cinder/volume/drivers/netapp/iscsi.py:722 #, python-format msgid "%s cannot be sub clone resized as it is hosted on compressed volume" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:683 +#: cinder/volume/drivers/netapp/iscsi.py:728 #, python-format msgid "%s cannot be sub clone resized as it contains no blocks." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:700 +#: cinder/volume/drivers/netapp/iscsi.py:745 #, python-format msgid "Post clone resize lun %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:711 +#: cinder/volume/drivers/netapp/iscsi.py:756 #, python-format msgid "Failure staging lun %s to tmp." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:716 +#: cinder/volume/drivers/netapp/iscsi.py:761 #, python-format msgid "Failure moving new cloned lun to %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:720 +#: cinder/volume/drivers/netapp/iscsi.py:765 #, python-format msgid "Failure deleting staged tmp lun %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:723 +#: cinder/volume/drivers/netapp/iscsi.py:768 #, python-format msgid "Unknown exception in post clone resize lun %s." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:725 +#: cinder/volume/drivers/netapp/iscsi.py:770 #, python-format msgid "Exception details: %s" msgstr "" @@ -8466,7 +8487,7 @@ msgid "Getting lun block count." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:734 +#: cinder/volume/drivers/netapp/iscsi.py:779 #, python-format msgid "Failure getting lun info for %s." msgstr "" @@ -8491,7 +8512,7 @@ msgid "Cloned LUN with new name %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1012 +#: cinder/volume/drivers/netapp/iscsi.py:1025 #, python-format msgid "No cloned lun named %s found on the filer" msgstr "" @@ -8500,15 +8521,15 @@ msgid "Cluster ssc is not updated. No volume stats found." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1175 -#: cinder/volume/drivers/netapp/nfs.py:1300 +#: cinder/volume/drivers/netapp/iscsi.py:1195 +#: cinder/volume/drivers/netapp/nfs.py:1343 msgid "" "Unsupported ONTAP version. ONTAP version 7.3.1 and above is supported." msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1179 -#: cinder/volume/drivers/netapp/nfs.py:1304 -#: cinder/volume/drivers/netapp/utils.py:323 +#: cinder/volume/drivers/netapp/iscsi.py:1199 +#: cinder/volume/drivers/netapp/nfs.py:1347 +#: cinder/volume/drivers/netapp/utils.py:336 msgid "Api version could not be determined." msgstr "" @@ -8517,7 +8538,7 @@ msgid "Failed to get vol with required size for volume: %s" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1299 +#: cinder/volume/drivers/netapp/iscsi.py:1309 #, python-format msgid "Error finding luns for volume %s. Verify volume exists." msgstr "" @@ -8532,7 +8553,7 @@ msgid "Clone operation with src %(name)s and dest %(new_name)s failed" msgstr "" -#: cinder/volume/drivers/netapp/iscsi.py:1509 +#: cinder/volume/drivers/netapp/iscsi.py:1570 msgid "Volume refresh job already running. Returning..." msgstr "" @@ -8546,23 +8567,23 @@ msgid "Refreshing capacity info for %s." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:106 -#: cinder/volume/drivers/netapp/nfs.py:213 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:110 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:215 #, python-format msgid "NFS file %s not discovered." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:226 +#: cinder/volume/drivers/netapp/nfs.py:235 #, python-format msgid "Copied image to volume %s using regular download." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:233 +#: cinder/volume/drivers/netapp/nfs.py:242 #, python-format msgid "Registering image in cache %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:240 +#: cinder/volume/drivers/netapp/nfs.py:249 #, python-format msgid "" "Exception while registering image %(image_id)s in cache. Exception: %(exc)s" @@ -8573,7 +8594,7 @@ msgid "Found cache file for image %(image_id)s on share %(share)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:266 +#: cinder/volume/drivers/netapp/nfs.py:275 #, python-format msgid "Cloning from cache to destination %s" msgstr "" @@ -8586,7 +8607,7 @@ msgid "Image cache cleaning in progress." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:296 +#: cinder/volume/drivers/netapp/nfs.py:305 #, python-format msgid "Cleaning cache for share %s." msgstr "" @@ -8596,7 +8617,7 @@ msgid "Files to be queued for deletion %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:308 +#: cinder/volume/drivers/netapp/nfs.py:317 #, python-format msgid "Exception during cache cleaning %(share)s. Message - %(ex)s" msgstr "" @@ -8620,17 +8641,17 @@ msgid "Deleting file at path %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:366 +#: cinder/volume/drivers/netapp/nfs.py:375 #, python-format msgid "Exception during deleting %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:398 +#: cinder/volume/drivers/netapp/nfs.py:407 #, python-format msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:414 +#: cinder/volume/drivers/netapp/nfs.py:423 #, python-format msgid "Cloning image %s from cache" msgstr "" @@ -8640,12 +8661,12 @@ msgid "Cache share: %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:428 +#: cinder/volume/drivers/netapp/nfs.py:437 #, python-format msgid "Unexpected exception during image cloning in share %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:434 +#: cinder/volume/drivers/netapp/nfs.py:443 #, python-format msgid "Checking image clone %s from glance share." msgstr "" @@ -8660,22 +8681,22 @@ msgid "Image is raw %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:453 +#: cinder/volume/drivers/netapp/nfs.py:462 #, python-format msgid "Image will locally be converted to raw %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:460 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:461 #, python-format msgid "Converted to raw, but format is now %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:470 +#: cinder/volume/drivers/netapp/nfs.py:479 #, python-format msgid "Performing post clone for %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:477 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:478 msgid "NFS file could not be discovered." msgstr "" @@ -8683,11 +8704,12 @@ msgid "Checking file for resize" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:491 +#: cinder/volume/drivers/hds/nfs.py:228 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:493 msgid "Resizing image file failed." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:513 +#: cinder/volume/drivers/netapp/nfs.py:522 msgid "Discover file retries exhausted." msgstr "" @@ -8701,54 +8723,55 @@ msgid "Found possible share matches %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:571 +#: cinder/volume/drivers/netapp/nfs.py:580 msgid "Unexpected exception while short listing used share." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:586 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:590 msgid "Image location not present." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:623 +#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:628 msgid "Container size smaller than required file size." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:631 +#: cinder/volume/drivers/netapp/nfs.py:640 #, python-format msgid "Destination %s already exists." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:639 +#: cinder/volume/drivers/netapp/nfs.py:648 #, python-format msgid "Exception moving file %(src)s. Message - %(e)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:741 +#: cinder/volume/drivers/netapp/nfs.py:767 #, python-format msgid "Shares on vserver %s will only be used for provisioning." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:745 -#: cinder/volume/drivers/netapp/nfs.py:947 +#: cinder/volume/drivers/netapp/nfs.py:771 msgid "No vserver set in config. SSC will be disabled." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:794 +#: cinder/volume/drivers/netapp/nfs.py:827 +#: cinder/volume/drivers/netapp/nfs.py:1390 #, python-format msgid "Exception creating vol %(name)s on share %(share)s. Details: %(ex)s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:803 +#: cinder/volume/drivers/netapp/dataontap/nfs_7mode.py:99 +#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:120 #, python-format msgid "Volume %s could not be created on shares." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:866 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:321 #, python-format msgid "No interface found on cluster for ip %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:907 +#: cinder/volume/drivers/netapp/nfs.py:924 #, python-format msgid "" "No volume on cluster with vserver\n" @@ -8757,7 +8780,7 @@ " " msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:914 +#: cinder/volume/drivers/netapp/nfs.py:931 #, python-format msgid "" "Cloning with params volume %(volume)s, src %(src_path)s,\n" @@ -8768,7 +8791,7 @@ msgid "No cluster ssc stats found. Wait for next volume stats update." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:996 +#: cinder/volume/drivers/netapp/nfs.py:1039 msgid "No shares found hence skipping ssc refresh." msgstr "" @@ -8807,7 +8830,7 @@ msgid "Found volume %(vol)s for share %(share)s." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1126 +#: cinder/volume/drivers/netapp/nfs.py:1169 #, python-format msgid "Copied image %(img)s to volume %(vol)s using copy offload workflow." msgstr "" @@ -8816,12 +8839,12 @@ msgid "Copy offload either not configured or unsupported." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1133 +#: cinder/volume/drivers/netapp/nfs.py:1176 #, python-format msgid "Copy offload workflow unsuccessful. %s" msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1157 +#: cinder/volume/drivers/netapp/nfs.py:1200 #, python-format msgid "No vserver owning the ip %s." msgstr "" @@ -8845,7 +8868,7 @@ msgid "Copied image from cache to volume %s using cloning." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1193 +#: cinder/volume/drivers/netapp/nfs.py:1236 #, python-format msgid "Error in workflow copy from cache. %s." msgstr "" @@ -8854,7 +8877,7 @@ msgid "Trying copy from image service using copy offload." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1213 +#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:452 msgid "Source host details not found." msgstr "" @@ -8878,7 +8901,7 @@ msgid "Image will be converted to raw %s." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1263 +#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:505 #, python-format msgid "Converted to raw, but format is now %s." msgstr "" @@ -8888,7 +8911,7 @@ msgid "Copied locally converted raw image %(img)s to volume %(vol)s." msgstr "" -#: cinder/volume/drivers/netapp/nfs.py:1349 +#: cinder/volume/drivers/netapp/dataontap/client/client_7mode.py:311 #, python-format msgid "No storage path found for export path %s" msgstr "" @@ -8923,48 +8946,48 @@ msgid "Exception querying storage disk. %s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:421 +#: cinder/volume/drivers/netapp/ssc_utils.py:424 #, python-format msgid "Running stale ssc refresh job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:455 +#: cinder/volume/drivers/netapp/ssc_utils.py:458 #, python-format msgid "" "Successfully completed stale refresh job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:482 +#: cinder/volume/drivers/netapp/ssc_utils.py:485 #, python-format msgid "Running cluster latest ssc job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:488 +#: cinder/volume/drivers/netapp/ssc_utils.py:491 #, python-format msgid "Successfully completed ssc job for %(server)s and vserver %(vs)s" msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:500 +#: cinder/volume/drivers/netapp/ssc_utils.py:503 msgid "Backend not a VolumeDriver." msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:502 +#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:503 msgid "Backend server not NaServer." msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:505 +#: cinder/volume/drivers/netapp/ssc_utils.py:508 msgid "ssc job in progress. Returning... " msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:517 +#: cinder/volume/drivers/netapp/ssc_utils.py:520 msgid "refresh stale ssc job in progress. Returning... " msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:613 +#: cinder/volume/drivers/netapp/dataontap/ssc_cmode.py:614 msgid "Fatal error: User not permitted to query NetApp volumes." msgstr "" -#: cinder/volume/drivers/netapp/ssc_utils.py:620 +#: cinder/volume/drivers/netapp/ssc_utils.py:623 #, python-format msgid "" "The user does not have access or sufficient privileges to use all netapp " @@ -8975,43 +8998,43 @@ msgid "ems executed successfully." msgstr "" -#: cinder/volume/drivers/netapp/utils.py:127 +#: cinder/volume/drivers/netapp/utils.py:139 #, python-format msgid "Failed to invoke ems. Message : %s" msgstr "" -#: cinder/volume/drivers/netapp/utils.py:140 +#: cinder/volume/drivers/netapp/utils.py:152 msgid "" "It is not the recommended way to use drivers by NetApp. Please use " "NetAppDriver to achieve the functionality." msgstr "" -#: cinder/volume/drivers/netapp/utils.py:163 +#: cinder/volume/drivers/netapp/dataontap/client/api.py:540 msgid "Requires an NaServer instance." msgstr "" -#: cinder/volume/drivers/netapp/utils.py:320 +#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:448 msgid "Unsupported Clustered Data ONTAP version." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:45 +#: cinder/volume/drivers/netapp/eseries/client.py:47 msgid "One of the required inputs from host, port or scheme not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:49 +#: cinder/volume/drivers/netapp/eseries/client.py:51 msgid "Invalid transport type." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:73 +#: cinder/volume/drivers/netapp/eseries/client.py:74 #, python-format msgid "Unexpected error while invoking web service. Error - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:76 +#: cinder/volume/drivers/netapp/eseries/client.py:78 msgid "Invoking web service failed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:109 +#: cinder/volume/drivers/netapp/eseries/client.py:111 msgid "Storage system id not set." msgstr "" @@ -9022,70 +9045,71 @@ "%(sys)s, timeout: %(t)s, verify: %(v)s, kwargs: %(k)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:135 +#: cinder/volume/drivers/netapp/eseries/client.py:144 msgid "Content type not supported." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:145 +#: cinder/volume/drivers/netapp/eseries/client.py:154 #, python-format msgid "Response error - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/client.py:147 +#: cinder/volume/drivers/netapp/eseries/client.py:156 #, python-format msgid "Response error code - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:86 +#: cinder/volume/drivers/nimble.py:90 +#: cinder/volume/drivers/ibm/flashsystem.py:1122 #, python-format msgid "%s is not set." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:100 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:104 #, python-format msgid "Error resolving host %(host)s. Error - %(e)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:110 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:114 msgid "Controller ips not valid after resolution." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:113 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:117 msgid "Embedded mode detected." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:116 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:120 msgid "Proxy mode detected." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:127 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:173 #, python-format msgid "" "System with controller addresses [%s] is not registered with web service." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:145 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:149 msgid "Waiting for web service array communication." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:149 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:195 #, python-format msgid "" "Failure in communication between web service and array. Waited %s seconds. " "Verify array configuration parameters." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:159 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:205 #, python-format msgid "System %(id)s found with bad status - %(status)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:161 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:165 #, python-format msgid "System %(id)s has %(status)s status." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:177 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:181 #, python-format msgid "Configured storage pools %s." msgstr "" @@ -9105,38 +9129,40 @@ msgid "Mapping with id %s already removed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:270 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:325 #, python-format msgid "No pit image found in snapshot group %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:296 -#: cinder/volume/drivers/netapp/eseries/iscsi.py:330 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:346 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:361 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:378 #, python-format msgid "Created volume with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:299 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:349 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:364 #, python-format msgid "Error creating volume. Msg - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:300 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:409 #, python-format msgid "Failure creating volume %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:316 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:725 #, python-format msgid "No storage pool found with available capacity %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:339 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:387 #, python-format msgid "Failure deleting snap vol. Error: %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:341 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:389 msgid "Snapshot volume not found." msgstr "" @@ -9145,67 +9171,67 @@ msgid "Creating snap vol for group %s" msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:357 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:405 #, python-format msgid "Copying src vol %(src)s to dest vol %(dst)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:370 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:418 #, python-format msgid "Vol copy job status %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:371 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:463 #, python-format msgid "Vol copy job for dest %s failed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:374 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:422 #, python-format msgid "Vol copy job completed for dest %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:382 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:430 #, python-format msgid "Failure deleting job %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:384 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:432 #, python-format msgid "Volume copy job for src vol %s not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:386 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:434 #, python-format msgid "Copy job to dest vol %s completed." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:398 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:446 #, python-format msgid "Failure deleting temp snapshot %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:407 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:455 #, python-format msgid "Volume %s already deleted." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:431 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:479 #, python-format msgid "Created snap grp with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:442 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:490 #, python-format msgid "Snapshot %s already deleted." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:468 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:563 #, python-format msgid "Mapped volume %(id)s to the initiator %(initiator_name)s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:471 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:566 #, python-format msgid "" "Successfully fetched target details for volume %(id)s and initiator " @@ -9217,31 +9243,31 @@ msgid "No good iscsi portal information found for %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:527 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:600 #, python-format msgid "Message - %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:542 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:615 #, python-format msgid "Host with port %(port)s and type %(type)s not found." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:547 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:620 #, python-format msgid "Creating host with port %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:560 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:679 #, python-format msgid "Host type %s not supported." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:569 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:643 msgid "No free luns. Host might exceeded max luns." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:592 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:719 #, python-format msgid "Mapping not found for %(vol)s to host %(ht)s." msgstr "" @@ -9250,12 +9276,12 @@ msgid "Updating volume stats." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:646 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:744 #, python-format msgid "Extended volume with label %s." msgstr "" -#: cinder/volume/drivers/netapp/eseries/iscsi.py:660 +#: cinder/volume/drivers/netapp/eseries/iscsi.py:758 msgid "Returning as clean tmp vol job already running." msgstr "" @@ -9264,22 +9290,22 @@ msgid "Error deleting vol with label %s." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:105 +#: cinder/volume/drivers/nexenta/iscsi.py:106 #, python-format msgid "Volume %s does not exist in Nexenta SA" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:151 +#: cinder/volume/drivers/nexenta/iscsi.py:152 #, python-format msgid "Extending volume: %(id)s New size: %(size)s GB" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:167 +#: cinder/volume/drivers/nexenta/iscsi.py:168 #, python-format msgid "Volume %s does not exist, it seems it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:180 +#: cinder/volume/drivers/nexenta/iscsi.py:181 #, python-format msgid "Cannot delete snapshot %(origin)s: %(exc)s" msgstr "" @@ -9290,15 +9316,15 @@ "Creating temp snapshot of the original volume: %(volume_name)s@%(name)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:201 -#: cinder/volume/drivers/nexenta/nfs.py:200 +#: cinder/volume/drivers/nexenta/iscsi.py:202 +#: cinder/volume/drivers/nexenta/nfs.py:202 #, python-format msgid "" "Volume creation failed, deleting created snapshot %(volume_name)s@%(name)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:206 -#: cinder/volume/drivers/nexenta/nfs.py:205 +#: cinder/volume/drivers/nexenta/iscsi.py:207 +#: cinder/volume/drivers/nexenta/nfs.py:207 #, python-format msgid "Failed to delete zfs snapshot %(volume_name)s@%(name)s" msgstr "" @@ -9308,77 +9334,77 @@ msgid "Enter: migrate_volume: id=%(id)s, host=%(host)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:268 +#: cinder/volume/drivers/nexenta/iscsi.py:269 #, python-format msgid "Remote NexentaStor appliance at %s should be SSH-bound." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:288 +#: cinder/volume/drivers/nexenta/iscsi.py:289 #, python-format msgid "" "Cannot send source snapshot %(src)s to destination %(dst)s. Reason: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:296 +#: cinder/volume/drivers/nexenta/iscsi.py:297 #, python-format msgid "" "Cannot delete temporary source snapshot %(src)s on NexentaStor Appliance: " "%(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:302 +#: cinder/volume/drivers/nexenta/iscsi.py:303 #, python-format msgid "" "Cannot delete source volume %(volume)s on NexentaStor Appliance: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:312 +#: cinder/volume/drivers/nexenta/iscsi.py:313 #, python-format msgid "" "Cannot delete temporary destination snapshot %(dst)s on NexentaStor " "Appliance: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:355 +#: cinder/volume/drivers/nexenta/iscsi.py:356 #, python-format msgid "Snapshot %s does not exist, it seems it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:476 -#: cinder/volume/drivers/windows/windows_utils.py:230 +#: cinder/volume/drivers/nexenta/iscsi.py:477 +#: cinder/volume/drivers/windows/windows_utils.py:273 #, python-format msgid "Ignored target creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:486 +#: cinder/volume/drivers/nexenta/iscsi.py:487 #, python-format msgid "Ignored target group creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:498 +#: cinder/volume/drivers/nexenta/iscsi.py:499 #, python-format msgid "" "Ignored target group member addition error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:508 +#: cinder/volume/drivers/nexenta/iscsi.py:509 #, python-format msgid "Ignored LU creation error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:518 +#: cinder/volume/drivers/nexenta/iscsi.py:519 #, python-format msgid "Ignored LUN mapping entry addition error \"%s\" while ensuring export" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:551 +#: cinder/volume/drivers/nexenta/iscsi.py:552 #, python-format msgid "" "Got error trying to destroy target group %(target_group)s, assuming it is " "already gone: %(exc)s" msgstr "" -#: cinder/volume/drivers/nexenta/iscsi.py:559 +#: cinder/volume/drivers/nexenta/iscsi.py:560 #, python-format msgid "" "Got error trying to delete target %(target)s, assuming it is already gone: " @@ -9390,15 +9416,15 @@ msgid "Sending JSON data: %s" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:88 +#: cinder/volume/drivers/nexenta/jsonrpc.py:89 msgid "No headers in server response" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:89 +#: cinder/volume/drivers/nexenta/jsonrpc.py:91 msgid "Bad response from server" msgstr "" -#: cinder/volume/drivers/nexenta/jsonrpc.py:90 +#: cinder/volume/drivers/nexenta/jsonrpc.py:91 #, python-format msgid "Auto switching to HTTPS connection to %s" msgstr "" @@ -9408,12 +9434,12 @@ msgid "Got response: %s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:85 +#: cinder/volume/drivers/nexenta/nfs.py:88 #, python-format msgid "Volume %s does not exist in Nexenta Store appliance" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:89 +#: cinder/volume/drivers/nexenta/nfs.py:92 #, python-format msgid "Folder %s does not exist in Nexenta Store appliance" msgstr "" @@ -9423,33 +9449,33 @@ msgid "Creating folder on Nexenta Store %s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:146 +#: cinder/volume/drivers/nexenta/nfs.py:148 #, python-format msgid "Cannot destroy created folder: %(vol)s/%(folder)s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:176 +#: cinder/volume/drivers/nexenta/nfs.py:178 #, python-format msgid "Cannot destroy cloned folder: %(vol)s/%(folder)s" msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:227 +#: cinder/volume/drivers/nexenta/nfs.py:229 #, python-format msgid "Folder %s does not exist, it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:237 -#: cinder/volume/drivers/nexenta/nfs.py:268 +#: cinder/volume/drivers/nexenta/nfs.py:239 +#: cinder/volume/drivers/nexenta/nfs.py:270 #, python-format msgid "Snapshot %s does not exist, it was already deleted." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:302 +#: cinder/volume/drivers/nexenta/nfs.py:300 #, python-format msgid "Creating regular file: %s.This may take some time." msgstr "" -#: cinder/volume/drivers/nexenta/nfs.py:313 +#: cinder/volume/drivers/nexenta/nfs.py:311 #, python-format msgid "Regular file: %s created." msgstr "" @@ -9464,16 +9490,16 @@ msgid "Shares loaded: %s" msgstr "" -#: cinder/volume/drivers/nexenta/utils.py:47 +#: cinder/volume/drivers/nexenta/utils.py:48 #, python-format msgid "Invalid value: \"%s\"" msgstr "" -#: cinder/volume/drivers/san/san.py:169 +#: cinder/volume/drivers/san/san.py:171 msgid "Specify san_password or san_private_key" msgstr "" -#: cinder/volume/drivers/san/san.py:173 +#: cinder/volume/drivers/san/san.py:175 msgid "san_ip must be set" msgstr "" @@ -9482,35 +9508,35 @@ msgid "Cannot parse list-view output: %s" msgstr "" -#: cinder/volume/drivers/san/solaris.py:174 +#: cinder/volume/drivers/san/solaris.py:171 #, python-format msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:178 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:224 #, python-format msgid "" "Invalid hp3parclient version found (%(found)s). Version %(minimum)s or " "greater required." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:200 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:239 #, python-format msgid "Failed to Login to 3PAR (%(url)s) because %(err)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:214 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:264 #, python-format msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:232 -#: cinder/volume/drivers/san/hp/hp_3par_common.py:442 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:291 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:690 #, python-format msgid "CPG (%s) doesn't exist on array" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:240 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:299 #, python-format msgid "Failed to get domain because CPG (%s) doesn't exist on array." msgstr "" @@ -9524,22 +9550,22 @@ msgid "Converting to base volume prior to growing." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:283 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:463 #, python-format msgid "Error extending volume: %(vol)s. Exception: %(ex)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:463 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:731 #, python-format msgid "3PAR vlun %(name)s not found on host %(host)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:593 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:831 #, python-format msgid "Error creating QOS rule %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:602 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:892 #, python-format msgid "VV Set %s does not exist." msgstr "" @@ -9550,14 +9576,14 @@ "Must specify a valid persona %(valid)s, value '%(persona)s' is invalid." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:695 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1019 #, python-format msgid "" "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is " "invalid." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:763 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1113 #, python-format msgid "Volume (%s) already exists on array" msgstr "" @@ -9572,7 +9598,7 @@ msgid "Found an online copy for %(volume)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:876 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1267 #, python-format msgid "Delete volume id not found. Removing from cinder: %(id)s Ex: %(msg)s" msgstr "" @@ -9587,27 +9613,27 @@ msgid "Growing volume: %(id)s by %(size)s GiB." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:947 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1234 #, python-format msgid "Error extending volume %(id)s. Ex: %(ex)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1031 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1419 #, python-format msgid "Failure in update_volume_key_value_pair:%s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1045 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1436 #, python-format msgid "Failure in clear_volume_key_value_pair:%s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1057 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1344 #, python-format msgid "Error attaching volume %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1065 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1352 #, python-format msgid "Error detaching volume %s" msgstr "" @@ -9647,7 +9673,7 @@ msgid "Copy volume scheduled: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1165 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1533 #, python-format msgid "" "Copy volume task failed: convert_to_base_volume: id=%(id)s, " @@ -9669,43 +9695,43 @@ msgid "Delete src volume completed: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1186 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1473 #, python-format msgid "Completed: convert_to_base_volume: id=%s." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1189 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1557 #, python-format msgid "Volume (%s) already exists on array." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_common.py:1218 +#: cinder/volume/drivers/san/hp/hp_3par_common.py:1588 #, python-format msgid "" "Delete Snapshot id not found. Removing from cinder: %(id)s Ex: %(msg)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:127 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:154 #, python-format msgid "Invalid IP address format '%s'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:161 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:188 #, python-format msgid "" "Found invalid iSCSI IP address(s) in configuration option(s) " "hp3par_iscsi_ips or iscsi_ip_address '%s.'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:167 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:194 msgid "At least one valid iSCSI IP address must be set." msgstr "" -#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:269 +#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:289 msgid "Least busy iSCSI port not found, using first iSCSI port in list." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:92 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:94 #, python-format msgid "CLIQ %(proxy_ver)s" msgstr "" @@ -9715,18 +9741,18 @@ msgid "CLIQ command returned %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:113 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:115 #, python-format msgid "" "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:121 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:123 #, python-format msgid "Error running CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:151 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:153 #, python-format msgid "" "Unexpected number of virtual ips for cluster %(cluster_name)s. " @@ -9743,21 +9769,21 @@ msgid "Snapshot info: %(name)s => %(attributes)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:318 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:184 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:320 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:188 msgid "Volume did not exist. It will not be deleted" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:330 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:217 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:332 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:221 msgid "Snapshot did not exist. It will not be deleted" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:342 +#: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:341 msgid "local_path not supported" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:75 +#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:80 #, python-format msgid "HPLeftHand driver %(driver_ver)s, proxy %(proxy_ver)s" msgstr "" @@ -9766,30 +9792,30 @@ msgid "Module hplefthandclient not installed." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:102 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:109 msgid "HPLeftHand url not found" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:128 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:147 msgid "LeftHand cluster not found" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:136 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:155 #, python-format msgid "REST %(proxy_ver)s hplefthandclient %(rest_ver)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:342 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:360 #, python-format msgid "'%(value)s' is an invalid value for extra spec '%(key)s'" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:362 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:380 #, python-format msgid "CHAP secret exists for host %s but CHAP is disabled" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:365 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:383 #, python-format msgid "CHAP is enabled, but server secret not configured on server %s" msgstr "" @@ -9809,15 +9835,15 @@ msgid "Clister info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:483 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:501 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because volume is " "from a different backend." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:488 -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:494 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:506 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:512 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because cluster " @@ -9829,7 +9855,7 @@ msgid "Volume info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:505 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:523 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because the volume " @@ -9841,14 +9867,14 @@ msgid "Snapshot info: %s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:516 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:534 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because the volume " "has snapshots." msgstr "" -#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:524 +#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:542 #, python-format msgid "" "Cannot provide backend assisted migration for volume: %s because volume does " @@ -9859,12 +9885,12 @@ msgid "Connecting to MSA" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:66 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:67 #, python-format msgid "Failed to connect to MSA Array (%(host)s): %(err)s" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:71 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:72 msgid "Failed to log on MSA Array (invalid login?)" msgstr "" @@ -9872,7 +9898,7 @@ msgid "Disconnected from MSA Array" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:125 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:126 #, python-format msgid "%s configuration option is not set" msgstr "" @@ -9882,7 +9908,7 @@ msgid "Create Volume (%(display_name)s: %(name)s %(id)s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:166 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:167 msgid "Volume must be detached to perform a clone operation." msgstr "" @@ -9901,12 +9927,12 @@ msgid "Deleting Volume (%s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:243 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:244 #, python-format msgid "Unable to get stats for VDisk (%s)" msgstr "" -#: cinder/volume/drivers/san/hp/hp_msa_common.py:252 +#: cinder/volume/drivers/san/hp/hp_msa_common.py:253 msgid "Connector doesn't provide wwpns" msgstr "" @@ -9927,26 +9953,26 @@ "%(growth_size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/api.py:71 +#: cinder/volume/drivers/vmware/api.py:72 #, python-format msgid "Failure while invoking function: %(func)s. Error: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:168 +#: cinder/volume/drivers/vmware/api.py:170 #, python-format msgid "Error while terminating session: %s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:173 +#: cinder/volume/drivers/vmware/api.py:183 msgid "Successfully established connection to the server." msgstr "" -#: cinder/volume/drivers/vmware/api.py:180 +#: cinder/volume/drivers/vmware/api.py:190 #, python-format msgid "Error while logging out from vim session: %s." msgstr "" -#: cinder/volume/drivers/vmware/api.py:186 +#: cinder/volume/drivers/vmware/api.py:196 #, python-format msgid "Error while logging out from pbm session: %s." msgstr "" @@ -9968,8 +9994,8 @@ msgid "Task %s status: success." msgstr "" -#: cinder/volume/drivers/vmware/api.py:274 -#: cinder/volume/drivers/vmware/api.py:278 +#: cinder/volume/drivers/vmware/api.py:313 +#: cinder/volume/drivers/vmware/api.py:317 #, python-format msgid "Task: %(task)s failed with error: %(err)s." msgstr "" @@ -9982,16 +10008,16 @@ msgid "Lease initializing..." msgstr "" -#: cinder/volume/drivers/vmware/api.py:306 +#: cinder/volume/drivers/vmware/api.py:347 #, python-format msgid "Error: unknown lease state %s." msgstr "" -#: cinder/volume/drivers/vmware/error_util.py:58 +#: cinder/volume/drivers/vmware/error_util.py:64 msgid "VMware VMDK driver exception." msgstr "" -#: cinder/volume/drivers/vmware/error_util.py:64 +#: cinder/volume/drivers/vmware/error_util.py:70 msgid "VMware VMDK driver configuration error." msgstr "" @@ -10016,12 +10042,12 @@ msgid "Glance image: %s is now active." msgstr "" -#: cinder/volume/drivers/vmware/io_util.py:123 +#: cinder/volume/drivers/vmware/io_util.py:130 #, python-format msgid "Glance image: %s is in killed state." msgstr "" -#: cinder/volume/drivers/vmware/io_util.py:132 +#: cinder/volume/drivers/vmware/io_util.py:139 #, python-format msgid "Glance image %(id)s is in unknown state - %(state)s" msgstr "" @@ -10032,12 +10058,12 @@ "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:204 -#: cinder/volume/drivers/vmware/read_write_util.py:293 +#: cinder/volume/drivers/vmware/read_write_util.py:199 +#: cinder/volume/drivers/vmware/read_write_util.py:292 msgid "Could not retrieve URL from lease." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:207 +#: cinder/volume/drivers/vmware/read_write_util.py:209 #, python-format msgid "Opening vmdk url: %s for write." msgstr "" @@ -10064,7 +10090,7 @@ msgid "Lease is already in state: %s." msgstr "" -#: cinder/volume/drivers/vmware/read_write_util.py:296 +#: cinder/volume/drivers/vmware/read_write_util.py:302 #, python-format msgid "Opening vmdk url: %s for read." msgstr "" @@ -10074,32 +10100,32 @@ msgid "Read %s bytes from vmdk." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:142 +#: cinder/volume/drivers/vmware/vim.py:145 #, python-format msgid "Error(s): %s occurred in the call to RetrievePropertiesEx." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:181 +#: cinder/volume/drivers/vmware/vim.py:185 #, python-format msgid "No such SOAP method %(attr)s. Detailed error: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:190 +#: cinder/volume/drivers/vmware/vim.py:194 #, python-format msgid "httplib error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:201 +#: cinder/volume/drivers/vmware/vim.py:211 #, python-format msgid "Socket error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:210 +#: cinder/volume/drivers/vmware/vim.py:220 #, python-format msgid "Type error in %(attr)s: %(excep)s." msgstr "" -#: cinder/volume/drivers/vmware/vim.py:217 +#: cinder/volume/drivers/vmware/vim.py:227 #, python-format msgid "Error in %(attr)s. Detailed error: %(excep)s." msgstr "" @@ -10119,25 +10145,25 @@ msgid "Invalid spec value: %s specified." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:146 +#: cinder/volume/drivers/vmware/vmdk.py:196 msgid "" "The VMware ESX VMDK driver is now deprecated and will be removed in the Juno " "release. The VMware vCenter VMDK driver will remain and continue to be " "supported." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:198 +#: cinder/volume/drivers/vmware/vmdk.py:258 #, python-format msgid "%s not set." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:206 -#: cinder/volume/drivers/vmware/vmdk.py:1190 +#: cinder/volume/drivers/vmware/vmdk.py:264 +#: cinder/volume/drivers/vmware/vmdk.py:1900 #, python-format msgid "Successfully setup driver: %(driver)s for server: %(ip)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:248 +#: cinder/volume/drivers/vmware/vmdk.py:308 #, python-format msgid "Not able to find a suitable datastore for the volume: %s." msgstr "" @@ -10147,11 +10173,11 @@ msgid "Verified volume %s can be created." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:271 +#: cinder/volume/drivers/vmware/vmdk.py:329 msgid "Backing not available, no operation to be performed." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:339 +#: cinder/volume/drivers/vmware/vmdk.py:400 #, python-format msgid "" "Unable to pick datastore to accommodate %(size)s bytes from the datastores: " @@ -10170,7 +10196,7 @@ msgid "Filter datastores matching storage profile %(profile)s: %(dss)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:375 +#: cinder/volume/drivers/vmware/vmdk.py:440 #, python-format msgid "No such storage profile '%s; is defined in vCenter." msgstr "" @@ -10180,40 +10206,40 @@ msgid "Storage profile required for this volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:402 +#: cinder/volume/drivers/vmware/vmdk.py:467 #, python-format msgid "" "Aborting since none of the datastores match the given storage profile %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:407 +#: cinder/volume/drivers/vmware/vmdk.py:469 #, python-format msgid "" "Ignoring storage profile %s requirement for this volume since policy based " "placement is disabled." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:483 +#: cinder/volume/drivers/vmware/vmdk.py:585 #, python-format msgid "" "Unable to find suitable datastore for volume of size: %(vol)s GB under host: " "%(host)s. More details: %(excep)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:493 +#: cinder/volume/drivers/vmware/vmdk.py:598 #, python-format msgid "" "Unable to find host to accommodate a disk of size: %s in the inventory." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:520 +#: cinder/volume/drivers/vmware/vmdk.py:626 #, python-format msgid "" "Unable to find suitable datastore for volume: %(vol)s under host: %(host)s. " "More details: %(excep)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:530 +#: cinder/volume/drivers/vmware/vmdk.py:639 #, python-format msgid "Unable to create volume: %s in the inventory." msgstr "" @@ -10223,7 +10249,7 @@ msgid "The instance: %s for which initialize connection is called, exists." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:556 +#: cinder/volume/drivers/vmware/vmdk.py:662 #, python-format msgid "There is no backing for the volume: %s. Need to create one." msgstr "" @@ -10233,77 +10259,77 @@ "The instance for which initialize connection is called, does not exist." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:569 +#: cinder/volume/drivers/vmware/vmdk.py:675 #, python-format msgid "Trying to boot from an empty volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:578 +#: cinder/volume/drivers/vmware/vmdk.py:684 #, python-format msgid "" "Returning connection_info: %(info)s for volume: %(volume)s with connector: " "%(connector)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:626 +#: cinder/volume/drivers/vmware/vmdk.py:735 #, python-format msgid "Snapshot of volume not supported in state: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:631 +#: cinder/volume/drivers/vmware/vmdk.py:737 #, python-format msgid "There is no backing, so will not create snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:636 +#: cinder/volume/drivers/vmware/vmdk.py:742 #, python-format msgid "Successfully created snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:657 +#: cinder/volume/drivers/vmware/vmdk.py:766 #, python-format msgid "Delete snapshot of volume not supported in state: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:662 +#: cinder/volume/drivers/vmware/vmdk.py:768 #, python-format msgid "There is no backing, and so there is no snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:666 +#: cinder/volume/drivers/vmware/vmdk.py:772 #, python-format msgid "Successfully deleted snapshot: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:707 +#: cinder/volume/drivers/vmware/vmdk.py:813 #, python-format msgid "" "Successfully cloned new backing: %(back)s from source VMDK file: %(vmdk)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:724 +#: cinder/volume/drivers/vmware/vmdk.py:830 #, python-format msgid "" "There is no backing for the source volume: %(svol)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:755 +#: cinder/volume/drivers/vmware/vmdk.py:861 #, python-format msgid "" "There is no backing for the source snapshot: %(snap)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:764 -#: cinder/volume/drivers/vmware/vmdk.py:1306 +#: cinder/volume/drivers/vmware/vmdk.py:870 +#: cinder/volume/drivers/vmware/vmdk.py:2030 #, python-format msgid "" "There is no snapshot point for the snapshotted volume: %(snap)s. Not " "creating any backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:801 +#: cinder/volume/drivers/vmware/vmdk.py:908 #, python-format msgid "" "Cannot create image of disk format: %s. Only vmdk disk format is accepted." @@ -10315,8 +10341,7 @@ msgid "Fetching glance image: %(id)s to server: %(host)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:845 -#: cinder/volume/drivers/vmware/vmdk.py:917 +#: cinder/volume/drivers/vmware/vmdk.py:1219 #, python-format msgid "Done copying image: %(id)s to volume: %(vol)s." msgstr "" @@ -10327,7 +10352,7 @@ "Exception in copy_image_to_volume: %(excep)s. Deleting the backing: %(back)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:868 +#: cinder/volume/drivers/vmware/vmdk.py:1172 #, python-format msgid "Exception in _select_ds_for_volume: %s." msgstr "" @@ -10337,24 +10362,24 @@ msgid "Selected datastore %(ds)s for new volume of size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:909 +#: cinder/volume/drivers/vmware/vmdk.py:1211 #, python-format msgid "Exception in copy_image_to_volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:913 +#: cinder/volume/drivers/vmware/vmdk.py:1215 #, python-format msgid "Deleting the backing: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:928 +#: cinder/volume/drivers/vmware/vmdk.py:1230 #, python-format msgid "" "The backing is not found, so there is no need to extend the vmdk virtual " "disk for the volume %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:950 +#: cinder/volume/drivers/vmware/vmdk.py:1252 #, python-format msgid "Unable to extend the size of the vmdk virtual disk at the path %s." msgstr "" @@ -10364,12 +10389,12 @@ msgid "Copy glance image: %s to create new volume." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:992 +#: cinder/volume/drivers/vmware/vmdk.py:1302 #, python-format msgid "Exception in copying the image to the volume: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1021 +#: cinder/volume/drivers/vmware/vmdk.py:1344 msgid "Upload to glance of attached volume is not supported." msgstr "" @@ -10378,102 +10403,102 @@ msgid "Copy Volume: %s to new image." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1032 +#: cinder/volume/drivers/vmware/vmdk.py:1350 #, python-format msgid "Backing not found, creating for volume: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1051 +#: cinder/volume/drivers/vmware/vmdk.py:1369 #, python-format msgid "Done copying volume %(vol)s to a new image %(img)s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1068 -#: cinder/volume/drivers/vmware/vmdk.py:1097 +#: cinder/volume/drivers/vmware/vmdk.py:1553 +#: cinder/volume/drivers/vmware/vmdk.py:1582 #, python-format msgid "Done extending volume %(vol)s to size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1072 +#: cinder/volume/drivers/vmware/vmdk.py:1557 #, python-format msgid "" "Relocating volume %s vmdk to a different datastore since trying to extend " "vmdk file in place failed." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1080 +#: cinder/volume/drivers/vmware/vmdk.py:1565 #, python-format msgid "" "Not able to find a different datastore to place the extended volume %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1083 +#: cinder/volume/drivers/vmware/vmdk.py:1568 #, python-format msgid "" "Selected datastore %(ds)s to place extended volume of size %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1095 +#: cinder/volume/drivers/vmware/vmdk.py:1580 #, python-format msgid "Not able to relocate volume %s for extending." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1140 +#: cinder/volume/drivers/vmware/vmdk.py:1850 #, python-format msgid "PBM WSDL file %s is missing!" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1143 +#: cinder/volume/drivers/vmware/vmdk.py:1853 #, python-format msgid "Using PBM WSDL location: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1154 +#: cinder/volume/drivers/vmware/vmdk.py:1864 #, python-format msgid "Using overridden vmware_host_version from config: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1158 +#: cinder/volume/drivers/vmware/vmdk.py:1868 #, python-format msgid "Fetched VC server version: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1165 +#: cinder/volume/drivers/vmware/vmdk.py:1875 #, python-format msgid "Version string '%s' is not parseable" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1179 +#: cinder/volume/drivers/vmware/vmdk.py:1889 #, python-format msgid "Not able to configure PBM for VC server: %s" msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1238 +#: cinder/volume/drivers/vmware/vmdk.py:1953 #, python-format msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1284 -#: cinder/volume/drivers/vmware/volumeops.py:673 +#: cinder/volume/drivers/vmware/vmdk.py:2008 +#: cinder/volume/drivers/vmware/volumeops.py:1069 #, python-format msgid "Successfully created clone: %s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1298 +#: cinder/volume/drivers/vmware/vmdk.py:2022 #, python-format msgid "" "There is no backing for the snapshotted volume: %(snap)s. Not creating any " "backing for the volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1335 +#: cinder/volume/drivers/vmware/vmdk.py:2059 #, python-format msgid "" "There is no backing for the source volume: %(src)s. Not creating any backing " "for volume: %(vol)s." msgstr "" -#: cinder/volume/drivers/vmware/vmdk.py:1343 +#: cinder/volume/drivers/vmware/vmdk.py:2065 #, python-format msgid "Linked clone of source volume not supported in state: %s." msgstr "" @@ -10483,8 +10508,8 @@ msgid "Downloading image: %s from glance image server as a flat vmdk file." msgstr "" -#: cinder/volume/drivers/vmware/vmware_images.py:107 -#: cinder/volume/drivers/vmware/vmware_images.py:126 +#: cinder/volume/drivers/vmware/vmware_images.py:110 +#: cinder/volume/drivers/vmware/vmware_images.py:129 #, python-format msgid "Downloaded image: %s from glance image server." msgstr "" @@ -10499,7 +10524,7 @@ msgid "Uploading image: %s to the Glance image server using HttpNfc export." msgstr "" -#: cinder/volume/drivers/vmware/vmware_images.py:158 +#: cinder/volume/drivers/vmware/vmware_images.py:161 #, python-format msgid "Uploaded image: %s to the Glance image server." msgstr "" @@ -10519,7 +10544,7 @@ msgid "Initiated deletion of VM backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:100 +#: cinder/volume/drivers/vmware/volumeops.py:306 #, python-format msgid "Deleted the VM backing: %s." msgstr "" @@ -10529,7 +10554,7 @@ msgid "Datastores attached to host %(host)s are: %(ds)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:240 +#: cinder/volume/drivers/vmware/volumeops.py:463 #, python-format msgid "There are no valid datastores attached to %s." msgstr "" @@ -10561,7 +10586,7 @@ msgid "Extending the volume %(name)s to %(size)s GB." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:347 +#: cinder/volume/drivers/vmware/volumeops.py:579 #, python-format msgid "Successfully extended the volume %(name)s to %(size)s GB." msgstr "" @@ -10584,7 +10609,7 @@ msgid "Initiated creation of volume backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:441 +#: cinder/volume/drivers/vmware/volumeops.py:724 #, python-format msgid "Successfully created volume backing: %s." msgstr "" @@ -10606,7 +10631,7 @@ msgid "Initiated relocation of volume backing: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:507 +#: cinder/volume/drivers/vmware/volumeops.py:882 #, python-format msgid "" "Successfully relocated volume backing: %(backing)s to datastore: %(ds)s and " @@ -10624,7 +10649,7 @@ "Initiated move of volume backing: %(backing)s into the folder: %(fol)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:525 +#: cinder/volume/drivers/vmware/volumeops.py:900 #, python-format msgid "" "Successfully moved volume backing: %(backing)s into the folder: %(fol)s." @@ -10640,7 +10665,7 @@ msgid "Initiated snapshot of volume backing: %(backing)s named: %(name)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:548 +#: cinder/volume/drivers/vmware/volumeops.py:923 #, python-format msgid "" "Successfully created snapshot: %(snap)s for volume backing: %(backing)s." @@ -10651,7 +10676,7 @@ msgid "Deleting the snapshot: %(name)s from backing: %(backing)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:601 +#: cinder/volume/drivers/vmware/volumeops.py:985 #, python-format msgid "" "Did not find the snapshot: %(name)s for backing: %(backing)s. Need not " @@ -10663,7 +10688,7 @@ msgid "Initiated snapshot: %(name)s deletion for backing: %(backing)s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:612 +#: cinder/volume/drivers/vmware/volumeops.py:996 #, python-format msgid "Successfully deleted snapshot: %(name)s of backing: %(backing)s." msgstr "" @@ -10695,7 +10720,7 @@ msgid "Initiated deletion via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:691 +#: cinder/volume/drivers/vmware/volumeops.py:1173 #, python-format msgid "Successfully deleted file: %s." msgstr "" @@ -10709,7 +10734,7 @@ msgid "Initiated copying disk data via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:756 +#: cinder/volume/drivers/vmware/volumeops.py:1321 #, python-format msgid "Successfully copied disk at: %(src)s to: %(dest)s." msgstr "" @@ -10724,7 +10749,7 @@ msgid "Initiated deleting vmdk file via task: %s." msgstr "" -#: cinder/volume/drivers/vmware/volumeops.py:774 +#: cinder/volume/drivers/vmware/volumeops.py:1339 #, python-format msgid "Deleted vmdk file: %s." msgstr "" @@ -10763,32 +10788,32 @@ msgid "Creating folder %s " msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:47 +#: cinder/volume/drivers/windows/windows_utils.py:56 #, python-format msgid "" "check_for_setup_error: the state of the WT Portal could not be verified. WMI " "exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:53 +#: cinder/volume/drivers/windows/windows_utils.py:62 msgid "check_for_setup_error: there is no ISCSI traffic listening." msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:63 +#: cinder/volume/drivers/windows/windows_utils.py:72 #, python-format msgid "" "get_host_information: the state of the WT Portal could not be verified. WMI " "exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:73 +#: cinder/volume/drivers/windows/windows_utils.py:82 #, python-format msgid "" "get_host_information: the ISCSI target information could not be retrieved. " "WMI exception: %s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:105 +#: cinder/volume/drivers/windows/windows_utils.py:116 #, python-format msgid "" "associate_initiator_with_iscsi_target: an association between initiator: " @@ -10796,77 +10821,77 @@ "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:123 +#: cinder/volume/drivers/windows/windows_utils.py:134 #, python-format msgid "" "delete_iscsi_target: error when deleting the iscsi target associated with " "target name: %(target)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:139 +#: cinder/volume/drivers/windows/windows_utils.py:154 #, python-format msgid "" "create_volume: error when creating the volume name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:157 +#: cinder/volume/drivers/windows/windows_utils.py:190 #, python-format msgid "" "delete_volume: error when deleting the volume name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:177 +#: cinder/volume/drivers/windows/windows_utils.py:210 #, python-format msgid "" "create_snapshot: error when creating the snapshot name: %(vol_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:193 +#: cinder/volume/drivers/windows/windows_utils.py:236 #, python-format msgid "" "create_volume_from_snapshot: error when creating the volume name: " "%(vol_name)s from snapshot name: %(snap_name)s. WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:208 +#: cinder/volume/drivers/windows/windows_utils.py:251 #, python-format msgid "" "delete_snapshot: error when deleting the snapshot name: %(snap_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:223 +#: cinder/volume/drivers/windows/windows_utils.py:266 #, python-format msgid "" "create_iscsi_target: error when creating iscsi target: %(tar_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:240 +#: cinder/volume/drivers/windows/windows_utils.py:288 #, python-format msgid "" "remove_iscsi_target: error when deleting iscsi target: %(tar_name)s . WMI " "exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:255 +#: cinder/volume/drivers/windows/windows_utils.py:303 #, python-format msgid "" "add_disk_to_target: error adding disk associated to volume : %(vol_name)s to " "the target name: %(tar_name)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:273 +#: cinder/volume/drivers/windows/windows_utils.py:321 #, python-format msgid "" "copy_vhd_disk: error when copying disk from source path : %(src_path)s to " "destination path: %(dest_path)s . WMI exception: %(wmi_exc)s" msgstr "" -#: cinder/volume/drivers/windows/windows_utils.py:290 +#: cinder/volume/drivers/windows/windows_utils.py:338 #, python-format msgid "" "extend: error when extending the volume: %(vol_name)s .WMI exception: " @@ -10878,7 +10903,7 @@ msgid "Restoring source %(source_volid)s status to %(status)s" msgstr "" -#: cinder/volume/flows/common.py:59 +#: cinder/volume/flows/common.py:60 #, python-format msgid "" "Failed setting source volume %(source_volid)s back to its initial " @@ -10890,106 +10915,108 @@ msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s" msgstr "" -#: cinder/volume/flows/common.py:91 -#: cinder/volume/flows/manager/create_volume.py:648 +#: cinder/volume/flows/common.py:92 +#: cinder/volume/flows/manager/create_volume.py:694 #, python-format msgid "Failed updating volume %(volume_id)s with %(update)s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:81 +#: cinder/volume/flows/api/create_volume.py:101 #, python-format msgid "Originating snapshot status must be one of %s values" msgstr "" -#: cinder/volume/flows/api/create_volume.py:103 +#: cinder/volume/flows/api/create_volume.py:123 +#: cinder/volume/flows/api/create_volume.py:146 #, python-format msgid "" "Unable to create a volume from an originating source volume when its status " "is not one of %s values" msgstr "" -#: cinder/volume/flows/api/create_volume.py:126 +#: cinder/volume/flows/api/create_volume.py:178 #, python-format msgid "" "Volume size %(size)sGB cannot be smaller than the snapshot size " "%(snap_size)sGB. They must be >= original snapshot size." msgstr "" -#: cinder/volume/flows/api/create_volume.py:135 +#: cinder/volume/flows/api/create_volume.py:187 #, python-format msgid "" "Volume size %(size)sGB cannot be smaller than original volume size " "%(source_size)sGB. They must be >= original volume size." msgstr "" -#: cinder/volume/flows/api/create_volume.py:144 +#: cinder/volume/flows/api/create_volume.py:196 #, python-format msgid "Volume size %(size)s must be an integer and greater than 0" msgstr "" -#: cinder/volume/flows/api/create_volume.py:186 +#: cinder/volume/flows/api/create_volume.py:244 #, python-format msgid "" "Size of specified image %(image_size)sGB is larger than volume size " "%(volume_size)sGB." msgstr "" -#: cinder/volume/flows/api/create_volume.py:194 +#: cinder/volume/flows/api/create_volume.py:252 #, python-format msgid "" "Volume size %(volume_size)sGB cannot be smaller than the image minDisk size " "%(min_disk)sGB." msgstr "" -#: cinder/volume/flows/api/create_volume.py:212 +#: cinder/volume/flows/api/create_volume.py:270 #, python-format msgid "Metadata property key %s greater than 255 characters" msgstr "" -#: cinder/volume/flows/api/create_volume.py:217 +#: cinder/volume/flows/api/create_volume.py:275 #, python-format msgid "Metadata property key %s value greater than 255 characters" msgstr "" -#: cinder/volume/flows/api/create_volume.py:254 +#: cinder/consistencygroup/api.py:100 +#: cinder/volume/flows/api/create_volume.py:312 #, python-format msgid "Availability zone '%s' is invalid" msgstr "" -#: cinder/volume/flows/api/create_volume.py:267 +#: cinder/volume/flows/api/create_volume.py:325 msgid "Volume must be in the same availability zone as the snapshot" msgstr "" -#: cinder/volume/flows/api/create_volume.py:276 +#: cinder/volume/flows/api/create_volume.py:334 msgid "Volume must be in the same availability zone as the source volume" msgstr "" -#: cinder/volume/flows/api/create_volume.py:315 +#: cinder/volume/flows/api/create_volume.py:370 msgid "Volume type will be changed to be the same as the source volume." msgstr "" -#: cinder/volume/flows/api/create_volume.py:463 +#: cinder/volume/flows/api/create_volume.py:536 #, python-format msgid "Failed destroying volume entry %s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:546 +#: cinder/volume/flows/api/create_volume.py:620 #, python-format msgid "Failed rolling back quota for %s reservations" msgstr "" -#: cinder/volume/flows/api/create_volume.py:590 +#: cinder/volume/flows/api/create_volume.py:666 #, python-format msgid "Failed to update quota for deleting volume: %s" msgstr "" -#: cinder/volume/flows/api/create_volume.py:678 -#: cinder/volume/flows/manager/create_volume.py:193 +#: cinder/volume/flows/api/create_volume.py:766 +#: cinder/volume/flows/manager/create_volume.py:190 #, python-format msgid "Volume %s: create failed" msgstr "" -#: cinder/volume/flows/api/create_volume.py:682 +#: cinder/volume/flows/api/create_volume.py:770 msgid "Unexpected build error:" msgstr "" @@ -11010,35 +11037,35 @@ msgid "Updating volume %(volume_id)s with %(update)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:142 +#: cinder/volume/flows/manager/create_volume.py:143 #, python-format msgid "Volume %s: resetting 'creating' status failed." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:161 +#: cinder/volume/flows/manager/create_volume.py:162 #, python-format msgid "Volume %s: rescheduling failed" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:308 +#: cinder/volume/flows/manager/create_volume.py:318 #, python-format msgid "" "Failed notifying about the volume action %(event)s for volume %(volume_id)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:344 +#: cinder/volume/flows/manager/create_volume.py:347 #, python-format msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:346 +#: cinder/volume/flows/manager/create_volume.py:349 #, python-format msgid "" "Failed updating volume %(vol_id)s metadata using the provided %(src_type)s " "%(src_id)s metadata" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:404 +#: cinder/volume/flows/manager/create_volume.py:417 #, python-format msgid "" "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided " @@ -11050,7 +11077,7 @@ msgid "Marking volume %s as bootable." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:420 +#: cinder/volume/flows/manager/create_volume.py:433 #, python-format msgid "Failed updating volume %(volume_id)s bootable flag to true" msgstr "" @@ -11062,14 +11089,14 @@ "%(volume_id)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:454 -#: cinder/volume/flows/manager/create_volume.py:465 +#: cinder/volume/flows/manager/create_volume.py:488 +#: cinder/volume/flows/manager/create_volume.py:499 #, python-format msgid "" "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: %(error)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:460 +#: cinder/volume/flows/manager/create_volume.py:494 #, python-format msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s" msgstr "" @@ -11095,12 +11122,12 @@ "%(image_location)s." msgstr "" -#: cinder/volume/flows/manager/create_volume.py:551 +#: cinder/volume/flows/manager/create_volume.py:585 #, python-format msgid "Failed updating volume %(volume_id)s with %(updates)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:573 +#: cinder/volume/flows/manager/create_volume.py:609 #, python-format msgid "Unable to create volume. Volume driver %s not initialized" msgstr "" @@ -11112,25 +11139,25 @@ "%(volume_spec)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:605 -#: cinder/volume/flows/manager/manage_existing.py:84 +#: cinder/volume/flows/manager/create_volume.py:651 +#: cinder/volume/flows/manager/manage_existing.py:85 #, python-format msgid "" "Failed updating model of volume %(volume_id)s with creation provided model " "%(model)s" msgstr "" -#: cinder/volume/flows/manager/create_volume.py:652 +#: cinder/volume/flows/manager/create_volume.py:703 #, python-format msgid "Volume %(volume_name)s (%(volume_id)s): created successfully" msgstr "" -#: cinder/volume/flows/manager/manage_existing.py:45 +#: cinder/volume/flows/manager/manage_existing.py:46 #, python-format msgid "Unable to manage existing volume. Volume driver %s not initialized." msgstr "" -#: cinder/volume/flows/manager/manage_existing.py:48 +#: cinder/volume/flows/manager/manage_existing.py:49 #, python-format msgid "Volume driver %s not initialized." msgstr "" @@ -11140,7 +11167,7 @@ msgid "Lookup service to invoke: %s" msgstr "" -#: cinder/zonemanager/fc_san_lookup_service.py:82 +#: cinder/zonemanager/fc_san_lookup_service.py:84 msgid "" "Lookup service not configured. Config option for fc_san_lookup_service need " "to specify a concrete implementation of lookup service" @@ -11161,21 +11188,21 @@ msgid "Fabric Map after context lookup:%s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:130 +#: cinder/zonemanager/fc_zone_manager.py:145 #, python-format msgid "Final filtered map for fabric: %s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:136 +#: cinder/zonemanager/fc_zone_manager.py:151 msgid "Add Connection: Finished iterating over all target list" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:139 +#: cinder/zonemanager/fc_zone_manager.py:154 #, python-format msgid "Failed adding connection for fabric=%(fabric)s: Error:%(err)s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:160 +#: cinder/zonemanager/fc_zone_manager.py:175 #, python-format msgid "Delete connection Target List:%s" msgstr "" @@ -11185,7 +11212,7 @@ msgid "Delete connection Fabric Map from SAN context: %s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:176 +#: cinder/zonemanager/fc_zone_manager.py:191 #, python-format msgid "Final filtered map for delete connection: %s" msgstr "" @@ -11194,7 +11221,7 @@ msgid "Delete Connection - Finished iterating over all target list" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:186 +#: cinder/zonemanager/fc_zone_manager.py:201 #, python-format msgid "Failed removing connection for fabric=%(fabric)s: Error:%(err)s" msgstr "" @@ -11204,7 +11231,7 @@ msgid "Got SAN context:%s" msgstr "" -#: cinder/zonemanager/fc_zone_manager.py:227 +#: cinder/zonemanager/fc_zone_manager.py:242 #, python-format msgid "No targets to add or remove connection for I: %s" msgstr "" @@ -11218,7 +11245,8 @@ msgid "Fabric Names: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:94 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:106 +#: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:104 msgid "Missing Fibre Channel SAN configuration param - fc_fabric_names" msgstr "" @@ -11232,12 +11260,12 @@ msgid "Getting name server data for fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:131 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:140 #, python-format msgid "Failed collecting name server info from fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:134 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:143 #, python-format msgid "SSH connection failed for %(fabric)s with error: %(err)s" msgstr "" @@ -11278,11 +11306,11 @@ msgid "Device map for SAN context: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:190 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:199 msgid "Failed collecting nsshow info for fabric" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:197 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:206 msgid "Failed collecting nscamshow" msgstr "" @@ -11291,23 +11319,25 @@ msgid "Connector returning nsinfo-%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:215 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:219 #, python-format msgid "SSH Command failed with error '%(err)s' '%(command)s'" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:246 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:367 +#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:250 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:370 #, python-format msgid "Malformed nameserver string: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:80 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:82 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:90 #, python-format msgid "Failed getting active zone set from fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:106 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:108 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:122 #, python-format msgid "" "Malformed zone configuration: (switch=%(switch)s " @@ -11329,7 +11359,8 @@ msgid "zone list:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:147 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:151 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:176 #, python-format msgid "Deleting zone failed %s" msgstr "" @@ -11357,7 +11388,7 @@ msgid "New zone %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:179 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:184 #, python-format msgid "" "Creating and activating zone set failed: (Zone set=%(cfg_name)s " @@ -11369,12 +11400,13 @@ msgid "Delete zones: Config cmd to run:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:231 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:239 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:286 #, python-format msgid "Deleting zones failed: (command=%(cmd)s error=%(err)s)." msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:249 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:260 #, python-format msgid "Failed collecting nsshow info for fabric %s" msgstr "" @@ -11384,7 +11416,7 @@ msgid "Failed collecting nscamshow info for fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:288 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:291 #, python-format msgid "Error while checking transaction status: %s" msgstr "" @@ -11395,7 +11427,7 @@ msgid "Executing command via ssh: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:304 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:307 #, python-format msgid "Error while running zoning CLI: (command=%(cmd)s error=%(err)s)." msgstr "" @@ -11405,12 +11437,14 @@ msgid "Firmware version string:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:329 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:332 msgid "No CLI output for firmware version check" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:332 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:345 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:335 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:348 +#: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:201 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:329 #, python-format msgid "Error while getting data via ssh: (command=%(cmd)s error=%(err)s)." msgstr "" @@ -11425,7 +11459,8 @@ msgid "Handling error case after SSH:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:479 +#: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:342 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py:470 #, python-format msgid "Error executing command via ssh: %s" msgstr "" @@ -11435,44 +11470,45 @@ msgid "Add connection for Fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:132 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:137 #, python-format msgid "BrcdFCZoneDriver - Add connection for I-T map: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:144 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:145 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:144 #, python-format msgid "Zoning policy for Fabric %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:154 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:263 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:402 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:460 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:357 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:393 #, python-format msgid "" "Unsupported firmware on switch %s. Make sure switch is running firmware v6.4 " "or higher" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:163 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:225 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:207 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:221 #, python-format msgid "Failed to add zoning configuration %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:191 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:172 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:176 #, python-format msgid "Zone exists in I-T mode. Skipping zone creation %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:209 -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:337 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:190 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:194 #, python-format msgid "Zoning Policy: %s, not recognized" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:214 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:195 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:199 #, python-format msgid "Zone map to add: %s" msgstr "" @@ -11487,12 +11523,13 @@ msgid "Delete connection for fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:241 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:223 #, python-format msgid "BrcdFCZoneDriver - Delete connection for I-T map: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:253 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:231 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:259 #, python-format msgid "Zoning policy for fabric %s" msgstr "" @@ -11537,7 +11574,8 @@ msgid "Final Zone list to delete: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:364 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:324 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:372 msgid "Failed to update or delete zoning configuration" msgstr "" @@ -11566,17 +11604,18 @@ msgid "name server info from fabric:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:423 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:363 #, python-format msgid "Error getting name server info: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:426 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:366 #, python-format msgid "Failed to get name server info:%s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:434 +#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:374 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:432 #, python-format msgid "Filtered targets for SAN is: %s" msgstr "" @@ -11591,7 +11630,7 @@ msgid "Southbound connector: %s" msgstr "" -#: cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py:470 +#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:461 #, python-format msgid "Failed to access active zoning configuration:%s" msgstr "" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/colord.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/colord.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/colord.po 2014-07-09 09:08:53.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/colord.po 2015-02-19 15:12:11.000000000 +0000 @@ -17,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 14:59+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 13:20+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #. TRANSLATORS: command line option diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/command-not-found.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/command-not-found.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/command-not-found.po 2014-07-09 09:08:45.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/command-not-found.po 2015-02-19 15:12:04.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:25+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:16+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: ../CommandNotFound/CommandNotFound.py:148 #, python-format diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/coreutils.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/coreutils.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/coreutils.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/coreutils.po 2015-02-19 15:11:49.000000000 +0000 @@ -11,15 +11,15 @@ "Project-Id-Version: GNU coreutils 8.14\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" "POT-Creation-Date: 2013-02-14 15:56+0000\n" -"PO-Revision-Date: 2014-03-25 03:48+0000\n" +"PO-Revision-Date: 2015-01-15 15:24+0000\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:48+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:39+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: lib/argmatch.c:133 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cpio.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cpio.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cpio.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cpio.po 2015-02-19 15:11:49.000000000 +0000 @@ -19,8 +19,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:49+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cpplib-4.7.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cpplib-4.7.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cpplib-4.7.po 2014-07-09 09:08:54.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cpplib-4.7.po 2015-02-19 15:12:11.000000000 +0000 @@ -17,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 15:06+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 13:24+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: charset.c:674 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cracklib.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cracklib.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cracklib.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cracklib.po 2015-02-19 15:11:49.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:49+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: \n" #: lib/fascist.c:516 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cryptsetup.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cryptsetup.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cryptsetup.po 2014-07-09 09:08:40.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cryptsetup.po 2015-02-19 15:12:00.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 12:40+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:47+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: lib/libdevmapper.c:232 msgid "Cannot initialize device-mapper, running as non-root user.\n" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cups.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cups.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/cups.po 2014-07-09 09:08:49.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/cups.po 2015-02-19 15:12:08.000000000 +0000 @@ -29,166 +29,166 @@ "Project-Id-Version: CUPS 1.7\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" "POT-Creation-Date: 2014-03-28 11:06-0400\n" -"PO-Revision-Date: 2014-04-11 19:53+0000\n" +"PO-Revision-Date: 2015-02-12 16:33+0000\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 14:14+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:49+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" -#: systemv/lpstat.c:1936 systemv/lpstat.c:2061 +#: systemv/lpstat.c:1867 systemv/lpstat.c:1990 msgid "\t\t(all)" msgstr "\t\t(すべて)" -#: systemv/lpstat.c:1939 systemv/lpstat.c:1942 systemv/lpstat.c:2064 -#: systemv/lpstat.c:2067 +#: systemv/lpstat.c:1870 systemv/lpstat.c:1873 systemv/lpstat.c:1993 +#: systemv/lpstat.c:1996 msgid "\t\t(none)" msgstr "\t\t(なし)" -#: berkeley/lpc.c:434 +#: berkeley/lpc.c:426 #, c-format msgid "\t%d entries" msgstr "\t%d エントリー" -#: systemv/lpstat.c:785 systemv/lpstat.c:801 +#: systemv/lpstat.c:783 systemv/lpstat.c:799 #, c-format msgid "\t%s" msgstr "\t%s" -#: systemv/lpstat.c:1917 systemv/lpstat.c:2042 +#: systemv/lpstat.c:1848 systemv/lpstat.c:1971 msgid "\tAfter fault: continue" msgstr "\t失敗後: 継続" -#: systemv/lpstat.c:1535 systemv/lpstat.c:1886 systemv/lpstat.c:2012 +#: systemv/lpstat.c:1471 systemv/lpstat.c:1817 systemv/lpstat.c:1941 #, c-format msgid "\tAlerts: %s" msgstr "\t警告: %s" -#: systemv/lpstat.c:1940 systemv/lpstat.c:2065 +#: systemv/lpstat.c:1871 systemv/lpstat.c:1994 msgid "\tBanner required" msgstr "\tバナーが必要" -#: systemv/lpstat.c:1941 systemv/lpstat.c:2066 +#: systemv/lpstat.c:1872 systemv/lpstat.c:1995 msgid "\tCharset sets:" msgstr "\t文字セット:" -#: systemv/lpstat.c:1905 systemv/lpstat.c:2030 +#: systemv/lpstat.c:1836 systemv/lpstat.c:1959 msgid "\tConnection: direct" msgstr "\t接続: 直結" -#: systemv/lpstat.c:1896 systemv/lpstat.c:2022 +#: systemv/lpstat.c:1827 systemv/lpstat.c:1951 msgid "\tConnection: remote" msgstr "\t接続: リモート" -#: systemv/lpstat.c:1860 systemv/lpstat.c:1986 +#: systemv/lpstat.c:1793 systemv/lpstat.c:1917 msgid "\tContent types: any" msgstr "\tコンテンツの種類: すべて" -#: systemv/lpstat.c:1944 systemv/lpstat.c:2069 +#: systemv/lpstat.c:1875 systemv/lpstat.c:1998 msgid "\tDefault page size:" msgstr "\tデフォルト用紙サイズ:" -#: systemv/lpstat.c:1943 systemv/lpstat.c:2068 +#: systemv/lpstat.c:1874 systemv/lpstat.c:1997 msgid "\tDefault pitch:" msgstr "\tデフォルトピッチ:" -#: systemv/lpstat.c:1945 systemv/lpstat.c:2070 +#: systemv/lpstat.c:1876 systemv/lpstat.c:1999 msgid "\tDefault port settings:" msgstr "\tデフォルトポート設定:" -#: systemv/lpstat.c:1866 systemv/lpstat.c:1992 +#: systemv/lpstat.c:1799 systemv/lpstat.c:1923 #, c-format msgid "\tDescription: %s" msgstr "\t説明: %s" -#: systemv/lpstat.c:1859 systemv/lpstat.c:1985 +#: systemv/lpstat.c:1792 systemv/lpstat.c:1916 msgid "\tForm mounted:" msgstr "\t設定されたフォーム:" -#: systemv/lpstat.c:1938 systemv/lpstat.c:2063 +#: systemv/lpstat.c:1869 systemv/lpstat.c:1992 msgid "\tForms allowed:" msgstr "\t許可されているフォーム:" -#: systemv/lpstat.c:1900 systemv/lpstat.c:2026 +#: systemv/lpstat.c:1831 systemv/lpstat.c:1955 #, c-format msgid "\tInterface: %s.ppd" msgstr "\tインターフェイス: %s.ppd" -#: systemv/lpstat.c:1909 systemv/lpstat.c:2034 +#: systemv/lpstat.c:1840 systemv/lpstat.c:1963 #, c-format msgid "\tInterface: %s/interfaces/%s" msgstr "\tインターフェイス: %s/interfaces/%s" -#: systemv/lpstat.c:1913 systemv/lpstat.c:2038 +#: systemv/lpstat.c:1844 systemv/lpstat.c:1967 #, c-format msgid "\tInterface: %s/ppd/%s.ppd" msgstr "\tインターフェイス: %s/ppd/%s.ppd" -#: systemv/lpstat.c:1891 systemv/lpstat.c:2017 +#: systemv/lpstat.c:1822 systemv/lpstat.c:1946 #, c-format msgid "\tLocation: %s" msgstr "\t場所: %s" -#: systemv/lpstat.c:1916 systemv/lpstat.c:2041 +#: systemv/lpstat.c:1847 systemv/lpstat.c:1970 msgid "\tOn fault: no alert" msgstr "\t失敗時: 警告なし" -#: systemv/lpstat.c:1861 systemv/lpstat.c:1987 +#: systemv/lpstat.c:1794 systemv/lpstat.c:1918 msgid "\tPrinter types: unknown" msgstr "\tプリンターの種類: 不明" -#: systemv/lpstat.c:1516 +#: systemv/lpstat.c:1454 #, c-format msgid "\tStatus: %s" msgstr "\tステータス: %s" -#: systemv/lpstat.c:1921 systemv/lpstat.c:1935 systemv/lpstat.c:2046 -#: systemv/lpstat.c:2060 +#: systemv/lpstat.c:1852 systemv/lpstat.c:1866 systemv/lpstat.c:1975 +#: systemv/lpstat.c:1989 msgid "\tUsers allowed:" msgstr "\t許可されているユーザー:" -#: systemv/lpstat.c:1928 systemv/lpstat.c:2053 +#: systemv/lpstat.c:1859 systemv/lpstat.c:1982 msgid "\tUsers denied:" msgstr "\t禁止されているユーザー:" -#: berkeley/lpc.c:436 +#: berkeley/lpc.c:428 msgid "\tdaemon present" msgstr "\tデーモンは提供されています" -#: berkeley/lpc.c:432 +#: berkeley/lpc.c:424 msgid "\tno entries" msgstr "\tエントリーがありません" -#: berkeley/lpc.c:404 berkeley/lpc.c:416 +#: berkeley/lpc.c:396 berkeley/lpc.c:408 #, c-format msgid "\tprinter is on device '%s' speed -1" msgstr "\tデバイス '%s' 上のプリンター 速度 -1" -#: berkeley/lpc.c:429 +#: berkeley/lpc.c:421 msgid "\tprinting is disabled" msgstr "\t印刷は無効です" -#: berkeley/lpc.c:427 +#: berkeley/lpc.c:419 msgid "\tprinting is enabled" msgstr "\t印刷は有効です" -#: systemv/lpstat.c:1538 +#: systemv/lpstat.c:1474 #, c-format msgid "\tqueued for %s" msgstr "\t%s にキューしました" -#: berkeley/lpc.c:424 +#: berkeley/lpc.c:416 msgid "\tqueuing is disabled" msgstr "\tキューは無効です" -#: berkeley/lpc.c:422 +#: berkeley/lpc.c:414 msgid "\tqueuing is enabled" msgstr "\tキューは有効です" -#: systemv/lpstat.c:1852 systemv/lpstat.c:1978 +#: systemv/lpstat.c:1785 systemv/lpstat.c:1909 msgid "\treason unknown" msgstr "\t未知の理由" @@ -252,7 +252,7 @@ msgid " REF: Pages 52-54, section 5.2." msgstr " 参照: 52-54 ページ、セクション 5.2。" -#: berkeley/lpq.c:559 +#: berkeley/lpq.c:528 #, c-format msgid " %-39.39s %.0f bytes" msgstr " %-39.39s %.0f バイト" @@ -492,7 +492,7 @@ #: systemv/cupstestppd.c:2964 #, c-format msgid " %s Bad cupsICCProfile %s." -msgstr " %s 不正な cupsICCProfile %sです。" +msgstr " %s 不正な cupsICCProfile %s です。" #: systemv/cupstestppd.c:2571 #, c-format @@ -502,12 +502,12 @@ #: systemv/cupstestppd.c:1822 #, c-format msgid " %s Bad cupsUIConstraints %s: \"%s\"" -msgstr " %s 不正な cupsUIConstraints %s: \"%s\"です。" +msgstr " %s 不正な cupsUIConstraints %s: \"%s\" です。" #: systemv/cupstestppd.c:3411 #, c-format msgid " %s Bad language \"%s\"." -msgstr " %s 無効な言語 \"%s\"です。" +msgstr " %s 無効な言語 \"%s\" です。" #: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529 #: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673 @@ -539,7 +539,7 @@ #: systemv/cupstestppd.c:1803 #, c-format msgid " %s Empty cupsUIConstraints %s" -msgstr " %s 空の cupsUIConstraints %sです。" +msgstr " %s 空の cupsUIConstraints %s です。" #: systemv/cupstestppd.c:3539 systemv/cupstestppd.c:3579 #, c-format @@ -1104,11 +1104,11 @@ msgid " Warning: obsolete DSC version %.1f in file." msgstr " 警告: ファイルは時代遅れの DSC バージョン %.1f です。" -#: test/ippfind.c:2776 +#: test/ippfind.c:2788 msgid " ! expression Unary NOT of expression." msgstr " ! <式> 式を否定する単項演算子。" -#: test/ippfind.c:2775 +#: test/ippfind.c:2787 msgid " ( expressions ) Group expressions." msgstr " ( <複数の式> ) グループ化された複数の式。" @@ -1132,19 +1132,19 @@ msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." msgstr " --[no-]user-cancel-any あらゆるジョブのキャンセルをユーザーに許可/禁止する" -#: ppdc/ppdc.cxx:455 +#: ppdc/ppdc.cxx:450 msgid " --cr End lines with CR (Mac OS 9)." msgstr " --cr 行末を CR とする (Mac OS 9)。" -#: ppdc/ppdc.cxx:457 +#: ppdc/ppdc.cxx:452 msgid " --crlf End lines with CR + LF (Windows)." msgstr " --crlf 行末を CR + LF とする (Windows)。" -#: test/ippfind.c:2757 +#: test/ippfind.c:2769 msgid " --domain regex Match domain to regular expression." msgstr " --domain <正規表現> ドメインが正規表現にマッチするか。" -#: test/ippfind.c:2758 +#: test/ippfind.c:2770 msgid "" " --exec utility [argument ...] ;\n" " Execute program if true." @@ -1152,99 +1152,99 @@ " --exec <実行ファイル名> [引数 ...] ;\n" " 成功した場合、<実行ファイル名>を実行する。" -#: test/ippfind.c:2778 +#: test/ippfind.c:2790 msgid " --false Always false." msgstr " --false 常に失敗。" -#: test/ippfind.c:2740 +#: test/ippfind.c:2752 msgid " --help Show this help." msgstr " --help このヘルプを表示する。" -#: test/ippfind.c:2760 +#: test/ippfind.c:2772 msgid " --host regex Match hostname to regular expression." msgstr " --host <正規表現> ホスト名が正規表現にマッチするか。" -#: ppdc/ppdc.cxx:459 +#: ppdc/ppdc.cxx:454 msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr " --lf 行末を LF とする (UNIX/Linux/OS X)。" -#: test/ippfind.c:2762 +#: test/ippfind.c:2774 msgid " --local True if service is local." msgstr " --local サービスがローカルなら真。" -#: test/ippfind.c:2761 +#: test/ippfind.c:2773 msgid " --ls List attributes." msgstr " --ls 属性の一覧を表示する。" -#: test/ippfind.c:2763 +#: test/ippfind.c:2775 msgid " --name regex Match service name to regular expression." msgstr " --name <正規表現> サービス名が正規表現とマッチするか。" -#: test/ippfind.c:2777 +#: test/ippfind.c:2789 msgid " --not expression Unary NOT of expression." msgstr " --not <式> 式を否定する単項演算子。" -#: test/ippfind.c:2764 +#: test/ippfind.c:2776 msgid " --path regex Match resource path to regular expression." msgstr " --path <正規表現> リソースのパスが正規表現とマッチするか。" -#: test/ippfind.c:2765 +#: test/ippfind.c:2777 msgid " --port number[-number] Match port to number or range." msgstr " --port 番号[-番号] ポートが指定された番号または範囲とマッチするか。" -#: test/ippfind.c:2766 +#: test/ippfind.c:2778 msgid " --print Print URI if true." msgstr " --print 結果が真なら URI を表示する。" -#: test/ippfind.c:2767 +#: test/ippfind.c:2779 msgid " --print-name Print service name if true." msgstr " --print-name 結果が真ならサービス名を表示する。" -#: test/ippfind.c:2768 +#: test/ippfind.c:2780 msgid " --quiet Quietly report match via exit code." msgstr " --quiet マッチ結果を終了コードで報告し、出力をしない。" -#: test/ippfind.c:2769 +#: test/ippfind.c:2781 msgid " --remote True if service is remote." msgstr " --remote サービスがリモートなら真。" -#: test/ippfind.c:2779 +#: test/ippfind.c:2791 msgid " --true Always true." msgstr " --true 常に真。" -#: test/ippfind.c:2770 +#: test/ippfind.c:2782 msgid " --txt key True if the TXT record contains the key." msgstr " --txt <キー名> TXT レコードがキー名を含んでいたら真。" -#: test/ippfind.c:2771 +#: test/ippfind.c:2783 msgid " --txt-* regex Match TXT record key to regular expression." msgstr " --txt-* <正規表現> TXT レコードのキーが正規表現とマッチしたら真。" -#: test/ippfind.c:2772 +#: test/ippfind.c:2784 msgid " --uri regex Match URI to regular expression." msgstr " --uri <正規表現> URI が正規表現とマッチするか。" -#: test/ippfind.c:2741 +#: test/ippfind.c:2753 msgid " --version Show program version." msgstr " --version プログラムのバージョンを表示。" -#: test/ippfind.c:2734 test/ipptool.c:4709 +#: test/ippfind.c:2746 test/ipptool.c:4810 msgid " -4 Connect using IPv4." msgstr " -4 IPv4 で接続する。" -#: test/ippfind.c:2735 test/ipptool.c:4710 +#: test/ippfind.c:2747 test/ipptool.c:4811 msgid " -6 Connect using IPv6." msgstr " -6 IPv6 で接続する。" -#: test/ipptool.c:4711 +#: test/ipptool.c:4812 msgid " -C Send requests using chunking (default)." msgstr " -C chunking を用いてリクエストを送る (デフォルト)。" -#: scheduler/cupsfilter.c:1458 +#: scheduler/cupsfilter.c:1484 msgid " -D Remove the input file when finished." msgstr " -D 終了したときに入力ファイルを削除する。" -#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 +#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 msgid " -D name=value Set named variable to value." msgstr " -D name=value name で指定された変数に値 value をセットする。" @@ -1252,11 +1252,11 @@ msgid " -E Encrypt the connection." msgstr " -E 接続を暗号化する。" -#: test/ipptool.c:4713 +#: test/ipptool.c:4814 msgid " -E Test with HTTP Upgrade to TLS." msgstr " -E HTTP から TLS へのアップグレードでテストする。" -#: scheduler/main.c:2005 +#: scheduler/main.c:2149 msgid "" " -F Run in the foreground but detach from console." msgstr " -F フォアグラウンドで実行するがコンソールからはデタッチする。" @@ -1265,11 +1265,11 @@ msgid " -H samba-server Use the named SAMBA server." msgstr " -H sambaサーバー 指定の SAMBA サーバーを使う。" -#: test/ipptool.c:4715 +#: test/ipptool.c:4816 msgid " -I Ignore errors." msgstr " -I エラーを無視する。" -#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 +#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 msgid " -I include-dir Add include directory to search path." msgstr " -I include-dir インクルードディレクトリーを検索パスに含める。" @@ -1277,15 +1277,15 @@ msgid " -I {filename,filters,none,profiles}" msgstr " -I {filename,filters,none,profiles}" -#: test/ipptool.c:4716 +#: test/ipptool.c:4817 msgid " -L Send requests using content-length." msgstr " -L content-length を用いてリクエストを送る。" -#: scheduler/cupsfilter.c:1460 +#: scheduler/cupsfilter.c:1485 msgid " -P filename.ppd Set PPD file." msgstr " -P filename.ppd PPD ファイルを指定する。" -#: test/ippfind.c:2744 +#: test/ippfind.c:2756 msgid " -P number[-number] Match port to number or range." msgstr " -P 番号[-番号] ポートが指定された番号または範囲とマッチするか。" @@ -1293,23 +1293,23 @@ msgid " -R root-directory Set alternate root." msgstr " -R root-directory 別のルートディレクトリーを指定する。" -#: test/ipptool.c:4718 +#: test/ipptool.c:4820 msgid " -S Test with SSL encryption." msgstr " -S SSL 暗号化でテストする。" -#: test/ippfind.c:2736 +#: test/ippfind.c:2748 msgid " -T seconds Set the browse timeout in seconds." msgstr " -T <秒> ブラウズのタイムアウトを秒で指定する。" -#: test/ipptool.c:4720 +#: test/ipptool.c:4822 msgid " -T seconds Set the receive/send timeout in seconds." msgstr " -T seconds 受信／送信タイムアウトを秒で指定する。" -#: scheduler/cupsfilter.c:1461 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206 +#: scheduler/cupsfilter.c:1486 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206 msgid " -U username Specify username." msgstr " -U username ユーザー名を指定する。" -#: test/ippfind.c:2738 test/ipptool.c:4722 +#: test/ippfind.c:2750 test/ipptool.c:4824 msgid " -V version Set default IPP version." msgstr " -V version デフォルトの IPP バージョンを指定する。" @@ -1321,7 +1321,7 @@ " -W " "{all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" -#: test/ipptool.c:4724 +#: test/ipptool.c:4826 msgid " -X Produce XML plist instead of plain text." msgstr " -X プレーンテキストの代わりに XML を用いる。" @@ -1333,15 +1333,15 @@ msgid " -a Export all printers." msgstr " -a すべてのプリンターをエクスポートする。" -#: ppdc/ppdc.cxx:442 +#: ppdc/ppdc.cxx:437 msgid " -c catalog.po Load the specified message catalog." msgstr " -c catalog.po 指定したメッセージカタログをロードする。" -#: scheduler/cupsfilter.c:1462 +#: scheduler/cupsfilter.c:1487 msgid " -c cups-files.conf Set cups-files.conf file to use." -msgstr "" +msgstr " -c cups-files.conf cups-files.conf を利用するよう設定する。" -#: scheduler/main.c:2003 +#: scheduler/main.c:2147 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf 使用する cupsd.conf ファイルを指定する。" @@ -1349,39 +1349,39 @@ msgid " -d domain Browse/resolve in specified domain." msgstr " -d <ドメイン名> 指定されたドメインでブラウズ/名前解決する。" -#: test/ipptool.c:4726 +#: test/ipptool.c:4829 msgid " -d name=value Set named variable to value." msgstr " -d name=value name で指定された変数に値 value をセットする。" -#: ppdc/ppdc.cxx:444 +#: ppdc/ppdc.cxx:439 msgid " -d output-dir Specify the output directory." msgstr " -d output-dir 出力先ディレクトリーを指定する。" -#: scheduler/cupsfilter.c:1464 +#: scheduler/cupsfilter.c:1488 msgid " -d printer Use the named printer." msgstr " -d printer 指定されたプリンターを利用する。" -#: test/ippfind.c:2745 +#: test/ippfind.c:2757 msgid " -d regex Match domain to regular expression." msgstr " -d <正規表現> ドメインが正規表現にマッチするか。" -#: scheduler/cupsfilter.c:1466 +#: scheduler/cupsfilter.c:1489 msgid " -e Use every filter from the PPD file." msgstr " -e PPD ファイルからすべてのフィルターを使用する。" -#: scheduler/main.c:2004 +#: scheduler/main.c:2148 msgid " -f Run in the foreground." msgstr " -f フォアグラウンドで実行する。" -#: test/ipptool.c:4728 +#: test/ipptool.c:4831 msgid " -f filename Set default request filename." msgstr " -f filename デフォルトのリクエストファイル名を指定する。" -#: scheduler/main.c:2007 +#: scheduler/main.c:2151 msgid " -h Show this usage message." msgstr " -h このヘルプメッセージを表示する。" -#: test/ippfind.c:2746 +#: test/ippfind.c:2758 msgid " -h regex Match hostname to regular expression." msgstr " -h <正規表現> ホスト名が正規表現にマッチするか。" @@ -1389,23 +1389,23 @@ msgid " -h server[:port] Specify server address." msgstr " -h server[:port] サーバーアドレスを指定する。" -#: scheduler/cupsfilter.c:1468 +#: scheduler/cupsfilter.c:1490 msgid " -i mime/type Set input MIME type (otherwise auto-typed)." msgstr " -i mime/type 入力の MIME タイプを指定する (指定がなければ自動タイプ)。" -#: test/ipptool.c:4730 +#: test/ipptool.c:4833 msgid "" " -i seconds Repeat the last file with the given time interval." msgstr " -i seconds 最後のファイルを与えられた時間間隔で繰り返す。" -#: scheduler/cupsfilter.c:1470 +#: scheduler/cupsfilter.c:1491 msgid "" " -j job-id[,N] Filter file N from the specified job (default is " "file 1)." msgstr "" " -j job-id[,N] フィルターファイル N を指定されたジョブから使用する (デフォルトは ファイル 1)。" -#: test/ippfind.c:2747 +#: test/ippfind.c:2759 msgid " -l List attributes." msgstr " -l 属性の一覧を表示する。" @@ -1413,30 +1413,30 @@ msgid " -l Run cupsd from launchd(8)." msgstr " -l launchd(8) から cupsd を実行する。" -#: ppdc/ppdc.cxx:446 +#: ppdc/ppdc.cxx:441 msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr " -l lang[,lang,...] 出力言語を指定する。(複数可能)" -#: ppdc/ppdc.cxx:448 +#: ppdc/ppdc.cxx:443 msgid " -m Use the ModelName value as the filename." msgstr " -m ModelName の値をファイル名として使用する。" -#: scheduler/cupsfilter.c:1472 +#: scheduler/cupsfilter.c:1492 msgid "" " -m mime/type Set output MIME type (otherwise application/pdf)." msgstr "" " -m mime/type 出力の MIME タイプを指定する (指定がなければ application/pdf)。" -#: scheduler/cupsfilter.c:1474 +#: scheduler/cupsfilter.c:1493 msgid " -n copies Set number of copies." msgstr " -n copies 部数を指定する。" -#: test/ipptool.c:4732 +#: test/ipptool.c:4836 msgid "" " -n count Repeat the last file the given number of times." msgstr " -n count 最後のファイルを与えられた回数だけ繰り返す。" -#: test/ippfind.c:2748 +#: test/ippfind.c:2760 msgid " -n regex Match service name to regular expression." msgstr " -n <正規表現> サービス名が正規表現とマッチするか。" @@ -1445,19 +1445,19 @@ " -o filename.drv Set driver information file (otherwise ppdi.drv)." msgstr " -o filename.drv ドライバー情報ファイルを指定する (指定がなければ ppdi.drv)。" -#: ppdc/ppdmerge.cxx:370 +#: ppdc/ppdmerge.cxx:364 msgid " -o filename.ppd[.gz] Set output file (otherwise stdout)." msgstr " -o filename.ppd[.gz] 出力ファイルを指定する (指定がなければ標準出力)。" -#: scheduler/cupsfilter.c:1475 +#: scheduler/cupsfilter.c:1494 msgid " -o name=value Set option(s)." msgstr " -o name=value オプションを指定する。" -#: test/ippfind.c:2749 +#: test/ippfind.c:2761 msgid " -p Print URI if true." msgstr " -p 結果が真なら URI を表示する。" -#: scheduler/cupsfilter.c:1476 +#: scheduler/cupsfilter.c:1495 msgid " -p filename.ppd Set PPD file." msgstr " -p filename.ppd PPD ファイルを指定する。" @@ -1465,15 +1465,15 @@ msgid " -p program Run specified program for each service." msgstr " -p <プログラム名> 指定されたプログラムをそれぞれのサービスに対し実行する。" -#: test/ippfind.c:2750 +#: test/ippfind.c:2762 msgid " -q Quietly report match via exit code." msgstr " -q マッチ結果を終了コードで報告し、出力をしない。" -#: systemv/cupstestppd.c:3826 test/ipptool.c:4734 +#: systemv/cupstestppd.c:3826 test/ipptool.c:4838 msgid " -q Run silently." msgstr " -q 詳細は表示しない。" -#: test/ippfind.c:2751 +#: test/ippfind.c:2763 msgid " -r True if service is remote." msgstr " -r サービスがリモートなら真。" @@ -1481,27 +1481,27 @@ msgid " -r Use 'relaxed' open mode." msgstr " -r 寛容モードを用いる。" -#: test/ippfind.c:2752 +#: test/ippfind.c:2764 msgid " -s Print service name if true." msgstr " -s 結果が真ならサービス名を表示する。" -#: test/ipptool.c:4735 +#: test/ipptool.c:4839 msgid " -t Produce a test report." msgstr " -t テストリポートを出力する。" -#: ppdc/ppdc.cxx:450 +#: ppdc/ppdc.cxx:445 msgid " -t Test PPDs instead of generating them." msgstr " -t PPD を出力しないでテストする。" -#: scheduler/main.c:2009 +#: scheduler/main.c:2153 msgid " -t Test the configuration file." msgstr " -t 設定ファイルをテストする。" -#: test/ippfind.c:2753 +#: test/ippfind.c:2765 msgid " -t key True if the TXT record contains the key." msgstr " -t <キー名> TXT レコードがキー名を含んでいたら真。" -#: scheduler/cupsfilter.c:1477 +#: scheduler/cupsfilter.c:1496 msgid " -t title Set title." msgstr " -t title タイトルを指定する。" @@ -1509,16 +1509,16 @@ msgid " -t type Browse/resolve with specified type." msgstr " -t タイプ 指定されたタイプでブラウズ/名前解決する。" -#: scheduler/cupsfilter.c:1478 +#: scheduler/cupsfilter.c:1497 msgid " -u Remove the PPD file when finished." msgstr " -u 終了したときに PPD ファイルを削除する。" -#: test/ippfind.c:2754 +#: test/ippfind.c:2766 msgid " -u regex Match URI to regular expression." msgstr " -u <正規表現> URI が正規表現とマッチするか。" -#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4736 -#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259 +#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4840 +#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259 msgid " -v Be verbose." msgstr " -v 冗長出力を行う。" @@ -1526,103 +1526,103 @@ msgid " -vv Be very verbose." msgstr " -vv より冗長な出力を行う。" -#: test/ippfind.c:2755 +#: test/ippfind.c:2767 msgid "" " -x utility [argument ...] ;\n" " Execute program if true." msgstr "" " -x <実行ファイル名> [引数 ...] ;\n" -" 成功した場合、<実行ファイル名>を実行する。" +" 成功した場合、<実行ファイル名> を実行する。" -#: ppdc/ppdc.cxx:453 +#: ppdc/ppdc.cxx:448 msgid " -z Compress PPD files using GNU zip." msgstr " -z PPD ファイルを GNU zip を使って圧縮する。" -#: test/ippfind.c:2798 +#: test/ippfind.c:2810 msgid " IPPFIND_SERVICE_DOMAIN Domain name" msgstr " IPPFIND_SERVICE_DOMAIN ドメイン名" -#: test/ippfind.c:2799 +#: test/ippfind.c:2811 msgid "" " IPPFIND_SERVICE_HOSTNAME\n" " Fully-qualified domain name" msgstr "" " IPPFIND_SERVICE_HOSTNAME\n" -" 完全修飾ドメイン名(FQDN)" +" 完全修飾ドメイン名 (FQDN)" -#: test/ippfind.c:2801 +#: test/ippfind.c:2813 msgid " IPPFIND_SERVICE_NAME Service instance name" msgstr " IPPFIND_SERVICE_NAME サービスインスタンス名" -#: test/ippfind.c:2802 +#: test/ippfind.c:2814 msgid " IPPFIND_SERVICE_PORT Port number" msgstr " IPPFIND_SERVICE_PORT ポート番号" -#: test/ippfind.c:2803 +#: test/ippfind.c:2815 msgid " IPPFIND_SERVICE_REGTYPE DNS-SD registration type" msgstr " IPPFIND_SERVICE_REGTYPE DNS-SD 登録タイプ" -#: test/ippfind.c:2804 +#: test/ippfind.c:2816 msgid " IPPFIND_SERVICE_SCHEME URI scheme" msgstr " IPPFIND_SERVICE_SCHEME URI スキーム" -#: test/ippfind.c:2805 +#: test/ippfind.c:2817 msgid " IPPFIND_SERVICE_URI URI" msgstr " IPPFIND_SERVICE_URI URI" -#: test/ippfind.c:2806 +#: test/ippfind.c:2818 msgid " IPPFIND_TXT_* Value of TXT record key" msgstr " IPPFIND_TXT_* TXT レコードキーの値" -#: test/ippfind.c:2781 +#: test/ippfind.c:2793 msgid "" " expression --and expression\n" " Logical AND." msgstr " <式> --and <式> 論理 AND。" -#: test/ippfind.c:2783 +#: test/ippfind.c:2795 msgid "" " expression --or expression\n" " Logical OR." msgstr " <式> --or <式> 論理 OR。" -#: test/ippfind.c:2780 +#: test/ippfind.c:2792 msgid " expression expression Logical AND." msgstr " <式> <式> 論理 AND。" -#: test/ippfind.c:2788 +#: test/ippfind.c:2800 msgid " {service_domain} Domain name" msgstr " {service_domain} ドメイン名" -#: test/ippfind.c:2789 +#: test/ippfind.c:2801 msgid " {service_hostname} Fully-qualified domain name" msgstr " {service_hostname} 完全修飾ドメイン名 (FQDN)" -#: test/ippfind.c:2790 +#: test/ippfind.c:2802 msgid " {service_name} Service instance name" msgstr " {service_name} サービスインスタンス名" -#: test/ippfind.c:2791 +#: test/ippfind.c:2803 msgid " {service_port} Port number" msgstr " {service_port} ポート番号" -#: test/ippfind.c:2792 +#: test/ippfind.c:2804 msgid " {service_regtype} DNS-SD registration type" msgstr " {service_regtype} DNS-SD 登録タイプ" -#: test/ippfind.c:2793 +#: test/ippfind.c:2805 msgid " {service_scheme} URI scheme" msgstr " {service_scheme} URI スキーム" -#: test/ippfind.c:2794 +#: test/ippfind.c:2806 msgid " {service_uri} URI" msgstr " {service_uri} URI" -#: test/ippfind.c:2795 +#: test/ippfind.c:2807 msgid " {txt_*} Value of TXT record key" msgstr " {txt_*} TXT レコードキーの値" -#: test/ippfind.c:2787 +#: test/ippfind.c:2799 msgid " {} URI" msgstr " {} URI" @@ -1687,117 +1687,117 @@ msgid " PASS" msgstr " 合格" -#: cups/ipp.c:5254 +#: cups/ipp.c:5227 #, c-format msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)." msgstr "\"%s\": URI の値 \"%s\" が誤っています - %s (RFC 2911 4.1.5 節)。" -#: cups/ipp.c:5265 +#: cups/ipp.c:5238 #, c-format msgid "" "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)." msgstr "\"%s\": URI の値 \"%s\" が誤っています - 長さの誤り %d (RFC 2911 4.1.5 節)。" -#: cups/ipp.c:4885 +#: cups/ipp.c:4858 #, c-format msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)." msgstr "\"%s\": 属性名が誤っています - 長さの誤り %d (RFC 2911 4.1.3 節)。" -#: cups/ipp.c:4877 +#: cups/ipp.c:4850 #, c-format msgid "" "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)." msgstr "\"%s\": 属性名が誤っています - 不正な文字 (RFC 2911 4.1.3 節)。" -#: cups/ipp.c:4903 +#: cups/ipp.c:4876 #, c-format msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)." msgstr "\"%s\": 真偽値 %d が誤っています (RFC 2911 4.1.11 節)。" -#: cups/ipp.c:5317 +#: cups/ipp.c:5290 #, c-format msgid "" "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)." msgstr "\"%s\": charset の値 \"%s\" が誤っています - 不正な文字 (RFC 2911 4.1.7 節)。" -#: cups/ipp.c:5326 +#: cups/ipp.c:5299 #, c-format msgid "" "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)." msgstr "" "\"%s\": charset の値 \"%s\" が誤っています - 不正な長さ %d (RFC 2911 section 4.1.7)." -#: cups/ipp.c:5003 +#: cups/ipp.c:4976 #, c-format msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime UTC の時間指定 %u が誤っています (RFC 2911 4.1.14 節)." -#: cups/ipp.c:5011 +#: cups/ipp.c:4984 #, c-format msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime UTC の分指定 %u が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4995 +#: cups/ipp.c:4968 #, c-format msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime UTC の符号指定 '%c' が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4955 +#: cups/ipp.c:4928 #, c-format msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime の日付指定 %u が誤っています (RFC 2911 4.1.14 節)." -#: cups/ipp.c:4987 +#: cups/ipp.c:4960 #, c-format msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime の 0.1 秒の指定 %u が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4963 +#: cups/ipp.c:4936 #, c-format msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime の時間指定 %u が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4971 +#: cups/ipp.c:4944 #, c-format msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime の分指定が誤っています %u (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4947 +#: cups/ipp.c:4920 #, c-format msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": dateTime の月指定 %u が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4979 +#: cups/ipp.c:4952 #, c-format msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)." msgstr "\"%s\": 日時の秒指定 %u が誤っています (RFC 2911 4.1.14 節)。" -#: cups/ipp.c:4917 +#: cups/ipp.c:4890 #, c-format msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)." msgstr "\"%s\": enum の値 %d が誤っています - 範囲外の値 (RFC 2911 4.1.4 節)。" -#: cups/ipp.c:5232 +#: cups/ipp.c:5205 #, c-format msgid "" "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)." msgstr "\"%s\": keyword の値 \"%s\" が誤っています - %d (RFC 2911 section 4.1.3)." -#: cups/ipp.c:5223 +#: cups/ipp.c:5196 #, c-format msgid "" "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section " "4.1.3)." msgstr "\"%s\": keyword の値 \"%s\" が誤っています - 不正な文字 (RFC 2911 4.1.3 節)。" -#: cups/ipp.c:5426 +#: cups/ipp.c:5399 #, c-format msgid "" "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section " "4.1.9)." msgstr "\"%s\": mimeMediaType の値 \"%s\" が誤っています - 誤った文字 (RFC 2911 4.1.9 節)。" -#: cups/ipp.c:5436 +#: cups/ipp.c:5409 #, c-format msgid "" "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section " @@ -1805,19 +1805,19 @@ msgstr "" "\"%s\": mimeMediaType の値 \"%s\" が誤っています - 長さの誤り %d (RFC 2911 4.1.9 節)。" -#: cups/ipp.c:5194 +#: cups/ipp.c:5167 #, c-format msgid "" "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)." msgstr "\"%s\": name の値 \"%s\" が誤っています - UTF-8 として誤った並び (RFC 2911 4.1.2 節)。" -#: cups/ipp.c:5203 +#: cups/ipp.c:5176 #, c-format msgid "" "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)." msgstr "\"%s\": name の値 \"%s\" が誤っています - 誤った長さ %d (RFC 2911 section 4.1.2)。" -#: cups/ipp.c:5372 +#: cups/ipp.c:5345 #, c-format msgid "" "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section " @@ -1825,7 +1825,7 @@ msgstr "" "\"%s\": naturalLanguage の値 \"%s\" が誤っています - 誤った文字 (RFC 2911 4.1.8 節)。" -#: cups/ipp.c:5382 +#: cups/ipp.c:5355 #, c-format msgid "" "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section " @@ -1833,13 +1833,13 @@ msgstr "" "\"%s\": naturalLanguage の値 \"%s\" が誤っています - 誤った長さ %d (RFC 2911 4.1.8 節)。" -#: cups/ipp.c:4931 +#: cups/ipp.c:4904 #, c-format msgid "" "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)." msgstr "\"%s\": octetString 値が誤っています - 誤った長さ %d (RFC 2911 4.1.10 節)。" -#: cups/ipp.c:5074 +#: cups/ipp.c:5047 #, c-format msgid "" "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 " @@ -1847,22 +1847,22 @@ msgstr "" "\"%s\": rangeOfInteger の値 %d-%d が誤っています - 下限が上限よりも大きい (RFC 2911 4.1.13 節)。" -#: cups/ipp.c:5055 +#: cups/ipp.c:5028 #, c-format msgid "" "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section " "4.1.15)." msgstr "\"%s\": resolution の値 %dx%d%s が誤っています - 単位値の誤り (RFC 2911 4.1.15 節)。" -#: cups/ipp.c:5024 +#: cups/ipp.c:4997 #, c-format msgid "" "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be " "positive (RFC 2911 section 4.1.15)." msgstr "" -"\"%s\": resolution の値 %dx%d%s が誤っています - 主走査解像道が負 (RFC 2911 4.1.15 節)。" +"\"%s\": resolution の値 %dx%d%s が誤っています - 主走査解像度が負 (RFC 2911 4.1.15 節)。" -#: cups/ipp.c:5039 +#: cups/ipp.c:5012 #, c-format msgid "" "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC " @@ -1870,107 +1870,106 @@ msgstr "" "\"%s\": resolution の値 %dx%d%s が誤っています - 副走査解像度が負 (RFC 2911 4.1.15 節)。" -#: cups/ipp.c:5136 +#: cups/ipp.c:5109 #, c-format msgid "" "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)." msgstr "\"%s\": text の値 \"%s\" が誤っています - UTF-8 として誤った並び (RFC 2911 4.1.1 節)。" -#: cups/ipp.c:5145 +#: cups/ipp.c:5118 #, c-format msgid "" "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)." msgstr "\"%s\": text の値 \"%s\" が誤っています - 不正な長さ %d (RFC 2911 4.1.1 節)。" -#: cups/ipp.c:5288 +#: cups/ipp.c:5261 #, c-format msgid "" "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)." msgstr "\"%s\": uriScheme の値 \"%s\" が誤っています - 誤った文字 (RFC 2911 4.1.6 節)." -#: cups/ipp.c:5297 +#: cups/ipp.c:5270 #, c-format msgid "" "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)." -msgstr "" -"\"%s\": 間違ったuriSchemeの値です \"%s\" - %d は間違った長さです(RFC 2911 section 4.1.6)." +msgstr "\"%s\": uriScheme の値 \"%s\" が誤っています - 不正な長さ %d (RFC 2911 4.1.6 節)." #: berkeley/lpq.c:565 #, c-format msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f バイト" -#: berkeley/lpq.c:570 +#: berkeley/lpq.c:533 #, c-format msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes" msgstr "%-7s %-7.7s %-7d %-31.31s %.0f バイト" -#: systemv/lpstat.c:779 +#: systemv/lpstat.c:777 #, c-format msgid "%s accepting requests since %s" msgstr "%s は %s からリクエストを受け付けています" -#: scheduler/ipp.c:9867 +#: scheduler/ipp.c:9952 #, c-format msgid "%s cannot be changed." msgstr "%s は変更できません。" -#: berkeley/lpc.c:189 +#: berkeley/lpc.c:181 #, c-format msgid "%s is not implemented by the CUPS version of lpc." msgstr "%s は lpc の CUPS バージョンでは実装されていません。" -#: berkeley/lpq.c:656 +#: berkeley/lpq.c:618 #, c-format msgid "%s is not ready" msgstr "%s は準備ができていません" -#: berkeley/lpq.c:649 +#: berkeley/lpq.c:611 #, c-format msgid "%s is ready" msgstr "%s は準備ができています" -#: berkeley/lpq.c:652 +#: berkeley/lpq.c:614 #, c-format msgid "%s is ready and printing" msgstr "%s は準備ができており印刷しています" -#: filter/rastertoepson.c:985 filter/rastertohp.c:711 -#: filter/rastertolabel.c:1128 +#: filter/rastertoepson.c:970 filter/rastertohp.c:700 +#: filter/rastertolabel.c:1120 #, c-format msgid "%s job-id user title copies options [file]" msgstr "%s ジョブID ユーザー タイトル コピー数 オプション [ファイル]" -#: systemv/lpstat.c:783 +#: systemv/lpstat.c:781 #, c-format msgid "%s not accepting requests since %s -" msgstr "%s は %s からリクエストを受け付けていません -" -#: scheduler/ipp.c:621 +#: scheduler/ipp.c:618 #, c-format msgid "%s not supported." msgstr "%s はサポートされていません。" -#: systemv/lpstat.c:794 +#: systemv/lpstat.c:792 #, c-format msgid "%s/%s accepting requests since %s" msgstr "%s/%s は %s からリクエストを受け付けています" -#: systemv/lpstat.c:799 +#: systemv/lpstat.c:797 #, c-format msgid "%s/%s not accepting requests since %s -" msgstr "%s/%s は %s からリクエストを受け付けていません -" -#: berkeley/lpq.c:557 +#: berkeley/lpq.c:526 #, c-format msgid "%s: %-33.33s [job %d localhost]" msgstr "%s:%-33.33s [ジョブ %d localhost]" #. TRANSLATORS: Message is "subject: error" -#: cups/langprintf.c:86 scheduler/cupsfilter.c:698 systemv/lpadmin.c:805 -#: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962 -#: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168 -#: systemv/lpadmin.c:1479 +#: cups/langprintf.c:77 scheduler/cupsfilter.c:726 systemv/lpadmin.c:791 +#: systemv/lpadmin.c:842 systemv/lpadmin.c:892 systemv/lpadmin.c:948 +#: systemv/lpadmin.c:1046 systemv/lpadmin.c:1098 systemv/lpadmin.c:1154 +#: systemv/lpadmin.c:1463 #, c-format msgid "%s: %s" msgstr "%s: %s" @@ -1980,7 +1979,7 @@ msgid "%s: %s failed: %s" msgstr "%s: %s に失敗しました: %s" -#: test/ippfind.c:797 test/ipptool.c:361 +#: test/ippfind.c:777 test/ipptool.c:378 #, c-format msgid "%s: Bad version %s for \"-V\"." msgstr "%s: -V オプションにおいて %s は不正なバージョンです。" @@ -1990,111 +1989,111 @@ msgid "%s: Don't know what to do." msgstr "%s: 何が起きているか不明です。" -#: berkeley/lpq.c:237 berkeley/lpr.c:362 systemv/lp.c:608 +#: berkeley/lpq.c:225 berkeley/lpr.c:358 systemv/lp.c:602 #, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています。" -#: berkeley/lpq.c:144 berkeley/lpq.c:215 berkeley/lpr.c:234 berkeley/lpr.c:337 -#: systemv/lp.c:163 systemv/lp.c:583 systemv/lp.c:703 systemv/lp.c:752 +#: berkeley/lpq.c:133 berkeley/lpq.c:203 berkeley/lpr.c:230 berkeley/lpr.c:333 +#: systemv/lp.c:157 systemv/lp.c:577 systemv/lp.c:697 systemv/lp.c:746 #: systemv/lpstat.c:195 systemv/lpstat.c:241 systemv/lpstat.c:332 #: systemv/lpstat.c:361 systemv/lpstat.c:385 systemv/lpstat.c:444 -#: systemv/lpstat.c:510 systemv/lpstat.c:571 systemv/lpstat.c:697 -#: systemv/lpstat.c:882 systemv/lpstat.c:1143 systemv/lpstat.c:1386 -#: systemv/lpstat.c:1645 +#: systemv/lpstat.c:510 systemv/lpstat.c:571 systemv/lpstat.c:696 +#: systemv/lpstat.c:880 systemv/lpstat.c:1141 systemv/lpstat.c:1339 +#: systemv/lpstat.c:1579 #, c-format msgid "%s: Error - add '/version=1.1' to server name." msgstr "%s: エラー - '/version=1.1' をサーバー名に付与してください。" -#: systemv/lp.c:240 +#: systemv/lp.c:234 #, c-format msgid "%s: Error - bad job ID." msgstr "%s: エラー - 不正なジョブ ID です。" -#: systemv/lp.c:228 +#: systemv/lp.c:222 #, c-format msgid "%s: Error - cannot print files and alter jobs simultaneously." msgstr "%s: エラー - ファイルを印刷できず、ジョブを同時に変えることができません。" -#: systemv/lp.c:521 +#: systemv/lp.c:515 #, c-format msgid "" "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "%s: エラー - ファイルまたはジョブ ID が提供されている場合、標準入力から印刷できません。" -#: systemv/lp.c:470 +#: systemv/lp.c:464 #, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "%s: エラー - \"-S\" オプションのあとには文字セットが必要です。" -#: systemv/lp.c:489 +#: systemv/lp.c:483 #, c-format msgid "%s: Error - expected content type after \"-T\" option." msgstr "%s: エラー - \"-T\" オプションのあとにはコンテンツタイプが必要です。" -#: berkeley/lpr.c:249 +#: berkeley/lpr.c:245 #, c-format msgid "%s: Error - expected copies after \"-#\" option." msgstr "%s: エラー - \"-#\" オプションのあとにはコピー数が必要です。" -#: systemv/lp.c:273 +#: systemv/lp.c:267 #, c-format msgid "%s: Error - expected copies after \"-n\" option." msgstr "%s: エラー - \"-n\" オプションのあとにはコピー数が必要です。" -#: berkeley/lpr.c:210 +#: berkeley/lpr.c:206 #, c-format msgid "%s: Error - expected destination after \"-P\" option." msgstr "%s: エラー - \"-P\" オプションのあとには宛先が必要です。" -#: systemv/lp.c:138 +#: systemv/lp.c:132 #, c-format msgid "%s: Error - expected destination after \"-d\" option." msgstr "%s: エラー - \"-d\" オプションのあとにはプリンター名が必要です。" -#: systemv/lp.c:177 +#: systemv/lp.c:171 #, c-format msgid "%s: Error - expected form after \"-f\" option." msgstr "%s: エラー - \"-f\" オプションのあとには用紙名が必要です。" -#: systemv/lp.c:400 +#: systemv/lp.c:394 #, c-format msgid "%s: Error - expected hold name after \"-H\" option." msgstr "%s: エラー - \"-H\" オプションのあとにはホールド名が必要です。" -#: berkeley/lpr.c:104 +#: berkeley/lpr.c:100 #, c-format msgid "%s: Error - expected hostname after \"-H\" option." msgstr "%s: エラー - \"-H\" オプションのあとにはホスト名が必要です。" -#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124 -#: systemv/cupsaccept.c:123 systemv/lp.c:198 systemv/lpstat.c:266 +#: berkeley/lpq.c:169 berkeley/lprm.c:123 systemv/cancel.c:124 +#: systemv/cupsaccept.c:123 systemv/lp.c:192 systemv/lpstat.c:266 #, c-format msgid "%s: Error - expected hostname after \"-h\" option." msgstr "%s: エラー - \"-h\" オプションのあとにはホスト名が必要です。" -#: systemv/lp.c:380 +#: systemv/lp.c:374 #, c-format msgid "%s: Error - expected mode list after \"-y\" option." msgstr "%s: エラー - \"-y\" オプションのあとにはモードリストが必要です。" -#: berkeley/lpr.c:272 +#: berkeley/lpr.c:268 #, c-format msgid "%s: Error - expected name after \"-%c\" option." msgstr "%s: エラー - \"-%c\" オプションのあとには名前が必要です。" -#: berkeley/lpr.c:154 systemv/lp.c:297 +#: berkeley/lpr.c:150 systemv/lp.c:291 #, c-format msgid "%s: Error - expected option=value after \"-o\" option." msgstr "%s: エラー - \"-o\" オプションのあとには オプション=値 が必要です。" -#: systemv/lp.c:450 +#: systemv/lp.c:444 #, c-format msgid "%s: Error - expected page list after \"-P\" option." msgstr "%s: エラー - \"-P\" オプションのあとにはページリストが必要です。" -#: systemv/lp.c:317 +#: systemv/lp.c:311 #, c-format msgid "%s: Error - expected priority after \"-%c\" option." msgstr "%s: エラー - \"-%c\" オプションのあとには優先度が必要です。" @@ -2104,14 +2103,14 @@ msgid "%s: Error - expected reason text after \"-r\" option." msgstr "%s: エラー - \"-r\" のあとには理由のテキストが必要です。" -#: systemv/lp.c:363 +#: systemv/lp.c:357 #, c-format msgid "%s: Error - expected title after \"-t\" option." msgstr "%s: エラー - \"-t\" オプションのあとにはタイトルが必要です。" -#: berkeley/lpq.c:108 berkeley/lpr.c:85 berkeley/lprm.c:104 -#: systemv/cancel.c:95 systemv/cupsaccept.c:101 systemv/lp.c:116 -#: systemv/lpadmin.c:438 systemv/lpstat.c:124 +#: berkeley/lpq.c:97 berkeley/lpr.c:81 berkeley/lprm.c:104 systemv/cancel.c:95 +#: systemv/cupsaccept.c:101 systemv/lp.c:110 systemv/lpadmin.c:424 +#: systemv/lpstat.c:124 #, c-format msgid "%s: Error - expected username after \"-U\" option." msgstr "%s: エラー - \"-U\" オプションのあとにはユーザー名が必要です。" @@ -2121,7 +2120,7 @@ msgid "%s: Error - expected username after \"-u\" option." msgstr "%s: エラー - \"-u\" オプションのあとにはユーザー名が必要です。" -#: berkeley/lpr.c:126 +#: berkeley/lpr.c:122 #, c-format msgid "%s: Error - expected value after \"-%c\" option." msgstr "%s: エラー - \"-%c\" オプションのあとには値が必要です。" @@ -2135,32 +2134,32 @@ "%s: エラー - \"-W\" オプションのあとには、\"completed\"、\"not-completed\"、\"all\" " "のいずれかが必要です。" -#: berkeley/lpq.c:242 berkeley/lpr.c:367 systemv/lp.c:613 +#: berkeley/lpq.c:230 berkeley/lpr.c:363 systemv/lp.c:607 #, c-format msgid "%s: Error - no default destination available." msgstr "%s: エラー - 利用可能なデフォルトの宛先がありません。" -#: systemv/lp.c:339 +#: systemv/lp.c:333 #, c-format msgid "%s: Error - priority must be between 1 and 100." msgstr "%s: エラー - 優先度は 1 から 100 の間である必要があります。" -#: berkeley/lpr.c:370 systemv/lp.c:616 +#: berkeley/lpr.c:366 systemv/lp.c:610 #, c-format msgid "%s: Error - scheduler not responding." msgstr "%s: エラー - スケジューラーが応答していません。" -#: berkeley/lpr.c:315 systemv/lp.c:553 +#: berkeley/lpr.c:311 systemv/lp.c:547 #, c-format msgid "%s: Error - too many files - \"%s\"." msgstr "%s: エラー - ファイルが多すぎます - \"%s\"" -#: berkeley/lpr.c:297 systemv/lp.c:536 +#: berkeley/lpr.c:293 systemv/lp.c:530 #, c-format msgid "%s: Error - unable to access \"%s\" - %s" msgstr "%s: エラー - \"%s\" にアクセスできません - %s" -#: berkeley/lpr.c:413 systemv/lp.c:647 +#: berkeley/lpr.c:409 systemv/lp.c:641 #, c-format msgid "%s: Error - unable to queue from stdin - %s." msgstr "%s: エラー - 標準入力からキューにデータを入力できません。 - %s" @@ -2170,23 +2169,23 @@ msgid "%s: Error - unknown destination \"%s\"." msgstr "%s: エラー - \"%s\" は未知の宛先です。" -#: berkeley/lpq.c:148 +#: berkeley/lpq.c:137 #, c-format msgid "%s: Error - unknown destination \"%s/%s\"." msgstr "%s: エラー - \"%s/%s\" は未知の宛先です。" -#: berkeley/lpr.c:283 berkeley/lprm.c:139 systemv/cancel.c:163 -#: systemv/cupsaccept.c:164 systemv/lp.c:512 systemv/lpstat.c:456 +#: berkeley/lpr.c:279 berkeley/lprm.c:139 systemv/cancel.c:163 +#: systemv/cupsaccept.c:164 systemv/lp.c:506 systemv/lpstat.c:456 #, c-format msgid "%s: Error - unknown option \"%c\"." msgstr "%s: エラー - '%c' は未知のオプションです。" -#: systemv/cupsaccept.c:157 systemv/lp.c:503 +#: systemv/cupsaccept.c:157 systemv/lp.c:497 #, c-format msgid "%s: Error - unknown option \"%s\"." msgstr "%s: エラー - '%s' は未知のオプションです。" -#: systemv/lp.c:217 +#: systemv/lp.c:211 #, c-format msgid "%s: Expected job ID after \"-i\" option." msgstr "%s: '-i' オプションのあとにはジョブ ID が必要です。" @@ -2196,27 +2195,27 @@ msgid "%s: Invalid destination name in list \"%s\"." msgstr "%s: リスト \"%s\" に無効な宛先名があります。" -#: scheduler/cupsfilter.c:551 +#: scheduler/cupsfilter.c:579 #, c-format msgid "%s: Invalid filter string \"%s\"." msgstr "%s: 無効なフィルター文字列です \"%s\"" -#: test/ippfind.c:768 test/ipptool.c:329 +#: test/ippfind.c:749 test/ipptool.c:346 #, c-format msgid "%s: Missing timeout for \"-T\"." msgstr "%s: \"-T\" オプションにタイムアウトが設定されていません。" -#: test/ippfind.c:781 test/ipptool.c:343 +#: test/ippfind.c:762 test/ipptool.c:360 #, c-format msgid "%s: Missing version for \"-V\"." msgstr "%s: \"-V\" オプションにバージョンの指定がありません。" -#: systemv/lp.c:427 +#: systemv/lp.c:421 #, c-format msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"." msgstr "%s: '-H restart' の前にはジョブ ID ('-i ジョブID') が必要です。" -#: scheduler/cupsfilter.c:442 +#: scheduler/cupsfilter.c:451 #, c-format msgid "%s: No filter to convert from %s/%s to %s/%s." msgstr "%s: %s/%s から %s/%s に変換するフィルターがありません。" @@ -2226,15 +2225,15 @@ msgid "%s: Operation failed: %s" msgstr "%s: 操作に失敗しました: %s" -#: berkeley/lpq.c:94 berkeley/lpr.c:71 berkeley/lprm.c:67 systemv/cancel.c:82 -#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102 -#: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73 -#: systemv/lpstat.c:88 test/ipptool.c:301 test/ipptool.c:318 +#: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82 +#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96 +#: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73 +#: systemv/lpstat.c:88 test/ipptool.c:291 test/ipptool.c:335 #, c-format msgid "%s: Sorry, no encryption support." msgstr "%s: 残念ながら、暗号化サポートはコンパイル時に組み込まれていません。" -#: berkeley/lpq.c:296 scheduler/cupsfilter.c:1247 systemv/cancel.c:245 +#: berkeley/lpq.c:284 scheduler/cupsfilter.c:1275 systemv/cancel.c:245 #: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171 #, c-format msgid "%s: Unable to connect to server." @@ -2245,236 +2244,236 @@ msgid "%s: Unable to contact server." msgstr "%s: サーバーに連絡できません。" -#: scheduler/cupsfilter.c:407 +#: scheduler/cupsfilter.c:416 #, c-format msgid "%s: Unable to determine MIME type of \"%s\"." msgstr "%s: \"%s\" の MIME タイプを判別できません。" -#: ppdc/ppdmerge.cxx:96 +#: ppdc/ppdmerge.cxx:90 #, c-format msgid "%s: Unable to open %s: %s" msgstr "%s: %s を開けません: %s" -#: scheduler/cupsfilter.c:646 ppdc/ppdmerge.cxx:112 +#: scheduler/cupsfilter.c:674 ppdc/ppdmerge.cxx:106 #, c-format msgid "%s: Unable to open PPD file: %s on line %d." msgstr "%s: PPD ファイルを開けません: %s の %d 行目" -#: scheduler/cupsfilter.c:374 +#: scheduler/cupsfilter.c:383 #, c-format msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "%s: \"%s\" または \"%s\" から MIME データベースを読み取ることができません。" -#: berkeley/lpq.c:151 systemv/lpstat.c:575 +#: berkeley/lpq.c:140 systemv/lpstat.c:575 #, c-format msgid "%s: Unknown destination \"%s\"." msgstr "%s: \"%s\" は未知の宛先です。" -#: scheduler/cupsfilter.c:419 +#: scheduler/cupsfilter.c:428 #, c-format msgid "%s: Unknown destination MIME type %s/%s." msgstr "%s: %s/%s は未知の宛先 MIME タイプです。" -#: scheduler/cupsfilter.c:1453 +#: scheduler/cupsfilter.c:1479 #, c-format msgid "%s: Unknown option \"%c\"." msgstr "%s: '%c' は未知のオプションです。" -#: test/ippfind.c:667 +#: test/ippfind.c:648 #, c-format msgid "%s: Unknown option \"%s\"." msgstr "%s: \"%s\" は未知のオプションです。" -#: test/ippfind.c:948 +#: test/ippfind.c:928 #, c-format msgid "%s: Unknown option \"-%c\"." msgstr "%s: \"-%c\" は未知のオプションです。" -#: scheduler/cupsfilter.c:399 +#: scheduler/cupsfilter.c:408 #, c-format msgid "%s: Unknown source MIME type %s/%s." msgstr "%s: %s/%s は未知のソース MIME タイプです。" -#: berkeley/lpr.c:140 +#: berkeley/lpr.c:136 #, c-format msgid "" "%s: Warning - \"%c\" format modifier not supported - output may not be " "correct." msgstr "%s: 警告 - '%c' 形式修飾子はサポートされていません - 出力は正しくないものになるかもしれません。" -#: systemv/lp.c:477 +#: systemv/lp.c:471 #, c-format msgid "%s: Warning - character set option ignored." msgstr "%s: 警告 - 文字セットオプションは無視されます。" -#: systemv/lp.c:496 +#: systemv/lp.c:490 #, c-format msgid "%s: Warning - content type option ignored." msgstr "%s: 警告 - コンテンツタイプオプションは無視されます。" -#: systemv/lp.c:184 +#: systemv/lp.c:178 #, c-format msgid "%s: Warning - form option ignored." msgstr "%s: 警告 - 用紙オプションは無視されます。" -#: systemv/lp.c:387 +#: systemv/lp.c:381 #, c-format msgid "%s: Warning - mode option ignored." msgstr "%s: 警告 - モードオプションは無視されます。" -#: ppdc/sample.c:310 +#: ppdc/sample.c:305 msgid "-1" msgstr "-1" -#: ppdc/sample.c:301 +#: ppdc/sample.c:296 msgid "-10" msgstr "-10" -#: ppdc/sample.c:393 +#: ppdc/sample.c:388 msgid "-100" msgstr "-100" -#: ppdc/sample.c:392 +#: ppdc/sample.c:387 msgid "-105" msgstr "-105" -#: ppdc/sample.c:300 +#: ppdc/sample.c:295 msgid "-11" msgstr "-11" -#: ppdc/sample.c:391 +#: ppdc/sample.c:386 msgid "-110" msgstr "-110" -#: ppdc/sample.c:390 +#: ppdc/sample.c:385 msgid "-115" msgstr "-115" -#: ppdc/sample.c:299 +#: ppdc/sample.c:294 msgid "-12" msgstr "-12" -#: ppdc/sample.c:389 +#: ppdc/sample.c:384 msgid "-120" msgstr "-120" -#: ppdc/sample.c:298 +#: ppdc/sample.c:293 msgid "-13" msgstr "-13" -#: ppdc/sample.c:297 +#: ppdc/sample.c:292 msgid "-14" msgstr "-14" -#: ppdc/sample.c:296 +#: ppdc/sample.c:291 msgid "-15" msgstr "-15" -#: ppdc/sample.c:309 +#: ppdc/sample.c:304 msgid "-2" msgstr "-2" -#: ppdc/sample.c:409 +#: ppdc/sample.c:404 msgid "-20" msgstr "-20" -#: ppdc/sample.c:408 +#: ppdc/sample.c:403 msgid "-25" msgstr "-25" -#: ppdc/sample.c:308 +#: ppdc/sample.c:303 msgid "-3" msgstr "-3" -#: ppdc/sample.c:407 +#: ppdc/sample.c:402 msgid "-30" msgstr "-30" -#: ppdc/sample.c:406 +#: ppdc/sample.c:401 msgid "-35" msgstr "-35" -#: ppdc/sample.c:307 +#: ppdc/sample.c:302 msgid "-4" msgstr "-4" -#: ppdc/sample.c:405 +#: ppdc/sample.c:400 msgid "-40" msgstr "-40" -#: ppdc/sample.c:404 +#: ppdc/sample.c:399 msgid "-45" msgstr "-45" -#: ppdc/sample.c:306 +#: ppdc/sample.c:301 msgid "-5" msgstr "-5" -#: ppdc/sample.c:403 +#: ppdc/sample.c:398 msgid "-50" msgstr "-50" -#: ppdc/sample.c:402 +#: ppdc/sample.c:397 msgid "-55" msgstr "-55" -#: ppdc/sample.c:305 +#: ppdc/sample.c:300 msgid "-6" msgstr "-6" -#: ppdc/sample.c:401 +#: ppdc/sample.c:396 msgid "-60" msgstr "-60" -#: ppdc/sample.c:400 +#: ppdc/sample.c:395 msgid "-65" msgstr "-65" -#: ppdc/sample.c:304 +#: ppdc/sample.c:299 msgid "-7" msgstr "-7" -#: ppdc/sample.c:399 +#: ppdc/sample.c:394 msgid "-70" msgstr "-70" -#: ppdc/sample.c:398 +#: ppdc/sample.c:393 msgid "-75" msgstr "-75" -#: ppdc/sample.c:303 +#: ppdc/sample.c:298 msgid "-8" msgstr "-8" -#: ppdc/sample.c:397 +#: ppdc/sample.c:392 msgid "-80" msgstr "-80" -#: ppdc/sample.c:396 +#: ppdc/sample.c:391 msgid "-85" msgstr "-85" -#: ppdc/sample.c:302 +#: ppdc/sample.c:297 msgid "-9" msgstr "-9" -#: ppdc/sample.c:395 +#: ppdc/sample.c:390 msgid "-90" msgstr "-90" -#: ppdc/sample.c:394 +#: ppdc/sample.c:389 msgid "-95" msgstr "-95" -#: ppdc/sample.c:311 +#: ppdc/sample.c:306 msgid "0" msgstr "0" -#: ppdc/sample.c:312 +#: ppdc/sample.c:307 msgid "1" msgstr "1" -#: ppdc/sample.c:384 +#: ppdc/sample.c:379 msgid "1 inch/sec." msgstr "1 インチ/秒" @@ -2486,7 +2485,7 @@ msgid "1.25x2.25\"" msgstr "1.25x2.25 インチ" -#: ppdc/sample.c:432 +#: ppdc/sample.c:427 msgid "1.5 inch/sec." msgstr "1.5 インチ/秒" @@ -2506,11 +2505,11 @@ msgid "1.50x2.00\"" msgstr "1.50x2.00 インチ" -#: ppdc/sample.c:321 +#: ppdc/sample.c:316 msgid "10" msgstr "10" -#: ppdc/sample.c:443 +#: ppdc/sample.c:438 msgid "10 inches/sec." msgstr "10 インチ/秒" @@ -2526,39 +2525,39 @@ msgid "10 x 14" msgstr "10 x 14 インチ" -#: ppdc/sample.c:423 +#: ppdc/sample.c:418 msgid "100" msgstr "100" -#: ppdc/sample.c:334 +#: ppdc/sample.c:329 msgid "100 mm/sec." msgstr "100 ミリメートル/秒" -#: ppdc/sample.c:424 +#: ppdc/sample.c:419 msgid "105" msgstr "105" -#: ppdc/sample.c:322 +#: ppdc/sample.c:317 msgid "11" msgstr "11" -#: ppdc/sample.c:444 +#: ppdc/sample.c:439 msgid "11 inches/sec." msgstr "11 インチ/秒" -#: ppdc/sample.c:425 +#: ppdc/sample.c:420 msgid "110" msgstr "110" -#: ppdc/sample.c:426 +#: ppdc/sample.c:421 msgid "115" msgstr "115" -#: ppdc/sample.c:323 +#: ppdc/sample.c:318 msgid "12" msgstr "12" -#: ppdc/sample.c:445 +#: ppdc/sample.c:440 msgid "12 inches/sec." msgstr "12 インチ/秒" @@ -2566,11 +2565,11 @@ msgid "12 x 11" msgstr "12 x 11 インチ" -#: ppdc/sample.c:427 +#: ppdc/sample.c:422 msgid "120" msgstr "120" -#: ppdc/sample.c:335 +#: ppdc/sample.c:330 msgid "120 mm/sec." msgstr "120 ミリメートル/秒" @@ -2582,7 +2581,7 @@ msgid "120x72dpi" msgstr "120x72dpi" -#: ppdc/sample.c:324 +#: ppdc/sample.c:319 msgid "13" msgstr "13" @@ -2590,15 +2589,15 @@ msgid "136dpi" msgstr "136dpi" -#: ppdc/sample.c:325 +#: ppdc/sample.c:320 msgid "14" msgstr "14" -#: ppdc/sample.c:326 +#: ppdc/sample.c:321 msgid "15" msgstr "15" -#: ppdc/sample.c:328 +#: ppdc/sample.c:323 msgid "15 mm/sec." msgstr "15 ミリメートル/秒" @@ -2606,23 +2605,23 @@ msgid "15 x 11" msgstr "15 x 11 インチ" -#: ppdc/sample.c:336 +#: ppdc/sample.c:331 msgid "150 mm/sec." msgstr "150 ミリメートル/秒" -#: ppdc/sample.c:283 +#: ppdc/sample.c:278 msgid "150dpi" msgstr "150dpi" -#: ppdc/sample.c:368 +#: ppdc/sample.c:363 msgid "16" msgstr "16" -#: ppdc/sample.c:369 +#: ppdc/sample.c:364 msgid "17" msgstr "17" -#: ppdc/sample.c:370 +#: ppdc/sample.c:365 msgid "18" msgstr "18" @@ -2630,19 +2629,19 @@ msgid "180dpi" msgstr "180dpi" -#: ppdc/sample.c:371 +#: ppdc/sample.c:366 msgid "19" msgstr "19" -#: ppdc/sample.c:313 +#: ppdc/sample.c:308 msgid "2" msgstr "2" -#: ppdc/sample.c:385 +#: ppdc/sample.c:380 msgid "2 inches/sec." msgstr "2 インチ/秒" -#: ppdc/sample.c:270 +#: ppdc/sample.c:262 msgid "2-Sided Printing" msgstr "両面印刷" @@ -2698,7 +2697,7 @@ msgid "2.38x5.50\"" msgstr "2.38x5.50 インチ" -#: ppdc/sample.c:433 +#: ppdc/sample.c:428 msgid "2.5 inches/sec." msgstr "2.5 インチ/秒" @@ -2718,15 +2717,15 @@ msgid "2.9 x 1\"" msgstr "2.9 x 1 インチ" -#: ppdc/sample.c:372 +#: ppdc/sample.c:367 msgid "20" msgstr "20" -#: ppdc/sample.c:329 +#: ppdc/sample.c:324 msgid "20 mm/sec." msgstr "20 ミリメートル/秒" -#: ppdc/sample.c:337 +#: ppdc/sample.c:332 msgid "200 mm/sec." msgstr "200 ミリメートル/秒" @@ -2734,19 +2733,19 @@ msgid "203dpi" msgstr "203dpi" -#: ppdc/sample.c:373 +#: ppdc/sample.c:368 msgid "21" msgstr "21" -#: ppdc/sample.c:374 +#: ppdc/sample.c:369 msgid "22" msgstr "22" -#: ppdc/sample.c:375 +#: ppdc/sample.c:370 msgid "23" msgstr "23" -#: ppdc/sample.c:376 +#: ppdc/sample.c:371 msgid "24" msgstr "24" @@ -2758,35 +2757,35 @@ msgid "240x72dpi" msgstr "240x72dpi" -#: ppdc/sample.c:377 +#: ppdc/sample.c:372 msgid "25" msgstr "25" -#: ppdc/sample.c:338 +#: ppdc/sample.c:333 msgid "250 mm/sec." msgstr "250 ミリメートル/秒" -#: ppdc/sample.c:378 +#: ppdc/sample.c:373 msgid "26" msgstr "26" -#: ppdc/sample.c:379 +#: ppdc/sample.c:374 msgid "27" msgstr "27" -#: ppdc/sample.c:380 +#: ppdc/sample.c:375 msgid "28" msgstr "28" -#: ppdc/sample.c:381 +#: ppdc/sample.c:376 msgid "29" msgstr "29" -#: ppdc/sample.c:314 +#: ppdc/sample.c:309 msgid "3" msgstr "3" -#: ppdc/sample.c:386 +#: ppdc/sample.c:381 msgid "3 inches/sec." msgstr "3 インチ/秒" @@ -2846,15 +2845,15 @@ msgid "3.50x1.00\"" msgstr "3.50x1.00 インチ" -#: ppdc/sample.c:382 +#: ppdc/sample.c:377 msgid "30" msgstr "30" -#: ppdc/sample.c:330 +#: ppdc/sample.c:325 msgid "30 mm/sec." msgstr "30 ミリメートル/秒" -#: ppdc/sample.c:339 +#: ppdc/sample.c:334 msgid "300 mm/sec." msgstr "300 ミリメートル/秒" @@ -2862,7 +2861,7 @@ msgid "300dpi" msgstr "300dpi" -#: ppdc/sample.c:410 +#: ppdc/sample.c:405 msgid "35" msgstr "35" @@ -2874,11 +2873,11 @@ msgid "360x180dpi" msgstr "360x180dpi" -#: ppdc/sample.c:315 +#: ppdc/sample.c:310 msgid "4" msgstr "4" -#: ppdc/sample.c:387 +#: ppdc/sample.c:382 msgid "4 inches/sec." msgstr "4 インチ/秒" @@ -2918,23 +2917,23 @@ msgid "4.00x6.50\"" msgstr "4.00x6.50 インチ" -#: ppdc/sample.c:411 +#: ppdc/sample.c:406 msgid "40" msgstr "40" -#: ppdc/sample.c:331 +#: ppdc/sample.c:326 msgid "40 mm/sec." msgstr "40 ミリメートル/秒" -#: ppdc/sample.c:412 +#: ppdc/sample.c:407 msgid "45" msgstr "45" -#: ppdc/sample.c:316 +#: ppdc/sample.c:311 msgid "5" msgstr "5" -#: ppdc/sample.c:437 +#: ppdc/sample.c:432 msgid "5 inches/sec." msgstr "5 インチ/秒" @@ -2942,19 +2941,19 @@ msgid "5 x 7" msgstr "5 x 7 インチ" -#: ppdc/sample.c:413 +#: ppdc/sample.c:408 msgid "50" msgstr "50" -#: ppdc/sample.c:414 +#: ppdc/sample.c:409 msgid "55" msgstr "55" -#: ppdc/sample.c:317 +#: ppdc/sample.c:312 msgid "6" msgstr "6" -#: ppdc/sample.c:438 +#: ppdc/sample.c:433 msgid "6 inches/sec." msgstr "6 インチ/秒" @@ -2986,15 +2985,15 @@ msgid "6.00x6.50\"" msgstr "6.00x6.50 インチ" -#: ppdc/sample.c:415 +#: ppdc/sample.c:410 msgid "60" msgstr "60" -#: ppdc/sample.c:332 +#: ppdc/sample.c:327 msgid "60 mm/sec." msgstr "60 ミリメートル/秒" -#: ppdc/sample.c:261 +#: ppdc/sample.c:253 msgid "600dpi" msgstr "600dpi" @@ -3006,15 +3005,15 @@ msgid "60x72dpi" msgstr "60x72dpi" -#: ppdc/sample.c:416 +#: ppdc/sample.c:411 msgid "65" msgstr "65" -#: ppdc/sample.c:318 +#: ppdc/sample.c:313 msgid "7" msgstr "7" -#: ppdc/sample.c:440 +#: ppdc/sample.c:435 msgid "7 inches/sec." msgstr "7 インチ/秒" @@ -3022,7 +3021,7 @@ msgid "7 x 9" msgstr "7 x 9 インチ" -#: ppdc/sample.c:417 +#: ppdc/sample.c:412 msgid "70" msgstr "70" @@ -3030,15 +3029,15 @@ msgid "720dpi" msgstr "720dpi" -#: ppdc/sample.c:418 +#: ppdc/sample.c:413 msgid "75" msgstr "75" -#: ppdc/sample.c:319 +#: ppdc/sample.c:314 msgid "8" msgstr "8" -#: ppdc/sample.c:441 +#: ppdc/sample.c:436 msgid "8 inches/sec." msgstr "8 インチ/秒" @@ -3074,23 +3073,23 @@ msgid "8.00x6.50\"" msgstr "8.00x6.50 インチ" -#: ppdc/sample.c:419 +#: ppdc/sample.c:414 msgid "80" msgstr "80" -#: ppdc/sample.c:333 +#: ppdc/sample.c:328 msgid "80 mm/sec." msgstr "80 ミリメートル/秒" -#: ppdc/sample.c:420 +#: ppdc/sample.c:415 msgid "85" msgstr "85" -#: ppdc/sample.c:320 +#: ppdc/sample.c:315 msgid "9" msgstr "9" -#: ppdc/sample.c:442 +#: ppdc/sample.c:437 msgid "9 inches/sec." msgstr "9 インチ/秒" @@ -3106,32 +3105,32 @@ msgid "9-Pin Series" msgstr "9 ピンシリーズ" -#: ppdc/sample.c:421 +#: ppdc/sample.c:416 msgid "90" msgstr "90" -#: ppdc/sample.c:422 +#: ppdc/sample.c:417 msgid "95" msgstr "95" -#: berkeley/lpc.c:213 +#: berkeley/lpc.c:205 msgid "?Invalid help command unknown." msgstr "?無効なヘルプコマンドです" -#: cgi-bin/admin.c:2368 +#: cgi-bin/admin.c:2348 msgid "A Samba password is required to export printer drivers" msgstr "プリンタードライバーをエクスポートするには Samba のパスワードが必要です。" -#: cgi-bin/admin.c:2364 +#: cgi-bin/admin.c:2344 msgid "A Samba username is required to export printer drivers" msgstr "プリンタードライバーをエクスポートするには、Samba のユーザー名が必要です。" -#: scheduler/ipp.c:2293 +#: scheduler/ipp.c:2274 #, c-format msgid "A class named \"%s\" already exists." msgstr "\"%s\" という名前のクラスはすでに存在します。" -#: scheduler/ipp.c:936 +#: scheduler/ipp.c:916 #, c-format msgid "A printer named \"%s\" already exists." msgstr "\"%s\" という名前のプリンターはすでに存在します。" @@ -3272,24 +3271,24 @@ msgid "ARCH E Long Edge" msgstr "ARCH E 長辺送り" -#: cgi-bin/classes.c:169 cgi-bin/printers.c:172 +#: cgi-bin/classes.c:161 cgi-bin/printers.c:164 msgid "Accept Jobs" msgstr "ジョブの受け付け" -#: cups/http-support.c:1359 +#: cups/http-support.c:1347 msgid "Accepted" msgstr "受け付けました" -#: cgi-bin/admin.c:570 +#: cgi-bin/admin.c:548 msgid "Add Class" msgstr "クラスの追加" -#: cgi-bin/admin.c:882 +#: cgi-bin/admin.c:860 msgid "Add Printer" msgstr "プリンターの追加" -#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525 -#: cgi-bin/admin.c:535 +#: cgi-bin/admin.c:422 cgi-bin/admin.c:455 cgi-bin/admin.c:503 +#: cgi-bin/admin.c:513 msgid "Add RSS Subscription" msgstr "RSS 購読を追加" @@ -3297,28 +3296,28 @@ msgid "Address" msgstr "アドレス" -#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745 +#: cgi-bin/admin.c:188 cgi-bin/admin.c:262 cgi-bin/admin.c:2725 msgid "Administration" msgstr "管理" -#: ppdc/sample.c:429 +#: ppdc/sample.c:424 msgid "Always" msgstr "常に有効" -#: backend/socket.c:126 +#: backend/socket.c:121 msgid "AppSocket/HP JetDirect" msgstr "AppSocket/HP JetDirect" -#: ppdc/sample.c:450 +#: ppdc/sample.c:445 msgid "Applicator" msgstr "アプリケーター" -#: scheduler/ipp.c:1011 +#: scheduler/ipp.c:991 #, c-format msgid "Attempt to set %s printer-state to bad value %d." msgstr "%s printer-state に 不正な値 %d を設定しようとしています。" -#: scheduler/ipp.c:242 +#: scheduler/ipp.c:239 #, c-format msgid "Attribute groups are out of order (%x < %x)." msgstr "属性グループは範囲外です (%x < %x)。" @@ -3371,145 +3370,145 @@ msgid "B9" msgstr "B9" -#: scheduler/ipp.c:10793 +#: scheduler/ipp.c:10877 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "誤った 'document-format' の値です \"%s\"。" -#: cups/dest.c:1712 +#: cups/dest.c:1736 msgid "Bad NULL dests pointer" msgstr "不正な NULL 送信先ポインター" -#: cups/ppd.c:345 +#: cups/ppd.c:303 msgid "Bad OpenGroup" msgstr "不正な OpenGroup" -#: cups/ppd.c:347 +#: cups/ppd.c:305 msgid "Bad OpenUI/JCLOpenUI" msgstr "不正な OpenUI/JCLOpenUI" -#: cups/ppd.c:349 +#: cups/ppd.c:307 msgid "Bad OrderDependency" msgstr "不正な OrderDependency" -#: cups/ppd-cache.c:149 cups/ppd-cache.c:196 cups/ppd-cache.c:234 -#: cups/ppd-cache.c:240 cups/ppd-cache.c:256 cups/ppd-cache.c:272 -#: cups/ppd-cache.c:281 cups/ppd-cache.c:289 cups/ppd-cache.c:306 -#: cups/ppd-cache.c:314 cups/ppd-cache.c:329 cups/ppd-cache.c:337 -#: cups/ppd-cache.c:358 cups/ppd-cache.c:370 cups/ppd-cache.c:385 -#: cups/ppd-cache.c:397 cups/ppd-cache.c:419 cups/ppd-cache.c:427 -#: cups/ppd-cache.c:445 cups/ppd-cache.c:453 cups/ppd-cache.c:468 -#: cups/ppd-cache.c:476 cups/ppd-cache.c:494 cups/ppd-cache.c:502 -#: cups/ppd-cache.c:529 cups/ppd-cache.c:599 cups/ppd-cache.c:607 -#: cups/ppd-cache.c:615 +#: cups/ppd-cache.c:117 cups/ppd-cache.c:164 cups/ppd-cache.c:202 +#: cups/ppd-cache.c:208 cups/ppd-cache.c:224 cups/ppd-cache.c:240 +#: cups/ppd-cache.c:249 cups/ppd-cache.c:257 cups/ppd-cache.c:274 +#: cups/ppd-cache.c:282 cups/ppd-cache.c:297 cups/ppd-cache.c:305 +#: cups/ppd-cache.c:326 cups/ppd-cache.c:338 cups/ppd-cache.c:353 +#: cups/ppd-cache.c:365 cups/ppd-cache.c:387 cups/ppd-cache.c:395 +#: cups/ppd-cache.c:413 cups/ppd-cache.c:421 cups/ppd-cache.c:436 +#: cups/ppd-cache.c:444 cups/ppd-cache.c:462 cups/ppd-cache.c:470 +#: cups/ppd-cache.c:497 cups/ppd-cache.c:567 cups/ppd-cache.c:575 +#: cups/ppd-cache.c:583 msgid "Bad PPD cache file." msgstr "不正な PPD キャッシュファイルです。" -#: cups/http-support.c:1374 +#: cups/http-support.c:1362 msgid "Bad Request" msgstr "不正なリクエスト" -#: cups/snmp.c:998 +#: cups/snmp.c:954 msgid "Bad SNMP version number" msgstr "不正な SNMP バージョン番号" -#: cups/ppd.c:350 +#: cups/ppd.c:308 msgid "Bad UIConstraints" msgstr "不正な UIConstraints" -#: scheduler/ipp.c:1372 +#: scheduler/ipp.c:1352 #, c-format msgid "Bad copies value %d." msgstr "%d は不正なコピー値です。" -#: cups/ppd.c:358 +#: cups/ppd.c:316 msgid "Bad custom parameter" msgstr "不正なカスタムパラメーター" -#: cups/http-support.c:1526 scheduler/ipp.c:2379 +#: cups/http-support.c:1598 scheduler/ipp.c:2360 #, c-format msgid "Bad device-uri \"%s\"." msgstr "\"%s\" は無効な device-uri です。" -#: scheduler/ipp.c:2418 +#: scheduler/ipp.c:2399 #, c-format msgid "Bad device-uri scheme \"%s\"." msgstr "\"%s\" は無効な device-uri スキーマです。" -#: scheduler/ipp.c:8039 scheduler/ipp.c:8055 scheduler/ipp.c:9276 +#: scheduler/ipp.c:8125 scheduler/ipp.c:8141 scheduler/ipp.c:9360 #, c-format msgid "Bad document-format \"%s\"." msgstr "\"%s\" は不正な document-format です。" -#: scheduler/ipp.c:9292 +#: scheduler/ipp.c:9376 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "\"%s\" は不正な document-format-default です。" -#: cups/util.c:932 +#: cups/util.c:823 msgid "Bad filename buffer" msgstr "不正なファイル名バッファーです。" -#: scheduler/ipp.c:1548 +#: scheduler/ipp.c:1527 #, c-format msgid "Bad job-name value: %s" msgstr "誤った job-name 値: %s" -#: scheduler/ipp.c:1541 +#: scheduler/ipp.c:1520 msgid "Bad job-name value: Wrong type or count." msgstr "誤った job-name 値: 型かカウントが誤っています。" -#: scheduler/ipp.c:9882 +#: scheduler/ipp.c:9967 msgid "Bad job-priority value." msgstr "不正な job-priority 値です。" -#: scheduler/ipp.c:1402 +#: scheduler/ipp.c:1382 #, c-format msgid "Bad job-sheets value \"%s\"." msgstr "\"%s\" は不正な job-sheets 値です。" -#: scheduler/ipp.c:1386 +#: scheduler/ipp.c:1366 msgid "Bad job-sheets value type." msgstr "不正な job-sheets 値タイプ です。" -#: scheduler/ipp.c:9912 +#: scheduler/ipp.c:9997 msgid "Bad job-state value." msgstr "不正な job-state 値です。" -#: scheduler/ipp.c:3001 scheduler/ipp.c:3461 scheduler/ipp.c:5904 -#: scheduler/ipp.c:6051 scheduler/ipp.c:7473 scheduler/ipp.c:7742 -#: scheduler/ipp.c:8591 scheduler/ipp.c:8817 scheduler/ipp.c:9172 -#: scheduler/ipp.c:9775 +#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5930 +#: scheduler/ipp.c:6077 scheduler/ipp.c:7559 scheduler/ipp.c:7828 +#: scheduler/ipp.c:8678 scheduler/ipp.c:8904 scheduler/ipp.c:9256 +#: scheduler/ipp.c:9860 #, c-format msgid "Bad job-uri \"%s\"." msgstr "\"%s\" は無効な job-uri 属性です。" -#: scheduler/ipp.c:2059 scheduler/ipp.c:5442 +#: scheduler/ipp.c:2040 scheduler/ipp.c:5468 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "\"%s\" は無効な notify-pull-method です。" -#: scheduler/ipp.c:2023 scheduler/ipp.c:5406 +#: scheduler/ipp.c:2004 scheduler/ipp.c:5432 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "URI \"%s\" は不正な notify-recipient-uri です。" -#: scheduler/ipp.c:1418 +#: scheduler/ipp.c:1398 #, c-format msgid "Bad number-up value %d." msgstr "%d は不正な number-up 値です。" -#: cups/adminutil.c:292 +#: cups/adminutil.c:281 #, c-format msgid "Bad option + choice on line %d." msgstr "%d 行に不正なオプションと選択があります。" -#: scheduler/ipp.c:1435 +#: scheduler/ipp.c:1415 #, c-format msgid "Bad page-ranges values %d-%d." msgstr "%d-%d は不正な page-ranges 値です。" -#: scheduler/ipp.c:2461 +#: scheduler/ipp.c:2442 #, c-format msgid "Bad port-monitor \"%s\"." msgstr "\"%s\" は無効な port-monitor です。" @@ -3518,101 +3517,101 @@ msgid "Bad printer URI." msgstr "不正なプリンター URI です。" -#: scheduler/ipp.c:2522 +#: scheduler/ipp.c:2503 #, c-format msgid "Bad printer-state value %d." msgstr "%d は無効な printer-state 値です。" -#: scheduler/ipp.c:210 +#: scheduler/ipp.c:207 #, c-format msgid "Bad request ID %d." msgstr "%d は無効なリクエストIDです。" -#: scheduler/ipp.c:195 +#: scheduler/ipp.c:192 #, c-format msgid "Bad request version number %d.%d." msgstr "バージョン番号 %d.%d は無効なリクエストです。" -#: cgi-bin/admin.c:1484 +#: cgi-bin/admin.c:1464 msgid "Bad subscription ID" -msgstr "不正なサブスクリプション ID です。" +msgstr "不正なサブスクリプション ID" -#: cups/ppd.c:360 +#: cups/ppd.c:318 msgid "Bad value string" msgstr "値文字列がありません" -#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536 +#: cgi-bin/admin.c:3270 cgi-bin/admin.c:3516 msgid "Banners" msgstr "バナー" -#: ppdc/sample.c:287 +#: ppdc/sample.c:282 msgid "Bond Paper" msgstr "ボンド紙" -#: backend/usb-darwin.c:1873 +#: backend/usb-darwin.c:1874 #, c-format msgid "Boolean expected for waiteof option \"%s\"." msgstr "論理値は、waiteof オプション \"%s\" であるべきです" -#: filter/pstops.c:2058 +#: filter/pstops.c:2029 msgid "Buffer overflow detected, aborting." msgstr "オーバーフローが検出され、中断しました。" -#: ppdc/sample.c:254 +#: ppdc/sample.c:277 msgid "CMYK" msgstr "CMYK" -#: ppdc/sample.c:363 +#: ppdc/sample.c:358 msgid "CPCL Label Printer" msgstr "CPCL ラベルプリンター" -#: cgi-bin/admin.c:1485 cgi-bin/admin.c:1524 cgi-bin/admin.c:1534 +#: cgi-bin/admin.c:1465 cgi-bin/admin.c:1504 cgi-bin/admin.c:1514 msgid "Cancel RSS Subscription" msgstr "RSS 購読をキャンセル" -#: backend/ipp.c:2139 +#: backend/ipp.c:2198 msgid "Canceling print job." msgstr "プリントジョブをキャンセルしています。" -#: scheduler/ipp.c:2502 +#: scheduler/ipp.c:2483 msgid "Cannot share a remote Kerberized printer." msgstr "リモートの Kerberos 認証のプリンターを共有できません。" -#: ppdc/sample.c:279 +#: ppdc/sample.c:271 msgid "Cassette" msgstr "カセット" -#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810 -#: cgi-bin/admin.c:1821 +#: cgi-bin/admin.c:1635 cgi-bin/admin.c:1777 cgi-bin/admin.c:1790 +#: cgi-bin/admin.c:1801 msgid "Change Settings" msgstr "設定の変更" -#: scheduler/ipp.c:2071 scheduler/ipp.c:5454 +#: scheduler/ipp.c:2052 scheduler/ipp.c:5480 #, c-format msgid "Character set \"%s\" not supported." msgstr "文字セット \"%s\" はサポートされていません。" -#: cgi-bin/classes.c:195 cgi-bin/classes.c:322 +#: cgi-bin/classes.c:187 cgi-bin/classes.c:314 msgid "Classes" msgstr "クラス" -#: cgi-bin/printers.c:182 +#: cgi-bin/printers.c:174 msgid "Clean Print Heads" msgstr "プリントヘッドクリーニング" -#: scheduler/ipp.c:3913 +#: scheduler/ipp.c:3893 msgid "Close-Job doesn't support the job-uri attribute." msgstr "Close-Job は job-uri 属性をサポートしていません。" -#: ppdc/sample.c:282 +#: ppdc/sample.c:276 msgid "Color" msgstr "カラー" -#: ppdc/sample.c:253 +#: ppdc/sample.c:274 msgid "Color Mode" msgstr "カラーモード" -#: berkeley/lpc.c:204 +#: berkeley/lpc.c:196 msgid "" "Commands may be abbreviated. Commands are:\n" "\n" @@ -3622,55 +3621,55 @@ "\n" "exit help quit status ?" -#: cups/snmp.c:1002 +#: cups/snmp.c:958 msgid "Community name uses indefinite length" msgstr "コミュニティ名の長さが不定" -#: backend/ipp.c:813 backend/lpd.c:888 backend/socket.c:405 +#: backend/ipp.c:854 backend/lpd.c:879 backend/socket.c:400 msgid "Connected to printer." msgstr "プリンターに接続しました。" -#: backend/ipp.c:718 backend/lpd.c:711 backend/socket.c:324 +#: backend/ipp.c:759 backend/lpd.c:702 backend/socket.c:319 msgid "Connecting to printer." msgstr "プリンターに接続中。" -#: cups/http-support.c:1347 +#: cups/http-support.c:1335 msgid "Continue" msgstr "継続" -#: ppdc/sample.c:365 +#: ppdc/sample.c:360 msgid "Continuous" msgstr "連続" -#: backend/lpd.c:1037 backend/lpd.c:1169 +#: backend/lpd.c:1028 backend/lpd.c:1160 msgid "Control file sent successfully." msgstr "コントロールファイルが正常に送信されました。" -#: backend/ipp.c:1309 backend/lpd.c:481 +#: backend/ipp.c:1349 backend/lpd.c:472 msgid "Copying print data." msgstr "印刷データをコピーしています。" -#: cups/http-support.c:1356 +#: cups/http-support.c:1344 msgid "Created" msgstr "ジョブ作成" -#: cups/ppd.c:1113 cups/ppd.c:1153 cups/ppd.c:1398 cups/ppd.c:1501 +#: cups/ppd.c:1069 cups/ppd.c:1109 cups/ppd.c:1354 cups/ppd.c:1457 msgid "Custom" msgstr "カスタム" -#: ppdc/sample.c:359 +#: ppdc/sample.c:354 msgid "CustominCutInterval" msgstr "CustominCutInterval" -#: ppdc/sample.c:357 +#: ppdc/sample.c:352 msgid "CustominTearInterval" msgstr "CustominTearInterval" -#: ppdc/sample.c:343 +#: ppdc/sample.c:338 msgid "Cut" msgstr "カット" -#: ppdc/sample.c:451 +#: ppdc/sample.c:446 msgid "Cutter" msgstr "カッター" @@ -3682,23 +3681,23 @@ msgid "Darkness" msgstr "濃さ" -#: backend/lpd.c:1122 +#: backend/lpd.c:1113 msgid "Data file sent successfully." -msgstr "データファイルが正常に送信されました" +msgstr "データファイルが正常に送信されました。" -#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150 +#: cgi-bin/admin.c:2074 cgi-bin/admin.c:2085 cgi-bin/admin.c:2130 msgid "Delete Class" msgstr "クラスの削除" -#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235 +#: cgi-bin/admin.c:2159 cgi-bin/admin.c:2170 cgi-bin/admin.c:2215 msgid "Delete Printer" msgstr "プリンターの削除" -#: ppdc/sample.c:281 +#: ppdc/sample.c:273 msgid "DeskJet Series" msgstr "DeskJet シリーズ" -#: scheduler/ipp.c:1296 +#: scheduler/ipp.c:1276 #, c-format msgid "Destination \"%s\" is not accepting jobs." msgstr "宛先 \"%s\" はジョブを受け付けていません。" @@ -3720,7 +3719,7 @@ " device-id = %s\n" " location = %s" -#: ppdc/sample.c:436 +#: ppdc/sample.c:431 msgid "Direct Thermal Media" msgstr "感熱紙" @@ -3749,16 +3748,16 @@ msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)." msgstr "ディレクトリー \"%s\" のパーミッションは問題ありません (0%o/uid=%d/gid=%d)。" -#: ppdc/sample.c:345 +#: ppdc/sample.c:340 msgid "Disabled" msgstr "無効" -#: scheduler/ipp.c:5953 +#: scheduler/ipp.c:5979 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "ドキュメント #%d がジョブ #%d に見つかりません。" -#: ppdc/sample.c:275 +#: ppdc/sample.c:267 msgid "Duplexer" msgstr "両面オプション" @@ -3766,26 +3765,26 @@ msgid "Dymo" msgstr "Dymo" -#: ppdc/sample.c:431 +#: ppdc/sample.c:426 msgid "EPL1 Label Printer" msgstr "EPL1 ラベルプリンター" -#: ppdc/sample.c:434 +#: ppdc/sample.c:429 msgid "EPL2 Label Printer" msgstr "EPL2 ラベルプリンター" -#: cgi-bin/admin.c:1849 cgi-bin/admin.c:1861 cgi-bin/admin.c:1915 -#: cgi-bin/admin.c:1922 cgi-bin/admin.c:1957 cgi-bin/admin.c:1970 -#: cgi-bin/admin.c:1994 cgi-bin/admin.c:2067 +#: cgi-bin/admin.c:1829 cgi-bin/admin.c:1841 cgi-bin/admin.c:1895 +#: cgi-bin/admin.c:1902 cgi-bin/admin.c:1937 cgi-bin/admin.c:1950 +#: cgi-bin/admin.c:1974 cgi-bin/admin.c:2047 msgid "Edit Configuration File" msgstr "設定ファイルの編集" -#: cups/adminutil.c:337 +#: cups/adminutil.c:326 msgid "Empty PPD file." msgstr "PPD ファイルが空です。" #. TRANSLATORS: Banner/cover sheet after the print job. -#: cgi-bin/admin.c:3561 +#: cgi-bin/admin.c:3541 msgid "Ending Banner" msgstr "終了バナー" @@ -3805,7 +3804,7 @@ msgid "Enter password:" msgstr "パスワードを入力:" -#: scheduler/client.c:2510 +#: scheduler/client.c:2209 msgid "" "Enter your username and password or the root username and password to access " "this page. If you are using Kerberos authentication, make sure you have a " @@ -3902,7 +3901,7 @@ msgid "Envelope DL" msgstr "封筒 DL" -#: ppdc/sample.c:269 +#: ppdc/sample.c:261 msgid "Envelope Feed" msgstr "封筒フィード" @@ -4026,7 +4025,7 @@ msgid "Envelope You4 Long Edge" msgstr "封筒 洋形4号 長辺送り" -#: test/ippfind.c:2797 +#: test/ippfind.c:2809 msgid "Environment Variables:" msgstr "環境変数:" @@ -4034,12 +4033,12 @@ msgid "Epson" msgstr "Epson" -#: cgi-bin/admin.c:3604 +#: cgi-bin/admin.c:3584 msgid "Error Policy" msgstr "エラーポリシー" -#: filter/rastertopwg.c:403 filter/rastertopwg.c:418 filter/rastertopwg.c:429 -#: filter/rastertopwg.c:440 +#: filter/rastertopwg.c:395 filter/rastertopwg.c:410 filter/rastertopwg.c:421 +#: filter/rastertopwg.c:432 msgid "Error sending raster data." msgstr "ラスターデータの送信でエラーが起きました。" @@ -4047,43 +4046,43 @@ msgid "Error: need hostname after \"-h\" option." msgstr "Error: '-h' オプションのあとにはホスト名が必要です。" -#: ppdc/sample.c:355 +#: ppdc/sample.c:350 msgid "Every 10 Labels" msgstr "10 ラベルごと" -#: ppdc/sample.c:347 +#: ppdc/sample.c:342 msgid "Every 2 Labels" msgstr "2 ラベルごと" -#: ppdc/sample.c:348 +#: ppdc/sample.c:343 msgid "Every 3 Labels" msgstr "3 ラベルごと" -#: ppdc/sample.c:349 +#: ppdc/sample.c:344 msgid "Every 4 Labels" msgstr "4 ラベルごと" -#: ppdc/sample.c:350 +#: ppdc/sample.c:345 msgid "Every 5 Labels" msgstr "5 ラベルごと" -#: ppdc/sample.c:351 +#: ppdc/sample.c:346 msgid "Every 6 Labels" msgstr "6 ラベルごと" -#: ppdc/sample.c:352 +#: ppdc/sample.c:347 msgid "Every 7 Labels" msgstr "7 ラベルごと" -#: ppdc/sample.c:353 +#: ppdc/sample.c:348 msgid "Every 8 Labels" msgstr "8 ラベルごと" -#: ppdc/sample.c:354 +#: ppdc/sample.c:349 msgid "Every 9 Labels" msgstr "9 ラベルごと" -#: ppdc/sample.c:346 +#: ppdc/sample.c:341 msgid "Every Label" msgstr "すべてのラベル" @@ -4091,15 +4090,15 @@ msgid "Executive" msgstr "エグゼクティブ" -#: cups/http-support.c:1402 +#: cups/http-support.c:1390 msgid "Expectation Failed" msgstr "予測に失敗しました" -#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375 +#: cgi-bin/admin.c:2336 cgi-bin/admin.c:2355 msgid "Export Printers to Samba" msgstr "Samba へプリンターをエクスポート" -#: test/ippfind.c:2743 +#: test/ippfind.c:2755 msgid "Expressions:" msgstr "式:" @@ -4154,7 +4153,7 @@ msgid "File Folder " msgstr "ファイルフォルダー " -#: scheduler/ipp.c:2397 +#: scheduler/ipp.c:2378 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " @@ -4163,8 +4162,8 @@ "ファイルデバイス URI は無効になっています。有効にするには、\"%s/cups-files.conf\" の FileDevice " "ディレクティブを参照してください。" -#: filter/rastertoepson.c:1117 filter/rastertohp.c:845 -#: filter/rastertolabel.c:1267 +#: filter/rastertoepson.c:1102 filter/rastertohp.c:834 +#: filter/rastertolabel.c:1259 #, c-format msgid "Finished page %d." msgstr "ページ %d を終了。" @@ -4173,38 +4172,38 @@ msgid "Folio" msgstr "フォリオ" -#: cups/http-support.c:1381 +#: cups/http-support.c:1369 msgid "Forbidden" msgstr "Forbidden" -#: cups/ppd.c:742 cups/ppd.c:1302 +#: cups/ppd.c:700 cups/ppd.c:1258 msgid "General" msgstr "一般" -#: ppdc/sample.c:259 +#: ppdc/sample.c:251 msgid "Generic" msgstr "汎用" -#: cups/snmp.c:1012 +#: cups/snmp.c:968 msgid "Get-Response-PDU uses indefinite length" msgstr "Get-Response-PDU は不確定の長さを使用しています" -#: ppdc/sample.c:290 +#: ppdc/sample.c:285 msgid "Glossy Paper" msgstr "光沢紙" -#: scheduler/ipp.c:2979 scheduler/ipp.c:3387 scheduler/ipp.c:3925 -#: scheduler/ipp.c:5882 scheduler/ipp.c:6029 scheduler/ipp.c:7450 -#: scheduler/ipp.c:8569 scheduler/ipp.c:8795 scheduler/ipp.c:9150 -#: scheduler/ipp.c:9753 +#: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905 +#: scheduler/ipp.c:5908 scheduler/ipp.c:6055 scheduler/ipp.c:7536 +#: scheduler/ipp.c:8656 scheduler/ipp.c:8882 scheduler/ipp.c:9234 +#: scheduler/ipp.c:9838 msgid "Got a printer-uri attribute but no job-id." msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした。" -#: ppdc/sample.c:255 +#: ppdc/sample.c:275 msgid "Grayscale" msgstr "グレースケール" -#: ppdc/sample.c:280 +#: ppdc/sample.c:272 msgid "HP" msgstr "HP" @@ -4216,95 +4215,95 @@ msgid "Help file not in index." msgstr "ヘルプファイルが索引に含まれていません。" -#: cups/ipp.c:3209 cups/ipp.c:3236 cups/ipp.c:3259 +#: cups/ipp.c:3183 cups/ipp.c:3210 cups/ipp.c:3233 msgid "IPP 1setOf attribute with incompatible value tags." msgstr "IPP の 1setOf 属性が value タグと互換性がありません。" -#: cups/ipp.c:3172 +#: cups/ipp.c:3146 msgid "IPP attribute has no name." msgstr "IPP の属性に名前がありません。" -#: cups/ipp.c:7026 +#: cups/ipp.c:7000 msgid "IPP attribute is not a member of the message." msgstr "IPP の属性がメッセージのメンバーではありません。" -#: cups/ipp.c:3621 +#: cups/ipp.c:3594 msgid "IPP begCollection value not 0 bytes." msgstr "IPP の begCollection は想定された 0 バイトになっていません。" -#: cups/ipp.c:3402 +#: cups/ipp.c:3376 msgid "IPP boolean value not 1 byte." msgstr "IPP の真偽値が想定された 1 バイトになっていません。" -#: cups/ipp.c:3463 +#: cups/ipp.c:3437 msgid "IPP date value not 11 bytes." msgstr "IPP の date 値は想定された 11 バイトになっていません。" -#: cups/ipp.c:3642 +#: cups/ipp.c:3615 msgid "IPP endCollection value not 0 bytes." msgstr "IPP の endCollection は想定された 0 バイトになっていません。" -#: cups/ipp.c:3377 +#: cups/ipp.c:3351 msgid "IPP enum value not 4 bytes." msgstr "IPP の enum 値は想定された 4 バイトになっていません。" -#: cups/ipp.c:3101 +#: cups/ipp.c:3075 msgid "IPP extension tag larger than 0x7FFFFFFF." msgstr "IPP の拡張タグが 0x7FFFFFFF より大きいです。" -#: cups/ipp.c:3374 +#: cups/ipp.c:3348 msgid "IPP integer value not 4 bytes." msgstr "IPP の整数値は想定された 4 バイトになっていません。" -#: cups/ipp.c:3574 +#: cups/ipp.c:3547 msgid "IPP language length overflows value." msgstr "IPP の language length の値がオーバーフローしています。" -#: cups/ipp.c:3583 +#: cups/ipp.c:3556 msgid "IPP language length too large." msgstr "IPP の language の長さが長すぎます。" -#: cups/ipp.c:3286 +#: cups/ipp.c:3260 msgid "IPP member name is not empty." msgstr "IPP のメンバー名が空ではありません。" -#: cups/ipp.c:3668 +#: cups/ipp.c:3641 msgid "IPP memberName value is empty." msgstr "IPP の memberName の値が空です。" -#: cups/ipp.c:3660 +#: cups/ipp.c:3633 msgid "IPP memberName with no attribute." msgstr "IPP の memberName に属性がありません。" -#: cups/ipp.c:3155 +#: cups/ipp.c:3129 msgid "IPP name larger than 32767 bytes." msgstr "IPP 名が 32767 バイトより大きいです。" -#: cups/ipp.c:3540 +#: cups/ipp.c:3514 msgid "IPP nameWithLanguage value less than minimum 4 bytes." msgstr "IPP の nameWithLanguage が最小値 4 バイト未満です。" -#: cups/ipp.c:3698 +#: cups/ipp.c:3671 msgid "IPP octetString length too large." msgstr "IPP の octetString の長さが大きすぎます。" -#: cups/ipp.c:3508 +#: cups/ipp.c:3482 msgid "IPP rangeOfInteger value not 8 bytes." msgstr "IPP の rangeOfInteger は想定された 8 バイトになっていません。" -#: cups/ipp.c:3481 +#: cups/ipp.c:3455 msgid "IPP resolution value not 9 bytes." msgstr "IPP の resolution は想定された 9 バイトになっていません。" -#: cups/ipp.c:3601 +#: cups/ipp.c:3574 msgid "IPP string length overflows value." msgstr "IPP の文字列長の値がオーバーフローしています。" -#: cups/ipp.c:3536 +#: cups/ipp.c:3510 msgid "IPP textWithLanguage value less than minimum 4 bytes." msgstr "IPP の textWithLanguage の値が最小値 4 バイト未満です。" -#: cups/ipp.c:3360 +#: cups/ipp.c:3334 msgid "IPP value larger than 32767 bytes." msgstr "IPP の値が 32767 バイト以上です。" @@ -4312,47 +4311,47 @@ msgid "ISOLatin1" msgstr "ISOLatin1" -#: cups/ppd.c:353 +#: cups/ppd.c:311 msgid "Illegal control character" msgstr "不正な制御文字" -#: cups/ppd.c:354 +#: cups/ppd.c:312 msgid "Illegal main keyword string" msgstr "不正なメインキーワード文字列" -#: cups/ppd.c:355 +#: cups/ppd.c:313 msgid "Illegal option keyword string" msgstr "不正なオプションキーワード文字列" -#: cups/ppd.c:356 +#: cups/ppd.c:314 msgid "Illegal translation string" msgstr "不正な翻訳文字列" -#: cups/ppd.c:357 +#: cups/ppd.c:315 msgid "Illegal whitespace character" msgstr "不正な空白文字" -#: ppdc/sample.c:274 +#: ppdc/sample.c:266 msgid "Installable Options" msgstr "インストール可能オプション" -#: ppdc/sample.c:277 +#: ppdc/sample.c:269 msgid "Installed" msgstr "インストールされています" -#: ppdc/sample.c:293 +#: ppdc/sample.c:288 msgid "IntelliBar Label Printer" msgstr "IntelliBar ラベルプリンター" -#: ppdc/sample.c:292 +#: ppdc/sample.c:287 msgid "Intellitech" msgstr "Intellitech" -#: cups/http-support.c:1408 +#: cups/http-support.c:1396 msgid "Internal Server Error" msgstr "サーバー内部エラー" -#: cups/ppd.c:344 +#: cups/ppd.c:302 msgid "Internal error" msgstr "内部エラー" @@ -4364,24 +4363,24 @@ msgid "Internet Postage 3-Part" msgstr "Internet Postage 3-Part" -#: backend/ipp.c:317 +#: backend/ipp.c:319 msgid "Internet Printing Protocol" msgstr "インターネット印刷プロトコル" -#: cups/pwg-media.c:312 cups/pwg-media.c:331 +#: cups/pwg-media.c:293 cups/pwg-media.c:312 msgid "Invalid media name arguments." msgstr "無効なメディア名引数です。" -#: cups/dest-options.c:1052 +#: cups/dest-options.c:1032 msgid "Invalid media size." msgstr "無効なメディアサイズです。" -#: filter/commandtops.c:125 +#: filter/commandtops.c:114 #, c-format msgid "Invalid printer command \"%s\"." msgstr "無効なプリンターコマンドです。 \"%s\"" -#: cups/ppd.c:1420 +#: cups/ppd.c:1376 msgid "JCL" msgstr "JCL" @@ -4441,93 +4440,93 @@ msgid "JIS B9" msgstr "JIS B9" -#: scheduler/ipp.c:8867 +#: scheduler/ipp.c:8954 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "ジョブ番号 %d を再開できません - ファイルが見つかりません。" -#: scheduler/ipp.c:3019 scheduler/ipp.c:3253 scheduler/ipp.c:3312 -#: scheduler/ipp.c:3489 scheduler/ipp.c:3935 scheduler/ipp.c:5540 -#: scheduler/ipp.c:5922 scheduler/ipp.c:6069 scheduler/ipp.c:6358 -#: scheduler/ipp.c:7297 scheduler/ipp.c:7319 scheduler/ipp.c:7491 -#: scheduler/ipp.c:7716 scheduler/ipp.c:7759 scheduler/ipp.c:8609 -#: scheduler/ipp.c:8835 scheduler/ipp.c:9190 scheduler/ipp.c:9793 +#: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292 +#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5566 +#: scheduler/ipp.c:5948 scheduler/ipp.c:6095 scheduler/ipp.c:6433 +#: scheduler/ipp.c:7383 scheduler/ipp.c:7405 scheduler/ipp.c:7577 +#: scheduler/ipp.c:7802 scheduler/ipp.c:7845 scheduler/ipp.c:8696 +#: scheduler/ipp.c:8922 scheduler/ipp.c:9274 scheduler/ipp.c:9878 #, c-format msgid "Job #%d does not exist." msgstr "ジョブ番号 %d は存在しません。" -#: scheduler/ipp.c:3521 +#: scheduler/ipp.c:3501 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "ジョブ番号 %d はすでに中断されています - キャンセルできません。" -#: scheduler/ipp.c:3515 +#: scheduler/ipp.c:3495 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "ジョブ番号 %d はすでにキャンセルされています - キャンセルできません。" -#: scheduler/ipp.c:3527 +#: scheduler/ipp.c:3507 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "ジョブ番号 %d はすでに完了しています - キャンセルできません。" -#: scheduler/ipp.c:7517 scheduler/ipp.c:7801 scheduler/ipp.c:9808 +#: scheduler/ipp.c:7603 scheduler/ipp.c:7887 scheduler/ipp.c:9893 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "ジョブ番号 %d はすでに終了し、変更できません。" -#: scheduler/ipp.c:8849 +#: scheduler/ipp.c:8936 #, c-format msgid "Job #%d is not complete." msgstr "ジョブ番号 %d は完了していません。" -#: scheduler/ipp.c:3034 +#: scheduler/ipp.c:3014 #, c-format msgid "Job #%d is not held for authentication." msgstr "ジョブ番号 %d は認証のために保留されていません。" -#: scheduler/ipp.c:8623 +#: scheduler/ipp.c:8710 #, c-format msgid "Job #%d is not held." msgstr "ジョブ番号 %d は保留されていません。" -#: cgi-bin/ipp-var.c:1055 +#: cgi-bin/ipp-var.c:1035 msgid "Job Completed" msgstr "ジョブ完了" -#: cgi-bin/ipp-var.c:1053 +#: cgi-bin/ipp-var.c:1033 msgid "Job Created" msgstr "ジョブ作成" -#: cgi-bin/ipp-var.c:1059 +#: cgi-bin/ipp-var.c:1039 msgid "Job Options Changed" msgstr "ジョブオプション変更" -#: cgi-bin/ipp-var.c:1057 +#: cgi-bin/ipp-var.c:1037 msgid "Job Stopped" msgstr "ジョブ中止" -#: scheduler/ipp.c:9890 +#: scheduler/ipp.c:9975 msgid "Job is completed and cannot be changed." msgstr "ジョブは完了し変更できません。" -#: cgi-bin/jobs.c:198 +#: cgi-bin/jobs.c:192 msgid "Job operation failed" msgstr "ジョブ操作失敗" -#: scheduler/ipp.c:9926 scheduler/ipp.c:9945 scheduler/ipp.c:9956 +#: scheduler/ipp.c:10011 scheduler/ipp.c:10028 scheduler/ipp.c:10039 msgid "Job state cannot be changed." msgstr "ジョブの状態を変更できません。" -#: scheduler/ipp.c:8715 +#: scheduler/ipp.c:8802 msgid "Job subscriptions cannot be renewed." msgstr "ジョブサブスクリプションを更新できません。" -#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195 +#: cgi-bin/jobs.c:97 cgi-bin/jobs.c:108 cgi-bin/jobs.c:189 msgid "Jobs" msgstr "ジョブ" -#: backend/lpd.c:186 +#: backend/lpd.c:177 msgid "LPD/LPR Host or Printer" msgstr "LPD/LPR ホストまたはプリンター" @@ -4535,11 +4534,11 @@ msgid "Label Printer" msgstr "ラベルプリンター" -#: ppdc/sample.c:446 +#: ppdc/sample.c:441 msgid "Label Top" msgstr "ラベルトップ" -#: scheduler/ipp.c:2080 scheduler/ipp.c:5463 +#: scheduler/ipp.c:2061 scheduler/ipp.c:5489 #, c-format msgid "Language \"%s\" not supported." msgstr "言語 \"%s\" はサポートされていません。" @@ -4548,7 +4547,7 @@ msgid "Large Address" msgstr "ラージアドレス" -#: ppdc/sample.c:291 +#: ppdc/sample.c:286 msgid "LaserJet Series PCL 4/5" msgstr "LaserJet Series PCL 4/5" @@ -4564,39 +4563,39 @@ msgid "Light" msgstr "薄い" -#: cups/ppd.c:352 +#: cups/ppd.c:310 msgid "Line longer than the maximum allowed (255 characters)" msgstr "1 行が最大値 (255 文字) を超えています" -#: cgi-bin/admin.c:2393 +#: cgi-bin/admin.c:2373 msgid "List Available Printers" -msgstr "使用可能なプリンターをリスト化" +msgstr "使用可能なプリンター一覧" -#: ppdc/sample.c:272 +#: ppdc/sample.c:264 msgid "Long-Edge (Portrait)" msgstr "長辺給紙 (縦向き)" -#: cups/http-support.c:1640 +#: cups/http-support.c:1725 msgid "Looking for printer." msgstr "プリンターを検索しています。" -#: ppdc/sample.c:268 +#: ppdc/sample.c:260 msgid "Manual Feed" msgstr "手差し" -#: cups/ppd.c:789 cups/ppd.c:1357 +#: cups/ppd.c:747 cups/ppd.c:1313 msgid "Media Size" msgstr "用紙サイズ" -#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262 +#: cups/ppd.c:751 cups/ppd.c:1317 ppdc/sample.c:254 msgid "Media Source" msgstr "給紙" -#: ppdc/sample.c:364 +#: ppdc/sample.c:359 msgid "Media Tracking" msgstr "用紙の経路" -#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285 +#: cups/ppd.c:749 cups/ppd.c:1315 ppdc/sample.c:280 msgid "Media Type" msgstr "用紙種類" @@ -4604,79 +4603,79 @@ msgid "Medium" msgstr "紙質" -#: cups/ppd.c:341 +#: cups/ppd.c:299 msgid "Memory allocation error" msgstr "メモリー割り当てエラー" -#: cups/ppd.c:361 +#: cups/ppd.c:319 msgid "Missing CloseGroup" msgstr "CloseGroup がありません" -#: cups/ppd.c:342 +#: cups/ppd.c:300 msgid "Missing PPD-Adobe-4.x header" msgstr "PPD-Adobe-4.x ヘッダーがありません" -#: cups/ppd.c:351 +#: cups/ppd.c:309 msgid "Missing asterisk in column 1" msgstr "1 列目にアスタリスクがありません" -#: scheduler/ipp.c:5945 +#: scheduler/ipp.c:5971 msgid "Missing document-number attribute." msgstr "document-number 属性がありません。" -#: cups/adminutil.c:273 +#: cups/adminutil.c:262 #, c-format msgid "Missing double quote on line %d." msgstr "%d 行に二重引用符がありません。" -#: cgi-bin/admin.c:736 cgi-bin/admin.c:2106 cgi-bin/admin.c:2191 -#: cgi-bin/admin.c:2785 cgi-bin/admin.c:3039 cgi-bin/admin.c:3150 -#: cgi-bin/admin.c:3860 +#: cgi-bin/admin.c:714 cgi-bin/admin.c:2086 cgi-bin/admin.c:2171 +#: cgi-bin/admin.c:2765 cgi-bin/admin.c:3019 cgi-bin/admin.c:3130 +#: cgi-bin/admin.c:3840 msgid "Missing form variable" msgstr "form 変数がありません。" -#: scheduler/ipp.c:9244 +#: scheduler/ipp.c:9328 msgid "Missing last-document attribute in request." msgstr "リクエストに last-document 属性がありません。" -#: cups/pwg-media.c:574 +#: cups/pwg-media.c:555 msgid "Missing media or media-col." msgstr "media または media-col がありません。" -#: cups/pwg-media.c:493 +#: cups/pwg-media.c:474 msgid "Missing media-size in media-col." msgstr "media-col に media-size がありません。" -#: scheduler/ipp.c:6488 +#: scheduler/ipp.c:6574 msgid "Missing notify-subscription-ids attribute." msgstr "notify-subscription-ids 属性がありません。" -#: cups/ppd.c:359 +#: cups/ppd.c:317 msgid "Missing option keyword" msgstr "オプションキーワードがありません" -#: scheduler/ipp.c:3160 scheduler/ipp.c:3185 +#: scheduler/ipp.c:3140 scheduler/ipp.c:3165 msgid "Missing requesting-user-name attribute." msgstr "requesting-user-name 属性が設定されていません。" -#: scheduler/ipp.c:391 +#: scheduler/ipp.c:388 msgid "Missing required attributes." msgstr "必須の属性が設定されていません。" -#: cups/adminutil.c:254 +#: cups/adminutil.c:243 #, c-format msgid "Missing value on line %d." msgstr "%d 行に値がありません。" -#: cups/ppd.c:343 +#: cups/ppd.c:301 msgid "Missing value string" msgstr "値文字列がありません" -#: cups/pwg-media.c:481 +#: cups/pwg-media.c:462 msgid "Missing x-dimension in media-size." msgstr "media-size に x-dimension がありません。" -#: cups/pwg-media.c:487 +#: cups/pwg-media.c:468 msgid "Missing y-dimension in media-size." msgstr "media-size に y-dimension がありません。" @@ -4693,43 +4692,43 @@ " プリンタードライバー = %s\n" " デバイス ID = %s" -#: test/ippfind.c:2774 +#: test/ippfind.c:2786 msgid "Modifiers:" msgstr "修飾子:" -#: cgi-bin/admin.c:570 +#: cgi-bin/admin.c:548 msgid "Modify Class" msgstr "クラスの変更" -#: cgi-bin/admin.c:882 +#: cgi-bin/admin.c:860 msgid "Modify Printer" msgstr "プリンターの変更" -#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516 +#: cgi-bin/ipp-var.c:410 cgi-bin/ipp-var.c:501 msgid "Move All Jobs" msgstr "すべてのジョブの移動" -#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514 +#: cgi-bin/ipp-var.c:349 cgi-bin/ipp-var.c:408 cgi-bin/ipp-var.c:499 msgid "Move Job" msgstr "ジョブの移動" -#: cups/http-support.c:1365 +#: cups/http-support.c:1353 msgid "Moved Permanently" msgstr "別の場所へ移動しました" -#: cups/ppd.c:340 +#: cups/ppd.c:298 msgid "NULL PPD file pointer" msgstr "PPD ファイルポインターが NULL です" -#: cups/snmp.c:1049 +#: cups/snmp.c:1005 msgid "Name OID uses indefinite length" msgstr "OID 名は限定的な長さを使用します" -#: scheduler/ipp.c:1074 +#: scheduler/ipp.c:1054 msgid "Nested classes are not allowed." msgstr "入れ子になったクラスは許可されていません。" -#: ppdc/sample.c:430 +#: ppdc/sample.c:425 msgid "Never" msgstr "Never" @@ -4741,125 +4740,125 @@ msgid "New Stylus Photo Series" msgstr "New Stylus Photo シリーズ" -#: cups/ppd.c:1949 +#: cups/ppd.c:1904 msgid "No" msgstr "いいえ" -#: cups/http-support.c:1362 +#: cups/http-support.c:1350 msgid "No Content" msgstr "中身がありません" -#: cups/util.c:1307 +#: cups/util.c:1123 msgid "No PPD name" msgstr "PPD の名前がありません" -#: cups/snmp.c:1043 +#: cups/snmp.c:999 msgid "No VarBind SEQUENCE" msgstr "VarBind SEQUENCE がありません" -#: cups/adminutil.c:788 +#: cups/adminutil.c:777 msgid "No Windows printer drivers are installed." msgstr "Windows プリンタードライバーがインストールされていません。" -#: cups/request.c:586 cups/request.c:949 +#: cups/request.c:570 cups/request.c:933 msgid "No active connection" msgstr "アクティブな接続はありません" -#: scheduler/ipp.c:3438 +#: scheduler/ipp.c:3418 #, c-format msgid "No active jobs on %s." msgstr "%s にはアクティブなジョブはありません。" -#: scheduler/ipp.c:219 +#: scheduler/ipp.c:216 msgid "No attributes in request." msgstr "リクエストに属性がありません。" -#: scheduler/ipp.c:3061 +#: scheduler/ipp.c:3041 msgid "No authentication information provided." msgstr "認証情報が提供されていません。" -#: cups/snmp.c:1000 +#: cups/snmp.c:956 msgid "No community name" msgstr "コミュニティ名がありません" -#: scheduler/ipp.c:5745 +#: scheduler/ipp.c:5771 msgid "No default printer." -msgstr "デフォルトのプリンターはありません" +msgstr "デフォルトのプリンターはありません。" -#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7063 +#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7149 msgid "No destinations added." -msgstr "追加された宛先はありません" +msgstr "追加された宛先はありません。" #: backend/usb.c:200 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable." msgstr "argv[0] または 環境変数 DEVICE_URI にデバイス URI が見つかりません。" -#: cups/snmp.c:1030 +#: cups/snmp.c:986 msgid "No error-index" msgstr "エラーインデックスがありません" -#: cups/snmp.c:1022 +#: cups/snmp.c:978 msgid "No error-status" msgstr "エラーステータスがありません" -#: scheduler/ipp.c:8005 scheduler/ipp.c:9258 +#: scheduler/ipp.c:8091 scheduler/ipp.c:9342 msgid "No file in print request." msgstr "印刷リクエストにファイルがありません。" -#: cups/util.c:926 +#: cups/util.c:817 msgid "No modification time" -msgstr "変更時刻がありません。" +msgstr "変更時刻がありません" -#: cups/snmp.c:1047 +#: cups/snmp.c:1003 msgid "No name OID" msgstr "OID 名がありません" -#: filter/rastertoepson.c:1147 filter/rastertohp.c:876 -#: filter/rastertolabel.c:1296 +#: filter/rastertoepson.c:1132 filter/rastertohp.c:865 +#: filter/rastertolabel.c:1288 msgid "No pages were found." msgstr "ページが見つかりません。" -#: cups/util.c:920 +#: cups/util.c:811 msgid "No printer name" -msgstr "プリンター名がありません。" +msgstr "プリンター名がありません" -#: cups/util.c:1843 +#: cups/util.c:1647 msgid "No printer-uri found" -msgstr "プリンター URI が見つかりません。" +msgstr "プリンター URI が見つかりません" -#: cups/util.c:1828 +#: cups/util.c:1631 msgid "No printer-uri found for class" -msgstr "クラスのプリンター URI が見つかりません。" +msgstr "クラスのプリンター URI が見つかりません" -#: scheduler/ipp.c:6148 +#: scheduler/ipp.c:6179 msgid "No printer-uri in request." msgstr "プリンター URI のリクエストがありません。" -#: cups/snmp.c:1014 +#: cups/snmp.c:970 msgid "No request-id" msgstr "リクエストID がありません" -#: scheduler/ipp.c:5348 +#: scheduler/ipp.c:5374 msgid "No subscription attributes in request." msgstr "リクエストにサブスクリプション属性がありません。" -#: scheduler/ipp.c:7390 +#: scheduler/ipp.c:7476 msgid "No subscriptions found." msgstr "サブスクリプションが見つかりません。" -#: cups/snmp.c:1038 +#: cups/snmp.c:994 msgid "No variable-bindings SEQUENCE" msgstr "variable-bindings SEQUENCE がありません" -#: cups/snmp.c:993 +#: cups/snmp.c:949 msgid "No version number" msgstr "バージョン名がありません" -#: ppdc/sample.c:367 +#: ppdc/sample.c:362 msgid "Non-continuous (Mark sensing)" msgstr "非連続です (Mark sensing)" -#: ppdc/sample.c:366 +#: ppdc/sample.c:361 msgid "Non-continuous (Web sensing)" msgstr "非連続です (Web sensing)" @@ -4867,27 +4866,27 @@ msgid "Normal" msgstr "標準" -#: cups/http-support.c:1384 +#: cups/http-support.c:1372 msgid "Not Found" msgstr "見つかりません" -#: cups/http-support.c:1396 +#: cups/http-support.c:1384 msgid "Not Implemented" msgstr "実装されていません" -#: ppdc/sample.c:276 +#: ppdc/sample.c:268 msgid "Not Installed" msgstr "インストールされていません" -#: cups/http-support.c:1371 +#: cups/http-support.c:1359 msgid "Not Modified" msgstr "変更されていません" -#: cups/http-support.c:1399 +#: cups/http-support.c:1387 msgid "Not Supported" msgstr "サポートされていません" -#: scheduler/ipp.c:1510 scheduler/ipp.c:10489 +#: scheduler/ipp.c:1490 scheduler/ipp.c:10572 msgid "Not allowed to print." msgstr "印刷が許可されていません。" @@ -4901,15 +4900,15 @@ "itself." msgstr "注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証するものではありません。" -#: cups/http-support.c:1353 cups/ppd.c:338 +#: cups/http-support.c:1341 cups/http-support.c:1477 cups/ppd.c:296 msgid "OK" msgstr "OK" -#: ppdc/sample.c:271 +#: ppdc/sample.c:263 msgid "Off (1-Sided)" msgstr "Off (片面)" -#: ppdc/sample.c:361 +#: ppdc/sample.c:356 msgid "Oki" msgstr "Oki" @@ -4917,49 +4916,49 @@ msgid "Online Help" msgstr "オンラインヘルプ" -#: cups/adminutil.c:955 +#: cups/adminutil.c:944 #, c-format msgid "Open of %s failed: %s" msgstr "%s のオープンに失敗しました: %s" -#: cups/ppd.c:346 +#: cups/ppd.c:304 msgid "OpenGroup without a CloseGroup first" msgstr "OpenGroup の前にまず CloseGroup が必要です" -#: cups/ppd.c:348 +#: cups/ppd.c:306 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first" msgstr "OpenUI/JCLOpenUI の前にまず CloseUI/JCLCloseUI が必要です" -#: cgi-bin/admin.c:3631 +#: cgi-bin/admin.c:3611 msgid "Operation Policy" msgstr "操作ポリシー" -#: filter/pstops.c:2206 +#: filter/pstops.c:2177 #, c-format msgid "Option \"%s\" cannot be included via %%%%IncludeFeature." msgstr "オプション \"%s\" は %%%%IncludeFeature 経由で含めることはできません。" -#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365 +#: cgi-bin/admin.c:3261 cgi-bin/admin.c:3345 msgid "Options Installed" msgstr "インストールされたオプション" -#: scheduler/cupsfilter.c:1457 scheduler/main.c:2002 systemv/cupsaddsmb.c:284 +#: scheduler/cupsfilter.c:1482 scheduler/main.c:2146 systemv/cupsaddsmb.c:284 #: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817 -#: test/ippfind.c:2733 test/ipptool.c:4708 ppdc/ppdc.cxx:437 -#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 +#: test/ippfind.c:2745 test/ipptool.c:4805 ppdc/ppdc.cxx:432 +#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363 #: ppdc/ppdpo.cxx:254 msgid "Options:" msgstr "オプション:" -#: cups/ppd-cache.c:157 +#: cups/ppd-cache.c:125 msgid "Out of date PPD cache file." msgstr "PPD キャッシュファイルが古すぎます。" -#: cups/ppd-cache.c:1444 +#: cups/ppd-cache.c:1410 msgid "Out of memory." msgstr "メモリーが足りません。" -#: cups/ppd.c:795 cups/ppd.c:1363 +#: cups/ppd.c:753 cups/ppd.c:1319 msgid "Output Mode" msgstr "出力モード" @@ -4987,7 +4986,7 @@ msgid "PASS" msgstr "合格" -#: ppdc/sample.c:260 +#: ppdc/sample.c:252 msgid "PCL Laser Printer" msgstr "PCL レーザープリンター" @@ -5015,23 +5014,23 @@ msgid "PRC32K Oversize Long Edge" msgstr "PRC32K (特大) 長辺送り" -#: cups/snmp.c:1010 +#: cups/snmp.c:966 msgid "Packet does not contain a Get-Response-PDU" msgstr "パケットが Get-Response-PDU を含んでいません" -#: cups/snmp.c:989 +#: cups/snmp.c:945 msgid "Packet does not start with SEQUENCE" msgstr "パケットが SEQUENCE から始まりません" -#: ppdc/sample.c:360 +#: ppdc/sample.c:355 msgid "ParamCustominCutInterval" msgstr "ParamCustominCutInterval" -#: ppdc/sample.c:358 +#: ppdc/sample.c:353 msgid "ParamCustominTearInterval" msgstr "ParamCustominTearInterval" -#: cups/auth.c:206 cups/auth.c:374 +#: cups/auth.c:195 cups/auth.c:362 #, c-format msgid "Password for %s on %s? " msgstr "%s のパスワード (%s 上)? " @@ -5041,15 +5040,15 @@ msgid "Password for %s required to access %s via SAMBA: " msgstr "%s のパスワード (SAMBA 経由で %s にアクセスするのに必要): " -#: cgi-bin/classes.c:167 +#: cgi-bin/classes.c:159 msgid "Pause Class" msgstr "クラスの休止" -#: cgi-bin/printers.c:170 +#: cgi-bin/printers.c:162 msgid "Pause Printer" msgstr "プリンターの休止" -#: ppdc/sample.c:448 +#: ppdc/sample.c:443 msgid "Peel-Off" msgstr "Peel-Off" @@ -5061,19 +5060,19 @@ msgid "Photo Labels" msgstr "写真ラベル" -#: ppdc/sample.c:286 +#: ppdc/sample.c:281 msgid "Plain Paper" msgstr "普通紙" -#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580 +#: cgi-bin/admin.c:3279 cgi-bin/admin.c:3560 msgid "Policies" msgstr "ポリシー" -#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662 +#: cgi-bin/admin.c:3286 cgi-bin/admin.c:3629 cgi-bin/admin.c:3642 msgid "Port Monitor" msgstr "ポートモニター" -#: ppdc/sample.c:278 +#: ppdc/sample.c:270 msgid "PostScript Printer" msgstr "PostScript プリンター" @@ -5093,11 +5092,11 @@ msgid "Postcard Long Edge" msgstr "ハガキ 長辺送り" -#: backend/ipp.c:921 backend/ipp.c:929 +#: backend/ipp.c:961 backend/ipp.c:969 msgid "Preparing to print." msgstr "印刷準備中です。" -#: ppdc/sample.c:295 +#: ppdc/sample.c:290 msgid "Print Density" msgstr "印刷密度" @@ -5105,79 +5104,79 @@ msgid "Print Job:" msgstr "ジョブの印刷:" -#: ppdc/sample.c:340 +#: ppdc/sample.c:335 msgid "Print Mode" msgstr "印刷モード" -#: ppdc/sample.c:383 +#: ppdc/sample.c:378 msgid "Print Rate" msgstr "印刷レート" -#: cgi-bin/printers.c:179 +#: cgi-bin/printers.c:171 msgid "Print Self-Test Page" msgstr "セルフテストページの印刷" -#: ppdc/sample.c:327 +#: ppdc/sample.c:322 msgid "Print Speed" msgstr "印刷速度" -#: cgi-bin/ipp-var.c:792 +#: cgi-bin/ipp-var.c:777 msgid "Print Test Page" msgstr "テストページの印刷" -#: ppdc/sample.c:356 +#: ppdc/sample.c:351 msgid "Print and Cut" msgstr "プリントしてカット" -#: ppdc/sample.c:344 +#: ppdc/sample.c:339 msgid "Print and Tear" msgstr "プリントして切り取る" -#: backend/socket.c:434 backend/usb-unix.c:191 +#: backend/socket.c:429 backend/usb-unix.c:184 msgid "Print file sent." msgstr "プリントファイルが送られました。" -#: backend/ipp.c:2113 +#: backend/ipp.c:2172 msgid "Print job canceled at printer." msgstr "印刷ジョブはプリンターでキャンセルされました。" -#: backend/ipp.c:2105 +#: backend/ipp.c:2164 msgid "Print job too large." msgstr "印刷ジョブが大きすぎます。" -#: backend/ipp.c:1602 +#: backend/ipp.c:1642 msgid "Print job was not accepted." -msgstr "印刷ジョブが受付されませんでした。" +msgstr "印刷ジョブが受け付けられませんでした。" -#: cgi-bin/ipp-var.c:1047 +#: cgi-bin/ipp-var.c:1027 msgid "Printer Added" msgstr "追加されたプリンター" -#: ppdc/sample.c:263 +#: ppdc/sample.c:255 msgid "Printer Default" msgstr "デフォルトのプリンター" -#: cgi-bin/ipp-var.c:1051 +#: cgi-bin/ipp-var.c:1031 msgid "Printer Deleted" msgstr "削除されたプリンター" -#: cgi-bin/ipp-var.c:1049 +#: cgi-bin/ipp-var.c:1029 msgid "Printer Modified" msgstr "変更されたプリンター" -#: cgi-bin/ipp-var.c:1045 +#: cgi-bin/ipp-var.c:1025 msgid "Printer Paused" msgstr "プリンターの休止" -#: ppdc/sample.c:294 +#: ppdc/sample.c:289 msgid "Printer Settings" msgstr "プリンター設定" -#: backend/ipp.c:2108 +#: backend/ipp.c:2167 msgid "Printer cannot print supplied content." msgstr "プリンターは受信した内容を印刷できませんでした。" -#: backend/ipp.c:2111 +#: backend/ipp.c:2170 msgid "Printer cannot print with supplied options." msgstr "指定されたオプションではプリンターは印刷できません。" @@ -5185,7 +5184,7 @@ msgid "Printer:" msgstr "プリンター:" -#: cgi-bin/printers.c:204 cgi-bin/printers.c:332 +#: cgi-bin/printers.c:196 cgi-bin/printers.c:324 msgid "Printers" msgstr "プリンター" @@ -5203,11 +5202,11 @@ msgid "Quarto" msgstr "Quarto" -#: scheduler/ipp.c:1505 scheduler/ipp.c:10484 +#: scheduler/ipp.c:1485 scheduler/ipp.c:10567 msgid "Quota limit reached." msgstr "クォータの制限に達しました。" -#: berkeley/lpq.c:520 +#: berkeley/lpq.c:490 msgid "Rank Owner Job File(s) Total Size" msgstr "ランク 所有者 ジョブ ファイル 合計サイズ" @@ -5217,37 +5216,37 @@ "Rank Owner Pri Job Files Total Size" msgstr "ランク 所有者 優先 ジョブ ファイル 合計サイズ" -#: cgi-bin/classes.c:171 cgi-bin/printers.c:174 +#: cgi-bin/classes.c:163 cgi-bin/printers.c:166 msgid "Reject Jobs" msgstr "ジョブの拒否" -#: backend/lpd.c:1033 backend/lpd.c:1165 +#: backend/lpd.c:1024 backend/lpd.c:1156 #, c-format msgid "Remote host did not accept control file (%d)." msgstr "リモートホストがコントロールファイルを受け付けませんでした (%d)。" -#: backend/lpd.c:1118 +#: backend/lpd.c:1109 #, c-format msgid "Remote host did not accept data file (%d)." msgstr "リモートホストがデータファイルを受け付けませんでした (%d)。" -#: ppdc/sample.c:428 +#: ppdc/sample.c:423 msgid "Reprint After Error" msgstr "エラー後の再印刷" -#: cups/http-support.c:1387 +#: cups/http-support.c:1375 msgid "Request Entity Too Large" msgstr "要求するエンティティが大きすぎます" -#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231 +#: cups/ppd.c:755 cups/ppd.c:1321 ppdc/sample.c:231 msgid "Resolution" msgstr "解像度" -#: cgi-bin/classes.c:165 +#: cgi-bin/classes.c:157 msgid "Resume Class" msgstr "クラスを再開する" -#: cgi-bin/printers.c:167 +#: cgi-bin/printers.c:159 msgid "Resume Printer" msgstr "プリンターを再開する" @@ -5255,69 +5254,69 @@ msgid "Return Address" msgstr "返信用ラベル" -#: ppdc/sample.c:449 +#: ppdc/sample.c:444 msgid "Rewind" msgstr "巻き取り" -#: cups/adminutil.c:2052 +#: cups/adminutil.c:2041 #, c-format msgid "Running command: %s %s -N -A %s -c '%s'" msgstr "コマンドを実行中: %s %s -N -A %s -c '%s'" -#: cups/snmp.c:991 +#: cups/snmp.c:947 msgid "SEQUENCE uses indefinite length" msgstr "SEQUENCE は不定長を使用しています" -#: cups/http-support.c:1411 +#: cups/http-support.c:1399 msgid "SSL/TLS Negotiation Error" msgstr "SSL/TLS のネゴシエーションエラー" -#: cups/http-support.c:1368 +#: cups/http-support.c:1356 msgid "See Other" msgstr "残りを見てください" -#: backend/usb-darwin.c:552 backend/usb-libusb.c:366 +#: backend/usb-darwin.c:552 backend/usb-libusb.c:346 msgid "Sending data to printer." msgstr "データをプリンターに送信しています。" -#: cgi-bin/ipp-var.c:1061 +#: cgi-bin/ipp-var.c:1041 msgid "Server Restarted" msgstr "再起動されたサーバー" -#: cgi-bin/ipp-var.c:1067 +#: cgi-bin/ipp-var.c:1047 msgid "Server Security Auditing" msgstr "サーバーのセキュリティー監査" -#: cgi-bin/ipp-var.c:1063 +#: cgi-bin/ipp-var.c:1043 msgid "Server Started" msgstr "開始されたサーバー" -#: cgi-bin/ipp-var.c:1065 +#: cgi-bin/ipp-var.c:1045 msgid "Server Stopped" msgstr "停止されたサーバー" -#: cups/http-support.c:1405 +#: cups/http-support.c:1393 msgid "Service Unavailable" msgstr "利用できないサービス" -#: cgi-bin/admin.c:2786 cgi-bin/admin.c:2832 cgi-bin/admin.c:2989 -#: cgi-bin/admin.c:3008 +#: cgi-bin/admin.c:2766 cgi-bin/admin.c:2812 cgi-bin/admin.c:2969 +#: cgi-bin/admin.c:2988 msgid "Set Allowed Users" msgstr "許可するユーザーの設定" -#: cgi-bin/admin.c:3035 +#: cgi-bin/admin.c:3015 msgid "Set As Server Default" msgstr "サーバーのデフォルトに設定" -#: cgi-bin/admin.c:3135 +#: cgi-bin/admin.c:3115 msgid "Set Class Options" msgstr "クラスオプションの設定" -#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691 +#: cgi-bin/admin.c:3115 cgi-bin/admin.c:3289 cgi-bin/admin.c:3671 msgid "Set Printer Options" msgstr "プリンターオプションの設定" -#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923 +#: cgi-bin/admin.c:3841 cgi-bin/admin.c:3885 cgi-bin/admin.c:3903 msgid "Set Publishing" msgstr "公開の設定" @@ -5325,30 +5324,30 @@ msgid "Shipping Address" msgstr "発送先ラベル" -#: ppdc/sample.c:273 +#: ppdc/sample.c:265 msgid "Short-Edge (Landscape)" msgstr "短辺 (横原稿)" -#: ppdc/sample.c:288 +#: ppdc/sample.c:283 msgid "Special Paper" msgstr "特殊紙" -#: backend/lpd.c:1074 +#: backend/lpd.c:1065 #, c-format msgid "Spooling job, %.0f%% complete." msgstr "ジョブをスプール中、%.0f%% 完了しました。" -#: ppdc/sample.c:341 +#: ppdc/sample.c:336 msgid "Standard" msgstr "標準" #. TRANSLATORS: Banner/cover sheet before the print job. -#: cgi-bin/admin.c:3552 +#: cgi-bin/admin.c:3532 msgid "Starting Banner" msgstr "開始バナー" -#: filter/rastertoepson.c:1069 filter/rastertohp.c:793 -#: filter/rastertolabel.c:1219 +#: filter/rastertoepson.c:1054 filter/rastertohp.c:782 +#: filter/rastertolabel.c:1211 #, c-format msgid "Starting page %d." msgstr "ページ %d を開始しています。" @@ -5365,13 +5364,13 @@ msgid "Stylus Photo Series" msgstr "Stylus Photo シリーズ" -#: scheduler/ipp.c:3584 scheduler/ipp.c:6504 scheduler/ipp.c:7203 -#: scheduler/ipp.c:8703 +#: scheduler/ipp.c:3564 scheduler/ipp.c:6590 scheduler/ipp.c:7289 +#: scheduler/ipp.c:8790 #, c-format msgid "Subscription #%d does not exist." msgstr "サブスクリプション番号 %d は存在しません。" -#: test/ippfind.c:2786 +#: test/ippfind.c:2798 msgid "Substitutions:" msgstr "置換:" @@ -5387,7 +5386,7 @@ msgid "Super B/A3" msgstr "スーパー B/A3" -#: cups/http-support.c:1350 +#: cups/http-support.c:1338 msgid "Switching Protocols" msgstr "プロトコルの変更" @@ -5403,94 +5402,94 @@ msgid "Tabloid Oversize Long Edge" msgstr "タブロイド (特大) 長辺送り" -#: ppdc/sample.c:342 +#: ppdc/sample.c:337 msgid "Tear" msgstr "Tear" -#: ppdc/sample.c:447 +#: ppdc/sample.c:442 msgid "Tear-Off" msgstr "Tear-Off" -#: ppdc/sample.c:388 +#: ppdc/sample.c:383 msgid "Tear-Off Adjust Position" msgstr "Tear-Off 位置調節" -#: scheduler/ipp.c:1341 +#: scheduler/ipp.c:1321 #, c-format msgid "The \"%s\" attribute is required for print jobs." msgstr "印刷ジョブに \"%s\" 属性が必要です。" -#: scheduler/ipp.c:6219 scheduler/ipp.c:6297 scheduler/ipp.c:6313 -#: scheduler/ipp.c:6331 +#: scheduler/ipp.c:6250 scheduler/ipp.c:6330 scheduler/ipp.c:6343 +#: scheduler/ipp.c:6355 scheduler/ipp.c:6370 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "%s 属性は、ジョブ ID と一緒に使うことはできません。" -#: scheduler/ipp.c:1317 +#: scheduler/ipp.c:1297 #, c-format msgid "" "The '%s' Job Description attribute cannot be supplied in a job creation " "request." msgstr "'%s' Job Description 属性はジョブ作成要求の中で指定できません。" -#: scheduler/ipp.c:5157 +#: scheduler/ipp.c:5183 #, c-format msgid "" "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "%s 操作属性は、Create-Job リクエストの中で使うことはできません。" -#: scheduler/ipp.c:6734 +#: scheduler/ipp.c:6820 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "PPD ファイル \"%s\" が見つかりません。" -#: scheduler/ipp.c:6721 +#: scheduler/ipp.c:6807 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "PPD ファイル \"%s\" を開けませんでした: %s" -#: filter/rastertoepson.c:1038 filter/rastertohp.c:764 -#: filter/rastertolabel.c:1183 +#: filter/rastertoepson.c:1023 filter/rastertohp.c:753 +#: filter/rastertolabel.c:1175 msgid "The PPD file could not be opened." msgstr "PPD ファイルを開けませんでした。" -#: cgi-bin/admin.c:749 +#: cgi-bin/admin.c:727 msgid "" "The class name may only contain up to 127 printable characters and may not " "contain spaces, slashes (/), or the pound sign (#)." msgstr "クラス名は 127 文字以内の表示可能文字からなり、空白、スラッシュ (/)、シャープ (#) を含んではなりません。" -#: cups/localize.c:353 +#: cups/localize.c:338 msgid "The developer unit needs to be replaced." msgstr "現像ユニットの交換が必要です。" -#: cups/localize.c:351 +#: cups/localize.c:336 msgid "The developer unit will need to be replaced soon." msgstr "もうすぐ現像ユニットの交換時期です。" -#: cups/localize.c:343 +#: cups/localize.c:328 msgid "The fuser's temperature is high." msgstr "定着器の温度が高すぎます。" -#: cups/localize.c:345 +#: cups/localize.c:330 msgid "The fuser's temperature is low." msgstr "定着器の温度が低すぎます。" -#: scheduler/ipp.c:2107 +#: scheduler/ipp.c:2088 msgid "" "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "notify-lease-duration 属性は、ジョブサブスクリプションと一緒に使うことはできません。" -#: scheduler/ipp.c:2090 scheduler/ipp.c:5473 +#: scheduler/ipp.c:2071 scheduler/ipp.c:5499 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "notify-user-data 値が大きすぎます (%d > 63 オクテット)。" -#: cups/localize.c:349 +#: cups/localize.c:334 msgid "The optical photoconductor needs to be replaced." msgstr "感光体の交換が必要です。" -#: cups/localize.c:347 +#: cups/localize.c:332 msgid "The optical photoconductor will need to be replaced soon." msgstr "もうすぐ感光体の交換時期です。" @@ -5522,39 +5521,39 @@ msgid "The paper tray needs to be filled." msgstr "用紙トレイに補充が必要です。" -#: backend/ipp.c:941 +#: backend/ipp.c:981 msgid "" "The printer configuration is incorrect or the printer no longer exists." msgstr "プリンターの設定が正しくないかプリンターはすでに存在しません。" -#: backend/lpd.c:636 backend/lpd.c:1026 backend/lpd.c:1108 backend/lpd.c:1158 +#: backend/lpd.c:627 backend/lpd.c:1017 backend/lpd.c:1099 backend/lpd.c:1149 msgid "The printer did not respond." msgstr "プリンターが応答しません。" -#: backend/ipp.c:784 backend/ipp.c:904 backend/ipp.c:1018 backend/ipp.c:1409 -#: backend/ipp.c:1574 backend/lpd.c:845 backend/socket.c:384 -#: backend/usb-unix.c:131 backend/usb-unix.c:423 backend/usb-unix.c:506 +#: backend/ipp.c:825 backend/ipp.c:944 backend/ipp.c:1058 backend/ipp.c:1449 +#: backend/ipp.c:1614 backend/lpd.c:836 backend/socket.c:379 +#: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497 msgid "The printer is in use." msgstr "プリンターは使用中です。" -#: backend/runloop.c:254 backend/runloop.c:374 cups/localize.c:311 +#: backend/runloop.c:243 backend/runloop.c:363 cups/localize.c:296 msgid "The printer is not connected." msgstr "プリンターは接続されていません。" -#: backend/ipp.c:762 backend/ipp.c:795 backend/ipp.c:900 backend/lpd.c:824 -#: backend/lpd.c:865 backend/socket.c:363 backend/socket.c:396 +#: backend/ipp.c:803 backend/ipp.c:836 backend/ipp.c:940 backend/lpd.c:815 +#: backend/lpd.c:856 backend/socket.c:358 backend/socket.c:391 msgid "The printer is not responding." msgstr "プリンターが応答していません。" -#: backend/runloop.c:396 +#: backend/runloop.c:385 msgid "The printer is now connected." msgstr "プリンターが接続されました。" -#: backend/usb-darwin.c:1299 +#: backend/usb-darwin.c:1300 msgid "The printer is now online." msgstr "プリンターは現在オンラインです。" -#: backend/usb-darwin.c:1320 +#: backend/usb-darwin.c:1321 msgid "The printer is offline." msgstr "プリンターはオフラインです。" @@ -5566,101 +5565,101 @@ msgid "The printer is running low on toner." msgstr "プリンターのトナーがもうすぐなくなります。" -#: backend/ipp.c:777 backend/lpd.c:838 backend/socket.c:377 +#: backend/ipp.c:818 backend/lpd.c:829 backend/socket.c:372 msgid "The printer is unreachable at this time." msgstr "プリンターには現在到達できません。" -#: cups/localize.c:337 +#: cups/localize.c:322 msgid "The printer may be out of ink." msgstr "プリンターのインクがなくなっているようです。" -#: cups/localize.c:315 +#: cups/localize.c:300 msgid "The printer may be out of toner." msgstr "プリンターのトナーがなくなっているようです。" -#: backend/ipp.c:771 backend/lpd.c:832 backend/socket.c:371 +#: backend/ipp.c:812 backend/lpd.c:823 backend/socket.c:366 msgid "The printer may not exist or is unavailable at this time." msgstr "プリンターは現在存在しないか、使用できないようです。" -#: cgi-bin/admin.c:931 +#: cgi-bin/admin.c:909 msgid "" "The printer name may only contain up to 127 printable characters and may not " "contain spaces, slashes (/), or the pound sign (#)." -msgstr "プリンター名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ポンド記号 (#) を含んではなりません。" +msgstr "プリンター名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ハッシュ (#) を含んではなりません。" -#: scheduler/ipp.c:808 scheduler/ipp.c:1068 scheduler/ipp.c:3225 -#: scheduler/ipp.c:3404 scheduler/ipp.c:5140 scheduler/ipp.c:5307 -#: scheduler/ipp.c:5621 scheduler/ipp.c:6185 scheduler/ipp.c:6939 -#: scheduler/ipp.c:6995 scheduler/ipp.c:7309 scheduler/ipp.c:7575 -#: scheduler/ipp.c:7664 scheduler/ipp.c:7697 scheduler/ipp.c:8020 -#: scheduler/ipp.c:8413 scheduler/ipp.c:8495 scheduler/ipp.c:9662 -#: scheduler/ipp.c:10116 scheduler/ipp.c:10447 scheduler/ipp.c:10529 -#: scheduler/ipp.c:10903 +#: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205 +#: scheduler/ipp.c:3384 scheduler/ipp.c:5166 scheduler/ipp.c:5333 +#: scheduler/ipp.c:5647 scheduler/ipp.c:6216 scheduler/ipp.c:7025 +#: scheduler/ipp.c:7081 scheduler/ipp.c:7395 scheduler/ipp.c:7661 +#: scheduler/ipp.c:7750 scheduler/ipp.c:7783 scheduler/ipp.c:8106 +#: scheduler/ipp.c:8500 scheduler/ipp.c:8582 scheduler/ipp.c:9747 +#: scheduler/ipp.c:10199 scheduler/ipp.c:10530 scheduler/ipp.c:10612 +#: scheduler/ipp.c:10987 msgid "The printer or class does not exist." msgstr "プリンターまたはクラスは存在しません。" -#: scheduler/ipp.c:1254 +#: scheduler/ipp.c:1234 msgid "The printer or class is not shared." msgstr "プリンターまたはクラスは共有できません。" -#: cups/localize.c:317 +#: cups/localize.c:302 msgid "The printer's cover is open." msgstr "プリンターのカバーが開いています。" -#: cups/localize.c:321 +#: cups/localize.c:306 msgid "The printer's door is open." msgstr "プリンターのドアが開いています。" -#: cups/localize.c:319 +#: cups/localize.c:304 msgid "The printer's interlock is open." msgstr "プリンターのインターロックが開いています。" -#: cups/localize.c:339 +#: cups/localize.c:324 msgid "The printer's waste bin is almost full." msgstr "プリンターの廃インクまたは廃トナー容器がほとんど一杯です。" -#: cups/localize.c:341 +#: cups/localize.c:326 msgid "The printer's waste bin is full." msgstr "プリンターの廃インクまたは廃トナー容器が一杯です。" -#: scheduler/ipp.c:914 scheduler/ipp.c:2271 +#: scheduler/ipp.c:894 scheduler/ipp.c:2252 #, c-format msgid "The printer-uri \"%s\" contains invalid characters." msgstr "printer-uri \"%s\" には、無効な文字が含まれています。" -#: scheduler/ipp.c:3202 +#: scheduler/ipp.c:3182 msgid "The printer-uri attribute is required." msgstr "printer-uri 属性は必須です。" -#: scheduler/ipp.c:898 +#: scheduler/ipp.c:878 msgid "" "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." msgstr "printer-uri は、\"ipp://ホスト名/classes/クラス名\" 形式でなければなりません。" -#: scheduler/ipp.c:2255 +#: scheduler/ipp.c:2236 msgid "" "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." msgstr "printer-uri は \"ipp://ホスト名/printers/プリンター名\" 形式でなければなりません。" -#: cgi-bin/admin.c:474 +#: cgi-bin/admin.c:452 msgid "" "The subscription name may not contain spaces, slashes (/), question marks " "(?), or the pound sign (#)." -msgstr "サブスクリプション名には、スペース、スラッシュ (/)、疑問府 (?)、ポンド記号 (#) を使用しないでください。" +msgstr "サブスクリプション名には、スペース、スラッシュ (/)、疑問府 (?)、ハッシュ (#) を使用しないでください。" -#: scheduler/client.c:2533 +#: scheduler/client.c:2232 msgid "" "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to " "enable it." msgstr "" "Web インターフェイスが現在無効になっています。有効にするには \"cupsctl WebInterface=yes\" を実行してください。" -#: scheduler/ipp.c:6280 +#: scheduler/ipp.c:6314 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "which-jobs の値 \"%s\" はサポートされていません。" -#: scheduler/ipp.c:5551 +#: scheduler/ipp.c:5577 msgid "There are too many subscriptions." msgstr "サブスクリプションが多すぎます。" @@ -5669,53 +5668,53 @@ msgstr "用紙づまりが発生しています。" #: backend/usb-darwin.c:386 backend/usb-darwin.c:445 backend/usb-darwin.c:514 -#: backend/usb-darwin.c:535 backend/usb-libusb.c:291 backend/usb-libusb.c:345 +#: backend/usb-darwin.c:535 backend/usb-libusb.c:271 backend/usb-libusb.c:325 msgid "There was an unrecoverable USB error." msgstr "回復不可能な USB のエラーが発生しています。" -#: ppdc/sample.c:435 +#: ppdc/sample.c:430 msgid "Thermal Transfer Media" msgstr "熱転写メディア" -#: scheduler/ipp.c:1499 +#: scheduler/ipp.c:1479 msgid "Too many active jobs." msgstr "アクティブなジョブが多すぎます。" -#: scheduler/ipp.c:1393 +#: scheduler/ipp.c:1373 #, c-format msgid "Too many job-sheets values (%d > 2)." msgstr "job-sheets 値が多すぎます (%d > 2)。" -#: scheduler/ipp.c:2556 +#: scheduler/ipp.c:2537 #, c-format msgid "Too many printer-state-reasons values (%d > %d)." msgstr "printer-state-reasons 値が多すぎます (%d > %d)。" -#: ppdc/sample.c:289 +#: ppdc/sample.c:284 msgid "Transparency" msgstr "OHP シート" -#: ppdc/sample.c:284 +#: ppdc/sample.c:279 msgid "Tray" msgstr "トレイ" -#: ppdc/sample.c:264 +#: ppdc/sample.c:256 msgid "Tray 1" msgstr "トレイ 1" -#: ppdc/sample.c:265 +#: ppdc/sample.c:257 msgid "Tray 2" msgstr "トレイ 2" -#: ppdc/sample.c:266 +#: ppdc/sample.c:258 msgid "Tray 3" msgstr "トレイ 3" -#: ppdc/sample.c:267 +#: ppdc/sample.c:259 msgid "Tray 4" msgstr "トレイ 4" -#: cups/http-support.c:1390 +#: cups/http-support.c:1378 msgid "URI Too Long" msgstr "URI が長すぎます" @@ -5751,7 +5750,7 @@ msgid "US Letter Small" msgstr "US レター (小)" -#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996 +#: cgi-bin/admin.c:1939 cgi-bin/admin.c:1952 cgi-bin/admin.c:1976 msgid "Unable to access cupsd.conf file" msgstr "cupsd.conf ファイルにアクセスできません" @@ -5759,230 +5758,230 @@ msgid "Unable to access help file." msgstr "ヘルプファイルにアクセスできません。" -#: cgi-bin/admin.c:526 +#: cgi-bin/admin.c:504 msgid "Unable to add RSS subscription" msgstr "RSS 購読を追加できません" -#: cgi-bin/admin.c:814 +#: cgi-bin/admin.c:792 msgid "Unable to add class" msgstr "クラスを追加できません" -#: backend/ipp.c:1757 +#: backend/ipp.c:1796 msgid "Unable to add document to print job." msgstr "ドキュメントを印刷ジョブに追加できません。" -#: scheduler/ipp.c:1558 +#: scheduler/ipp.c:1537 #, c-format msgid "Unable to add job for destination \"%s\"." msgstr "宛先 \"%s\"にジョブを追加できません。" -#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419 +#: cgi-bin/admin.c:1037 cgi-bin/admin.c:1399 msgid "Unable to add printer" msgstr "プリンターを追加できません" -#: scheduler/ipp.c:1184 +#: scheduler/ipp.c:1164 msgid "Unable to allocate memory for file types." msgstr "ファイルタイプ用にメモリーを割り当てられません。" -#: filter/pstops.c:451 +#: filter/pstops.c:418 msgid "Unable to allocate memory for page info" msgstr "ページ情報のメモリー割り当てができません" -#: filter/pstops.c:445 +#: filter/pstops.c:412 msgid "Unable to allocate memory for pages array" msgstr "ページアレイのメモリー割り当てができません" -#: cgi-bin/admin.c:1525 +#: cgi-bin/admin.c:1505 msgid "Unable to cancel RSS subscription" msgstr "RSS 購読をキャンセルできません" -#: backend/ipp.c:2160 +#: backend/ipp.c:2077 backend/ipp.c:2512 msgid "Unable to cancel print job." msgstr "プリンターを変更できません。" -#: cgi-bin/admin.c:2990 +#: cgi-bin/admin.c:2970 msgid "Unable to change printer" msgstr "プリンターを変更できません" -#: cgi-bin/admin.c:3906 +#: cgi-bin/admin.c:3886 msgid "Unable to change printer-is-shared attribute" msgstr "printer-is-shared 属性を変更することができません" -#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799 +#: cgi-bin/admin.c:1637 cgi-bin/admin.c:1779 msgid "Unable to change server settings" msgstr "サーバーの設定を変更できません" -#: cups/ipp.c:5416 +#: cups/ipp.c:5389 #, c-format msgid "Unable to compile mimeMediaType regular expression: %s." msgstr "mimeMediaType の正規表現を解釈できませんでした: %s。" -#: cups/ipp.c:5362 +#: cups/ipp.c:5335 #, c-format msgid "Unable to compile naturalLanguage regular expression: %s." msgstr "naturalLanguage の正規表現を解釈できませんでした: %s。" -#: filter/commandtops.c:420 +#: filter/commandtops.c:407 msgid "Unable to configure printer options." msgstr "プリンターオプションを設定できません。" -#: cups/adminutil.c:911 cups/request.c:1082 +#: cups/adminutil.c:900 cups/request.c:1066 msgid "Unable to connect to host." msgstr "ホストに接続できません。" -#: backend/ipp.c:740 backend/ipp.c:1214 backend/lpd.c:804 backend/socket.c:343 -#: backend/usb-unix.c:117 +#: backend/ipp.c:781 backend/ipp.c:1254 backend/lpd.c:795 backend/socket.c:338 +#: backend/usb-unix.c:110 msgid "Unable to contact printer, queuing on next printer in class." msgstr "プリンターと交信できません。クラス内の次のプリンターにキューします。" -#: cups/adminutil.c:726 +#: cups/adminutil.c:715 #, c-format msgid "Unable to copy 64-bit CUPS printer driver files (%d)." msgstr "64-bit 版の CUPS プリンタードライバーファイルをコピーできません (%d)。" -#: cups/adminutil.c:691 +#: cups/adminutil.c:680 #, c-format msgid "Unable to copy 64-bit Windows printer driver files (%d)." msgstr "64-bit 版の Windows プリンタードライバーをコピーできません (%d)。" -#: cups/adminutil.c:522 +#: cups/adminutil.c:511 #, c-format msgid "Unable to copy CUPS printer driver files (%d)." msgstr "複数の CUPS プリンタードライバーファイルをコピーできません (%d)。" -#: scheduler/ipp.c:2676 +#: scheduler/ipp.c:2657 #, c-format msgid "Unable to copy PPD file - %s" msgstr "PPD ファイルをコピーできません - %s" -#: scheduler/ipp.c:2731 +#: scheduler/ipp.c:2712 msgid "Unable to copy PPD file." msgstr "PPD ファイルをコピーできません。" -#: cups/adminutil.c:487 +#: cups/adminutil.c:476 #, c-format msgid "Unable to copy Windows 2000 printer driver files (%d)." msgstr "複数の Windows 2000 プリンタードライバーファイルをコピーできません (%d)。" -#: cups/adminutil.c:610 +#: cups/adminutil.c:599 #, c-format msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。" -#: scheduler/ipp.c:2653 +#: scheduler/ipp.c:2634 #, c-format msgid "Unable to copy interface script - %s" msgstr "インターフェイススクリプトをコピーできません - %s" -#: cups/util.c:605 cups/util.c:1667 +#: cups/util.c:496 cups/util.c:1479 msgid "Unable to create printer-uri" -msgstr "printer-uri を作成できません。" +msgstr "printer-uri を作成できません" -#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1262 +#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1290 msgid "Unable to create temporary file" msgstr "テンポラリーファイルを作成できません" -#: cgi-bin/admin.c:2153 +#: cgi-bin/admin.c:2133 msgid "Unable to delete class" msgstr "クラスを削除できません" -#: cgi-bin/admin.c:2238 +#: cgi-bin/admin.c:2218 msgid "Unable to delete printer" msgstr "プリンターを削除できません" -#: cgi-bin/classes.c:260 cgi-bin/printers.c:269 +#: cgi-bin/classes.c:252 cgi-bin/printers.c:261 msgid "Unable to do maintenance command" msgstr "メンテナンスコマンドを実行できません" -#: cgi-bin/admin.c:1974 +#: cgi-bin/admin.c:1954 msgid "Unable to edit cupsd.conf files larger than 1MB" -msgstr "1MB 以上の cupsd.conf ファイルは編集できません。" +msgstr "1MB 以上の cupsd.conf ファイルは編集できません" -#: cups/http.c:5354 +#: cups/tls-darwin.c:1284 msgid "" "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "ホストへの安全な接続が確立できません (認証パスが無効です)。" -#: cups/http.c:5344 +#: cups/tls-darwin.c:1274 msgid "" "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "ホストへの安全な接続が確立できません (認証がまだ有効ではありません)。" -#: cups/http.c:5339 +#: cups/tls-darwin.c:1269 msgid "" "Unable to establish a secure connection to host (expired certificate)." msgstr "ホストへの安全な接続が確立できません (認証が期限切れです)。" -#: cups/http.c:5349 +#: cups/tls-darwin.c:1279 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "ホストへの安全な接続が確立できません (ホスト名が一致しません)。" -#: cups/http.c:5359 +#: cups/tls-darwin.c:1289 msgid "" "Unable to establish a secure connection to host (peer dropped connection " "before responding)." msgstr "ホストへの安全な接続が確立できません (応答がある前に接続が切断されました)。" -#: cups/http.c:5334 +#: cups/tls-darwin.c:1264 msgid "" "Unable to establish a secure connection to host (self-signed certificate)." msgstr "ホストへの安全な接続が確立できません (自己署名証明書です)。" -#: cups/http.c:5329 +#: cups/tls-darwin.c:1259 msgid "" "Unable to establish a secure connection to host (untrusted certificate)." msgstr "ホストへの安全な接続が確立できません (信用できない証明書です)。" -#: cups/http.c:5130 cups/http.c:5386 cups/http.c:5423 cups/http.c:5442 +#: cups/tls-darwin.c:1316 cups/tls-sspi.c:1247 cups/tls-sspi.c:1264 msgid "Unable to establish a secure connection to host." msgstr "ホストへの安全な接続を確立できません。" -#: cgi-bin/ipp-var.c:365 +#: cgi-bin/ipp-var.c:350 msgid "Unable to find destination for job" msgstr "ジョブの宛先が見つかりません" -#: cups/http-support.c:1830 +#: cups/http-support.c:1949 msgid "Unable to find printer." msgstr "プリンターが見つかりません。" -#: backend/ipp.c:3435 +#: backend/ipp.c:3493 msgid "Unable to get backend exit status." msgstr "バックエンドの終了ステータスを取得できません。" -#: cgi-bin/classes.c:450 +#: cgi-bin/classes.c:442 msgid "Unable to get class list" msgstr "クラスリストを取得できません" -#: cgi-bin/classes.c:549 +#: cgi-bin/classes.c:541 msgid "Unable to get class status" msgstr "クラスの状態を取得できません。" -#: cgi-bin/admin.c:1320 +#: cgi-bin/admin.c:1300 msgid "Unable to get list of printer drivers" msgstr "プリンタードライバーのリストを取得できません" -#: cgi-bin/admin.c:2840 +#: cgi-bin/admin.c:2820 msgid "Unable to get printer attributes" msgstr "プリンター属性を取得できません" -#: cgi-bin/printers.c:467 +#: cgi-bin/printers.c:459 msgid "Unable to get printer list" msgstr "プリンターリストを取得できません" -#: cgi-bin/printers.c:569 +#: cgi-bin/printers.c:561 msgid "Unable to get printer status" msgstr "プリンターの状態を取得できません" -#: backend/ipp.c:965 +#: backend/ipp.c:1005 msgid "Unable to get printer status." msgstr "プリンターの状態を取得できません。" -#: cups/adminutil.c:565 cups/adminutil.c:769 +#: cups/adminutil.c:554 cups/adminutil.c:758 #, c-format msgid "Unable to install Windows 2000 printer driver files (%d)." msgstr "複数の Windows 2000 プリンタードライバーファイルをインストールできません (%d)。" -#: cups/adminutil.c:639 +#: cups/adminutil.c:628 #, c-format msgid "Unable to install Windows 9x printer driver files (%d)." msgstr "複数の Windows 9x プリンタードライバーファイルをインストールできません (%d)。" @@ -5991,45 +5990,45 @@ msgid "Unable to load help index." msgstr "ヘルプの索引を読み込めません。" -#: backend/ipp.c:665 backend/lpd.c:435 backend/socket.c:282 +#: backend/ipp.c:668 backend/lpd.c:426 backend/socket.c:277 #, c-format msgid "Unable to locate printer \"%s\"." msgstr "プリンター \"%s\" が見つかりません。" -#: backend/dnssd.c:790 backend/ipp.c:334 backend/lpd.c:205 -#: backend/socket.c:168 +#: backend/dnssd.c:787 backend/ipp.c:336 backend/lpd.c:196 +#: backend/socket.c:163 msgid "Unable to locate printer." msgstr "プリンターが見つかりません。" -#: cgi-bin/admin.c:813 +#: cgi-bin/admin.c:791 msgid "Unable to modify class" msgstr "クラスを変更できません" -#: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418 +#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1398 msgid "Unable to modify printer" msgstr "プリンターを変更できません" -#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521 +#: cgi-bin/ipp-var.c:417 cgi-bin/ipp-var.c:506 msgid "Unable to move job" msgstr "ジョブを移動できません" -#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523 +#: cgi-bin/ipp-var.c:419 cgi-bin/ipp-var.c:508 msgid "Unable to move jobs" msgstr "複数のジョブを移動できません" -#: cgi-bin/admin.c:3186 cups/ppd.c:339 +#: cgi-bin/admin.c:3166 cups/ppd.c:297 msgid "Unable to open PPD file" msgstr "PPD ファイルを読み込むことができません" -#: cgi-bin/admin.c:2608 +#: cgi-bin/admin.c:2588 msgid "Unable to open cupsd.conf file:" msgstr "cupsd.conf ファイルを開けません:" -#: backend/usb-unix.c:141 +#: backend/usb-unix.c:134 msgid "Unable to open device file" msgstr "デバイスファイルを開けません" -#: scheduler/ipp.c:5966 +#: scheduler/ipp.c:5992 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "ドキュメント %d (ジョブ %d) を開けません。" @@ -6038,23 +6037,23 @@ msgid "Unable to open help file." msgstr "ヘルプファイルを読み込むことができません。" -#: backend/ipp.c:376 backend/ipp.c:1503 backend/ipp.c:1712 backend/lpd.c:505 -#: backend/socket.c:155 backend/usb.c:237 filter/gziptoany.c:71 -#: filter/pstops.c:300 +#: backend/ipp.c:378 backend/ipp.c:1543 backend/ipp.c:1751 backend/lpd.c:496 +#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67 +#: filter/pstops.c:267 msgid "Unable to open print file" msgstr "印刷ファイルを開けません" -#: filter/rastertoepson.c:998 filter/rastertohp.c:724 -#: filter/rastertolabel.c:1141 +#: filter/rastertoepson.c:983 filter/rastertohp.c:713 +#: filter/rastertolabel.c:1133 msgid "Unable to open raster file" msgstr "ラスターファイルを開けません" -#: cgi-bin/ipp-var.c:795 +#: cgi-bin/ipp-var.c:780 msgid "Unable to print test page" msgstr "テストページを印刷できません" -#: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:622 -#: backend/usb-darwin.c:666 backend/usb-libusb.c:436 backend/usb-libusb.c:471 +#: backend/runloop.c:85 backend/runloop.c:314 backend/usb-darwin.c:622 +#: backend/usb-darwin.c:666 backend/usb-libusb.c:416 backend/usb-libusb.c:451 msgid "Unable to read print data." msgstr "プリントデータを読み込めません。" @@ -6062,202 +6061,202 @@ msgid "Unable to resolve printer URI." msgstr "プリンター URI を解決できません。" -#: cups/adminutil.c:2088 +#: cups/adminutil.c:2077 #, c-format msgid "Unable to run \"%s\": %s" msgstr "\"%s\" を実行できません: %s" -#: filter/pstops.c:563 +#: filter/pstops.c:530 msgid "Unable to see in file" msgstr "ファイルを読み込むことができません" -#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618 +#: cgi-bin/ipp-var.c:583 cgi-bin/ipp-var.c:603 msgid "Unable to send command to printer driver" msgstr "プリンタードライバーにコマンドを送信できません" -#: backend/usb-darwin.c:744 backend/usb-libusb.c:547 +#: backend/usb-darwin.c:744 backend/usb-libusb.c:527 msgid "Unable to send data to printer." msgstr "プリンターにデータを送信することができません。" -#: cups/adminutil.c:821 +#: cups/adminutil.c:810 #, c-format msgid "Unable to set Windows printer driver (%d)." msgstr "Windows プリンタードライバーを設定できません (%d)。" -#: cgi-bin/admin.c:3807 +#: cgi-bin/admin.c:3787 msgid "Unable to set options" msgstr "オプションを設定できません" -#: cgi-bin/admin.c:3077 +#: cgi-bin/admin.c:3057 msgid "Unable to set server default" msgstr "サーバーをデフォルトに設定できません" -#: backend/ipp.c:3294 backend/ipp.c:3371 backend/ipp.c:3379 +#: backend/ipp.c:3352 backend/ipp.c:3429 backend/ipp.c:3437 msgid "Unable to start backend process." msgstr "バックエンドのプロセスを起動できません。" -#: cgi-bin/admin.c:1912 +#: cgi-bin/admin.c:1892 msgid "Unable to upload cupsd.conf file" msgstr "cupsd.conf ファイルをアップロードできません" -#: backend/usb-darwin.c:2014 backend/usb-darwin.c:2038 +#: backend/usb-darwin.c:2016 backend/usb-darwin.c:2040 msgid "Unable to use legacy USB class driver." msgstr "古いタイプの USB クラスドライバーは使用できません。" -#: backend/runloop.c:125 backend/runloop.c:380 +#: backend/runloop.c:114 backend/runloop.c:369 msgid "Unable to write print data" msgstr "プリントデータを書き込めません" -#: filter/gziptoany.c:90 +#: filter/gziptoany.c:86 #, c-format msgid "Unable to write uncompressed print data: %s" msgstr "非圧縮のプリントデータを書き込めません: %s" -#: cups/http-support.c:1378 +#: cups/http-support.c:1366 msgid "Unauthorized" msgstr "未許可" -#: cgi-bin/admin.c:3503 +#: cgi-bin/admin.c:3483 msgid "Units" msgstr "ユニット" -#: cups/http-support.c:1418 cups/ppd.c:366 +#: cups/http-support.c:1406 cups/http-support.c:1490 cups/ppd.c:324 msgid "Unknown" msgstr "未知" -#: filter/pstops.c:2214 +#: filter/pstops.c:2185 #, c-format msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "\"%s\" (オプション \"%s\" 用) は未知の設定です。" -#: backend/ipp.c:518 +#: backend/ipp.c:520 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "\"%s\" は未知の暗号オプション値です。" -#: backend/lpd.c:351 +#: backend/lpd.c:342 #, c-format msgid "Unknown file order: \"%s\"." msgstr "\"%s\" は未知のファイルオーダーです。" -#: backend/lpd.c:322 +#: backend/lpd.c:313 #, c-format msgid "Unknown format character: \"%c\"." msgstr "\"%c\" は未知の書式文字です。" -#: cups/dest-options.c:984 +#: cups/dest-options.c:964 msgid "Unknown media size name." msgstr "未知のメディアサイズ名称です。" -#: backend/ipp.c:582 +#: backend/ipp.c:584 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "\"%s\" (値 \"%s\") は未知のオプションです。" -#: filter/pstops.c:2197 +#: filter/pstops.c:2168 #, c-format msgid "Unknown option \"%s\"." msgstr "\"%s\" は未知のオプションです。" -#: backend/lpd.c:337 +#: backend/lpd.c:328 #, c-format msgid "Unknown print mode: \"%s\"." msgstr "\"%s\" は未知のプリントモードです。" -#: scheduler/ipp.c:10318 +#: scheduler/ipp.c:10401 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "\"%s\" は未知の printer-error-policy です。" -#: scheduler/ipp.c:10301 +#: scheduler/ipp.c:10384 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "\"%s\" は未知の printer-op-policy です。" -#: cups/http-addrlist.c:746 +#: cups/http-addrlist.c:737 msgid "Unknown service name." msgstr "未知のサービス名です。" -#: backend/ipp.c:547 +#: backend/ipp.c:549 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "\"%s\" は未知のバージョンオプション値です。" -#: scheduler/ipp.c:10774 +#: scheduler/ipp.c:10858 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "\"%s\" はサポートされていない 'compression' の値です。" -#: scheduler/ipp.c:10804 +#: scheduler/ipp.c:10888 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "\"%s\" はサポートされていない 'document-format' の値です。" -#: scheduler/ipp.c:10879 +#: scheduler/ipp.c:10963 msgid "Unsupported 'job-name' value." msgstr "サポートされていない 'job-name' の値です。" -#: scheduler/ipp.c:332 +#: scheduler/ipp.c:329 #, c-format msgid "Unsupported character set \"%s\"." msgstr "\"%s\" はサポートされていない文字セットです。" -#: scheduler/ipp.c:7986 scheduler/ipp.c:9223 +#: scheduler/ipp.c:8072 scheduler/ipp.c:9307 #, c-format msgid "Unsupported compression \"%s\"." msgstr "\"%s\" はサポートされていない圧縮形式です。" -#: scheduler/ipp.c:8120 scheduler/ipp.c:9373 +#: scheduler/ipp.c:8206 scheduler/ipp.c:9457 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "\"%s\" はサポートされていない文書形式です。" -#: scheduler/ipp.c:9356 +#: scheduler/ipp.c:9440 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "\"%s/%s\" はサポートされていない文書形式です。" -#: scheduler/ipp.c:1359 +#: scheduler/ipp.c:1339 #, c-format msgid "Unsupported format \"%s\"." msgstr "\"%s\" はサポートされていない形式です。" -#: scheduler/ipp.c:1457 +#: scheduler/ipp.c:1437 msgid "Unsupported margins." msgstr "サポートされていないマージンです。" -#: cups/pwg-media.c:568 +#: cups/pwg-media.c:549 msgid "Unsupported media value." msgstr "サポートされていないメディアの値です。" -#: filter/pstops.c:2479 +#: filter/pstops.c:2450 #, c-format msgid "Unsupported number-up value %d, using number-up=1." msgstr "%d はサポートされていない number-up 値です。number-up=1 を使用します。" -#: filter/pstops.c:2513 +#: filter/pstops.c:2484 #, c-format msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb." msgstr "%s はサポートされていない number-up-layout 値です。number-up-layout=lrtb を使用します。" -#: filter/pstops.c:2564 +#: filter/pstops.c:2535 #, c-format msgid "Unsupported page-border value %s, using page-border=none." msgstr "%s はサポートされていない page-border 値です。page-border=none を使用します。" -#: filter/rastertopwg.c:147 filter/rastertopwg.c:155 filter/rastertopwg.c:164 +#: filter/rastertopwg.c:139 filter/rastertopwg.c:147 filter/rastertopwg.c:156 msgid "Unsupported raster data." msgstr "サポートされていないラスターデータです。" -#: cups/snmp.c:1108 +#: cups/snmp.c:1064 msgid "Unsupported value type" msgstr "サポートされていない型の値です" -#: cups/http-support.c:1393 +#: cups/http-support.c:1381 msgid "Upgrade Required" msgstr "アップグレードが必要です" -#: systemv/lpadmin.c:668 +#: systemv/lpadmin.c:654 msgid "" "Usage:\n" "\n" @@ -6277,10 +6276,10 @@ " [-D 宛先] [-P PPD ファイル] [-o 名前=値]\n" " [-u allow:ユーザー,ユーザー] [-u deny:ユーザー,ユーザー]" -#: backend/dnssd.c:242 backend/ipp.c:323 backend/lpd.c:192 -#: backend/socket.c:132 backend/usb.c:183 filter/commandtops.c:74 -#: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62 -#: monitor/tbcp.c:61 +#: backend/dnssd.c:227 backend/ipp.c:325 backend/lpd.c:183 +#: backend/socket.c:127 backend/usb.c:183 filter/commandtops.c:63 +#: filter/gziptoany.c:46 filter/pstops.c:231 monitor/bcp.c:56 +#: monitor/tbcp.c:55 #, c-format msgid "Usage: %s job-id user title copies options [file]" msgstr "使い方: %s ジョブID ユーザー タイトル コピー数 オプション [ファイル]" @@ -6293,7 +6292,7 @@ msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "Usage: cupsctl [オプション] [パラメータ=値 ... パラメータN=値N]" -#: scheduler/main.c:2001 +#: scheduler/main.c:2145 msgid "Usage: cupsd [options]" msgstr "使い方: cupsd [オプション]" @@ -6303,7 +6302,7 @@ #: systemv/cupstestdsc.c:425 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" -msgstr "使い方: cupstestdsc [オプション] filename.ps [... filename.ps]" +msgstr "使い方: cupstestdsc [オプション] ファイル名.ps [... ファイル名.ps]" #: systemv/cupstestppd.c:3813 msgid "" @@ -6322,7 +6321,7 @@ "\n" "オプション:" -#: test/ippfind.c:2726 +#: test/ippfind.c:2738 msgid "" "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n" " ippfind [options] name[.regtype[.domain.]] ... [expression]\n" @@ -6334,7 +6333,7 @@ " ippfind --help\n" " ippfind --version" -#: test/ipptool.c:4706 +#: test/ipptool.c:4803 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]" msgstr "使い方: ipptool [オプション] URI ファイル名 [ ... ファイル名N ]" @@ -6342,7 +6341,7 @@ msgid "Usage: lpmove job/src dest" msgstr "使い方: lpmove ジョブ/ソース 宛先" -#: systemv/lpoptions.c:553 +#: systemv/lpoptions.c:539 msgid "" "Usage: lpoptions [-h server] [-E] -d printer\n" " lpoptions [-h server] [-E] [-p printer] -l\n" @@ -6368,12 +6367,12 @@ " lppasswd [-g グループ名] -a [ユーザー名]\n" " lppasswd [-g グループ名] -x [ユーザー名]" -#: berkeley/lpq.c:675 +#: berkeley/lpq.c:637 msgid "" "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "使い方: lpq [-P 宛先] [-U ユーザー名] [-h ホスト名[:ポート]] [-l] [+間隔]" -#: ppdc/ppdc.cxx:435 +#: ppdc/ppdc.cxx:430 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]" msgstr "使い方: ppdc [オプション] ファイル名.drv [ ... ファイル名N.drv ]" @@ -6385,7 +6384,7 @@ msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]" msgstr "使い方: ppdi [オプション] ファイル名.ppd [ ... ファイル名N.ppd ]" -#: ppdc/ppdmerge.cxx:367 +#: ppdc/ppdmerge.cxx:361 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]" msgstr "使い方: ppdmerge [オプション] ファイル名.ppd [ ... ファイル名N.ppd ]" @@ -6394,47 +6393,47 @@ "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]" msgstr "使い方: ppdpo [オプション] -o ファイル名.po ファイル名.drv [ ... ファイル名N.drv ]" -#: backend/snmp.c:218 +#: backend/snmp.c:192 msgid "Usage: snmp [host-or-ip-address]" -msgstr "使い方: snmp [ホストまたはIPアドレス]" +msgstr "使い方: snmp [ホスト名またはIPアドレス]" -#: cups/snmp.c:1060 +#: cups/snmp.c:1016 msgid "Value uses indefinite length" msgstr "値は不定長です" -#: cups/snmp.c:1045 +#: cups/snmp.c:1001 msgid "VarBind uses indefinite length" msgstr "VarBind は不定長です" -#: cups/snmp.c:995 +#: cups/snmp.c:951 msgid "Version uses indefinite length" msgstr "Version は不定長です" -#: backend/ipp.c:1858 +#: backend/ipp.c:1913 msgid "Waiting for job to complete." msgstr "ジョブが完了するのを待っています。" -#: backend/usb-darwin.c:469 backend/usb-libusb.c:243 +#: backend/usb-darwin.c:469 backend/usb-libusb.c:223 msgid "Waiting for printer to become available." msgstr "プリンターが使用可能になるのを待っています。" -#: backend/socket.c:443 +#: backend/socket.c:440 msgid "Waiting for printer to finish." msgstr "プリンターが終了するのを待っています。" -#: cups/adminutil.c:793 +#: cups/adminutil.c:782 msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "警告、Windows 2000 プリンタードライバーがインストールされていません。" -#: cups/http-support.c:1414 +#: cups/http-support.c:1402 msgid "Web Interface is Disabled" msgstr "Web インターフェイスが無効になっています" -#: cups/ppd.c:1947 +#: cups/ppd.c:1902 msgid "Yes" msgstr "はい" -#: scheduler/client.c:2520 +#: scheduler/client.c:2219 #, c-format msgid "" "You must access this page using the URL " msgstr "lpc> " @@ -6905,7 +6904,7 @@ #: systemv/lpinfo.c:207 msgid "lpinfo: Expected make and model after \"--make-and-model\"." -msgstr "lpinfo: \"--make-and-model\" の後には、メーカーとモデルを指定する必要があります。" +msgstr "lpinfo: \"--make-and-model\" のあとには、メーカーとモデルを指定する必要があります。" #: systemv/lpinfo.c:224 msgid "lpinfo: Expected product string after \"--product\"." @@ -6953,26 +6952,26 @@ msgid "lpmove: Unknown option \"%c\"." msgstr "lpmove: 未知のオプション \"%c\"。" -#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244 +#: systemv/lpoptions.c:143 systemv/lpoptions.c:161 systemv/lpoptions.c:237 msgid "lpoptions: No printers." msgstr "lpoptions: プリンターがありません。" -#: systemv/lpoptions.c:219 +#: systemv/lpoptions.c:212 #, c-format msgid "lpoptions: Unable to add printer or instance: %s" -msgstr "lpoptions: プリンターまたはインスタンスを追加できません: %s。" +msgstr "lpoptions: プリンターまたはインスタンスを追加できません: %s" -#: systemv/lpoptions.c:521 +#: systemv/lpoptions.c:507 #, c-format msgid "lpoptions: Unable to get PPD file for %s: %s" msgstr "lpoptions: %s の PPD ファイルを取得できません: %s" -#: systemv/lpoptions.c:529 +#: systemv/lpoptions.c:515 #, c-format msgid "lpoptions: Unable to open PPD file for %s." msgstr "lpoptions: %s の PPD ファイルを開けません。" -#: systemv/lpoptions.c:99 +#: systemv/lpoptions.c:92 msgid "lpoptions: Unknown printer or class." msgstr "lpoptions: 未知のプリンターまたはクラスです。" @@ -7030,45 +7029,45 @@ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." msgstr "lppasswd: ユーザー \"%s\" およびグループ \"%s\" は存在しません。" -#: systemv/lpstat.c:1076 +#: systemv/lpstat.c:1074 #, c-format msgid "" "lpstat: error - %s environment variable names non-existent destination " "\"%s\"." msgstr "lpstat: エラー - 環境変数 %s が、存在しない宛先 \"%s\" を指しています。" -#: systemv/lpstat.c:1012 +#: systemv/lpstat.c:1010 #, c-format msgid "members of class %s:" msgstr "クラス %s のメンバー:" -#: berkeley/lpq.c:587 +#: berkeley/lpq.c:549 msgid "no entries" msgstr "エントリーがありません" -#: systemv/lpstat.c:1080 +#: systemv/lpstat.c:1078 msgid "no system default destination" msgstr "システムのデフォルトの宛先がありません" -#: scheduler/ipp.c:5522 +#: scheduler/ipp.c:5548 msgid "notify-events not specified." msgstr "notify-events が指定されていません。" -#: scheduler/ipp.c:2044 scheduler/ipp.c:5427 +#: scheduler/ipp.c:2025 scheduler/ipp.c:5453 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "notify-recipient-uri URI \"%s\" はすでに使われています。" -#: scheduler/ipp.c:2034 scheduler/ipp.c:5417 +#: scheduler/ipp.c:2015 scheduler/ipp.c:5443 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "notify-recipient-uri URI \"%s\" には未知のスキームが使われています。" #: cups/notify.c:87 msgid "pending" -msgstr "保留" +msgstr "プリンター待ち" -#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93 +#: ppdc/ppdc.cxx:108 ppdc/ppdpo.cxx:93 #, c-format msgid "ppdc: Adding include directory \"%s\"." msgstr "ppdc: ディレクトリー \"%s\" を追加しています。" @@ -7078,7 +7077,7 @@ msgid "ppdc: Adding/updating UI text from %s." msgstr "ppdc: %s から UI テキストを追加または更新しています。" -#: ppdc/ppdc-source.cxx:410 +#: ppdc/ppdc-source.cxx:367 #, c-format msgid "ppdc: Bad boolean value (%s) on line %d of %s." msgstr "ppdc: 不正な boolean 値 (%s) があります。%d 行目、ファイル名 %s。" @@ -7088,215 +7087,215 @@ msgid "ppdc: Bad font attribute: %s" msgstr "不正なフォント属性: %s" -#: ppdc/ppdc-source.cxx:1796 +#: ppdc/ppdc-source.cxx:1753 #, c-format msgid "ppdc: Bad resolution name \"%s\" on line %d of %s." -msgstr "ppdc: 不正な resolution 名 \"%s\" があります。%d 行目、ファイル名 %s 。" +msgstr "ppdc: 不正な resolution 名 \"%s\" があります。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1113 +#: ppdc/ppdc-source.cxx:1070 #, c-format msgid "ppdc: Bad status keyword %s on line %d of %s." -msgstr "ppdc: 不正な status キーワード %s があります。%d 行目、ファイル名 %s 。" +msgstr "ppdc: 不正な status キーワード %s があります。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:2033 +#: ppdc/ppdc-source.cxx:1990 #, c-format msgid "ppdc: Bad variable substitution ($%c) on line %d of %s." msgstr "ppdc: 不正な数値置換 ($%c) があります。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:2719 +#: ppdc/ppdc-source.cxx:2675 #, c-format msgid "ppdc: Choice found on line %d of %s with no Option." msgstr "ppdc: %d 行目、ファイル名 %s で、Option がないのに Choice が見つかりました。" -#: ppdc/ppdc-source.cxx:1698 +#: ppdc/ppdc-source.cxx:1655 #, c-format msgid "ppdc: Duplicate #po for locale %s on line %d of %s." -msgstr "ppdc: locale %s に対して #po が二重に定義されています。%d 行目、ファイル名 %s 。" +msgstr "ppdc: locale %s に対して #po が二重に定義されています。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:932 +#: ppdc/ppdc-source.cxx:889 #, c-format msgid "ppdc: Expected a filter definition on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s においてフィルター定義が必要です。" -#: ppdc/ppdc-source.cxx:955 +#: ppdc/ppdc-source.cxx:912 #, c-format msgid "ppdc: Expected a program name on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s においてプログラム名が必要です。" -#: ppdc/ppdc-source.cxx:394 +#: ppdc/ppdc-source.cxx:351 #, c-format msgid "ppdc: Expected boolean value on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において boolean 値が必要です。" -#: ppdc/ppdc-source.cxx:1093 +#: ppdc/ppdc-source.cxx:1050 #, c-format msgid "ppdc: Expected charset after Font on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに charset が必要です。" -#: ppdc/ppdc-source.cxx:447 +#: ppdc/ppdc-source.cxx:404 #, c-format msgid "ppdc: Expected choice code on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において choice code が必要です。" -#: ppdc/ppdc-source.cxx:435 +#: ppdc/ppdc-source.cxx:392 #, c-format msgid "ppdc: Expected choice name/text on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において choice name/text が必要です。" -#: ppdc/ppdc-source.cxx:503 +#: ppdc/ppdc-source.cxx:460 #, c-format msgid "ppdc: Expected color order for ColorModel on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において ColorModel に対する color order が必要です。" -#: ppdc/ppdc-source.cxx:492 +#: ppdc/ppdc-source.cxx:449 #, c-format msgid "ppdc: Expected colorspace for ColorModel on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において ColorModel に対する colorspace が必要です。" -#: ppdc/ppdc-source.cxx:514 +#: ppdc/ppdc-source.cxx:471 #, c-format msgid "ppdc: Expected compression for ColorModel on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において ColorModel に対する compression が必要です。" -#: ppdc/ppdc-source.cxx:695 +#: ppdc/ppdc-source.cxx:652 #, c-format msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において UIConstraints に対する constraint が必要です。" -#: ppdc/ppdc-source.cxx:2905 +#: ppdc/ppdc-source.cxx:2861 #, c-format msgid "" "ppdc: Expected driver type keyword following DriverType on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において DriverType のあとに driver type keyword が必要です。" -#: ppdc/ppdc-source.cxx:826 +#: ppdc/ppdc-source.cxx:783 #, c-format msgid "ppdc: Expected duplex type after Duplex on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Duplex のあとに type が必要です。" -#: ppdc/ppdc-source.cxx:1077 +#: ppdc/ppdc-source.cxx:1034 #, c-format msgid "ppdc: Expected encoding after Font on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに encoding が必要です。" -#: ppdc/ppdc-source.cxx:1689 +#: ppdc/ppdc-source.cxx:1646 #, c-format msgid "ppdc: Expected filename after #po %s on line %d of %s." msgstr "ppdc: #po %s のあとにファイル名が必要です (%d 行目, ファイル %s)。" -#: ppdc/ppdc-source.cxx:1205 +#: ppdc/ppdc-source.cxx:1162 #, c-format msgid "ppdc: Expected group name/text on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において group name/text が必要です。" -#: ppdc/ppdc-source.cxx:2619 +#: ppdc/ppdc-source.cxx:2575 #, c-format msgid "ppdc: Expected include filename on line %d of %s." -msgstr "ppdc: %d 行目、ファイル名 %s において include ファイル名が必要です。" +msgstr "ppdc: %d 行目、ファイル名 %s において include ファイル名 が必要です。" -#: ppdc/ppdc-source.cxx:1502 +#: ppdc/ppdc-source.cxx:1459 #, c-format msgid "ppdc: Expected integer on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において整数指定が必要です。" -#: ppdc/ppdc-source.cxx:1681 +#: ppdc/ppdc-source.cxx:1638 #, c-format msgid "ppdc: Expected locale after #po on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において #po のあとに locale が必要です。" -#: ppdc/ppdc-source.cxx:353 +#: ppdc/ppdc-source.cxx:310 #, c-format msgid "ppdc: Expected name after %s on line %d of %s." msgstr "ppdc: %s のあとに name が必要です。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:3277 +#: ppdc/ppdc-source.cxx:3233 #, c-format msgid "ppdc: Expected name after FileName on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において FileName のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:1058 +#: ppdc/ppdc-source.cxx:1015 #, c-format msgid "ppdc: Expected name after Font on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:3108 +#: ppdc/ppdc-source.cxx:3064 #, c-format msgid "ppdc: Expected name after Manufacturer on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Manufacturer のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:3141 +#: ppdc/ppdc-source.cxx:3097 #, c-format msgid "ppdc: Expected name after MediaSize on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において MediaSize のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:3231 +#: ppdc/ppdc-source.cxx:3187 #, c-format msgid "ppdc: Expected name after ModelName on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において ModelName のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:3294 +#: ppdc/ppdc-source.cxx:3250 #, c-format msgid "ppdc: Expected name after PCFileName on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において PCFileName のあとに name が必要です。" -#: ppdc/ppdc-source.cxx:1156 +#: ppdc/ppdc-source.cxx:1113 #, c-format msgid "ppdc: Expected name/text after %s on line %d of %s." msgstr "ppdc: %s のあとに name/text が必要です。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1245 +#: ppdc/ppdc-source.cxx:1202 #, c-format msgid "ppdc: Expected name/text after Installable on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Installable のあとに name/text が必要です。" -#: ppdc/ppdc-source.cxx:1782 +#: ppdc/ppdc-source.cxx:1739 #, c-format msgid "ppdc: Expected name/text after Resolution on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Resolution のあとに name/text が必要です。" -#: ppdc/ppdc-source.cxx:479 +#: ppdc/ppdc-source.cxx:436 #, c-format msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において ColorModel に対する name/text が必要です。" -#: ppdc/ppdc-source.cxx:1574 +#: ppdc/ppdc-source.cxx:1531 #, c-format msgid "ppdc: Expected option name/text on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において option name/text が必要です。" -#: ppdc/ppdc-source.cxx:1608 +#: ppdc/ppdc-source.cxx:1565 #, c-format msgid "ppdc: Expected option section on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において option section が必要です。" -#: ppdc/ppdc-source.cxx:1586 +#: ppdc/ppdc-source.cxx:1543 #, c-format msgid "ppdc: Expected option type on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において option type が必要です。" -#: ppdc/ppdc-source.cxx:1765 +#: ppdc/ppdc-source.cxx:1722 #, c-format msgid "ppdc: Expected override field after Resolution on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Resolution のあとに override field が必要です。" -#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353 +#: ppdc/ppdc-catalog.cxx:389 ppdc/ppdc-catalog.cxx:401 #, c-format msgid "ppdc: Expected quoted string on line %d of %s." msgstr "%d 行: %s には引用符で囲まれた文字列が必要です。" -#: ppdc/ppdc-source.cxx:1004 +#: ppdc/ppdc-source.cxx:961 #, c-format msgid "ppdc: Expected real number on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において実数が必要です。" -#: ppdc/ppdc-source.cxx:572 +#: ppdc/ppdc-source.cxx:529 #, c-format msgid "" "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s." msgstr "" "ppdc: %d 行目、ファイル名 %s において ColorProfile に続いて resolution/mediatype が必要です。" -#: ppdc/ppdc-source.cxx:1863 +#: ppdc/ppdc-source.cxx:1820 #, c-format msgid "" "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d " @@ -7304,166 +7303,166 @@ msgstr "" "ppdc: %d 行目、ファイル名 %s において SimpleColorProfile に続いて resolution/mediatype が必要です。" -#: ppdc/ppdc-source.cxx:361 +#: ppdc/ppdc-source.cxx:318 #, c-format msgid "ppdc: Expected selector after %s on line %d of %s." msgstr "ppdc: %s のあとに selector が必要です。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1101 +#: ppdc/ppdc-source.cxx:1058 #, c-format msgid "ppdc: Expected status after Font on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに status が必要です。" -#: ppdc/ppdc-source.cxx:2794 +#: ppdc/ppdc-source.cxx:2750 #, c-format msgid "ppdc: Expected string after Copyright on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Copyright のあとに文字列が必要です。" -#: ppdc/ppdc-source.cxx:3397 +#: ppdc/ppdc-source.cxx:3353 #, c-format msgid "ppdc: Expected string after Version on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Version のあとに文字列が必要です。" -#: ppdc/ppdc-source.cxx:728 +#: ppdc/ppdc-source.cxx:685 #, c-format msgid "ppdc: Expected two option names on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において 2 つのオプション名が必要です。" -#: ppdc/ppdc-source.cxx:372 +#: ppdc/ppdc-source.cxx:329 #, c-format msgid "ppdc: Expected value after %s on line %d of %s." msgstr "ppdc: %s のあとに value が必要です。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1085 +#: ppdc/ppdc-source.cxx:1042 #, c-format msgid "ppdc: Expected version after Font on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに version が必要です。" -#: ppdc/ppdc-source.cxx:227 +#: ppdc/ppdc-source.cxx:184 #, c-format msgid "ppdc: Invalid #include/#po filename \"%s\"." msgstr "ppdc: 無効な #include/#po ファイル名です \"%s\"。" -#: ppdc/ppdc-source.cxx:972 +#: ppdc/ppdc-source.cxx:929 #, c-format msgid "ppdc: Invalid cost for filter on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s においてフィルターに対する無効な cost があります。" -#: ppdc/ppdc-source.cxx:964 +#: ppdc/ppdc-source.cxx:921 #, c-format msgid "ppdc: Invalid empty MIME type for filter on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s においてフィルターに対する無効な空の MIME タイプがあります。" -#: ppdc/ppdc-source.cxx:980 +#: ppdc/ppdc-source.cxx:937 #, c-format msgid "ppdc: Invalid empty program name for filter on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s においてフィルターに対するプログラム名が空であり無効です。" -#: ppdc/ppdc-source.cxx:1628 +#: ppdc/ppdc-source.cxx:1585 #, c-format msgid "ppdc: Invalid option section \"%s\" on line %d of %s." msgstr "ppdc: 無効な option section があります \"%s\"。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1600 +#: ppdc/ppdc-source.cxx:1557 #, c-format msgid "ppdc: Invalid option type \"%s\" on line %d of %s." msgstr "ppdc: 無効な option type があります \"%s\"。%d 行目、ファイル名 %s。" -#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123 +#: ppdc/ppdc.cxx:246 ppdc/ppdpo.cxx:123 #, c-format msgid "ppdc: Loading driver information file \"%s\"." msgstr "ppdc: ドライバー情報ファイル \"%s\" を読み込んでいます。" -#: ppdc/ppdc.cxx:187 +#: ppdc/ppdc.cxx:182 #, c-format msgid "ppdc: Loading messages for locale \"%s\"." msgstr "ppdc: ロケール \"%s\" のメッセージを読み込んでいます。" -#: ppdc/ppdc.cxx:126 +#: ppdc/ppdc.cxx:121 #, c-format msgid "ppdc: Loading messages from \"%s\"." msgstr "ppdc: \"%s\" からメッセージを読み込んでいます。" -#: ppdc/ppdc-source.cxx:2412 ppdc/ppdc-source.cxx:2644 +#: ppdc/ppdc-source.cxx:2368 ppdc/ppdc-source.cxx:2600 #, c-format msgid "ppdc: Missing #endif at end of \"%s\"." msgstr "ppdc: \"%s\" の最後に #endif が見つかりません。" -#: ppdc/ppdc-source.cxx:2513 ppdc/ppdc-source.cxx:2548 -#: ppdc/ppdc-source.cxx:2578 +#: ppdc/ppdc-source.cxx:2469 ppdc/ppdc-source.cxx:2504 +#: ppdc/ppdc-source.cxx:2534 #, c-format msgid "ppdc: Missing #if on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において #if が見つかりません。" -#: ppdc/ppdc-catalog.cxx:418 +#: ppdc/ppdc-catalog.cxx:466 #, c-format msgid "" "ppdc: Need a msgid line before any translation strings on line %d of %s." msgstr "%d 行: %s の翻訳文字列の前に msgid 行が必要です。" -#: ppdc/ppdc-driver.cxx:730 +#: ppdc/ppdc-driver.cxx:712 #, c-format msgid "ppdc: No message catalog provided for locale %s." msgstr "ppdc: ロケール %s に対するメッセージカタログが見つかりません。" -#: ppdc/ppdc-source.cxx:1651 ppdc/ppdc-source.cxx:2882 -#: ppdc/ppdc-source.cxx:2968 ppdc/ppdc-source.cxx:3061 -#: ppdc/ppdc-source.cxx:3194 ppdc/ppdc-source.cxx:3327 +#: ppdc/ppdc-source.cxx:1608 ppdc/ppdc-source.cxx:2838 +#: ppdc/ppdc-source.cxx:2924 ppdc/ppdc-source.cxx:3017 +#: ppdc/ppdc-source.cxx:3150 ppdc/ppdc-source.cxx:3283 #, c-format msgid "ppdc: Option %s defined in two different groups on line %d of %s." msgstr "ppdc: オプション %s が行 %d、ファイル %s の 2 つの異なるグループで定義されています。" -#: ppdc/ppdc-source.cxx:1644 +#: ppdc/ppdc-source.cxx:1601 #, c-format msgid "ppdc: Option %s redefined with a different type on line %d of %s." msgstr "ppdc: オプション %s は異なる型で再定義されています。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:705 +#: ppdc/ppdc-source.cxx:662 #, c-format msgid "ppdc: Option constraint must *name on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において Option constraint は *name で指定しなければなりません。" -#: ppdc/ppdc-source.cxx:2495 +#: ppdc/ppdc-source.cxx:2451 #, c-format msgid "ppdc: Too many nested #if's on line %d of %s." msgstr "ppdc: %d 行目、ファイル名 %s において #if のネストが多すぎます。" -#: ppdc/ppdc.cxx:374 +#: ppdc/ppdc.cxx:369 #, c-format msgid "ppdc: Unable to create PPD file \"%s\" - %s." msgstr "ppdc: PPD ファイル \"%s\" を作成できません - %s。" -#: ppdc/ppdc.cxx:266 +#: ppdc/ppdc.cxx:261 #, c-format msgid "ppdc: Unable to create output directory %s: %s" msgstr "ppdc: 出力ディレクトリー \"%s\" を作成できません - %s" -#: ppdc/ppdc.cxx:287 +#: ppdc/ppdc.cxx:282 #, c-format msgid "ppdc: Unable to create output pipes: %s" msgstr "ppdc: 出力パイプを作成できません: %s" -#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309 +#: ppdc/ppdc.cxx:298 ppdc/ppdc.cxx:304 #, c-format msgid "ppdc: Unable to execute cupstestppd: %s" msgstr "ppdc: cupstestppd を実行できません: %s" -#: ppdc/ppdc-source.cxx:1730 +#: ppdc/ppdc-source.cxx:1687 #, c-format msgid "ppdc: Unable to find #po file %s on line %d of %s." msgstr "ppdc: #po ファイル %s が見つかりません。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:2651 +#: ppdc/ppdc-source.cxx:2607 #, c-format msgid "ppdc: Unable to find include file \"%s\" on line %d of %s." msgstr "ppdc: インクルードファイル %s が見つかりません。%d 行目、ファイル名 %s。" -#: ppdc/ppdc.cxx:198 +#: ppdc/ppdc.cxx:193 #, c-format msgid "ppdc: Unable to find localization for \"%s\" - %s" msgstr "ppdc: \"%s\" に対する地域化情報が見つかりません - %s" -#: ppdc/ppdc.cxx:135 +#: ppdc/ppdc.cxx:130 #, c-format msgid "ppdc: Unable to load localization file \"%s\" - %s" msgstr "ppdc: \"%s\" に対するローカライズファイルを読み込めません - %s" @@ -7473,108 +7472,108 @@ msgid "ppdc: Unable to open %s: %s" msgstr "ppdc: %s を開けません: %s" -#: ppdc/ppdc-source.cxx:2054 +#: ppdc/ppdc-source.cxx:2011 #, c-format msgid "ppdc: Undefined variable (%s) on line %d of %s." msgstr "ppdc: 変数 (%s) は未定義です。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-catalog.cxx:435 +#: ppdc/ppdc-catalog.cxx:483 #, c-format msgid "ppdc: Unexpected text on line %d of %s." msgstr "%d 行: %s は予期せぬテキストです。" -#: ppdc/ppdc-source.cxx:2924 +#: ppdc/ppdc-source.cxx:2880 #, c-format msgid "ppdc: Unknown driver type %s on line %d of %s." msgstr "ppdc: %s は未知のドライバータイプです。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:906 +#: ppdc/ppdc-source.cxx:863 #, c-format msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s." msgstr "ppdc: \"%s\" は未知の両面タイプです。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:3154 +#: ppdc/ppdc-source.cxx:3110 #, c-format msgid "ppdc: Unknown media size \"%s\" on line %d of %s." msgstr "ppdc: \"%s\" は未知の用紙サイズです。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-catalog.cxx:463 +#: ppdc/ppdc-catalog.cxx:511 #, c-format msgid "ppdc: Unknown message catalog format for \"%s\"." msgstr "\"%s\" は未知のメッセージカタログの書式です。" -#: ppdc/ppdc-source.cxx:3408 +#: ppdc/ppdc-source.cxx:3364 #, c-format msgid "ppdc: Unknown token \"%s\" seen on line %d of %s." msgstr "ppdc: 未知のトークン \"%s\" があります。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:1014 +#: ppdc/ppdc-source.cxx:971 #, c-format msgid "" "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s." msgstr "ppdc: 実数 \"%s\" に未知の終了文字があります。%d 行目、ファイル名 %s。" -#: ppdc/ppdc-source.cxx:2164 +#: ppdc/ppdc-source.cxx:2121 #, c-format msgid "ppdc: Unterminated string starting with %c on line %d of %s." msgstr "ppdc: %c で始まる文字に対して終端文字がありません。%d 行目、ファイル名 %s。" -#: ppdc/ppdc.cxx:365 +#: ppdc/ppdc.cxx:360 #, c-format msgid "ppdc: Warning - overlapping filename \"%s\"." msgstr "ppdc: 警告 - ファイル名 \"%s\" が重複しています。" -#: ppdc/ppdc.cxx:380 +#: ppdc/ppdc.cxx:375 #, c-format msgid "ppdc: Writing %s." msgstr "ppdc: %s を書き込んでいます。" -#: ppdc/ppdc.cxx:148 +#: ppdc/ppdc.cxx:143 #, c-format msgid "ppdc: Writing PPD files to directory \"%s\"." msgstr "ppdc: ディレクトリー \"%s\" に PPD ファイルを書き込んでいます。" -#: ppdc/ppdmerge.cxx:136 +#: ppdc/ppdmerge.cxx:130 #, c-format msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s." msgstr "ppdmerge: 不正な LanguageVersion \"%s\" が %s にあります。" -#: ppdc/ppdmerge.cxx:176 +#: ppdc/ppdmerge.cxx:170 #, c-format msgid "ppdmerge: Ignoring PPD file %s." msgstr "ppdmerge: PPD ファイル %s を無視します。" -#: ppdc/ppdmerge.cxx:160 +#: ppdc/ppdmerge.cxx:154 #, c-format msgid "ppdmerge: Unable to backup %s to %s - %s" msgstr "ppdmerge: %s を %s にバックアップできません - %s" -#: systemv/lpstat.c:1844 +#: systemv/lpstat.c:1777 #, c-format msgid "printer %s disabled since %s -" msgstr "プリンター %s は %s から無効です -" -#: systemv/lpstat.c:1833 +#: systemv/lpstat.c:1766 #, c-format msgid "printer %s is idle. enabled since %s" msgstr "プリンター %s は待機中です。%s 以来有効です" -#: systemv/lpstat.c:1838 +#: systemv/lpstat.c:1771 #, c-format msgid "printer %s now printing %s-%d. enabled since %s" msgstr "プリンター %s は %s-%d を印刷しています。%s 以来有効です" -#: systemv/lpstat.c:1969 +#: systemv/lpstat.c:1900 #, c-format msgid "printer %s/%s disabled since %s -" msgstr "プリンター %s/%s は %s から無効です -" -#: systemv/lpstat.c:1955 +#: systemv/lpstat.c:1886 #, c-format msgid "printer %s/%s is idle. enabled since %s" msgstr "プリンター %s/%s は待機中です。%s 以来有効です" -#: systemv/lpstat.c:1962 +#: systemv/lpstat.c:1893 #, c-format msgid "printer %s/%s now printing %s-%d. enabled since %s" msgstr "プリンター %s/%s は現在 %s-%d を印刷中です。%s 以来有効です" @@ -7583,42 +7582,42 @@ msgid "processing" msgstr "処理中" -#: systemv/lp.c:668 +#: systemv/lp.c:662 #, c-format msgid "request id is %s-%d (%d file(s))" msgstr "リクエスト ID は %s-%d です (%d 個のファイル)" -#: cups/snmp.c:1016 +#: cups/snmp.c:972 msgid "request-id uses indefinite length" msgstr "リクエスト ID の長さが不定" -#: systemv/lpstat.c:2103 +#: systemv/lpstat.c:2032 msgid "scheduler is not running" msgstr "スケジューラーは動作していません" -#: systemv/lpstat.c:2099 +#: systemv/lpstat.c:2028 msgid "scheduler is running" msgstr "スケジューラーは動作中です" -#: cups/adminutil.c:2159 +#: cups/adminutil.c:2148 #, c-format msgid "stat of %s failed: %s" msgstr "%s の状態取得に失敗しました: %s" -#: berkeley/lpc.c:211 +#: berkeley/lpc.c:203 msgid "status\t\tShow status of daemon and queue." -msgstr "status\t\tデーモンとキューの状態を表示" +msgstr "status\t\tデーモンとキューの状態を表示。" #: cups/notify.c:96 cups/notify.c:137 msgid "stopped" msgstr "停止" -#: systemv/lpstat.c:1054 +#: systemv/lpstat.c:1052 #, c-format msgid "system default destination: %s" msgstr "システムのデフォルトの宛先: %s" -#: systemv/lpstat.c:1051 +#: systemv/lpstat.c:1049 #, c-format msgid "system default destination: %s/%s" msgstr "システムのデフォルトの宛先: %s/%s" @@ -7631,6 +7630,6 @@ msgid "untitled" msgstr "タイトルなし" -#: cups/snmp.c:1041 +#: cups/snmp.c:997 msgid "variable-bindings uses indefinite length" msgstr "variable-bindings の長さが不定" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/dctrl-tools.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/dctrl-tools.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/dctrl-tools.po 2014-07-09 09:08:44.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/dctrl-tools.po 2015-02-19 15:12:03.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 13:24+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 12:15+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: \n" #: lib/ifile.c:58 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debconf.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debconf.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debconf.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debconf.po 2015-02-19 15:11:49.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:49+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: ../Debconf/AutoSelect.pm:76 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debian-tasks.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debian-tasks.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debian-tasks.po 2014-07-09 09:08:42.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debian-tasks.po 2015-02-19 15:12:02.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 12:56+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:57+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #. Description diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debianutils.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debianutils.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/debianutils.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/debianutils.po 2015-02-19 15:11:49.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 10:50+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:40+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #. type: TH diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2014-07-09 09:08:51.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2015-02-19 15:12:10.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 14:35+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 13:03+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2014-07-09 09:08:53.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2015-02-19 15:12:11.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 14:53+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 13:16+0000\n" +"X-Generator: Launchpad (build 17341)\n" #: searchproviders/brainstorm.desktop:5 msgctxt "Name" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/diffutils.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/diffutils.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/diffutils.po 2014-07-09 09:08:43.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/diffutils.po 2015-02-19 15:12:02.000000000 +0000 @@ -19,8 +19,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-07-07 12:59+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 11:59+0000\n" +"X-Generator: Launchpad (build 17341)\n" "Language: ja\n" #: lib/c-stack.c:204 lib/c-stack.c:297 diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/doc-base.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/doc-base.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/doc-base.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/doc-base.po 2015-02-19 15:11:49.000000000 +0000 @@ -15,20 +15,20 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:54+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:43+0000\n" +"X-Generator: Launchpad (build 17341)\n" -#: ../../install-docs.in:97 +#: ../../install-docs.in:107 #, perl-format msgid "Too many arguments for `%s'." -msgstr "`%s' の引数が多すぎます。" +msgstr "`%s' に対して引数が多すぎます。" -#: ../../install-docs.in:100 +#: ../../install-docs.in:110 #, perl-format msgid "`%s' requires exactly one argument." -msgstr "`%s' は１つだけ引数が必要です。" +msgstr "`%s' には引数が 1 つだけ必要です。" -#: ../../install-docs.in:103 +#: ../../install-docs.in:113 #, perl-format msgid "Arguments missing for `%s'." msgstr "`%s' の引数がありません。" @@ -41,35 +41,35 @@ #: ../../perl/Debian/DocBase/DB.pm:43 #, perl-format msgid "Cannot read file `%s': %s." -msgstr "ファイルが読み込めません `%s': %s" +msgstr "ファイル `%s' を読み込めません: %s" #: ../../perl/Debian/DocBase/DB.pm:74 #, perl-format msgid "Saving `%s' (%d)." -msgstr "保存しています `%s' (%d)" +msgstr "`%s' を保存しています (%d)" #: ../../perl/Debian/DocBase/DB.pm:77 msgid "Needs to be root for this operation." -msgstr "この操作を行うにはroot権限が必要です。" +msgstr "この操作は root になる必要があります。" #: ../../perl/Debian/DocBase/DB.pm:83 #, perl-format msgid "Cannot save file `%s': %s." -msgstr "ファイルを書き込めません `%s': %s" +msgstr "ファイル `%s' を保存できません: %s" #: ../../perl/Debian/DocBase/DB.pm:87 #: ../../perl/Debian/DocBase/Document.pm:273 #: ../../perl/Debian/DocBase/InstallDocs.pm:156 #, perl-format msgid "Cannot rename file `%s' to `%s': %s." -msgstr "ファイル名を `%s' から `%s' に変更できません: %s" +msgstr "ファイル `%s' を `%s' に名前変更できません: %s" #: ../../perl/Debian/DocBase/DB.pm:108 #, perl-format msgid "Contents of file `%s':" -msgstr "ファイル `%s'の内容:" +msgstr "ファイル `%s' の内容:" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:105 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:104 msgid "" "Note: `install-docs --verbose --check file_name' may give more details about " "the above error." @@ -77,284 +77,283 @@ "Note: `install-docs --verbose --check file_name' may give more details about " "the above errors." msgstr[0] "" -"メモ: `install-docs --verbose --check file_name'を実行すると、エラーのより詳細な情報を得られます。" +"注意: `install-docs --verbose --check file_name' とすると上記のエラーについての詳細を得られます。" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:227 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:226 #: ../../perl/Debian/DocBase/Document.pm:167 #: ../../perl/Debian/DocBase/Utils.pm:183 #, perl-format msgid "Cannot open file `%s' for reading: %s." -msgstr "ファイル`%s'を読み込みモードで開けません: %s" +msgstr "ファイル `%s' を読み込むために開けません: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:258 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:257 #, perl-format msgid "`%s', line %d" -msgstr "`%s', %d 行" +msgstr "`%s', 行 %d" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:266 -#: ../../perl/Debian/DocBase/DocBaseFile.pm:269 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:265 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:268 #, perl-format msgid "Error in %s: %s." msgstr "%s でエラー: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:271 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:270 #, perl-format msgid "Warning in %s: %s." msgstr "%s で警告: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:273 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:272 #, perl-format msgid "Unknown flag (%s, %s)." -msgstr "未定義のフラグです (%s, %s)" +msgstr "不明なフラグ (%s, %s)" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:289 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:288 #, perl-format msgid "line in field `%s' seems not to be UTF-8 encoded, recoding" -msgstr "`%s'フィールドの行はUTF-8でエンコードされていないようなので、エンコードし直します。" +msgstr "フィールド `%s' の行は UTF-8 でエンコードされていないようです。再エンコードします" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:325 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:324 #, perl-format msgid "control field `%s' already defined" -msgstr "制御フィールド `%s'はすでに定義されています" +msgstr "コントロールフィールド `%s' は既に定義されています" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:328 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:327 #, perl-format msgid "unrecognised control field `%s'" -msgstr "認識できない制御フィールド %s'" +msgstr "`%s' は認識できないコントロールフィールドです" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:331 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:330 #, perl-format msgid "" "field `%s' in incorrect section (missing empty line before the field?)" -msgstr "" +msgstr "フィールド `%s' が正しくないセクションにあります (フィールドの前に空行がなくはないですか?)" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:338 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:337 msgid "syntax error - no field specified" -msgstr "シンタックスエラー - フィールドが指定されていません" +msgstr "構文エラー - フィールドが指定されていません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:339 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:338 #, perl-format msgid "field `%s' cannot consist of multi lines" -msgstr "" +msgstr "フィールド `%s' は複数行にできません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:343 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:342 #, perl-format msgid "syntax error in control file: %s" -msgstr "制御ファイルのシンタックスエラー: %s" +msgstr "コントロールファイルで構文エラーです: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:353 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:352 #, perl-format msgid "File `%s' not yet parsed." -msgstr "ファイル `%s' はまだパースされていません。" +msgstr "ファイル `%s' はまだパースしていません。" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:371 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:370 #, perl-format msgid "unknown section: `%s'" -msgstr "不明なセクション: `%s'" +msgstr "不明なセクションです: `%s'" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:385 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:384 #, perl-format msgid "value of `%s' not specified" msgstr "`%s' の値が指定されていません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:403 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:402 msgid "the first line does not contain valid `Document' field" -msgstr "第1行に有効な `Document' フィールドがありません" +msgstr "先頭行に適切な `Document' フィールドが含まれていません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:406 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:405 msgid "invalid value of `Document' field" -msgstr "`Document' フィールドの値が無効です" +msgstr "`Document' フィールドの値が不正です" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:409 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:408 #, perl-format msgid "(using `%s' as the root directory)" -msgstr "" +msgstr "(`%s' をルートディレクトリとして使用します)" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:416 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:415 #, perl-format msgid "unsupported doc-base file version: %s" -msgstr "サポートされていないdoc-baseのバージョン: %s" +msgstr "サポートしていない doc-base ファイルのバージョンです: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:437 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:436 #, perl-format msgid "format `%s' already defined" msgstr "フォーマット `%s' はすでに定義されています" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:441 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:440 #, perl-format msgid "format `%s' is not supported" -msgstr "フォーマット `%s'はサポートされていません" +msgstr "フォーマット `%s' はサポートされていません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:453 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:452 #, perl-format msgid "`%s' value missing for format `%s'" -msgstr "" +msgstr "フォーマット `%2$s' に対して `%1$s' の値がありません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:457 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:456 #, perl-format msgid "`%s' value has to be specified with absolute path: %s" -msgstr "" +msgstr "`%s' の値は絶対パスで指定しなければなりません: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:463 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:462 #, perl-format msgid "file `%s' does not exist" -msgstr "ファイル `%s' がありません" +msgstr "ファイル %s は存在しません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:474 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:473 #, perl-format msgid "`%s' value not specified for format `%s'" -msgstr "" +msgstr "フォーマット `%2$s' に対して `%1$s' の値を指定してません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:483 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:482 #, perl-format msgid "`%s' value has to be specified with absolute path: %s" -msgstr "" +msgstr "`%s' の値は絶対パスで指定しなければなりません: %s" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:489 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:488 #, perl-format msgid "file mask `%s' does not match any files" -msgstr "" +msgstr "ファイルマスク `%s' にマッチするファイルがありません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:502 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:501 msgid "no `Format' section found" -msgstr "" +msgstr "`Format' セクションがありません" -#: ../../perl/Debian/DocBase/DocBaseFile.pm:503 +#: ../../perl/Debian/DocBase/DocBaseFile.pm:502 msgid "all `Format' sections are invalid" -msgstr "" +msgstr "`Format' セクションがすべて不正です。" #: ../../perl/Debian/DocBase/Document.pm:153 msgid "---document-information---" -msgstr "" +msgstr "---ドキュメント情報---" #: ../../perl/Debian/DocBase/Document.pm:154 msgid "---format-description---" -msgstr "" +msgstr "---フォーマットの説明---" #: ../../perl/Debian/DocBase/Document.pm:155 msgid "---status-information---" -msgstr "" +msgstr "---状態情報---" #: ../../perl/Debian/DocBase/Document.pm:191 #, perl-format msgid "Document id in `%s' does not match our document id (%s != %s)." -msgstr "" +msgstr "`%s' のドキュメント ID が自身のドキュメント ID と一致しません (%s != %s)。" #: ../../perl/Debian/DocBase/Document.pm:199 #, perl-format msgid "`%s' contains errors, not registering." -msgstr "" +msgstr "`%s' にエラーがあります。登録しません。" #: ../../perl/Debian/DocBase/Document.pm:214 #, perl-format msgid "File `%s' is not registered, cannot remove." -msgstr "" +msgstr "ファイル `%s' は登録されておらず、削除できません。" #: ../../perl/Debian/DocBase/Document.pm:225 #, perl-format msgid "Unregistering all control files from document `%s'." -msgstr "" +msgstr "ドキュメント `%s' の全コントロールファイルを登録解除しています" #: ../../perl/Debian/DocBase/Document.pm:248 #: ../../perl/Debian/DocBase/InstallDocs.pm:153 #: ../../perl/Debian/DocBase/InstallDocs.pm:160 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:183 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:190 #, perl-format msgid "Cannot remove file `%s': %s." -msgstr "" +msgstr "ファイル `%s' を削除できません: %s" #: ../../perl/Debian/DocBase/Document.pm:255 #, perl-format msgid "Cannot open file `%s' for writing: %s." -msgstr "" +msgstr "ファイル `%s' を書き込み用に開けません: %s" #: ../../perl/Debian/DocBase/Document.pm:270 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:239 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:256 #, perl-format msgid "Cannot close file `%s': %s." -msgstr "" +msgstr "ファイル `%s' を閉じることができません: %s" #: ../../perl/Debian/DocBase/Document.pm:307 #, perl-format msgid "" "Unregistering file `%s', since its actual document id `%s' does not match " "its saved document id `%s'." -msgstr "" +msgstr "ファイル `%s' の実際のドキュメント ID `%s' と保存されたドキュメント ID `%s' が一致しないため、登録解除しています" #: ../../perl/Debian/DocBase/Document.pm:323 #, perl-format msgid "Error while merging %s with %s: inconsistent values of %s." -msgstr "" +msgstr "%s と %s のマージ中にエラー: %s の値が矛盾しています。" #: ../../perl/Debian/DocBase/Document.pm:332 #, perl-format msgid "Error while merging %s with %s: format %s already defined." -msgstr "" +msgstr "%s と %s のマージ中にエラー: フォーマット %s は既に定義されています。" #: ../../perl/Debian/DocBase/Document.pm:357 #, perl-format msgid "Document `%s' is not yet merged." -msgstr "" +msgstr "ドキュメント `%s' はまだマージされていません。" #: ../../perl/Debian/DocBase/Document.pm:434 #, perl-format msgid "`%s' not yet created." -msgstr "" +msgstr "`%s' はまだ作成していません。" #: ../../perl/Debian/DocBase/InstallDocs.pm:53 #, perl-format msgid "Mode already set: %s, %s." -msgstr "" +msgstr "モードを既に設定しています: %s, %s" #: ../../perl/Debian/DocBase/InstallDocs.pm:57 #, perl-format msgid "Value of the `%s' option ignored." -msgstr "" +msgstr "`%s' オプションの値を無視します。" #: ../../perl/Debian/DocBase/InstallDocs.pm:74 msgid "Unknown mode." -msgstr "" +msgstr "未知のモード。" #: ../../perl/Debian/DocBase/InstallDocs.pm:103 #: ../../perl/Debian/DocBase/InstallDocs.pm:278 #, perl-format msgid "Doc-base file `%s' does not exist." -msgstr "" +msgstr "Doc-base ファイル `%s' がありません。" #: ../../perl/Debian/DocBase/InstallDocs.pm:110 #, perl-format msgid "%s: Fatal error found, the file won't be registered." -msgstr "" +msgstr "%s: 致命的エラーが発生しました。ファイルを登録しません。" #: ../../perl/Debian/DocBase/InstallDocs.pm:112 #, perl-format msgid "%d warning or non-fatal error found." msgid_plural "%d warnings or non-fatal errors found." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d 個の警告ないし致命的でないエラーが発生しました。" #: ../../perl/Debian/DocBase/InstallDocs.pm:117 #, perl-format msgid "%s: No problems found." -msgstr "" +msgstr "%s: 問題はありませんでした。" #: ../../perl/Debian/DocBase/InstallDocs.pm:126 #, perl-format msgid "Document `%s' is not registered." -msgstr "" +msgstr "ドキュメント `%s' SGML文書ではありません" #: ../../perl/Debian/DocBase/InstallDocs.pm:142 #, perl-format msgid "Invalid argument `%s' passed to the `%s' option." -msgstr "" +msgstr "`%2$s' オプションに対して不当な引数 `%1$s' があります。" #: ../../perl/Debian/DocBase/InstallDocs.pm:186 msgid "Scrollkeeper was removed, forcing re-registration of all documents." -msgstr "" +msgstr "Scrollkeeper が削除されました。強制的に全ドキュメントを再登録します。" #: ../../perl/Debian/DocBase/InstallDocs.pm:187 msgid "Scrollkeeper was installed, forcing re-registration of all documents." -msgstr "" +msgstr "Scrollkeeper がインストールされました。強制的に全ドキュメントを再登録します。" #. Translators: the following message will be used to replace `%s' in `Processing %s', e.g. #. `Processing 5 removed doc-base files...' @@ -363,8 +362,7 @@ #, perl-format msgid "%d removed doc-base file" msgid_plural "%d removed doc-base files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個削除" #. Translators: the following message will be used to replace `%s' in `Processing %s', e.g. #. `Processing 5 changed doc-base files...' @@ -373,8 +371,7 @@ #, perl-format msgid "%d changed doc-base file" msgid_plural "%d changed doc-base files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個変更" #. Translators: the following message will be used to replace `%s' in `Processing %s', e.g. #. `Processing 5 added doc-base files...' @@ -383,13 +380,12 @@ #, perl-format msgid "%d added doc-base file" msgid_plural "%d added doc-base files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個追加" #: ../../perl/Debian/DocBase/InstallDocs.pm:214 #, perl-format msgid "Processing %s..." -msgstr "" +msgstr "%s を処理中..." #. Translators: the `Unregisteing %d doc-base files, ' and `re-registeing %d doc-base files...' #. messages are used together. @@ -397,8 +393,7 @@ #, perl-format msgid "Unregistering %d doc-base file, " msgid_plural "Unregistering %d doc-base files, " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個登録解除しています, " #. Translators: the `Unregisteing %d doc-base files, ' and `re-registeing %d doc-base files...' #. messages are used together. @@ -406,117 +401,114 @@ #, perl-format msgid "re-registering %d doc-base file..." msgid_plural "re-registering %d doc-base files..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個再登録しています..." #: ../../perl/Debian/DocBase/InstallDocs.pm:236 #, perl-format msgid "Unregistering %d doc-base file..." msgid_plural "Unregistering %d doc-base files..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個登録解除しています..." #: ../../perl/Debian/DocBase/InstallDocs.pm:239 #, perl-format msgid "Registering %d doc-base file..." msgid_plural "Registering %d doc-base files..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "doc-base ファイルを %d 個登録しています..." #: ../../perl/Debian/DocBase/InstallDocs.pm:257 #, perl-format msgid "Ignoring unregistered document `%s'." -msgstr "" +msgstr "登録されなかったドキュメント `%s' を無視します。" #: ../../perl/Debian/DocBase/InstallDocs.pm:260 #, perl-format msgid "Trying to remove document `%s'." -msgstr "" +msgstr "ドキュメント `%s' の削除を試みます。" #: ../../perl/Debian/DocBase/InstallDocs.pm:268 #, perl-format msgid "Ignoring unregistered file `%s'." -msgstr "" +msgstr "登録されなかったファイル `%s' を無視します。" #: ../../perl/Debian/DocBase/InstallDocs.pm:281 #, perl-format msgid "Trying to install file `%s'." -msgstr "" +msgstr "ファイル `%s' をインストールします。" #: ../../perl/Debian/DocBase/Programs/Dhelp.pm:78 #: ../../perl/Debian/DocBase/Programs/Dwww.pm:27 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:94 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:148 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:101 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:155 #, perl-format msgid "%s started." -msgstr "" +msgstr "%s を起動しました。" #: ../../perl/Debian/DocBase/Programs/Dhelp.pm:81 #: ../../perl/Debian/DocBase/Programs/Dwww.pm:30 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:74 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:81 #, perl-format msgid "Registering documents with %s..." -msgstr "" +msgstr "%s をドキュメントとして登録しています..." #: ../../perl/Debian/DocBase/Programs/Dhelp.pm:83 #: ../../perl/Debian/DocBase/Programs/Dwww.pm:33 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:84 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:91 #, perl-format msgid "Skipping execution of %s - %s package doesn't seem to be installed." -msgstr "" +msgstr "%s の実行をスキップします - %s パッケージがインストールされていないようです。" #: ../../perl/Debian/DocBase/Programs/Dhelp.pm:97 #: ../../perl/Debian/DocBase/Programs/Dwww.pm:35 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:141 -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:157 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:148 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:164 #, perl-format msgid "%s finished." -msgstr "" +msgstr "%s を完了しました。" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:67 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:74 #, perl-format msgid "Skipping registration of %s because of --no-update-menus." -msgstr "" +msgstr "--no-update-menus を指定したため %s の登録をスキップします。" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:79 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:86 #, perl-format msgid "Unregistering documents from %s..." -msgstr "" +msgstr "%s からドキュメントを登録解除しています..." -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:182 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:189 #, perl-format msgid "Removing scrollkeeper OMF file `%s'." -msgstr "" +msgstr "scrollkeeper OMF ファイル `%s' を削除しています。" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:188 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:195 #, perl-format msgid "Cannot delete directory `%s': %s." -msgstr "" +msgstr "ディレクトリ `%s' を削除できません: %s" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:214 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:231 #, perl-format msgid "Cannot create directory `%s': %s." -msgstr "" +msgstr "ディレクトリ `%s' を作成できません: %s" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:253 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:270 #, perl-format msgid "Scrollkeeper status changed: %d." -msgstr "" +msgstr "Scrollkeeper の状態を変更しました: %d" -#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:265 +#: ../../perl/Debian/DocBase/Programs/Scrollkeeper.pm:282 #, perl-format msgid "Scrollkeeper status set to %d." -msgstr "" +msgstr "Scrollkeeper の状態を %d に設定します。" #: ../../perl/Debian/DocBase/Utils.pm:59 #, perl-format msgid "No arguments passed to %s." -msgstr "引数が%sに渡されていません" +msgstr "%s に引数が渡されていません。" #: ../../perl/Debian/DocBase/Utils.pm:62 #, perl-format msgid "Executing `%s'" -msgstr "`%s' を実行" +msgstr "`%s' の実行中" #: ../../perl/Debian/DocBase/Utils.pm:64 #, perl-format @@ -526,44 +518,44 @@ #: ../../perl/Debian/DocBase/Utils.pm:67 #, perl-format msgid "Skipping execution of `%s'." -msgstr "" +msgstr "`%s' の実行をスキップしました。" #: ../../perl/Debian/DocBase/Utils.pm:98 msgid "Internal error: " -msgstr "" +msgstr "内部エラー: " #: ../../perl/Debian/DocBase/Utils.pm:99 msgid "Database error: " -msgstr "" +msgstr "データベースエラー: " #: ../../perl/Debian/DocBase/Utils.pm:104 msgid "Running fatal errors handler." -msgstr "" +msgstr "致命的エラーハンドラを実行しています" #: ../../perl/Debian/DocBase/Utils.pm:115 #, perl-format msgid "Signal %s received, terminating." -msgstr "" +msgstr "シグナル %s を受け取ったので終了します。" #: ../../perl/Debian/DocBase/Utils.pm:128 msgid "Ignore signals." -msgstr "" +msgstr "シグナルを無視します。" #: ../../perl/Debian/DocBase/Utils.pm:132 msgid "Restore signals." -msgstr "" +msgstr "シグナルを復元します。" #: ../../perl/Debian/DocBase/Utils.pm:135 msgid "Setup signals." -msgstr "" +msgstr "シグナルを設定します。" #: ../../perl/Debian/DocBase/Utils.pm:138 #: ../../perl/Debian/DocBase/Utils.pm:158 #, perl-format msgid "Invalid argument of IgnoreRestoreSignals(): %s." -msgstr "" +msgstr "IgnoreRestoreSignals() の引数が不正です: %s" #: ../../perl/Debian/DocBase/Utils.pm:143 #, perl-format msgid "Invalid counter (%d) in IgnoreRestoreSignals(%s)." -msgstr "" +msgstr "IgnoreRestoreSignals(%2$s) でカウンタ異常 (%1$d) があります。" diff -Nru language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/dpkg-dev.po language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/dpkg-dev.po --- language-pack-ja-base-14.04+20140707/data/ja/LC_MESSAGES/dpkg-dev.po 2014-07-09 09:08:29.000000000 +0000 +++ language-pack-ja-base-14.04+20150219/data/ja/LC_MESSAGES/dpkg-dev.po 2015-02-19 15:11:50.000000000 +0000 @@ -15,34 +15,38 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2014-07-07 10:57+0000\n" -"X-Generator: Launchpad (build 17086)\n" +"X-Launchpad-Export-Date: 2015-02-19 10:44+0000\n" +"X-Generator: Launchpad (build 17341)\n" -#: scripts/dpkg-architecture.pl:37 scripts/dpkg-buildflags.pl:33 -#: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-checkbuilddeps.pl:39 -#: scripts/dpkg-distaddfile.pl:36 scripts/dpkg-genchanges.pl:102 -#: scripts/dpkg-gencontrol.pl:65 scripts/dpkg-gensymbols.pl:53 +#: scripts/dpkg-architecture.pl:38 scripts/dpkg-buildflags.pl:33 +#: scripts/dpkg-buildpackage.pl:49 scripts/dpkg-checkbuilddeps.pl:39 +#: scripts/dpkg-distaddfile.pl:37 scripts/dpkg-genchanges.pl:121 +#: scripts/dpkg-gencontrol.pl:66 scripts/dpkg-gensymbols.pl:53 #: scripts/dpkg-mergechangelogs.pl:54 scripts/dpkg-name.pl:46 -#: scripts/dpkg-parsechangelog.pl:36 scripts/dpkg-scanpackages.pl:67 -#: scripts/dpkg-scansources.pl:79 scripts/dpkg-shlibdeps.pl:550 -#: scripts/dpkg-source.pl:472 scripts/changelog/debian.pl:37 +#: scripts/dpkg-parsechangelog.pl:36 scripts/dpkg-scanpackages.pl:69 +#: scripts/dpkg-scansources.pl:79 scripts/dpkg-shlibdeps.pl:545 +#: scripts/dpkg-source.pl:521 scripts/dpkg-vendor.pl:32 +#: scripts/changelog/debian.pl:37 #, perl-format msgid "Debian %s version %s.\n" msgstr "" -#: scripts/dpkg-architecture.pl:39 scripts/dpkg-buildflags.pl:35 -#: scripts/dpkg-buildpackage.pl:46 scripts/dpkg-distaddfile.pl:38 -#: scripts/dpkg-genchanges.pl:104 scripts/dpkg-gencontrol.pl:67 +#: scripts/dpkg-architecture.pl:40 scripts/dpkg-buildflags.pl:35 +#: scripts/dpkg-buildpackage.pl:51 scripts/dpkg-distaddfile.pl:39 +#: scripts/dpkg-genchanges.pl:123 scripts/dpkg-gencontrol.pl:68 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:38 -#: scripts/dpkg-shlibdeps.pl:552 scripts/dpkg-source.pl:474 -#: scripts/changelog/debian.pl:39 +#: scripts/dpkg-shlibdeps.pl:547 scripts/dpkg-source.pl:523 +#: scripts/dpkg-vendor.pl:34 scripts/changelog/debian.pl:39 msgid "" "\n" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" +"\n" +"これはフリーソフトウェアです。コピー条件は、GNU General Public License version 2 または\n" +"それ以降を参照してください。まったくの無保証です。\n" -#: scripts/dpkg-architecture.pl:47 +#: scripts/dpkg-architecture.pl:48 scripts/dpkg-vendor.pl:42 #, perl-format msgid "Usage: %s [