Binary files /tmp/tmplopjcm0v/8FEACQvgxu/language-pack-ja-base-20.04+20210802/data/extra.tar and /tmp/tmplopjcm0v/lxVBfdTioX/language-pack-ja-base-20.04+20220211/data/extra.tar differ diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/acl.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/acl.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/acl.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/acl.po 2022-02-11 23:04:20.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: 2021-08-02 16:39+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:31+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: libacl/perm_copy_fd.c:124 libacl/perm_copy_fd.c:136 #: libacl/perm_copy_fd.c:198 libacl/perm_copy_file.c:124 @@ -147,28 +147,28 @@ msgid "%s: malloc failed: %s\n" msgstr "%s: mallocに失敗しました: %s↵\n" -#: tools/getfacl.c:497 +#: tools/getfacl.c:498 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "" "%s: 絶対パス名から先頭の '/' を削除\n" "\n" -#: tools/getfacl.c:568 +#: tools/getfacl.c:569 #, c-format msgid "%s %s -- get file access control lists\n" msgstr "" "%s %s -- ファイルのアクセス・コントロール・リストを取得する\n" "\n" -#: tools/getfacl.c:570 tools/getfacl.c:750 +#: tools/getfacl.c:571 tools/getfacl.c:756 #, c-format msgid "Usage: %s [-%s] file ...\n" msgstr "" "使い方: %s [-%s] file ...\n" "\n" -#: tools/getfacl.c:576 +#: tools/getfacl.c:577 #, c-format msgid " -d, --default display the default access control list\n" msgstr "" @@ -192,21 +192,21 @@ " -p, --absolute-names don't strip leading '/' in pathnames\n" msgstr "" -#: tools/getfacl.c:595 tools/setfacl.c:299 +#: tools/setfacl.c:299 tools/getfacl.c:597 #, c-format msgid "" " -v, --version print version and exit\n" " -h, --help this help text\n" msgstr "" -#: tools/getfacl.c:737 tools/setfacl.c:316 +#: tools/setfacl.c:316 tools/getfacl.c:743 #, c-format msgid "%s: Standard input: %s\n" msgstr "" "%s: 標準入力: %s\n" "\n" -#: tools/getfacl.c:752 tools/setfacl.c:655 +#: tools/setfacl.c:655 tools/getfacl.c:758 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/adduser.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/adduser.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/adduser.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/adduser.po 2022-02-11 23:04:13.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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:48+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/alsa-utils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/alsa-utils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/alsa-utils.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/alsa-utils.po 2022-02-11 23:04:18.000000000 +0000 @@ -15,27 +15,27 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:48+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: alsamixer/card_select.c:126 alsamixer/device_name.c:126 +#: alsamixer/card_select.c:77 alsamixer/device_name.c:127 msgid "Sound Card" msgstr "サウンドカード" -#: alsamixer/card_select.c:181 +#: alsamixer/card_select.c:115 msgid "(default)" msgstr "(デフォルト)" -#: alsamixer/card_select.c:191 +#: alsamixer/card_select.c:125 msgid "cannot enumerate sound cards" msgstr "サウンドカードを検出できません" -#: alsamixer/card_select.c:215 +#: alsamixer/card_select.c:151 msgid "enter device name..." msgstr "デバイス名入力..." -#: alsamixer/cli.c:40 +#: alsamixer/cli.c:43 msgid "Usage: alsamixer [options]" msgstr "使用法: alsamixer [オプション]" @@ -53,7 +53,7 @@ " -D, --device=名前 ミキサーデバイス名\n" " -V, --view=表示モード 開始時の表示モード: playback/capture/all" -#: alsamixer/cli.c:46 +#: alsamixer/cli.c:53 msgid "" "Debugging options:\n" " -g, --no-color toggle using of colors\n" @@ -63,22 +63,22 @@ " -g, --no-color カラー/モノクロ表示\n" " -a, --abstraction=名前 ミキサー抽象レベル: none/basic" -#: alsamixer/cli.c:77 +#: alsamixer/cli.c:88 #, c-format msgid "invalid card index: %s\n" msgstr "不正なカード番号: %s\n" -#: alsamixer/cli.c:103 +#: alsamixer/cli.c:130 #, c-format msgid "unknown abstraction level: %s\n" msgstr "未知の抽象レベル: %s\n" -#: alsamixer/cli.c:108 +#: alsamixer/cli.c:135 #, c-format msgid "unknown option: %c\n" msgstr "未知のオプション '%c'\n" -#: alsamixer/cli.c:110 +#: alsamixer/cli.c:137 msgid "try `alsamixer --help' for more information\n" msgstr "より詳しい情報は「alsamixer --help」を実行してください\n" @@ -91,138 +91,138 @@ msgid "%s: %s\n" msgstr "%s: %s\n" -#: alsamixer/mixer_display.c:98 +#: alsamixer/mixer_display.c:99 msgid "Card:" msgstr "カード:" -#: alsamixer/mixer_display.c:99 +#: alsamixer/mixer_display.c:100 msgid "Chip:" msgstr "チップ:" -#: alsamixer/mixer_display.c:100 +#: alsamixer/mixer_display.c:101 msgid "View:" msgstr "表示:" -#: alsamixer/mixer_display.c:101 +#: alsamixer/mixer_display.c:102 msgid "Item:" msgstr "項目:" -#: alsamixer/mixer_display.c:104 +#: alsamixer/mixer_display.c:105 msgid "F1: Help" msgstr "F1: ヘルプ" -#: alsamixer/mixer_display.c:105 +#: alsamixer/mixer_display.c:106 msgid "F2: System information" msgstr "F2: システム情報" -#: alsamixer/mixer_display.c:106 +#: alsamixer/mixer_display.c:107 msgid "F6: Select sound card" msgstr "F6: サウンドカード選択" -#: alsamixer/mixer_display.c:107 +#: alsamixer/mixer_display.c:108 msgid "Esc: Exit" msgstr "Esc: 終了" -#: alsamixer/mixer_display.c:174 +#: alsamixer/mixer_display.c:179 msgid "(unplugged)" msgstr "(未接続)" -#: alsamixer/mixer_display.c:192 +#: alsamixer/mixer_display.c:197 msgid "Playback" msgstr "再生" -#: alsamixer/mixer_display.c:193 +#: alsamixer/mixer_display.c:198 msgid "Capture" msgstr "録音" -#: alsamixer/mixer_display.c:194 +#: alsamixer/mixer_display.c:199 msgid "All" msgstr "全て" -#: alsamixer/mixer_display.c:234 +#: alsamixer/mixer_display.c:240 msgid "mute" msgstr "ミュート" -#: alsamixer/mixer_display.c:275 alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:281 alsamixer/mixer_display.c:291 msgid "dB gain:" msgstr "dBゲイン:" -#: alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:291 #, c-format msgid " [%s %s, %s]" msgstr " [%s %s, %s]" -#: alsamixer/mixer_display.c:294 alsamixer/mixer_display.c:300 -#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:306 +#: alsamixer/mixer_display.c:312 alsamixer/mixer_display.c:318 msgid "Off" msgstr "オフ" -#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:318 msgid "On" msgstr "オン" -#: alsamixer/mixer_display.c:363 +#: alsamixer/mixer_display.c:370 msgid "The sound device was unplugged." msgstr "デバイスが接続されていません" -#: alsamixer/mixer_display.c:364 +#: alsamixer/mixer_display.c:371 msgid "Press F6 to select another sound card." msgstr "他のカードを選択するにはF6を押して下さい" -#: alsamixer/mixer_display.c:379 +#: alsamixer/mixer_display.c:386 msgid "This sound device does not have any playback controls." msgstr "このカードには再生ミキサーがありません" -#: alsamixer/mixer_display.c:381 +#: alsamixer/mixer_display.c:388 msgid "This sound device does not have any capture controls." msgstr "このカードには録音ミキサーがありません" -#: alsamixer/mixer_display.c:383 +#: alsamixer/mixer_display.c:390 msgid "This sound device does not have any controls." msgstr "このカードには制御可能なミキサーがありません" #. TRANSLATORS: playback on; one character -#: alsamixer/mixer_display.c:516 alsamixer/mixer_display.c:521 +#: alsamixer/mixer_display.c:523 alsamixer/mixer_display.c:528 msgid "O" msgstr "" #. TRANSLATORS: playback muted; one character -#: alsamixer/mixer_display.c:518 alsamixer/mixer_display.c:522 +#: alsamixer/mixer_display.c:525 alsamixer/mixer_display.c:529 msgid "M" msgstr "M" #. TRANSLATORS: "left"; no more than two characters -#: alsamixer/mixer_display.c:536 +#: alsamixer/mixer_display.c:545 msgid "L" msgstr "L" #. TRANSLATORS: "right"; no more than two characters -#: alsamixer/mixer_display.c:540 +#: alsamixer/mixer_display.c:551 msgid "R" msgstr "R" #. TRANSLATORS: no more than eight characters -#: alsamixer/mixer_display.c:542 +#: alsamixer/mixer_display.c:555 msgid "CAPTURE" msgstr "録音" -#: alsamixer/mixer_display.c:592 +#: alsamixer/mixer_display.c:611 msgid "Front" msgstr "フロント" -#: alsamixer/mixer_display.c:595 +#: alsamixer/mixer_display.c:614 msgid "Rear" msgstr "リア" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:124 +#: alsamixer/mixer_display.c:617 speaker-test/speaker-test.c:124 msgid "Center" msgstr "センター" -#: alsamixer/mixer_display.c:601 +#: alsamixer/mixer_display.c:620 msgid "Woofer" msgstr "低音" -#: alsamixer/mixer_display.c:604 +#: alsamixer/mixer_display.c:623 msgid "Side" msgstr "サイド" @@ -355,11 +355,11 @@ msgid "Help" msgstr "ヘルプ" -#: alsamixer/proc_files.c:103 +#: alsamixer/proc_files.c:56 msgid "Select File" msgstr "ファイル選択" -#: alsamixer/textbox.c:52 alsamixer/textbox.c:66 +#: alsamixer/textbox.c:51 alsamixer/textbox.c:65 msgid "Error" msgstr "エラー" @@ -436,7 +436,7 @@ " --fatal-errors treat all errors as fatal\n" msgstr "" -#: aplay/aplay.c:250 speaker-test/speaker-test.c:945 +#: aplay/aplay.c:250 speaker-test/speaker-test.c:961 #, c-format msgid "Recognized sample formats are:" msgstr "認識されるサンプルフォーマット:" @@ -518,189 +518,189 @@ msgid "value %i for channels is invalid" msgstr "不正なチャネル数 %i" -#: aplay/aplay.c:629 +#: aplay/aplay.c:630 #, c-format msgid "wrong extended format '%s'" msgstr "不正な拡張フォーマット '%s'" -#: aplay/aplay.c:637 +#: aplay/aplay.c:638 #, c-format msgid "invalid rate argument '%s'" msgstr "" -#: aplay/aplay.c:644 +#: aplay/aplay.c:645 #, c-format msgid "bad speed value %i" msgstr "不正なレート値 %i" -#: aplay/aplay.c:650 +#: aplay/aplay.c:651 msgid "duration and samples arguments cannot be used together" msgstr "" -#: aplay/aplay.c:655 +#: aplay/aplay.c:656 #, c-format msgid "invalid duration argument '%s'" msgstr "" -#: aplay/aplay.c:662 +#: aplay/aplay.c:663 msgid "samples and duration arguments cannot be used together" msgstr "" -#: aplay/aplay.c:667 +#: aplay/aplay.c:668 #, c-format msgid "invalid samples argument '%s'" msgstr "" -#: aplay/aplay.c:679 +#: aplay/aplay.c:680 #, c-format msgid "invalid period time argument '%s'" msgstr "" -#: aplay/aplay.c:686 +#: aplay/aplay.c:687 #, c-format msgid "invalid buffer time argument '%s'" msgstr "" -#: aplay/aplay.c:693 +#: aplay/aplay.c:694 #, c-format msgid "invalid period size argument '%s'" msgstr "" -#: aplay/aplay.c:700 +#: aplay/aplay.c:701 #, c-format msgid "invalid buffer size argument '%s'" msgstr "" -#: aplay/aplay.c:707 +#: aplay/aplay.c:708 #, c-format msgid "invalid min available space argument '%s'" msgstr "" -#: aplay/aplay.c:714 +#: aplay/aplay.c:715 #, c-format msgid "invalid start delay argument '%s'" msgstr "" -#: aplay/aplay.c:721 +#: aplay/aplay.c:722 #, c-format msgid "invalid stop delay argument '%s'" msgstr "" -#: aplay/aplay.c:776 +#: aplay/aplay.c:777 #, c-format msgid "invalid test coef argument '%s'" msgstr "" -#: aplay/aplay.c:788 +#: aplay/aplay.c:789 #, c-format msgid "invalid max file time argument '%s'" msgstr "" -#: aplay/aplay.c:808 speaker-test/speaker-test.c:571 +#: aplay/aplay.c:809 speaker-test/speaker-test.c:587 #, c-format msgid "Unable to parse channel map string: %s\n" msgstr "" -#: aplay/aplay.c:814 +#: aplay/aplay.c:815 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "より詳しい情報は「%s --help」を実行してください\n" -#: aplay/aplay.c:830 +#: aplay/aplay.c:831 #, c-format msgid "audio open error: %s" msgstr "オーディオオープンエラー %s" -#: aplay/aplay.c:835 +#: aplay/aplay.c:836 #, c-format msgid "info error: %s" msgstr "情報エラー: %s" -#: aplay/aplay.c:842 +#: aplay/aplay.c:843 #, c-format msgid "nonblock setting error: %s" msgstr "ノンブロック設定エラー: %s" -#: aplay/aplay.c:852 aplay/aplay.c:976 aplay/aplay.c:1266 aplay/aplay.c:1466 -#: aplay/aplay.c:1989 aplay/aplay.c:2019 +#: aplay/aplay.c:861 aplay/aplay.c:985 aplay/aplay.c:1275 aplay/aplay.c:1475 +#: aplay/aplay.c:2055 aplay/aplay.c:2085 msgid "not enough memory" msgstr "メモリが足りません" -#: aplay/aplay.c:876 +#: aplay/aplay.c:885 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "プロセスIDファイル%sを作成できませんでした: %s" -#: aplay/aplay.c:966 +#: aplay/aplay.c:975 #, c-format msgid "read error (called from line %i)" msgstr "リードエラー (%i 行)" -#: aplay/aplay.c:1033 +#: aplay/aplay.c:1042 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "'fmt'チャンクの長さが不明です(%uを読みましたが、少なくとも%uであるべきです)" -#: aplay/aplay.c:1044 +#: aplay/aplay.c:1053 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" msgstr "拡張'fmt'チャンクの長さが不明です(%uを読みましたが、少なくとも%uであるべきです)" -#: aplay/aplay.c:1049 +#: aplay/aplay.c:1058 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "拡張 'fmt ' チャンクに不正なフォーマットタグがあります" -#: aplay/aplay.c:1056 +#: aplay/aplay.c:1065 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "PCMエンコードあるいはFLOATエンコードされていないため、WAVEファイルフォーマット0x%04xを再生できませんでした。" -#: aplay/aplay.c:1061 +#: aplay/aplay.c:1070 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "%d トラックを含む WAVE ファイルは再生できません" -#: aplay/aplay.c:1069 aplay/aplay.c:1195 +#: aplay/aplay.c:1078 aplay/aplay.c:1204 #, c-format msgid "Warning: format is changed to U8\n" msgstr "警告: フォーマットは U8 に変更されます\n" -#: aplay/aplay.c:1079 aplay/aplay.c:1092 aplay/aplay.c:1103 +#: aplay/aplay.c:1088 aplay/aplay.c:1101 aplay/aplay.c:1112 #, c-format msgid "Warning: format is changed to %s\n" msgstr "" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1117 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" msgstr " %2$d バイト長 %1$d サンプルビット (%3$d チャネル) の WAVE ファイルは再生できません" -#: aplay/aplay.c:1131 +#: aplay/aplay.c:1140 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr " %d ビット長のサンプルの WAVE ファイルは再生できません" -#: aplay/aplay.c:1189 +#: aplay/aplay.c:1198 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "警告: フォーマットは MU_LAW に変更されます\n" -#: aplay/aplay.c:1201 +#: aplay/aplay.c:1210 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "警告: フォーマットは S16_BE に変更されます\n" -#: aplay/aplay.c:1214 aplay/aplay.c:2304 aplay/aplay.c:2311 aplay/aplay.c:2836 +#: aplay/aplay.c:1223 aplay/aplay.c:2376 aplay/aplay.c:2383 aplay/aplay.c:2912 msgid "read error" msgstr "リードエラー" -#: aplay/aplay.c:1244 +#: aplay/aplay.c:1253 msgid "Channel numbers don't match between hw_params and channel map" msgstr "" -#: aplay/aplay.c:1253 +#: aplay/aplay.c:1262 #, c-format msgid "Warning: unable to get channel map\n" msgstr "" @@ -710,180 +710,180 @@ msgid "Channel %d doesn't match with hw_parmas" msgstr "" -#: aplay/aplay.c:1314 +#: aplay/aplay.c:1323 msgid "Broken configuration for this PCM: no configurations available" msgstr "指定の PCM を使用できません: 設定がありません" -#: aplay/aplay.c:1318 +#: aplay/aplay.c:1327 #, c-format msgid "HW Params of device \"%s\":\n" msgstr "" -#: aplay/aplay.c:1338 +#: aplay/aplay.c:1347 msgid "Access type not available" msgstr "アクセスタイプが使用不可能" -#: aplay/aplay.c:1343 +#: aplay/aplay.c:1352 msgid "Sample format non available" msgstr "サンプルフォーマットが使用不可能" -#: aplay/aplay.c:1349 +#: aplay/aplay.c:1358 msgid "Channels count non available" msgstr "チャネル数が使用不可能" -#: aplay/aplay.c:1364 +#: aplay/aplay.c:1373 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "警告: レートが不正確です (要求値 = %iHz, 使用値 = %iHz)\n" -#: aplay/aplay.c:1370 +#: aplay/aplay.c:1379 #, c-format msgid " please, try the plug plugin %s\n" msgstr " plug プラグイン%s を使用してください\n" -#: aplay/aplay.c:1407 +#: aplay/aplay.c:1416 msgid "Unable to install hw params:" msgstr "hw params のインストールに失敗しました:" -#: aplay/aplay.c:1414 +#: aplay/aplay.c:1423 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "period と buffer サイズには同じ値を使用できません (%lu == %lu)" -#: aplay/aplay.c:1420 +#: aplay/aplay.c:1429 msgid "Unable to get current sw params." msgstr "" -#: aplay/aplay.c:1449 +#: aplay/aplay.c:1458 msgid "unable to install sw params:" msgstr "sw params のインストールに失敗しました:" -#: aplay/aplay.c:1484 +#: aplay/aplay.c:1493 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "snd_pcm_mmap_beginの問題: %s" -#: aplay/aplay.c:1513 +#: aplay/aplay.c:1522 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "標準入力のO_NONBLOCKフラグの設定に失敗しました\n" -#: aplay/aplay.c:1537 +#: aplay/aplay.c:1559 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1545 +#: aplay/aplay.c:1567 #, c-format msgid "pause push error: %s" msgstr "停止の実行エラー: %s" -#: aplay/aplay.c:1556 +#: aplay/aplay.c:1578 #, c-format msgid "pause release error: %s" msgstr "停止の解除エラー: %s" -#: aplay/aplay.c:1572 +#: aplay/aplay.c:1594 #, c-format msgid "" "\r=== PAUSE === " msgstr "" "\r=== 停止 === " -#: aplay/aplay.c:1614 +#: aplay/aplay.c:1636 #, c-format msgid "status error: %s" msgstr "ステータスエラー: %s" -#: aplay/aplay.c:1619 +#: aplay/aplay.c:1641 #, c-format msgid "fatal %s: %s" msgstr "" -#: aplay/aplay.c:1620 aplay/aplay.c:1631 aplay/aplay.c:1634 aplay/aplay.c:1642 +#: aplay/aplay.c:1642 aplay/aplay.c:1653 aplay/aplay.c:1656 aplay/aplay.c:1664 msgid "underrun" msgstr "アンダーラン" -#: aplay/aplay.c:1620 aplay/aplay.c:1631 aplay/aplay.c:1642 +#: aplay/aplay.c:1642 aplay/aplay.c:1653 aplay/aplay.c:1664 msgid "overrun" msgstr "オーバーラン" -#: aplay/aplay.c:1630 aplay/aplay.c:1641 +#: aplay/aplay.c:1652 aplay/aplay.c:1663 #, c-format msgid "%s!!! (at least %.3f ms long)\n" msgstr "%s!!! (少なくとも %.3f ms)\n" -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1668 #, c-format msgid "Status:\n" msgstr "ステータス:\n" -#: aplay/aplay.c:1650 +#: aplay/aplay.c:1672 #, c-format msgid "xrun: prepare error: %s" msgstr "xrun: 準備エラー: %s" -#: aplay/aplay.c:1656 +#: aplay/aplay.c:1679 #, c-format msgid "Status(DRAINING):\n" msgstr "ステータス(DRAINING):\n" -#: aplay/aplay.c:1660 +#: aplay/aplay.c:1683 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "録音ストリームのフォーマットが変更？ 修復を試みます...\n" -#: aplay/aplay.c:1662 +#: aplay/aplay.c:1685 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "xrun(入力): 準備エラー: %s" -#: aplay/aplay.c:1669 +#: aplay/aplay.c:1692 #, c-format msgid "Status(R/W):\n" msgstr "ステータス(R/W):\n" -#: aplay/aplay.c:1672 +#: aplay/aplay.c:1695 #, c-format msgid "read/write error, state = %s" msgstr "読み書きエラー, ステータス = %s" -#: aplay/aplay.c:1682 +#: aplay/aplay.c:1705 #, c-format msgid "Suspended. Trying resume. " msgstr "サスペンド中です。レジュームします。 " -#: aplay/aplay.c:1688 +#: aplay/aplay.c:1711 #, c-format msgid "Failed. Restarting stream. " msgstr "失敗しました。ストリームを再スタートします。 " -#: aplay/aplay.c:1691 +#: aplay/aplay.c:1714 #, c-format msgid "suspend: prepare error: %s" msgstr "サスペンド: prepare エラー: %s" -#: aplay/aplay.c:1696 +#: aplay/aplay.c:1719 #, c-format msgid "Done.\n" msgstr "終了\n" -#: aplay/aplay.c:1718 +#: aplay/aplay.c:1741 #, c-format msgid " !clip " msgstr " !クリップ " -#: aplay/aplay.c:1865 +#: aplay/aplay.c:1893 #, c-format msgid "Unsupported bit size %d.\n" msgstr "ビットサイズ%dはサポートされていません。\n" -#: aplay/aplay.c:1899 +#: aplay/aplay.c:1929 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大ピーク (%li サンプル): 0x%08x " -#: aplay/aplay.c:1933 +#: aplay/aplay.c:1970 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " @@ -891,112 +891,112 @@ msgstr "" "不適切な疑いのあるバッファー位置です (%li total): avail = %li, delay = %li, buffer = %li\n" -#: aplay/aplay.c:2061 +#: aplay/aplay.c:2127 #, c-format msgid "write error: %s" msgstr "書込エラー: %s" -#: aplay/aplay.c:2109 +#: aplay/aplay.c:2175 #, c-format msgid "writev error: %s" msgstr "書込(writev)エラー: %s" -#: aplay/aplay.c:2153 +#: aplay/aplay.c:2221 #, c-format msgid "read error: %s" msgstr "読込エラー: %s" -#: aplay/aplay.c:2197 +#: aplay/aplay.c:2268 #, c-format msgid "readv error: %s" msgstr "読込(readv)エラー: %s" -#: aplay/aplay.c:2245 +#: aplay/aplay.c:2317 msgid "can't allocate buffer for silence" msgstr "サイレンス用のバッファの取得に失敗しました" -#: aplay/aplay.c:2254 aplay/aplay.c:2482 aplay/aplay.c:2487 aplay/aplay.c:2537 -#: aplay/aplay.c:2546 aplay/aplay.c:2553 aplay/aplay.c:2563 aplay/aplay.c:2569 -#: aplay/aplay.c:2641 aplay/aplay.c:2671 aplay/aplay.c:2685 +#: aplay/aplay.c:2326 aplay/aplay.c:2554 aplay/aplay.c:2559 aplay/aplay.c:2611 +#: aplay/aplay.c:2620 aplay/aplay.c:2627 aplay/aplay.c:2637 aplay/aplay.c:2643 +#: aplay/aplay.c:2715 aplay/aplay.c:2745 aplay/aplay.c:2759 msgid "write error" msgstr "書込エラー" -#: aplay/aplay.c:2267 +#: aplay/aplay.c:2339 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - 無音エラー" -#: aplay/aplay.c:2270 +#: aplay/aplay.c:2342 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush エラー" -#: aplay/aplay.c:2295 +#: aplay/aplay.c:2367 msgid "malloc error" msgstr "malloc エラー" -#: aplay/aplay.c:2299 +#: aplay/aplay.c:2371 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "Creative Labs Channel ファイル '%s' を演奏中...\n" -#: aplay/aplay.c:2367 aplay/aplay.c:2462 +#: aplay/aplay.c:2439 aplay/aplay.c:2534 msgid "can't play packed .voc files" msgstr "packed .voc ファイルは演奏できません" -#: aplay/aplay.c:2422 +#: aplay/aplay.c:2494 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "ループ演奏できません。%s はシーク不可能です\n" -#: aplay/aplay.c:2471 +#: aplay/aplay.c:2543 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知のブロックタイプ %d: 終了します。" -#: aplay/aplay.c:2605 +#: aplay/aplay.c:2679 #, c-format msgid "Wave doesn't support %s format..." msgstr "WAVE は %s フォーマットをサポートしません..." -#: aplay/aplay.c:2665 +#: aplay/aplay.c:2739 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc オーディオは %s フォーマットをサポートしません..." -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2814 msgid "Playing" msgstr "再生中" -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2814 msgid "Recording" msgstr "録音中" -#: aplay/aplay.c:2744 +#: aplay/aplay.c:2818 #, c-format msgid "Rate %d Hz, " msgstr "レート %d Hz, " -#: aplay/aplay.c:2746 +#: aplay/aplay.c:2820 #, c-format msgid "Mono" msgstr "モノラル" -#: aplay/aplay.c:2748 +#: aplay/aplay.c:2822 #, c-format msgid "Stereo" msgstr "ステレオ" -#: aplay/aplay.c:2750 +#: aplay/aplay.c:2824 #, c-format msgid "Channels %i" msgstr "チャネル数 %i" -#: aplay/aplay.c:3351 +#: aplay/aplay.c:3431 #, c-format msgid "You need to specify %u files" msgstr "" -#: aplay/aplay.c:3404 +#: aplay/aplay.c:3484 #, c-format msgid "You need to specify %d files" msgstr "%d 個のファイルを指定してください" @@ -1127,7 +1127,7 @@ msgid "invalid sender address %s\n" msgstr "送信アドレスが不正です: %s\n" -#: seq/aconnect/aconnect.c:370 seq/aseqnet/aseqnet.c:290 +#: seq/aconnect/aconnect.c:370 seq/aseqnet/aseqnet.c:303 #, c-format msgid "invalid destination address %s\n" msgstr "受信アドレスが不正です: %s\n" @@ -1152,127 +1152,127 @@ msgid "Connection failed (%s)\n" msgstr "接続に失敗 (%s)\n" -#: seq/aseqnet/aseqnet.c:164 +#: seq/aseqnet/aseqnet.c:171 #, c-format msgid "aseqnet - network client/server on ALSA sequencer\n" msgstr "aseqnet - ALSA sequencer 上のネットワーククライアント／サーバ\n" -#: seq/aseqnet/aseqnet.c:165 +#: seq/aseqnet/aseqnet.c:172 #, c-format msgid " Copyright (C) 1999 Takashi Iwai\n" msgstr " Copyright (C) 1999 Takashi Iwai\n" -#: seq/aseqnet/aseqnet.c:166 +#: seq/aseqnet/aseqnet.c:173 #, c-format msgid "usage:\n" msgstr "使用法:\n" -#: seq/aseqnet/aseqnet.c:167 +#: seq/aseqnet/aseqnet.c:174 #, c-format msgid " server mode: aseqnet [-options]\n" msgstr " サーバモード: aseqnet [-オプション]\n" -#: seq/aseqnet/aseqnet.c:168 +#: seq/aseqnet/aseqnet.c:175 #, c-format msgid " client mode: aseqnet [-options] server_host\n" msgstr " クライアントモード: aseqnet [-オプション] サーバホスト\n" -#: seq/aseqnet/aseqnet.c:169 +#: seq/aseqnet/aseqnet.c:176 #, c-format msgid "options:\n" msgstr "オプション:\n" -#: seq/aseqnet/aseqnet.c:170 +#: seq/aseqnet/aseqnet.c:178 #, c-format msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr "" -#: seq/aseqnet/aseqnet.c:171 +#: seq/aseqnet/aseqnet.c:179 #, c-format msgid " -s,--source addr : read from given addr (client:port)\n" msgstr " -s,--source addr : 指定のアドレス(クライアント:ポート)から読み込む\n" -#: seq/aseqnet/aseqnet.c:172 +#: seq/aseqnet/aseqnet.c:180 #, c-format msgid " -d,--dest addr : write to given addr (client:port)\n" msgstr " -d,--dest addr : 指定のアドレス(クライアント:ポート)に書き込む\n" -#: seq/aseqnet/aseqnet.c:173 +#: seq/aseqnet/aseqnet.c:182 #, c-format msgid " -v, --verbose : print verbose messages\n" msgstr " -v,--verbose : 冗長メッセージ表示\n" -#: seq/aseqnet/aseqnet.c:174 +#: seq/aseqnet/aseqnet.c:183 #, c-format msgid " -i, --info : print certain received events\n" msgstr " -i,--info : 受信イベントを表示する\n" -#: seq/aseqnet/aseqnet.c:188 +#: seq/aseqnet/aseqnet.c:197 #, c-format msgid "can't malloc\n" msgstr "malloc できません\n" -#: seq/aseqnet/aseqnet.c:213 +#: seq/aseqnet/aseqnet.c:222 #, c-format msgid "closing files..\n" msgstr "ファイルを閉じます..\n" -#: seq/aseqnet/aseqnet.c:272 +#: seq/aseqnet/aseqnet.c:285 #, c-format msgid "sequencer opened: %d:%d\n" msgstr "シーケンサーを開きました: %d:%d\n" -#: seq/aseqnet/aseqnet.c:279 +#: seq/aseqnet/aseqnet.c:292 #, c-format msgid "invalid source address %s\n" msgstr "不正な送信アドレス %s\n" -#: seq/aseqnet/aseqnet.c:309 +#: seq/aseqnet/aseqnet.c:319 #, c-format msgid "service '%s' is not found in /etc/services\n" msgstr "サービス '%s' が /etc/services に見つかりません\n" -#: seq/aseqnet/aseqnet.c:377 +#: seq/aseqnet/aseqnet.c:414 #, c-format msgid "too many connections!\n" msgstr "接続が多すぎます!\n" -#: seq/aseqnet/aseqnet.c:388 +#: seq/aseqnet/aseqnet.c:425 #, c-format msgid "accepted[%d]\n" msgstr "了解[%d]\n" -#: seq/aseqnet/aseqnet.c:411 +#: seq/aseqnet/aseqnet.c:447 #, c-format msgid "can't get address %s\n" msgstr "アドレス %s を取得できません\n" -#: seq/aseqnet/aseqnet.c:422 +#: seq/aseqnet/aseqnet.c:475 #, c-format msgid "ok.. connected\n" msgstr "ok.. 接続\n" -#: seq/aseqnet/aseqnet.c:518 +#: seq/aseqnet/aseqnet.c:574 #, c-format msgid "Channel %2d: Control event : %5d\n" msgstr "チャネル %2d: コントロール : %5d\n" -#: seq/aseqnet/aseqnet.c:522 +#: seq/aseqnet/aseqnet.c:578 #, c-format msgid "Channel %2d: Pitchbender : %5d\n" msgstr "チャネル %2d: ピッチベンド : %5d\n" -#: seq/aseqnet/aseqnet.c:526 +#: seq/aseqnet/aseqnet.c:582 #, c-format msgid "Channel %2d: Note On event : %5d\n" msgstr "チャネル %2d: ノートオン : %5d\n" -#: seq/aseqnet/aseqnet.c:530 +#: seq/aseqnet/aseqnet.c:586 #, c-format msgid "Channel %2d: Note Off event: %5d\n" msgstr "チャネル %2d: ノートオフ : %5d\n" -#: seq/aseqnet/aseqnet.c:585 +#: seq/aseqnet/aseqnet.c:641 #, c-format msgid "disconnected\n" msgstr "切り離し\n" @@ -1337,202 +1337,202 @@ msgid "Channel 16" msgstr "チャネル １６" -#: speaker-test/speaker-test.c:424 +#: speaker-test/speaker-test.c:440 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "再生用に設定できません: 設定がみつかりません: %s\n" -#: speaker-test/speaker-test.c:431 +#: speaker-test/speaker-test.c:447 #, c-format msgid "Access type not available for playback: %s\n" msgstr "アクセスタイプが不正です: %s\n" -#: speaker-test/speaker-test.c:438 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "指定のサンプルフォーマットを使用できません: %s\n" -#: speaker-test/speaker-test.c:445 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "チャネル数 (%i) を使用できません: %s\n" -#: speaker-test/speaker-test.c:453 +#: speaker-test/speaker-test.c:469 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "レート %iHz を使用できません: %s\n" -#: speaker-test/speaker-test.c:458 +#: speaker-test/speaker-test.c:474 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "設定レートが一致しません< (要求値 %iHz, 取得値 %iHz, エラー %d)\n" -#: speaker-test/speaker-test.c:462 +#: speaker-test/speaker-test.c:478 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "レート %iHz (要求値 %iHz)\n" -#: speaker-test/speaker-test.c:468 +#: speaker-test/speaker-test.c:484 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "バッファサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:469 +#: speaker-test/speaker-test.c:485 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "ピリオドサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:471 +#: speaker-test/speaker-test.c:487 #, c-format msgid "Requested period time %u us\n" msgstr "要求されたピリオド長 %u us\n" -#: speaker-test/speaker-test.c:474 +#: speaker-test/speaker-test.c:490 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "ピリオド長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:480 +#: speaker-test/speaker-test.c:496 #, c-format msgid "Requested buffer time %u us\n" msgstr "要求されたバッファ長 %u us\n" -#: speaker-test/speaker-test.c:483 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "バッファ長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:492 +#: speaker-test/speaker-test.c:508 #, c-format msgid "Using max buffer size %lu\n" msgstr "最大バッファサイズ %lu を使用\n" -#: speaker-test/speaker-test.c:495 +#: speaker-test/speaker-test.c:511 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "buffer_size %lu を設定できません: %s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:517 #, c-format msgid "Periods = %u\n" msgstr "ピリオド数 = %u\n" -#: speaker-test/speaker-test.c:504 +#: speaker-test/speaker-test.c:520 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "ピリオド数 %u を設定できません: %s\n" -#: speaker-test/speaker-test.c:513 +#: speaker-test/speaker-test.c:529 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "hw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:519 +#: speaker-test/speaker-test.c:535 #, c-format msgid "was set period_size = %lu\n" msgstr "period_size = %lu で設定\n" -#: speaker-test/speaker-test.c:520 +#: speaker-test/speaker-test.c:536 #, c-format msgid "was set buffer_size = %lu\n" msgstr "buffer_size = %lu で設定\n" -#: speaker-test/speaker-test.c:522 +#: speaker-test/speaker-test.c:538 #, c-format msgid "buffer to small, could not use\n" msgstr "バッファが小さすぎます\n" -#: speaker-test/speaker-test.c:535 +#: speaker-test/speaker-test.c:551 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "現在の swparams を取得できません: %s\n" -#: speaker-test/speaker-test.c:542 +#: speaker-test/speaker-test.c:558 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "start_threshold モードを設定できません: %s\n" -#: speaker-test/speaker-test.c:549 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "avail_min を設定できません: %s\n" -#: speaker-test/speaker-test.c:556 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "再生用の sw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:576 +#: speaker-test/speaker-test.c:592 #, c-format msgid "Unable to set channel map: %s\n" msgstr "" -#: speaker-test/speaker-test.c:601 +#: speaker-test/speaker-test.c:617 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "アンダーランから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:612 +#: speaker-test/speaker-test.c:628 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "サスペンドから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:676 speaker-test/speaker-test.c:1191 +#: speaker-test/speaker-test.c:692 speaker-test/speaker-test.c:1207 #, c-format msgid "No enough memory\n" msgstr "メモリが足りません\n" -#: speaker-test/speaker-test.c:681 +#: speaker-test/speaker-test.c:697 #, c-format msgid "Cannot open WAV file %s\n" msgstr "WAVファイルがオープンできません: %s\n" -#: speaker-test/speaker-test.c:685 speaker-test/speaker-test.c:714 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:730 #, c-format msgid "Invalid WAV file %s\n" msgstr "不正なWAVファイルです: %s\n" -#: speaker-test/speaker-test.c:690 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Not a WAV file: %s\n" msgstr "WAVファイルではありません: %s\n" -#: speaker-test/speaker-test.c:694 +#: speaker-test/speaker-test.c:710 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "未サポートのWAVフォーマット %d: %s\n" -#: speaker-test/speaker-test.c:699 +#: speaker-test/speaker-test.c:715 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s はモノストリームではありません (%d チャネル)\n" -#: speaker-test/speaker-test.c:704 +#: speaker-test/speaker-test.c:720 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "サンプルレートが不一致です(%d): %s\n" -#: speaker-test/speaker-test.c:709 +#: speaker-test/speaker-test.c:725 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "未サポートのサンプルフォーマットビット %d: %s\n" -#: speaker-test/speaker-test.c:770 +#: speaker-test/speaker-test.c:786 #, c-format msgid "Undefined channel %d\n" msgstr "未定義のチャネル %d\n" -#: speaker-test/speaker-test.c:821 +#: speaker-test/speaker-test.c:837 #, c-format msgid "Write error: %d,%s\n" msgstr "書込エラー: %d,%s\n" -#: speaker-test/speaker-test.c:823 +#: speaker-test/speaker-test.c:839 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery 失敗: %d,%s\n" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:942 #, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1556,72 +1556,72 @@ "\n" msgstr "" -#: speaker-test/speaker-test.c:1058 +#: speaker-test/speaker-test.c:1074 #, c-format msgid "Invalid number of periods %d\n" msgstr "不正なピリオド数 %d\n" -#: speaker-test/speaker-test.c:1074 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1090 speaker-test/speaker-test.c:1094 #, c-format msgid "Invalid test type %s\n" msgstr "不正なテストタイプ %s\n" -#: speaker-test/speaker-test.c:1111 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Unknown option '%c'\n" msgstr "未知のオプション '%c'\n" -#: speaker-test/speaker-test.c:1125 +#: speaker-test/speaker-test.c:1141 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s オプションの値が不正です\n" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1156 #, c-format msgid "Playback device is %s\n" msgstr "再生デバイス: %s\n" -#: speaker-test/speaker-test.c:1141 +#: speaker-test/speaker-test.c:1157 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n" -#: speaker-test/speaker-test.c:1144 +#: speaker-test/speaker-test.c:1160 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "16 オクターブのピンクノイズを使用\n" -#: speaker-test/speaker-test.c:1147 +#: speaker-test/speaker-test.c:1163 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "正弦波レート: %.4fHz\n" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1166 #, c-format msgid "WAV file(s)\n" msgstr "WAV ファイル\n" -#: speaker-test/speaker-test.c:1160 +#: speaker-test/speaker-test.c:1176 #, c-format msgid "Playback open error: %d,%s\n" msgstr "再生オープンエラー: %d,%s\n" -#: speaker-test/speaker-test.c:1166 +#: speaker-test/speaker-test.c:1182 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "hwparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1170 +#: speaker-test/speaker-test.c:1186 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "swparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1216 speaker-test/speaker-test.c:1238 +#: speaker-test/speaker-test.c:1232 speaker-test/speaker-test.c:1254 #, c-format msgid "Transfer failed: %s\n" msgstr "転送に失敗しました: %s\n" -#: speaker-test/speaker-test.c:1224 +#: speaker-test/speaker-test.c:1240 #, c-format msgid "Time per period = %lf\n" msgstr "ピリオド時間 = %lf\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apparmorapplet.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apparmorapplet.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apparmorapplet.po 2021-08-03 08:53:39.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apparmorapplet.po 2022-02-11 23:04:22.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: 2021-08-02 17:35+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:30+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apparmor-parser.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apparmor-parser.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apparmor-parser.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apparmor-parser.po 2022-02-11 23:04:17.000000000 +0000 @@ -14,98 +14,109 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:35+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:30+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: ../parser_include.c:113 ../parser_include.c:111 +#: ../parser_include.c:113 ../parser_include.c:111 ../parser_include.c:96 msgid "Error: Out of memory.\n" msgstr "エラー:メモリ不足\n" -#: ../parser_include.c:123 ../parser_include.c:121 +#: ../parser_include.c:123 ../parser_include.c:121 ../parser_include.c:106 #, c-format msgid "Error: basedir %s is not a directory, skipping.\n" msgstr "エラー:ベースディレクトリ %s はディレクトリではありません。スキップしています\n" -#: ../parser_include.c:137 +#: ../parser_include.c:137 ../parser_include.c:122 #, c-format msgid "Error: Could not add directory %s to search path.\n" msgstr "エラー:ディレクトリ %s を検索パスに追加できませんでした。\n" -#: ../parser_include.c:147 ../parser_include.c:151 +#: ../parser_include.c:147 ../parser_include.c:151 ../parser_include.c:136 msgid "Error: Could not allocate memory.\n" msgstr "エラー:メモリを割り当てることができませんでした。\n" #: ../parser_interface.c:69 ../parser_interface.c:72 ../parser_interface.c:49 +#: ../parser_interface.c:52 msgid "Bad write position\n" msgstr "不正書き込み位置\n" #: ../parser_interface.c:72 ../parser_interface.c:75 ../parser_interface.c:52 +#: ../parser_interface.c:55 msgid "Permission denied\n" msgstr "拒否されたパーミッション\n" #: ../parser_interface.c:75 ../parser_interface.c:78 ../parser_interface.c:55 +#: ../parser_interface.c:58 msgid "Out of memory\n" msgstr "メモリ不足\n" #: ../parser_interface.c:78 ../parser_interface.c:81 ../parser_interface.c:58 +#: ../parser_interface.c:61 msgid "Couldn't copy profile: Bad memory address\n" msgstr "" #: ../parser_interface.c:81 ../parser_interface.c:84 ../parser_interface.c:61 +#: ../parser_interface.c:64 msgid "Profile doesn't conform to protocol\n" msgstr "プロファイルがプロトコルに準拠していません\n" #: ../parser_interface.c:84 ../parser_interface.c:87 ../parser_interface.c:64 +#: ../parser_interface.c:67 msgid "Profile does not match signature\n" msgstr "プロファイルが署名に一致していません\n" #: ../parser_interface.c:87 ../parser_interface.c:90 ../parser_interface.c:67 +#: ../parser_interface.c:70 msgid "Profile version not supported by Apparmor module\n" msgstr "プロファイルバージョンがApparmorモジュールでサポートされていません\n" #: ../parser_interface.c:90 ../parser_interface.c:93 ../parser_interface.c:70 +#: ../parser_interface.c:73 msgid "Profile already exists\n" msgstr "プロファイルはすでに存在します\n" #: ../parser_interface.c:93 ../parser_interface.c:96 ../parser_interface.c:73 +#: ../parser_interface.c:76 msgid "Profile doesn't exist\n" msgstr "プロファイルが存在しません\n" #: ../parser_interface.c:96 ../parser_interface.c:99 ../parser_interface.c:76 +#: ../parser_interface.c:79 msgid "Permission denied; attempted to load a profile while confined?\n" msgstr "" #: ../parser_interface.c:99 ../parser_interface.c:102 ../parser_interface.c:79 +#: ../parser_interface.c:82 #, c-format msgid "Unknown error (%d): %s\n" msgstr "" -#: ../parser_interface.c:116 ../parser_interface.c:119 -#: ../parser_interface.c:96 +#: ../parser_interface.c:116 ../parser_interface.c:119 ../parser_interface.c:96 +#: ../parser_interface.c:100 #, c-format msgid "%s: Unable to add \"%s\". " msgstr "%s: 「%s」を追加できません。 " #: ../parser_interface.c:121 ../parser_interface.c:124 -#: ../parser_interface.c:101 +#: ../parser_interface.c:101 ../parser_interface.c:105 #, c-format msgid "%s: Unable to replace \"%s\". " msgstr "%s: 「%s」を置換できません。 " #: ../parser_interface.c:126 ../parser_interface.c:129 -#: ../parser_interface.c:106 +#: ../parser_interface.c:106 ../parser_interface.c:110 #, c-format msgid "%s: Unable to remove \"%s\". " msgstr "%s: 「%s」を削除できません。 " #: ../parser_interface.c:131 ../parser_interface.c:134 -#: ../parser_interface.c:111 +#: ../parser_interface.c:111 ../parser_interface.c:115 #, 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 +#: ../parser_interface.c:115 ../parser_interface.c:119 #, c-format msgid "%s: Unable to write to output file\n" msgstr "" @@ -113,24 +124,25 @@ #: ../parser_interface.c:138 ../parser_interface.c:162 #: ../parser_interface.c:141 ../parser_interface.c:165 #: ../parser_interface.c:118 ../parser_interface.c:142 +#: ../parser_interface.c:123 ../parser_interface.c:147 #, 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 +#: ../parser_interface.c:127 ../parser_interface.c:132 #, c-format msgid "Addition succeeded for \"%s\".\n" msgstr "「%s」に続く追加。\n" #: ../parser_interface.c:151 ../parser_interface.c:154 -#: ../parser_interface.c:131 +#: ../parser_interface.c:131 ../parser_interface.c:136 #, c-format msgid "Replacement succeeded for \"%s\".\n" msgstr "「%s」に続く置換。\n" #: ../parser_interface.c:155 ../parser_interface.c:158 -#: ../parser_interface.c:135 +#: ../parser_interface.c:135 ../parser_interface.c:140 #, c-format msgid "Removal succeeded for \"%s\".\n" msgstr "「%s」に続く削除。\n" @@ -141,7 +153,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 +#: ../parser_interface.c:446 ../parser_interface.c:476 #, c-format msgid "profile %s network rules not enforced\n" msgstr "" @@ -186,7 +198,7 @@ msgstr "%s: プロファイルエントリ全体を書き込むことができません\n" #: ../parser_interface.c:839 ../parser_interface.c:831 -#: ../parser_interface.c:593 +#: ../parser_interface.c:593 ../parser_interface.c:579 #, c-format msgid "%s: Unable to write entire profile entry to cache\n" msgstr "" @@ -196,7 +208,7 @@ msgid "Could not open '%s'" msgstr "" -#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 +#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 parser_lex.l:174 #, c-format msgid "fstat failed for '%s'" msgstr "" @@ -222,7 +234,7 @@ msgid "Found unexpected character: '%s'" msgstr "予期しない文字を検出しました: '%s'" -#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 +#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 parser_lex.l:474 msgid "Variable declarations do not accept trailing commas" msgstr "" @@ -242,6 +254,7 @@ msgstr "%s: サブドメインベースマウントポイントに対してメモリを割り当てることができませんでした\n" #: ../parser_main.c:577 ../parser_main.c:616 ../parser_main.c:479 +#: ../parser_main.c:1444 #, c-format msgid "" "Warning: unable to find a suitable fs in %s, is it mounted?\n" @@ -251,6 +264,7 @@ "--subdomainfsを使用して上書きしてください。\n" #: ../parser_main.c:597 ../parser_main.c:635 ../parser_main.c:498 +#: ../parser_main.c:822 #, c-format msgid "" "%s: Sorry. You need root privileges to run this program.\n" @@ -260,6 +274,7 @@ "\n" #: ../parser_main.c:604 ../parser_main.c:642 ../parser_main.c:505 +#: ../parser_main.c:828 #, c-format msgid "" "%s: Warning! You've set this program setuid root.\n" @@ -271,7 +286,7 @@ "\n" #: ../parser_main.c:704 ../parser_main.c:813 ../parser_main.c:836 -#: ../parser_main.c:946 ../parser_main.c:860 +#: ../parser_main.c:946 ../parser_main.c:860 ../parser_main.c:1038 #, c-format msgid "Error: Could not read profile %s: %s.\n" msgstr "エラー:プロファイル %s: %s を読み込めませんでした。\n" @@ -293,26 +308,36 @@ #: 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 +#: ../network.c:314 ../af_unix.cc:203 ../parser_misc.c:215 ../parser_misc.c:939 +#: parser_yacc.y:343 parser_yacc.y:367 parser_yacc.y:533 parser_yacc.y:543 +#: parser_yacc.y:660 parser_yacc.y:741 parser_yacc.y:750 parser_yacc.y:1171 +#: parser_yacc.y:1219 parser_yacc.y:1255 parser_yacc.y:1264 parser_yacc.y:1268 +#: parser_yacc.y:1278 parser_yacc.y:1288 parser_yacc.y:1382 parser_yacc.y:1460 +#: parser_yacc.y:1592 parser_yacc.y:1597 parser_yacc.y:1674 parser_yacc.y:1692 +#: parser_yacc.y:1699 parser_yacc.y:1748 ../network.c:315 ../af_unix.cc:194 msgid "Memory allocation error." msgstr "メモリ割り当てエラー。" #: ../parser_main.c:740 ../parser_main.c:872 ../parser_main.c:757 +#: ../parser_main.c:975 #, c-format msgid "Cached load succeeded for \"%s\".\n" msgstr "" #: ../parser_main.c:744 ../parser_main.c:876 ../parser_main.c:761 +#: ../parser_main.c:979 #, c-format msgid "Cached reload succeeded for \"%s\".\n" msgstr "" #: ../parser_main.c:910 ../parser_main.c:1058 ../parser_main.c:967 +#: ../parser_main.c:1132 #, c-format msgid "%s: Errors found in file. Aborting.\n" msgstr "%s: ファイルにエラーが検出されました。中止しています。\n" #: ../parser_misc.c:426 ../parser_misc.c:597 ../parser_misc.c:339 +#: ../parser_misc.c:532 msgid "" "Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n" "See the apparmor.d(5) manpage for details.\n" @@ -322,14 +347,17 @@ #: ../parser_misc.c:467 ../parser_misc.c:474 ../parser_misc.c:638 #: ../parser_misc.c:645 ../parser_misc.c:380 ../parser_misc.c:387 +#: ../parser_misc.c:573 ../parser_misc.c:580 msgid "Conflict 'a' and 'w' perms are mutually exclusive." msgstr "競合:パーミッション「a」と「w」は互いに排他的です。" #: ../parser_misc.c:491 ../parser_misc.c:662 ../parser_misc.c:404 +#: ../parser_misc.c:597 msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified" msgstr "Execクォリファイア「i」は無効です、相反するクォリファイアがすでに指定されています" #: ../parser_misc.c:502 ../parser_misc.c:673 ../parser_misc.c:415 +#: ../parser_misc.c:608 #, c-format msgid "" "Unconfined exec qualifier (%c%c) allows some dangerous environment variables " @@ -340,23 +368,27 @@ #: ../parser_misc.c:510 ../parser_misc.c:551 ../parser_misc.c:681 #: ../parser_misc.c:722 ../parser_misc.c:423 ../parser_misc.c:464 +#: ../parser_misc.c:616 ../parser_misc.c:657 #, 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:450 ../parser_misc.c:458 +#: ../parser_misc.c:643 ../parser_misc.c:651 #, 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:506 +#: ../parser_misc.c:699 #, c-format msgid "Internal: unexpected mode character '%c' in input" msgstr "内部:予期しないモード文字「%c」が入力されています" #: ../parser_misc.c:615 ../parser_misc.c:786 ../parser_misc.c:528 +#: ../parser_misc.c:721 #, c-format msgid "Internal error generated invalid perm 0x%llx\n" msgstr "内部エラーが発生しました。パーミッシオンが正しくありません 0x%llx\n" @@ -368,10 +400,12 @@ msgstr "AppArmorパーサエラー: %s\n" #: ../parser_merge.c:92 ../parser_merge.c:91 ../parser_merge.c:83 +#: ../parser_merge.c:71 msgid "Couldn't merge entries. Out of Memory\n" msgstr "エントリをマージできませんでした。メモリ不足\n" #: ../parser_merge.c:111 ../parser_merge.c:113 ../parser_merge.c:105 +#: ../parser_merge.c:93 #, c-format msgid "profile %s: has merged rule %s with conflicting x modifiers\n" msgstr "" @@ -380,115 +414,118 @@ msgid "Profile attachment must begin with a '/'." msgstr "" -#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 +#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 parser_yacc.y:407 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:384 +#: parser_yacc.y:296 parser_yacc.y:338 parser_yacc.y:384 parser_yacc.y:449 #, 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:506 +#: parser_yacc.y:417 parser_yacc.y:460 parser_yacc.y:506 parser_yacc.y:581 msgid "Profile flag chroot_relative conflicts with namespace_relative" msgstr "" -#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 +#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 parser_yacc.y:585 msgid "Profile flag mediate_deleted conflicts with delegate_deleted" msgstr "" -#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 +#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 parser_yacc.y:588 msgid "" "Profile flag attach_disconnected conflicts with no_attach_disconnected" msgstr "" -#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 +#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 parser_yacc.y:591 msgid "Profile flag chroot_attach conflicts with chroot_no_attach" msgstr "" -#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 +#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 parser_yacc.y:607 msgid "Profile flag 'debug' is no longer valid." msgstr "プロファイルフラグ'debug'は現在は利用できません。" -#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 +#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 parser_yacc.y:629 #, c-format msgid "Invalid profile flag: %s." msgstr "プロファイルフラグが正しくありません: %s" #: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 parser_yacc.y:594 +#: parser_yacc.y:673 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 +#: parser_yacc.y:598 parser_yacc.y:630 parser_yacc.y:677 parser_yacc.y:709 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:602 +#: parser_yacc.y:524 parser_yacc.y:556 parser_yacc.y:602 parser_yacc.y:681 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:633 +#: parser_yacc.y:549 parser_yacc.y:587 parser_yacc.y:633 parser_yacc.y:712 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:660 +#: parser_yacc.y:739 msgid "Assert: `network_rule' return invalid protocol." msgstr "Assert:「network_rule」は無効なプロトコルを返しています。" -#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 +#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 parser_yacc.y:867 msgid "Assert: `change_profile' returned NULL." msgstr "Assert:「change_profile」はNULLを返しています。" -#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 +#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 parser_yacc.y:905 msgid "Assert: 'hat rule' returned NULL." msgstr "Assert:「hat rule」はNULLを返しています。" -#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 +#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 parser_yacc.y:914 msgid "Assert: 'local_profile rule' returned NULL." msgstr "Assert: 「local_profile rule」は NULL を返しています。" -#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 +#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 parser_yacc.y:1077 #, 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:1092 +#: parser_yacc.y:882 parser_yacc.y:986 parser_yacc.y:1092 parser_yacc.y:1181 msgid "unsafe rule missing exec permissions" msgstr "ルールが安全ではありません。execパーミッションがありません" -#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 +#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 parser_yacc.y:1148 msgid "subset can only be used with link rules." msgstr "サブセットはリンクルールと共にのみ使用することができます" -#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 +#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 parser_yacc.y:1150 msgid "link and exec perms conflict on a file rule using ->" msgstr "以下のファイルルール内でリンクとexecパーミッションが矛盾しています ->" -#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 +#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 parser_yacc.y:1152 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:1109 +#: parser_yacc.y:921 parser_yacc.y:1003 parser_yacc.y:1109 parser_yacc.y:1198 #, 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 +#: parser_yacc.y:1145 parser_yacc.y:1155 parser_yacc.y:1234 parser_yacc.y:1244 msgid "Invalid network entry." msgstr "無効なネットワークエントリ" #: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 parser_yacc.y:1510 +#: parser_yacc.y:1617 #, c-format msgid "Invalid capability %s." msgstr "無効な機能です %s" -#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 +#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 parser_yacc.y:1637 #, c-format msgid "AppArmor parser error for %s%s%s at line %d: %s\n" msgstr "" @@ -504,17 +541,20 @@ msgstr "%s: 不正オープン{、入れ子グループ分けは許可されていません\n" #: ../parser_regex.c:265 ../parser_regex.c:274 ../parser_regex.c:278 +#: ../parser_regex.c:306 #, 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:284 +#: ../parser_regex.c:312 #, 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:361 +#: ../parser_regex.c:403 #, c-format msgid "" "%s: Regex grouping error: Unclosed grouping or character class, expecting " @@ -527,16 +567,19 @@ msgstr "%s: 内部バッファオーバーフローが検出されました、%d文字超えています\n" #: ../parser_regex.c:355 ../parser_regex.c:361 ../parser_regex.c:377 +#: ../parser_regex.c:419 #, 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:421 +#: ../parser_regex.c:487 #, c-format msgid "%s: Invalid profile name '%s' - bad regular expression\n" msgstr "" #: ../parser_policy.c:202 ../parser_policy.c:402 ../parser_policy.c:375 +#: ../parser_policy.c:383 #, c-format msgid "ERROR merging rules for profile %s, failed to load\n" msgstr "プロファイル %s のルールをマージ中にエラーが発生しました。ロードできませんでした\n" @@ -553,16 +596,19 @@ "\t「**」はルールの末尾にのみ使用できます。\n" #: ../parser_policy.c:279 ../parser_policy.c:359 ../parser_policy.c:332 +#: ../parser_policy.c:340 #, 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:362 +#: ../parser_policy.c:370 #, 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:355 +#: ../parser_policy.c:363 #, c-format msgid "ERROR adding hat access rule for profile %s\n" msgstr "プロファイル %s にハットアクセスルールを追加する際にエラーになりました\n" @@ -592,7 +638,7 @@ msgid "%s: Errors found in combining rules postprocessing. Aborting.\n" msgstr "%s: 規則後処理の結合中にエラーが見つかりました。中断しています。\n" -#: parser_lex.l:180 parser_lex.l:186 +#: parser_lex.l:180 parser_lex.l:186 parser_lex.l:187 #, c-format msgid "Could not process include directory '%s' in '%s'" msgstr "" @@ -602,7 +648,8 @@ msgstr "" #: ../parser_main.c:1115 ../parser_main.c:1132 ../parser_main.c:1024 -#: ../parser_main.c:1041 +#: ../parser_main.c:1041 ../parser_main.c:1332 ../parser_main.c:1354 +#: ../parser_misc.c:280 ../parser_misc.c:299 ../parser_misc.c:308 msgid "Out of memory" msgstr "" @@ -631,11 +678,11 @@ msgid "Internal error generated invalid DBus perm 0x%x\n" msgstr "" -#: parser_yacc.y:575 parser_yacc.y:621 +#: parser_yacc.y:575 parser_yacc.y:621 parser_yacc.y:700 msgid "deny prefix not allowed" msgstr "" -#: parser_yacc.y:612 parser_yacc.y:658 +#: parser_yacc.y:612 parser_yacc.y:658 parser_yacc.y:737 msgid "owner prefix not allowed" msgstr "" @@ -651,41 +698,41 @@ msgid "owner prefix not allow on capability rules" msgstr "" -#: parser_yacc.y:1357 parser_yacc.y:1613 +#: parser_yacc.y:1357 parser_yacc.y:1613 parser_yacc.y:1722 #, c-format msgid "invalid mount conditional %s%s" msgstr "" -#: parser_yacc.y:1374 parser_yacc.y:1628 +#: parser_yacc.y:1374 parser_yacc.y:1628 parser_yacc.y:1737 msgid "bad mount rule" msgstr "" -#: parser_yacc.y:1381 parser_yacc.y:1635 +#: parser_yacc.y:1381 parser_yacc.y:1635 parser_yacc.y:1744 msgid "mount point conditions not currently supported" msgstr "" -#: parser_yacc.y:1398 parser_yacc.y:1650 +#: parser_yacc.y:1398 parser_yacc.y:1650 parser_yacc.y:1759 #, c-format msgid "invalid pivotroot conditional '%s'" msgstr "" -#: ../parser_regex.c:241 ../parser_regex.c:236 +#: ../parser_regex.c:241 ../parser_regex.c:236 ../parser_regex.c:264 #, c-format msgid "" "%s: Regex grouping error: Invalid close ], no matching open [ detected\n" msgstr "" -#: ../parser_regex.c:257 ../parser_regex.c:256 +#: ../parser_regex.c:257 ../parser_regex.c:256 ../parser_regex.c:284 #, c-format msgid "%s: Regex grouping error: Exceeded maximum nesting of {}\n" msgstr "" -#: ../parser_policy.c:366 ../parser_policy.c:339 +#: ../parser_policy.c:366 ../parser_policy.c:339 ../parser_policy.c:347 #, c-format msgid "ERROR processing policydb rules for profile %s, failed to load\n" msgstr "" -#: ../parser_policy.c:396 ../parser_policy.c:369 +#: ../parser_policy.c:396 ../parser_policy.c:369 ../parser_policy.c:377 #, c-format msgid "ERROR replacing aliases for profile %s, failed to load\n" msgstr "" @@ -705,51 +752,51 @@ msgid "Error: Could not read cache file '%s', skipping...\n" msgstr "" -#: ../parser_misc.c:575 +#: ../parser_misc.c:575 ../parser_misc.c:768 #, c-format msgid "Internal: unexpected %s mode character '%c' in input" msgstr "" -#: ../parser_misc.c:599 +#: ../parser_misc.c:599 ../parser_misc.c:792 #, c-format msgid "Internal error generated invalid %s perm 0x%x\n" msgstr "" -#: parser_yacc.y:703 +#: parser_yacc.y:703 parser_yacc.y:784 msgid "owner prefix not allowed on mount rules" msgstr "" -#: parser_yacc.y:720 +#: parser_yacc.y:720 parser_yacc.y:801 msgid "owner prefix not allowed on dbus rules" msgstr "" -#: parser_yacc.y:736 +#: parser_yacc.y:736 parser_yacc.y:817 msgid "owner prefix not allowed on signal rules" msgstr "" -#: parser_yacc.y:752 +#: parser_yacc.y:752 parser_yacc.y:833 msgid "owner prefix not allowed on ptrace rules" msgstr "" -#: parser_yacc.y:768 +#: parser_yacc.y:768 parser_yacc.y:849 parser_yacc.y:869 msgid "owner prefix not allowed on unix rules" msgstr "" -#: parser_yacc.y:794 +#: parser_yacc.y:794 parser_yacc.y:885 msgid "owner prefix not allowed on capability rules" msgstr "" -#: parser_yacc.y:1293 +#: parser_yacc.y:1293 parser_yacc.y:1377 #, c-format msgid "dbus rule: invalid conditional group %s=()" msgstr "" -#: parser_yacc.y:1371 +#: parser_yacc.y:1371 parser_yacc.y:1455 #, c-format msgid "unix rule: invalid conditional group %s=()" msgstr "" -#: ../parser_regex.c:368 +#: ../parser_regex.c:368 ../parser_regex.c:410 #, c-format msgid "%s: Regex error: trailing '\\' escape character\n" msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/app-install-data.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/app-install-data.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/app-install-data.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/app-install-data.po 2022-02-11 23:04:15.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: 2021-08-02 17:37+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:33+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apport.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apport.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apport.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apport.po 2022-02-11 23:04:21.000000000 +0000 @@ -7,17 +7,148 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-18 15:35+0000\n" +"POT-Creation-Date: 2021-10-20 11:36+0000\n" "PO-Revision-Date: 2019-04-06 06:55+0000\n" "Last-Translator: Akira Tanaka \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: 2021-08-02 17:24+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:19+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" +#: ../data/general-hooks/ubuntu.py:200 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package." +msgstr "あるUbuntuのパッケージがUbuntu純正ではないパッケージと対立するファイルを含んでいます。" + +#: ../data/general-hooks/ubuntu.py:208 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 +msgid "You have already encountered this package installation failure." +msgstr "以前にもこのパッケージのインストールに失敗しています。" + +#: ../data/general-hooks/ubuntu.py:224 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 +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" + +#: ../bin/apport-cli.py:166 ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146 +#: ../kde/apport-kde.py:363 ../debian/tmp/usr/share/apport/apport-kde.py:363 +msgid "(binary data)" +msgstr "(バイナリデータ)" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 +#, python-format +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "残念ながら、アプリケーション %s が予期せず停止しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "残念ながら、%s が予期せず終了しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 +#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 +#: ../debian/tmp/usr/share/apport/apport-kde.py:200 +#: ../debian/tmp/usr/share/apport/apport-kde.py:238 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "残念ながら、%s で内部エラーが発生しました。" + +#: ../bin/apport-cli.py:194 ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../kde/apport-kde.py:186 ../debian/tmp/usr/share/apport/apport-kde.py:186 +msgid "Send problem report to the developers?" +msgstr "問題のレポートを開発者に送信しますか？" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-kde.py:194 +msgid "Send" +msgstr "送信" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204 +#: ../gtk/apport-gtk.py:575 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:292 +msgid "Show Details" +msgstr "詳細を表示" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 +#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 +#: ../debian/tmp/usr/share/apport/apport-kde.py:231 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 +msgid "Continue" +msgstr "続行" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 +#, python-format +msgid "The application %s has stopped responding." +msgstr "アプリケーション %s は応答していません。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "プログラム \"%s\" は応答していません。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 +#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208 +#, python-format +msgid "Package: %s" +msgstr "パッケージ: %s" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 +#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214 +msgid "Sorry, a problem occurred while installing software." +msgstr "残念ながら、ソフトウェアのインストール中に問題が発生しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 +#: ../gtk/apport-gtk.py:289 ../kde/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 +#, python-format +msgid "The application %s has experienced an internal error." +msgstr "アプリケーション %s で内部エラーが発生しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 +#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223 +#, python-format +msgid "The application %s has closed unexpectedly." +msgstr "アプリケーション %s が予期せず終了しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-kde.py:241 +msgid "If you notice further problems, try restarting the computer." +msgstr "さらに問題が発生する場合は、コンピューターを再起動してみてください。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 +#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245 +msgid "Ignore future problems of this type" +msgstr "今後、この種類の問題は無視する" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 +#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289 +msgid "Hide Details" +msgstr "詳細を隠す" + #: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 msgid "Press any key to continue..." msgstr "続けるには何かキーを押してください..." @@ -36,21 +167,6 @@ msgid "(%i bytes)" msgstr "(%i バイト)" -#: ../kde/apport-kde.py:363 ../bin/apport-cli.py:166 -#: ../debian/tmp/usr/bin/apport-cli.py:166 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(バイナリデータ)" - -#: ../gtk/apport-gtk.ui.h:6 ../kde/apport-kde.py:186 ../bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.py:181 -msgid "Send problem report to the developers?" -msgstr "問題のレポートを開発者に送信しますか？" - #: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195 msgid "" "After the problem report has been sent, please fill out the form in the\n" @@ -101,9 +217,8 @@ msgid "Error: %s" msgstr "エラー: %s" -#: ../kde/apport-kde.py:407 ../bin/apport-cli.py:254 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 +#: ../bin/apport-cli.py:254 ../debian/tmp/usr/bin/apport-cli.py:254 +#: ../kde/apport-kde.py:407 ../debian/tmp/usr/share/apport/apport-kde.py:407 msgid "Collecting problem information" msgstr "問題の情報を集めています" @@ -115,10 +230,9 @@ "収集された情報はアプリケーションを改善するために開発者へ送られます。\n" "しばらくお待ちください。" -#: ../gtk/apport-gtk.ui.h:17 ../kde/apport-kde.py:435 ../bin/apport-cli.py:267 -#: ../debian/tmp/usr/bin/apport-cli.py:267 -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 +#: ../bin/apport-cli.py:267 ../debian/tmp/usr/bin/apport-cli.py:267 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../kde/apport-kde.py:435 ../debian/tmp/usr/share/apport/apport-kde.py:435 msgid "Uploading problem information" msgstr "問題の情報をアップロードしています" @@ -151,339 +265,43 @@ msgid "Path to file (Enter to cancel):" msgstr "ファイルへのパス (Enterでキャンセル):" -#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "ファイルが存在しません。" - -#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "これはディレクトリです。" - -#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "続行するには、以下のURLを開いてください:" - -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 -msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" - -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "今すぐブラウザーを起動する" - -#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "未解決のクラッシュレポートはありません。詳しくは --help を試してみてください。" - -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "詳細はmanページをご覧ください。" - -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "valgrindによって生成されたログファイルの名前を指定" - -#: ../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) を再利用するか、もし存在しない場合には作成する" - -#: ../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 "追加のデバッグシンボル用にサンドボックスディレクトリを作成または再利用せず、インストールされたデバッグシンボルのみを利用する。" - -#: ../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) を再利用するか、もし存在しない場合には作成する" - -#: ../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-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65 -msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" -msgstr "サンドボックスに追加のパッケージをインストールします（複数回指定可）" - -#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." -msgstr "エラー: %s は実行ファイルではありません。中止します。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "残念ながら、アプリケーション %s が予期せず停止しました。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "残念ながら、%s が予期せず終了しました。" - -#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "残念ながら、%s で内部エラーが発生しました。" - -#: ../gtk/apport-gtk.ui.h:14 ../kde/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.py:188 -msgid "Send" -msgstr "送信" - -#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 -msgid "Show Details" -msgstr "詳細を表示" - -#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 -msgid "Continue" -msgstr "続行" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 -#, python-format -msgid "The application %s has stopped responding." -msgstr "アプリケーション %s は応答していません。" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "プログラム \"%s\" は応答していません。" - -#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 -#, python-format -msgid "Package: %s" -msgstr "パッケージ: %s" - -#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 -msgid "Sorry, a problem occurred while installing software." -msgstr "残念ながら、ソフトウェアのインストール中に問題が発生しました。" - -#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-kde.py:220 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "アプリケーション %s で内部エラーが発生しました。" - -#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 -#, python-format -msgid "The application %s has closed unexpectedly." -msgstr "アプリケーション %s が予期せず終了しました。" - -#: ../gtk/apport-gtk.ui.h:7 ../kde/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "さらに問題が発生する場合は、コンピューターを再起動してみてください。" - -#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 -msgid "Ignore future problems of this type" -msgstr "今後、この種類の問題は無視する" - -#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 -msgid "Hide Details" -msgstr "詳細を隠す" - -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 -msgid "Leave Closed" -msgstr "閉じて終了する" - -#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 -#: ../debian/tmp/usr/share/apport/apport-kde.py:235 -#: ../debian/tmp/usr/share/apport/apport-kde.py:381 -msgid "Relaunch" -msgstr "再起動する" - -#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 -msgid "Username:" -msgstr "ユーザー名:" - -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 -msgid "Password:" -msgstr "パスワード:" - -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 -msgid "Collecting Problem Information" -msgstr "問題の情報を集めています" - -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 -msgid "" -"The collected information can be sent to the developers to improve the " -"application. This might take a few minutes." -msgstr "収集された情報はアプリケーションを改善するために開発者へ送られます。しばらくお待ちください。" - -#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 -msgid "Uploading Problem Information" -msgstr "問題の情報をアップロードしています" - -#: ../gtk/apport-gtk.ui.h:19 ../kde/apport-kde.py:436 -#: ../debian/tmp/usr/share/apport/apport-kde.py:436 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 -msgid "" -"The collected information is being sent to the bug tracking system. This " -"might take a few minutes." -msgstr "収集された情報はバグトラッキングシステムに送信されます。しばらくお待ちください。" - -#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 -#: ../kde/apport-kde.py:524 ../debian/tmp/usr/share/apport/apport-kde.py:469 -#: ../debian/tmp/usr/share/apport/apport-kde.py:504 -#: ../debian/tmp/usr/share/apport/apport-kde.py:524 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 -msgid "Apport" -msgstr "Apport" - -#: ../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 "開発者に異常動作を報告してください" - -#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" - -#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 -msgid "Cancel" -msgstr "キャンセル" - -#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 -msgid "OK" -msgstr "OK" - -#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 -msgid "Crash report" -msgstr "クラッシュレポート" - -#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 -msgid "Sorry, an internal error happened." -msgstr "残念ながら、内部エラーが発生しました。" - -#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 -msgid "Remember this in future" -msgstr "この選択を記憶する" - -#: ../gtk/apport-gtk.ui.h:9 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 -msgid "Ignore future problems of this program version" -msgstr "今後このバージョンのプログラムの問題を無視する" - -#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 -msgid "Relaunch this application" -msgstr "このアプリケーションを再起動する" - -#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 -msgid "_Examine locally" -msgstr "ローカルで解析する(_E)" - -#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 -msgid "Don't send" -msgstr "送信しない" - -#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 -msgid "Collecting problem information" -msgstr "問題の情報を集めています" - -#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 -msgid "" -"Information is being collected that may help the developers fix the problem " -"you report." -msgstr "あなたの報告する問題を開発者が修正するのに、手助けとなるような情報を収集します。" - -#: ../gtk/apport-gtk.ui.h:18 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 -msgid "Uploading problem information" -msgstr "問題の情報をアップロードしています" - -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "システム情報を収集" - -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" -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 "システムプログラムの問題レポートにアクセスするにはパスワードを入力してください" +#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "ファイルが存在しません。" -#: ../data/apportcheckresume.py:67 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 -msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." -msgstr "このことは前のサスペンド中に発生しており、システムが正常に復帰できませんでした。" +#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "これはディレクトリです。" -#: ../data/apportcheckresume.py:69 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "このことは前のハイバネーション中に発生しており、システムが正常に復帰できませんでした。" +#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "続行するには、以下のURLを開いてください:" -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "リジューム処理が終わる寸前でハングしましたが、通常通り完了していると思われます。" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." +msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" -#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "使用法 : %s <レポート> <対象ディレクトリ>" +#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "今すぐブラウザーを起動する" -#: ../bin/apport-unpack.py:42 ../debian/tmp/usr/bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "目的のディレクトリは存在しますが、空ではありません。" +#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "未解決のクラッシュレポートはありません。詳しくは --help を試してみてください。" #: ../kde/apport-kde-mimelnk.desktop.in.h:1 msgid "Apport crash file" msgstr "クラッシュファイルを Apport する" +#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" + #: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:139 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:139 msgid "This package does not seem to be installed correctly" msgstr "このパッケージは恐らく正常にインストールされていません" @@ -497,6 +315,8 @@ msgstr "これは %s の公式パッケージではありません。すべてのサードパーティーのパッケージを削除して再度試してください。" #: ../apport/ui.py:166 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:166 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:166 #, python-format msgid "" @@ -510,24 +330,34 @@ "%s" #: ../apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:303 msgid "unknown program" msgstr "不明なプログラム" #: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:304 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "残念ながら、プログラム \"%s\" が予期せず終了しました" -#: ../apport/ui.py:306 ../apport/ui.py:1458 +#: ../apport/ui.py:306 ../apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:306 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1459 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1458 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1459 #, python-format msgid "Problem in %s" msgstr "%s に問題があります" #: ../apport/ui.py:307 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:307 msgid "" "Your computer does not have enough free memory to automatically analyze the " @@ -536,81 +366,125 @@ #: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:519 #: ../apport/ui.py:522 ../apport/ui.py:727 ../apport/ui.py:1264 -#: ../apport/ui.py:1430 ../apport/ui.py:1434 +#: ../apport/ui.py:1431 ../apport/ui.py:1435 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:362 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:370 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:522 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1264 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1435 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:362 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:370 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:522 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1264 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1435 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:362 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:370 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:519 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:522 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:727 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1264 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1434 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1435 msgid "Invalid problem report" msgstr "無効な問題のレポートです" #: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:363 msgid "You are not allowed to access this problem report." msgstr "この問題を報告するための権限がありません。" #: ../apport/ui.py:366 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:366 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:366 msgid "Error" msgstr "エラー" #: ../apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:367 msgid "There is not enough disk space available to process this report." msgstr "このレポートを作成するための空きスペースがディスクにありません。" #: ../apport/ui.py:403 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:403 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:403 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:403 msgid "No PID specified" msgstr "PIDが指定されていません" #: ../apport/ui.py:404 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:404 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:404 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:404 msgid "You need to specify a PID. See --help for more information." -msgstr "" +msgstr "PIDを指定する必要があります。詳細については --help の出力を確認してください。" #: ../apport/ui.py:411 ../apport/ui.py:500 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:500 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:500 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:411 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:500 msgid "Invalid PID" msgstr "無効なプロセスID" #: ../apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:412 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:412 msgid "The specified process ID does not exist." msgstr "指定されたプロセスIDは存在しません。" #: ../apport/ui.py:415 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:415 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:415 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:415 msgid "Not your PID" msgstr "プロセスIDの所有者ではありません" #: ../apport/ui.py:416 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:416 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:416 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:416 msgid "The specified process ID does not belong to you." msgstr "あなたは指定されたプロセスIDの所有者ではありません。" #: ../apport/ui.py:467 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:467 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:467 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:467 msgid "No package specified" msgstr "パッケージが指定されていません" #: ../apport/ui.py:468 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:468 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:468 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:468 msgid "" "You need to specify a package or a PID. See --help for more information." -msgstr "パッケージまたはプロセスIDを指定する必要があります。詳しくは --help を試してみてください。" +msgstr "パッケージまたはプロセスIDを指定する必要があります。詳細については --help の出力を確認してください。" #: ../apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:497 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:497 msgid "Permission denied" msgstr "許可がありません" #: ../apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:498 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:498 msgid "" "The specified process does not belong to you. Please run this program as the " @@ -618,23 +492,35 @@ msgstr "このプロセスを操作する権限がありません。プロセスの所有者もしくはrootユーザーとして実行してください。" #: ../apport/ui.py:501 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:501 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:501 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:501 msgid "The specified process ID does not belong to a program." msgstr "指定されたプロセスIDはプログラムに属していません。" #: ../apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:520 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:520 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "Symptomスクリプト %s は、影響を受けたパッケージを特定していません" #: ../apport/ui.py:523 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:523 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:523 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:523 #, python-format msgid "Package %s does not exist" msgstr "パッケージ %s は存在しません" #: ../apport/ui.py:552 ../apport/ui.py:739 ../apport/ui.py:744 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:552 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:739 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:744 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:552 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:744 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:552 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:739 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:744 @@ -642,6 +528,12 @@ msgstr "レポートを作成できません" #: ../apport/ui.py:567 ../apport/ui.py:613 ../apport/ui.py:629 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:567 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:613 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:629 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:567 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:613 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:629 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:567 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:613 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:629 @@ -649,6 +541,8 @@ msgstr "問題点のレポートを更新中" #: ../apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:568 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:568 msgid "" "You are not the reporter or subscriber of this problem report, or the report " @@ -661,6 +555,8 @@ "\"apport-bug\"を使って新規にレポートを作成してください。" #: ../apport/ui.py:577 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:577 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:577 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:577 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " @@ -680,28 +576,40 @@ "本当に進めますか?" #: ../apport/ui.py:614 ../apport/ui.py:630 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:630 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:630 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:614 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:630 msgid "No additional information collected." msgstr "収集する追加情報はありません。" #: ../apport/ui.py:681 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:681 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:681 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:681 msgid "What kind of problem do you want to report?" msgstr "どのような種類の問題を報告しますか？" #: ../apport/ui.py:698 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:698 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:698 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:698 msgid "Unknown symptom" msgstr "未知の現象" #: ../apport/ui.py:699 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:699 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:699 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:699 #, python-format msgid "The symptom \"%s\" is not known." msgstr "現象 \"%s\" は知られていません。" #: ../apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:730 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:730 msgid "" "After closing this message please click on an application window to report a " @@ -709,28 +617,42 @@ msgstr "このメッセージを閉じた後でアプリケーションウィンドウ上でクリックして、その問題について報告してください。" #: ../apport/ui.py:740 ../apport/ui.py:745 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:740 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:745 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:740 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:745 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:740 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:745 msgid "xprop failed to determine process ID of the window" msgstr "xpropはウィンドウのプロセスIDを特定できませんでした" #: ../apport/ui.py:759 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:759 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:759 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:759 msgid "%prog " msgstr "%prog " #: ../apport/ui.py:761 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:761 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:761 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:761 msgid "Specify package name." msgstr "パッケージ名を指定" #: ../apport/ui.py:763 ../apport/ui.py:815 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:763 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:815 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:763 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:815 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:763 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:815 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "レポートに追加タグを追加します。複数回指定できます。" #: ../apport/ui.py:794 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:794 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:794 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" @@ -738,6 +660,8 @@ "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" #: ../apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:797 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:797 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " @@ -748,16 +672,22 @@ "だけとするオプションが必要です。どちらも与えられていないときには、既知の現象のリストを表示します（暗黙の一つの引数が与えられた場合）。" #: ../apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:799 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:799 msgid "Click a window as a target for filing a problem report." msgstr "問題レポートを埋めるには、ターゲットとなるウィンドウをクリックしてください。" #: ../apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:801 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:801 msgid "Start in bug updating mode. Can take an optional --package." msgstr "バグ更新モードを開始します。オプション --package が使用できます。" #: ../apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:803 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:803 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " @@ -765,6 +695,8 @@ msgstr "SYMPTOM（症状）についてのバグを報告します（唯一の引数は症状の名前を意味します）。" #: ../apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:805 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:805 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " @@ -774,6 +706,8 @@ "が指定されている場合はオプション扱いになります（唯一の引数はパッケージ名を意味します）。" #: ../apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:807 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:807 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " @@ -785,11 +719,15 @@ "す）。" #: ../apport/ui.py:809 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:809 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:809 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:809 msgid "The provided pid is a hanging application." msgstr "指定されたpidはハングアップしたアプリケーションのものです。" #: ../apport/ui.py:811 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:811 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:811 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:811 #, python-format msgid "" @@ -799,6 +737,8 @@ "クラッシュの報告を %s で保留中のプログラムのかわりに .apport または .crash ファイルで行う（ファイル名が引数のみで与えられた場合）。" #: ../apport/ui.py:813 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:813 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:813 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:813 msgid "" "In bug filing mode, save the collected information into a file instead of " @@ -808,45 +748,63 @@ "バグファイリングモードでは、収集した情報は報告する代わりにファイルに保存されます。このファイルは、後で別のコンピューターから報告することができます。" #: ../apport/ui.py:817 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:817 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:817 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:817 msgid "Print the Apport version number." msgstr "Apportのバージョン番号を表示します。" #: ../apport/ui.py:968 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:968 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:968 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:968 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "クラッシュの解析を行うため端末ウィンドウでapport-retraceを起動します。" #: ../apport/ui.py:969 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:969 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:969 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:969 msgid "Run gdb session" msgstr "gdbセッションを実行" #: ../apport/ui.py:970 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:970 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:970 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:970 msgid "Run gdb session without downloading debug symbols" msgstr "デバッグシンボルをダウンロードせずgdbセッションを実行" #. TRANSLATORS: %s contains the crash report file name #: ../apport/ui.py:972 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:972 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:972 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:972 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "%s を完全なシンボリックスタックトレースに更新する" #: ../apport/ui.py:1008 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1008 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1008 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1008 msgid "Can't remember send report status settings" msgstr "レポートの送信のステータス設定を記憶できません" #: ../apport/ui.py:1009 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1009 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1009 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1009 msgid "" "Saving crash reporting state failed. Can't set auto or never reporting mode." msgstr "クラッシュレポートの状態の保存に失敗しました。報告モードを「自動」または「しない」に設定できません。" #: ../apport/ui.py:1068 ../apport/ui.py:1078 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1078 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1078 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1068 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1078 msgid "" @@ -854,6 +812,8 @@ msgstr "この問題レポートは、もうインストールされていないプログラムに対するものです。" #: ../apport/ui.py:1093 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1093 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1093 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1093 #, python-format msgid "" @@ -861,24 +821,36 @@ "occurred." msgstr "この問題はプログラム %s に発生したものですが、このプログラムはクラッシュしてから変更されています。" -#: ../apport/ui.py:1140 ../apport/ui.py:1221 ../apport/ui.py:1436 +#: ../apport/ui.py:1140 ../apport/ui.py:1221 ../apport/ui.py:1437 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1140 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1221 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1437 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1140 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1221 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1437 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1140 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1221 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1436 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1437 msgid "This problem report is damaged and cannot be processed." msgstr "この問題の報告は破損しており、処理することができません。" #: ../apport/ui.py:1145 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1145 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1145 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1145 msgid "This report is about a package that is not installed." msgstr "このレポートは、インストールされていないパッケージに対するものです。" #: ../apport/ui.py:1149 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1149 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1149 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1149 msgid "An error occurred while attempting to process this problem report:" msgstr "この問題の報告の処理中にエラーが発生しました:" #: ../apport/ui.py:1159 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1159 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1159 msgid "" "You have two versions of this application installed, which one do you want " @@ -886,77 +858,105 @@ msgstr "このアプリケーションは2種類のバージョンがインストールされています。どちらのバグを報告しますか？" #: ../apport/ui.py:1160 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1160 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1160 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1160 #, python-format msgid "%s snap" -msgstr "" +msgstr "snapの %s" #: ../apport/ui.py:1161 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1161 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1161 #, python-format msgid "%s deb package" -msgstr "" +msgstr "debパッケージの %s" #: ../apport/ui.py:1194 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1194 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1194 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1194 #, python-format msgid "" "%s is provided by a snap published by %s. Contact them via %s for help." -msgstr "" +msgstr "%s は %s が公開しているsnapです。バグ報告や質問については %s に連絡してください。" #: ../apport/ui.py:1196 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1196 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1196 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1196 #, python-format msgid "" "%s is provided by a snap published by %s. No contact address has been " "provided; visit the forum at https://forum.snapcraft.io/ for help." msgstr "" +"%s は %s が公開しているsnapです。連絡先のアドレスは提供されていないため、バグ報告や質問については " +"https://forum.snapcraft.io/ にアクセスしてください。" #: ../apport/ui.py:1265 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1265 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1265 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1265 msgid "Could not determine the package or source package name." msgstr "パッケージまたはソースパッケージ名を特定できませんでした。" #: ../apport/ui.py:1283 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1283 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1283 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1283 msgid "Unable to start web browser" msgstr "ウェブブラウザーを起動できません" #: ../apport/ui.py:1284 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1284 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1284 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1284 #, python-format msgid "Unable to start web browser to open %s." msgstr "%s を開くためのウェブブラウザーを起動できません" -#: ../apport/ui.py:1384 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1384 +#: ../apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1385 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "バグ追跡システム %s にあなたのアカウント情報を入力してください" -#: ../apport/ui.py:1396 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1396 +#: ../apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1397 msgid "Network problem" msgstr "ネットワークの問題" -#: ../apport/ui.py:1398 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1398 +#: ../apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1399 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "クラッシュデータベースに接続できませんでした。インターネット接続を確認してください。" -#: ../apport/ui.py:1425 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1425 +#: ../apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1426 msgid "Memory exhaustion" msgstr "メモリー不足" -#: ../apport/ui.py:1426 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1426 +#: ../apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1427 msgid "Your system does not have enough memory to process this crash report." msgstr "コンピューターには、このクラッシュレポートを処理するのに十分なメモリーがありません。" -#: ../apport/ui.py:1461 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1461 +#: ../apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1462 #, python-format msgid "" "The problem cannot be reported:\n" @@ -967,14 +967,20 @@ "\n" "%s" -#: ../apport/ui.py:1517 ../apport/ui.py:1524 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1517 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1524 +#: ../apport/ui.py:1518 ../apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1525 msgid "Problem already known" msgstr "問題は既知のものです" -#: ../apport/ui.py:1518 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1518 +#: ../apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1519 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 " @@ -982,75 +988,105 @@ msgstr "" "この問題は、ブラウザーに表示されたバグレポートですでに報告されています。開発者にとって役立つような、より詳しい情報を追加できるかどうか確認してください。" -#: ../apport/ui.py:1525 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1525 +#: ../apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1526 msgid "This problem was already reported to developers. Thank you!" msgstr "この問題はすでに開発者に報告されています。ありがとうございます！" -#: ../data/general-hooks/ubuntu.py:200 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 +#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 +msgid "Leave Closed" +msgstr "閉じて終了する" + +#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 +#: ../debian/tmp/usr/share/apport/apport-kde.py:235 +#: ../debian/tmp/usr/share/apport/apport-kde.py:381 +msgid "Relaunch" +msgstr "再起動する" + +#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +msgid "Username:" +msgstr "ユーザー名:" + +#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 +msgid "Password:" +msgstr "パスワード:" + +#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 +msgid "Collecting Problem Information" +msgstr "問題の情報を集めています" + +#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package." -msgstr "あるUbuntuのパッケージがUbuntu純正ではないパッケージと対立するファイルを含んでいます。" +"The collected information can be sent to the developers to improve the " +"application. This might take a few minutes." +msgstr "収集された情報はアプリケーションを改善するために開発者へ送られます。しばらくお待ちください。" -#: ../data/general-hooks/ubuntu.py:208 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 -msgid "You have already encountered this package installation failure." -msgstr "以前にもこのパッケージのインストールに失敗しています。" +#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 +msgid "Uploading Problem Information" +msgstr "問題の情報をアップロードしています" -#: ../data/general-hooks/ubuntu.py:224 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 +#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-kde.py:436 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" +"The collected information is being sent to the bug tracking system. This " +"might take a few minutes." +msgstr "収集された情報はバグトラッキングシステムに送信されます。しばらくお待ちください。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 +#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-kde.py:469 +#: ../debian/tmp/usr/share/apport/apport-kde.py:504 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 +msgid "Apport" +msgstr "Apport" + +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "使用法 : %s <レポート> <対象ディレクトリ>" -#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +#: ../bin/apport-unpack.py:42 ../debian/tmp/usr/bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "目的のディレクトリは存在しますが、空ではありません。" + +#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "これ以上レポートに新しいトレースを書き込みませんが、標準出力には表示します。" -#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 msgid "" "Start an interactive gdb session with the report's core dump (-o ignored; " "does not rewrite report)" msgstr "レポートのコアダンプに対してインタラクティブなgdbセッションを開始します（-o 無視；レポートを上書きしません）" -#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 msgid "" "Write modified report to given file instead of changing the original report" msgstr "オリジナルのレポートを変更せずに、指定されたファイルに変更後のレポートを書き込みます" -#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 msgid "Remove the core dump from the report after stack trace regeneration" msgstr "スタックトレースを再生成した後にコアダンプをレポートから取り除きます" -#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 msgid "Override report's CoreFile" msgstr "レポートのコアファイルを上書きします" -#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 msgid "Override report's ExecutablePath" msgstr "レポートの ExecutablePath を上書きします" -#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 msgid "Override report's ProcMaps" msgstr "レポートの ProcMaps を上書きします" -#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 msgid "Rebuild report's Package information" msgstr "レポートに含まれるパッケージ情報を再生成します" -#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 +#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 msgid "" "Build a temporary sandbox and download/install the necessary packages and " "debug symbols in there; without this option it assumes that the necessary " @@ -1064,7 +1100,7 @@ "ィレクトリを指定します。「system」を指定した場合にはシステムの設定ファイルを利用しますが、その場合には現在実行中のリリースで発生したクラッシュしかリ" "トレースできません。" -#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 +#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 msgid "" "Build another temporary sandbox for installing gdb and its dependencies " "using the same release as the report rather than whatever version of gdb you " @@ -1073,32 +1109,38 @@ "gdbとその依存関係をインストールする一時的なサンドボックスをビルドし、インストールされているgdbのバージョンとは関係なく、レポートにあるのと同じリリー" "スを利用します" -#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "サンドボックスにパッケージをインストールする際に、ダウンロードおよびインストールの進捗状況を表示します" -#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 msgid "Prepend timestamps to log messages, for batch operation" msgstr "ログメッセージの先頭にタイムスタンプを挿入します（バッチ処理用）" -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 msgid "" "Create and use third-party repositories from origins specified in reports" msgstr "レポートで指定された提供元から、サードパーティーのリポジトリを作成して使用します。" -#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 msgid "Cache directory for packages downloaded in the sandbox" msgstr "サンドボックスにダウンロードされたパッケージのためのキャッシュディレクトリ" -#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 +#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 msgid "" "Directory for unpacked packages. Future runs will assume that any already " "downloaded package is also extracted to this sandbox." msgstr "" "展開したパッケージのためのディレクトリ。これ以降はダウンロード済みのパッケージはすべてこのサンドボックスに展開されているものと仮定します。" -#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66 +msgid "" +"Install an extra package into the sandbox (can be specified multiple times)" +msgstr "サンドボックスに追加のパッケージをインストールします（複数回指定可）" + +#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 msgid "" "Path to a file with the crash database authentication information. This is " "used when specifying a crash ID to upload the retraced stack traces (only if " @@ -1107,26 +1149,168 @@ "クラッシュデータベース認証情報のファイルへのパス。これはリトレースしたスタックトレースをアップロードする際にクラッシュIDを指定するために使われます（-" "g, -o, または -s が指定されていない場合）。" -#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 msgid "" "Display retraced stack traces and ask for confirmation before sending them " "to the crash database." msgstr "スタックトレースのリトレースを表示し、クラッシュデータベースに送る前に確認します。" -#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 +#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "sqliteデータベースの複製へのパス（デフォルトは複製のチェックをしない）" -#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 +#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 msgid "Do not add StacktraceSource to the report." msgstr "レポートにスタックトレースソースを追加しないでください。" -#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 +#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 msgid "You cannot use -C without -S. Stopping." msgstr "-S を指定せずに -C を使用することはできません。中止します。" #. translators: don't translate y/n, apport currently only checks for "y" -#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 +#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 msgid "OK to send these as attachments? [y/n]" msgstr "これらを添付ファイルとして送ってよろしいですか？ [y/n]" + +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "問題を報告する..." + +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.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/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 +msgid "Cancel" +msgstr "キャンセル" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 +msgid "OK" +msgstr "OK" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 +msgid "Crash report" +msgstr "クラッシュレポート" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 +msgid "Sorry, an internal error happened." +msgstr "残念ながら、内部エラーが発生しました。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 +msgid "Remember this in future" +msgstr "この選択を記憶する" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../gtk/apport-gtk.ui.h:9 +msgid "Ignore future problems of this program version" +msgstr "今後このバージョンのプログラムの問題を無視する" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 +msgid "Relaunch this application" +msgstr "このアプリケーションを再起動する" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 +msgid "_Examine locally" +msgstr "ローカルで解析する(_E)" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 +msgid "Don't send" +msgstr "送信しない" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 +msgid "Collecting problem information" +msgstr "問題の情報を集めています" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 +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:18 ../gtk/apport-gtk.ui.h:18 +msgid "Uploading problem information" +msgstr "問題の情報をアップロードしています" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 +msgid "" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." +msgstr "このことは前のサスペンド中に発生しており、システムが正常に復帰できませんでした。" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 +msgid "" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." +msgstr "このことは前のハイバネーション中に発生しており、システムが正常に復帰できませんでした。" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +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:97 ../bin/apport-valgrind.py:97 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "エラー: %s は実行ファイルではありません。中止します。" + +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "システム情報を収集" + +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +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 "システムプログラムの問題レポートにアクセスするにはパスワードを入力してください" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/appstream.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/appstream.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/appstream.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/appstream.po 2022-02-11 23:04:15.000000000 +0000 @@ -16,16 +16,16 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:21+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:18+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: tools/appstream-cli.c:156 +#: tools/appstreamcli.c:157 #, c-format msgid "'%s' command" msgstr "'%s' コマンド" -#: src/as-category.c:168 +#: src/as-category.c:169 msgctxt "Category of Graphics" msgid "3D Graphics" msgstr "3D グラフィックス" @@ -46,13 +46,13 @@ "/>タグは、メタ情報ファイル（アップストリームメタデータ）でローカライズしないでください。代わりに、個々の段落をローカライズします。" #. TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). -#: src/as-validator-issue-tag.h:200 +#: src/as-validator-issue-tag.h:210 msgid "" "A screenshot must contain at least one image or video in order to be useful. " "Please add an to it." msgstr "スクリーンショットには、少なくとも1つの画像またはビデオが含まれている必要があります。 を追加してください。" -#: src/as-validator-issue-tag.h:205 +#: src/as-validator-issue-tag.h:215 msgid "" "A screenshot must contain either images or videos, but not both at the same " "time. Please use this screenshot exclusively for either static images or for " @@ -61,24 +61,24 @@ "スクリーンショットには画像または動画のいずれかを含める必要がありますが、両方を同時に含めることはできません。このスクリーンショットは、静止画像または動画専" "用に使用してください。" -#: src/as-category.c:123 +#: src/as-category.c:124 msgctxt "Category of Games" msgid "Action" msgstr "アクション" #. TRANSLATORS: this is the main category for Add-ons #. TRANSLATORS: Addons are extensions for existing software components, e.g. support for more visual effects for a video editor -#: src/as-category.c:320 tools/ascli-utils.c:371 +#: src/as-category.c:321 tools/ascli-utils.c:371 msgid "Add-ons" msgstr "アドオン" -#: src/as-category.c:126 +#: src/as-category.c:127 msgctxt "Category of Games" msgid "Adventure" msgstr "アドベンチャー" #. TRANSLATORS: ascli flag description for: --pedantic (used by the "validate" command) -#: tools/appstream-cli.c:118 +#: tools/appstreamcli.c:119 msgid "Also show pedantic hints." msgstr "詳細なヒントも表示します。" @@ -102,7 +102,7 @@ msgstr "AppStream CLI" #. TRANSLATORS: Output if appstreamcli --version is run and the CLI and libappstream versions differ. -#: tools/appstream-cli.c:1202 +#: tools/appstream-compose.c:250 tools/appstreamcli.c:1279 #, c-format msgid "" "AppStream CLI tool version: %s\n" @@ -112,7 +112,7 @@ "AppStream ライブラリ バージョン: %s" #. TRANSLATORS: In the status report of ascli: Header -#: tools/ascli-actions-misc.c:47 +#: tools/ascli-actions-misc.c:48 msgid "AppStream Status:" msgstr "AppStream の状態:" @@ -129,7 +129,7 @@ #. TRANSLATORS: This is the header to the --help menu for subcommands #. TRANSLATORS: This is the header to the --help menu -#: tools/appstream-cli.c:153 tools/appstream-cli.c:956 +#: tools/appstreamcli.c:154 tools/appstreamcli.c:1022 msgid "AppStream command-line interface" msgstr "AppStream コマンドラインインターフェース" @@ -150,7 +150,7 @@ "software components." msgstr "AppStream は、ソフトウェアコンポーネントに関するメタデータを提供するための、ディストリビューション間で共通の仕様です。" -#: src/as-pool.c:2124 +#: src/as-pool.c:2125 #, c-format msgid "" "AppStream system cache refresh failed. Turn on verbose mode to get detailed " @@ -158,53 +158,53 @@ msgstr "AppStream システムキャッシュの更新が失敗しました。問題のより詳細な情報を入手するには、詳細モードをオンにしてください。" #. TRANSLATORS: Output if appstreamcli --version is executed. -#: tools/appstream-cli.c:1199 +#: tools/appstream-compose.c:247 tools/appstreamcli.c:1276 #, c-format msgid "AppStream version: %s" msgstr "AppStream バージョン: %s" -#: src/as-category.c:129 +#: src/as-category.c:130 msgctxt "Category of Games" msgid "Arcade" msgstr "アーケード" -#: src/as-category.c:234 +#: src/as-category.c:235 msgctxt "Category of Science" msgid "Artificial Intelligence" msgstr "人工知能" -#: src/as-validator-issue-tag.h:91 +#: src/as-validator-issue-tag.h:96 msgid "" "As per AppStream specification, the mentioned tag must only appear once in " "this context. Having multiple tags of this kind is not valid." msgstr "AppStream仕様に従って、言及されたタグはこのコンテキストで1回だけで表示されます。この種のタグを複数持つことは無効です。" #. TRANSLATORS: ascli flag description for: --format as part of the news-to-metainfo command -#: tools/appstream-cli.c:815 +#: tools/appstreamcli.c:842 msgid "Assume the input file is in the selected format ('yaml' or 'text')." msgstr "入力ファイルが選択した形式（「yaml」または「text」）であると仮定します。" -#: src/as-category.c:101 +#: src/as-category.c:102 msgctxt "Category of Education" msgid "Astronomy" msgstr "天文学" -#: src/as-category.c:237 +#: src/as-category.c:238 msgctxt "Category of Science" msgid "Astronomy" msgstr "天文学" #. TRANSLATORS: this is the menu spec main category for Audio & Video -#: src/as-category.c:302 +#: src/as-category.c:303 msgid "Audio & Video" msgstr "オーディオとビデオ" -#: src/as-category.c:68 +#: src/as-category.c:69 msgctxt "Category of AudioVideo" msgid "Audio Creation & Editing" msgstr "オーディオ制作と編集" -#: tools/ascli-actions-misc.c:219 +#: tools/ascli-actions-misc.c:149 #, c-format msgid "Augmenting existing desktop-entry file '%s' with data from '%s'." msgstr "既存のデスクトップエントリーファイル「%s」を「%s」のデータで拡張しています。" @@ -213,12 +213,12 @@ msgid "Binaries" msgstr "バイナリ" -#: src/as-category.c:132 +#: src/as-category.c:133 msgctxt "Category of Games" msgid "Blocks" msgstr "ブロック" -#: src/as-category.c:135 +#: src/as-category.c:136 msgctxt "Category of Games" msgid "Board" msgstr "ボード" @@ -227,12 +227,12 @@ msgid "Bundle" msgstr "バンドル" -#: src/as-pool.c:1995 +#: src/as-cache.c:909 #, c-format msgid "Cache location '%s' is not writable." msgstr "キャッシュの場所 '%s' が書き込み可能ではありません。" -#: src/as-category.c:191 +#: src/as-category.c:192 msgctxt "Category of Office" msgid "Calendar" msgstr "カレンダー" @@ -244,7 +244,7 @@ "suffix." msgstr "'%s' をコピーできません。ファイルの拡張子が '.metainfo.xml' または '.appdata.xml' ではありません。" -#: src/as-category.c:138 +#: src/as-category.c:139 msgctxt "Category of Games" msgid "Card" msgstr "カード" @@ -253,33 +253,33 @@ msgid "Categories" msgstr "カテゴリー" -#: src/as-category.c:259 +#: src/as-category.c:260 msgctxt "Category of Communication" msgid "Chat" msgstr "チャット" -#: src/as-category.c:104 +#: src/as-category.c:105 msgctxt "Category of Education" msgid "Chemistry" msgstr "化学" -#: src/as-category.c:240 +#: src/as-category.c:241 msgctxt "Category of Science" msgid "Chemistry" msgstr "化学" -#: src/as-category.c:214 +#: src/as-category.c:215 msgctxt "Category of Addons" msgid "Codecs" msgstr "コーデック" #. TRANSLATORS: this is the menu spec main category for Communication -#: src/as-category.c:326 +#: src/as-category.c:327 msgid "Communication & News" msgstr "コミュニケーションとニュース" #. TRANSLATORS: `appstreamcli vercmp` command description. -#: tools/appstream-cli.c:1146 +#: tools/appstreamcli.c:1217 msgid "Compare two version numbers." msgstr "2 つのバージョン番号を比較します。" @@ -297,32 +297,32 @@ msgid "Compulsory for" msgstr "必須的に" -#: src/as-validator-issue-tag.h:398 +#: src/as-validator-issue-tag.h:420 msgid "Consider using a secure (HTTPS) URL for the remote icon link." msgstr "リモートアイコンリンクに安全な（HTTPS）URLを使用することを検討してください。" -#: src/as-validator-issue-tag.h:420 +#: src/as-validator-issue-tag.h:442 msgid "Consider using a secure (HTTPS) URL for this web link." msgstr "このWebリンクには安全な（HTTPS）URLを使用することを検討してください。" -#: src/as-validator-issue-tag.h:194 +#: src/as-validator-issue-tag.h:204 msgid "" "Consider using a secure (HTTPS) URL to reference this screenshot image or " "video." msgstr "安全な（HTTPS）URLを使用して、このスクリーンショット画像またはビデオを参照することを検討してください。" #. TRANSLATORS: `appstreamcli news-to-metainfo` command description. -#: tools/appstream-cli.c:1162 +#: tools/appstreamcli.c:1233 msgid "Convert a YAML or text NEWS file into metainfo releases." msgstr "YAMLまたはテキストNEWSファイルをメタ情報リリースに変換します。" #. TRANSLATORS: `appstreamcli convert` command description. "Collection XML" is a term describing a specific type of AppStream XML data. -#: tools/appstream-cli.c:1141 +#: tools/appstreamcli.c:1212 msgid "Convert collection XML to YAML or vice versa." msgstr "コレクションXMLをYAMLに、またはその逆に変換する。" #. TRANSLATORS: Search for provided items (e.g. mimetypes, modaliases, ..) yielded no results -#: tools/ascli-actions-mdata.c:227 +#: tools/ascli-actions-mdata.c:245 #, c-format msgid "Could not find component providing '%s::%s'." msgstr "" @@ -332,13 +332,13 @@ msgstr "メタインフォファイルからXDGデスクトップエントリファイルを作成します。" #. TRANSLATORS: `appstreamcli new-template` command description. -#: tools/appstream-cli.c:1152 +#: tools/appstreamcli.c:1223 msgid "" "Create a template for a metainfo file (to be filled out by the upstream " "project)." msgstr "メタインフォファイルのテンプレートを作成します（アップストリームプロジェクトが記入します）。" -#: tools/ascli-actions-misc.c:228 +#: tools/ascli-actions-misc.c:158 #, c-format msgid "Creating new desktop-entry file '%s' using data from '%s'" msgstr "「%s」のデータを使用して新しいデスクトップエントリファイル「%s」を作成しています" @@ -351,12 +351,12 @@ msgid "D-Bus System Services" msgstr "D-Bus システムサービス" -#: src/as-category.c:195 +#: src/as-category.c:196 msgctxt "Category of Office" msgid "Database" msgstr "データベース" -#: src/as-category.c:86 +#: src/as-category.c:87 msgctxt "Category of Development" msgid "Debuggers" msgstr "デバッガ" @@ -366,7 +366,7 @@ msgstr "デフォルトのスクリーンショット URL" #. TRANSLATORS: ascli flag description for: --format -#: tools/appstream-cli.c:85 +#: tools/appstreamcli.c:86 msgid "Default metadata format (valid values are 'xml' and 'yaml')." msgstr "デフォルトのメタデータファイル形式 (有効な値は 'xml' と 'yaml')。" @@ -380,12 +380,12 @@ msgstr "開発者" #. TRANSLATORS: this is the menu spec main category for Development -#: src/as-category.c:305 +#: src/as-category.c:306 msgid "Developer Tools" msgstr "開発者ツール" #. TRANSLATORS: `appstreamcli status` command description. -#: tools/appstream-cli.c:1126 +#: tools/appstreamcli.c:1197 msgid "Display status information about available AppStream metadata." msgstr "利用可能な AppStream メタデータの状態情報を表示します。" @@ -395,22 +395,23 @@ msgstr "ディストリビューションメタデータ:" #. TRANSLATORS: ascli flag description for: --no-net (used by the "validate" command) -#: tools/appstream-cli.c:128 +#: tools/appstreamcli.c:129 msgid "Do not use network access." msgstr "ネットワークアクセスを使用しません。" +#. TRANSLATORS: ascompose flag description for: --no-color #. TRANSLATORS: ascli flag description for: --no-color -#: tools/appstream-cli.c:1062 +#: tools/appstream-compose.c:186 tools/appstreamcli.c:1128 msgid "Don't show colored output." msgstr "カラーで出力を表示しません。" #. TRANSLATORS: `appstreamcli dump` command description. -#: tools/appstream-cli.c:1093 +#: tools/appstreamcli.c:1159 msgid "Dump raw XML metadata for a component matching the ID." msgstr "IDに一致するコンポーネントの生のXMLメタデータをダンプします。" #. TRANSLATORS: this is the menu spec main category for Education -#: src/as-category.c:308 +#: src/as-category.c:309 msgid "Education" msgstr "教育" @@ -419,13 +420,13 @@ msgid "Empty." msgstr "空です。" -#: src/as-category.c:141 +#: src/as-category.c:142 msgctxt "Category of Games" msgid "Emulators" msgstr "エミュレータ" #. TRANSLATORS: ascli flag description for: --force -#: tools/appstream-cli.c:245 +#: tools/appstreamcli.c:247 msgid "Enforce a cache refresh." msgstr "強制的にキャッシュを更新します。" @@ -433,7 +434,7 @@ msgid "Enumerations must only have list items (
  • ) as children." msgstr "列挙子には子要素としてリスト項目(
  • )があります。" -#: tools/ascli-actions-misc.c:159 +#: tools/ascli-actions-misc.c:88 #, c-format msgid "Error while loading the metadata pool: %s" msgstr "メタデータプールの読み込み中にエラーが発生しました: %s" @@ -442,62 +443,62 @@ msgid "Extends" msgstr "拡張" -#: src/as-category.c:65 +#: src/as-category.c:66 msgctxt "Category of AudioVideo" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:256 +#: src/as-category.c:257 msgctxt "Category of Communication" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:83 +#: src/as-category.c:84 msgctxt "Category of Development" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:98 +#: src/as-category.c:99 msgctxt "Category of Education" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:120 +#: src/as-category.c:121 msgctxt "Category of Games" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:165 +#: src/as-category.c:166 msgctxt "Category of Graphics" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:188 +#: src/as-category.c:189 msgctxt "Category of Office" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:231 +#: src/as-category.c:232 msgctxt "Category of Science" msgid "Featured" msgstr "おすすめ" -#: src/as-category.c:278 +#: src/as-category.c:279 msgctxt "Category of Utility" msgid "Featured" msgstr "おすすめ" -#: tools/ascli-actions-validate.c:176 tools/ascli-actions-validate.c:354 +#: tools/ascli-actions-validate.c:176 tools/ascli-actions-validate.c:356 #, c-format msgid "File '%s' does not exist." msgstr "ファイル '%s' は存在しません。" -#: src/as-category.c:287 +#: src/as-category.c:288 msgctxt "Category of Utility" msgid "File System" msgstr "ファイルシステム" -#: src/as-category.c:198 +#: src/as-category.c:199 msgctxt "Category of Office" msgid "Finance" msgstr "ファイナンス" @@ -510,12 +511,12 @@ msgid "Fonts" msgstr "フォント" -#: src/as-category.c:211 +#: src/as-category.c:212 msgctxt "Category of Addons" msgid "Fonts" msgstr "フォント" -#: src/as-validator-issue-tag.h:242 +#: src/as-validator-issue-tag.h:252 msgid "" "For videos, only the WebM and Matroska (.mkv) container formats are " "currently supported. The file extension of the referenced video does not " @@ -525,7 +526,7 @@ "いずれにも属していません。" #. TRANSLATORS: ascli flag description for: --format when validating XML files -#: tools/appstream-cli.c:133 +#: tools/appstreamcli.c:134 msgid "Format of the generated report (valid values are 'text' and 'yaml')." msgstr "デフォルトのメタデータファイル形式 (有効な値は 'xml' と 'yaml')。" @@ -564,7 +565,7 @@ "instead." msgstr "" -#: src/as-validator-issue-tag.h:253 +#: src/as-validator-issue-tag.h:263 msgid "" "Found an unknown tag in a requires/recommends group. This is likely an " "error, because a component relation of this type is unknown." @@ -581,19 +582,20 @@ msgstr "" #. TRANSLATORS: An invalid XML tag was found, "Found" refers to the tag name found, "Allowed" to the permitted name. -#: src/as-validator.c:524 src/as-validator.c:945 src/as-validator.c:1039 -#: src/as-validator.c:1440 src/as-validator.c:1460 src/as-validator.c:1493 +#: src/as-validator.c:522 src/as-validator.c:1027 src/as-validator.c:1078 +#: src/as-validator.c:1172 src/as-validator.c:1583 src/as-validator.c:1603 +#: src/as-validator.c:1636 #, c-format msgid "Found: %s - Allowed: %s" msgstr "検出：%s-許可：%s" #. TRANSLATORS: this is the menu spec main category for Game -#: src/as-category.c:311 +#: src/as-category.c:312 msgid "Games" msgstr "ゲーム" #. TRANSLATORS: ascli flag description for: --format as part of the metainfo-to-news command -#: tools/appstream-cli.c:862 +#: tools/appstreamcli.c:898 msgid "Generate the output in the selected format ('yaml' or 'text')." msgstr "選択した形式（「yaml」または「text」）で出力を生成します。" @@ -602,12 +604,12 @@ msgstr "指定されたアイテムを提供するコンポーネントを取得します。" #. TRANSLATORS: `appstreamcli get` command description. -#: tools/appstream-cli.c:1082 +#: tools/appstreamcli.c:1148 msgid "Get information about a component by its ID." msgstr "IDでコンポーネントに関する情報を取得します。" #. TRANSLATORS: this is the menu spec main category for Graphics -#: src/as-category.c:314 +#: src/as-category.c:315 msgid "Graphics & Photography" msgstr "グラフィックスと写真" @@ -615,7 +617,7 @@ msgid "Homepage" msgstr "ホームページ" -#: src/as-category.c:89 +#: src/as-category.c:90 msgctxt "Category of Development" msgid "IDEs" msgstr "統合開発環境" @@ -636,7 +638,7 @@ "relative path to the icon. Only file basenames or stock names are allowed." msgstr "" -#: tools/ascli-actions-misc.c:94 +#: src/as-pool.c:2429 msgid "Iconsets" msgstr "アイコンセット" @@ -644,18 +646,18 @@ msgid "Identifier" msgstr "識別子" -#: src/as-category.c:217 +#: src/as-category.c:218 msgctxt "Category of Addons" msgid "Input Sources" msgstr "入力ソース" #. TRANSLATORS: `appstreamcli put` command description. -#: tools/appstream-cli.c:1136 +#: tools/appstreamcli.c:1207 msgid "Install a metadata file into the right location." msgstr "メタデータファイルを正しい場所にインストールします。" #. TRANSLATORS: `appstreamcli install` command description. -#: tools/appstream-cli.c:1115 +#: tools/appstreamcli.c:1186 msgid "Install software matching the component-ID." msgstr "コンポーネント ID に一致するソフトウェアをインストールします。" @@ -673,7 +675,7 @@ "permitted." msgstr "" -#: tools/ascli-actions-mdata.c:212 +#: tools/ascli-actions-mdata.c:230 msgid "Invalid type for provided item selected. Valid values are:" msgstr "選択した提供アイテムのタイプが無効です。有効な値は：" @@ -683,29 +685,29 @@ "eq/ne/lt/gt/le/ge are permitted." msgstr "関係アイテムのバージョン比較操作が無効です。 eq / ne / lt / gt / le / geのみが許可されます。" -#: src/as-validator-issue-tag.h:492 +#: src/as-validator-issue-tag.h:514 msgid "" "It is recommended to add a long description to this component to present it " "better to users." msgstr "ユーザーにわかりやすく表示するために、このコンポーネントに長い説明を追加することはお勧めです。" -#: src/as-validator-issue-tag.h:487 +#: src/as-validator-issue-tag.h:509 msgid "" "It would be useful to add a long description to this font to present it " "better to users." msgstr "このフォントに長い説明を追加して、ユーザーにわかりやすく表示すると便利です。" -#: src/as-category.c:144 +#: src/as-category.c:145 msgctxt "Category of Games" msgid "Kids" msgstr "子ども向け" -#: src/as-category.c:220 +#: src/as-category.c:221 msgctxt "Category of Addons" msgid "Language Packs" msgstr "言語パック" -#: src/as-category.c:107 +#: src/as-category.c:108 msgctxt "Category of Education" msgid "Languages" msgstr "言語" @@ -729,49 +731,49 @@ msgstr "" #. TRANSLATORS: ascli flag description for: --limit as part of the news-to-metainfo command -#: tools/appstream-cli.c:820 +#: tools/appstreamcli.c:820 msgid "" "Limit the number of release entries that end up in the metainfo file (0 for " "unlimited)." msgstr "メタインフォファイルに含まれるリリースエントリの数を制限します（無制限の場合は0）。" -#: src/as-category.c:223 +#: src/as-category.c:224 msgctxt "Category of Addons" msgid "Localization" msgstr "ローカライゼーション" -#: src/as-category.c:147 +#: src/as-category.c:148 msgctxt "Category of Games" msgid "Logic" msgstr "論理" #. TRANSLATORS: ascli flag description for: --no-cache -#: tools/appstream-cli.c:69 +#: tools/appstreamcli.c:69 msgid "Make request without any caching." msgstr "キャッシュせずにリクエストを行います。" #. TRANSLATORS: ascli flag description for: --cachepath -#: tools/appstream-cli.c:59 +#: tools/appstreamcli.c:60 msgid "Manually selected location of AppStream cache." msgstr "手動で選択したAppStreamキャッシュの場所。" #. TRANSLATORS: ascli flag description for: --datapath -#: tools/appstream-cli.c:64 +#: tools/appstreamcli.c:65 msgid "Manually selected location of AppStream metadata to scan." msgstr "スキャンするAppStreamメタデータの場所を手動で選択します。" -#: src/as-pool.c:1369 +#: src/as-pool.c:1370 msgid "" "Many components have been recognized as invalid. See debug output for " "details." msgstr "多くのコンポーネントが無効と認識されています。詳細については、デバッグ出力を参照してください。" -#: src/as-category.c:111 +#: src/as-category.c:112 msgctxt "Category of Education" msgid "Math" msgstr "数学" -#: src/as-category.c:243 +#: src/as-category.c:244 msgctxt "Category of Science" msgid "Math" msgstr "数学" @@ -780,17 +782,17 @@ msgid "Media types" msgstr "メディアタイプ" -#: tools/ascli-actions-mdata.c:347 +#: tools/ascli-actions-mdata.c:365 #, c-format msgid "Metadata file '%s' does not exist." msgstr "メタデータファイル '%s' は存在しません。" -#: src/as-pool.c:962 +#: src/as-pool.c:1114 msgid "Metadata files have errors:" msgstr "メタデータファイルにエラーがあります:" -#: tools/ascli-actions-misc.c:198 tools/ascli-actions-misc.c:436 -#: tools/ascli-actions-misc.c:515 +#: tools/ascli-actions-misc.c:128 tools/ascli-actions-misc.c:371 +#: tools/ascli-actions-misc.c:448 #, c-format msgid "Metainfo file '%s' does not exist." msgstr "メタデータファイル '%s' は存在しません。" @@ -811,7 +813,7 @@ msgid "Modaliases" msgstr "モダリア" -#: src/as-category.c:74 +#: src/as-category.c:75 msgctxt "Category of AudioVideo" msgid "Music Players" msgstr "音楽プレーヤー" @@ -820,21 +822,22 @@ msgid "Name" msgstr "名前" -#: src/as-category.c:266 +#: src/as-category.c:267 msgctxt "Category of Communication" msgid "News" msgstr "ニュース" -#: src/as-validator-issue-tag.h:631 +#: src/as-validator-issue-tag.h:653 msgid "No AppStream metadata was found in this directory or directory tree." msgstr "このディレクトリまたはディレクトリツリーにAppStreamメタデータが見つかりませんでした。" #. pedantic because not everything which has metadata is an application -#: src/as-validator-issue-tag.h:636 +#: src/as-validator-issue-tag.h:658 msgid "No XDG applications directory found." msgstr "XDGアプリケーションディレクトリが見つかりません。" -#: tools/ascli-actions-mdata.c:182 +#. TRANSLATORS: We got no full-text search results +#: tools/ascli-actions-mdata.c:200 #, c-format msgid "No component matching '%s' found." msgstr "'%s' に一致するコンポーネントは見つかりませんでした。" @@ -843,18 +846,18 @@ msgid "No icons." msgstr "アイコンはありません。" -#: tools/ascli-actions-misc.c:402 +#: tools/ascli-actions-misc.c:337 msgid "No output filename specified, modifying metainfo file directly." msgstr "出力ファイル名が指定されていません。メタ情報ファイルを直接変更します。" -#: tools/ascli-actions-misc.c:306 +#: tools/ascli-actions-misc.c:236 msgid "" "No provided binary specified in metainfo file, and no exec command specified " "via '--exec'. Can not create 'Exec=' key." msgstr "" "メタインフォファイルにバイナリが指定されておらず、「-exec」で指定されたexecコマンドもありません。 「Exec =」キーを作成できません。" -#: tools/ascli-actions-misc.c:284 +#: tools/ascli-actions-misc.c:214 msgid "" "No stock icon name was provided in the metainfo file. Can not continue." msgstr "メタインフォファイルにストックアイコン名が指定されていません。続行できません。" @@ -865,17 +868,17 @@ "(part of PackageKit) is available." msgstr "適切なパッケージマネージャーCLIが見つかりません。ご確認してください。 「pkcon」（PackageKitの一部）が利用可能です。" -#: tools/ascli-actions-mdata.c:206 +#: tools/ascli-actions-mdata.c:224 msgid "No value for the item to search for was defined." msgstr "検索するアイテムの値が定義されていません。" #. TRANSLATORS: this is the menu spec main category for Office -#: src/as-category.c:317 +#: src/as-category.c:318 msgid "Office" msgstr "Office" #. TRANSLATORS: An unknown option was passed to appstreamcli. -#: tools/appstream-cli.c:191 +#: tools/appstreamcli.c:193 #, c-format msgid "Option '%s' is unknown." msgstr "オプション '%s' は不明です。" @@ -884,18 +887,18 @@ msgid "Package" msgstr "パッケージ" -#: src/as-category.c:171 +#: src/as-category.c:172 msgctxt "Category of Graphics" msgid "Photography" msgstr "写真" #. TRANSLATORS: ascli flag description for: --explain (used by the "validate" command) -#: tools/appstream-cli.c:123 +#: tools/appstreamcli.c:124 msgid "Print detailed explanation for found issues." msgstr "見つかった問題の詳細な説明を表示します。" #. TRANSLATORS: ascli flag description for: --details -#: tools/appstream-cli.c:100 +#: tools/appstreamcli.c:101 msgid "Print detailed output about found components." msgstr "見つかったコンポーネントの詳細な出力を表示します。" @@ -917,37 +920,37 @@ msgstr "Python 3" #. TRANSLATORS: `appstreamcli refresh-cache` command description. -#: tools/appstream-cli.c:1098 +#: tools/appstreamcli.c:1164 msgid "Rebuild the component metadata cache." msgstr "コンポーネントのメタデータキャッシュを再構築します。" #. TRANSLATORS: `appstreamcli remove` command description. -#: tools/appstream-cli.c:1120 +#: tools/appstreamcli.c:1191 msgid "Remove software matching the component-ID." msgstr "コンポーネント ID に一致するソフトウェアを削除します。" #. TRANSLATORS: We tried to download from an URL, but the retrieved data was empty -#: src/as-curl.c:247 +#: src/as-curl.c:315 #, c-format msgid "Retrieved file size was zero." msgstr "取得したファイルサイズはゼロでした。" -#: src/as-category.c:248 +#: src/as-category.c:249 msgctxt "Category of Science" msgid "Robotics" msgstr "ロボット工学" -#: src/as-category.c:150 +#: src/as-category.c:151 msgctxt "Category of Games" msgid "Role Playing" msgstr "ロールプレイング" -#: tools/appstream-cli.c:195 tools/appstream-cli.c:1176 +#: tools/appstreamcli.c:197 tools/appstreamcli.c:1253 #, c-format msgid "Run '%s --help' to see a full list of available command line options." msgstr "利用可能なコマンドラインオプションの完全なリストを見るには '%s --help' を実行してください。" -#: tools/appstream-cli.c:197 +#: tools/appstreamcli.c:199 #, c-format msgid "" "Run '%s --help' to see a list of available commands and options, and '%s %s -" @@ -960,33 +963,34 @@ msgid "Runtime Firmware" msgstr "ランタイムファームウェア" -#: src/as-category.c:174 +#: src/as-category.c:175 msgctxt "Category of Graphics" msgid "Scanning" msgstr "スキャン" #. TRANSLATORS: this is the menu spec main category for Science -#: src/as-category.c:323 +#: src/as-category.c:324 msgid "Science" msgstr "科学" #. TRANSLATORS: `appstreamcli search` command description. -#: tools/appstream-cli.c:1077 +#: tools/appstreamcli.c:1143 msgid "Search the component database." msgstr "コンポーネントデータベースを検索します。" -#: src/as-category.c:293 +#: src/as-category.c:294 msgctxt "Category of Utility" msgid "Security" msgstr "セキュリティ" #. TRANSLATORS: ascli flag description for: --verbose -#: tools/appstream-cli.c:1057 +#: tools/appstreamcli.c:1123 msgid "Show extra debugging information." msgstr "追加のデバッグ情報を表示します。" +#. TRANSLATORS: ascompose flag description for: --version #. TRANSLATORS: ascli flag description for: --version -#: tools/appstream-cli.c:1051 +#: tools/appstream-compose.c:189 tools/appstreamcli.c:1117 msgid "Show the program version." msgstr "プログラムのバージョンを表示します。" @@ -997,18 +1001,18 @@ "this runtime." msgstr "" -#: src/as-category.c:153 +#: src/as-category.c:154 msgctxt "Category of Games" msgid "Sports" msgstr "スポーツ" -#: src/as-category.c:157 +#: src/as-category.c:158 msgctxt "Category of Games" msgid "Strategy" msgstr "戦略" #. these are commands we can use with appstreamcli -#: tools/appstream-cli.c:958 +#: tools/appstreamcli.c:1024 msgid "Subcommands:" msgstr "サブコマンド:" @@ -1024,11 +1028,11 @@ msgstr "要約" #. TRANSLATORS: Status summary in ascli -#: tools/ascli-actions-misc.c:145 +#: tools/ascli-actions-misc.c:70 msgid "Summary:" msgstr "要約:" -#: src/as-category.c:290 +#: src/as-category.c:291 msgctxt "Category of Utility" msgid "System Monitoring" msgstr "システム監視" @@ -1037,12 +1041,12 @@ msgid "Tags of this name are not permitted in this section." msgstr "このセクションでは、この名前のタグは許可されていません。" -#: src/as-category.c:284 +#: src/as-category.c:285 msgctxt "Category of Utility" msgid "Terminal Emulators" msgstr "ターミナルエミュレーター" -#: src/as-category.c:281 +#: src/as-category.c:282 msgctxt "Category of Utility" msgid "Text Editors" msgstr "テキストエディター" @@ -1060,12 +1064,12 @@ "The 'update_contact' tag should not be included in collection AppStream XML." msgstr "" -#: tools/ascli-actions-mdata.c:483 +#: tools/ascli-actions-mdata.c:505 #, c-format msgid "The .desktop file '%s' does not exist." msgstr ".desktop ファイル '%s' は存在しません。" -#: src/as-validator-issue-tag.h:435 +#: src/as-validator-issue-tag.h:457 msgid "The can not contain a hyperlink." msgstr "にハイパーリンクを含めることはできません。" @@ -1075,7 +1079,7 @@ "conversion to the recent metainfo format." msgstr "" -#: src/as-validator-issue-tag.h:712 +#: src/as-validator-issue-tag.h:740 msgid "" "The AppStream specification requires a complete, ISO 8601 date string with " "at least day-granularity to denote dates. Please ensure the date string is " @@ -1084,41 +1088,41 @@ "AppStream の仕様では、日付を示すために少なくとも1日単位の完全な ISO 8601 日付文字列が必要です。 " "日付文字列が有効であることを確認してください。" -#: src/as-pool.c:2110 +#: src/as-pool.c:2111 #, c-format msgid "" "The AppStream system cache was updated, but problems were found which " "resulted in metadata being ignored: %s" msgstr "AppStream システムキャッシュをアップデートしましたが、問題が見つかったため、メタデータ内の結果を無視しました: %s" -#: src/as-pool.c:2108 +#: src/as-pool.c:2109 msgid "" "The AppStream system cache was updated, but some components were ignored. " "Refer to the verbose log for more information." msgstr "" "AppStreamシステムキャッシュは更新されましたが、一部のコンポーネントは無視されました。詳細については、詳細ログを参照してください。" -#: src/as-validator-issue-tag.h:156 +#: src/as-validator-issue-tag.h:166 msgid "The SPDX license expression is invalid and could not be parsed." msgstr "SPDXライセンス式が無効であり、解析できませんでした。" #. TRANSLATORS: Additional help text for the 'new-template' ascli subcommand, a bullet-pointed list of types follows -#: tools/appstream-cli.c:734 +#: tools/appstreamcli.c:760 #, c-format msgid "The TYPE must be a valid component-type, such as: %s" msgstr "TYPEは次のような有効なコンポーネントタイプである必要があります：%s" -#: src/as-validator-issue-tag.h:589 +#: src/as-validator-issue-tag.h:611 msgid "The XML of this file is malformed." msgstr "このファイルのXMLの形式が正しくありません。" -#: src/as-validator-issue-tag.h:626 +#: src/as-validator-issue-tag.h:648 msgid "" "The category defined in the .desktop file is not valid. Refer to the XDG " "Menu Specification for a list of valid categories." msgstr "" -#: src/as-validator-issue-tag.h:574 +#: src/as-validator-issue-tag.h:596 msgid "" "The category name is not valid. Refer to the XDG Menu Specification for a " "list of valid category names." @@ -1131,7 +1135,7 @@ "good option is to replace any hyphens with underscores ('_')." msgstr "" -#: src/as-validator-issue-tag.h:130 +#: src/as-validator-issue-tag.h:135 msgid "" "The component ID contains a segment starting with a number. Starting a " "segment of the reverse-DNS ID with a number is strongly discouraged, to keep " @@ -1139,13 +1143,13 @@ "segments with an underscore." msgstr "" -#: src/as-validator-issue-tag.h:119 +#: src/as-validator-issue-tag.h:124 msgid "" "The component ID contains an invalid character. Only ASCII characters, dots " "and numbers are permitted." msgstr "" -#: src/as-validator-issue-tag.h:106 +#: src/as-validator-issue-tag.h:111 msgid "" "The component ID is not a reverse domain-name. Please update the ID to avoid " "future issues and be compatible with all AppStream implementations.\n" @@ -1157,13 +1161,13 @@ "associated with the metainfo data." msgstr "" -#: src/as-validator-issue-tag.h:101 +#: src/as-validator-issue-tag.h:106 msgid "" "The component ID is required to follow a reverse domain-name scheme for its " "name. See the AppStream specification for details." msgstr "" -#: src/as-validator-issue-tag.h:114 +#: src/as-validator-issue-tag.h:119 msgid "" "The component ID might not follow the reverse domain-name schema (the TLD " "used by it is not known to the validator)." @@ -1175,7 +1179,7 @@ "files." msgstr "" -#: src/as-validator-issue-tag.h:325 +#: src/as-validator-issue-tag.h:342 msgid "" "The component has a priority value set. This is not allowed in metainfo " "files." @@ -1186,37 +1190,37 @@ msgid "The component is an addon, but no 'extends' tag was specified." msgstr "" -#: src/as-validator-issue-tag.h:482 +#: src/as-validator-issue-tag.h:504 msgid "" "The component is missing a long description. Components of this type must " "have a long description." msgstr "" -#: src/as-validator-issue-tag.h:340 +#: src/as-validator-issue-tag.h:357 msgid "The component is missing a name ( tag)." msgstr "" -#: src/as-validator-issue-tag.h:345 +#: src/as-validator-issue-tag.h:362 msgid "The component is missing a summary ( tag)." msgstr "" -#: src/as-validator-issue-tag.h:335 +#: src/as-validator-issue-tag.h:352 msgid "The component is missing an ID ( tag)." msgstr "" -#: src/as-validator-issue-tag.h:141 +#: src/as-validator-issue-tag.h:151 msgid "" "The component is part of the Freedesktop project, but its ID does not start " "with fd.o's reverse-DNS name (\"org.freedesktop\")." msgstr "" -#: src/as-validator-issue-tag.h:151 +#: src/as-validator-issue-tag.h:161 msgid "" "The component is part of the GNOME project, but its ID does not start with " "GNOMEs reverse-DNS name (\"org.gnome\")." msgstr "" -#: src/as-validator-issue-tag.h:146 +#: src/as-validator-issue-tag.h:156 msgid "" "The component is part of the KDE project, but its ID does not start with " "KDEs reverse-DNS name (\"org.kde\")." @@ -1226,7 +1230,7 @@ msgid "The component name should (likely) not end with a dot ('.')." msgstr "" -#: src/as-validator-issue-tag.h:370 +#: src/as-validator-issue-tag.h:387 msgid "The component summary must not contain tabs or linebreaks." msgstr "" @@ -1234,14 +1238,14 @@ msgid "The component summary should not end with a dot ('.')." msgstr "" -#: src/as-validator-issue-tag.h:248 +#: src/as-validator-issue-tag.h:258 msgid "" "The default screenshot of a software component must not be a video. Use a " "static image as default screenshot and set the video as a secondary " "screenshot." msgstr "" -#: src/as-validator-issue-tag.h:86 +#: src/as-validator-issue-tag.h:91 msgid "" "The description contains a web URL in plain text. This is not allowed, " "please use the tag instead to share links." @@ -1268,20 +1272,20 @@ "detailed information on this component immediately in the first paragraph." msgstr "" -#: src/as-validator-issue-tag.h:161 +#: src/as-validator-issue-tag.h:171 msgid "" "The license ID was not found in the SPDX database. Please check that the " "license ID is written in an SPDX-conformant way and is a valid free software " "license." msgstr "" -#: src/as-validator-issue-tag.h:96 +#: src/as-validator-issue-tag.h:101 msgid "" "The mentioned tag is empty, which is highly likely not intended as it should " "have content." msgstr "" -#: src/as-validator-issue-tag.h:173 +#: src/as-validator-issue-tag.h:183 msgid "" "The metadata itself does not seem to be licensed under a permissive license. " "Please license the data under a permissive license, like FSFAP, CC0-1.0 or " @@ -1289,7 +1293,7 @@ "the risk of license violations due to mutually incompatible licenses." msgstr "" -#: src/as-validator-issue-tag.h:167 +#: src/as-validator-issue-tag.h:177 msgid "" "The metadata itself seems to be licensed under a complex collection of " "licenses. Please license the data under a simple permissive license, like " @@ -1304,22 +1308,22 @@ "'/usr/share/metainfo'." msgstr "" -#: src/as-validator-issue-tag.h:646 +#: src/as-validator-issue-tag.h:668 msgid "The metainfo file specifies multiple components. This is not allowed." msgstr "" #. TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). -#: src/as-validator-issue-tag.h:601 +#: src/as-validator-issue-tag.h:623 msgid "" "The metainfo file uses an ancient version of the AppStream specification, " "which can not be validated. Please migrate it to version 0.6 (or higher)." msgstr "" -#: src/as-validator-issue-tag.h:611 +#: src/as-validator-issue-tag.h:633 msgid "The metainfo filename does not match the component ID." msgstr "メタ情報ファイル名がコンポーネント ID に一致しません。" -#: src/as-validator-issue-tag.h:651 +#: src/as-validator-issue-tag.h:673 msgid "" "The releases are not sorted in a latest to oldest version order. This is " "required as some tools will assume that the latest version is always at the " @@ -1331,7 +1335,7 @@ msgid "The screenshot caption is too long (should be <= 80 characters)" msgstr "" -#: src/as-validator-issue-tag.h:211 +#: src/as-validator-issue-tag.h:221 msgid "The screenshot does not have a caption text. Consider adding one." msgstr "" @@ -1366,29 +1370,29 @@ "values for the 'container' property." msgstr "" -#: src/as-validator-issue-tag.h:320 +#: src/as-validator-issue-tag.h:337 msgid "" "The set component type is not a recognized, valid AppStream component type." msgstr "" -#: src/as-validator-issue-tag.h:440 +#: src/as-validator-issue-tag.h:462 msgid "" "The set value is not an identifier for a desktop environment as registered " "with Freedesktop.org." msgstr "" -#: tools/ascli-actions-mdata.c:465 +#: tools/ascli-actions-mdata.c:487 #, c-format msgid "" "The software component type '%s' is not valid in AppStream. Possible values " "are:" msgstr "" -#: src/as-validator-issue-tag.h:375 +#: src/as-validator-issue-tag.h:381 msgid "The summary must not contain any URL. Use the tags for links." msgstr "" -#: src/as-validator-issue-tag.h:736 +#: src/as-validator-issue-tag.h:764 msgid "" "The type of the item that the component provides is not known to AppStream." msgstr "" @@ -1399,7 +1403,7 @@ "'@' is only allowed as '_at_' or '_AT_')." msgstr "" -#: tools/ascli-actions-validate.c:368 tools/ascli-actions-validate.c:497 +#: tools/ascli-actions-validate.c:370 tools/ascli-actions-validate.c:501 #, c-format msgid "" "The validator can not create reports in the '%s' format. You may select " @@ -1456,27 +1460,27 @@ "block is likely missing." msgstr "" -#: src/as-validator-issue-tag.h:606 +#: src/as-validator-issue-tag.h:628 msgid "" "This XML document has an unknown root tag. Maybe this file is not a metainfo " "document?" msgstr "" #. TRANSLATORS: Additional help text for the 'new-template' ascli subcommand -#: tools/appstream-cli.c:731 +#: tools/appstreamcli.c:757 msgid "" "This command takes optional TYPE and FILE positional arguments, FILE being a " "file to write to (or \"-\" for standard output)." msgstr "" -#: src/as-validator-issue-tag.h:718 +#: src/as-validator-issue-tag.h:746 msgid "" "This component extends, provides, requires or recommends itself, which is " "certainly not intended and may confuse users or machines dealing with this " "metadata." msgstr "" -#: src/as-validator-issue-tag.h:621 +#: src/as-validator-issue-tag.h:643 msgid "This component metadata refers to a non-existing .desktop file." msgstr "" @@ -1495,13 +1499,13 @@ "the data." msgstr "" -#: src/as-validator-issue-tag.h:497 +#: src/as-validator-issue-tag.h:519 msgid "" "This generic component is missing a long description. It may be useful to " "add one." msgstr "" -#: src/as-validator-issue-tag.h:463 +#: src/as-validator-issue-tag.h:485 msgid "" "This tag is a GNOME-specific extension to AppStream and not part of the " "official specification. Do not expect it to work in all implementations and " @@ -1520,12 +1524,12 @@ "and installing it by its software component identifier." msgstr "" -#: src/as-validator-issue-tag.h:430 +#: src/as-validator-issue-tag.h:452 msgid "" "This web link uses the FTP protocol. Consider switching to HTTP(S) instead." msgstr "" -#: tools/appstream-cli.c:700 +#: tools/appstreamcli.c:726 msgid "" "Too many parameters: Need two version numbers or version numbers and a " "comparison operator." @@ -1556,80 +1560,80 @@ msgid "URL format is invalid." msgstr "" -#: tools/ascli-actions-mdata.c:560 +#: tools/ascli-actions-mdata.c:582 #, c-format msgid "Unable to build the template metainfo file: %s" msgstr "メタ情報テンプレート ファイルを構築できません: %s" #. TRANSLATORS: User is trying to convert a file in ascli -#: tools/ascli-actions-mdata.c:383 +#: tools/ascli-actions-mdata.c:405 msgid "" "Unable to convert file: Could not determine output format, please set it " "explicitly using '--format='." msgstr "" #. TRANSLATORS: We failed to find any component in the database, likely due to an error -#: tools/ascli-actions-mdata.c:177 +#: tools/ascli-actions-mdata.c:194 #, c-format msgid "Unable to find component matching %s!" msgstr "%s に一致するコンポーネントが見つかりません！" -#: tools/ascli-actions-mdata.c:144 tools/ascli-actions-mdata.c:265 +#: tools/ascli-actions-mdata.c:161 tools/ascli-actions-mdata.c:283 #: tools/ascli-actions-pkgmgr.c:93 #, c-format msgid "Unable to find component with ID '%s'!" msgstr "ID が '%s' のコンポーネントは見つかりません！" -#: tools/ascli-actions-misc.c:224 +#: tools/ascli-actions-misc.c:154 #, c-format msgid "Unable to load existing desktop-entry file template: %s" msgstr "既存のデスクトップエントリファイルのテンプレートを読み込めません: %s" -#: src/as-validator-issue-tag.h:393 +#: src/as-validator-issue-tag.h:415 msgid "" "Unable to reach remote icon at the given web location - does it exist?" msgstr "" -#: src/as-validator-issue-tag.h:415 +#: src/as-validator-issue-tag.h:437 msgid "" "Unable to reach remote location that this URL references - does it exist?" msgstr "" -#: src/as-validator-issue-tag.h:184 +#: src/as-validator-issue-tag.h:194 msgid "" "Unable to reach the screenshot image on its remote location - does the image " "exist?" msgstr "" -#: src/as-validator-issue-tag.h:189 +#: src/as-validator-issue-tag.h:199 msgid "" "Unable to reach the screenshot video on its remote location - does the video " "file exist?" msgstr "" -#: src/as-validator-issue-tag.h:584 +#: src/as-validator-issue-tag.h:606 msgid "Unable to read file." msgstr "ファイルを読み込めません。" -#: src/as-validator-issue-tag.h:616 +#: src/as-validator-issue-tag.h:638 msgid "Unable to read the .desktop file associated with this component." msgstr "コンポーネントに関連付けられた .desktop ファイルを読み込めません。" -#: tools/ascli-actions-mdata.c:489 +#: tools/ascli-actions-mdata.c:511 #, c-format msgid "Unable to read the .desktop file: %s" msgstr ".desktop ファイルを読み込めません: %s" -#: src/as-pool.c:619 +#: src/as-pool.c:620 msgid "Unable to remove old cache." msgstr "" -#: tools/ascli-actions-misc.c:370 +#: tools/ascli-actions-misc.c:300 #, c-format msgid "Unable to save desktop entry file: %s" msgstr "デスクトップエントリファイルを保存できません: %s" -#: tools/ascli-actions-mdata.c:568 +#: tools/ascli-actions-mdata.c:590 #, c-format msgid "Unable to save the template metainfo file: %s" msgstr "メタ情報テンプレートファイルを保存できません: %s" @@ -1651,47 +1655,47 @@ msgstr "不明なコマンド '%s' です。" #. * TRANSLATORS: The user tried to compare version numbers, but the comparison operator (greater-then, equal, etc.) was invalid. -#: tools/appstream-cli.c:660 +#: tools/appstreamcli.c:686 #, c-format msgid "Unknown compare relation '%s'. Valid values are:" msgstr "" #. TRANSLATORS: ascli flag description for: --from-desktop (part of the new-template subcommand) -#: tools/appstream-cli.c:726 +#: tools/appstreamcli.c:752 msgid "" "Use the given .desktop file to fill in the basic values of the metainfo file." msgstr "" #. TRANSLATORS: ascli flag description for: --exec (part of the make-desktop-file subcommand) -#: tools/appstream-cli.c:775 +#: tools/appstreamcli.c:801 msgid "Use the specified line for the 'Exec=' key of the desktop-entry file." msgstr "" #. TRANSLATORS: this is the menu spec main category for Utilities -#: src/as-category.c:329 +#: src/as-category.c:330 msgid "Utilities" msgstr "ユーティリティー" #. TRANSLATORS: `appstreamcli validate` command description. -#: tools/appstream-cli.c:1104 +#: tools/appstreamcli.c:1170 msgid "Validate AppStream XML files for issues." msgstr "" #. TRANSLATORS: `appstreamcli validate-tree` command description. -#: tools/appstream-cli.c:1109 +#: tools/appstreamcli.c:1175 msgid "Validate an installed file-tree of an application for valid metadata." msgstr "" -#: tools/ascli-actions-validate.c:306 tools/ascli-actions-validate.c:447 +#: tools/ascli-actions-validate.c:307 tools/ascli-actions-validate.c:450 #, c-format msgid "Validation failed: %s" msgstr "" -#: tools/ascli-actions-validate.c:294 tools/ascli-actions-validate.c:435 +#: tools/ascli-actions-validate.c:294 tools/ascli-actions-validate.c:437 msgid "Validation was successful." msgstr "" -#: tools/ascli-actions-validate.c:296 tools/ascli-actions-validate.c:437 +#: tools/ascli-actions-validate.c:296 tools/ascli-actions-validate.c:439 #, c-format msgid "Validation was successful: %s" msgstr "" @@ -1700,118 +1704,118 @@ msgid "Value of the item that should be found." msgstr "" -#: src/as-category.c:177 +#: src/as-category.c:178 msgctxt "Category of Graphics" msgid "Vector Graphics" msgstr "ベクターグラフィックス" -#: tools/ascli-actions-misc.c:48 +#: tools/ascli-actions-misc.c:49 #, c-format msgid "Version: %s" msgstr "バージョン: %s" -#: src/as-category.c:180 +#: src/as-category.c:181 msgctxt "Category of Graphics" msgid "Viewers" msgstr "ビューアー" -#: tools/ascli-actions-misc.c:153 +#: tools/ascli-actions-misc.c:84 #, c-format msgid "We have information on %i software components." msgstr "" -#: src/as-category.c:270 +#: src/as-category.c:271 msgctxt "Category of Communication" msgid "Web Browsers" msgstr "Web ブラウザー" -#: src/as-category.c:202 +#: src/as-category.c:203 msgctxt "Category of Office" msgid "Word Processor" msgstr "ワードプロセッサー" #. TRANSLATORS: `appstreamcli metainfo-to-news` command description. -#: tools/appstream-cli.c:1167 +#: tools/appstreamcli.c:1238 msgid "Write NEWS text or YAML file with information from a metainfo file." msgstr "" -#: tools/appstream-cli.c:1004 +#: tools/appstreamcli.c:1070 msgid "" "You can find information about subcommand-specific options by passing \"--" "help\" to the subcommand." msgstr "" #. TRANSLATORS: In ascli: The requested action needs higher permissions. -#: tools/ascli-actions-mdata.c:70 +#: tools/ascli-actions-mdata.c:91 msgid "You might need superuser permissions to perform this action." msgstr "この操作を実行するにはスーパーユーザー権限が必要である可能性があります。" -#: tools/ascli-actions-mdata.c:463 +#: tools/ascli-actions-mdata.c:485 msgid "" "You need to give an AppStream software component type to generate a " "template. Possible values are:" msgstr "" -#: tools/appstream-cli.c:631 +#: tools/appstreamcli.c:657 msgid "" "You need to provide at least two version numbers to compare as parameters." msgstr "" -#: tools/ascli-actions-misc.c:393 +#: tools/ascli-actions-misc.c:328 msgid "You need to specify a NEWS file as input." -msgstr "" +msgstr "入力元としてNEWSファイルの指定が必要です。" -#: tools/ascli-actions-misc.c:509 +#: tools/ascli-actions-misc.c:442 msgid "You need to specify a NEWS file as output, or '-' to print to stdout." -msgstr "" +msgstr "出力先としてNEWSファイルを指定するか、'-' と入力して標準出力に出力する必要があります。" -#: tools/ascli-actions-misc.c:540 +#: tools/ascli-actions-misc.c:473 msgid "You need to specify a NEWS format to write the output in." -msgstr "" +msgstr "出力を書き込むにはNEWS形式の指定が必要です。" #. TRANSLATORS: ascli has been run without command. -#: tools/appstream-cli.c:1175 +#: tools/appstreamcli.c:1252 msgid "You need to specify a command." msgstr "コマンドの指定が必要です。" #. TRANSLATORS: An AppStream component-id is missing in the command-line arguments #. TRANSLATORS: ascli was told to find a software component by its ID, but no component-id was specified. -#: tools/ascli-actions-mdata.c:132 tools/ascli-actions-mdata.c:253 +#: tools/ascli-actions-mdata.c:149 tools/ascli-actions-mdata.c:271 #: tools/ascli-actions-pkgmgr.c:80 msgid "You need to specify a component-ID." msgstr "コンポーネント ID の指定が必要です。" -#: tools/ascli-actions-misc.c:188 +#: tools/ascli-actions-misc.c:118 msgid "" "You need to specify a desktop-entry file to create or augment as output." msgstr "出力として作成したり引数に取るには、デスクトップファイルの指定が必要です。" -#: tools/ascli-actions-mdata.c:306 +#: tools/ascli-actions-mdata.c:324 msgid "You need to specify a metadata file." msgstr "メタデータファイルの指定が必要です。" -#: tools/ascli-actions-misc.c:184 tools/ascli-actions-misc.c:505 +#: tools/ascli-actions-misc.c:114 tools/ascli-actions-misc.c:438 msgid "You need to specify a metainfo file as input." msgstr "入力としてメタインフォファイルの指定が必要です。" -#: tools/ascli-actions-misc.c:397 +#: tools/ascli-actions-misc.c:332 msgid "" "You need to specify a metainfo file to augment, or '-' to print to stdout." msgstr "引数へのメタインフォファイルの指定が必要です。標準出力に表示する場合は '-' が必要です。" -#: tools/ascli-actions-validate.c:390 tools/ascli-actions-validate.c:484 +#: tools/ascli-actions-validate.c:392 tools/ascli-actions-validate.c:488 msgid "You need to specify a root directory to start validation!" msgstr "検証を始めるには、ルートディレクトリの指定が必要です！" -#: tools/ascli-actions-mdata.c:164 +#: tools/ascli-actions-mdata.c:181 msgid "You need to specify a term to search for." msgstr "検索する単語の指定が必要です。" -#: tools/ascli-actions-mdata.c:340 +#: tools/ascli-actions-mdata.c:358 msgid "You need to specify an input and output file." msgstr "入力ファイルと出力ファイルの指定が必要です。" -#: tools/ascli-actions-validate.c:268 tools/ascli-actions-validate.c:342 +#: tools/ascli-actions-validate.c:268 tools/ascli-actions-validate.c:344 msgid "You need to specify at least one file to validate!" msgstr "検証するファイルの指定が少なくとも一つは必要です！" @@ -1821,7 +1825,7 @@ #. * to include in a search but that should normally be ignored in #. * the search. #. -#: src/as-pool.c:111 +#: src/as-pool.c:103 msgid "app;application;package;program;programme;suite;tool" msgstr "" "app;application;package;program;programme;suite;tool;アプリ;アプリケーション;パッケージ;プログラム" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/aptitude.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/aptitude.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/aptitude.po 2021-08-03 08:53:43.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/aptitude.po 2022-02-11 23:04:25.000000000 +0000 @@ -196,8 +196,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: 2021-08-02 15:59+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. TRANSLATORS: These strings describing config items diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt-listchanges.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt-listchanges.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt-listchanges.po 2021-08-03 08:53:33.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt-listchanges.po 2022-02-11 23:04:15.000000000 +0000 @@ -13,10 +13,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 15:59+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Generated-By: pygettext.py 1.4\n" +"Language: ja\n" #: ../apt-listchanges.py:70 #, python-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt.po 2022-02-11 23:04:20.000000000 +0000 @@ -18,8 +18,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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:48+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -95,53 +95,53 @@ msgid " Done" msgstr " 完了" -#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:721 +#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:709 msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "これらを直すためには 'apt --fix-broken install' を実行する必要があるかもしれません。" -#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:723 +#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:711 msgid "" "Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " "specify a solution)." msgstr "未解決の依存関係です。'apt --fix-broken install' を実行してみてください (または解法を明示してください)。" -#: apt-private/private-cacheset.cc:36 apt-private/private-search.cc:89 +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:89 msgid "Sorting" msgstr "ソート中" -#: apt-private/private-cacheset.cc:212 +#: apt-private/private-cacheset.cc:226 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意、タスク '%2$s' のために '%1$s' を選択します\n" -#: apt-private/private-cacheset.cc:218 +#: apt-private/private-cacheset.cc:232 #, c-format msgid "Note, selecting '%s' for glob '%s'\n" msgstr "注意、glob '%2$s' のために '%1$s' を選択します\n" -#: apt-private/private-cacheset.cc:224 +#: apt-private/private-cacheset.cc:238 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意、regex '%2$s' のために '%1$s' を選択します\n" -#: apt-private/private-cacheset.cc:251 +#: apt-private/private-cacheset.cc:266 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "パッケージ %s は、以下によって提供される仮想パッケージです:\n" -#: apt-private/private-cacheset.cc:263 +#: apt-private/private-cacheset.cc:280 msgid " [Installed]" msgstr " [インストール済み]" -#: apt-private/private-cacheset.cc:272 +#: apt-private/private-cacheset.cc:292 msgid " [Not candidate version]" msgstr " [候補バージョンでない]" -#: apt-private/private-cacheset.cc:274 +#: apt-private/private-cacheset.cc:295 msgid "You should explicitly select one to install." msgstr "インストールするには、明示的にいずれかを選択する必要があります。" -#: apt-private/private-cacheset.cc:277 +#: apt-private/private-cacheset.cc:298 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -152,46 +152,46 @@ "これは、パッケージが欠落しているか、廃止されたか、または別のソース\n" "からのみ利用可能であることを意味します。\n" -#: apt-private/private-cacheset.cc:293 +#: apt-private/private-cacheset.cc:314 msgid "However the following packages replace it:" msgstr "ただし、以下のパッケージで置き換えられます:" -#: apt-private/private-cacheset.cc:333 +#: apt-private/private-cacheset.cc:386 #, c-format msgid "Package '%s' has no installation candidate" msgstr "パッケージ '%s' にはインストール候補がありません" -#: apt-private/private-cacheset.cc:346 +#: apt-private/private-cacheset.cc:399 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "'%s' のような仮想パッケージを削除することはできません\n" #. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-cacheset.cc:358 apt-private/private-install.cc:1144 +#: apt-private/private-cacheset.cc:411 apt-private/private-install.cc:1132 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "パッケージ '%s' はインストールされていないため削除もされません。削除したかったのは '%s' でしょうか?\n" -#: apt-private/private-cacheset.cc:364 apt-private/private-install.cc:1150 +#: apt-private/private-cacheset.cc:417 apt-private/private-install.cc:1138 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "パッケージ '%s' はインストールされていないため削除もされません\n" -#: apt-private/private-cacheset.cc:409 +#: apt-private/private-cacheset.cc:487 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意、'%2$s' の代わりに '%1$s' を選択します\n" -#: apt-private/private-cmndline.cc:417 +#: apt-private/private-cmndline.cc:418 msgid "Most used commands:" msgstr "最も使用されているコマンド:" -#: apt-private/private-cmndline.cc:457 +#: apt-private/private-cmndline.cc:458 #, c-format msgid "See %s for more information about the available commands." msgstr "利用可能なコマンドの詳細は %s を参照してください。" -#: apt-private/private-cmndline.cc:461 +#: apt-private/private-cmndline.cc:462 msgid "" "Configuration options and syntax is detailed in apt.conf(5).\n" "Information about how to configure sources can be found in sources.list(5).\n" @@ -203,24 +203,24 @@ "パッケージとバージョンの選択は apt_preferences(5) で表現できます。\n" "セキュリティの詳細は apt-secure(8) を参照してください。\n" -#: apt-private/private-cmndline.cc:466 +#: apt-private/private-cmndline.cc:467 msgid "This APT has Super Cow Powers." msgstr "この APT は Super Cow Powers 化されています。" -#: apt-private/private-cmndline.cc:468 +#: apt-private/private-cmndline.cc:469 msgid "This APT helper has Super Meep Powers." msgstr "この APT helper は Super Meep Powers 化されています。" -#: apt-private/private-cmndline.cc:565 +#: apt-private/private-cmndline.cc:567 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." msgstr "--force-yes は時代遅れです、代わりに --allow で始まるオプションのいずれかを使用します。" #: apt-private/private-depends.cc:35 apt-private/private-download.cc:255 -#: apt-private/private-show.cc:408 apt-private/private-show.cc:410 -#: apt-private/private-show.cc:465 cmdline/apt-mark.cc:56 -#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 +#: apt-private/private-show.cc:411 apt-private/private-show.cc:413 +#: apt-private/private-show.cc:468 cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:116 cmdline/apt-mark.cc:314 msgid "No packages found" msgstr "パッケージが見つかりません" @@ -287,7 +287,7 @@ #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:70 apt-private/private-install.cc:563 +#: apt-private/private-install.cc:70 apt-private/private-install.cc:551 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" @@ -295,7 +295,7 @@ msgid "Broken packages" msgstr "壊れたパッケージ" -#: apt-private/private-install.cc:174 apt-private/private-install.cc:366 +#: apt-private/private-install.cc:174 apt-private/private-install.cc:354 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -362,7 +362,7 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: apt-private/private-install.cc:305 apt-private/private-install.cc:327 +#: apt-private/private-install.cc:305 apt-private/private-install.cc:315 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これはTrivialに属する操作ではありません。" @@ -383,35 +383,35 @@ "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: apt-private/private-install.cc:317 apt-private/private-install.cc:334 +#: apt-private/private-install.cc:322 msgid "Abort." msgstr "中断しました。" -#: apt-private/private-install.cc:332 cmdline/apt-mark.cc:251 +#: apt-private/private-install.cc:320 cmdline/apt-mark.cc:253 msgid "Do you want to continue?" msgstr "続行しますか?" -#: apt-private/private-install.cc:360 +#: apt-private/private-install.cc:348 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: apt-private/private-install.cc:361 apt-private/private-source.cc:495 +#: apt-private/private-install.cc:349 apt-private/private-source.cc:492 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: apt-private/private-install.cc:369 +#: apt-private/private-install.cc:357 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: apt-private/private-install.cc:374 +#: apt-private/private-install.cc:362 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: apt-private/private-install.cc:375 +#: apt-private/private-install.cc:363 msgid "Aborting install." msgstr "インストールを中断します。" -#: apt-private/private-install.cc:403 +#: apt-private/private-install.cc:391 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -422,15 +422,15 @@ "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" "システムから消えました:" -#: apt-private/private-install.cc:410 +#: apt-private/private-install.cc:398 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意: これは dpkg により自動でわざと行われれます。" -#: apt-private/private-install.cc:453 +#: apt-private/private-install.cc:441 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "一連のものを削除するように指定されていないので、AutoRemover を開始できません" -#: apt-private/private-install.cc:560 +#: apt-private/private-install.cc:548 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -438,11 +438,11 @@ "AutoRemover が、想定されていない何かを壊したようです。\n" "apt のバグレポートを送ってください。" -#: apt-private/private-install.cc:567 +#: apt-private/private-install.cc:555 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: apt-private/private-install.cc:578 +#: apt-private/private-install.cc:566 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -450,70 +450,70 @@ "required:" msgstr[0] "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: apt-private/private-install.cc:585 +#: apt-private/private-install.cc:573 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu つのパッケージが自動でインストールされましたが、もう必要とされていません:\n" -#: apt-private/private-install.cc:595 +#: apt-private/private-install.cc:583 #, c-format msgid "Use '%s' to remove it." msgid_plural "Use '%s' to remove them." msgstr[0] "これを削除するには '%s' を利用してください。" -#: apt-private/private-install.cc:802 apt-private/private-install.cc:809 -#: apt-private/private-install.cc:817 +#: apt-private/private-install.cc:790 apt-private/private-install.cc:797 +#: apt-private/private-install.cc:805 #, c-format msgid "Unsupported file %s given on commandline" msgstr "コマンドラインで指定されたファイル %s はサポートされていません" -#: apt-private/private-install.cc:886 +#: apt-private/private-install.cc:874 msgid "The following additional packages will be installed:" msgstr "以下の追加パッケージがインストールされます:" -#: apt-private/private-install.cc:975 +#: apt-private/private-install.cc:963 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: apt-private/private-install.cc:977 +#: apt-private/private-install.cc:965 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: apt-private/private-install.cc:1019 +#: apt-private/private-install.cc:1007 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s はすでにインストール済みで upgrade がセットされていないため、インストールをスキップします。\n" -#: apt-private/private-install.cc:1023 +#: apt-private/private-install.cc:1011 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "%s はインストールされておらず、アップグレードだけの要求なので、インストールをスキップします。\n" -#: apt-private/private-install.cc:1035 +#: apt-private/private-install.cc:1023 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s はダウンロードできないため、再インストールは不可能です。\n" #. TRANSLATORS: First string is package name, second is version -#: apt-private/private-install.cc:1041 +#: apt-private/private-install.cc:1029 #, c-format msgid "%s is already the newest version (%s).\n" msgstr "%s はすでに最新バージョン (%s) です。\n" -#: apt-private/private-install.cc:1060 cmdline/apt-get.cc:121 -#: cmdline/apt-mark.cc:94 +#: apt-private/private-install.cc:1048 cmdline/apt-get.cc:121 +#: cmdline/apt-mark.cc:95 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: apt-private/private-install.cc:1093 +#: apt-private/private-install.cc:1081 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n" -#: apt-private/private-install.cc:1102 +#: apt-private/private-install.cc:1090 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択しました\n" @@ -713,55 +713,55 @@ msgid "Full Text Search" msgstr "全文検索" -#: apt-private/private-show.cc:392 +#: apt-private/private-show.cc:395 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。" -#: apt-private/private-show.cc:400 +#: apt-private/private-show.cc:403 msgid "not a real package (virtual)" msgstr "実際のパッケージではありません (仮想)" -#: apt-private/private-show.cc:460 +#: apt-private/private-show.cc:463 #, c-format msgid "Unable to locate package %s" msgstr "%s のパッケージが見つかりません" -#: apt-private/private-show.cc:486 +#: apt-private/private-show.cc:489 msgid "Package files:" msgstr "パッケージファイル:" -#: apt-private/private-show.cc:495 apt-private/private-show.cc:579 +#: apt-private/private-show.cc:498 apt-private/private-show.cc:582 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" #. Show any packages have explicit pins -#: apt-private/private-show.cc:509 +#: apt-private/private-show.cc:512 msgid "Pinned packages:" msgstr "Pin されたパッケージ:" #. Print the package name and the version we are forcing to -#: apt-private/private-show.cc:520 +#: apt-private/private-show.cc:523 #, c-format msgid "%s -> %s with priority %d\n" msgstr "%s -> %s 優先度 %d\n" -#: apt-private/private-show.cc:526 +#: apt-private/private-show.cc:529 msgid " Installed: " msgstr " インストールされているバージョン: " -#: apt-private/private-show.cc:527 +#: apt-private/private-show.cc:530 msgid " Candidate: " msgstr " 候補: " -#: apt-private/private-show.cc:545 apt-private/private-show.cc:553 +#: apt-private/private-show.cc:548 apt-private/private-show.cc:556 msgid "(none)" msgstr "(なし)" #. Show the priority tables -#: apt-private/private-show.cc:558 +#: apt-private/private-show.cc:561 msgid " Version table:" msgstr " バージョンテーブル:" @@ -785,22 +785,22 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" -#: apt-private/private-source.cc:292 +#: apt-private/private-source.cc:289 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "パッケージ '%2$s' のバージョン '%1$s' は見つかりませんでした" -#: apt-private/private-source.cc:314 +#: apt-private/private-source.cc:311 msgid "Must specify at least one package to fetch source for" msgstr "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: apt-private/private-source.cc:348 apt-private/private-source.cc:764 -#: apt-private/private-source.cc:774 apt-private/private-source.cc:801 +#: apt-private/private-source.cc:345 apt-private/private-source.cc:760 +#: apt-private/private-source.cc:770 apt-private/private-source.cc:797 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: apt-private/private-source.cc:368 +#: apt-private/private-source.cc:365 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -809,7 +809,7 @@ "注意: '%s' パッケージは以下の場所の '%s' バージョン管理システムで保守されています:\n" "%s\n" -#: apt-private/private-source.cc:379 +#: apt-private/private-source.cc:376 #, c-format msgid "" "Please use:\n" @@ -820,64 +820,64 @@ "%s\n" "を使用してください。\n" -#: apt-private/private-source.cc:427 +#: apt-private/private-source.cc:424 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:459 +#: apt-private/private-source.cc:456 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:464 +#: apt-private/private-source.cc:461 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: apt-private/private-source.cc:470 +#: apt-private/private-source.cc:467 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: apt-private/private-source.cc:491 +#: apt-private/private-source.cc:488 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: apt-private/private-source.cc:512 +#: apt-private/private-source.cc:509 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: apt-private/private-source.cc:525 +#: apt-private/private-source.cc:522 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: apt-private/private-source.cc:528 +#: apt-private/private-source.cc:525 msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: apt-private/private-source.cc:558 +#: apt-private/private-source.cc:555 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: apt-private/private-source.cc:583 apt-private/private-source.cc:589 +#: apt-private/private-source.cc:580 apt-private/private-source.cc:586 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルドに必要な依存情報を取得できません" -#: apt-private/private-source.cc:594 +#: apt-private/private-source.cc:591 #, c-format msgid "%s has no build depends.\n" msgstr "%s には build depends が指定されていません。\n" -#: apt-private/private-source.cc:646 +#: apt-private/private-source.cc:644 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) " @@ -886,27 +886,27 @@ "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf(5) の APT::Architectures " "を参照してください。" -#: apt-private/private-source.cc:663 +#: apt-private/private-source.cc:659 msgid "Must specify at least one package to check builddeps for" msgstr "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: apt-private/private-source.cc:706 +#: apt-private/private-source.cc:702 #, c-format msgid "" "Invalid operator '%c' at offset %d, did you mean '%c%c' or '%c='? - in: %s" msgstr "" -#: apt-private/private-source.cc:768 +#: apt-private/private-source.cc:764 #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "注意、ビルドの依存関係を取得するためディレクトリ '%s' を使用します\n" -#: apt-private/private-source.cc:770 +#: apt-private/private-source.cc:766 #, c-format msgid "Note, using file '%s' to get the build dependencies\n" msgstr "注意、ビルドの依存関係を取得するためファイル '%s' を使用します\n" -#: apt-private/private-source.cc:900 +#: apt-private/private-source.cc:896 msgid "Failed to process build dependencies" msgstr "ビルドに必要な依存関係の処理に失敗しました" @@ -949,7 +949,7 @@ msgid "All packages are up to date." msgstr "パッケージはすべて最新です。" -#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:173 +#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:175 #, c-format msgid "%s does not take any arguments" msgstr "%s は引数をとりません" @@ -1144,12 +1144,12 @@ msgid "Couldn't find package %s" msgstr "パッケージ %s が見付かりません" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:97 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:137 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -1311,69 +1311,69 @@ msgid "analyse a pattern" msgstr "" -#: cmdline/apt-mark.cc:66 +#: cmdline/apt-mark.cc:67 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s をインストールされていないものとしてマークできません\n" -#: cmdline/apt-mark.cc:72 +#: cmdline/apt-mark.cc:73 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s は手動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:74 +#: cmdline/apt-mark.cc:75 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s は自動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:240 +#: cmdline/apt-mark.cc:242 msgid "No changes necessary" msgstr "" -#: cmdline/apt-mark.cc:244 +#: cmdline/apt-mark.cc:246 msgid "The following packages will be marked as automatically installed:" msgstr "" -#: cmdline/apt-mark.cc:323 +#: cmdline/apt-mark.cc:327 #, c-format msgid "%s was already set on hold.\n" msgstr "%s はすでに保留に設定されています。\n" -#: cmdline/apt-mark.cc:325 +#: cmdline/apt-mark.cc:329 #, c-format msgid "%s was already not hold.\n" msgstr "%s はすでに保留されていません。\n" -#: cmdline/apt-mark.cc:352 +#: cmdline/apt-mark.cc:356 msgid "Executing dpkg failed. Are you root?" msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?" -#: cmdline/apt-mark.cc:355 +#: cmdline/apt-mark.cc:359 #, c-format msgid "%s set on hold.\n" msgstr "%s は保留に設定されました。\n" -#: cmdline/apt-mark.cc:357 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Canceled hold on %s.\n" msgstr "%s の保留を解除しました。\n" -#: cmdline/apt-mark.cc:359 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for purge.\n" msgstr "%s は完全削除で選択されました。\n" -#: cmdline/apt-mark.cc:361 +#: cmdline/apt-mark.cc:365 #, c-format msgid "Selected %s for removal.\n" msgstr "%s は削除で選択されました。\n" -#: cmdline/apt-mark.cc:363 +#: cmdline/apt-mark.cc:367 #, c-format msgid "Selected %s for installation.\n" msgstr "%s はインストールで選択されました。\n" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:419 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1389,35 +1389,35 @@ "パッケージ選択状態を操作したり、マークを特定せずにすべてのパッケージの\n" "一覧表示したりもできます。\n" -#: cmdline/apt-mark.cc:427 +#: cmdline/apt-mark.cc:431 msgid "Mark the given packages as automatically installed" msgstr "指定のパッケージを自動でインストールされたものとしてマークする" -#: cmdline/apt-mark.cc:428 +#: cmdline/apt-mark.cc:432 msgid "Mark the given packages as manually installed" msgstr "指定のパッケージを手動でインストールしたものとしてマークする" -#: cmdline/apt-mark.cc:429 +#: cmdline/apt-mark.cc:433 msgid "Mark all dependencies of meta packages as automatically installed." msgstr "" -#: cmdline/apt-mark.cc:430 +#: cmdline/apt-mark.cc:434 msgid "Mark a package as held back" msgstr "パッケージを保留としてマークする" -#: cmdline/apt-mark.cc:431 +#: cmdline/apt-mark.cc:435 msgid "Unset a package set as held back" msgstr "パッケージの保留を解除する" -#: cmdline/apt-mark.cc:436 +#: cmdline/apt-mark.cc:440 msgid "Print the list of automatically installed packages" msgstr "自動的にインストールされたパッケージの一覧を表示する" -#: cmdline/apt-mark.cc:437 +#: cmdline/apt-mark.cc:441 msgid "Print the list of manually installed packages" msgstr "手作業でインストールしたパッケージの一覧を表示する" -#: cmdline/apt-mark.cc:438 +#: cmdline/apt-mark.cc:442 msgid "Print the list of packages on hold" msgstr "保留されているパッケージの一覧を表示する" @@ -1520,56 +1520,56 @@ msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: methods/basehttp.cc:53 +#: methods/basehttp.cc:55 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/basehttp.cc:104 methods/basehttp.cc:111 +#: methods/basehttp.cc:106 methods/basehttp.cc:113 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP サーバが不正なリプライヘッダを送信してきました" -#: methods/basehttp.cc:142 +#: methods/basehttp.cc:144 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/basehttp.cc:168 +#: methods/basehttp.cc:173 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/basehttp.cc:199 +#: methods/basehttp.cc:206 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/basehttp.cc:201 +#: methods/basehttp.cc:208 msgid "This HTTP server has broken range support" msgstr "HTTP サーバのレンジサポートが壊れています" -#: methods/basehttp.cc:239 +#: methods/basehttp.cc:247 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/basehttp.cc:655 +#: methods/basehttp.cc:688 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/basehttp.cc:674 +#: methods/basehttp.cc:707 msgid "Connection failed" msgstr "接続失敗" -#: methods/basehttp.cc:727 methods/ftp.cc:970 methods/http.cc:620 -#: methods/http.cc:858 +#: methods/basehttp.cc:760 methods/ftp.cc:970 methods/http.cc:622 +#: methods/http.cc:860 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" -#: methods/basehttp.cc:769 +#: methods/basehttp.cc:802 #, c-format msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " "5 apt.conf)" msgstr "サーバ/プロキシからの不正な応答のため自動的に %s を無効にしました。(man 5 apt.conf)" -#: methods/basehttp.cc:871 +#: methods/basehttp.cc:904 msgid "Internal error" msgstr "内部エラー" @@ -1811,7 +1811,7 @@ msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334 +#: methods/ftp.cc:918 methods/http.cc:1017 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1871,16 +1871,16 @@ msgstr "apt-key の実行中に未知のエラーが発生" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. -#: methods/gpgv.cc:448 +#: methods/gpgv.cc:472 #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" msgstr "鍵 %s による署名は弱い digest アルゴリズム (%s) を使用しています" -#: methods/gpgv.cc:464 methods/gpgv.cc:470 +#: methods/gpgv.cc:488 methods/gpgv.cc:494 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:476 +#: methods/gpgv.cc:500 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1890,23 +1890,23 @@ msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:724 +#: methods/http.cc:726 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:728 +#: methods/http.cc:730 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:747 +#: methods/http.cc:749 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:815 +#: methods/http.cc:817 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:821 +#: methods/http.cc:823 msgid "Connection timed out" msgstr "接続タイムアウト" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apturl.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apturl.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apturl.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apturl.po 2022-02-11 23:04:20.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: 2021-08-02 17:43+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:38+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt-utils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt-utils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/apt-utils.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/apt-utils.po 2022-02-11 23:04:20.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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: cmdline/apt-dump-solver.cc:37 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/aspell.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/aspell.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/aspell.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/aspell.po 2022-02-11 23:04:17.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:00+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:50+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Poedit-Basepath: /factory/ja-po/aspell/aspell-0.60.6\n" +"Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" #: common/info.cpp:232 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/at-spi2-core.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/at-spi2-core.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/at-spi2-core.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/at-spi2-core.po 2022-02-11 23:04:14.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: 2021-08-02 18:02+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: atspi/atspi-component.c:326 atspi/atspi-misc.c:1073 atspi/atspi-value.c:111 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/attr.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/attr.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/attr.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/attr.po 2022-02-11 23:04:22.000000000 +0000 @@ -14,28 +14,28 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:00+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:50+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "%sの属性リスト" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "%2$sの属性%1$sを取得する" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "%sの属性を設定する" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "%2$sの属性%1$sを設定する" @@ -115,7 +115,7 @@ msgid "At least one of -s, -g, -r, or -l is required\n" msgstr "-s 、-g、-r、-l のうちの最低1つが必要です\n" -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "そのような属性はありません" @@ -134,7 +134,7 @@ msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- 拡張属性をセットする\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "" @@ -168,12 +168,12 @@ " %s %s\n" " `%s --help' 　　詳細な情報を見る\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "" @@ -207,12 +207,12 @@ " --version 　　バージョン表示して終了する\n" " --help ヘルプテキスト\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: \"%s\"は無効な正規表現です\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bash.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bash.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bash.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bash.po 2022-02-11 23:04:18.000000000 +0000 @@ -16,10 +16,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:01+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: arrayfunc.c:66 msgid "bad array subscript" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bfd.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bfd.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bfd.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bfd.po 2022-02-11 23:04:20.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: 2021-08-02 18:53+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:52+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" # BFD 内で利用される書式文字列については bfd/bfd.c を参照してください。 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/binutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/binutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/binutils.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/binutils.po 2022-02-11 23:04:13.000000000 +0000 @@ -9,17 +9,17 @@ "Project-Id-Version: binutils 2.30.90\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2020-02-01 11:50+0000\n" -"PO-Revision-Date: 2021-02-18 10:54+0000\n" +"PO-Revision-Date: 2021-10-25 18:46+0000\n" "Last-Translator: Takeshi Hamasaki \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: 2021-08-02 16:02+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:52+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: addr2line.c:87 #, c-format @@ -60,9 +60,9 @@ "\n" msgstr "" -#: addr2line.c:109 ar.c:357 ar.c:394 coffdump.c:471 dlltool.c:3715 -#: dllwrap.c:518 elfedit.c:952 objcopy.c:697 objcopy.c:752 readelf.c:4842 -#: size.c:109 srconv.c:1704 strings.c:706 sysdump.c:649 windmc.c:227 +#: addr2line.c:109 ar.c:359 ar.c:396 coffdump.c:471 dlltool.c:3713 +#: dllwrap.c:518 elfedit.c:976 objcopy.c:697 objcopy.c:752 readelf.c:5165 +#: size.c:109 srconv.c:1704 strings.c:1343 sysdump.c:655 windmc.c:227 #: windres.c:690 #, c-format msgid "Report bugs to %s\n" @@ -101,22 +101,22 @@ msgid "%s: cannot find section %s" msgstr "%s: セクション %s が見つかりません" -#: addr2line.c:442 ar.c:756 dlltool.c:3239 nm.c:1807 objcopy.c:6029 -#: objdump.c:5211 size.c:151 strings.c:289 windmc.c:958 windres.c:816 +#: addr2line.c:442 ar.c:758 dlltool.c:3237 nm.c:2051 objcopy.c:6036 +#: objdump.c:5372 size.c:151 strings.c:340 windmc.c:958 windres.c:816 msgid "fatal error: libbfd ABI mismatch" msgstr "" -#: addr2line.c:469 nm.c:1833 objdump.c:5258 readelf.c:5115 +#: addr2line.c:469 nm.c:2077 objdump.c:5419 readelf.c:5438 #, c-format msgid "unknown demangling style `%s'" msgstr "名前復元 (demangle) の方式 `%s' が不明です" -#: ar.c:274 +#: ar.c:275 #, c-format msgid "no entry %s in archive\n" msgstr "エントリ %s が書庫中にありません\n" -#: ar.c:288 +#: ar.c:289 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin " @@ -125,7 +125,7 @@ "使用法: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin " "] [member-name] [count] archive-file file...\n" -#: ar.c:294 +#: ar.c:295 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [member-" @@ -134,140 +134,140 @@ "使用法: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [member-name] " "[count] archive-file file...\n" -#: ar.c:302 +#: ar.c:303 #, c-format msgid " %s -M [ - read options from \n" msgstr " @ - からオプションを読み込む\n" -#: ar.c:344 +#: ar.c:345 #, c-format msgid " --target=BFDNAME - specify the target object format as BFDNAME\n" msgstr " --target=BFDNAME - ターゲットのオブジェクト形式を BFDNAME として指定する\n" -#: ar.c:345 +#: ar.c:346 #, c-format msgid "" " --output=DIRNAME - specify the output directory for extraction operations\n" msgstr "" -#: ar.c:348 +#: ar.c:350 #, c-format msgid " optional:\n" msgstr " 任意指定:\n" -#: ar.c:349 +#: ar.c:351 #, c-format msgid " --plugin

    - load the specified plugin\n" msgstr " --plugin

    - 指定したプラグインを読み込む\n" -#: ar.c:370 +#: ar.c:372 #, c-format msgid "Usage: %s [options] archive\n" msgstr "使用法: %s [options] archive\n" -#: ar.c:371 +#: ar.c:373 #, c-format msgid " Generate an index to speed access to archives\n" msgstr " アクセス速度を向上させるために書庫に索引を生成します\n" -#: ar.c:372 +#: ar.c:374 #, c-format msgid "" " The options are:\n" @@ -332,26 +332,26 @@ " オプションは以下の通りです:\n" " @ からオプションを読み込む\n" -#: ar.c:375 +#: ar.c:377 #, c-format msgid " --plugin Load the specified plugin\n" msgstr " --plugin 指定したプラグインを読み込む\n" -#: ar.c:379 +#: ar.c:381 #, c-format msgid "" " -D Use zero for symbol map timestamp (default)\n" " -U Use an actual symbol map timestamp\n" msgstr "" -#: ar.c:383 +#: ar.c:385 #, c-format msgid "" " -D Use zero for symbol map timestamp\n" " -U Use actual symbol map timestamp (default)\n" msgstr "" -#: ar.c:386 +#: ar.c:388 #, c-format msgid "" " -t Update the archive's symbol map timestamp\n" @@ -362,101 +362,101 @@ " -h --help このヘルプメッセージを表示する\n" " -v --version バージョン情報を表示する\n" -#: ar.c:511 +#: ar.c:513 msgid "two different operation options specified" msgstr "二つの異なった操作オプションが指定されました" -#: ar.c:608 ar.c:683 nm.c:1926 +#: ar.c:610 ar.c:685 nm.c:2188 #, c-format msgid "sorry - this program has been built without plugin support\n" msgstr "このプログラムはプラグインサポートなしで作成されています\n" -#: ar.c:812 +#: ar.c:814 msgid "no operation specified" msgstr "操作が指定されていません" -#: ar.c:815 +#: ar.c:817 msgid "`u' is only meaningful with the `r' option." msgstr "`u' は `r' オプションと併せて使用したときのみ意味があります。" -#: ar.c:818 +#: ar.c:820 msgid "`u' is not meaningful with the `D' option." msgstr "`u' は `D' オプションと併せて使用しても意味がありません。" -#: ar.c:821 +#: ar.c:823 msgid "`u' modifier ignored since `D' is the default (see `U')" msgstr "" -#: ar.c:830 +#: ar.c:832 msgid "missing position arg." msgstr "" -#: ar.c:836 +#: ar.c:838 msgid "`N' is only meaningful with the `x' and `d' options." msgstr "`N' は `x' および `d' オプションと併せて使用したときのみ意味があります。" -#: ar.c:838 +#: ar.c:840 msgid "`N' missing value." msgstr "" -#: ar.c:841 +#: ar.c:843 msgid "Value for `N' must be positive." msgstr "`N' の値は正でなければいけません。" -#: ar.c:857 +#: ar.c:859 msgid "`x' cannot be used on thin archives." msgstr "薄い書庫に対して `x' を使用できません。" -#: ar.c:950 +#: ar.c:952 #, c-format msgid "internal error -- this option not implemented" msgstr "内部エラー -- このオプションは実装されていません" -#: ar.c:1019 +#: ar.c:1021 #, c-format msgid "creating %s" msgstr "%s を作成しています" -#: ar.c:1050 +#: ar.c:1052 #, c-format msgid "Cannot convert existing library %s to thin format" msgstr "" -#: ar.c:1056 +#: ar.c:1058 #, c-format msgid "Cannot convert existing thin library %s to normal format" msgstr "" -#: ar.c:1088 ar.c:1185 ar.c:1507 objcopy.c:3606 +#: ar.c:1090 ar.c:1190 ar.c:1512 objcopy.c:3612 #, c-format msgid "internal stat error on %s" msgstr "内部状態エラーが %s で発生しました" -#: ar.c:1107 ar.c:1211 +#: ar.c:1109 ar.c:1216 #, c-format msgid "%s is not a valid archive" msgstr "%s は有効な書庫ではありません" -#: ar.c:1135 +#: ar.c:1137 #, c-format msgid "illegal output pathname for archive member: %s, using '%s' instead" msgstr "" -#: ar.c:1259 +#: ar.c:1264 msgid "could not create temporary file whilst writing archive" msgstr "書庫を書き込む際に一時ファイルの作成に失敗しました" -#: ar.c:1410 +#: ar.c:1415 #, c-format msgid "No member named `%s'\n" msgstr "`%s' という名前のメンバはありません\n" -#: ar.c:1460 +#: ar.c:1465 #, c-format msgid "no entry %s in archive %s!" msgstr "項目 %s は書庫 %s に存在しません!" -#: ar.c:1620 +#: ar.c:1625 #, c-format msgid "%s: no archive map to update" msgstr "%s: 更新すべき書庫のマップがありません" @@ -532,7 +532,7 @@ msgid " emulation options: \n" msgstr " エミュレーションに関係したオプション: \n" -#: bucomm.c:43 bucomm.c:77 +#: bucomm.c:43 bucomm.c:76 msgid "cause of error unknown" msgstr "" @@ -600,17 +600,17 @@ msgid "%s: bad number: %s" msgstr "%s: 誤った番号です: %s" -#: bucomm.c:607 strings.c:402 +#: bucomm.c:607 strings.c:453 #, c-format msgid "'%s': No such file" msgstr "'%s': そのようなファイルはありません" -#: bucomm.c:609 strings.c:404 +#: bucomm.c:609 strings.c:455 #, c-format msgid "Warning: could not locate '%s'. reason: %s" msgstr "警告: '%s' を配置できません。 理由: %s" -#: bucomm.c:613 strings.c:410 +#: bucomm.c:613 strings.c:461 #, c-format msgid "Warning: '%s' is a directory" msgstr "警告: '%s' はディレクトリです" @@ -730,7 +730,7 @@ msgid "Symbol %s, tag %d, number %d" msgstr "" -#: coffdump.c:345 readelf.c:18461 readelf.c:18552 +#: coffdump.c:345 readelf.c:18836 readelf.c:18927 #, c-format msgid "Type" msgstr "型" @@ -784,7 +784,7 @@ msgid "#sources %d" msgstr "" -#: coffdump.c:462 sysdump.c:642 +#: coffdump.c:462 sysdump.c:648 #, c-format msgid "Usage: %s [option(s)] in-file\n" msgstr "使用法: %s [option(s)] in-file\n" @@ -809,7 +809,7 @@ " -v --version プログラムのバージョンを表示する\n" "\n" -#: coffdump.c:532 srconv.c:1793 sysdump.c:705 +#: coffdump.c:532 srconv.c:1793 sysdump.c:711 msgid "no input file specified" msgstr "入力ファイルが指定されていません" @@ -957,7 +957,7 @@ msgid "%s: is not a COFF format file" msgstr "%s: は COFF 形式のファイルではありません" -#: cxxfilt.c:124 nm.c:324 objdump.c:390 +#: cxxfilt.c:124 nm.c:379 objdump.c:405 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -1053,7 +1053,7 @@ msgid "debug_get_real_type: circular debug information for %s\n" msgstr "debug_get_real_type: %s のデバッグ情報が循環しています\n" -#: debug.c:2484 +#: debug.c:2490 msgid "debug_write_type: illegal type encountered" msgstr "debug_write_type: 不正な型に遭遇しました" @@ -1081,223 +1081,223 @@ msgid "Syntax error in def file %s:%d" msgstr "定義ファイル %s で構文エラーが発生しました:%d" -#: dlltool.c:1034 +#: dlltool.c:1032 #, c-format msgid "%s: Path components stripped from image name, '%s'." msgstr "%s: イメージ名 '%s' からパスの要素が取り除かれました。" -#: dlltool.c:1052 +#: dlltool.c:1050 #, c-format msgid "NAME: %s base: %x" msgstr "NAME: %s ベース: %x" -#: dlltool.c:1055 dlltool.c:1076 +#: dlltool.c:1053 dlltool.c:1074 msgid "Can't have LIBRARY and NAME" msgstr "LIBRARY や NAME を持てません" -#: dlltool.c:1073 +#: dlltool.c:1071 #, c-format msgid "LIBRARY: %s base: %x" msgstr "LIBRARY: %s ベース: %x" -#: dlltool.c:1228 +#: dlltool.c:1226 #, c-format msgid "VERSION %d.%d\n" msgstr "バージョン %d.%d\n" -#: dlltool.c:1276 +#: dlltool.c:1274 #, c-format msgid "run: %s %s" msgstr "" -#: dlltool.c:1317 resrc.c:288 +#: dlltool.c:1315 resrc.c:288 #, c-format msgid "wait: %s" msgstr "wait: %s" -#: dlltool.c:1322 dllwrap.c:416 resrc.c:293 +#: dlltool.c:1320 dllwrap.c:416 resrc.c:293 #, c-format msgid "subprocess got fatal signal %d" msgstr "子プロセスが致命的なシグナルを %d 受け取りました" -#: dlltool.c:1328 dllwrap.c:423 resrc.c:300 +#: dlltool.c:1326 dllwrap.c:423 resrc.c:300 #, c-format msgid "%s exited with status %d" msgstr "%s はステータス %d で終了しました" -#: dlltool.c:1359 +#: dlltool.c:1357 #, c-format msgid "Sucking in info from %s section in %s" msgstr "%2$s 内の %1$s セクションから情報を取り込んでいます" -#: dlltool.c:1499 +#: dlltool.c:1497 #, c-format msgid "Excluding symbol: %s" msgstr "シンボルを除外しています: %s" -#: dlltool.c:1588 dlltool.c:1599 nm.c:1172 nm.c:1183 nm.c:1193 +#: dlltool.c:1586 dlltool.c:1597 nm.c:1416 nm.c:1427 nm.c:1437 #, c-format msgid "%s: no symbols" msgstr "%s: シンボルがありません" #. FIXME: we ought to read in and block out the base relocations. -#: dlltool.c:1625 +#: dlltool.c:1623 #, c-format msgid "Done reading %s" msgstr "%s の読取りが完了しました" -#: dlltool.c:1635 +#: dlltool.c:1633 #, c-format msgid "Unable to open object file: %s: %s" msgstr "オブジェクトファイルを開けません: %s: %s" -#: dlltool.c:1638 +#: dlltool.c:1636 #, c-format msgid "Scanning object file %s" msgstr "オブジェクトファイル %s を走査しています" -#: dlltool.c:1658 +#: dlltool.c:1656 #, c-format msgid "Cannot produce mcore-elf dll from archive file: %s" msgstr "書庫ファイルから mcore-elf dll を生成できません: %s" -#: dlltool.c:1760 +#: dlltool.c:1758 msgid "Adding exports to output file" msgstr "出力ファイルにエクスポートを追加しています" -#: dlltool.c:1812 +#: dlltool.c:1810 msgid "Added exports to output file" msgstr "出力ファイルにエクスポートを追加しました" -#: dlltool.c:1980 +#: dlltool.c:1978 #, c-format msgid "Generating export file: %s" msgstr "エクスポートファイルを生成します: %s" -#: dlltool.c:1985 +#: dlltool.c:1983 #, c-format msgid "Unable to open temporary assembler file: %s" msgstr "一時アセンブリファイルを開けません: %s" -#: dlltool.c:1990 +#: dlltool.c:1988 #, c-format msgid "Opened temporary file: %s" msgstr "一時ファイルを開きました: %s" -#: dlltool.c:2166 +#: dlltool.c:2164 msgid "failed to read the number of entries from base file" msgstr "ベースファイルから項目数を読み込むのに失敗しました" -#: dlltool.c:2217 +#: dlltool.c:2215 msgid "Generated exports file" msgstr "エクスポートファイルを生成しました" -#: dlltool.c:2375 +#: dlltool.c:2373 #, c-format msgid "bfd_open failed open stub file: %s: %s" msgstr "bfd_open がスタブファイルを開けませんでした: %s: %s" -#: dlltool.c:2379 +#: dlltool.c:2377 #, c-format msgid "Creating stub file: %s" msgstr "スタブファイルを作成しています: %s" -#: dlltool.c:2693 +#: dlltool.c:2691 #, c-format msgid "bfd_open failed reopen stub file: %s: %s" msgstr "bfd_open がスタブファイルを開けませんでした: %s: %s" -#: dlltool.c:2707 dlltool.c:2786 +#: dlltool.c:2705 dlltool.c:2784 #, c-format msgid "failed to open temporary head file: %s" msgstr "一時 head ファイルを開けません: %s" -#: dlltool.c:2771 dlltool.c:2861 +#: dlltool.c:2769 dlltool.c:2859 #, c-format msgid "failed to open temporary head file: %s: %s" msgstr "一時 head ファイルを開けません: %s: %s" -#: dlltool.c:2876 +#: dlltool.c:2874 #, c-format msgid "failed to open temporary tail file: %s" msgstr "一時 tail ファイルを開けません: %s" -#: dlltool.c:2912 +#: dlltool.c:2910 #, c-format msgid "failed to open temporary tail file: %s: %s" msgstr "一時 tail ファイルを開けません: %s: %s" -#: dlltool.c:2935 +#: dlltool.c:2933 #, c-format msgid "Can't create .lib file: %s: %s" msgstr ".lib ファイルを作成できません: %s: %s" -#: dlltool.c:2939 +#: dlltool.c:2937 #, c-format msgid "Creating library file: %s" msgstr "ライブラリファイルを作成しています: %s" -#: dlltool.c:3026 dlltool.c:3032 +#: dlltool.c:3024 dlltool.c:3030 #, c-format msgid "cannot delete %s: %s" msgstr "%s を削除できません: %s" -#: dlltool.c:3038 +#: dlltool.c:3036 msgid "Created lib file" msgstr "lib ファイルを作成しました" -#: dlltool.c:3244 +#: dlltool.c:3242 #, c-format msgid "Can't open .lib file: %s: %s" msgstr ".lib ファイルを開けません: %s: %s" -#: dlltool.c:3252 dlltool.c:3274 +#: dlltool.c:3250 dlltool.c:3272 #, c-format msgid "%s is not a library" msgstr "%s はライブラリではありません" -#: dlltool.c:3292 +#: dlltool.c:3290 #, c-format msgid "Import library `%s' specifies two or more dlls" msgstr "インポートライブラリ `%s' が2個以上の dll を指定しています" -#: dlltool.c:3303 +#: dlltool.c:3301 #, c-format msgid "Unable to determine dll name for `%s' (not an import library?)" msgstr "`%s' に対する dll 名を決定できません (インポートライブラリでは無い?)" -#: dlltool.c:3529 +#: dlltool.c:3527 #, c-format msgid "Warning, ignoring duplicate EXPORT %s %d,%d" msgstr "警告、重複した EXPORT %s %d,%d を無視します" -#: dlltool.c:3535 +#: dlltool.c:3533 #, c-format msgid "Error, duplicate EXPORT with ordinals: %s" msgstr "エラー、序数付き EXPORT が重複しています: %s" -#: dlltool.c:3638 +#: dlltool.c:3636 msgid "Processing definitions" msgstr "定義を処理しています" -#: dlltool.c:3665 +#: dlltool.c:3663 msgid "Processed definitions" msgstr "定義を処理しました" #. xgetext:c-format -#: dlltool.c:3672 dllwrap.c:477 +#: dlltool.c:3670 dllwrap.c:477 #, c-format msgid "Usage %s \n" msgstr "使用法: %s \n" #. xgetext:c-format -#: dlltool.c:3674 +#: dlltool.c:3672 #, c-format msgid "" " -m --machine Create as DLL for . [default: %s]\n" msgstr " -m --machine 用 DLL を作成する。 [default: %s]\n" -#: dlltool.c:3966 +#: dlltool.c:3949 #, c-format msgid "" " possible : arm[_interwork], i386, mcore[-elf]{-le|-be}, " @@ -1306,78 +1306,78 @@ " 可能な : arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, " "thumb\n" -#: dlltool.c:3676 +#: dlltool.c:3674 #, c-format msgid " -e --output-exp Generate an export file.\n" msgstr " -e --output-exp エクスポートファイルを生成する\n" -#: dlltool.c:3677 +#: dlltool.c:3675 #, c-format msgid " -l --output-lib Generate an interface library.\n" msgstr " -l --output-lib インターフェースライブラリを生成する\n" -#: dlltool.c:3678 +#: dlltool.c:3676 #, c-format msgid " -y --output-delaylib Create a delay-import library.\n" msgstr " -y --output-delaylib 遅延インポートライブラリを生成する\n" -#: dlltool.c:3679 +#: dlltool.c:3677 #, c-format msgid " -a --add-indirect Add dll indirects to export file.\n" msgstr " -a --add-indirect エクスポートファイルに間接 dll を追加する\n" -#: dlltool.c:3680 +#: dlltool.c:3678 #, c-format msgid "" " -D --dllname Name of input dll to put into interface lib.\n" msgstr " -D --dllname インターフェースライブラリに入れる入力 DLL の名前\n" -#: dlltool.c:3681 +#: dlltool.c:3679 #, c-format msgid " -d --input-def Name of .def file to be read in.\n" msgstr " -d --input-def 読み込まれる .def ファイルの名前\n" -#: dlltool.c:3682 +#: dlltool.c:3680 #, c-format msgid " -z --output-def Name of .def file to be created.\n" msgstr " -z --output-def 作成される .def ファイルの名前\n" -#: dlltool.c:3683 +#: dlltool.c:3681 #, c-format msgid " --export-all-symbols Export all symbols to .def\n" msgstr " --export-all-symbols .def に全てのシンボルをエクスポートする\n" -#: dlltool.c:3684 +#: dlltool.c:3682 #, c-format msgid " --no-export-all-symbols Only export listed symbols\n" msgstr " --no-export-all-symbols リストされたシンボルだけをエクスポートする\n" -#: dlltool.c:3685 +#: dlltool.c:3683 #, c-format msgid " --exclude-symbols Don't export \n" msgstr " --exclude-symbols をエクスポートしない\n" -#: dlltool.c:3686 +#: dlltool.c:3684 #, c-format msgid " --no-default-excludes Clear default exclude symbols\n" msgstr " --no-default-excludes デフォルトで除外されるシンボルを無くす\n" -#: dlltool.c:3687 +#: dlltool.c:3685 #, c-format msgid " -b --base-file Read linker generated base file.\n" msgstr " -b --base-file リンカが生成したベースファイルを読み込む\n" -#: dlltool.c:3688 +#: dlltool.c:3686 #, c-format msgid " -x --no-idata4 Don't generate idata$4 section.\n" msgstr " -x --no-idata4 idata$4 セクションを生成しない\n" -#: dlltool.c:3689 +#: dlltool.c:3687 #, c-format msgid " -c --no-idata5 Don't generate idata$5 section.\n" msgstr " -c --no-idata5 idata$5 セクションを生成しない\n" -#: dlltool.c:3690 +#: dlltool.c:3688 #, c-format msgid "" " --use-nul-prefixed-import-tables Use zero prefixed idata$4 and " @@ -1385,14 +1385,14 @@ msgstr "" " --use-nul-prefixed-import-tables idata$4 および idata$5 に接頭辞を付けない\n" -#: dlltool.c:3691 +#: dlltool.c:3689 #, c-format msgid "" " -U --add-underscore Add underscores to all symbols in interface " "library.\n" msgstr " -U --add-underscore インターフェースライブラリ内の全てのシンボルに下線 (_) を付ける\n" -#: dlltool.c:3692 +#: dlltool.c:3690 #, c-format msgid "" " --add-stdcall-underscore Add underscores to stdcall symbols in " @@ -1400,72 +1400,72 @@ msgstr "" " --add-stdcall-underscore インターフェースライブラリ内の stdcall シンボルに下線 (_) を付ける\n" -#: dlltool.c:3693 +#: dlltool.c:3691 #, c-format msgid "" " --no-leading-underscore All symbols shouldn't be prefixed by an " "underscore.\n" msgstr " --no-leading-underscore すべてのシンボルの先頭に下線 (_) が付いていないとする\n" -#: dlltool.c:3694 +#: dlltool.c:3692 #, c-format msgid "" " --leading-underscore All symbols should be prefixed by an " "underscore.\n" msgstr " --leading-underscore すべてのシンボルの先頭に下線 (_) が付いているとする\n" -#: dlltool.c:3695 +#: dlltool.c:3693 #, c-format msgid " -k --kill-at Kill @ from exported names.\n" msgstr " -k --kill-at エクスポートされた名前から @ を取り除く\n" -#: dlltool.c:3696 +#: dlltool.c:3694 #, c-format msgid " -A --add-stdcall-alias Add aliases without @.\n" msgstr " -A --add-stdcall-alias @ 無しのエイリアスを追加する\n" -#: dlltool.c:3697 +#: dlltool.c:3695 #, c-format msgid " -p --ext-prefix-alias Add aliases with .\n" msgstr " -p --ext-prefix-alias を接頭辞として付けたエイリアスを加える\n" -#: dlltool.c:3698 +#: dlltool.c:3696 #, c-format msgid " -S --as Use for assembler.\n" msgstr " -S --as アセンブラとして を使用する\n" -#: dlltool.c:3699 +#: dlltool.c:3697 #, c-format msgid " -f --as-flags Pass to the assembler.\n" msgstr " -f --as-flags アセンブラに を渡す\n" -#: dlltool.c:3700 +#: dlltool.c:3698 #, c-format msgid "" " -C --compat-implib Create backward compatible import library.\n" msgstr " -C --compat-implib 後方互換性のあるインポートライブラリを作成する\n" -#: dlltool.c:3701 +#: dlltool.c:3699 #, c-format msgid "" " -n --no-delete Keep temp files (repeat for extra " "preservation).\n" msgstr " -n --no-delete 一時ファイルを消去しない (余分なものも保存するなら繰り返すこと)\n" -#: dlltool.c:3702 +#: dlltool.c:3700 #, c-format msgid "" " -t --temp-prefix Use to construct temp file names.\n" msgstr " -t --temp-prefix 一時ファイル名を生成するときに 接頭辞を使用する\n" -#: dlltool.c:3703 +#: dlltool.c:3701 #, c-format msgid "" " -I --identify Report the name of the DLL associated with " ".\n" msgstr " -I --identify に関連づけられた DLL 名を報告する\n" -#: dlltool.c:3704 +#: dlltool.c:3702 #, c-format msgid "" " --identify-strict Causes --identify to report error when multiple " @@ -1473,73 +1473,73 @@ msgstr "" " --identify-strict 複数の DLL があるときに --identify がエラーを報告するようにする\n" -#: dlltool.c:3705 +#: dlltool.c:3703 #, c-format msgid " -v --verbose Be verbose.\n" msgstr " -v --verbose 冗長に表示を行う\n" -#: dlltool.c:3706 +#: dlltool.c:3704 #, c-format msgid " -V --version Display the program version.\n" msgstr " -V --version プログラムのバージョンを表示する\n" -#: dlltool.c:3707 +#: dlltool.c:3705 #, c-format msgid " -h --help Display this information.\n" msgstr " -h --help この情報を表示する\n" -#: dlltool.c:3708 +#: dlltool.c:3706 #, c-format msgid " @ Read options from .\n" msgstr " @ からオプションを読み込む\n" -#: dlltool.c:3710 +#: dlltool.c:3708 #, c-format msgid "" " -M --mcore-elf Process mcore-elf object files into .\n" msgstr " -M --mcore-elf へ mcore-elf オブジェクトファイルを処理する\n" -#: dlltool.c:3711 +#: dlltool.c:3709 #, c-format msgid " -L --linker Use as the linker.\n" msgstr " -L --linker リンカとして を使用する\n" -#: dlltool.c:3712 +#: dlltool.c:3710 #, c-format msgid " -F --linker-flags Pass to the linker.\n" msgstr " -F --linker-flags をリンカに渡す\n" -#: dlltool.c:3856 +#: dlltool.c:3854 #, c-format msgid "Unable to open def-file: %s" msgstr "" -#: dlltool.c:3861 +#: dlltool.c:3859 #, c-format msgid "Path components stripped from dllname, '%s'." msgstr "DLL 名'%s' からパスの要素が取り除かれました" -#: dlltool.c:3909 +#: dlltool.c:3907 #, c-format msgid "Unable to open base-file: %s" msgstr "ベースファイルを開けません: %s" -#: dlltool.c:3944 +#: dlltool.c:3939 #, c-format msgid "Machine '%s' not supported" msgstr "マシン '%s' はサポートされていません" -#: dlltool.c:4024 +#: dlltool.c:4036 #, c-format msgid "Warning, machine type (%d) not supported for delayimport." msgstr "警告、マシン型 (%d) では遅延インポートはサポートされていません" -#: dlltool.c:4092 dllwrap.c:206 +#: dlltool.c:4104 dllwrap.c:206 #, c-format msgid "Tried file: %s" msgstr "試したファイル: %s" -#: dlltool.c:4099 dllwrap.c:213 +#: dlltool.c:4111 dllwrap.c:213 #, c-format msgid "Using file: %s" msgstr "使用するファイル: %s" @@ -1906,7 +1906,7 @@ msgid "" msgstr "<.debug_str セクションがありません>" -#: dwarf.c:692 +#: dwarf.c:675 #, c-format msgid "DW_FORM_strp offset too big: %s\n" msgstr "DW_FORM_strp オフセットが大きすぎます: %s\n" @@ -1923,7 +1923,7 @@ msgid "" msgstr "<.debug_line_str セクションがありません>" -#: dwarf.c:720 +#: dwarf.c:703 #, c-format msgid "DW_FORM_line_strp offset too big: %s\n" msgstr "DW_FORM_line_strp オフセットが大きすぎます: %s\n" @@ -1940,7 +1940,7 @@ msgid "" msgstr "" -#: dwarf.c:758 +#: dwarf.c:740 #, c-format msgid "DW_FORM_GNU_str_index offset too big: %s\n" msgstr "DW_FORM_GNU_str_index オフセットが大きすぎます: %s\n" @@ -1953,7 +1953,7 @@ msgid "" msgstr "<.debug_str.dwo セクションがありません>" -#: dwarf.c:815 +#: dwarf.c:753 #, c-format msgid "DW_FORM_GNU_str_index indirect offset too big: %s\n" msgstr "DW_FORM_GNU_str_index の間接オフセットが大きすぎます: %s\n" @@ -1970,7 +1970,7 @@ msgid "" msgstr "<.debug_addr セクションがありません>" -#: dwarf.c:841 +#: dwarf.c:779 #, c-format msgid "Offset into section %s too big: %s\n" msgstr "" @@ -2069,236 +2069,236 @@ msgid "Corrupt attribute block length: %lx\n" msgstr "" -#: dwarf.c:2310 +#: dwarf.c:2313 msgid "corrupt discr_list - not using a block form\n" msgstr "" -#: dwarf.c:2317 +#: dwarf.c:2320 msgid "corrupt discr_list - block not long enough\n" msgstr "" -#: dwarf.c:2388 +#: dwarf.c:2092 #, c-format msgid "corrupt discr_list - unrecognised discriminant byte %#x\n" msgstr "" -#: dwarf.c:2402 +#: dwarf.c:2396 msgid "Corrupt attribute\n" msgstr "破損した属性\n" -#: dwarf.c:1786 +#: dwarf.c:2147 msgid "Internal error: DWARF version is not 2, 3 or 4.\n" msgstr "内部エラー: DWARF バージョンが 2、3 または 4 ではありません。\n" -#: dwarf.c:2586 +#: dwarf.c:2274 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n" msgstr "sizeof(dwarf_vma) != 8 の時は DW_FORM_data8 はサポートされません\n" -#: dwarf.c:2610 +#: dwarf.c:2604 msgid "Block ends prematurely\n" msgstr "" -#: dwarf.c:2644 +#: dwarf.c:2638 #, c-format msgid "%c(indirect string, offset: 0x%s): %s" msgstr "%c(間接文字列、オフセット: 0x%s): %s" -#: dwarf.c:2659 +#: dwarf.c:2653 #, c-format msgid "%c(indirect line string, offset: 0x%s): %s" msgstr "%c(間接行文字列、オフセット: 0x%s): %s" -#: dwarf.c:2682 +#: dwarf.c:2676 #, c-format msgid "%c(indexed string: 0x%s): %s" msgstr "" -#: dwarf.c:2697 +#: dwarf.c:2691 #, c-format msgid "%c(alt indirect string, offset: 0x%s) %s" msgstr "" -#: dwarf.c:2739 +#: dwarf.c:2733 #, c-format msgid "%c(addr_index: 0x%s): %s" msgstr "" -#: dwarf.c:2757 +#: dwarf.c:2404 #, c-format msgid "Unrecognized form: %lu\n" msgstr "認識できない形式: %lu\n" -#: dwarf.c:2812 +#: dwarf.c:2808 msgid "More location offset attributes than DW_AT_GNU_locview attributes\n" msgstr "" -#: dwarf.c:2824 +#: dwarf.c:2820 msgid "More DW_AT_GNU_locview attributes than location offset attributes\n" msgstr "" -#: dwarf.c:2893 dwarf.c:2925 dwarf.c:2940 +#: dwarf.c:2889 dwarf.c:2921 dwarf.c:2936 #, c-format msgid "Unsupported form (%s) for attribute %s\n" msgstr "" -#: dwarf.c:2985 +#: dwarf.c:2983 #, c-format msgid "(not inlined)" msgstr "(非 inline 化)" -#: dwarf.c:2988 +#: dwarf.c:2986 #, c-format msgid "(inlined)" msgstr "(inline 化)" -#: dwarf.c:2991 +#: dwarf.c:2989 #, c-format msgid "(declared as inline but ignored)" msgstr "(inline 宣言されたが無視された)" -#: dwarf.c:2994 +#: dwarf.c:2992 #, c-format msgid "(declared as inline and inlined)" msgstr "(inline 宣言され inline 化)" -#: dwarf.c:2997 +#: dwarf.c:2995 #, c-format msgid " (Unknown inline attribute value: %s)" msgstr " (不明な inline 属性値: %s)" -#: dwarf.c:3054 +#: dwarf.c:3052 #, c-format msgid "(implementation defined: %s)" msgstr "" -#: dwarf.c:3057 +#: dwarf.c:3055 #, c-format msgid "(Unknown: %s)" msgstr "" -#: dwarf.c:3102 +#: dwarf.c:3100 #, c-format msgid "(user defined type)" msgstr "" -#: dwarf.c:3104 +#: dwarf.c:3102 #, c-format msgid "(unknown type)" msgstr "(不明な型)" -#: dwarf.c:3117 +#: dwarf.c:3115 #, c-format msgid "(unknown accessibility)" msgstr "" -#: dwarf.c:3129 +#: dwarf.c:3127 #, c-format msgid "(unknown visibility)" msgstr "" -#: dwarf.c:3142 +#: dwarf.c:3140 #, c-format msgid "(user specified)" msgstr "" -#: dwarf.c:3144 +#: dwarf.c:3142 #, c-format msgid "(unknown endianity)" msgstr "" -#: dwarf.c:3156 +#: dwarf.c:3154 #, c-format msgid "(unknown virtuality)" msgstr "" -#: dwarf.c:3168 +#: dwarf.c:3166 #, c-format msgid "(unknown case)" msgstr "" -#: dwarf.c:3186 +#: dwarf.c:3184 #, c-format msgid "(user defined)" msgstr "" -#: dwarf.c:3188 +#: dwarf.c:3186 #, c-format msgid "(unknown convention)" msgstr "" -#: dwarf.c:3197 +#: dwarf.c:3195 #, c-format msgid "(undefined)" msgstr "(未定義)" -#: dwarf.c:3207 +#: dwarf.c:3205 #, c-format msgid "(unsigned)" msgstr "(符号無し)" -#: dwarf.c:3208 +#: dwarf.c:3206 #, c-format msgid "(leading overpunch)" msgstr "" -#: dwarf.c:3209 +#: dwarf.c:3207 #, c-format msgid "(trailing overpunch)" msgstr "" -#: dwarf.c:3210 +#: dwarf.c:3208 #, c-format msgid "(leading separate)" msgstr "" -#: dwarf.c:3211 +#: dwarf.c:3209 #, c-format msgid "(trailing separate)" msgstr "" -#: dwarf.c:3212 dwarf.c:3223 +#: dwarf.c:3210 dwarf.c:3221 #, c-format msgid "(unrecognised)" msgstr "" -#: dwarf.c:3220 +#: dwarf.c:3218 #, c-format msgid "(no)" msgstr "" -#: dwarf.c:3221 +#: dwarf.c:3219 #, c-format msgid "(in class)" msgstr "" -#: dwarf.c:3222 +#: dwarf.c:3220 #, c-format msgid "(out of class)" msgstr "" -#: dwarf.c:3254 +#: dwarf.c:3252 #, c-format msgid " (location list)" msgstr "" -#: dwarf.c:3275 dwarf.c:6444 dwarf.c:6614 dwarf.c:6789 +#: dwarf.c:3273 dwarf.c:6449 dwarf.c:6620 dwarf.c:6796 #, c-format msgid " [without DW_AT_frame_base]" msgstr " [DW_AT_frame_base 無し]" -#: dwarf.c:3305 +#: dwarf.c:3303 #, c-format msgid "" "Offset %s used as value for DW_AT_import attribute of DIE at offset 0x%lx is " "too big.\n" msgstr "" -#: dwarf.c:3311 +#: dwarf.c:3309 #, c-format msgid "\t[Abbrev Number: %ld" msgstr "\t[省略番号: %ld" -#: dwarf.c:3406 +#: dwarf.c:3404 #, c-format msgid "" "Raw dump of debug contents of section %s (loaded from %s):\n" @@ -2307,7 +2307,7 @@ "セクション %s のデバッグ内容の生ダンプ(%s より読み込んだもの):\n" "\n" -#: dwarf.c:3409 +#: dwarf.c:3407 #, c-format msgid "" "Raw dump of debug contents of section %s:\n" @@ -2316,7 +2316,7 @@ "セクション %s のデバッグ内容の生ダンプ:\n" "\n" -#: dwarf.c:3414 +#: dwarf.c:3412 #, c-format msgid "" "Contents of the %s section (loaded from %s):\n" @@ -2325,7 +2325,7 @@ "%s セクションの内容(%s より読み込んだもの):\n" "\n" -#: dwarf.c:3417 +#: dwarf.c:3415 #, c-format msgid "" "Contents of the %s section:\n" @@ -2334,7 +2334,7 @@ "%s セクションの内容:\n" "\n" -#: dwarf.c:3460 +#: dwarf.c:3458 #, c-format msgid "Reserved length value (0x%s) found in section %s\n" msgstr "セクション %2$s 内に予約された長さの値 (%1$s) が見つかりました\n" @@ -2424,7 +2424,7 @@ msgid " .debug_str_offsets.dwo: 0x%s 0x%s\n" msgstr "" -#: dwarf.c:5637 dwarf.c:7210 dwarf.c:9605 +#: dwarf.c:5642 dwarf.c:7220 dwarf.c:9626 #, c-format msgid "Debug info is corrupted, %s header at %#lx has length %s\n" msgstr "" @@ -2499,7 +2499,7 @@ msgid "Only DWARF version 2, 3, 4 and 5 line info is currently supported.\n" msgstr "現在のところ、DWARF バージョン 2, 3, 4 および 5 のみ行情報をサポートしています。\n" -#: dwarf.c:4126 dwarf.c:6882 dwarf.c:7747 +#: dwarf.c:4126 dwarf.c:6889 dwarf.c:7763 #, c-format msgid "The %s section contains unsupported segment selector size: %d.\n" msgstr "" @@ -2508,7 +2508,7 @@ msgid "Invalid maximum operations per insn.\n" msgstr "命令ごとの最大操作数が無効です。\n" -#: dwarf.c:4181 +#: dwarf.c:3720 #, c-format msgid "Line length %s extends beyond end of section\n" msgstr "" @@ -2590,7 +2590,7 @@ msgid "\tSize" msgstr "\tサイズ" -#: dwarf.c:3467 +#: dwarf.c:3809 #, c-format msgid "\tMD5" msgstr "\tMD5" @@ -2614,7 +2614,7 @@ "section\n" msgstr "" -#: dwarf.c:4412 dwarf.c:5962 +#: dwarf.c:4412 dwarf.c:5967 #, c-format msgid " Offset: 0x%lx\n" msgstr " オフセット: 0x%lx\n" @@ -2796,7 +2796,7 @@ msgid " Set ISA to %s\n" msgstr " ISA を %s に設定します\n" -#: dwarf.c:4755 dwarf.c:5392 +#: dwarf.c:4755 dwarf.c:5394 #, c-format msgid " Unknown opcode %d with operands: " msgstr " 不明な被演算子付きのオペコード %d : " @@ -2823,22 +2823,22 @@ msgid "CU: %s:\n" msgstr "CU: %s:\n" -#: dwarf.c:5130 dwarf.c:5430 readelf.c:6373 readelf.c:6470 readelf.c:6488 -#: readelf.c:6506 readelf.c:7306 readelf.c:11504 readelf.c:12169 -#: readelf.c:12182 readelf.c:17545 readelf.c:17577 +#: dwarf.c:5130 dwarf.c:5435 readelf.c:6715 readelf.c:6812 readelf.c:6830 +#: readelf.c:6848 readelf.c:7652 readelf.c:11854 readelf.c:12519 +#: readelf.c:12532 readelf.c:17921 readelf.c:17953 msgid "" msgstr "<不明>" -#: dwarf.c:5133 dwarf.c:5322 +#: dwarf.c:5133 dwarf.c:5324 #, c-format msgid "directory index %u > number of directories %s\n" msgstr "" -#: dwarf.c:5135 dwarf.c:5424 elfcomm.c:777 readelf.c:356 readelf.c:745 -#: readelf.c:7483 readelf.c:8044 readelf.c:10075 readelf.c:12496 -#: readelf.c:12562 readelf.c:12566 readelf.c:12634 readelf.c:12639 -#: readelf.c:16278 readelf.c:16367 readelf.c:16960 readelf.c:16979 -#: readelf.c:17098 readelf.c:17554 readelf.c:18710 readelf.c:18713 +#: dwarf.c:5135 dwarf.c:5429 elfcomm.c:777 readelf.c:389 readelf.c:923 +#: readelf.c:7830 readelf.c:8393 readelf.c:10429 readelf.c:12871 +#: readelf.c:12937 readelf.c:12941 readelf.c:13013 readelf.c:13018 +#: readelf.c:16651 readelf.c:16740 readelf.c:17333 readelf.c:17352 +#: readelf.c:17471 readelf.c:17930 readelf.c:19085 readelf.c:19088 #, c-format msgid "" msgstr "<破損>" @@ -2860,119 +2860,119 @@ msgid "UNKNOWN (%u): length %ld\n" msgstr "" -#: dwarf.c:5306 +#: dwarf.c:5308 #, c-format msgid "" "\n" " [Use file table entry %d]\n" msgstr "" -#: dwarf.c:5310 +#: dwarf.c:5312 #, c-format msgid "file index %u > number of files %u\n" msgstr "" -#: dwarf.c:5311 +#: dwarf.c:5313 #, c-format msgid "" "\n" " " msgstr "" -#: dwarf.c:5317 +#: dwarf.c:5319 #, c-format msgid "" "\n" " [Use file %s in directory table entry %d]\n" msgstr "" -#: dwarf.c:5324 +#: dwarf.c:5326 #, c-format msgid "" "\n" " \n" msgstr "" -#: dwarf.c:5388 +#: dwarf.c:5390 #, c-format msgid " Set ISA to %lu\n" msgstr " ISA を %lu に設定します\n" -#: dwarf.c:5423 +#: dwarf.c:5428 #, c-format msgid "corrupt file index %u encountered\n" msgstr "" -#: dwarf.c:5592 +#: dwarf.c:5597 msgid "no info" msgstr "" -#: dwarf.c:5593 +#: dwarf.c:5598 msgid "type" msgstr "" -#: dwarf.c:5594 +#: dwarf.c:5599 msgid "variable" msgstr "変数" -#: dwarf.c:5595 +#: dwarf.c:5600 msgid "function" msgstr "関数" -#: dwarf.c:5596 +#: dwarf.c:5601 msgid "other" msgstr "その他" -#: dwarf.c:5597 +#: dwarf.c:5602 msgid "unused5" msgstr "" -#: dwarf.c:5598 +#: dwarf.c:5603 msgid "unused6" msgstr "" -#: dwarf.c:5599 +#: dwarf.c:5604 msgid "unused7" msgstr "" -#: dwarf.c:5653 dwarf.c:7225 +#: dwarf.c:5658 dwarf.c:7235 #, c-format msgid "" ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n" msgstr "%2$s セクション内オフセット 0x%1$lx の .debug_info が CU ヘッダを指していません。\n" -#: dwarf.c:5658 +#: dwarf.c:5663 #, c-format msgid " Length: %ld\n" msgstr " 長さ: %ld\n" -#: dwarf.c:5660 +#: dwarf.c:5665 #, c-format msgid " Version: %d\n" msgstr " バージョン: %d\n" -#: dwarf.c:5662 +#: dwarf.c:5667 #, c-format msgid " Offset into .debug_info section: 0x%lx\n" msgstr " .debug_info セクションのオフセット: 0x%lx\n" -#: dwarf.c:5664 +#: dwarf.c:5669 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr " .debug_info セクション領域サイズ: %ld\n" -#: dwarf.c:5673 +#: dwarf.c:5678 msgid "Only DWARF 2 and 3 pubnames are currently supported\n" msgstr "DWARF 2 および 3 の pubnames のみ現在サポートされています\n" -#: dwarf.c:5681 +#: dwarf.c:5686 #, c-format msgid "" "\n" " Offset Kind Name\n" msgstr "" -#: dwarf.c:5683 +#: dwarf.c:5688 #, c-format msgid "" "\n" @@ -2981,257 +2981,257 @@ "\n" " オフセット\t名前\n" -#: dwarf.c:5717 +#: dwarf.c:5722 msgid "s" msgstr "" -#: dwarf.c:5717 +#: dwarf.c:5722 msgid "g" msgstr "" -#: dwarf.c:5775 +#: dwarf.c:5780 #, c-format msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n" msgstr " DW_MACINFO_start_file - 行番号: %d ファイル番号: %d\n" -#: dwarf.c:5781 +#: dwarf.c:5786 #, c-format msgid " DW_MACINFO_end_file\n" msgstr " DW_MACINFO_end_file\n" -#: dwarf.c:5748 +#: dwarf.c:5227 #, c-format msgid " DW_MACINFO_define - lineno : %d macro : %s\n" msgstr " DW_MACINFO_define - 行番号 : %d マクロ : %s\n" -#: dwarf.c:5756 +#: dwarf.c:5235 #, c-format msgid " DW_MACINFO_undef - lineno : %d macro : %s\n" msgstr " DW_MACINFO_undef - 行番号 : %d マクロ : %s\n" -#: dwarf.c:5767 +#: dwarf.c:5246 #, c-format msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n" msgstr " DW_MACINFO_vendor_ext - 定数 : %d 文字列 : %s\n" -#: dwarf.c:5897 +#: dwarf.c:5375 #, c-format msgid "Only GNU extension to DWARF 4 or 5 of %s is currently supported.\n" msgstr "" -#: dwarf.c:5964 +#: dwarf.c:5969 #, c-format msgid " Version: %d\n" msgstr "" -#: dwarf.c:5965 +#: dwarf.c:5970 #, c-format msgid " Offset size: %d\n" msgstr "" -#: dwarf.c:5969 +#: dwarf.c:5974 #, c-format msgid " Offset into .debug_line: 0x%lx\n" msgstr "" -#: dwarf.c:5983 +#: dwarf.c:5988 #, c-format msgid " Extension opcode arguments:\n" msgstr "" -#: dwarf.c:5990 +#: dwarf.c:5995 #, c-format msgid " DW_MACRO_%02x has no arguments\n" msgstr "" -#: dwarf.c:5993 +#: dwarf.c:5998 #, c-format msgid " DW_MACRO_%02x arguments: " msgstr "" -#: dwarf.c:6019 +#: dwarf.c:6024 #, c-format msgid "Invalid extension opcode form %s\n" msgstr "" -#: dwarf.c:6036 +#: dwarf.c:6041 msgid ".debug_macro section not zero terminated\n" msgstr "" -#: dwarf.c:6075 +#: dwarf.c:6080 msgid "DW_MACRO_start_file used, but no .debug_line offset provided.\n" msgstr "" -#: dwarf.c:6081 +#: dwarf.c:6086 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d\n" msgstr "" -#: dwarf.c:6084 +#: dwarf.c:6089 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d filename: %s%s%s\n" msgstr "" -#: dwarf.c:6092 +#: dwarf.c:6097 #, c-format msgid " DW_MACRO_end_file\n" msgstr "" -#: dwarf.c:5993 +#: dwarf.c:5500 #, c-format msgid " DW_MACRO_define - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6001 +#: dwarf.c:5508 #, c-format msgid " DW_MACRO_undef - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6102 +#: dwarf.c:6107 #, c-format msgid " DW_MACRO_define_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6113 +#: dwarf.c:6118 #, c-format msgid " DW_MACRO_undef_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6119 +#: dwarf.c:6124 #, c-format msgid " DW_MACRO_import - offset : 0x%lx\n" msgstr "" -#: dwarf.c:6126 +#: dwarf.c:6131 #, c-format msgid " DW_MACRO_define_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:6133 +#: dwarf.c:6138 #, c-format msgid " DW_MACRO_undef_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:6139 +#: dwarf.c:6144 #, c-format msgid " DW_MACRO_import_sup - offset : 0x%lx\n" msgstr "" -#: dwarf.c:6168 +#: dwarf.c:6173 #, c-format msgid " Unknown macro opcode %02x seen\n" msgstr "" -#: dwarf.c:6179 +#: dwarf.c:6184 #, c-format msgid " DW_MACRO_%02x\n" msgstr " DW_MACRO_%02x\n" -#: dwarf.c:6182 +#: dwarf.c:6187 #, c-format msgid " DW_MACRO_%02x -" msgstr " DW_MACRO_%02x -" -#: dwarf.c:6237 +#: dwarf.c:6242 #, c-format msgid " Number TAG (0x%lx)\n" msgstr "" -#: dwarf.c:6246 +#: dwarf.c:6251 msgid "has children" msgstr "子あり" -#: dwarf.c:6246 +#: dwarf.c:6251 msgid "no children" msgstr "子なし" -#: dwarf.c:6308 +#: dwarf.c:6313 #, c-format msgid "location view pair\n" msgstr "" -#: dwarf.c:6340 +#: dwarf.c:6344 #, c-format msgid "No debug information available for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:6352 dwarf.c:6499 dwarf.c:6682 +#: dwarf.c:6356 dwarf.c:6504 dwarf.c:6688 #, c-format msgid "Invalid pointer size (%d) in debug info for entry %d\n" msgstr "" -#: dwarf.c:6364 dwarf.c:6417 dwarf.c:6426 dwarf.c:6511 dwarf.c:6588 -#: dwarf.c:6596 dwarf.c:6693 dwarf.c:6766 dwarf.c:6774 +#: dwarf.c:6368 dwarf.c:6422 dwarf.c:6431 dwarf.c:6516 dwarf.c:6594 +#: dwarf.c:6602 dwarf.c:6700 dwarf.c:6773 dwarf.c:6781 #, c-format msgid "Location list starting at offset 0x%lx is not terminated.\n" msgstr "オフセット 0x%lx から始まる位置リストが終端されていません。\n" -#: dwarf.c:6385 dwarf.c:6539 dwarf.c:6731 dwarf.c:7569 dwarf.c:7624 +#: dwarf.c:6390 dwarf.c:6545 dwarf.c:6738 dwarf.c:7582 dwarf.c:7640 #, c-format msgid "\n" msgstr "<リストの終端>\n" -#: dwarf.c:6397 dwarf.c:6560 dwarf.c:7629 +#: dwarf.c:6402 dwarf.c:6566 dwarf.c:7645 #, c-format msgid "(base address)\n" msgstr "(ベースアドレス)\n" -#: dwarf.c:6411 dwarf.c:6532 dwarf.c:6719 +#: dwarf.c:6416 dwarf.c:6538 dwarf.c:6726 #, c-format msgid "" "views at %8.8lx for:\n" " %*s " msgstr "" -#: dwarf.c:6447 dwarf.c:6617 +#: dwarf.c:6452 dwarf.c:6623 msgid " (start == end)" msgstr " (開始 == 終了)" -#: dwarf.c:6449 dwarf.c:6619 +#: dwarf.c:6454 dwarf.c:6625 msgid " (start > end)" msgstr " (開始 > 終了)" -#: dwarf.c:6486 +#: dwarf.c:6491 #, c-format msgid "No debug information available for loclists lists of entry: %u\n" msgstr "" -#: dwarf.c:6565 +#: dwarf.c:6571 #, c-format msgid "View pair entry in loclist with locviews attribute\n" msgstr "" -#: dwarf.c:6572 +#: dwarf.c:6578 #, c-format msgid "views for:\n" msgstr "" -#: dwarf.c:6576 +#: dwarf.c:6582 #, c-format msgid "Invalid location list entry type %d\n" msgstr "" -#: dwarf.c:6628 +#: dwarf.c:6634 #, c-format msgid "Trailing view pair not used in a range" msgstr "" -#: dwarf.c:6670 +#: dwarf.c:6676 #, c-format msgid "No debug information for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:6737 +#: dwarf.c:6744 #, c-format msgid "(base address selection entry)\n" msgstr "" -#: dwarf.c:6758 +#: dwarf.c:6765 #, c-format msgid "Unknown location list entry type 0x%x.\n" msgstr "" -#: dwarf.c:6851 dwarf.c:7104 dwarf.c:7323 dwarf.c:7430 dwarf.c:7691 +#: dwarf.c:6858 dwarf.c:7115 dwarf.c:7333 dwarf.c:7440 dwarf.c:7708 #, c-format msgid "" "\n" @@ -3240,33 +3240,33 @@ "\n" "%s セクションが空です。\n" -#: dwarf.c:6871 +#: dwarf.c:6878 #, c-format msgid "The %s section contains corrupt or unsupported version number: %d.\n" msgstr "" -#: dwarf.c:6891 +#: dwarf.c:6898 #, c-format msgid "The %s section contains unsupported offset entry count: %d.\n" msgstr "" -#: dwarf.c:6902 dwarf.c:7329 dwarf.c:7765 +#: dwarf.c:6909 dwarf.c:7339 dwarf.c:7781 #, c-format msgid "" "Unable to load/parse the .debug_info section, so cannot interpret the %s " "section.\n" msgstr ".debug_info のロード/構文解析が出来ません。そのため %s セクションを解釈できません。\n" -#: dwarf.c:6950 +#: dwarf.c:6957 msgid "No location lists in .debug_info section!\n" msgstr ".debug_info セクションに位置リストがありません!\n" -#: dwarf.c:6955 +#: dwarf.c:6962 #, c-format msgid "Location lists in %s section start at 0x%s\n" msgstr "%s セクションの位置リストが 0x%s から開始します\n" -#: dwarf.c:6965 +#: dwarf.c:6972 #, c-format msgid "" " Warning: This section has relocations - addresses seen here may not be " @@ -3274,86 +3274,86 @@ "\n" msgstr "" -#: dwarf.c:6967 +#: dwarf.c:6974 #, c-format msgid " Offset Begin End Expression\n" msgstr "" -#: dwarf.c:7022 +#: dwarf.c:7020 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr ".debug_loc セクション内に穴 [0x%lx - 0x%lx] があります。\n" -#: dwarf.c:7026 +#: dwarf.c:7024 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr ".debug_loc セクションに重なり合っている部分 [0x%lx - 0x%lx] があります\n" -#: dwarf.c:7035 +#: dwarf.c:7033 #, c-format msgid "Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "オフセット 0x%lx が .debug_loc セクションサイズより大きいです。\n" -#: dwarf.c:7042 +#: dwarf.c:7040 #, c-format msgid "View Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "" -#: dwarf.c:7059 +#: dwarf.c:7070 msgid "DWO is not yet supported.\n" msgstr "" -#: dwarf.c:7076 +#: dwarf.c:7087 msgid "" "Hole and overlap detection requires adjacent view lists and loclists.\n" msgstr "" -#: dwarf.c:7085 +#: dwarf.c:7096 #, c-format msgid "There is %ld unused byte at the end of section %s\n" msgid_plural "There are %ld unused bytes at the end of section %s\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:7238 +#: dwarf.c:7248 msgid "Only DWARF 2 and 3 aranges are currently supported.\n" msgstr "現在のところ DWARF 2 および 3 arange のみサポートされています\n" -#: dwarf.c:7242 +#: dwarf.c:7252 #, c-format msgid " Length: %ld\n" msgstr " 長さ: %ld\n" -#: dwarf.c:7244 +#: dwarf.c:7254 #, c-format msgid " Version: %d\n" msgstr " バージョン: %d\n" -#: dwarf.c:7245 +#: dwarf.c:7255 #, c-format msgid " Offset into .debug_info: 0x%lx\n" msgstr " .debug_info 内へのオフセット: %lx\n" -#: dwarf.c:7247 +#: dwarf.c:7257 #, c-format msgid " Pointer Size: %d\n" msgstr " ポインタサイズ: %d\n" -#: dwarf.c:7248 +#: dwarf.c:7258 #, c-format msgid " Segment Size: %d\n" msgstr " セグメントサイズ: %d\n" -#: dwarf.c:7255 +#: dwarf.c:7265 #, c-format msgid "Invalid address size in %s section!\n" msgstr "" -#: dwarf.c:7265 +#: dwarf.c:7275 msgid "Pointer size + Segment size is not a power of two.\n" msgstr "ポインタサイズ + セグメントサイズが2のべき乗数ではありません。\n" -#: dwarf.c:7270 +#: dwarf.c:7280 #, c-format msgid "" "\n" @@ -3362,7 +3362,7 @@ "\n" " アドレス 長さ\n" -#: dwarf.c:7272 +#: dwarf.c:7282 #, c-format msgid "" "\n" @@ -3371,265 +3371,265 @@ "\n" " アドレス 長さ\n" -#: dwarf.c:7349 +#: dwarf.c:7359 #, c-format msgid "Corrupt address base (%lx) found in debug section %u\n" msgstr "" -#: dwarf.c:7366 +#: dwarf.c:7376 #, c-format msgid " For compilation unit at offset 0x%s:\n" msgstr "" -#: dwarf.c:7369 +#: dwarf.c:7379 #, c-format msgid "\tIndex\tAddress\n" msgstr "" -#: dwarf.c:7407 +#: dwarf.c:7417 #, c-format msgid "\t%d:\t" msgstr "" -#: dwarf.c:7588 dwarf.c:7665 +#: dwarf.c:7601 dwarf.c:7681 msgid "(start == end)" msgstr "(開始 == 終了)" -#: dwarf.c:7590 dwarf.c:7667 +#: dwarf.c:7603 dwarf.c:7683 msgid "(start > end)" msgstr "(開始 > 終了)" -#: dwarf.c:7612 +#: dwarf.c:7610 #, c-format msgid "Range list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:7645 +#: dwarf.c:7661 #, c-format msgid "Invalid range list entry type %d\n" msgstr "" -#: dwarf.c:7725 +#: dwarf.c:7742 #, c-format msgid "" "The length field (0x%lx) in the debug_rnglists header is wrong - the section " "is too small\n" msgstr "" -#: dwarf.c:7737 +#: dwarf.c:7753 msgid "Only DWARF version 5 debug_rnglists info is currently supported.\n" msgstr "" -#: dwarf.c:7756 +#: dwarf.c:7772 #, c-format msgid "The %s section contains unsupported offset entry count: %u.\n" msgstr "" #. This can happen when the file was compiled with -gsplit-debug #. which removes references to range lists from the primary .o file. -#: dwarf.c:7786 +#: dwarf.c:7802 #, c-format msgid "No range lists in .debug_info section.\n" msgstr "" -#: dwarf.c:7818 +#: dwarf.c:7834 #, c-format msgid "Range lists in %s section start at 0x%lx\n" msgstr "%s セクションの範囲リストが 0x%lx から開始します\n" -#: dwarf.c:7823 +#: dwarf.c:7839 #, c-format msgid " Offset Begin End\n" msgstr " オフセット 開始 終了\n" -#: dwarf.c:7841 +#: dwarf.c:7857 #, c-format msgid "Corrupt pointer size (%d) in debug entry at offset %8.8lx\n" msgstr "" -#: dwarf.c:7848 +#: dwarf.c:7864 #, c-format msgid "Corrupt offset (%#8.8lx) in range entry %u\n" msgstr "" -#: dwarf.c:7866 +#: dwarf.c:7029 dwarf.c:7882 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n" msgstr "%3$s セクションに穴 [0x%1$lx - 0x%2$lx] があります。\n" -#: dwarf.c:7873 +#: dwarf.c:7034 dwarf.c:7889 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n" msgstr "%3$s セクションに重なり合っている部分 [0x%1$lx - 0x%2$lx] があります。\n" -#: dwarf.c:7949 +#: dwarf.c:7965 #, c-format msgid "Unfeasibly large register number: %u\n" msgstr "" -#: dwarf.c:7962 +#: dwarf.c:7978 #, c-format msgid "Out of memory allocating %u columns in dwarf frame arrays\n" msgstr "" -#: dwarf.c:8411 +#: dwarf.c:8427 msgid "No terminator for augmentation name\n" msgstr "" -#: dwarf.c:8429 +#: dwarf.c:8445 #, c-format msgid "Invalid pointer size (%d) in CIE data\n" msgstr "" -#: dwarf.c:8437 +#: dwarf.c:8453 #, c-format msgid "Invalid segment size (%d) in CIE data\n" msgstr "" -#: dwarf.c:8473 dwarf.c:8849 +#: dwarf.c:8489 dwarf.c:8862 #, c-format msgid "Augmentation data too long: 0x%s, expected at most %#lx\n" msgstr "" -#: dwarf.c:8560 +#: dwarf.c:8576 #, c-format msgid " Augmentation data: " msgstr "" -#: dwarf.c:8576 +#: dwarf.c:8592 msgid "bad register: " msgstr "間違ったレジスタ: " -#: dwarf.c:8748 +#: dwarf.c:8764 msgid "Failed to read CIE information\n" msgstr "" -#: dwarf.c:8759 dwarf.c:8783 dwarf.c:8810 +#: dwarf.c:8775 dwarf.c:8796 dwarf.c:8823 msgid "Invalid max register\n" msgstr "" #. PR 17512: file: 9e196b3e. -#: dwarf.c:8825 +#: dwarf.c:8838 #, c-format msgid "Probably corrupt segment size: %d - using 4 instead\n" msgstr "" -#: dwarf.c:8830 +#: dwarf.c:8177 #, c-format msgid "Corrupt CFA_def expression value: %lu\n" msgstr "" #. PR 17512: file:306-192417-0.005. -#: dwarf.c:8844 +#: dwarf.c:8191 #, c-format msgid "Corrupt CFA expression value: %lu\n" msgstr "" -#: dwarf.c:9296 +#: dwarf.c:9317 msgid "Invalid column number in saved frame state\n" msgstr "" -#: dwarf.c:9343 +#: dwarf.c:9364 #, c-format msgid " DW_CFA_def_cfa_expression: \n" msgstr "" -#: dwarf.c:9366 +#: dwarf.c:9387 #, c-format msgid " DW_CFA_expression: \n" msgstr "" -#: dwarf.c:9499 +#: dwarf.c:9520 #, c-format msgid " DW_CFA_??? (User defined call frame op: %#x)\n" msgstr " DW_CFA_??? (ユーザ定義フレーム呼び出し操作: %#x)\n" -#: dwarf.c:9501 +#: dwarf.c:9522 #, c-format msgid "Unsupported or unknown Dwarf Call Frame Instruction number: %#x\n" msgstr "" -#: dwarf.c:9615 dwarf.c:10032 +#: dwarf.c:9636 dwarf.c:10053 #, c-format msgid "Version %ld\n" msgstr "バージョン %ld\n" -#: dwarf.c:9621 +#: dwarf.c:9642 msgid "Only DWARF version 5 .debug_names is currently supported.\n" msgstr "" -#: dwarf.c:9628 +#: dwarf.c:9649 #, c-format msgid "Padding field of .debug_names must be 0 (found 0x%x)\n" msgstr "" -#: dwarf.c:9633 +#: dwarf.c:9654 msgid "Compilation unit count must be >= 1 in .debug_names\n" msgstr "" -#: dwarf.c:9644 +#: dwarf.c:9665 #, c-format msgid "" "Augmentation string length %u must be rounded up to a multiple of 4 in " ".debug_names.\n" msgstr "" -#: dwarf.c:9652 +#: dwarf.c:9673 #, c-format msgid "Augmentation string:" msgstr "" -#: dwarf.c:9679 +#: dwarf.c:9700 #, c-format msgid "CU table:\n" msgstr "CU 表:\n" -#: dwarf.c:9688 dwarf.c:9701 +#: dwarf.c:9709 dwarf.c:9722 #, c-format msgid "[%3u] 0x%lx\n" msgstr "" -#: dwarf.c:9692 +#: dwarf.c:9713 #, c-format msgid "TU table:\n" msgstr "TU 表:\n" -#: dwarf.c:9705 +#: dwarf.c:9726 #, c-format msgid "Foreign TU table:\n" msgstr "" -#: dwarf.c:9714 +#: dwarf.c:9735 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:9725 +#: dwarf.c:9746 #, c-format msgid "" "Entry pool offset (0x%lx) exceeds unit size 0x%lx for unit 0x%lx in the " "debug_names\n" msgstr "" -#: dwarf.c:9754 +#: dwarf.c:9775 #, c-format msgid "Used %zu of %lu bucket.\n" msgid_plural "Used %zu of %lu buckets.\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:9781 +#: dwarf.c:9802 #, c-format msgid "" "Out of %lu items there are %zu bucket clashes (longest of %zu entries).\n" msgstr "" -#: dwarf.c:9818 +#: dwarf.c:9839 #, c-format msgid "Duplicate abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9840 dwarf.c:10158 +#: dwarf.c:9861 dwarf.c:10179 #, c-format msgid "" "\n" @@ -3638,105 +3638,105 @@ "\n" "シンボル表:\n" -#: dwarf.c:9892 +#: dwarf.c:9913 #, c-format msgid "Undefined abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9923 +#: dwarf.c:9944 #, c-format msgid " " msgstr " <エントリなし>" -#: dwarf.c:9955 +#: dwarf.c:9976 msgid "The debuglink filename is corrupt/missing\n" msgstr "" -#: dwarf.c:9959 +#: dwarf.c:9980 #, c-format msgid " Separate debug info file: %s\n" msgstr "" -#: dwarf.c:9970 +#: dwarf.c:9991 msgid "CRC offset missing/truncated\n" msgstr "" -#: dwarf.c:9976 +#: dwarf.c:9997 #, c-format msgid " CRC value: %#x\n" msgstr "" -#: dwarf.c:9980 +#: dwarf.c:10001 #, c-format msgid "There are %#lx extraneous bytes at the end of the section\n" msgstr "" -#: dwarf.c:9994 +#: dwarf.c:10015 #, c-format msgid "Build-ID is too short (%#lx bytes)\n" msgstr "Build-ID が短すぎます (%#lx バイト)\n" -#: dwarf.c:9998 +#: dwarf.c:10019 #, c-format msgid " Build-ID (%#lx bytes):" msgstr " Build-ID (%#lx バイト):" -#: dwarf.c:10027 +#: dwarf.c:10048 #, c-format msgid "Truncated header in the %s section.\n" msgstr "グループセクション %s 内で切り詰められたヘッダです\n" -#: dwarf.c:10038 +#: dwarf.c:10059 #, c-format msgid "Unsupported version %lu.\n" msgstr "バージョン %lu はサポートされていません。\n" -#: dwarf.c:10042 +#: dwarf.c:10063 msgid "The address table data in version 3 may be wrong.\n" msgstr "バージョン 3 ではアドレス表データに間違いがあるかもしれません。\n" -#: dwarf.c:10044 +#: dwarf.c:10065 msgid "Version 4 does not support case insensitive lookups.\n" msgstr "バージョン 4 では大文字と小文字を区別しない検索はサポートされません。\n" -#: dwarf.c:10046 +#: dwarf.c:10067 msgid "Version 5 does not include inlined functions.\n" msgstr "" -#: dwarf.c:10048 +#: dwarf.c:10069 msgid "Version 6 does not include symbol attributes.\n" msgstr "" -#: dwarf.c:10066 +#: dwarf.c:10087 #, c-format msgid "Corrupt header in the %s section.\n" msgstr "グループセクション %s 内で破損したヘッダです。\n" -#: dwarf.c:10073 +#: dwarf.c:10094 #, c-format msgid "TU offset (%x) is less than CU offset (%x)\n" msgstr "" -#: dwarf.c:10082 +#: dwarf.c:10103 #, c-format msgid "Address table offset (%x) is less than TU offset (%x)\n" msgstr "" -#: dwarf.c:10092 +#: dwarf.c:10113 #, c-format msgid "Symbol table offset (%x) is less then Address table offset (%x)\n" msgstr "" -#: dwarf.c:10101 +#: dwarf.c:10122 #, c-format msgid "Constant pool offset (%x) is less than symbol table offset (%x)\n" msgstr "" -#: dwarf.c:10116 +#: dwarf.c:10137 msgid "Address table extends beyond end of section.\n" msgstr "" -#: dwarf.c:10120 +#: dwarf.c:10141 #, c-format msgid "" "\n" @@ -3745,12 +3745,12 @@ "\n" "CU 表:\n" -#: dwarf.c:10126 +#: dwarf.c:10147 #, c-format msgid "[%3u] 0x%lx - 0x%lx\n" msgstr "[%3u] 0x%lx - 0x%lx\n" -#: dwarf.c:10131 +#: dwarf.c:10152 #, c-format msgid "" "\n" @@ -3759,12 +3759,12 @@ "\n" "TU 表:\n" -#: dwarf.c:10138 +#: dwarf.c:10159 #, c-format msgid "[%3u] 0x%lx 0x%lx " msgstr "[%3u] 0x%lx 0x%lx " -#: dwarf.c:10145 +#: dwarf.c:10166 #, c-format msgid "" "\n" @@ -3773,282 +3773,282 @@ "\n" "アドレス表:\n" -#: dwarf.c:10155 +#: dwarf.c:10176 #, c-format msgid "%lu\n" msgstr "%lu\n" -#: dwarf.c:10173 +#: dwarf.c:10194 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:10174 +#: dwarf.c:10195 #, c-format msgid "Corrupt name offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:10185 +#: dwarf.c:10206 #, c-format msgid "\n" msgstr "" -#: dwarf.c:10186 +#: dwarf.c:10207 #, c-format msgid "Corrupt CU vector offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:10197 +#: dwarf.c:10218 #, c-format msgid "Invalid number of CUs (0x%x) for symbol table slot %d\n" msgstr "" -#: dwarf.c:10222 +#: dwarf.c:10243 msgid "static" msgstr "" -#: dwarf.c:10222 +#: dwarf.c:10243 msgid "global" msgstr "" -#: dwarf.c:10260 dwarf.c:10271 +#: dwarf.c:10281 dwarf.c:10292 msgid "Internal error: out of space in the shndx pool.\n" msgstr "" -#: dwarf.c:10334 +#: dwarf.c:10355 #, c-format msgid "Section %s is empty\n" msgstr "%s セクションが空です\n" -#: dwarf.c:10340 +#: dwarf.c:10361 #, c-format msgid "Section %s is too small to contain a CU/TU header\n" msgstr "" -#: dwarf.c:10359 +#: dwarf.c:10380 #, c-format msgid " Version: %u\n" msgstr "" -#: dwarf.c:10361 +#: dwarf.c:10382 #, c-format msgid " Number of columns: %u\n" msgstr "" -#: dwarf.c:10362 +#: dwarf.c:10383 #, c-format msgid " Number of used entries: %u\n" msgstr "" -#: dwarf.c:10363 +#: dwarf.c:10384 #, c-format msgid "" " Number of slots: %u\n" "\n" msgstr "" -#: dwarf.c:10370 +#: dwarf.c:10391 #, c-format msgid "Section %s is too small for %u slot\n" msgid_plural "Section %s is too small for %u slots\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:10394 +#: dwarf.c:10415 msgid "Section index pool located before start of section\n" msgstr "" -#: dwarf.c:10399 +#: dwarf.c:10420 #, c-format msgid " [%3d] Signature: 0x%s Sections: " msgstr "" -#: dwarf.c:10405 +#: dwarf.c:10426 #, c-format msgid "Section %s too small for shndx pool\n" msgstr "" -#: dwarf.c:10451 +#: dwarf.c:10472 #, c-format msgid "Section %s too small for offset and size tables\n" msgstr "" -#: dwarf.c:10458 +#: dwarf.c:10479 #, c-format msgid " Offset table\n" msgstr "" -#: dwarf.c:10460 dwarf.c:10548 +#: dwarf.c:10481 dwarf.c:10569 msgid "signature" msgstr "" -#: dwarf.c:10460 dwarf.c:10548 +#: dwarf.c:10481 dwarf.c:10569 msgid "dwo_id" msgstr "" -#: dwarf.c:10499 +#: dwarf.c:10520 #, c-format msgid "Row index (%u) is larger than number of used entries (%u)\n" msgstr "" -#: dwarf.c:10360 +#: dwarf.c:9707 #, c-format msgid "Signature (%p) extends beyond end of space in section\n" msgstr "" -#: dwarf.c:10369 +#: dwarf.c:9716 #, c-format msgid "Row index (%u) * num columns (%u) > space remaining in section\n" msgstr "" -#: dwarf.c:10513 dwarf.c:10572 +#: dwarf.c:10534 dwarf.c:10593 #, c-format msgid " [%3d] 0x%s" msgstr "" -#: dwarf.c:10528 dwarf.c:10586 +#: dwarf.c:10549 dwarf.c:10621 #, c-format msgid "Overlarge Dwarf section index detected: %u\n" msgstr "" -#: dwarf.c:10546 +#: dwarf.c:10567 #, c-format msgid " Size table\n" msgstr "" -#: dwarf.c:10601 +#: dwarf.c:10636 #, c-format msgid " Unsupported version (%d)\n" msgstr "" -#: dwarf.c:10673 +#: dwarf.c:10708 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "セクション %s のデバッグ内容の表示はまだサポートされていません。\n" -#: dwarf.c:10704 +#: dwarf.c:10739 #, c-format msgid "" "Attempt to allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10722 +#: dwarf.c:10757 #, c-format msgid "" "Attempt to re-allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10738 +#: dwarf.c:10773 #, c-format msgid "" "Attempt to allocate a zero'ed array with an excessive number of elements: " "0x%lx\n" msgstr "" -#: dwarf.c:10836 +#: dwarf.c:10871 #, c-format msgid "Unable to reopen separate debug info file: %s\n" msgstr "" -#: dwarf.c:10848 +#: dwarf.c:10883 #, c-format msgid "" "Separate debug info file %s found, but CRC does not match - ignoring\n" msgstr "" -#: dwarf.c:11024 +#: dwarf.c:11062 #, c-format msgid "Corrupt debuglink section: %s\n" msgstr "" -#: dwarf.c:11062 +#: dwarf.c:11101 msgid "Out of memory" msgstr "メモリが足りません" #. Failed to find the file. -#: dwarf.c:11136 +#: dwarf.c:11176 #, c-format msgid "could not find separate debug file '%s'\n" msgstr "" -#: dwarf.c:11138 dwarf.c:11143 dwarf.c:11149 dwarf.c:11153 dwarf.c:11158 -#: dwarf.c:11161 dwarf.c:11164 dwarf.c:11167 +#: dwarf.c:11178 dwarf.c:11183 dwarf.c:11189 dwarf.c:11193 dwarf.c:11198 +#: dwarf.c:11201 dwarf.c:11204 dwarf.c:11207 #, c-format msgid "tried: %s\n" msgstr "" -#: dwarf.c:11175 +#: dwarf.c:11215 #, c-format msgid "tried: DEBUGINFOD_URLS=%s\n" msgstr "" -#: dwarf.c:11192 +#: dwarf.c:11243 #, c-format msgid "failed to open separate debug file: %s\n" msgstr "" #. FIXME: We do not check to see if there are any other separate debug info #. files that would also match. -#: dwarf.c:11047 +#: dwarf.c:10400 #, c-format msgid "" "%s: Found separate debug info file: %s\n" "\n" msgstr "" -#: dwarf.c:11224 +#: dwarf.c:11275 msgid "Out of memory allocating dwo filename\n" msgstr "" -#: dwarf.c:11230 +#: dwarf.c:11281 #, c-format msgid "Unable to load dwo file: %s\n" msgstr "" #. FIXME: We should check the dwo_id. -#: dwarf.c:11237 +#: dwarf.c:11288 #, c-format msgid "" "%s: Found separate debug object file: %s\n" "\n" msgstr "" -#: dwarf.c:11430 +#: dwarf.c:11590 #, c-format msgid "" "The %s section contains link(s) to dwo file(s):\n" "\n" msgstr "" -#: dwarf.c:11435 +#: dwarf.c:11595 #, c-format msgid " Name: %s\n" msgstr "" -#: dwarf.c:11436 +#: dwarf.c:11596 #, c-format msgid " Directory: %s\n" msgstr "" -#: dwarf.c:11436 +#: dwarf.c:11596 msgid "" msgstr "<見つかりません>" -#: dwarf.c:11438 +#: dwarf.c:11598 #, c-format msgid " ID: " msgstr " ID: " -#: dwarf.c:9876 +#: dwarf.c:10484 #, c-format msgid " ID: \n" msgstr " ID: <不明>\n" -#: dwarf.c:11415 +#: dwarf.c:11575 msgid "Unexpected DWO INFO type" msgstr "" -#: dwarf.c:11604 dwarf.c:11648 +#: dwarf.c:11764 dwarf.c:11808 #, c-format msgid "Unrecognized debug option '%s'\n" msgstr "認識できないデバッグオプション '%s' です\n" @@ -4146,7 +4146,7 @@ #. PR 24049 - we cannot use filedata->file_name as this will #. have already been freed. -#: elfcomm.c:519 elfcomm.c:753 elfedit.c:595 readelf.c:21730 +#: elfcomm.c:519 elfcomm.c:753 elfedit.c:613 readelf.c:22187 #, c-format msgid "%s: failed to read archive header\n" msgstr "%s: 書庫ヘッダの読み込みに失敗しました\n" @@ -4193,72 +4193,72 @@ msgid "%s: failed to seek to next file name\n" msgstr "%s: 次のファイル名の探査 (seek) に失敗しました\n" -#: elfcomm.c:758 elfedit.c:602 readelf.c:21737 +#: elfcomm.c:758 elfedit.c:620 readelf.c:22194 #, c-format msgid "%s: did not find a valid archive header\n" msgstr "%s: 有効な書庫ヘッダを見つけられませんでした\n" -#: elfedit.c:91 +#: elfedit.c:93 #, c-format msgid "%s: Not an i386 nor x86-64 ELF file\n" msgstr "" -#: elfedit.c:97 +#: elfedit.c:99 #, c-format msgid "%s: stat () failed\n" msgstr "" -#: elfedit.c:105 +#: elfedit.c:107 #, c-format msgid "%s: mmap () failed\n" msgstr "" -#: elfedit.c:244 +#: elfedit.c:246 #, c-format msgid "%s: Invalid PT_NOTE segment\n" msgstr "" -#: elfedit.c:269 +#: elfedit.c:271 #, c-format msgid "Unknown x86 feature: %s\n" msgstr "" -#: elfedit.c:317 +#: elfedit.c:319 #, c-format msgid "%s: Unsupported EI_VERSION: %d is not %d\n" msgstr "%s: サポートされない EI_VERSION です: %d は %d ではありません\n" -#: elfedit.c:338 +#: elfedit.c:340 #, c-format msgid "%s: Unmatched input EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:347 +#: elfedit.c:349 #, c-format msgid "%s: Unmatched output EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:356 +#: elfedit.c:358 #, c-format msgid "%s: Unmatched e_machine: %d is not %d\n" msgstr "%s: 一致しない e_machine です: %d は %d ではありません\n" -#: elfedit.c:367 +#: elfedit.c:369 #, c-format msgid "%s: Unmatched e_type: %d is not %d\n" msgstr "%s: 一致しない e_type です: %d は %d ではありません\n" -#: elfedit.c:378 +#: elfedit.c:380 #, c-format msgid "%s: Unmatched EI_OSABI: %d is not %d\n" msgstr "%s: 一致しない EI_OSABI です: %d は %d ではありません\n" -#: elfedit.c:411 +#: elfedit.c:429 #, c-format msgid "%s: Failed to update ELF header: %s\n" msgstr "%s: ELF ヘッダの更新に失敗しました: %s\n" -#: elfedit.c:481 +#: elfedit.c:499 msgid "" "This executable has been built without support for a\n" "64 bit data type and so it cannot process 64 bit ELF files.\n" @@ -4266,82 +4266,82 @@ "この実行ファイルは 64 ビットサポート無しでコンパイルされているため\n" "64 ビット ELF ファイルを処理できません。\n" -#: elfedit.c:522 +#: elfedit.c:540 #, c-format msgid "%s: Failed to read ELF header\n" msgstr "%s: ELF ヘッダの読み込みに失敗しました\n" -#: elfedit.c:529 +#: elfedit.c:547 #, c-format msgid "%s: Failed to seek to ELF header\n" msgstr "%s: ELF ヘッダの探査 (seek) に失敗しました\n" -#: elfedit.c:586 readelf.c:21718 +#: elfedit.c:604 readelf.c:22175 #, c-format msgid "%s: failed to seek to next archive header\n" msgstr "%s: 次の書庫ヘッダへの探査 (seek) に失敗しました\n" -#: elfedit.c:617 elfedit.c:626 readelf.c:21752 readelf.c:21761 +#: elfedit.c:635 elfedit.c:644 readelf.c:22207 readelf.c:22216 #, c-format msgid "%s: bad archive file name\n" msgstr "%s: 誤った書庫ファイル名です\n" -#: elfedit.c:649 elfedit.c:760 +#: elfedit.c:667 elfedit.c:778 #, c-format msgid "Input file '%s' is not readable\n" msgstr "入力ファイル '%s' が読み込み可能ではありません\n" -#: elfedit.c:676 +#: elfedit.c:694 #, c-format msgid "%s: failed to seek to archive member\n" msgstr "%s: 書庫のメンバの探査 (seek) に失敗しました\n" -#: elfedit.c:717 readelf.c:21880 +#: elfedit.c:735 readelf.c:22335 #, c-format msgid "'%s': No such file\n" msgstr "'%s': そのようなファイルはありません\n" -#: elfedit.c:719 readelf.c:21882 +#: elfedit.c:737 readelf.c:22337 #, c-format msgid "Could not locate '%s'. System error message: %s\n" msgstr "'%s' を配置できませんでした。システムエラーメッセージ: %s\n" -#: elfedit.c:740 readelf.c:21889 +#: elfedit.c:758 readelf.c:22344 #, c-format msgid "'%s' is not an ordinary file\n" msgstr "'%s' は正常なファイルではありません\n" -#: elfedit.c:766 readelf.c:21911 +#: elfedit.c:784 readelf.c:22366 #, c-format msgid "%s: Failed to read file's magic number\n" msgstr "%s: ファイルのマジック番号の読み出しに失敗しました\n" -#: elfedit.c:830 +#: elfedit.c:848 #, c-format msgid "Unknown OSABI: %s\n" msgstr "不明な OSABI です: %s\n" -#: elfedit.c:855 +#: elfedit.c:873 #, c-format msgid "Unknown machine type: %s\n" msgstr "不明なマシン型です: %s\n" -#: elfedit.c:874 +#: elfedit.c:892 #, c-format msgid "Unknown type: %s\n" msgstr "不明な型です: %s\n" -#: elfedit.c:921 +#: elfedit.c:943 #, c-format msgid "Usage: %s elffile(s)\n" msgstr "使用法: %s elffile(s)\n" -#: elfedit.c:923 +#: elfedit.c:945 #, c-format msgid " Update the ELF header of ELF files\n" msgstr " ELF ファイルの ELF ヘッダを更新します\n" -#: elfedit.c:924 objcopy.c:565 objcopy.c:706 strings.c:679 +#: elfedit.c:946 nm.c:295 objcopy.c:565 objcopy.c:706 strings.c:1314 #, c-format msgid " The options are:\n" msgstr " オプション:\n" @@ -4366,7 +4366,7 @@ " Disable x86 feature \n" msgstr "" -#: elfedit.c:946 +#: elfedit.c:970 #, c-format msgid "" " -h --help Display this information\n" @@ -4393,16 +4393,16 @@ msgid " [-X32_64] - accepts 32 and 64 bit objects\n" msgstr " [-X32_64] - 32 および 64 ビットオブジェクトを受容する\n" -#: mclex.c:240 +#: mclex.c:245 msgid "Duplicate symbol entered into keyword list." msgstr "重複したシンボルがキーワードシンボルに入れられました。" -#: nm.c:274 size.c:88 strings.c:677 +#: nm.c:293 size.c:88 strings.c:1312 #, c-format msgid "Usage: %s [option(s)] [file(s)]\n" msgstr "使用法: %s [option(s)] [file(s)]\n" -#: nm.c:275 +#: nm.c:294 #, c-format msgid " List symbols in [file(s)] (a.out by default).\n" msgstr " [file(s)] に含まれるシンボルを一覧表示します (デフォルトは a.out)。\n" @@ -4441,12 +4441,12 @@ " -r, --reverse-sort Reverse the sense of the sort\n" msgstr "" -#: nm.c:303 +#: nm.c:342 #, c-format msgid " --plugin NAME Load the specified plugin\n" msgstr " --plugin NAME 指定したプラグインを読み込む\n" -#: nm.c:279 +#: nm.c:269 #, c-format msgid "" " -S, --print-size Print size of defined symbols\n" @@ -4465,37 +4465,37 @@ "\n" msgstr "" -#: nm.c:340 +#: nm.c:395 #, c-format msgid "%s: invalid radix" msgstr "%s: 無効な基数です" -#: nm.c:370 +#: nm.c:425 #, c-format msgid "%s: invalid output format" msgstr "%s: 無効な出力形式です" -#: nm.c:395 readelf.c:12090 readelf.c:12133 +#: nm.c:450 readelf.c:12440 readelf.c:12483 #, c-format msgid ": %d" msgstr "<プロセッサ固有>: %d" -#: nm.c:397 readelf.c:12097 readelf.c:12150 +#: nm.c:452 readelf.c:12447 readelf.c:12500 #, c-format msgid ": %d" msgstr ": %d" -#: nm.c:399 readelf.c:12100 readelf.c:12153 +#: nm.c:454 readelf.c:12450 readelf.c:12503 #, c-format msgid ": %d" msgstr "<不明>: %d" -#: nm.c:429 +#: nm.c:484 #, c-format msgid ": %d/%d" msgstr "" -#: nm.c:499 +#: nm.c:742 #, c-format msgid "" "\n" @@ -4504,12 +4504,12 @@ "\n" "書庫索引:\n" -#: nm.c:553 nm.c:1250 +#: nm.c:797 nm.c:1494 #, c-format msgid "%s: plugin needed to handle lto object" msgstr "" -#: nm.c:1487 +#: nm.c:1731 #, c-format msgid "" "\n" @@ -4522,7 +4522,7 @@ "%s からの未定義シンボル:\n" "\n" -#: nm.c:1489 +#: nm.c:1733 #, c-format msgid "" "\n" @@ -4535,7 +4535,7 @@ "%s からのシンボル:\n" "\n" -#: nm.c:1491 nm.c:1552 +#: nm.c:1735 nm.c:1796 #, c-format msgid "" "Name Value Class Type Size Line " @@ -4545,7 +4545,7 @@ "名前 値 クラス 型 サイズ 行 セクション\n" "\n" -#: nm.c:1494 nm.c:1555 +#: nm.c:1738 nm.c:1799 #, c-format msgid "" "Name Value Class Type Size " @@ -4555,7 +4555,7 @@ "名前 値 クラス 型 サイズ 行 セクション\n" "\n" -#: nm.c:1548 +#: nm.c:1792 #, c-format msgid "" "\n" @@ -4568,7 +4568,7 @@ "%s[%s] からの未定義シンボル:\n" "\n" -#: nm.c:1550 +#: nm.c:1794 #, c-format msgid "" "\n" @@ -4581,20 +4581,20 @@ "%s[%s] からのシンボル:\n" "\n" -#: nm.c:1656 +#: nm.c:1900 #, c-format msgid "Print width has not been initialized (%d)" msgstr "表示幅が初期化されていません (%d)" -#: nm.c:1915 +#: nm.c:2177 msgid "Only -X 32_64 is supported" msgstr "-X 32_64 のみサポートされています" -#: nm.c:1947 +#: nm.c:2209 msgid "Using the --size-sort and --undefined-only options together" msgstr "--size-sort および --undefined-only オプションを同時に使用しています。" -#: nm.c:1948 +#: nm.c:2210 msgid "will produce no output, since undefined symbols have no size." msgstr "未定義シンボルはサイズが 0 のため何も出力しません。" @@ -4643,7 +4643,7 @@ " Disable -D behavior (default)\n" msgstr "" -#: objcopy.c:581 +#: objcopy.c:580 #, c-format msgid "" " -j --only-section Only copy section into the output\n" @@ -4814,7 +4814,7 @@ "output\n" msgstr "" -#: objcopy.c:720 +#: objcopy.c:719 #, c-format msgid "" " -R --remove-section= Also remove section from the " @@ -4881,7 +4881,7 @@ msgid "cannot open '%s': %s" msgstr "'%s' を開けません: %s" -#: objcopy.c:1094 objcopy.c:5055 +#: objcopy.c:1094 objcopy.c:5091 #, c-format msgid "%s: fread failed" msgstr "%s: fread(3) が失敗しました" @@ -4906,511 +4906,511 @@ msgid "Section %s not found" msgstr "" -#: objcopy.c:1654 +#: objcopy.c:1662 #, c-format msgid "not stripping symbol `%s' because it is named in a relocation" msgstr "再配置用に名付けられているためシンボル `%s' を取り除きません" -#: objcopy.c:1715 +#: objcopy.c:1723 #, c-format msgid "'before=%s' not found" msgstr "" -#: objcopy.c:1754 +#: objcopy.c:1762 #, c-format msgid "%s: Multiple redefinition of symbol \"%s\"" msgstr "%s: シンボル \"%s\" の再定義です" -#: objcopy.c:1758 +#: objcopy.c:1766 #, c-format msgid "%s: Symbol \"%s\" is target of more than one redefinition" msgstr "%s: シンボル \"%s\" 何度か再定義されたターゲットです" -#: objcopy.c:1785 +#: objcopy.c:1793 #, c-format msgid "couldn't open symbol redefinition file %s (error: %s)" msgstr "シンボル再定義ファイル %s を開けません (エラー: %s)" -#: objcopy.c:1863 +#: objcopy.c:1871 #, c-format msgid "%s:%d: garbage found at end of line" msgstr "%s:%d: 行末にゴミが存在します" -#: objcopy.c:1866 +#: objcopy.c:1874 #, c-format msgid "%s:%d: missing new symbol name" msgstr "%s:%d: 新しいシンボル名がありません" -#: objcopy.c:1876 +#: objcopy.c:1884 #, c-format msgid "%s:%d: premature end of file" msgstr "%s:%d: 早すぎるファイル終端 (EOF) です" -#: objcopy.c:1903 +#: objcopy.c:1910 #, c-format msgid "stat returns negative size for `%s'" msgstr "stat(2) が `%s' のサイズとして負の値を返しました" -#: objcopy.c:1915 +#: objcopy.c:1922 #, c-format msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "`%s' [不明] から `%s' [不明] へコピーします\n" -#: objcopy.c:2162 +#: objcopy.c:2167 #, c-format msgid "%s[%s]: Cannot merge - there are relocations against this section" msgstr "" -#: objcopy.c:2184 +#: objcopy.c:2189 msgid "corrupt GNU build attribute note: description size not a factor of 4" msgstr "" -#: objcopy.c:2191 +#: objcopy.c:2196 msgid "corrupt GNU build attribute note: wrong note type" msgstr "" -#: objcopy.c:2197 +#: objcopy.c:2202 msgid "corrupt GNU build attribute note: note too big" msgstr "" -#: objcopy.c:2203 +#: objcopy.c:2208 msgid "corrupt GNU build attribute note: name too small" msgstr "" -#: objcopy.c:2226 +#: objcopy.c:2231 msgid "corrupt GNU build attribute note: unsupported version" msgstr "" -#: objcopy.c:2260 +#: objcopy.c:2265 msgid "corrupt GNU build attribute note: bad description size" msgstr "" -#: objcopy.c:2296 +#: objcopy.c:2301 msgid "corrupt GNU build attribute note: name not NUL terminated" msgstr "" -#: objcopy.c:2308 +#: objcopy.c:2313 msgid "corrupt GNU build attribute notes: excess data at end" msgstr "" -#: objcopy.c:2315 +#: objcopy.c:2320 msgid "bad GNU build attribute notes: no known versions detected" msgstr "" #. This happens with glibc. No idea why. -#: objcopy.c:2319 +#: objcopy.c:2324 #, c-format msgid "%s[%s]: Warning: version note missing - assuming version 3" msgstr "" -#: objcopy.c:2329 +#: objcopy.c:2334 msgid "bad GNU build attribute notes: multiple different versions" msgstr "" #. PR 17636: Call non-fatal so that we return to our parent who #. may need to tidy temporary files. -#: objcopy.c:2428 +#: objcopy.c:2583 msgid "Unable to change endianness of input file(s)" msgstr "入力ファイルのエンディアンを変更できません" -#: objcopy.c:2621 +#: objcopy.c:2626 #, c-format msgid "error: the input file '%s' has no sections" msgstr "" -#: objcopy.c:2631 +#: objcopy.c:2636 #, c-format msgid "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'" msgstr "" -#: objcopy.c:2638 +#: objcopy.c:2643 #, c-format msgid "--elf-stt-common=[yes|no] is unsupported on `%s'" msgstr "" -#: objcopy.c:2645 +#: objcopy.c:2650 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "`%s' [%s] から `%s' [%s] へコピーします\n" -#: objcopy.c:2693 +#: objcopy.c:2698 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "入力ファイル `%s' はバイナリアーキテクチャパラメータを無視します。" -#: objcopy.c:2709 +#: objcopy.c:2714 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "入力ファイル `%s' の形式を認識できません" -#: objcopy.c:2712 +#: objcopy.c:2717 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "出力ファイルはアーキテクチャ `%s' を表すことができません" -#: objcopy.c:2775 +#: objcopy.c:2780 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "警告: ファイル引数 (0x%s) > セクション引数 (0x%s)" -#: objcopy.c:2848 +#: objcopy.c:2853 #, c-format msgid "can't add section '%s'" msgstr "セクション '%s' を追加できません" -#: objcopy.c:2862 +#: objcopy.c:2867 #, c-format msgid "can't create section `%s'" msgstr "セクション `%s' を作成できません" -#: objcopy.c:2910 +#: objcopy.c:2915 #, c-format msgid "error: %s not found, can't be updated" msgstr "" -#: objcopy.c:2943 +#: objcopy.c:2948 msgid "warning: note section is empty" msgstr "" -#: objcopy.c:2952 +#: objcopy.c:2957 msgid "warning: could not load note section" msgstr "" -#: objcopy.c:2968 +#: objcopy.c:2973 msgid "warning: failed to set merged notes size" msgstr "" -#: objcopy.c:2994 +#: objcopy.c:2999 #, c-format msgid "can't dump section '%s' - it does not exist" msgstr "" -#: objcopy.c:3002 +#: objcopy.c:3007 msgid "can't dump section - it has no contents" msgstr "" -#: objcopy.c:2804 +#: objcopy.c:2974 msgid "can't dump section - it is empty" msgstr "" -#: objcopy.c:3014 +#: objcopy.c:3019 msgid "could not open section dump file" msgstr "" -#: objcopy.c:3022 +#: objcopy.c:3027 #, c-format msgid "error writing section contents to %s (error: %s)" msgstr "" -#: objcopy.c:3032 +#: objcopy.c:3037 msgid "could not retrieve section contents" msgstr "" -#: objcopy.c:3046 +#: objcopy.c:3051 #, c-format msgid "%s: debuglink section already exists" msgstr "" -#: objcopy.c:3058 +#: objcopy.c:3063 #, c-format msgid "cannot create debug link section `%s'" msgstr "デバッグリンクセクション `%s' を作成できません" -#: objcopy.c:3152 +#: objcopy.c:3157 msgid "Can't fill gap after section" msgstr "セクション後の隙間を埋められません" -#: objcopy.c:3177 +#: objcopy.c:3182 msgid "can't add padding" msgstr "隙間詰めを追加できません" -#: objcopy.c:3354 +#: objcopy.c:3359 msgid "error: failed to locate merged notes" msgstr "" -#: objcopy.c:3363 +#: objcopy.c:3368 msgid "error: failed to merge notes" msgstr "" -#: objcopy.c:3372 +#: objcopy.c:3377 msgid "error: failed to copy merged notes into output" msgstr "" -#: objcopy.c:3389 +#: objcopy.c:3394 #, c-format msgid "%s: Could not find any mergeable note sections" msgstr "" -#: objcopy.c:3398 +#: objcopy.c:3403 #, c-format msgid "cannot fill debug link section `%s'" msgstr "デバッグリンクセクション `%s' を埋められません" -#: objcopy.c:3459 +#: objcopy.c:3464 msgid "error copying private BFD data" msgstr "プライベート BFD データをコピー中にエラーが発生しましたdata" -#: objcopy.c:3470 +#: objcopy.c:3475 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "このターゲットは %lu 代替マシンコードをサポートしません" -#: objcopy.c:3474 +#: objcopy.c:3479 msgid "treating that number as an absolute e_machine value instead" msgstr "その番号を代わりに絶対的な e_machine 値として扱います" -#: objcopy.c:3478 +#: objcopy.c:3483 msgid "ignoring the alternative value" msgstr "代替の値を無視しています" -#: objcopy.c:3524 +#: objcopy.c:3529 msgid "sorry: copying thin archives is not currently supported" msgstr "" -#: objcopy.c:3531 objcopy.c:3586 +#: objcopy.c:3536 objcopy.c:3591 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "書庫コピーのための一時ディレクトリを作成できません (エラー: %s)" -#: objcopy.c:3568 +#: objcopy.c:3573 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "" -#: objcopy.c:3619 +#: objcopy.c:3625 msgid "Unable to recognise the format of file" msgstr "ファイルの形式を認識できません" -#: objcopy.c:3752 +#: objcopy.c:3758 #, c-format msgid "error: the input file '%s' is empty" msgstr "エラー: 入力ファイル '%s' が空です" -#: objcopy.c:3830 +#: objcopy.c:3836 #, c-format msgid "--add-gnu-debuglink ignored for archive %s" msgstr "" -#: objcopy.c:3939 +#: objcopy.c:3945 #, c-format msgid "Multiple renames of section %s" msgstr "セクション %s の名前変更が複数回行われています" -#: objcopy.c:3985 +#: objcopy.c:3991 msgid "error in private header data" msgstr "プライベートヘッダデータにエラーがあります" -#: objcopy.c:4078 +#: objcopy.c:4084 msgid "failed to create output section" msgstr "出力セクションの作成に失敗しました" -#: objcopy.c:4093 +#: objcopy.c:4096 msgid "failed to set size" msgstr "サイズの設定に失敗しました" -#: objcopy.c:4112 +#: objcopy.c:4115 msgid "failed to set vma" msgstr "vma の設定に失敗しました" -#: objcopy.c:4142 +#: objcopy.c:4145 msgid "failed to set alignment" msgstr "整列の設定に失敗しました" -#: objcopy.c:4174 +#: objcopy.c:4177 msgid "failed to copy private data" msgstr "プライベートデータのコピーに失敗しました" -#: objcopy.c:4331 +#: objcopy.c:4337 msgid "relocation count is negative" msgstr "再配置数が負の値です" #. User must pad the section up in order to do this. -#: objcopy.c:4430 +#: objcopy.c:4436 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" msgstr "バイト順を逆にできません: セクション %s の長さは %d で割り切れなければいけません" -#: objcopy.c:4638 +#: objcopy.c:4644 msgid "can't create debugging section" msgstr "デバッグセクションを作成できません" -#: objcopy.c:4652 +#: objcopy.c:4658 msgid "can't set debugging section contents" msgstr "デバッグセクションの内容を設定できません" -#: objcopy.c:4661 +#: objcopy.c:4667 #, c-format msgid "don't know how to write debugging information for %s" msgstr "%s に対してデバッグ情報を書き込む方法が分かりません" -#: objcopy.c:4850 +#: objcopy.c:4856 msgid "could not create temporary file to hold stripped copy" msgstr "取り除かれたコピーを保持する一時ファイルの作成に失敗しました" -#: objcopy.c:4924 +#: objcopy.c:4930 #, c-format msgid "%s: bad version in PE subsystem" msgstr "%s: PE 子システム内に誤ったバージョンがあります" -#: objcopy.c:4954 +#: objcopy.c:4960 #, c-format msgid "unknown PE subsystem: %s" msgstr "不明な PE 子システム: %s" -#: objcopy.c:5008 objcopy.c:5280 objcopy.c:5360 objcopy.c:5501 objcopy.c:5533 -#: objcopy.c:5596 objcopy.c:5600 objcopy.c:5620 +#: objcopy.c:5044 objcopy.c:5316 objcopy.c:5396 objcopy.c:5537 objcopy.c:5569 +#: objcopy.c:5632 objcopy.c:5636 objcopy.c:5656 #, c-format msgid "bad format for %s" msgstr "%s 用としては不正な形式です" -#: objcopy.c:5037 +#: objcopy.c:5073 #, c-format msgid "cannot open: %s: %s" msgstr "開くことができません: %s: %s" -#: objcopy.c:5092 +#: objcopy.c:5128 msgid "byte number must be non-negative" msgstr "バイト数は非負でなければなりません" -#: objcopy.c:5098 +#: objcopy.c:5134 #, c-format msgid "architecture %s unknown" msgstr "アーキテクチャ %s は不明です" -#: objcopy.c:5106 +#: objcopy.c:5142 msgid "interleave must be positive" msgstr "interleave は正の数値でなければいけません" -#: objcopy.c:5115 +#: objcopy.c:5151 msgid "interleave width must be positive" msgstr "interleave 幅は正の数値でなければいけません" -#: objcopy.c:5433 +#: objcopy.c:5469 #, c-format msgid "unrecognized --compress-debug-sections type `%s'" msgstr "" -#: objcopy.c:5454 +#: objcopy.c:5490 #, c-format msgid "unrecognized --elf-stt-common= option `%s'" msgstr "" -#: objcopy.c:5470 +#: objcopy.c:5506 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "警告: 0x%s から 0x%x までの隙間の埋め込みを切り詰めます" -#: objcopy.c:5556 +#: objcopy.c:5592 msgid "bad format for --set-section-alignment: argument needed" msgstr "" -#: objcopy.c:5560 +#: objcopy.c:5596 msgid "bad format for --set-section-alignment: numeric argument needed" msgstr "" #. Number has more than on 1, i.e. wasn't a power of 2. -#: objcopy.c:5572 +#: objcopy.c:5608 msgid "" "bad format for --set-section-alignment: alignment is not a power of two" msgstr "" -#: objcopy.c:5679 +#: objcopy.c:5715 #, c-format msgid "unknown long section names option '%s'" msgstr "長いセクション名の扱いに対する不明なオプション '%s' です" -#: objcopy.c:5702 +#: objcopy.c:5738 msgid "unable to parse alternative machine code" msgstr "代替マシンコードを解析できません" -#: objcopy.c:5751 +#: objcopy.c:5787 msgid "number of bytes to reverse must be positive and even" msgstr "逆にするバイト数は正の偶数でなければいけません" -#: objcopy.c:5754 +#: objcopy.c:5790 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "警告: 前にある --reverse-bytes の値 %d は無視しています" -#: objcopy.c:5769 +#: objcopy.c:5805 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "%s: --heap に対する無効な予約値です" -#: objcopy.c:5775 +#: objcopy.c:5811 #, c-format msgid "%s: invalid commit value for --heap" msgstr "%s: --heap に対する無効な確定値です" -#: objcopy.c:5800 +#: objcopy.c:5836 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "%s: --stack に対する無効な予約値です" -#: objcopy.c:5806 +#: objcopy.c:5842 #, c-format msgid "%s: invalid commit value for --stack" msgstr "%s: --stack に対する無効な確定値です" -#: objcopy.c:5815 +#: objcopy.c:5851 msgid "verilog data width must be at least 1 byte" msgstr "" -#: objcopy.c:5832 +#: objcopy.c:5868 msgid "--globalize-symbol(s) is incompatible with -G/--keep-global-symbol(s)" msgstr "" -#: objcopy.c:5844 +#: objcopy.c:5880 msgid "interleave start byte must be set with --byte" msgstr "interleave の開始バイトを --byte で設定しなければいけません" -#: objcopy.c:5847 +#: objcopy.c:5883 msgid "byte number must be less than interleave" msgstr "バイト数は interleave 未満でなければなりません" -#: objcopy.c:5850 +#: objcopy.c:5886 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "" -#: objcopy.c:5879 +#: objcopy.c:5909 #, c-format msgid "unknown input EFI target: %s" msgstr "不明な入力 EFI ターゲットです: %s" -#: objcopy.c:5910 +#: objcopy.c:5919 #, c-format msgid "unknown output EFI target: %s" msgstr "不明な出力 EFI ターゲットです: %s" -#: objcopy.c:5463 +#: objcopy.c:5835 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "警告: '%s' を配置できません。システムエラーメッセージ: %s" -#: objcopy.c:5936 +#: objcopy.c:5943 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" msgstr "警告: '%s' をコピー中に一時ファイルを作成できませんでした (エラー: %s)" -#: objcopy.c:5973 objcopy.c:5987 +#: objcopy.c:5980 objcopy.c:5994 #, c-format msgid "%s %s%c0x%s never used" msgstr "%s %s%c0x%s は使われることがありません" -#: objdump.c:212 +#: objdump.c:225 #, c-format msgid "Usage: %s \n" msgstr "使用法: %s \n" -#: objdump.c:213 +#: objdump.c:226 #, c-format msgid " Display information from object .\n" msgstr " オブジェクトファイル の情報を表示する\n" -#: objdump.c:214 +#: objdump.c:227 #, c-format msgid " At least one of the following switches must be given:\n" msgstr " 下記のスイッチの中で最低一つは指定しなければいけません:\n" @@ -5456,7 +5456,7 @@ " -H, --help Display this information\n" msgstr "" -#: objdump.c:299 +#: objdump.c:312 #, c-format msgid "" "\n" @@ -5530,7 +5530,7 @@ "\n" msgstr "" -#: objdump.c:384 +#: objdump.c:399 #, c-format msgid "" "\n" @@ -5539,67 +5539,67 @@ "\n" "-P/--private スイッチでサポートされるオプション:\n" -#: objdump.c:621 +#: objdump.c:759 #, c-format msgid "" "section '%s' mentioned in a -j option, but not found in any input file" msgstr "セクション '%s' が -j オプションで指定されましたがどの入力ファイルにもありません" -#: objdump.c:776 +#: objdump.c:914 #, c-format msgid "Sections:\n" msgstr "セクション:\n" -#: objdump.c:782 +#: objdump.c:920 #, c-format msgid "Idx %-*s Size %-*s%-*sFile off Algn" msgstr "" -#: objdump.c:788 +#: objdump.c:926 #, c-format msgid " Flags" msgstr " フラグ" -#: objdump.c:810 +#: objdump.c:948 #, c-format msgid "failed to read symbol table from: %s" msgstr "" -#: objdump.c:811 objdump.c:4753 +#: objdump.c:949 objdump.c:4907 msgid "error message was" msgstr "" -#: objdump.c:826 +#: objdump.c:964 #, c-format msgid "error: symbol table size (%#lx) is larger than filesize (%#lx)" msgstr "" -#: objdump.c:856 +#: objdump.c:994 #, c-format msgid "%s: not a dynamic object" msgstr "%s: 動的オブジェクトではありません" -#: objdump.c:1455 objdump.c:1482 +#: objdump.c:1593 objdump.c:1620 #, c-format msgid " (File Offset: 0x%lx)" msgstr " (ファイルオフセット: 0x%lx)" -#: objdump.c:1727 +#: objdump.c:1865 #, c-format msgid "source file %s is more recent than object file\n" msgstr "" -#: objdump.c:2887 +#: objdump.c:3025 #, c-format msgid "disassemble_fn returned length %d" msgstr "disassemble_fn が長さ %d を返しました" -#: objdump.c:3215 objdump.c:4391 +#: objdump.c:3353 objdump.c:4527 #, c-format msgid "Reading section %s failed because: %s" msgstr "" -#: objdump.c:3236 +#: objdump.c:3374 #, c-format msgid "" "\n" @@ -5608,24 +5608,24 @@ "\n" "セクション %s の逆アセンブル:\n" -#: objdump.c:3527 +#: objdump.c:3665 #, c-format msgid "can't use supplied machine %s" msgstr "与えられたマシン %s を使用できません" -#: objdump.c:3548 +#: objdump.c:3686 #, c-format msgid "can't disassemble for architecture %s\n" msgstr "アーキテクチャ %s 用に逆アセンブルできません\n" -#: objdump.c:3637 +#: objdump.c:3775 #, c-format msgid "" "\n" "Section '%s' has an invalid size: %#llx.\n" msgstr "" -#: objdump.c:3682 +#: objdump.c:3820 #, c-format msgid "" "\n" @@ -5634,12 +5634,12 @@ "\n" "セクション '%s' の内容を取得できません。\n" -#: objdump.c:3844 +#: objdump.c:3999 #, c-format msgid "File %s does not contain any dwarf debug information\n" msgstr "" -#: objdump.c:3881 +#: objdump.c:4036 #, c-format msgid "" "No %s section present\n" @@ -5648,12 +5648,12 @@ "%s セクションがありません\n" "\n" -#: objdump.c:3888 +#: objdump.c:4043 #, c-format msgid "reading %s section of %s failed: %s" msgstr "%2$s の %1$s セクションの読み込みに失敗しました: %3$s" -#: objdump.c:3934 +#: objdump.c:4089 #, c-format msgid "" "Contents of %s section:\n" @@ -5662,17 +5662,17 @@ "%s セクションの内容:\n" "\n" -#: objdump.c:4068 +#: objdump.c:4223 #, c-format msgid "architecture: %s, " msgstr "アーキテクチャ: %s, " -#: objdump.c:4071 +#: objdump.c:4226 #, c-format msgid "flags 0x%08x:\n" msgstr "フラグ 0x%08x:\n" -#: objdump.c:4084 +#: objdump.c:4239 #, c-format msgid "" "\n" @@ -5681,73 +5681,73 @@ "\n" "開始アドレス 0x" -#: objdump.c:4167 readelf.c:15125 +#: objdump.c:4319 readelf.c:15505 #, c-format msgid "" "\n" "CTF archive member: %s:\n" msgstr "" -#: readelf.c:15144 +#: readelf.c:15525 #, c-format msgid "Iteration failed: %s, %s\n" msgstr "" -#: readelf.c:15242 readelf.c:15255 readelf.c:15269 +#: readelf.c:15605 readelf.c:15617 #, c-format msgid "CTF open failure: %s\n" msgstr "" -#: objdump.c:4252 +#: objdump.c:4388 #, c-format msgid "Contents of CTF section %s:\n" msgstr "" -#: objdump.c:4277 +#: objdump.c:4413 #, c-format msgid "warning: private headers incomplete: %s" msgstr "" -#: objdump.c:4295 +#: objdump.c:4431 msgid "option -P/--private not supported by this file" msgstr "このファイルではオプション -P/--private はサポートされていません" -#: objdump.c:4319 +#: objdump.c:4455 #, c-format msgid "target specific dump '%s' not supported" msgstr "ターゲット特有のダンプ '%s' はサポートされていません" -#: objdump.c:4383 +#: objdump.c:4519 #, c-format msgid "Contents of section %s:" msgstr "セクション %s の内容:" -#: objdump.c:4385 +#: objdump.c:4521 #, c-format msgid " (Starting at file offset: 0x%lx)" msgstr " (開始ファイルオフセット: 0x%lx)" -#: objdump.c:4495 +#: objdump.c:4631 #, c-format msgid "no symbols\n" msgstr "シンボルがありません\n" -#: objdump.c:4502 +#: objdump.c:4638 #, c-format msgid "no information for symbol number %ld\n" msgstr "シンボル番号 %ld に関する情報がありません\n" -#: objdump.c:4505 +#: objdump.c:4641 #, c-format msgid "could not determine the type of symbol number %ld\n" msgstr "シンボル番号 %ld の型を決定できませんでした\n" -#: objdump.c:4751 +#: objdump.c:4905 #, c-format msgid "failed to read relocs in: %s" msgstr "" -#: objdump.c:4911 +#: objdump.c:5064 #, c-format msgid "" "\n" @@ -5756,52 +5756,52 @@ "\n" "%s: ファイル形式 %s\n" -#: objdump.c:5011 +#: objdump.c:5172 #, c-format msgid "%s: printing debugging information failed" msgstr "%s: デバッグ情報の出力に失敗しました" -#: objdump.c:5107 +#: objdump.c:5268 #, c-format msgid "In archive %s:\n" msgstr "書庫 %s 内:\n" #. Prevent corrupted files from spinning us into an #. infinite loop. 100 is an arbitrary heuristic. -#: objdump.c:5112 +#: objdump.c:5273 msgid "Archive nesting is too deep" msgstr "" -#: objdump.c:5116 +#: objdump.c:5277 #, c-format msgid "In nested archive %s:\n" msgstr "" -#: objdump.c:5279 +#: objdump.c:5440 msgid "error: the start address should be before the end address" msgstr "エラー: 開始アドレスは終了アドレスより前でなければいけません" -#: objdump.c:5284 +#: objdump.c:5445 msgid "error: the stop address should be after the start address" msgstr "エラー: 停止アドレスは開始アドレスより後でなければいけません" -#: objdump.c:5296 +#: objdump.c:5457 msgid "error: prefix strip must be non-negative" msgstr "エラー: prefix strip は非負の値でなければいけません" -#: objdump.c:5301 +#: objdump.c:5462 msgid "error: instruction width must be positive" msgstr "エラー: 命令幅は正の数値でなければいけません" -#: objdump.c:5322 +#: objdump.c:5483 msgid "unrecognized argument to --visualize-option" msgstr "" -#: objdump.c:5332 +#: objdump.c:5493 msgid "unrecognized -E option" msgstr "-E のオプションを認識できません" -#: objdump.c:5343 +#: objdump.c:5504 #, c-format msgid "unrecognized --endian type `%s'" msgstr "--endian タイプ `%s' を認識できません" @@ -6078,7 +6078,7 @@ msgid " time and date: 0x%08x - " msgstr " 時刻および日付: 0x%08x - " -#: od-xcoff.c:421 readelf.c:19706 +#: od-xcoff.c:421 readelf.c:20126 #, c-format msgid "not set\n" msgstr "設定されていません\n" @@ -6543,82 +6543,82 @@ msgid "Last stabs entries before error:\n" msgstr "エラーの直前のスタブエントリ:\n" -#: readelf.c:354 +#: readelf.c:385 msgid "" msgstr "<無し>" -#: readelf.c:355 +#: readelf.c:387 msgid "" msgstr "<文字列はありません>" -#: readelf.c:437 +#: readelf.c:482 #, c-format msgid "Size truncation prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:447 +#: readelf.c:492 #, c-format msgid "Size overflow prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:460 +#: readelf.c:505 #, c-format msgid "Reading %s bytes extends past end of file for %s\n" msgstr "" -#: readelf.c:469 +#: readelf.c:514 #, c-format msgid "Unable to seek to 0x%lx for %s\n" msgstr "%2$s の 0x%1$lx まで探査 (seek) できません\n" -#: readelf.c:483 +#: readelf.c:528 #, c-format msgid "Out of memory allocating %s bytes for %s\n" msgstr "%2$s のために %1$s バイトのメモリを確保中にメモリが不足しました\n" -#: readelf.c:494 +#: readelf.c:539 #, c-format msgid "Unable to read in %s bytes of %s\n" msgstr "" -#: readelf.c:971 +#: readelf.c:1151 msgid "Don't know about relocations on this machine architecture\n" msgstr "このマシンアーキテクチャでの再配置について解っていません\n" -#: readelf.c:998 readelf.c:1103 +#: readelf.c:1178 readelf.c:1283 msgid "32-bit relocation data" msgstr "" -#: readelf.c:1010 readelf.c:1040 readelf.c:1114 readelf.c:1143 +#: readelf.c:1190 readelf.c:1220 readelf.c:1294 readelf.c:1323 readelf.c:1402 msgid "out of memory parsing relocs\n" msgstr "再配置を解析中にメモリが不足しました\n" -#: readelf.c:1028 readelf.c:1132 +#: readelf.c:1208 readelf.c:1312 msgid "64-bit relocation data" msgstr "" -#: readelf.c:1262 +#: readelf.c:1528 #, c-format msgid "" " Offset Info Type Sym. Value Symbol's Name + Addend\n" msgstr " オフセット 情報 型 シンボル値 シンボル名 + 加数\n" -#: readelf.c:1264 +#: readelf.c:1530 #, c-format msgid " Offset Info Type Sym.Value Sym. Name + Addend\n" msgstr " オフセット 情報 型 シンボル値 シンボル名 + 加数\n" -#: readelf.c:1269 +#: readelf.c:1535 #, c-format msgid " Offset Info Type Sym. Value Symbol's Name\n" msgstr " オフセット 情報 型 シンボル値 シンボル名\n" -#: readelf.c:1271 +#: readelf.c:1537 #, c-format msgid " Offset Info Type Sym.Value Sym. Name\n" msgstr " オフセット 情報 型 シンボル値 シンボル名\n" -#: readelf.c:1279 +#: readelf.c:1545 #, c-format msgid "" " Offset Info Type Symbol's Value " @@ -6626,14 +6626,14 @@ msgstr "" " オフセット 情報 型 シンボル値 シンボル名 + 加数\n" -#: readelf.c:1281 +#: readelf.c:1547 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name + " "Addend\n" msgstr " オフセット 情報 型 シンボル値 シンボル名 + 加数\n" -#: readelf.c:1286 +#: readelf.c:1552 #, c-format msgid "" " Offset Info Type Symbol's Value " @@ -6641,200 +6641,201 @@ msgstr "" " オフセット 情報 型 シンボル値 シンボル名\n" -#: readelf.c:1288 +#: readelf.c:1554 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name\n" msgstr " オフセット 情報 型 シンボル値 シンボル名\n" -#: readelf.c:1659 readelf.c:1852 readelf.c:1860 +#: readelf.c:1930 readelf.c:2125 readelf.c:2133 #, c-format msgid "unrecognized: %-7lx" msgstr "認識できません: %-7lx" -#: readelf.c:1685 +#: readelf.c:1956 #, c-format msgid "" msgstr "<不明な加数: %lx>" -#: readelf.c:1590 +#: readelf.c:1632 #, c-format msgid " bad symbol index: %08lx in reloc" msgstr "" -#: readelf.c:1797 +#: readelf.c:2070 #, c-format msgid "" msgstr "<文字列表索引: %3ld>" -#: readelf.c:1694 +#: readelf.c:1736 #, c-format msgid "" msgstr "<破損した文字列表索引: %3ld>" -#: readelf.c:2305 +#: readelf.c:2595 #, c-format msgid "Processor Specific: %lx" msgstr "プロセッサ固有: %lx" -#: readelf.c:2332 +#: readelf.c:2622 #, c-format msgid "Operating System specific: %lx" msgstr "オペレーティングシステム固有: %lx" -#: readelf.c:2336 readelf.c:4246 +#: readelf.c:2626 readelf.c:4563 #, c-format msgid ": %lx" msgstr "<不明>: %lx" -#: readelf.c:2436 +#: readelf.c:2726 msgid "NONE (None)" msgstr "NONE (無し)" -#: readelf.c:2437 +#: readelf.c:2727 msgid "REL (Relocatable file)" msgstr "REL (再配置可能ファイル)" -#: readelf.c:2438 +#: readelf.c:2728 msgid "EXEC (Executable file)" msgstr "EXEC (実行可能ファイル)" -#: readelf.c:2443 +#: readelf.c:2733 msgid "DYN (Shared object file)" msgstr "DYN (共有オブジェクトファイル)" -#: readelf.c:2444 +#: readelf.c:2734 msgid "CORE (Core file)" msgstr "CORE (コアファイル)" -#: readelf.c:2448 +#: readelf.c:2738 #, c-format msgid "Processor Specific: (%x)" msgstr "プロセッサ固有: (%x)" -#: readelf.c:2450 +#: readelf.c:2740 #, c-format msgid "OS Specific: (%x)" msgstr "OS 固有: (%x)" -#: readelf.c:2452 +#: readelf.c:2742 #, c-format msgid ": %x" msgstr "<不明>: %x" #. Please keep this switch table sorted by increasing EM_ value. #. 0 -#: readelf.c:2466 readelf.c:17634 readelf.c:17645 +#: readelf.c:2756 readelf.c:18010 readelf.c:18021 msgid "None" msgstr "なし" -#: readelf.c:2714 +#: readelf.c:3004 #, c-format msgid ": 0x%x" msgstr "<不明>: 0x%x" -#: readelf.c:3000 +#: readelf.c:3290 msgid ", " msgstr ", <不明>" -#: readelf.c:3369 readelf.c:10401 +#: readelf.c:3659 readelf.c:10755 msgid "unknown" msgstr "不明" -#: readelf.c:3370 +#: readelf.c:3660 msgid "unknown mac" msgstr "不明な mac" -#: readelf.c:3438 +#: readelf.c:3728 msgid ", " msgstr "" -#: readelf.c:3448 +#: readelf.c:3738 msgid "" msgstr "" -#: readelf.c:3459 +#: readelf.c:3749 #, c-format msgid ", unknown flags bits: %#x" msgstr "" -#: readelf.c:3468 +#: readelf.c:3758 msgid ", relocatable" msgstr ", 再配置可能" -#: readelf.c:3471 +#: readelf.c:3761 msgid ", relocatable-lib" msgstr ", 再配置可能ライブラリ" -#: readelf.c:3553 +#: readelf.c:3843 msgid ", unknown v850 architecture variant" msgstr ", 不明な v850 アーキテクチャの変種" -#: readelf.c:3621 +#: readelf.c:3911 msgid ", unknown CPU" msgstr ", 不明な CPU" -#: readelf.c:3636 +#: readelf.c:3926 msgid ", unknown ABI" msgstr ", 不明な ABI" -#: readelf.c:3661 readelf.c:3732 +#: readelf.c:3951 readelf.c:4022 msgid ", unknown ISA" msgstr ", 不明な ISA" -#: readelf.c:3842 +#: readelf.c:4132 #, c-format msgid "Unrecognised IA64 VMS Command Code: %x\n" msgstr "" -#: readelf.c:3908 +#: readelf.c:4198 msgid ": architecture variant: " msgstr ": アーキテクチャの変種: " -#: readelf.c:3927 +#: readelf.c:4217 msgid ": unknown" msgstr ": 不明" -#: readelf.c:3931 +#: readelf.c:4221 msgid ": unknown extra flag bits also present" msgstr "" -#: readelf.c:3945 +#: readelf.c:4235 msgid ", unknown" msgstr "" -#: readelf.c:3997 +#: readelf.c:4301 msgid "Standalone App" msgstr "独立アプリケーション" -#: readelf.c:4006 +#: readelf.c:4310 msgid "Bare-metal C6000" msgstr "ベアメタル C6000" -#: readelf.c:4016 readelf.c:5193 readelf.c:5209 readelf.c:19058 readelf.c:19158 -#: readelf.c:19189 readelf.c:19226 readelf.c:19287 readelf.c:19314 +#: readelf.c:4320 readelf.c:5535 readelf.c:5551 readelf.c:19439 readelf.c:19539 +#: readelf.c:19570 readelf.c:19607 readelf.c:19668 readelf.c:19695 +#: readelf.c:19717 #, c-format msgid "" msgstr "<不明: %x>" #. This message is probably going to be displayed in a 15 #. character wide field, so put the hex value first. -#: readelf.c:4615 +#: readelf.c:4933 #, c-format msgid "%08x: " msgstr "%08x: <不明>" -#: readelf.c:4702 +#: readelf.c:5021 #, c-format msgid "Usage: readelf elf-file(s)\n" msgstr "使用法: readelf elf-file(s)\n" -#: readelf.c:4703 +#: readelf.c:5022 #, c-format msgid " Display information about the contents of ELF format files\n" msgstr " ELF 形式のファイルの内容に関する情報を表示します\n" -#: readelf.c:4334 +#: readelf.c:4494 #, c-format msgid "" " Options are:\n" @@ -6878,7 +6879,7 @@ " Display the contents of DWARF debug sections\n" msgstr "" -#: readelf.c:4633 +#: readelf.c:4528 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -6888,7 +6889,7 @@ " --dwarf-depth=N N 以上の深さの DIE を表示しない\n" " --dwarf-start=N N 以上の深さの DIE を表示する\n" -#: readelf.c:4638 +#: readelf.c:4532 #, c-format msgid "" " --ctf= Display CTF info from section \n" @@ -6905,7 +6906,7 @@ "\n" msgstr "" -#: readelf.c:4824 +#: readelf.c:5147 #, c-format msgid "" " -i --instruction-dump=\n" @@ -6914,7 +6915,7 @@ " -i --instruction-dump=\n" " セクション の内容を逆アセンブルする\n" -#: readelf.c:4377 +#: readelf.c:4546 #, c-format msgid "" " -I --histogram Display histogram of bucket list lengths\n" @@ -6929,95 +6930,95 @@ " -H --help この情報を表示する\n" " -v --version readelf のバージョン番号を表示する\n" -#: readelf.c:4864 readelf.c:4895 readelf.c:4899 +#: readelf.c:5187 readelf.c:5218 readelf.c:5222 msgid "Out of memory allocating dump request table.\n" msgstr "ダンプ要求表のメモリを確保中にメモリが足りなくなりました\n" -#: readelf.c:5155 +#: readelf.c:5497 #, c-format msgid "Invalid option '-%c'\n" msgstr "無効なオプション '-%c'\n" -#: readelf.c:5189 readelf.c:5205 readelf.c:11478 +#: readelf.c:5531 readelf.c:5547 readelf.c:11828 msgid "none" msgstr "なし" -#: readelf.c:5206 +#: readelf.c:5548 msgid "2's complement, little endian" msgstr "2 の補数、リトルエンディアン" -#: readelf.c:5207 +#: readelf.c:5549 msgid "2's complement, big endian" msgstr "2 の補数、ビッグエンディアン" -#: readelf.c:5227 +#: readelf.c:5569 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "ELF ファイルではありません - 始点にあるマジック番号が異なります\n" -#: readelf.c:5241 +#: readelf.c:5583 #, c-format msgid "ELF Header:\n" msgstr "ELF ヘッダ:\n" -#: readelf.c:5242 +#: readelf.c:5584 #, c-format msgid " Magic: " msgstr " マジック: " -#: readelf.c:5246 +#: readelf.c:5588 #, c-format msgid " Class: %s\n" msgstr " クラス: %s\n" -#: readelf.c:5248 +#: readelf.c:5590 #, c-format msgid " Data: %s\n" msgstr " データ: %s\n" -#: readelf.c:5250 +#: readelf.c:5592 #, c-format msgid " Version: %d%s\n" msgstr "" -#: readelf.c:5253 +#: readelf.c:5595 msgid " (current)" msgstr "" -#: readelf.c:5255 +#: readelf.c:5597 msgid " " msgstr "" -#: readelf.c:5257 +#: readelf.c:5599 #, c-format msgid " OS/ABI: %s\n" msgstr " OS/ABI: %s\n" -#: readelf.c:5259 +#: readelf.c:5601 #, c-format msgid " ABI Version: %d\n" msgstr " ABI バージョン: %d\n" -#: readelf.c:5261 +#: readelf.c:5603 #, c-format msgid " Type: %s\n" msgstr " 型: %s\n" -#: readelf.c:5263 +#: readelf.c:5605 #, c-format msgid " Machine: %s\n" msgstr " マシン: %s\n" -#: readelf.c:5265 +#: readelf.c:5607 #, c-format msgid " Version: 0x%lx\n" msgstr " バージョン: 0x%lx\n" -#: readelf.c:5268 +#: readelf.c:5610 #, c-format msgid " Entry point address: " msgstr " エントリポイントアドレス: " -#: readelf.c:5270 +#: readelf.c:5612 #, c-format msgid "" "\n" @@ -7026,7 +7027,7 @@ "\n" " プログラムヘッダ始点: " -#: readelf.c:5272 +#: readelf.c:5614 #, c-format msgid "" " (bytes into file)\n" @@ -7035,84 +7036,84 @@ " (バイト)\n" " セクションヘッダ始点: " -#: readelf.c:5274 +#: readelf.c:5616 #, c-format msgid " (bytes into file)\n" msgstr " (バイト)\n" -#: readelf.c:5276 +#: readelf.c:5618 #, c-format msgid " Flags: 0x%lx%s\n" msgstr " フラグ: 0x%lx%s\n" -#: readelf.c:5279 +#: readelf.c:5621 #, c-format msgid " Size of this header: %u (bytes)\n" msgstr "" -#: readelf.c:5281 +#: readelf.c:5623 #, c-format msgid " Size of program headers: %u (bytes)\n" msgstr "" -#: readelf.c:5283 +#: readelf.c:5625 #, c-format msgid " Number of program headers: %u" msgstr "" -#: readelf.c:5293 +#: readelf.c:5635 #, c-format msgid " Size of section headers: %u (bytes)\n" msgstr "" -#: readelf.c:5295 +#: readelf.c:5637 #, c-format msgid " Number of section headers: %u" msgstr "" -#: readelf.c:5303 +#: readelf.c:5645 #, c-format msgid " Section header string table index: %u" msgstr "" -#: readelf.c:5315 +#: readelf.c:5657 #, c-format msgid " " msgstr " <破損: 範囲外>" -#: readelf.c:5354 readelf.c:5401 +#: readelf.c:5696 readelf.c:5743 msgid "" "The e_phentsize field in the ELF header is less than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5358 readelf.c:5405 +#: readelf.c:5700 readelf.c:5747 msgid "" "The e_phentsize field in the ELF header is larger than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5361 readelf.c:5408 +#: readelf.c:5703 readelf.c:5750 msgid "program headers" msgstr "プログラムヘッダ" -#: readelf.c:5447 +#: readelf.c:5789 #, c-format msgid "Too many program headers - %#x - the file is not that big\n" msgstr "" -#: readelf.c:5456 +#: readelf.c:5798 #, c-format msgid "Out of memory reading %u program headers\n" msgstr "" -#: readelf.c:5486 +#: readelf.c:5828 msgid "" "possibly corrupt ELF header - it has a non-zero program header offset, but " "no program headers\n" msgstr "ELF ヘッダがおそらく壊れています - 0 でないプログラムヘッダオフセットがありますが、プログラムヘッダがありません\n" -#: readelf.c:5494 +#: readelf.c:5836 #, c-format msgid "" "\n" @@ -7121,7 +7122,7 @@ "\n" "このファイルにはプログラムヘッダはありません。\n" -#: readelf.c:5505 +#: readelf.c:5847 #, c-format msgid "" "\n" @@ -7130,19 +7131,19 @@ "\n" "Elf ファイルタイプは %s です\n" -#: readelf.c:5506 +#: readelf.c:5848 #, c-format msgid "Entry point 0x%s\n" msgstr "エントリポイント 0x%s\n" -#: readelf.c:5507 +#: readelf.c:5849 #, c-format msgid "There is %d program header, starting at offset %s\n" msgid_plural "There are %d program headers, starting at offset %s\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:5520 readelf.c:5522 +#: readelf.c:5862 readelf.c:5864 #, c-format msgid "" "\n" @@ -7151,13 +7152,13 @@ "\n" "プログラムヘッダ:\n" -#: readelf.c:5526 +#: readelf.c:5868 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr " タイプ オフセット 仮想Addr 物理Addr FileSiz MemSiz Flg Align\n" -#: readelf.c:5529 +#: readelf.c:5871 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz " @@ -7166,74 +7167,74 @@ " タイプ Offset VirtAddr PhysAddr FileSiz MemSiz " " Flg Align\n" -#: readelf.c:5533 +#: readelf.c:5875 #, c-format msgid " Type Offset VirtAddr PhysAddr\n" msgstr " タイプ オフセット 仮想Addr 物理Addr\n" -#: readelf.c:5535 +#: readelf.c:5877 #, c-format msgid "" " FileSiz MemSiz Flags Align\n" msgstr " ファイルサイズ メモリサイズ フラグ 整列\n" -#: readelf.c:5633 +#: readelf.c:5975 msgid "LOAD segments must be sorted in order of increasing VirtAddr\n" msgstr "" -#: readelf.c:5636 +#: readelf.c:5978 msgid "the segment's file size is larger than its memory size\n" msgstr "" -#: readelf.c:5643 +#: readelf.c:5985 msgid "the PHDR segment must occur before any LOAD segment\n" msgstr "" -#: readelf.c:5661 +#: readelf.c:6003 msgid "the PHDR segment is not covered by a LOAD segment\n" msgstr "" -#: readelf.c:5667 +#: readelf.c:6009 msgid "more than one dynamic segment\n" msgstr "複数の動的セグメント\n" -#: readelf.c:5686 +#: readelf.c:6028 msgid "no .dynamic section in the dynamic segment\n" msgstr "動的セグメントに内 .dynamic セクションがありません\n" -#: readelf.c:5126 +#: readelf.c:5326 msgid "the .dynamic section is not contained within the dynamic segment\n" msgstr "動的セグメント内に .dynamic セクションが含まれていません\n" -#: readelf.c:5129 +#: readelf.c:5329 msgid "" "the .dynamic section is not the first section in the dynamic segment.\n" msgstr ".dynamic セクションが動的セグメントの最初のセクションではありません\n" -#: readelf.c:5716 +#: readelf.c:6058 msgid "the dynamic segment offset + size exceeds the size of the file\n" msgstr "" -#: readelf.c:5729 +#: readelf.c:6071 msgid "Unable to find program interpreter name\n" msgstr "プログラムインタプリタ名は見つかりません\n" -#: readelf.c:5517 +#: readelf.c:5355 msgid "" "Internal error: failed to create format string to display program " "interpreter\n" msgstr "内部エラー: プログラムインタプリタを表示するための書式文字列作成に失敗しました\n" -#: readelf.c:5522 +#: readelf.c:5359 msgid "Unable to read program interpreter name\n" msgstr "プログラムインタプリタ名を読み込めません\n" -#: readelf.c:5740 +#: readelf.c:6082 #, c-format msgid " [Requesting program interpreter: %s]\n" msgstr "" -#: readelf.c:5751 +#: readelf.c:6093 #, c-format msgid "" "\n" @@ -7242,111 +7243,111 @@ "\n" " セグメントマッピングへのセクション:\n" -#: readelf.c:5752 +#: readelf.c:6094 #, c-format msgid " Segment Sections...\n" msgstr " セグメントセクション...\n" -#: readelf.c:5794 readelf.c:10759 +#: readelf.c:6136 readelf.c:11113 msgid "Cannot interpret virtual addresses without program headers.\n" msgstr "プログラムヘッダ無しに仮想アドレスを解釈できません。\n" -#: readelf.c:5810 +#: readelf.c:6152 #, c-format msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n" msgstr "仮想アドレス 0x%lx がどの PT_LOAD セグメントにも位置していません。\n" -#: readelf.c:5835 readelf.c:5899 +#: readelf.c:6177 readelf.c:6241 msgid "" "The e_shentsize field in the ELF header is less than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5839 readelf.c:5904 +#: readelf.c:6181 readelf.c:6246 msgid "" "The e_shentsize field in the ELF header is larger than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5843 readelf.c:5909 +#: readelf.c:6185 readelf.c:6251 msgid "section headers" msgstr "セクションヘッダ" -#: readelf.c:5852 readelf.c:5918 +#: readelf.c:6194 readelf.c:6260 #, c-format msgid "Out of memory reading %u section headers\n" msgstr "" -#: readelf.c:5872 readelf.c:5938 +#: readelf.c:6214 readelf.c:6280 #, c-format msgid "Section %u has an out of range sh_link value of %u\n" msgstr "" -#: readelf.c:5874 readelf.c:5940 +#: readelf.c:6216 readelf.c:6282 #, c-format msgid "Section %u has an out of range sh_info value of %u\n" msgstr "" -#: readelf.c:5982 readelf.c:6099 +#: readelf.c:6324 readelf.c:6441 #, c-format msgid "Section %s has an invalid sh_entsize of 0x%lx\n" msgstr "" -#: readelf.c:5990 readelf.c:6107 readelf.c:12767 +#: readelf.c:6332 readelf.c:6449 readelf.c:13146 #, c-format msgid "Section %s has an invalid sh_size of 0x%lx\n" msgstr "" -#: readelf.c:6000 readelf.c:6117 +#: readelf.c:6342 readelf.c:6459 #, c-format msgid "" "Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n" msgstr "" -#: readelf.c:6008 readelf.c:6125 readelf.c:15196 +#: readelf.c:6350 readelf.c:6467 readelf.c:15575 msgid "symbols" msgstr "シンボル" -#: readelf.c:6020 readelf.c:6137 +#: readelf.c:6362 readelf.c:6479 msgid "" "Multiple symbol table index sections associated with the same symbol " "section\n" msgstr "" -#: readelf.c:6027 readelf.c:6144 +#: readelf.c:6369 readelf.c:6486 msgid "symbol table section indices" msgstr "" -#: readelf.c:6034 readelf.c:6151 +#: readelf.c:6376 readelf.c:6493 #, c-format msgid "Index section %s has an sh_size of 0x%lx - expected 0x%lx\n" msgstr "" -#: readelf.c:6046 readelf.c:6163 +#: readelf.c:6388 readelf.c:6505 #, c-format msgid "Out of memory reading %lu symbols\n" msgstr "" -#: readelf.c:6372 readelf.c:6469 readelf.c:6487 readelf.c:6505 +#: readelf.c:6714 readelf.c:6811 readelf.c:6829 readelf.c:6847 msgid "Internal error: not enough buffer room for section flag info" msgstr "" -#: readelf.c:6512 +#: readelf.c:6854 #, c-format msgid "UNKNOWN (%*.*lx)" msgstr "UNKNOWN (%*.*lx)" -#: readelf.c:6531 readelf.c:6546 +#: readelf.c:6873 readelf.c:6888 msgid "Compressed section is too small even for a compression header\n" msgstr "" -#: readelf.c:6568 +#: readelf.c:6910 msgid "" "possibly corrupt ELF file header - it has a non-zero section header offset, " "but no section headers\n" msgstr "ELF ファイルヘッダが壊れているようです - 0 でないセクションヘッダオフセットがありますが、セクションヘッダがありません\n" -#: readelf.c:6573 +#: readelf.c:6915 #, c-format msgid "" "\n" @@ -7355,41 +7356,41 @@ "\n" "このファイルにはセクションがありません。\n" -#: readelf.c:6583 +#: readelf.c:6925 #, c-format msgid "There is %d section header, starting at offset 0x%lx:\n" msgid_plural "There are %d section headers, starting at offset 0x%lx:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:6605 readelf.c:7278 readelf.c:7479 readelf.c:13054 readelf.c:15585 +#: readelf.c:6947 readelf.c:7624 readelf.c:7826 readelf.c:13434 readelf.c:15933 msgid "string table" msgstr "文字列表" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:6671 +#: readelf.c:7013 #, c-format msgid "Section %d has invalid sh_entsize of %s\n" msgstr "" -#: readelf.c:6672 +#: readelf.c:7014 #, c-format msgid "(Using the expected size of %u for the rest of this dump)\n" msgstr "" -#: readelf.c:6696 +#: readelf.c:7038 msgid "File contains multiple dynamic symbol tables\n" msgstr "ファイルが複数の動的シンボルテーブルを含んでいます\n" -#: readelf.c:6711 +#: readelf.c:7053 msgid "File contains multiple dynamic string tables\n" msgstr "ファイルが複数の動的文字列テーブルを含んでいます\n" -#: readelf.c:6717 +#: readelf.c:7059 msgid "dynamic strings" msgstr "動的文字列" -#: readelf.c:6846 +#: readelf.c:7192 #, c-format msgid "" "\n" @@ -7398,7 +7399,7 @@ "\n" "セクションヘッダ:\n" -#: readelf.c:6848 +#: readelf.c:7194 #, c-format msgid "" "\n" @@ -7407,17 +7408,17 @@ "\n" "セクションヘッダ:\n" -#: readelf.c:6854 readelf.c:6865 readelf.c:6876 +#: readelf.c:7200 readelf.c:7211 readelf.c:7222 #, c-format msgid " [Nr] Name\n" msgstr " [番] 名前\n" -#: readelf.c:6855 +#: readelf.c:7201 #, c-format msgid " Type Addr Off Size ES Lk Inf Al\n" msgstr " 型 アドレス Off サイズ ES Lk Inf Al\n" -#: readelf.c:6859 +#: readelf.c:7205 #, c-format msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " @@ -7425,13 +7426,13 @@ msgstr "" " [番] 名前 タイプ アドレス Off サイズ ES Flg Lk Inf Al\n" -#: readelf.c:6866 +#: readelf.c:7212 #, c-format msgid "" " Type Address Off Size ES Lk Inf Al\n" msgstr " 型 アドレス Off サイズ ES Lk Inf Al\n" -#: readelf.c:6870 +#: readelf.c:7216 #, c-format msgid "" " [Nr] Name Type Address Off Size ES " @@ -7440,77 +7441,77 @@ " [番] 名前 型 アドレス Off サイズ ES Flg Lk Inf " "Al\n" -#: readelf.c:6877 +#: readelf.c:7223 #, c-format msgid " Type Address Offset Link\n" msgstr " 型 アドレス オフセット リンク\n" -#: readelf.c:6878 +#: readelf.c:7224 #, c-format msgid " Size EntSize Info Align\n" msgstr " サイズ EntSize 情報 整列\n" -#: readelf.c:6882 +#: readelf.c:7228 #, c-format msgid " [Nr] Name Type Address Offset\n" msgstr " [番] 名前 タイプ アドレス オフセット\n" -#: readelf.c:6883 +#: readelf.c:7229 #, c-format msgid " Size EntSize Flags Link Info Align\n" msgstr " サイズ EntSize フラグ Link 情報 整列\n" -#: readelf.c:6888 +#: readelf.c:7234 #, c-format msgid " Flags\n" msgstr " フラグ\n" -#: readelf.c:6917 +#: readelf.c:7263 #, c-format msgid "[%2u]: Link field (%u) should index a symtab section.\n" msgstr "" -#: readelf.c:6930 +#: readelf.c:7276 #, c-format msgid "[%2u]: Link field (%u) should index a string section.\n" msgstr "" -#: readelf.c:6938 readelf.c:6949 +#: readelf.c:7284 readelf.c:7295 #, c-format msgid "[%2u]: Unexpected value (%u) in link field.\n" msgstr "" -#: readelf.c:6976 +#: readelf.c:7322 #, c-format msgid "[%2u]: Info field (%u) should index a relocatable section.\n" msgstr "" -#: readelf.c:6987 readelf.c:7014 +#: readelf.c:7333 readelf.c:7360 #, c-format msgid "[%2u]: Unexpected value (%u) in info field.\n" msgstr "" -#: readelf.c:7009 +#: readelf.c:7355 #, c-format msgid "[%2u]: Expected link to another section in info field" msgstr "" -#: readelf.c:7024 +#: readelf.c:7370 #, c-format msgid "Size of section %u is larger than the entire file!\n" msgstr "" -#: readelf.c:7093 +#: readelf.c:7439 #, c-format msgid "" "section %u: sh_link value of %u is larger than the number of sections\n" msgstr "セクション %u: sh_link の値 %u がセクション数より大きいです\n" -#: readelf.c:7194 +#: readelf.c:7540 msgid "compression header" msgstr "" -#: readelf.c:7205 +#: readelf.c:7551 #, c-format msgid " [: 0x%x], " msgstr " [<不明>: 0x%x], " @@ -7518,7 +7519,7 @@ #. The ordering of the letters shown here matches the ordering of the #. corresponding SHF_xxx values, and hence the order in which these #. letters will be displayed to the user. -#: readelf.c:7220 +#: readelf.c:7566 #, c-format msgid "" "Key to Flags:\n" @@ -7528,27 +7529,27 @@ " " msgstr "" -#: readelf.c:7239 +#: readelf.c:7585 #, c-format msgid "l (large), " msgstr "" -#: readelf.c:7241 +#: readelf.c:7587 #, c-format msgid "y (purecode), " msgstr "" -#: readelf.c:7243 +#: readelf.c:7589 #, c-format msgid "v (VLE), " msgstr "" -#: readelf.c:6552 +#: readelf.c:6764 #, c-format msgid "[0x%x: " msgstr "" -#: readelf.c:7090 +#: readelf.c:6806 #, c-format msgid "" "\n" @@ -7557,16 +7558,16 @@ "\n" "このファイルにはグループ化するセクションがありません。\n" -#: readelf.c:7343 +#: readelf.c:7689 msgid "Section headers are not available!\n" msgstr "セクションヘッダが利用できません!\n" -#: readelf.c:7354 +#: readelf.c:7700 #, c-format msgid "Out of memory reading %u section group headers\n" msgstr "" -#: readelf.c:7336 readelf.c:7375 +#: readelf.c:7682 readelf.c:7721 #, c-format msgid "" "\n" @@ -7575,37 +7576,37 @@ "\n" "このファイルにはセクショングループがありません。\n" -#: readelf.c:7386 +#: readelf.c:7732 #, c-format msgid "Out of memory reading %lu groups\n" msgstr "" -#: readelf.c:7420 +#: readelf.c:7766 #, c-format msgid "Bad sh_link in group section `%s'\n" msgstr "グループセクション `%s' 内で誤った sh_link です\n" -#: readelf.c:7433 +#: readelf.c:7779 #, c-format msgid "Corrupt header in group section `%s'\n" msgstr "グループセクション `%s' 内で破損したヘッダです\n" -#: readelf.c:7439 readelf.c:7450 +#: readelf.c:7785 readelf.c:7796 #, c-format msgid "Bad sh_info in group section `%s'\n" msgstr "グループセクション `%s' 内で誤った sh_info です\n" -#: readelf.c:7489 +#: readelf.c:7836 #, c-format msgid "" "Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n" msgstr "" -#: readelf.c:7498 +#: readelf.c:7845 msgid "section data" msgstr "セクションデータ" -#: readelf.c:7509 +#: readelf.c:7856 #, c-format msgid "" "\n" @@ -7614,63 +7615,63 @@ "\n" "%s グループセクション [%5u] `%s' [%s] は %u 個のセクションを含みます:\n" -#: readelf.c:7512 +#: readelf.c:7859 #, c-format msgid " [Index] Name\n" msgstr " [索引] 名前\n" -#: readelf.c:7530 +#: readelf.c:7877 #, c-format msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n" msgstr "グループセクション [%2$5u] のセクション [%1$5u] > 最大セクション [%3$5u] です\n" -#: readelf.c:7533 +#: readelf.c:7880 msgid "" "Further error messages about overlarge group section indices suppressed\n" msgstr "" -#: readelf.c:7546 +#: readelf.c:7893 #, c-format msgid "section [%5u] in group section [%5u] already in group section [%5u]\n" msgstr "グループセクション [%2$5u] のセクション [%1$5u] は既にグループセクション [%3$5u] に属しています\n" -#: readelf.c:7550 +#: readelf.c:7897 msgid "" "Further error messages about already contained group sections suppressed\n" msgstr "" -#: readelf.c:7562 +#: readelf.c:7909 #, c-format msgid "section 0 in group section [%5u]\n" msgstr "グループセクション [%5u] にセクション 0 があります\n" -#: readelf.c:7629 +#: readelf.c:7976 msgid "dynamic section image fixups" msgstr "動的セクションイメージ修正" -#: readelf.c:7637 +#: readelf.c:7984 #, c-format msgid "corrupt library name index of 0x%lx found in dynamic entry" msgstr "" -#: readelf.c:7642 +#: readelf.c:7989 #, c-format msgid "" "\n" "Image fixups for needed library #%d: %s - ident: %lx\n" msgstr "" -#: readelf.c:7645 +#: readelf.c:7992 #, c-format msgid "" "Seg Offset Type SymVec DataType\n" msgstr "" -#: readelf.c:7679 +#: readelf.c:8026 msgid "dynamic section image relocations" msgstr "" -#: readelf.c:7683 +#: readelf.c:8030 #, c-format msgid "" "\n" @@ -7679,18 +7680,18 @@ "\n" "イメージ再配置\n" -#: readelf.c:7685 +#: readelf.c:8032 #, c-format msgid "" "Seg Offset Type Addend Seg Sym Off\n" msgstr "" "Seg Offset 型 Addend Seg Sym Off\n" -#: readelf.c:7742 +#: readelf.c:8089 msgid "dynamic string section" msgstr "動的文字列セクション" -#: readelf.c:7849 +#: readelf.c:8197 #, c-format msgid "" "\n" @@ -7699,7 +7700,7 @@ "\n" "オフセット0x%2$lx にある '%1$s' 再配置セクションは %3$ld バイトで構成されています:\n" -#: readelf.c:7873 +#: readelf.c:8221 #, c-format msgid "" "\n" @@ -7708,7 +7709,7 @@ "\n" "このファイルには動的再配置がありません。\n" -#: readelf.c:7902 +#: readelf.c:8251 #, c-format msgid "" "\n" @@ -7717,28 +7718,28 @@ "\n" "再配置セクション " -#: readelf.c:7910 +#: readelf.c:8259 #, c-format msgid " at offset 0x%lx contains %lu entry:\n" msgid_plural " at offset 0x%lx contains %lu entries:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:7962 +#: readelf.c:8311 #, c-format msgid "" "\n" "There are no static relocations in this file." msgstr "" -#: readelf.c:7963 +#: readelf.c:8312 #, c-format msgid "" "\n" "To see the dynamic relocations add --use-dynamic to the command line.\n" msgstr "" -#: readelf.c:7974 +#: readelf.c:8323 #, c-format msgid "" "\n" @@ -7747,50 +7748,50 @@ "\n" "このファイルには再配置されるものがありません。\n" -#: readelf.c:8142 +#: readelf.c:8491 #, c-format msgid "Invalid section %u in table entry %ld\n" msgstr "" -#: readelf.c:8154 +#: readelf.c:8503 #, c-format msgid "Invalid offset %lx in table entry %ld\n" msgstr "" -#: readelf.c:8172 +#: readelf.c:8521 #, c-format msgid "\tUnknown version.\n" msgstr "\t不明なバージョンです。\n" -#: readelf.c:8235 readelf.c:8669 +#: readelf.c:8584 readelf.c:9021 msgid "unwind table" msgstr "巻き戻し (unwind) 表" -#: readelf.c:8286 readelf.c:8752 +#: readelf.c:8635 readelf.c:9104 #, c-format msgid "Skipping unknown relocation type: %u\n" msgstr "" -#: readelf.c:8292 readelf.c:8759 +#: readelf.c:8641 readelf.c:9111 #, c-format msgid "Skipping unexpected relocation type: %s\n" msgstr "" -#: readelf.c:8301 readelf.c:8766 +#: readelf.c:8650 readelf.c:9118 #, c-format msgid "Skipping reloc with overlarge offset: %lx\n" msgstr "" -#: readelf.c:8308 readelf.c:8773 +#: readelf.c:8657 readelf.c:9125 #, c-format msgid "Skipping reloc with invalid symbol index: %u\n" msgstr "" -#: readelf.c:7577 readelf.c:8020 +#: readelf.c:7807 readelf.c:8271 msgid "Multiple auxillary string tables encountered\n" msgstr "" -#: readelf.c:8371 readelf.c:8836 readelf.c:9943 +#: readelf.c:8720 readelf.c:9188 readelf.c:10297 #, c-format msgid "" "\n" @@ -7799,18 +7800,18 @@ "\n" "このファイルにはスタック巻き戻し (unwind) セクションがありません。\n" -#: readelf.c:8454 +#: readelf.c:8806 #, c-format msgid "" "\n" "Could not find unwind info section for " msgstr "" -#: readelf.c:8466 +#: readelf.c:8818 msgid "unwind info" msgstr "巻き戻し (unwind) 情報" -#: readelf.c:8469 +#: readelf.c:8821 #, c-format msgid "" "\n" @@ -7819,12 +7820,12 @@ "\n" "巻き戻し (unwind) セクション " -#: readelf.c:8476 +#: readelf.c:8828 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr " (オフセット 0x%lx) は %lu 個のエントリから構成されています:\n" -#: readelf.c:8845 readelf.c:9950 +#: readelf.c:9197 readelf.c:10304 #, c-format msgid "" "\n" @@ -7835,193 +7836,193 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:8978 +#: readelf.c:9330 msgid "unwind data" msgstr "巻き戻し (unwind) データ" -#: readelf.c:9051 +#: readelf.c:9403 #, c-format msgid "Skipping unexpected relocation at offset 0x%lx\n" msgstr "オフセット 0x%lx にある予期しない再配置をスキップしています\n" -#: readelf.c:9073 +#: readelf.c:9425 #, c-format msgid "Unknown section relocation type %d encountered\n" msgstr "" -#: readelf.c:9081 +#: readelf.c:9433 #, c-format msgid "Bad symbol index in unwind relocation (%lu > %lu)\n" msgstr "" -#: readelf.c:9096 +#: readelf.c:9448 #, c-format msgid "Skipping unknown ARM relocation type: %d\n" msgstr "" -#: readelf.c:9106 +#: readelf.c:9458 #, c-format msgid "Skipping unexpected ARM relocation type %s\n" msgstr "" -#: readelf.c:9115 +#: readelf.c:9467 #, c-format msgid "Skipping unknown C6000 relocation type: %d\n" msgstr "" -#: readelf.c:9125 +#: readelf.c:9477 #, c-format msgid "Skipping unexpected C6000 relocation type %s\n" msgstr "" #. This function currently only supports ARM and TI unwinders. -#: readelf.c:9134 +#: readelf.c:9486 msgid "Only TI and ARM unwinders are currently supported\n" msgstr "" -#: readelf.c:9197 +#: readelf.c:9549 #, c-format msgid "[Truncated opcode]\n" msgstr "[切り詰められたオペコード]\n" -#: readelf.c:9245 readelf.c:9461 +#: readelf.c:9597 readelf.c:9815 #, c-format msgid "Refuse to unwind" msgstr "巻き戻し (unwind) 拒否" -#: readelf.c:9268 +#: readelf.c:9620 #, c-format msgid " [Reserved]" msgstr " [予約]" -#: readelf.c:9296 +#: readelf.c:9648 #, c-format msgid " finish" msgstr " 終了" -#: readelf.c:9301 readelf.c:9394 +#: readelf.c:9653 readelf.c:9748 #, c-format msgid "[Spare]" msgstr "" -#: readelf.c:8538 +#: readelf.c:8789 msgid "corrupt change to vsp" msgstr "" -#: readelf.c:9416 readelf.c:9573 +#: readelf.c:9770 readelf.c:9927 #, c-format msgid " [unsupported opcode]" msgstr " [サポートされないオペコード]" -#: readelf.c:9509 +#: readelf.c:9863 #, c-format msgid "pop frame {" msgstr "" -#: readelf.c:9512 +#: readelf.c:9866 #, c-format msgid "*corrupt* - no registers specified" msgstr "" -#: readelf.c:9526 +#: readelf.c:9880 msgid "[pad]" msgstr "" -#: readelf.c:9555 +#: readelf.c:9909 msgid "Corrupt stack pointer adjustment detected\n" msgstr "" -#: readelf.c:9562 +#: readelf.c:9916 #, c-format msgid "sp = sp + %ld" msgstr "sp = sp + %ld" -#: readelf.c:9637 +#: readelf.c:9991 #, c-format msgid " Personality routine: " msgstr "" -#: readelf.c:9669 +#: readelf.c:10023 #, c-format msgid " [Truncated data]\n" msgstr " [切り詰められたデータ]\n" -#: readelf.c:9693 +#: readelf.c:10047 #, c-format msgid "Corrupt ARM compact model table entry: %x \n" msgstr "" -#: readelf.c:9698 +#: readelf.c:10052 #, c-format msgid " Compact model index: %d\n" msgstr "" -#: readelf.c:9724 +#: readelf.c:10078 msgid "Unknown ARM compact model index encountered\n" msgstr "" -#: readelf.c:9725 +#: readelf.c:10079 #, c-format msgid " [reserved]\n" msgstr " [予約]\n" -#: readelf.c:9740 +#: readelf.c:10094 #, c-format msgid " Restore stack from frame pointer\n" msgstr "" -#: readelf.c:9742 +#: readelf.c:10096 #, c-format msgid " Stack increment %d\n" msgstr "" -#: readelf.c:9743 +#: readelf.c:10097 #, c-format msgid " Registers restored: " msgstr "" -#: readelf.c:9748 +#: readelf.c:10102 #, c-format msgid " Return register: %s\n" msgstr " 戻りレジスタ: %s\n" -#: readelf.c:9752 +#: readelf.c:10106 #, c-format msgid " [reserved (%d)]\n" msgstr " [予約 (%d)]\n" -#: readelf.c:9756 +#: readelf.c:10110 #, c-format msgid "" "Unsupported architecture type %d encountered when decoding unwind table\n" msgstr "" -#: readelf.c:9811 +#: readelf.c:10165 #, c-format msgid "corrupt index table entry: %x\n" msgstr "" -#: readelf.c:9851 +#: readelf.c:10205 #, c-format msgid "Unwind entry contains corrupt offset (0x%lx) into section %s\n" msgstr "" -#: readelf.c:9867 +#: readelf.c:10221 #, c-format msgid "Could not locate .ARM.extab section containing 0x%lx.\n" msgstr "0x%lx を含む .ARM.extab セクションを配置できません\n" -#: readelf.c:9911 +#: readelf.c:10265 #, c-format msgid "" "Unsupported architecture type %d encountered when processing unwind table\n" msgstr "" -#: readelf.c:9125 +#: readelf.c:9388 msgid "Multiple string tables found in file.\n" msgstr "" -#: readelf.c:10003 +#: readelf.c:10357 #, c-format msgid "" "\n" @@ -8029,37 +8030,37 @@ "supported.\n" msgstr "" -#: readelf.c:10030 +#: readelf.c:10384 #, c-format msgid "NONE" msgstr "" -#: readelf.c:10055 +#: readelf.c:10409 #, c-format msgid "Interface Version: %s" msgstr "" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:10062 +#: readelf.c:10416 #, c-format msgid "" msgstr "" -#: readelf.c:10080 +#: readelf.c:10434 #, c-format msgid "Time Stamp: %s" msgstr "" -#: readelf.c:10274 readelf.c:10324 +#: readelf.c:10628 readelf.c:10678 msgid "dynamic section" msgstr "動的セクション" -#: readelf.c:10294 readelf.c:10345 +#: readelf.c:10648 readelf.c:10699 #, c-format msgid "Out of memory allocating space for %lu dynamic entries\n" msgstr "" -#: readelf.c:10714 +#: readelf.c:11068 #, c-format msgid "" "\n" @@ -8069,7 +8070,7 @@ "このファイルには動的セクションがありません。\n" #. See PR 21379 for a reproducer. -#: readelf.c:9597 +#: readelf.c:9880 #, c-format msgid "Invalid DT_SYMTAB entry: %lx" msgstr "" @@ -8078,11 +8079,11 @@ msgid "Multiple dynamic symbol table sections found\n" msgstr "" -#: readelf.c:9615 +#: readelf.c:9903 msgid "Unable to determine the number of symbols to load\n" msgstr "ロードすべきシンボルの数を決定できません\n" -#: readelf.c:9651 +#: readelf.c:9939 msgid "Unable to determine the length of the dynamic string table\n" msgstr "動的文字列テーブルの長さを決定できません\n" @@ -8090,29 +8091,29 @@ msgid "Multiple dynamic string tables found\n" msgstr "" -#: readelf.c:10851 +#: readelf.c:11205 msgid "dynamic string table" msgstr "動的文字列表" -#: readelf.c:10879 +#: readelf.c:11233 #, c-format msgid "Bad value (%d) for SYMINENT entry\n" msgstr "" -#: readelf.c:10898 +#: readelf.c:11252 msgid "symbol information" msgstr "シンボル情報" -#: readelf.c:10904 +#: readelf.c:11258 msgid "Multiple dynamic symbol information sections found\n" msgstr "" -#: readelf.c:9705 +#: readelf.c:10003 #, c-format msgid "Out of memory allocating %lu byte for dynamic symbol info\n" msgstr "" -#: readelf.c:10632 +#: readelf.c:11295 #, c-format msgid "" "\n" @@ -8123,87 +8124,87 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:10957 +#: readelf.c:11302 #, c-format msgid " Tag Type Name/Value\n" msgstr " タグ タイプ 名前/値\n" -#: readelf.c:10991 +#: readelf.c:11336 #, c-format msgid "Auxiliary library" msgstr "補助ライブラリ" -#: readelf.c:10995 +#: readelf.c:11340 #, c-format msgid "Filter library" msgstr "フィルタライブラリ" -#: readelf.c:10999 +#: readelf.c:11344 #, c-format msgid "Configuration file" msgstr "設定ファイル" -#: readelf.c:11003 +#: readelf.c:11348 #, c-format msgid "Dependency audit library" msgstr "依存関係監査ライブラリ" -#: readelf.c:11007 +#: readelf.c:11352 #, c-format msgid "Audit library" msgstr "監査ライブラリ" -#: readelf.c:11026 readelf.c:11054 readelf.c:11082 readelf.c:11417 +#: readelf.c:11371 readelf.c:11399 readelf.c:11427 readelf.c:11767 #, c-format msgid "Flags:" msgstr "フラグ:" -#: readelf.c:11029 readelf.c:11057 readelf.c:11084 readelf.c:11419 +#: readelf.c:11374 readelf.c:11402 readelf.c:11429 readelf.c:11769 #, c-format msgid " None\n" msgstr " 無し\n" -#: readelf.c:11290 +#: readelf.c:11636 #, c-format msgid "Shared library: [%s]" msgstr "共有ライブラリ: [%s]" -#: readelf.c:11294 +#: readelf.c:11640 #, c-format msgid " program interpreter" msgstr " プログラムインタプリタ" -#: readelf.c:11298 +#: readelf.c:11644 #, c-format msgid "Library soname: [%s]" msgstr "ライブラリの soname: [%s]" -#: readelf.c:11302 +#: readelf.c:11648 #, c-format msgid "Library rpath: [%s]" msgstr "ライブラリの rpath: [%s]" -#: readelf.c:11306 +#: readelf.c:11652 #, c-format msgid "Library runpath: [%s]" msgstr "ライブラリの runpath: [%s]" -#: readelf.c:11340 +#: readelf.c:11689 #, c-format msgid " (bytes)\n" msgstr " (バイト)\n" -#: readelf.c:11370 +#: readelf.c:11720 #, c-format msgid "Not needed object: [%s]\n" msgstr "不要なオブジェクト: [%s]\n" -#: readelf.c:11395 +#: readelf.c:11745 #, c-format msgid ": %d" msgstr "" -#: readelf.c:12348 +#: readelf.c:12723 #, c-format msgid ": %x" msgstr "<その他>: %x" -#: readelf.c:12388 +#: readelf.c:12763 #, c-format msgid "bad section index[%3d]" msgstr "" -#: readelf.c:10419 +#: readelf.c:10773 #, c-format msgid "Size truncation prevents reading %s elements of size %u\n" msgstr "" -#: readelf.c:10428 +#: readelf.c:10782 #, c-format msgid "Invalid number of dynamic entries: %s\n" msgstr "" -#: readelf.c:10436 +#: readelf.c:10790 #, c-format msgid "Out of memory reading %s dynamic entries\n" msgstr "" -#: readelf.c:10443 +#: readelf.c:10797 #, c-format msgid "Unable to read in %s bytes of dynamic data\n" msgstr "" -#: readelf.c:10452 +#: readelf.c:10806 #, c-format msgid "Out of memory allocating space for %s dynamic entries\n" msgstr "" -#: readelf.c:11127 +#: readelf.c:11479 #, c-format msgid "\n" msgstr "" -#: readelf.c:11159 +#: readelf.c:11511 #, c-format msgid " " msgstr " <破損: %14ld>" -#: readelf.c:12421 +#: readelf.c:12796 msgid "version data" msgstr "バージョンデータ" -#: readelf.c:12533 +#: readelf.c:12908 msgid "version need aux (3)" msgstr "必要バージョン補助 (3)" -#: readelf.c:10492 readelf.c:10546 readelf.c:10570 readelf.c:10603 -#: readelf.c:10629 readelf.c:10648 +#: readelf.c:10846 readelf.c:10900 readelf.c:10924 readelf.c:10957 +#: readelf.c:10983 readelf.c:11002 msgid "Unable to seek to start of dynamic information\n" msgstr "動的情報の開始位置まで探査 (seek) できません\n" -#: readelf.c:10498 readelf.c:10552 +#: readelf.c:10852 readelf.c:10906 msgid "Failed to read in number of buckets\n" msgstr "バケット数の読込みに失敗しました\n" -#: readelf.c:10504 +#: readelf.c:10858 msgid "Failed to read in number of chains\n" msgstr "チェイン数の読込みに失敗しました\n" -#: readelf.c:10611 +#: readelf.c:10965 msgid "Failed to determine last chain length\n" msgstr "最後のチェイン長の決定に失敗しました\n" -#: readelf.c:11526 +#: readelf.c:11914 #, c-format msgid "" "\n" @@ -8514,17 +8515,17 @@ "\n" "イメージのシンボル表:\n" -#: readelf.c:11528 readelf.c:11554 +#: readelf.c:11916 readelf.c:11943 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr " bucket数: 値 サイズ タイプ Bind Vis 索引名\n" -#: readelf.c:11530 readelf.c:11556 +#: readelf.c:11918 readelf.c:11945 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr " bucket数: 値 サイズ タイプ Bind Vis 索引名\n" -#: readelf.c:13109 +#: readelf.c:13489 msgid "histogram chain is corrupt\n" msgstr "" @@ -8535,7 +8536,7 @@ "Symbol table of `%s' for image:\n" msgstr "" -#: readelf.c:13011 +#: readelf.c:13391 #, c-format msgid "" "\n" @@ -8544,7 +8545,7 @@ "\n" "シンボル表 '%s' の sh_entsize が 0 です!\n" -#: readelf.c:13026 +#: readelf.c:13406 #, c-format msgid "" "\n" @@ -8555,22 +8556,22 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12980 readelf.c:13033 +#: readelf.c:13360 readelf.c:13413 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr " 番号: 値 サイズ タイプ Bind Vis 索引名\n" -#: readelf.c:12982 readelf.c:13035 +#: readelf.c:13362 readelf.c:13415 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr " 番号: 値 サイズ タイプ Bind Vis 索引名\n" -#: readelf.c:11687 +#: readelf.c:12079 #, c-format msgid "local symbol %u found at index >= %s's sh_info value of %u\n" msgstr "" -#: readelf.c:13069 +#: readelf.c:13449 #, c-format msgid "" "\n" @@ -8579,7 +8580,7 @@ "\n" "動的シンボル情報は表示用シンボルとしては利用できません。\n" -#: readelf.c:13082 +#: readelf.c:13462 #, c-format msgid "" "\n" @@ -8590,20 +8591,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13093 +#: readelf.c:13473 msgid "Out of memory allocating space for histogram buckets\n" msgstr "" -#: readelf.c:13099 readelf.c:13177 +#: readelf.c:13479 readelf.c:13557 #, c-format msgid " Length Number %% of total Coverage\n" msgstr " 長さ 個数 占有率 範囲\n" -#: readelf.c:13121 +#: readelf.c:13501 msgid "Out of memory allocating space for histogram counts\n" msgstr "" -#: readelf.c:13161 +#: readelf.c:13541 #, c-format msgid "" "\n" @@ -8614,15 +8615,15 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13173 +#: readelf.c:13553 msgid "Out of memory allocating space for gnu histogram buckets\n" msgstr "" -#: readelf.c:13200 +#: readelf.c:13580 msgid "Out of memory allocating space for gnu histogram counts\n" msgstr "" -#: readelf.c:13273 +#: readelf.c:13653 #, c-format msgid "" "\n" @@ -8633,98 +8634,98 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13281 +#: readelf.c:13661 #, c-format msgid " Num: Name BoundTo Flags\n" msgstr " 番号: 名前 境界まで フラグ\n" -#: readelf.c:13288 +#: readelf.c:13668 #, c-format msgid "" msgstr "<破損した索引>" -#: readelf.c:13293 +#: readelf.c:13673 #, c-format msgid "" msgstr "<破損: %19ld>" -#: readelf.c:13390 +#: readelf.c:13770 #, c-format msgid "MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13441 +#: readelf.c:13821 #, c-format msgid "MSP430 reloc contains invalid symbol index %lu\n" msgstr "" #. PR 21137 -#: readelf.c:13452 +#: readelf.c:13832 #, c-format msgid "MSP430 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13463 +#: readelf.c:13843 msgid "Unhandled MSP430 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:13486 +#: readelf.c:13866 #, c-format msgid "MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13500 +#: readelf.c:13880 #, c-format msgid "MN10300 reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13510 +#: readelf.c:13890 #, c-format msgid "MN10300 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13520 +#: readelf.c:13900 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:13543 +#: readelf.c:13923 #, c-format msgid "RL78_SYM reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13562 readelf.c:13571 +#: readelf.c:13942 readelf.c:13951 #, c-format msgid "RL78 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13790 +#: readelf.c:14172 #, c-format msgid "" "Missing knowledge of 32-bit reloc types used in DWARF sections of machine " "number %d\n" msgstr "マシン番号 %d の DWARF セクション内で使用される 32ビット再配置型に関する知識がありません。\n" -#: readelf.c:14473 +#: readelf.c:14857 #, c-format msgid "unable to apply unsupported reloc type %d to section %s\n" msgstr "セクション %2$s にサポートされていない再配置型 %1$d を適用できません\n" -#: readelf.c:14482 +#: readelf.c:14866 #, c-format msgid "skipping invalid relocation offset 0x%lx in section %s\n" msgstr "セクション %2$s 内にある無効な再配置オフセット 0x%1$lx　をスキップしています\n" -#: readelf.c:14491 +#: readelf.c:14875 #, c-format msgid "skipping invalid relocation symbol index 0x%lx in section %s\n" msgstr "" -#: readelf.c:14514 +#: readelf.c:14898 #, c-format msgid "skipping unexpected symbol type %s in section %s relocation %ld\n" msgstr "" -#: readelf.c:14591 +#: readelf.c:14975 #, c-format msgid "" "\n" @@ -8733,16 +8734,16 @@ "\n" "セクション %s のアセンブリダンプ\n" -#: readelf.c:14609 +#: readelf.c:14993 #, c-format msgid "Section '%s' has no data to dump.\n" msgstr "" -#: readelf.c:14615 +#: readelf.c:14999 msgid "section contents" msgstr "セクションの内容" -#: readelf.c:14695 +#: readelf.c:15079 #, c-format msgid "" "\n" @@ -8751,35 +8752,35 @@ "\n" "セクション '%s' の文字列ダンプ:\n" -#: readelf.c:14716 readelf.c:14932 readelf.c:15355 +#: readelf.c:15100 readelf.c:15316 readelf.c:15703 #, c-format msgid "section '%s' has unsupported compress type: %d\n" msgstr "" -#: readelf.c:14748 readelf.c:14966 readelf.c:15392 +#: readelf.c:15132 readelf.c:15350 readelf.c:15740 #, c-format msgid "Unable to decompress section %s\n" msgstr "" -#: readelf.c:14773 +#: readelf.c:15157 #, c-format msgid "" " Note: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr " 備考: このセクションは再配置がありますが、このダンプには適用されていません。\n" -#: readelf.c:14866 readelf.c:16353 readelf.c:16393 readelf.c:16431 -#: readelf.c:16478 readelf.c:16509 readelf.c:18113 readelf.c:18145 +#: readelf.c:15250 readelf.c:16726 readelf.c:16766 readelf.c:16804 +#: readelf.c:16851 readelf.c:16882 readelf.c:18488 readelf.c:18520 #, c-format msgid "\n" msgstr "" -#: readelf.c:14874 +#: readelf.c:15258 #, c-format msgid " No strings found in this section." msgstr " このセクション内では文字列が見つかりませんでした。" -#: readelf.c:14911 +#: readelf.c:15295 #, c-format msgid "" "\n" @@ -8788,49 +8789,49 @@ "\n" "セクション '%s' の 十六進数ダンプ:\n" -#: readelf.c:14999 +#: readelf.c:15383 #, c-format msgid "" " NOTE: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr " 備考: このセクションには再配置がありますが、このダンプには適用されていません。\n" -#: readelf.c:15190 +#: readelf.c:15569 #, c-format msgid "No symbol section named %s\n" msgstr "" -#: readelf.c:15206 +#: readelf.c:15585 #, c-format msgid "No string table section named %s\n" msgstr "" -#: readelf.c:15213 +#: readelf.c:15592 msgid "strings" msgstr "" -#: readelf.c:15223 +#: readelf.c:15227 #, c-format msgid "No CTF parent section named %s\n" msgstr "" -#: readelf.c:15229 +#: readelf.c:15233 msgid "CTF parent" msgstr "" -#: readelf.c:15280 +#: readelf.c:15628 #, c-format msgid "" "\n" "Dump of CTF section '%s':\n" msgstr "" -#: readelf.c:15319 +#: readelf.c:15667 #, c-format msgid "%s section data" msgstr "%s セクションデータ" -#: readelf.c:13490 +#: readelf.c:14125 #, c-format msgid "compressed section %s is too small to contain a compression header" msgstr "" @@ -8848,12 +8849,12 @@ msgid "debuginfod: note with invalid namesz and/or descsz found\n" msgstr "" -#: readelf.c:20906 +#: readelf.c:21363 #, c-format msgid " type: 0x%lx, namesize: 0x%08lx, descsize: 0x%08lx, alignment: %u\n" msgstr "" -#: readelf.c:15644 +#: readelf.c:15993 #, c-format msgid "" "\n" @@ -8866,533 +8867,533 @@ #. which has the NOBITS type - the bits in the file will be random. #. This can happen when a file containing a .eh_frame section is #. stripped with the --only-keep-debug command line option. -#: readelf.c:15653 +#: readelf.c:16002 #, c-format msgid "section '%s' has the NOBITS type - its contents are unreliable.\n" msgstr "セクション '%s' は NOBITS 型です - 内容は信頼できません\n" -#: readelf.c:15703 +#: readelf.c:16052 #, c-format msgid "Unrecognized debug section: %s\n" msgstr "認識できないでバッグセクションです: %s\n" -#: readelf.c:15290 +#: readelf.c:14507 #, c-format msgid "Section '%s' was not dumped because it does not exist!\n" msgstr "セクション '%s' は存在しないためダンプされませんでした!\n" -#: readelf.c:15805 +#: readelf.c:16155 #, c-format msgid "Section %d was not dumped because it does not exist!\n" msgstr "セクション %d は存在しないためダンプされませんでした!\n" -#: readelf.c:15861 +#: readelf.c:16211 msgid "\n" msgstr "" -#: readelf.c:15876 +#: readelf.c:16226 #, c-format msgid "" msgstr "<破損した文字列タグ>" -#: readelf.c:15910 +#: readelf.c:16260 #, c-format msgid "Absent/Non standard\n" msgstr "" -#: readelf.c:15913 +#: readelf.c:16263 #, c-format msgid "Bare metal/mwdt\n" msgstr "" -#: readelf.c:15916 +#: readelf.c:16266 #, c-format msgid "Bare metal/newlib\n" msgstr "" -#: readelf.c:15919 +#: readelf.c:16269 #, c-format msgid "Linux/uclibc\n" msgstr "" -#: readelf.c:15922 +#: readelf.c:16272 #, c-format msgid "Linux/glibc\n" msgstr "" -#: readelf.c:15925 readelf.c:16004 +#: readelf.c:16275 readelf.c:16354 #, c-format msgid "Unknown\n" msgstr "" -#: readelf.c:15937 readelf.c:15967 readelf.c:15995 +#: readelf.c:16287 readelf.c:16317 readelf.c:16345 #, c-format msgid "Absent\n" msgstr "" -#: readelf.c:15979 +#: readelf.c:16329 msgid "yes" msgstr "" -#: readelf.c:15979 +#: readelf.c:16329 msgid "no" msgstr "" -#: readelf.c:16016 readelf.c:16023 +#: readelf.c:16366 readelf.c:16373 msgid "default" msgstr "" -#: readelf.c:16017 +#: readelf.c:16367 msgid "smallest" msgstr "" -#: readelf.c:16022 +#: readelf.c:16372 msgid "OPTFP" msgstr "" -#: readelf.c:16220 readelf.c:16233 readelf.c:16251 readelf.c:16772 -#: readelf.c:17051 readelf.c:17063 readelf.c:17075 +#: readelf.c:16593 readelf.c:16606 readelf.c:16624 readelf.c:17145 +#: readelf.c:17424 readelf.c:17436 readelf.c:17448 #, c-format msgid "None\n" msgstr "なし\n" -#: readelf.c:16221 +#: readelf.c:16594 #, c-format msgid "Application\n" msgstr "アプリケーション\n" -#: readelf.c:16222 +#: readelf.c:16595 #, c-format msgid "Realtime\n" msgstr "リアルタイム\n" -#: readelf.c:16223 +#: readelf.c:16596 #, c-format msgid "Microcontroller\n" msgstr "マイクロコントローラ\n" -#: readelf.c:16224 +#: readelf.c:16597 #, c-format msgid "Application or Realtime\n" msgstr "アプリケーションまたはリアルタイム\n" -#: readelf.c:16234 readelf.c:16253 readelf.c:16824 readelf.c:16841 -#: readelf.c:16912 readelf.c:16932 readelf.c:19716 +#: readelf.c:16607 readelf.c:16626 readelf.c:17197 readelf.c:17214 +#: readelf.c:17285 readelf.c:17305 readelf.c:20136 #, c-format msgid "8-byte\n" msgstr "8-バイト\n" -#: readelf.c:16235 readelf.c:16915 readelf.c:16935 readelf.c:19715 +#: readelf.c:16608 readelf.c:17288 readelf.c:17308 readelf.c:20135 #, c-format msgid "4-byte\n" msgstr "4-バイト\n" -#: readelf.c:16239 readelf.c:16257 +#: readelf.c:16612 readelf.c:16630 #, c-format msgid "8-byte and up to %d-byte extended\n" msgstr "8-バイトおよび %d-バイトまでの拡張\n" -#: readelf.c:16252 +#: readelf.c:16625 #, c-format msgid "8-byte, except leaf SP\n" msgstr "末端の SP を除き 8-バイト\n" -#: readelf.c:16268 readelf.c:16350 readelf.c:16950 +#: readelf.c:16641 readelf.c:16723 readelf.c:17323 #, c-format msgid "flag = %d, vendor = " msgstr "" -#: readelf.c:16289 +#: readelf.c:16662 #, c-format msgid "True\n" msgstr "" -#: readelf.c:16309 +#: readelf.c:16682 #, c-format msgid "\n" msgstr "" -#: readelf.c:16354 +#: readelf.c:16727 msgid "corrupt vendor attribute\n" msgstr "" -#: readelf.c:16442 +#: readelf.c:16815 #, c-format msgid "unspecified hard/soft float, " msgstr "" -#: readelf.c:16445 +#: readelf.c:16818 #, c-format msgid "hard float, " msgstr "" -#: readelf.c:16448 +#: readelf.c:16821 #, c-format msgid "soft float, " msgstr "" -#: readelf.c:16451 +#: readelf.c:16824 #, c-format msgid "single-precision hard float, " msgstr "" -#: readelf.c:16458 +#: readelf.c:16831 #, c-format msgid "unspecified long double\n" msgstr "" -#: readelf.c:16461 +#: readelf.c:16834 #, c-format msgid "128-bit IBM long double\n" msgstr "" -#: readelf.c:16464 +#: readelf.c:16837 #, c-format msgid "64-bit long double\n" msgstr "" -#: readelf.c:16467 +#: readelf.c:16840 #, c-format msgid "128-bit IEEE long double\n" msgstr "" -#: readelf.c:16489 readelf.c:16520 +#: readelf.c:16862 readelf.c:16893 #, c-format msgid "unspecified\n" msgstr "" -#: readelf.c:16492 +#: readelf.c:16865 #, c-format msgid "generic\n" msgstr "" -#: readelf.c:16526 +#: readelf.c:16899 #, c-format msgid "memory\n" msgstr "メモリ\n" -#: readelf.c:16553 +#: readelf.c:16926 #, c-format msgid "any\n" msgstr "" -#: readelf.c:16556 +#: readelf.c:16929 #, c-format msgid "software\n" msgstr "" -#: readelf.c:16559 +#: readelf.c:16932 #, c-format msgid "hardware\n" msgstr "" -#: readelf.c:16682 +#: readelf.c:17055 #, c-format msgid "Hard or soft float\n" msgstr "ハードウェアまたはソフトウェア浮動小数\n" -#: readelf.c:16685 +#: readelf.c:17058 #, c-format msgid "Hard float (double precision)\n" msgstr "ハードウェア浮動小数 (倍精度)\n" -#: readelf.c:16688 +#: readelf.c:17061 #, c-format msgid "Hard float (single precision)\n" msgstr "ハードウェア浮動小数 (単精度)\n" -#: readelf.c:16691 +#: readelf.c:17064 #, c-format msgid "Soft float\n" msgstr "ソフトウェア浮動小数\n" -#: readelf.c:16694 +#: readelf.c:17067 #, c-format msgid "Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n" msgstr "" -#: readelf.c:16697 +#: readelf.c:17070 #, c-format msgid "Hard float (32-bit CPU, Any FPU)\n" msgstr "" -#: readelf.c:16700 +#: readelf.c:17073 #, c-format msgid "Hard float (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:16703 +#: readelf.c:17076 #, c-format msgid "Hard float compat (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:16706 +#: readelf.c:17079 #, c-format msgid "NaN 2008 compatibility\n" msgstr "" -#: readelf.c:16739 +#: readelf.c:17112 #, c-format msgid "Any MSA or not\n" msgstr "" -#: readelf.c:16742 +#: readelf.c:17115 #, c-format msgid "128-bit MSA\n" msgstr "" -#: readelf.c:16804 +#: readelf.c:17177 #, c-format msgid "Not used\n" msgstr "未使用\n" -#: readelf.c:16807 +#: readelf.c:17180 #, c-format msgid "2 bytes\n" msgstr "2 バイト\n" -#: readelf.c:16810 +#: readelf.c:17183 #, c-format msgid "4 bytes\n" msgstr "4 バイト\n" -#: readelf.c:16827 readelf.c:16844 readelf.c:16918 readelf.c:16938 +#: readelf.c:17200 readelf.c:17217 readelf.c:17291 readelf.c:17311 #, c-format msgid "16-byte\n" msgstr "16-バイト\n" -#: readelf.c:16858 +#: readelf.c:17231 #, c-format msgid "DSBT addressing not used\n" msgstr "DSBT アドレスが使用されていません\n" -#: readelf.c:16861 +#: readelf.c:17234 #, c-format msgid "DSBT addressing used\n" msgstr "DSBT アドレスが使用されています\n" -#: readelf.c:16875 +#: readelf.c:17248 #, c-format msgid "Data addressing position-dependent\n" msgstr "データアドレスが位置依存です\n" -#: readelf.c:16878 +#: readelf.c:17251 #, c-format msgid "Data addressing position-independent, GOT near DP\n" msgstr "データアドレスが位置非依存で、 GOT が DP の近くにあります\n" -#: readelf.c:16881 +#: readelf.c:17254 #, c-format msgid "Data addressing position-independent, GOT far from DP\n" msgstr "データアドレスが位置非依存で、GOT が DP の遠くにあります\n" -#: readelf.c:16895 +#: readelf.c:17268 #, c-format msgid "Code addressing position-dependent\n" msgstr "コードアドレスが位置依存です\n" -#: readelf.c:16898 +#: readelf.c:17271 #, c-format msgid "Code addressing position-independent\n" msgstr "コードアドレスが位置非依存です\n" -#: readelf.c:17052 +#: readelf.c:17425 #, c-format msgid "MSP430\n" msgstr "MSP430\n" -#: readelf.c:17053 +#: readelf.c:17426 #, c-format msgid "MSP430X\n" msgstr "MSP430X\n" -#: readelf.c:17064 readelf.c:17076 +#: readelf.c:17437 readelf.c:17449 #, c-format msgid "Small\n" msgstr "" -#: readelf.c:17065 readelf.c:17077 +#: readelf.c:17438 readelf.c:17450 #, c-format msgid "Large\n" msgstr "" -#: readelf.c:17078 +#: readelf.c:17451 #, c-format msgid "Restricted Large\n" msgstr "" -#: readelf.c:17084 +#: readelf.c:17457 #, c-format msgid " : " msgstr "" -#: readelf.c:17130 +#: readelf.c:17503 #, c-format msgid "Any Region\n" msgstr "" -#: readelf.c:17133 +#: readelf.c:17506 #, c-format msgid "Lower Region Only\n" msgstr "" -#: readelf.c:17192 +#: readelf.c:17565 #, c-format msgid "%u\n" msgstr "" -#: readelf.c:17199 +#: readelf.c:17572 #, c-format msgid "No unaligned access\n" msgstr "" -#: readelf.c:17202 +#: readelf.c:17575 #, c-format msgid "Unaligned access\n" msgstr "" -#: readelf.c:17208 +#: readelf.c:17581 #, c-format msgid "%u-bytes\n" msgstr "" -#: readelf.c:17347 +#: readelf.c:17723 msgid "attributes" msgstr "属性" -#: readelf.c:17359 +#: readelf.c:17735 #, c-format msgid "Unknown attributes version '%c'(%d) - expecting 'A'\n" msgstr "" -#: readelf.c:17378 +#: readelf.c:17754 msgid "Tag section ends prematurely\n" msgstr "" -#: readelf.c:17387 +#: readelf.c:17763 #, c-format msgid "Bad attribute length (%u > %u)\n" msgstr "" -#: readelf.c:17395 +#: readelf.c:17771 #, c-format msgid "Attribute length of %u is too small\n" msgstr "" -#: readelf.c:17406 +#: readelf.c:17782 msgid "Corrupt attribute section name\n" msgstr "" -#: readelf.c:17411 +#: readelf.c:17787 #, c-format msgid "Attribute Section: " msgstr "" -#: readelf.c:17438 +#: readelf.c:17814 msgid "Unused bytes at end of section\n" msgstr "" -#: readelf.c:17448 +#: readelf.c:17824 #, c-format msgid "Bad subsection length (%u > %u)\n" msgstr "" -#: readelf.c:17456 +#: readelf.c:17832 #, c-format msgid "Bad subsection length (%u < 6)\n" msgstr "" -#: readelf.c:17471 +#: readelf.c:17847 #, c-format msgid "File Attributes\n" msgstr "ファイル属性\n" -#: readelf.c:17474 +#: readelf.c:17850 #, c-format msgid "Section Attributes:" msgstr "セクション属性:" -#: readelf.c:17477 +#: readelf.c:17853 #, c-format msgid "Symbol Attributes:" msgstr "シンボル属性:" -#: readelf.c:17490 +#: readelf.c:17866 #, c-format msgid "Unknown tag: %d\n" msgstr "不明なタグ: %d\n" -#: readelf.c:17511 +#: readelf.c:17887 #, c-format msgid " Unknown attribute:\n" msgstr "" -#: readelf.c:17553 +#: readelf.c:17929 msgid "MIPS GOT entry extends beyond the end of available data\n" msgstr "" -#: readelf.c:17636 readelf.c:17705 +#: readelf.c:18012 readelf.c:18081 msgid "Unknown" msgstr "不明" -#: readelf.c:17752 +#: readelf.c:18128 msgid "Corrupt MIPS ABI Flags section.\n" msgstr "" -#: readelf.c:17758 +#: readelf.c:18134 msgid "MIPS ABI Flags section" msgstr "" -#: readelf.c:17817 readelf.c:18400 +#: readelf.c:18193 readelf.c:18775 msgid "Global Offset Table data" msgstr "" -#: readelf.c:17821 +#: readelf.c:18197 #, c-format msgid "" "\n" "Static GOT:\n" msgstr "" -#: readelf.c:17822 readelf.c:18405 +#: readelf.c:18198 readelf.c:18780 #, c-format msgid " Canonical gp value: " msgstr " 正準 GP 値: " -#: readelf.c:17836 readelf.c:18409 readelf.c:18539 +#: readelf.c:18212 readelf.c:18784 readelf.c:18914 #, c-format msgid " Reserved entries:\n" msgstr " 予約されたエントリ:\n" -#: readelf.c:17837 +#: readelf.c:18213 #, c-format msgid " %*s %10s %*s\n" msgstr " %*s %10s %*s\n" -#: readelf.c:17838 readelf.c:17868 readelf.c:18411 readelf.c:18439 -#: readelf.c:18457 readelf.c:18541 readelf.c:18550 +#: readelf.c:18214 readelf.c:18244 readelf.c:18786 readelf.c:18814 +#: readelf.c:18832 readelf.c:18916 readelf.c:18925 msgid "Address" msgstr "アドレス" -#: readelf.c:17838 readelf.c:17868 readelf.c:18411 readelf.c:18439 -#: readelf.c:18458 +#: readelf.c:18214 readelf.c:18244 readelf.c:18786 readelf.c:18814 +#: readelf.c:18833 msgid "Access" msgstr "" -#: readelf.c:17839 readelf.c:17869 +#: readelf.c:18215 readelf.c:18245 msgid "Value" msgstr "" -#: readelf.c:17866 readelf.c:18437 +#: readelf.c:18242 readelf.c:18812 #, c-format msgid " Local entries:\n" msgstr " 局所エントリ:\n" -#: readelf.c:17948 readelf.c:18656 +#: readelf.c:18324 readelf.c:19031 msgid "liblist section data" msgstr "" -#: readelf.c:17951 +#: readelf.c:18327 #, c-format msgid "" "\n" @@ -9403,42 +9404,42 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:17955 +#: readelf.c:18331 msgid "" " Library Time Stamp Checksum Version Flags\n" msgstr " ライブラリ タイムスタンプ Checksum バージョンフラグ\n" -#: readelf.c:17981 +#: readelf.c:18357 #, c-format msgid "" msgstr "<破損: %9ld>" -#: readelf.c:17986 +#: readelf.c:18362 msgid " NONE" msgstr "" -#: readelf.c:18037 +#: readelf.c:18412 msgid "No MIPS_OPTIONS header found\n" msgstr "" -#: readelf.c:18043 +#: readelf.c:18418 msgid "The MIPS options section is too small.\n" msgstr "" -#: readelf.c:18048 +#: readelf.c:18423 msgid "options" msgstr "オプション" -#: readelf.c:15846 +#: readelf.c:16687 msgid "Out of memory allocating space for MIPS options\n" msgstr "" -#: readelf.c:18067 +#: readelf.c:18442 #, c-format msgid "Invalid size (%u) for MIPS option\n" msgstr "" -#: readelf.c:18076 +#: readelf.c:18451 #, c-format msgid "" "\n" @@ -9449,28 +9450,28 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18114 readelf.c:18146 +#: readelf.c:18489 readelf.c:18521 msgid "Truncated MIPS REGINFO option\n" msgstr "" -#: readelf.c:18282 +#: readelf.c:18657 msgid "conflict list found without a dynamic symbol table\n" msgstr "動的シンボルテーブルが無い競合リストが見つかりました\n" -#: readelf.c:18290 +#: readelf.c:18665 #, c-format msgid "Overlarge number of conflicts detected: %lx\n" msgstr "" -#: readelf.c:18298 +#: readelf.c:18673 msgid "Out of memory allocating space for dynamic conflicts\n" msgstr "" -#: readelf.c:18308 readelf.c:18326 +#: readelf.c:18683 readelf.c:18701 msgid "conflict" msgstr "競合" -#: readelf.c:18339 +#: readelf.c:18714 #, c-format msgid "" "\n" @@ -9481,32 +9482,32 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18343 +#: readelf.c:18718 msgid " Num: Index Value Name" msgstr " 番号: 索引 値 名前" -#: readelf.c:18350 +#: readelf.c:18725 #, c-format msgid "" msgstr "" -#: readelf.c:18361 readelf.c:18487 readelf.c:18575 +#: readelf.c:18736 readelf.c:18862 readelf.c:18950 #, c-format msgid "" msgstr "<破損: %14ld>" -#: readelf.c:18384 +#: readelf.c:18759 #, c-format msgid "" "The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n" msgstr "" -#: readelf.c:18393 +#: readelf.c:18768 #, c-format msgid "Too many GOT symbols: %lu\n" msgstr "" -#: readelf.c:18404 +#: readelf.c:18779 #, c-format msgid "" "\n" @@ -9515,92 +9516,92 @@ "\n" "主 GOT:\n" -#: readelf.c:18410 +#: readelf.c:18785 #, c-format msgid " %*s %10s %*s Purpose\n" msgstr "" -#: readelf.c:18412 readelf.c:18440 readelf.c:18459 readelf.c:18541 -#: readelf.c:18551 +#: readelf.c:18787 readelf.c:18815 readelf.c:18834 readelf.c:18916 +#: readelf.c:18926 msgid "Initial" msgstr "" -#: readelf.c:18414 +#: readelf.c:18789 #, c-format msgid " Lazy resolver\n" msgstr "" -#: readelf.c:18429 +#: readelf.c:18804 #, c-format msgid " Module pointer (GNU extension)\n" msgstr " モジュールポインタ (GNU 拡張)\n" -#: readelf.c:18455 +#: readelf.c:18830 #, c-format msgid " Global entries:\n" msgstr " 大域エントリ:\n" -#: readelf.c:18460 readelf.c:18552 +#: readelf.c:18835 readelf.c:18927 msgid "Sym.Val." msgstr "シンボル値" #. Note for translators: "Ndx" = abbreviated form of "Index". -#: readelf.c:18463 readelf.c:18552 +#: readelf.c:18838 readelf.c:18927 msgid "Ndx" msgstr "" -#: readelf.c:18463 readelf.c:18552 +#: readelf.c:18838 readelf.c:18927 msgid "Name" msgstr "名前" -#: readelf.c:18473 +#: readelf.c:18848 #, c-format msgid "" msgstr "" -#: readelf.c:18490 +#: readelf.c:18865 #, c-format msgid "" msgstr "" -#: readelf.c:18531 +#: readelf.c:18906 msgid "Procedure Linkage Table data" msgstr "" -#: readelf.c:18540 +#: readelf.c:18915 #, c-format msgid " %*s %*s Purpose\n" msgstr "" -#: readelf.c:18543 +#: readelf.c:18918 #, c-format msgid " PLT lazy resolver\n" msgstr "" -#: readelf.c:18545 +#: readelf.c:18920 #, c-format msgid " Module pointer\n" msgstr "" -#: readelf.c:18548 +#: readelf.c:18923 #, c-format msgid " Entries:\n" msgstr " エントリ:\n" -#: readelf.c:18562 +#: readelf.c:18937 #, c-format msgid "" msgstr "" -#: readelf.c:18601 +#: readelf.c:18976 msgid "NDS32 elf flags section" msgstr "" -#: readelf.c:18667 +#: readelf.c:19042 msgid "liblist string table" msgstr "liblist 文字列テーブル" -#: readelf.c:18679 +#: readelf.c:19054 #, c-format msgid "" "\n" @@ -9611,391 +9612,391 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18685 +#: readelf.c:19060 msgid "" " Library Time Stamp Checksum Version Flags" msgstr " ライブラリ タイムスタンプ Checksum バージョンフラグ" -#: readelf.c:18735 +#: readelf.c:19110 msgid "NT_AUXV (auxiliary vector)" msgstr "NT_AUXV (補助ベクタ)" -#: readelf.c:18737 +#: readelf.c:19112 msgid "NT_PRSTATUS (prstatus structure)" msgstr "NT_PRSTATUS (prstatus 構造体)" -#: readelf.c:18739 +#: readelf.c:19114 msgid "NT_FPREGSET (floating point registers)" msgstr "NT_FPREGSET (浮動小数点レジスタ)" -#: readelf.c:18741 +#: readelf.c:19116 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "NT_PRPSINFO (prpsinfo 構造体)" -#: readelf.c:18743 +#: readelf.c:19118 msgid "NT_TASKSTRUCT (task structure)" msgstr "NT_TASKSTRUCT (task 構造体)" -#: readelf.c:18747 +#: readelf.c:19122 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "NT_PRXFPREG (user_xfpregs 構造体)" -#: readelf.c:18749 +#: readelf.c:19124 msgid "NT_PPC_VMX (ppc Altivec registers)" msgstr "NT_PPC_VMX (ppc Altivec レジスタ)" -#: readelf.c:18751 +#: readelf.c:19126 msgid "NT_PPC_VSX (ppc VSX registers)" msgstr "NT_PPC_VSX (ppc VSX レジスタ)" -#: readelf.c:18753 +#: readelf.c:19128 msgid "NT_PPC_TAR (ppc TAR register)" msgstr "" -#: readelf.c:18755 +#: readelf.c:19130 msgid "NT_PPC_PPR (ppc PPR register)" msgstr "" -#: readelf.c:18757 +#: readelf.c:19132 msgid "NT_PPC_DSCR (ppc DSCR register)" msgstr "" -#: readelf.c:18759 +#: readelf.c:19134 msgid "NT_PPC_EBB (ppc EBB registers)" msgstr "" -#: readelf.c:18761 +#: readelf.c:19136 msgid "NT_PPC_PMU (ppc PMU registers)" msgstr "" -#: readelf.c:18763 +#: readelf.c:19138 msgid "NT_PPC_TM_CGPR (ppc checkpointed GPR registers)" msgstr "" -#: readelf.c:18765 +#: readelf.c:19140 msgid "NT_PPC_TM_CFPR (ppc checkpointed floating point registers)" msgstr "" -#: readelf.c:18767 +#: readelf.c:19142 msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)" msgstr "" -#: readelf.c:18769 +#: readelf.c:19144 msgid "NT_PPC_TM_CVSX (ppc checkpointed VSX registers)" msgstr "" -#: readelf.c:18771 +#: readelf.c:19146 msgid "NT_PPC_TM_SPR (ppc TM special purpose registers)" msgstr "" -#: readelf.c:18773 +#: readelf.c:19148 msgid "NT_PPC_TM_CTAR (ppc checkpointed TAR register)" msgstr "" -#: readelf.c:18775 +#: readelf.c:19150 msgid "NT_PPC_TM_CPPR (ppc checkpointed PPR register)" msgstr "" -#: readelf.c:18777 +#: readelf.c:19152 msgid "NT_PPC_TM_CDSCR (ppc checkpointed DSCR register)" msgstr "" -#: readelf.c:18779 +#: readelf.c:19154 msgid "NT_386_TLS (x86 TLS information)" msgstr "" -#: readelf.c:18781 +#: readelf.c:19156 msgid "NT_386_IOPERM (x86 I/O permissions)" msgstr "" -#: readelf.c:18783 +#: readelf.c:19158 msgid "NT_X86_XSTATE (x86 XSAVE extended state)" msgstr "NT_X86_XSTATE (x86 XSAVE 拡張状態)" -#: readelf.c:18787 +#: readelf.c:19162 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)" msgstr "" -#: readelf.c:18789 +#: readelf.c:19164 msgid "NT_S390_TIMER (s390 timer register)" msgstr "NT_S390_TIMER (s390 タイマーレジスタ)" -#: readelf.c:18791 +#: readelf.c:19166 msgid "NT_S390_TODCMP (s390 TOD comparator register)" msgstr "NT_S390_TODCMP (s390 TOD 比較レジスタ)" -#: readelf.c:18793 +#: readelf.c:19168 msgid "NT_S390_TODPREG (s390 TOD programmable register)" msgstr "NT_S390_TODPREG (s390 TOD プログラム可能レジスタ)" -#: readelf.c:18795 +#: readelf.c:19170 msgid "NT_S390_CTRS (s390 control registers)" msgstr "NT_S390_CTRS (s390 制御レジスタ)" -#: readelf.c:18797 +#: readelf.c:19172 msgid "NT_S390_PREFIX (s390 prefix register)" msgstr "" -#: readelf.c:18799 +#: readelf.c:19174 msgid "NT_S390_LAST_BREAK (s390 last breaking event address)" msgstr "" -#: readelf.c:18801 +#: readelf.c:19176 msgid "NT_S390_SYSTEM_CALL (s390 system call restart data)" msgstr "" -#: readelf.c:18803 +#: readelf.c:19178 msgid "NT_S390_TDB (s390 transaction diagnostic block)" msgstr "" -#: readelf.c:18805 +#: readelf.c:19180 msgid "NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)" msgstr "" -#: readelf.c:18807 +#: readelf.c:19182 msgid "NT_S390_VXRS_HIGH (s390 vector registers 16-31)" msgstr "" -#: readelf.c:18809 +#: readelf.c:19184 msgid "NT_S390_GS_CB (s390 guarded-storage registers)" msgstr "" -#: readelf.c:18811 +#: readelf.c:19186 msgid "NT_S390_GS_BC (s390 guarded-storage broadcast control)" msgstr "" -#: readelf.c:18813 +#: readelf.c:19188 msgid "NT_ARM_VFP (arm VFP registers)" msgstr "" -#: readelf.c:18815 +#: readelf.c:19190 msgid "NT_ARM_TLS (AArch TLS registers)" msgstr "" -#: readelf.c:18817 +#: readelf.c:19192 msgid "NT_ARM_HW_BREAK (AArch hardware breakpoint registers)" msgstr "" -#: readelf.c:18819 +#: readelf.c:19194 msgid "NT_ARM_HW_WATCH (AArch hardware watchpoint registers)" msgstr "" -#: readelf.c:18831 +#: readelf.c:19212 msgid "NT_PSTATUS (pstatus structure)" msgstr "NT_PSTATUS (pstatus 構造体)" -#: readelf.c:18833 +#: readelf.c:19214 msgid "NT_FPREGS (floating point registers)" msgstr "NT_FPREGS (浮動小数点レジスタ)" -#: readelf.c:18835 +#: readelf.c:19216 msgid "NT_PSINFO (psinfo structure)" msgstr "NT_PSINFO (psinfo 構造体)" -#: readelf.c:18837 +#: readelf.c:19218 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "NT_LWPSTATUS (lwpstatus_t 構造体)" -#: readelf.c:18839 +#: readelf.c:19220 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "NT_LWPSINFO (lwpsinfo_t 構造体)" -#: readelf.c:18841 +#: readelf.c:19222 msgid "NT_WIN32PSTATUS (win32_pstatus structure)" msgstr "NT_WIN32PSTATUS (win32_pstatus 構造体)" -#: readelf.c:18843 +#: readelf.c:19224 msgid "NT_SIGINFO (siginfo_t data)" msgstr "" -#: readelf.c:18845 +#: readelf.c:19226 msgid "NT_FILE (mapped files)" msgstr "" -#: readelf.c:18855 +#: readelf.c:19234 msgid "NT_VERSION (version)" msgstr "NT_VERSION (バージョン)" -#: readelf.c:18857 +#: readelf.c:19236 msgid "NT_ARCH (architecture)" msgstr "NT_ARCH (アーキテクチャ)" -#: readelf.c:18859 +#: readelf.c:19238 msgid "OPEN" msgstr "" -#: readelf.c:18861 +#: readelf.c:19240 msgid "func" msgstr "" -#: readelf.c:18868 readelf.c:18987 readelf.c:19689 readelf.c:19857 -#: readelf.c:19934 readelf.c:20051 +#: readelf.c:19249 readelf.c:19368 readelf.c:20109 readelf.c:20277 +#: readelf.c:20374 readelf.c:20502 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "不明な備考タイプ: (0x%08x)" -#: readelf.c:18889 +#: readelf.c:19270 #, c-format msgid " Cannot decode 64-bit note in 32-bit build\n" msgstr "" -#: readelf.c:18897 +#: readelf.c:19278 msgid " Malformed note - too short for header\n" msgstr "" -#: readelf.c:18906 +#: readelf.c:19287 msgid " Malformed note - does not end with \\0\n" msgstr "" -#: readelf.c:18919 +#: readelf.c:19300 msgid " Malformed note - too short for supplied file count\n" msgstr "" -#: readelf.c:18923 +#: readelf.c:19304 #, c-format msgid " Page size: " msgstr "" -#: readelf.c:18927 +#: readelf.c:19308 #, c-format msgid " %*s%*s%*s\n" msgstr "" -#: readelf.c:18928 +#: readelf.c:19309 msgid "Start" msgstr "" -#: readelf.c:18929 +#: readelf.c:19310 msgid "End" msgstr "" -#: readelf.c:18930 +#: readelf.c:19311 msgid "Page Offset" msgstr "ページオフセット" -#: readelf.c:18938 +#: readelf.c:19319 msgid " Malformed note - filenames end too early\n" msgstr "" -#: readelf.c:18970 +#: readelf.c:19351 msgid "NT_GNU_ABI_TAG (ABI version tag)" msgstr "NT_GNU_ABI_TAG (ABI バージョンタグ)" -#: readelf.c:18972 +#: readelf.c:19353 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)" msgstr "NT_GNU_HWCAP (DSO が適用されるソフトウェア HWCAP 情報)" -#: readelf.c:18974 +#: readelf.c:19355 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)" msgstr "NT_GNU_BUILD_ID (一意なビルドID ビット列)" -#: readelf.c:18976 +#: readelf.c:19357 msgid "NT_GNU_GOLD_VERSION (gold version)" msgstr "NT_GNU_GOLD_VERSION (gold バージョン)" -#: readelf.c:18978 +#: readelf.c:19359 msgid "NT_GNU_PROPERTY_TYPE_0" msgstr "" -#: readelf.c:18980 +#: readelf.c:19361 msgid "NT_GNU_BUILD_ATTRIBUTE_OPEN" msgstr "" -#: readelf.c:18982 +#: readelf.c:19363 msgid "NT_GNU_BUILD_ATTRIBUTE_FUNC" msgstr "" -#: readelf.c:19071 readelf.c:19202 readelf.c:19239 +#: readelf.c:19452 readelf.c:19583 readelf.c:19620 #, c-format msgid "" msgstr "" -#: readelf.c:19329 +#: readelf.c:19732 #, c-format msgid " Properties: " msgstr "" -#: readelf.c:19333 +#: readelf.c:19736 #, c-format msgid "\n" msgstr "" -#: readelf.c:19345 +#: readelf.c:19748 #, c-format msgid "\n" msgstr "" -#: readelf.c:19356 +#: readelf.c:19759 #, c-format msgid "\n" msgstr "" -#: readelf.c:19378 readelf.c:19432 readelf.c:19454 +#: readelf.c:19781 readelf.c:19835 readelf.c:19857 #, c-format msgid "x86 ISA used: " msgstr "" -#: readelf.c:19389 readelf.c:19443 readelf.c:19465 +#: readelf.c:19792 readelf.c:19846 readelf.c:19868 #, c-format msgid "x86 ISA needed: " msgstr "" -#: readelf.c:19400 +#: readelf.c:19803 #, c-format msgid "x86 feature: " msgstr "" -#: readelf.c:19411 +#: readelf.c:19814 #, c-format msgid "x86 feature used: " msgstr "" -#: readelf.c:19422 +#: readelf.c:19825 #, c-format msgid "x86 feature needed: " msgstr "" -#: readelf.c:19484 readelf.c:19498 readelf.c:19506 readelf.c:19520 +#: readelf.c:19887 readelf.c:19901 readelf.c:19909 readelf.c:19940 #, c-format msgid " " msgstr "" -#: readelf.c:19496 +#: readelf.c:19899 #, c-format msgid "stack size: " msgstr "" -#: readelf.c:19530 +#: readelf.c:19950 #, c-format msgid "\n" msgstr "" -#: readelf.c:19615 +#: readelf.c:20035 #, c-format msgid " OS: %s, ABI: %ld.%ld.%ld\n" msgstr " OS: %s, ABI: %ld.%ld.%ld\n" -#: readelf.c:19624 +#: readelf.c:20044 #, c-format msgid " Version: " msgstr "" @@ -10005,490 +10006,490 @@ #. is a series of entries, where each entry is a single byte followed #. by a nul terminated string. The byte gives the bit number to test #. if enabled in the bitmask. -#: readelf.c:19640 +#: readelf.c:20060 #, c-format msgid " Hardware Capabilities: " msgstr "" -#: readelf.c:19643 +#: readelf.c:20063 msgid "\n" msgstr "" -#: readelf.c:19648 +#: readelf.c:20068 #, c-format msgid "num entries: %ld, enabled mask: %lx\n" msgstr "" -#: readelf.c:19664 +#: readelf.c:20084 #, c-format msgid " Description data: " msgstr "" -#: readelf.c:19682 +#: readelf.c:20102 msgid "Alignment of 8-byte objects" msgstr "" -#: readelf.c:19683 +#: readelf.c:20103 msgid "Sizeof double and long double" msgstr "" -#: readelf.c:19684 +#: readelf.c:20104 msgid "Type of FPU support needed" msgstr "" -#: readelf.c:19685 +#: readelf.c:20105 msgid "Use of SIMD instructions" msgstr "" -#: readelf.c:19686 +#: readelf.c:20106 msgid "Use of cache" msgstr "" -#: readelf.c:19687 +#: readelf.c:20107 msgid "Use of MMU" msgstr "" -#: readelf.c:19723 +#: readelf.c:20143 #, c-format msgid "4-bytes\n" msgstr "4-バイト\n" -#: readelf.c:19724 +#: readelf.c:20144 #, c-format msgid "8-bytes\n" msgstr "8-バイト\n" -#: readelf.c:19731 +#: readelf.c:20151 #, c-format msgid "FPU-2.0\n" msgstr "FPU-2.0\n" -#: readelf.c:19732 +#: readelf.c:20152 #, c-format msgid "FPU-3.0\n" msgstr "FPU-3.0\n" -#: readelf.c:19741 +#: readelf.c:20161 #, c-format msgid "yes\n" msgstr "" -#: readelf.c:19751 +#: readelf.c:20171 #, c-format msgid "unknown value: %x\n" msgstr "" -#: readelf.c:19807 +#: readelf.c:20227 msgid "NT_THRMISC (thrmisc structure)" msgstr "" -#: readelf.c:19809 +#: readelf.c:20229 msgid "NT_PROCSTAT_PROC (proc data)" msgstr "" -#: readelf.c:19811 +#: readelf.c:20231 msgid "NT_PROCSTAT_FILES (files data)" msgstr "" -#: readelf.c:19813 +#: readelf.c:20233 msgid "NT_PROCSTAT_VMMAP (vmmap data)" msgstr "" -#: readelf.c:19815 +#: readelf.c:20235 msgid "NT_PROCSTAT_GROUPS (groups data)" msgstr "" -#: readelf.c:19817 +#: readelf.c:20237 msgid "NT_PROCSTAT_UMASK (umask data)" msgstr "" -#: readelf.c:19819 +#: readelf.c:20239 msgid "NT_PROCSTAT_RLIMIT (rlimit data)" msgstr "" -#: readelf.c:19821 +#: readelf.c:20241 msgid "NT_PROCSTAT_OSREL (osreldate data)" msgstr "" -#: readelf.c:19823 +#: readelf.c:20243 msgid "NT_PROCSTAT_PSSTRINGS (ps_strings data)" msgstr "" -#: readelf.c:19825 +#: readelf.c:20245 msgid "NT_PROCSTAT_AUXV (auxv data)" msgstr "" -#: readelf.c:19827 +#: readelf.c:20247 msgid "NT_PTLWPINFO (ptrace_lwpinfo structure)" msgstr "" #. NetBSD core "procinfo" structure. -#: readelf.c:19841 +#: readelf.c:20261 msgid "NetBSD procinfo structure" msgstr "NetBSD procinfo 構造体" -#: readelf.c:19844 +#: readelf.c:20264 msgid "NetBSD ELF auxiliary vector data" msgstr "" -#: readelf.c:19876 readelf.c:19893 readelf.c:19907 +#: readelf.c:20296 readelf.c:20313 readelf.c:20327 msgid "PT_GETREGS (reg structure)" msgstr "PT_GETREGS (reg 構造体)" -#: readelf.c:19878 readelf.c:19895 readelf.c:19909 +#: readelf.c:20298 readelf.c:20315 readelf.c:20329 msgid "PT_GETFPREGS (fpreg structure)" msgstr "PT_GETFPREGS (fpreg 構造体)" -#: readelf.c:19891 +#: readelf.c:20311 msgid "PT___GETREGS40 (old reg structure)" msgstr "" -#: readelf.c:19928 +#: readelf.c:20368 msgid "NT_STAPSDT (SystemTap probe descriptors)" msgstr "" -#: readelf.c:19996 +#: readelf.c:20436 #, c-format msgid " Provider: %s\n" msgstr " Provider: %s\n" -#: readelf.c:19997 +#: readelf.c:20437 #, c-format msgid " Name: %s\n" msgstr " 名前: %s\n" -#: readelf.c:19998 +#: readelf.c:20438 #, c-format msgid " Location: " msgstr " 位置: " -#: readelf.c:20000 +#: readelf.c:20440 #, c-format msgid ", Base: " msgstr ", 基底: " -#: readelf.c:20002 +#: readelf.c:20442 #, c-format msgid ", Semaphore: " msgstr ", セマフォ: " -#: readelf.c:20005 +#: readelf.c:20445 #, c-format msgid " Arguments: %s\n" msgstr " 引数: %s\n" -#: readelf.c:20010 +#: readelf.c:20450 #, c-format msgid " \n" msgstr "" -#: readelf.c:20011 +#: readelf.c:20451 msgid "corrupt stapdt note - the data size is too small\n" msgstr "" -#: readelf.c:20023 +#: readelf.c:20474 msgid "NT_VMS_MHD (module header)" msgstr "NT_VMS_MHD (モジュールヘッダ)" -#: readelf.c:20025 +#: readelf.c:20476 msgid "NT_VMS_LNM (language name)" msgstr "NT_VMS_LNM (言語名)" -#: readelf.c:20027 +#: readelf.c:20478 msgid "NT_VMS_SRC (source files)" msgstr "NT_VMS_SRC (ソースファイル)" -#: readelf.c:20031 +#: readelf.c:20482 msgid "NT_VMS_EIDC (consistency check)" msgstr "NT_VMS_EIDC (一貫性検査)" -#: readelf.c:20033 +#: readelf.c:20484 msgid "NT_VMS_FPMODE (FP mode)" msgstr "NT_VMS_FPMODE (浮動小数モード)" -#: readelf.c:20037 +#: readelf.c:20488 msgid "NT_VMS_IMGNAM (image name)" msgstr "NT_VMS_IMGNAM (イメージ名)" -#: readelf.c:20039 +#: readelf.c:20490 msgid "NT_VMS_IMGID (image id)" msgstr "NT_VMS_IMGID (イメージID)" -#: readelf.c:20041 +#: readelf.c:20492 msgid "NT_VMS_LINKID (link id)" msgstr "NT_VMS_LINKID (リンクID)" -#: readelf.c:20043 +#: readelf.c:20494 msgid "NT_VMS_IMGBID (build id)" msgstr "NT_VMS_IMGBID (ビルドID)" -#: readelf.c:20045 +#: readelf.c:20496 msgid "NT_VMS_GSTNAM (sym table name)" msgstr "NT_VMS_GSTNAM (シンボル表名)" -#: readelf.c:20072 +#: readelf.c:20523 #, c-format msgid " Creation date : %.17s\n" msgstr " 作成日 : %.17s\n" -#: readelf.c:20073 +#: readelf.c:20524 #, c-format msgid " Last patch date: %.17s\n" msgstr " 最終パッチ適用日: %.17s\n" -#: readelf.c:20076 +#: readelf.c:20527 #, c-format msgid " Module name : %s\n" msgstr " モジュール名 : %s\n" -#: readelf.c:20078 +#: readelf.c:20529 #, c-format msgid " Module version : %s\n" msgstr " モジュールバージョン : %s\n" -#: readelf.c:20080 readelf.c:20085 +#: readelf.c:20531 readelf.c:20536 #, c-format msgid " Module version : \n" msgstr "" -#: readelf.c:20084 +#: readelf.c:20535 #, c-format msgid " Module name : \n" msgstr "" -#: readelf.c:20090 +#: readelf.c:20541 #, c-format msgid " Language: %.*s\n" msgstr "" -#: readelf.c:20095 +#: readelf.c:20546 #, c-format msgid " Floating Point mode: " msgstr "" -#: readelf.c:20105 +#: readelf.c:20556 #, c-format msgid " Link time: " msgstr " リンク時間: " -#: readelf.c:20116 +#: readelf.c:20567 #, c-format msgid " Patch time: " msgstr " パッチ時間: " -#: readelf.c:20130 +#: readelf.c:20581 #, c-format msgid " Major id: %u, minor id: %u\n" msgstr " Major id: %u, minor id: %u\n" -#: readelf.c:20133 +#: readelf.c:20584 #, c-format msgid " Last modified : " msgstr "" -#: readelf.c:20136 +#: readelf.c:20587 #, c-format msgid "" "\n" " Link flags : " msgstr "" -#: readelf.c:20139 +#: readelf.c:20590 #, c-format msgid " Header flags: 0x%08x\n" msgstr " ヘッダフラグ: 0x%08x\n" -#: readelf.c:20141 +#: readelf.c:20592 #, c-format msgid " Image id : %.*s\n" msgstr "" -#: readelf.c:20146 +#: readelf.c:20597 #, c-format msgid " Image name: %.*s\n" msgstr "" -#: readelf.c:20150 +#: readelf.c:20601 #, c-format msgid " Global symbol table name: %.*s\n" msgstr "" -#: readelf.c:20154 +#: readelf.c:20605 #, c-format msgid " Image id: %.*s\n" msgstr "" -#: readelf.c:20158 +#: readelf.c:20609 #, c-format msgid " Linker id: %.*s\n" msgstr "" -#: readelf.c:20168 +#: readelf.c:20619 #, c-format msgid " \n" msgstr "" -#: readelf.c:20169 +#: readelf.c:20620 msgid "corrupt IA64 note: data size is too small\n" msgstr "" -#: readelf.c:20336 readelf.c:20344 +#: readelf.c:20787 readelf.c:20795 #, c-format msgid " Applies to region from %#lx to %#lx\n" msgstr "" -#: readelf.c:20339 readelf.c:20346 +#: readelf.c:20790 readelf.c:20797 #, c-format msgid " Applies to region from %#lx\n" msgstr "" -#: readelf.c:20366 +#: readelf.c:20817 #, c-format msgid " \n" msgstr "" -#: readelf.c:20367 +#: readelf.c:20818 #, c-format msgid " " msgstr "" -#: readelf.c:20393 +#: readelf.c:20844 #, c-format msgid "Gap in build notes detected from %#lx to %#lx\n" msgstr "" -#: readelf.c:20396 readelf.c:20407 +#: readelf.c:20847 readelf.c:20858 #, c-format msgid " Applies to region from %#lx" msgstr "" -#: readelf.c:20401 readelf.c:20412 +#: readelf.c:20852 readelf.c:20863 #, c-format msgid " to %#lx" msgstr "" -#: readelf.c:20418 +#: readelf.c:20869 #, c-format msgid " (%s)" msgstr "" -#: readelf.c:20439 readelf.c:20454 +#: readelf.c:20890 readelf.c:20905 #, c-format msgid "corrupt name field in GNU build attribute note: size = %ld\n" msgstr "" -#: readelf.c:20440 readelf.c:20455 +#: readelf.c:20891 readelf.c:20906 msgid " " msgstr "" -#: readelf.c:20474 +#: readelf.c:20925 #, c-format msgid "unrecognised attribute type in name field: %d\n" msgstr "" -#: readelf.c:20475 +#: readelf.c:20926 msgid "" msgstr "" -#: readelf.c:20485 +#: readelf.c:20936 msgid "" msgstr "<バージョン>" -#: readelf.c:20490 +#: readelf.c:20941 msgid "" msgstr "" -#: readelf.c:20495 +#: readelf.c:20946 msgid "" msgstr "" -#: readelf.c:20500 +#: readelf.c:20951 msgid "" msgstr "<スタックサイズ>" -#: readelf.c:20505 +#: readelf.c:20956 msgid "" msgstr "" -#: readelf.c:20510 +#: readelf.c:20961 msgid "" msgstr "" -#: readelf.c:20515 +#: readelf.c:20966 msgid "" msgstr "" -#: readelf.c:20520 +#: readelf.c:20971 msgid "" msgstr "" -#: readelf.c:20539 +#: readelf.c:20990 #, c-format msgid "unrecognised byte in name field: %d\n" msgstr "" -#: readelf.c:20540 +#: readelf.c:20991 #, c-format msgid "" msgstr "<不明:_%d>" -#: readelf.c:20552 +#: readelf.c:21003 #, c-format msgid "attribute does not have an expected type (%c)\n" msgstr "" -#: readelf.c:20556 +#: readelf.c:21007 #, c-format msgid "corrupt name field: namesz: %lu but parsing gets to %ld\n" msgstr "" -#: readelf.c:20583 +#: readelf.c:21034 #, c-format msgid "corrupt numeric name field: too many bytes in the value: %x\n" msgstr "" -#: readelf.c:20755 +#: readelf.c:21212 #, c-format msgid " description data: " msgstr "" -#: readelf.c:20797 +#: readelf.c:21254 msgid "notes" msgstr "備考" -#: readelf.c:20346 +#: readelf.c:19336 #, c-format msgid "" "\n" "Displaying notes found in: %s\n" msgstr "" -#: readelf.c:20348 +#: readelf.c:19338 #, c-format msgid "" "\n" "Displaying notes found at file offset 0x%08lx with length 0x%08lx:\n" msgstr "" -#: readelf.c:20823 +#: readelf.c:21280 #, c-format msgid "Corrupt note: alignment %ld, expecting 4 or 8\n" msgstr "" -#: readelf.c:20829 +#: readelf.c:21286 #, c-format msgid " %-20s %-10s\tDescription\n" msgstr "" -#: readelf.c:20829 +#: readelf.c:21286 msgid "Owner" msgstr "所有者" -#: readelf.c:20829 +#: readelf.c:21286 msgid "Data size" msgstr "データサイズ" -#: readelf.c:20847 readelf.c:20876 +#: readelf.c:21304 readelf.c:21333 #, c-format msgid "Corrupt note: only %ld byte remains, not enough for a full note\n" msgid_plural "" @@ -10496,20 +10497,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:20904 +#: readelf.c:21361 #, c-format msgid "note with invalid namesz and/or descsz found at offset 0x%lx\n" msgstr "" -#: readelf.c:20924 +#: readelf.c:21381 msgid "Out of memory allocating space for inote name\n" msgstr "" -#: readelf.c:20984 +#: readelf.c:21441 msgid "v850 notes" msgstr "V850の備考" -#: readelf.c:20991 +#: readelf.c:21448 #, c-format msgid "" "\n" @@ -10517,37 +10518,37 @@ "length 0x%lx:\n" msgstr "" -#: readelf.c:21008 +#: readelf.c:21465 #, c-format msgid "Corrupt note: name size is too big: %lx\n" msgstr "" -#: readelf.c:21018 +#: readelf.c:21475 #, c-format msgid "corrupt descsz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:21020 readelf.c:21033 +#: readelf.c:21477 readelf.c:21490 #, c-format msgid " type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n" msgstr "" -#: readelf.c:21031 +#: readelf.c:21488 #, c-format msgid "corrupt namesz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:20646 +#: readelf.c:19639 #, c-format msgid "No note segments present in the core file.\n" msgstr "このcoreファイルに備考セグメントが有りません。\n" -#: readelf.c:21122 +#: readelf.c:21579 #, c-format msgid " Unknown GNU attribute: %s\n" msgstr "" -#: readelf.c:21270 +#: readelf.c:21727 msgid "" "This instance of readelf has been built without support for a\n" "64 bit data type and so it cannot read 64 bit ELF files.\n" @@ -10555,12 +10556,12 @@ "この readelf の実体は 64 ビットデータ型サポート無しで構築されており、\n" "64 ビット ELF ファイルを読み込めません。\n" -#: readelf.c:21440 +#: readelf.c:21897 #, c-format msgid "%s: Failed to read file header\n" msgstr "%s: ファイルヘッダの読込みが失敗しました\n" -#: readelf.c:21455 +#: readelf.c:21912 #, c-format msgid "" "\n" @@ -10569,27 +10570,27 @@ "\n" "ファイル: %s\n" -#: readelf.c:21616 +#: readelf.c:22073 #, c-format msgid "%s: unable to dump the index as none was found\n" msgstr "%s: 索引が無いため、索引のダンプを行うことが出来ません\n" -#: readelf.c:21623 +#: readelf.c:22080 #, c-format msgid "Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n" msgstr "" -#: readelf.c:21647 +#: readelf.c:22104 #, c-format msgid "Contents of binary %s at offset " msgstr "" -#: readelf.c:21659 +#: readelf.c:22116 #, c-format msgid "%s: end of the symbol table reached before the end of the index\n" msgstr "%s: 索引の終了前にシンボル表の終了に到達しました\n" -#: readelf.c:21678 +#: readelf.c:22135 #, c-format msgid "" "%s: %ld byte remains in the symbol table, but without corresponding entries " @@ -10600,51 +10601,51 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:21691 +#: readelf.c:22148 #, c-format msgid "%s: failed to seek back to start of object files in the archive\n" msgstr "%s: 書庫内のオブジェクトファイルの開始位置への戻り方向の走査 (seek back) に失敗しました\n" -#: readelf.c:21785 readelf.c:21904 +#: readelf.c:22240 readelf.c:22359 #, c-format msgid "Input file '%s' is not readable.\n" msgstr "入力ファイル '%s' が読み込めません。\n" -#: readelf.c:21813 +#: readelf.c:22268 #, c-format msgid "%s: contains corrupt thin archive: %s\n" msgstr "" -#: readelf.c:21831 +#: readelf.c:22286 #, c-format msgid "%s: failed to seek to archive member.\n" msgstr "%s: 書庫のメンバの探査 (seek) に失敗しました。\n" -#: readelf.c:21896 +#: readelf.c:22351 msgid "Out of memory allocating file data structure\n" msgstr "" -#: readelf.c:21933 +#: readelf.c:22388 #, c-format msgid "File %s is not an archive so its index cannot be displayed.\n" msgstr "ファイル %s は書庫ではないため索引を表示できません。\n" -#: readelf.c:22004 +#: readelf.c:22459 msgid "Nothing to do.\n" msgstr "行なうべき事はありません。\n" -#: rename.c:198 +#: rename.c:200 #, c-format msgid "%s: cannot set time: %s" msgstr "%s: 時刻を設定できません: %s" #. We have to clean up here. -#: rename.c:195 rename.c:232 +#: rename.c:157 rename.c:195 #, c-format msgid "unable to rename '%s'; reason: %s" msgstr "'%s' の名前変更に失敗しました。理由: %s" -#: rename.c:217 +#: rename.c:219 #, c-format msgid "unable to copy file '%s'; reason: %s" msgstr "ファイル '%s' をコピーできません。理由: %s" @@ -11249,77 +11250,77 @@ msgid "Type index number %d out of range\n" msgstr "インデックス番号型 %d が範囲外です\n" -#: stabs.c:3506 +#: stabs.c:3507 #, c-format msgid "Unrecognized XCOFF type %d\n" msgstr "XCOFF タイプ %d を認識できません\n" -#: stabs.c:3799 +#: stabs.c:3798 #, c-format msgid "bad mangled name `%s'\n" msgstr "誤った変形 (mangle) 名 `%s' です\n" -#: stabs.c:3894 +#: stabs.c:3893 #, c-format msgid "no argument types in mangled string\n" msgstr "変形 (mangle) された文字列に引数の型がありません\n" -#: stabs.c:5242 +#: stabs.c:5241 #, c-format msgid "Demangled name is not a function\n" msgstr "復元 (demangle) された名前が関数ではありません\n" -#: stabs.c:5284 +#: stabs.c:5283 #, c-format msgid "Unexpected type in v3 arglist demangling\n" msgstr "v3 引数リストの復元 (demangle) 内で予期しない型です\n" -#: stabs.c:5356 +#: stabs.c:5355 #, c-format msgid "Unrecognized demangle component %d\n" msgstr "名前復元 (demangle) コンポーネント %d を認識できません\n" -#: stabs.c:5408 +#: stabs.c:5407 #, c-format msgid "Failed to print demangled template\n" msgstr "名前復元したテンプレートの表示に失敗しました\n" -#: stabs.c:5488 +#: stabs.c:5487 #, c-format msgid "Couldn't get demangled builtin type\n" msgstr "名前復元 (demangle) された組み込み型を取得できませんでした\n" -#: stabs.c:5537 +#: stabs.c:5536 #, c-format msgid "Unexpected demangled varargs\n" msgstr "予期しない名前復元 (demangle) された varargs です\n" -#: stabs.c:5544 +#: stabs.c:5543 #, c-format msgid "Unrecognized demangled builtin type\n" msgstr "認識できない名前復元 (demangle) された組み込み型です\n" -#: strings.c:198 strings.c:265 +#: strings.c:229 strings.c:316 #, c-format msgid "invalid integer argument %s" msgstr "無効な整数引数 %s です" -#: strings.c:268 +#: strings.c:319 #, c-format msgid "invalid minimum string length %d" msgstr "無効な最小文字列長 %d です" -#: strings.c:339 +#: strings.c:390 #, c-format msgid "%s: Reading section %s failed: %s" msgstr "" -#: strings.c:678 +#: strings.c:1313 #, c-format msgid " Display printable strings in [file(s)] (stdin by default)\n" msgstr " [file(s)] (デフォルトは標準入力) 内の表示可能な文字列を表示します\n" -#: strings.c:682 +#: strings.c:1317 #, c-format msgid "" " -a - --all Scan the entire file, not just the data section " @@ -11327,7 +11328,7 @@ " -d --data Only scan the data sections in the file\n" msgstr "" -#: strings.c:686 +#: strings.c:1321 #, c-format msgid "" " -a - --all Scan the entire file, not just the data section\n" @@ -11361,54 +11362,55 @@ msgid "*undefined*" msgstr "*未定義*" -#: sysdump.c:57 +#. PR 28564 +#: sysdump.c:57 sysdump.c:66 msgid "*corrupt*" msgstr "*破損*" -#: sysdump.c:125 +#: sysdump.c:131 #, c-format msgid "SUM IS %x\n" msgstr "" #. PR 17512: file: id:000001,src:000002,op:flip1,pos:45. #. Prevent infinite loops re-reading beyond the end of the buffer. -#: sysdump.c:163 +#: sysdump.c:169 msgid "ICE: getINT: Out of buffer space" msgstr "" -#: sysdump.c:188 +#: sysdump.c:194 #, c-format msgid "Unsupported read size: %d" msgstr "サポートされていない読み込みサイズ: %d" -#: sysdump.c:499 +#: sysdump.c:505 #, c-format msgid "GOT A %x\n" msgstr "" -#: sysdump.c:517 +#: sysdump.c:523 #, c-format msgid "WANTED %x!!\n" msgstr "" -#: sysdump.c:535 +#: sysdump.c:541 msgid "SYMBOL INFO" msgstr "" -#: sysdump.c:553 +#: sysdump.c:559 msgid "DERIVED TYPE" msgstr "" -#: sysdump.c:610 +#: sysdump.c:616 msgid "MODULE***\n" msgstr "" -#: sysdump.c:643 +#: sysdump.c:649 #, c-format msgid "Print a human readable interpretation of a SYSROFF object file\n" msgstr "SYSROFF オブジェクトファイルの解釈を人間が読みやすい形式で表示する\n" -#: sysdump.c:644 +#: sysdump.c:650 #, c-format msgid "" " The options are:\n" @@ -11419,7 +11421,7 @@ " -h --help この情報を表示する\n" " -v --version プログラムのバージョン番号を表示する\n" -#: sysdump.c:710 +#: sysdump.c:716 #, c-format msgid "cannot open input file %s" msgstr "入力ファイル %s を開けません" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison-gnulib.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison-gnulib.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison-gnulib.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison-gnulib.po 2022-02-11 23:04:17.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:52+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -37,69 +37,69 @@ msgid "Valid arguments are:" msgstr "有効な引数:" -#: lib/bitset/stats.c:177 +#: lib/bitset/stats.c:183 #, c-format msgid "%u bitset_allocs, %u freed (%.2f%%).\n" msgstr "" -#: lib/bitset/stats.c:180 +#: lib/bitset/stats.c:186 #, c-format msgid "%u bitset_sets, %u cached (%.2f%%)\n" msgstr "" -#: lib/bitset/stats.c:183 +#: lib/bitset/stats.c:189 #, c-format msgid "%u bitset_resets, %u cached (%.2f%%)\n" msgstr "" -#: lib/bitset/stats.c:186 +#: lib/bitset/stats.c:192 #, c-format msgid "%u bitset_tests, %u cached (%.2f%%)\n" msgstr "" -#: lib/bitset/stats.c:190 +#: lib/bitset/stats.c:196 #, c-format msgid "%u bitset_lists\n" msgstr "" -#: lib/bitset/stats.c:192 +#: lib/bitset/stats.c:198 msgid "count log histogram\n" msgstr "" -#: lib/bitset/stats.c:195 +#: lib/bitset/stats.c:201 msgid "size log histogram\n" msgstr "" -#: lib/bitset/stats.c:198 +#: lib/bitset/stats.c:204 msgid "density histogram\n" msgstr "" -#: lib/bitset/stats.c:210 +#: lib/bitset/stats.c:216 #, c-format msgid "" "Bitset statistics:\n" "\n" msgstr "" -#: lib/bitset/stats.c:213 +#: lib/bitset/stats.c:219 #, c-format msgid "Accumulated runs = %u\n" msgstr "" -#: lib/bitset/stats.c:255 lib/bitset/stats.c:260 +#: lib/bitset/stats.c:261 lib/bitset/stats.c:266 msgid "cannot read stats file" msgstr "" -#: lib/bitset/stats.c:257 +#: lib/bitset/stats.c:263 #, c-format msgid "bad stats file size\n" msgstr "" -#: lib/bitset/stats.c:281 lib/bitset/stats.c:283 +#: lib/bitset/stats.c:287 lib/bitset/stats.c:289 msgid "cannot write stats file" msgstr "" -#: lib/bitset/stats.c:286 +#: lib/bitset/stats.c:292 msgid "cannot open stats file for writing" msgstr "" @@ -146,7 +146,7 @@ msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションには引数が必要です -- '%c'\n" -#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 +#: lib/obstack.c:337 lib/obstack.c:339 lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -179,14 +179,14 @@ msgid "'" msgstr "'" -#: lib/spawn-pipe.c:141 lib/spawn-pipe.c:144 lib/spawn-pipe.c:265 -#: lib/spawn-pipe.c:268 +#: lib/spawn-pipe.c:217 lib/spawn-pipe.c:220 lib/spawn-pipe.c:459 +#: lib/spawn-pipe.c:462 #, c-format msgid "cannot create pipe" msgstr "パイプを作成できません" -#: lib/spawn-pipe.c:235 lib/spawn-pipe.c:349 lib/wait-process.c:290 -#: lib/wait-process.c:364 +#: lib/execute.c:348 lib/spawn-pipe.c:597 lib/wait-process.c:291 +#: lib/wait-process.c:365 #, c-format msgid "%s subprocess failed" msgstr "%s サブプロセスが失敗しました" @@ -207,22 +207,22 @@ msgid "wall clock" msgstr "" -#: lib/w32spawn.h:49 +#: lib/os2-spawn.c:46 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle に失敗しました" -#: lib/w32spawn.h:90 +#: lib/os2-spawn.c:83 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "ファイル記述子 (fd) %d をリストアできません: dup2 に失敗しました" -#: lib/wait-process.c:231 lib/wait-process.c:263 lib/wait-process.c:325 +#: lib/wait-process.c:232 lib/wait-process.c:264 lib/wait-process.c:326 #, c-format msgid "%s subprocess" msgstr "%s 子プロセス" -#: lib/wait-process.c:282 lib/wait-process.c:354 +#: lib/wait-process.c:283 lib/wait-process.c:355 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s 子プロセスが致命的なシグナル %d を受信しました" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison.po 2022-02-11 23:04:23.000000000 +0000 @@ -17,10 +17,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:55+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: src/complain.c:153 msgid "S/R conflicts (enabled by default)" @@ -111,8 +111,8 @@ msgid "duplicate directive: %s" msgstr "重複した指示: %s" -#: src/complain.c:619 src/complain.c:628 src/reader.c:135 src/symtab.c:327 -#: src/symtab.c:336 src/symtab.c:566 +#: src/complain.c:619 src/complain.c:628 src/reader.c:156 src/symtab.c:330 +#: src/symtab.c:339 src/symtab.c:569 msgid "previous declaration" msgstr "以前の宣言" @@ -193,27 +193,27 @@ msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d 還元/還元競合" -#: src/files.c:139 +#: src/files.c:144 #, c-format msgid "%s: cannot open" msgstr "%s: 開くことができません" -#: src/files.c:155 +#: src/files.c:160 #, c-format msgid "input/output error" msgstr "入力/出力エラーです" -#: src/files.c:158 +#: src/files.c:163 #, c-format msgid "cannot close file" msgstr "ファイルを閉じることができません" -#: src/files.c:456 +#: src/files.c:510 #, c-format msgid "refusing to overwrite the input file %s" msgstr "入力ファイル %s の上書きを拒否しました" -#: src/files.c:464 +#: src/files.c:518 #, c-format msgid "conflicting outputs to file %s" msgstr "ファイル %s への出力が衝突しています" @@ -223,95 +223,95 @@ msgid "%s: cannot backup" msgstr "%s: バックアップできません" -#: src/getargs.c:173 +#: src/getargs.c:186 msgid "colorize the output" msgstr "出力に色をつける" -#: src/getargs.c:174 +#: src/getargs.c:187 msgid "don't colorize the output" msgstr "出力に色をつけない" -#: src/getargs.c:175 +#: src/getargs.c:188 msgid "colorize if the output device is a tty" msgstr "出力デバイスが tty の時だけ色をつける" #. TRANSLATORS: Use the same translation for WHEN as in the #. --color=WHEN help message. -#: src/getargs.c:196 +#: src/getargs.c:209 msgid "WHEN can be one of the following:" msgstr "WHEN は以下のうちのどれかです:" -#: src/getargs.c:209 +#: src/getargs.c:222 msgid "describe the states" msgstr "状態を説明" -#: src/getargs.c:210 +#: src/getargs.c:223 msgid "complete the core item sets with their closure" msgstr "コアアイテムセットを閉包で完成" -#: src/getargs.c:211 +#: src/getargs.c:224 msgid "explicitly associate lookahead tokens to items" msgstr "lookahead トークンを明示的にアイテムに結合" -#: src/getargs.c:212 +#: src/getargs.c:225 msgid "describe shift/reduce conflicts solving" msgstr "解決したシフト/還元について説明" -#: src/getargs.c:214 +#: src/getargs.c:227 msgid "include all the above information" msgstr "上記の全てを含む" -#: src/getargs.c:215 +#: src/getargs.c:228 msgid "disable the report" msgstr "レポートをしない" #. TRANSLATORS: Use the same translation for THINGS as in the #. --report=THINGS help message. -#: src/getargs.c:238 +#: src/getargs.c:251 msgid "THINGS is a list of comma separated words that can include:" msgstr "THINGS は以下の単語をコンマ(,)で区切ったリストです:" -#: src/getargs.c:301 +#: src/getargs.c:314 msgid "TRACES is a list of comma separated words that can include:" msgstr "TRACES は以下の単語をコンマ(,)で区切ったリストです:" -#: src/getargs.c:313 +#: src/getargs.c:326 msgid "show errors with carets" msgstr "エラーを ^ つきで表示" -#: src/getargs.c:314 +#: src/getargs.c:327 msgid "show machine-readable fixes" msgstr "修正を出力" -#: src/getargs.c:315 +#: src/getargs.c:328 msgid "do not generate any file" msgstr "ファイルを生成しない" -#: src/getargs.c:316 +#: src/getargs.c:329 msgid "all of the above" msgstr "上記全て有効化" -#: src/getargs.c:317 +#: src/getargs.c:330 msgid "disable all of the above" msgstr "上記全て無効化" #. TRANSLATORS: Use the same translation for FEATURES as in the #. --feature=FEATURES help message. -#: src/getargs.c:339 +#: src/getargs.c:352 msgid "FEATURES is a list of comma separated words that can include:" msgstr "FEATURES は以下の単語をコンマ(,)で区切ったリストです:" -#: src/getargs.c:354 +#: src/getargs.c:367 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "`%s --help' で詳細情報を参照してください\n" -#: src/getargs.c:363 +#: src/getargs.c:376 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "使い方: %s [オプション]... ファイル\n" -#: src/getargs.c:364 +#: src/getargs.c:377 msgid "" "Generate a deterministic LR or generalized LR (GLR) parser employing\n" "LALR(1), IELR(1), or canonical LR(1) parser tables.\n" @@ -321,16 +321,16 @@ "LALR(1), IELR(1), または canonical LR(1) パーサテーブルを用いて生成する。\n" "\n" -#: src/getargs.c:370 +#: src/getargs.c:383 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長いオプションに必須の引数は短いオプションにも必須です.\n" -#: src/getargs.c:373 +#: src/getargs.c:386 msgid "The same is true for optional arguments.\n" msgstr "オプションの引数についても同様です。\n" -#: src/getargs.c:378 +#: src/getargs.c:391 msgid "" "Operation Modes:\n" " -h, --help display this help and exit\n" @@ -356,7 +356,7 @@ " -f, --feature[=FEATURES] 機能を有効にする\n" "\n" -#: src/getargs.c:394 +#: src/getargs.c:407 msgid "" "Diagnostics:\n" " -W, --warnings[=CATEGORY] report the warnings falling in CATEGORY\n" @@ -370,7 +370,7 @@ " --style=FILE 診断結果に色をつける CSS に FILE を使う\n" "\n" -#: src/getargs.c:408 +#: src/getargs.c:421 #, c-format msgid "" "Tuning the Parser:\n" @@ -426,12 +426,12 @@ " -g, --graph[=FILE] オートマトンのグラフも出力\n" " -x, --xml[=FILE] オートマトンを XML 形式で出力\n" -#: src/getargs.c:446 +#: src/getargs.c:458 #, c-format msgid "Report bugs to <%s>.\n" msgstr "バグを発見したら <%s> 宛に報告して下さい。\n" -#: src/getargs.c:447 +#: src/getargs.c:459 #, c-format msgid "%s home page: <%s>.\n" msgstr "%s のホームページ: <%s>\n" @@ -449,7 +449,7 @@ msgid "Report translation bugs to .\n" msgstr "翻訳に関するバグはに報告してください。\n" -#: src/getargs.c:465 +#: src/getargs.c:477 msgid "For complete documentation, run: info bison.\n" msgstr "充実したドキュメントは次のコマンドで表示できます: info bison\n" @@ -458,16 +458,16 @@ msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:483 +#: src/getargs.c:495 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Robert Corbett と Richard Stallman によって書かれました\n" -#: src/getargs.c:487 +#: src/getargs.c:499 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:490 +#: src/getargs.c:502 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" @@ -478,36 +478,36 @@ "これはフリーソフトウェアです -- 複製についての条件はソースを見ましょう。\n" "一切の保証はありません -- 商業性や目的適合性についての保証すらありません。\n" -#: src/getargs.c:512 +#: src/getargs.c:524 #, c-format msgid "multiple skeleton declarations are invalid" msgstr "複数のスケルトンの宣言は無効です" -#: src/getargs.c:529 +#: src/getargs.c:541 #, c-format msgid "%s: invalid language" msgstr "%s: 無効な言語" -#: src/getargs.c:532 +#: src/getargs.c:544 msgid "multiple language declarations are invalid" msgstr "複数の言語の宣言は無効です" -#: src/getargs.c:843 +#: src/getargs.c:868 #, c-format msgid "deprecated option: %s, use %s" msgstr "%s は非推奨のオプションです。%s を使ってください" -#: src/getargs.c:877 +#: src/getargs.c:902 #, c-format msgid "missing operand" msgstr "オペランドがありません" -#: src/getargs.c:879 +#: src/getargs.c:904 #, c-format msgid "extra operand %s" msgstr "余分なオペランド %s" -#: src/gram.c:208 +#: src/gram.c:222 msgid "Grammar" msgstr "文法" @@ -524,7 +524,7 @@ "// Home page: <%s>.\n" "\n" -#: src/location.c:138 src/scan-gram.l:956 +#: src/location.c:138 src/scan-gram.l:957 #, c-format msgid "line number overflow" msgstr "行番号がオーバーフローしました" @@ -548,139 +548,139 @@ msgid "..." msgstr "..." -#: src/main.c:162 +#: src/main.c:172 msgid "rule useless in parser due to conflicts" msgstr "衝突のせいでパーサ内の規則が使用できません" -#: src/main.c:256 +#: src/main.c:274 #, c-format msgid "fix-its can be applied. Rerun with option '--update'." msgstr "自動的に修正できます。'--update' を付けて再度実行してください。" -#: src/muscle-tab.c:527 +#: src/muscle-tab.c:528 #, c-format msgid "%%define variable %s redefined" msgstr "%%define 変数 %s が再定義されました" -#: src/muscle-tab.c:530 src/symtab.c:347 +#: src/muscle-tab.c:531 src/symtab.c:350 msgid "previous definition" msgstr "前の定義" -#: src/muscle-tab.c:589 src/muscle-tab.c:690 src/muscle-tab.c:749 +#: src/muscle-tab.c:590 src/muscle-tab.c:691 src/muscle-tab.c:750 #, c-format msgid "%s: undefined %%define variable %s" msgstr "%s: 未定義の %%define 変数 %s" -#: src/muscle-tab.c:623 +#: src/muscle-tab.c:624 #, c-format msgid "%%define variable '%s' requires '{...}' values" msgstr "%%define 変数 '%s' は '{...}' を値として必要としています" -#: src/muscle-tab.c:628 +#: src/muscle-tab.c:629 #, c-format msgid "%%define variable '%s' requires keyword values" msgstr "%%define 変数 '%s' はキーワードを値として必要としています" -#: src/muscle-tab.c:633 +#: src/muscle-tab.c:634 #, c-format msgid "%%define variable '%s' requires '\"...\"' values" msgstr "%%define 変数 '%s' は '\"...\"' を値として必要としています" -#: src/muscle-tab.c:684 +#: src/muscle-tab.c:685 #, c-format msgid "invalid value for %%define Boolean variable %s" msgstr "%%define Boolean variable %s としては不正な値" -#: src/muscle-tab.c:737 +#: src/muscle-tab.c:738 #, c-format msgid "invalid value for %%define variable %s: %s" msgstr "%%define 変数 %s の値として不適切です: %s" -#: src/muscle-tab.c:741 +#: src/muscle-tab.c:742 #, c-format msgid "accepted value: %s" msgstr "受け入れられた値: %s" -#: src/parse-gram.y:773 +#: src/parse-gram.y:780 #, c-format msgid "character literals cannot be nonterminals" msgstr "文字リテラルは非終端にはなれません" -#: src/parse-gram.y:779 +#: src/parse-gram.y:786 #, c-format msgid "character literals cannot be used together with %s" msgstr "文字リテラルは %s と一緒に使えません" -#: src/parse-gram.y:782 +#: src/parse-gram.y:789 #, c-format msgid "definition of %s" msgstr "%s の定義" -#: src/parse-gram.y:933 +#: src/parse-gram.y:940 #, c-format msgid "missing identifier in parameter declaration" msgstr "パラメータの宣言に識別子がありません" -#: src/parse-gram.y:1052 +#: src/parse-gram.y:1062 #, c-format msgid "invalid version requirement: %s" msgstr "必要なバージョン指定が無効です: %s" -#: src/parse-gram.y:1063 +#: src/parse-gram.y:1073 #, c-format msgid "require bison %s, but have %s" msgstr "bison %s が必要ですが、%s です。" -#: src/print-graph.c:62 src/print.c:350 +#: src/print-graph.c:62 src/print.c:352 #, c-format msgid "State %d" msgstr "状態 %d" -#: src/print.c:141 +#: src/print.c:143 #, c-format msgid "shift, and go to state %d\n" msgstr "" -#: src/print.c:143 +#: src/print.c:145 #, c-format msgid "go to state %d\n" msgstr "状態 %d に移行\n" -#: src/print.c:178 +#: src/print.c:180 msgid "error (nonassociative)\n" msgstr "エラー (nonassociative)\n" -#: src/print.c:200 +#: src/print.c:204 #, c-format msgid "reduce using rule %d (%s)" msgstr "規則 %d を使って還元 (%s)" -#: src/print.c:203 +#: src/print.c:202 #, c-format msgid "accept" msgstr "受け入れる" -#: src/print.c:240 src/print.c:314 +#: src/print.c:242 src/print.c:316 msgid "$default" msgstr "$default" -#: src/print.c:376 +#: src/print.c:378 msgid "Terminals, with rules where they appear" msgstr "出現位置の規則による終端" -#: src/print.c:403 +#: src/print.c:405 msgid "Nonterminals, with rules where they appear" msgstr "出現位置の規則による非終端" -#: src/print.c:429 +#: src/print.c:431 msgid "on left:" msgstr "左辺:" -#: src/print.c:438 +#: src/print.c:440 msgid "on right:" msgstr "右辺:" -#: src/print.c:460 +#: src/print.c:462 msgid "Rules useless in parser due to conflicts" msgstr "衝突のせいでパーサ内の規則が使用できません" @@ -689,82 +689,82 @@ msgid "multiple %s declarations" msgstr "%s が複数個宣言されました" -#: src/reader.c:130 +#: src/reader.c:151 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "結果のタイプがマージ関数 %s と衝突します: <%s> != <%s>" -#: src/reader.c:205 +#: src/reader.c:226 #, c-format msgid "duplicated symbol name for %s ignored" msgstr "%s の重複するシンボル名を無視します" -#: src/reader.c:241 +#: src/reader.c:262 #, c-format msgid "rule given for %s, which is a token" msgstr "%s に規則が与えられ、それはトークンとなります" -#: src/reader.c:298 +#: src/reader.c:321 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "デフォルトのアクションではタイプが衝突します: <%s> != <%s>" -#: src/reader.c:321 +#: src/reader.c:345 #, c-format msgid "empty rule for typed nonterminal, and no action" msgstr "空の型付き非終端アイテム用規則であり、動作が起りません" -#: src/reader.c:337 +#: src/reader.c:389 #, c-format msgid "unused value: $%d" msgstr "使われていない値: $%d" -#: src/reader.c:339 +#: src/reader.c:391 #, c-format msgid "unset value: $$" msgstr "未設定の値: $$" -#: src/reader.c:349 +#: src/reader.c:401 #, c-format msgid "%%empty on non-empty rule" msgstr "空でない規則に %%empty" -#: src/reader.c:359 +#: src/reader.c:411 #, c-format msgid "empty rule without %%empty" msgstr "%%empty なしで空の規則" -#: src/reader.c:375 +#: src/reader.c:427 #, c-format msgid "token for %%prec is not defined: %s" msgstr "%%prec に対するトークンが定義されていません: %s" -#: src/reader.c:380 +#: src/reader.c:432 #, c-format msgid "only midrule actions can be typed: %s" msgstr "midrule アクションにしか型をつけられません: %s" -#: src/reader.c:507 src/reader.c:529 src/reader.c:600 +#: src/reader.c:559 src/reader.c:581 src/reader.c:652 #, c-format msgid "%s affects only GLR parsers" msgstr "%s は GLR パーサにしか影響しません" -#: src/reader.c:510 +#: src/reader.c:562 #, c-format msgid "%s must be followed by positive number" msgstr "%s の後は正の数でなければなりません" -#: src/reader.c:565 +#: src/reader.c:617 #, c-format msgid "POSIX Yacc does not support typed midrule actions" msgstr "POSIX Yacc は型つき midrule アクションをサポートしていません" -#: src/reader.c:669 +#: src/reader.c:717 #, c-format msgid "rule is too long" msgstr "規則が長すぎます" -#: src/reader.c:781 +#: src/reader.c:951 #, c-format msgid "no rules in the input grammar" msgstr "入力した文法に規則が定義されていません" @@ -773,126 +773,126 @@ msgid "rule useless in grammar" msgstr "文法中にある規則が無駄です" -#: src/reduce.c:280 +#: src/reduce.c:281 #, c-format msgid "nonterminal useless in grammar: %s" msgstr "文法中の非終端が無駄です: %s" -#: src/reduce.c:321 +#: src/reduce.c:322 msgid "Nonterminals useless in grammar" msgstr "文法中の非終端が無駄です" -#: src/reduce.c:333 +#: src/reduce.c:334 msgid "Terminals unused in grammar" msgstr "文法中の終端が無駄です" -#: src/reduce.c:342 +#: src/reduce.c:343 msgid "Rules useless in grammar" msgstr "文法中の規則が無駄です" -#: src/reduce.c:355 +#: src/reduce.c:356 #, c-format msgid "%d nonterminal useless in grammar" msgid_plural "%d nonterminals useless in grammar" msgstr[0] "文法中に %d 個の無駄な非終端があります" -#: src/reduce.c:360 +#: src/reduce.c:361 #, c-format msgid "%d rule useless in grammar" msgid_plural "%d rules useless in grammar" msgstr[0] "文法中に %d 個の無駄な終端があります" -#: src/reduce.c:386 +#: src/reduce.c:392 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "開始シンボル %s はどの文にも由来しません" -#: src/scan-code.l:158 +#: src/scan-code.l:160 #, c-format msgid "stray '%s'" msgstr "はぐれた '%s'" -#: src/scan-code.l:330 +#: src/scan-code.l:332 #, c-format msgid "refers to: %c%s at %s" msgstr "参照しています: %c%s at %s" -#: src/scan-code.l:354 +#: src/scan-code.l:356 #, c-format msgid "possibly meant: %c" msgstr "もしかして以下を意味していますか: %c" -#: src/scan-code.l:363 +#: src/scan-code.l:365 #, c-format msgid ", hiding %c" msgstr ", %c を隠しています" -#: src/scan-code.l:371 +#: src/scan-code.l:373 #, c-format msgid " at %s" msgstr " at %s" -#: src/scan-code.l:375 +#: src/scan-code.l:377 #, c-format msgid ", cannot be accessed from midrule action at $%d" msgstr ", %d にある midrule アクションからアクセスできません" -#: src/scan-code.l:422 src/scan-gram.l:878 +#: src/scan-code.l:416 src/scan-gram.l:879 #, c-format msgid "integer out of range: %s" msgstr "整数が値の範囲外です: %s" -#: src/scan-code.l:496 +#: src/scan-code.l:505 #, c-format msgid "invalid reference: %s" msgstr "無効な参照: %s" -#: src/scan-code.l:503 +#: src/scan-code.l:512 #, c-format msgid "syntax error after '%c', expecting integer, letter, '_', '[', or '$'" msgstr "'%c' の後に文法エラーがあります。整数、文字、'_', '[','$' が来るはずです。" -#: src/scan-code.l:509 +#: src/scan-code.l:518 #, c-format msgid "symbol not found in production before $%d: %.*s" msgstr "$%d の前の出力にシンボルがありません: %.*s" -#: src/scan-code.l:514 +#: src/scan-code.l:523 #, c-format msgid "symbol not found in production: %.*s" msgstr "結果にシンボルが見つかりません: %.*s" -#: src/scan-code.l:528 +#: src/scan-code.l:537 #, c-format msgid "misleading reference: %s" msgstr "紛らわしい参照: %s" -#: src/scan-code.l:543 +#: src/scan-code.l:552 #, c-format msgid "ambiguous reference: %s" msgstr "曖昧な参照: \"%s" -#: src/scan-code.l:579 +#: src/scan-code.l:588 #, c-format msgid "explicit type given in untyped grammar" msgstr "型なしの文法に明示的に型が与えられています" -#: src/scan-code.l:634 +#: src/scan-code.l:643 #, c-format msgid "$$ for the midrule at $%d of %s has no declared type" msgstr "$$ に対する $%d midrule %s が宣言された型を持っていません" -#: src/scan-code.l:640 +#: src/scan-code.l:649 #, c-format msgid "$$ of %s has no declared type" msgstr "%s の $$ に宣言のない型があります" -#: src/scan-code.l:666 +#: src/scan-code.l:675 #, c-format msgid "$%s of %s has no declared type" msgstr "$%s の %s に宣言のない型があります" -#: src/scan-code.l:689 +#: src/scan-code.l:698 #, c-format msgid "multiple occurrences of $%d with api.value.automove" msgstr "api.value.automove が有効で $%d が複数回でてきます" @@ -902,52 +902,52 @@ msgid "stray ',' treated as white space" msgstr "はぐれた ',' は空白として扱われました" -#: src/scan-gram.l:308 +#: src/scan-gram.l:309 #, c-format msgid "invalid directive: %s" msgstr "無効な指示: %s" -#: src/scan-gram.l:330 +#: src/scan-gram.l:331 #, c-format msgid "invalid identifier: %s" msgstr "無効な識別子: %s" -#: src/scan-gram.l:384 +#: src/scan-gram.l:385 msgid "invalid character" msgid_plural "invalid characters" msgstr[0] "無効な文" -#: src/scan-gram.l:404 +#: src/scan-gram.l:405 #, c-format msgid "invalid null character" msgstr "無効な null 文字" -#: src/scan-gram.l:462 +#: src/scan-gram.l:463 #, c-format msgid "unexpected identifier in bracketed name: %s" msgstr "ブラケットに囲まれた識別子としては期待されていません: %s" -#: src/scan-gram.l:486 +#: src/scan-gram.l:487 #, c-format msgid "an identifier expected" msgstr "識別子が期待されています" -#: src/scan-gram.l:493 +#: src/scan-gram.l:494 msgid "invalid character in bracketed name" msgid_plural "invalid characters in bracketed name" msgstr[0] "ブラケットに囲まれた名前に不正な文字があります" -#: src/scan-gram.l:566 src/scan-gram.l:581 +#: src/scan-gram.l:567 src/scan-gram.l:582 #, c-format msgid "POSIX Yacc does not support string literals" msgstr "POSIX Yacc は文字列リテラルをサポートしていません" -#: src/scan-gram.l:604 +#: src/scan-gram.l:605 #, c-format msgid "empty character literal" msgstr "空の文字定数" -#: src/scan-gram.l:610 +#: src/scan-gram.l:611 #, c-format msgid "extra characters in character literal" msgstr "キャラクタリテラルに余分な文字があります" @@ -957,42 +957,42 @@ msgid "invalid number after \\-escape: %s" msgstr "\\ エスケープの後に不正な数字があります: %s" -#: src/scan-gram.l:689 +#: src/scan-gram.l:690 #, c-format msgid "invalid character after \\-escape: %s" msgstr "\\ エスケープの後に不正な文字があります: %s\"" -#: src/scan-gram.l:871 +#: src/scan-gram.l:872 #, c-format msgid "POSIX Yacc does not support hexadecimal literals" msgstr "POSIX Yacc は16進数リテラルをサポートしていません" -#: src/scan-gram.l:1009 +#: src/scan-gram.l:1010 #, c-format msgid "missing %s at end of file" msgstr "ファイル末尾に %s がありません" -#: src/scan-gram.l:1020 +#: src/scan-gram.l:1021 #, c-format msgid "missing %s at end of line" msgstr "行末に %s がありません" -#: src/scan-skel.l:141 +#: src/scan-skel.l:158 #, c-format msgid "unclosed %s directive in skeleton" msgstr "スケルトンの %s ディレクティブがクローズされていません" -#: src/scan-skel.l:252 +#: src/scan-skel.l:269 #, c-format msgid "too few arguments for %s directive in skeleton" msgstr "スケルトンの %s ディレクティブの引数が少なすぎます" -#: src/scan-skel.l:259 +#: src/scan-skel.l:276 #, c-format msgid "too many arguments for %s directive in skeleton" msgstr "スケルトンの %s ディレクティブの引数が多すぎます" -#: src/symtab.c:131 +#: src/symtab.c:129 #, c-format msgid "POSIX Yacc forbids dashes in symbol names: %s" msgstr "POSIX Yacc ではシンボル名にダッシュは使えません: %s" @@ -1002,44 +1002,44 @@ msgid "too many symbols in input grammar (limit is %d)" msgstr "入力している文法のシンボルが多すぎます(最大 %d)" -#: src/symtab.c:326 +#: src/symtab.c:329 #, c-format msgid "%s redeclaration for %s" msgstr "%s は %s の再宣言です" -#: src/symtab.c:335 +#: src/symtab.c:338 #, c-format msgid "%s redeclaration for <%s>" msgstr "%s は <%s> の再宣言です" -#: src/symtab.c:344 +#: src/symtab.c:347 #, c-format msgid "symbol %s redeclared as a token" msgstr "シンボル %s がトークンとして再宣言されました" -#: src/symtab.c:345 +#: src/symtab.c:348 #, c-format msgid "symbol %s redeclared as a nonterminal" msgstr "シンボル %s が非終端として再宣言されました" -#: src/symtab.c:385 +#: src/symtab.c:388 #, c-format msgid "" "symbol %s is used, but is not defined as a token and has no rules; did you " "mean %s?" msgstr "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちません。%s と間違えましたか？" -#: src/symtab.c:395 +#: src/symtab.c:398 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちません" -#: src/symtab.c:534 +#: src/symtab.c:537 #, c-format msgid "POSIX yacc reserves %%type to nonterminals" msgstr "POSIX yacc は %%type を非終端として予約しています" -#: src/symtab.c:564 +#: src/symtab.c:567 #, c-format msgid "symbol %s redeclared" msgstr "シンボル %s が再宣言されました" @@ -1059,32 +1059,32 @@ msgid "user token number of %s too large" msgstr "%s のユーザトークンナンバーが大きすぎます" -#: src/symtab.c:631 +#: src/symtab.c:634 #, c-format msgid "string literal %s not attached to a symbol" msgstr "文字列リテラル %s にシンボルが割り当てられていません" -#: src/symtab.c:659 +#: src/symtab.c:662 #, c-format msgid "useless %s for type <%s>" msgstr "%s は型 <%s>無用です" -#: src/symtab.c:664 +#: src/symtab.c:667 #, c-format msgid "type <%s> is used, but is not associated to any symbol" msgstr "タイプ %s が使われていますが、シンボルと対応づけられていません" -#: src/symtab.c:709 +#: src/symtab.c:712 #, c-format msgid "nonterminals cannot be given a string alias" msgstr "非終端に文字列エイリアスは与えられません" -#: src/symtab.c:712 +#: src/symtab.c:715 #, c-format msgid "symbol %s used more than once as a literal string" msgstr "シンボル %s はリテラル文字列として複数回使われました" -#: src/symtab.c:715 +#: src/symtab.c:718 #, c-format msgid "symbol %s given more than one literal string" msgstr "シンボル %s に複数のリテラル文字列が与えられました" @@ -1094,37 +1094,37 @@ msgid "user token number %d redeclaration for %s" msgstr "ユーザトークンナンバー %d が %s に対して再定義されました" -#: src/symtab.c:752 +#: src/symtab.c:755 #, c-format msgid "previous declaration for %s" msgstr "%s に対する以前の宣言" -#: src/symtab.c:1080 +#: src/symtab.c:1083 #, c-format msgid "token number too large" msgstr "トークン数が大きすぎます" -#: src/symtab.c:1151 +#: src/reader.c:923 #, c-format msgid "the start symbol %s is undefined" msgstr "開始シンボル %s は定義されていません" -#: src/symtab.c:1155 +#: src/reader.c:933 #, c-format msgid "the start symbol %s is a token" msgstr "開始シンボル %s はトークンです" -#: src/symtab.c:1338 +#: src/symtab.c:1332 #, c-format msgid "useless precedence and associativity for %s" msgstr "%s に無用な precedence and associativity" -#: src/symtab.c:1341 +#: src/symtab.c:1335 #, c-format msgid "useless precedence for %s" msgstr "%s に無用な precedence" -#: src/symtab.c:1345 +#: src/symtab.c:1339 #, c-format msgid "useless associativity for %s, use %%precedence" msgstr "%s に無用な associativity、%%precedence を使ってください" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison-runtime.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison-runtime.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bison-runtime.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bison-runtime.po 2022-02-11 23:04:20.000000000 +0000 @@ -14,58 +14,58 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:05+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:55+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: data/skeletons/glr.c:904 data/skeletons/yacc.c:690 +#: data/skeletons/glr.c:930 data/skeletons/yacc.c:769 msgid "syntax error: cannot back up" msgstr "構文エラー: バックアップすることができません" -#: data/skeletons/glr.c:1819 +#: data/skeletons/glr.c:1832 msgid "syntax is ambiguous" msgstr "構文が曖昧です" -#: data/skeletons/glr.c:2231 data/skeletons/glr.c:2257 -#: data/skeletons/glr.c:2310 data/skeletons/glr.c:2550 -#: data/skeletons/lalr1.cc:1046 data/skeletons/lalr1.cc:1543 -#: data/skeletons/yacc.c:1364 data/skeletons/yacc.c:1901 -#: data/skeletons/yacc.c:1905 +#: data/skeletons/glr.c:2245 data/skeletons/glr.c:2271 +#: data/skeletons/glr.c:2324 data/skeletons/glr.c:2560 +#: data/skeletons/lalr1.cc:1054 data/skeletons/lalr1.cc:1555 +#: data/skeletons/yacc.c:1443 data/skeletons/yacc.c:2006 +#: data/skeletons/yacc.c:2010 msgid "syntax error" msgstr "構文エラー" -#: data/skeletons/glr.c:2258 data/skeletons/lalr1.cc:1544 -#: data/skeletons/yacc.c:1365 +#: data/skeletons/glr.c:2272 data/skeletons/lalr1.cc:1556 +#: data/skeletons/yacc.c:1444 #, c-format msgid "syntax error, unexpected %s" msgstr "構文エラー、予期しない %s です" -#: data/skeletons/glr.c:2259 data/skeletons/lalr1.cc:1545 -#: data/skeletons/yacc.c:1366 +#: data/skeletons/glr.c:2273 data/skeletons/lalr1.cc:1557 +#: data/skeletons/yacc.c:1445 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "構文エラー、予期しない %s です。予期されるのは %s です" -#: data/skeletons/glr.c:2260 data/skeletons/lalr1.cc:1546 -#: data/skeletons/yacc.c:1367 +#: data/skeletons/glr.c:2274 data/skeletons/lalr1.cc:1558 +#: data/skeletons/yacc.c:1446 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "構文エラー、予期しない %s です。予期されるのは %s または %s です" -#: data/skeletons/glr.c:2261 data/skeletons/lalr1.cc:1547 -#: data/skeletons/yacc.c:1368 +#: data/skeletons/glr.c:2275 data/skeletons/lalr1.cc:1559 +#: data/skeletons/yacc.c:1447 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "構文エラー、 予期しない %s です。予期されるのは %s、%s または %s です" -#: data/skeletons/glr.c:2262 data/skeletons/lalr1.cc:1548 -#: data/skeletons/yacc.c:1369 +#: data/skeletons/glr.c:2276 data/skeletons/lalr1.cc:1560 +#: data/skeletons/yacc.c:1448 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "構文エラー、予期しない %s です。予期されるのは %s、%s、%s、または %s です。" -#: data/skeletons/glr.c:2609 data/skeletons/yacc.c:1437 -#: data/skeletons/yacc.c:1439 data/skeletons/yacc.c:1644 -#: data/skeletons/yacc.c:2053 +#: data/skeletons/glr.c:2619 data/skeletons/yacc.c:1516 +#: data/skeletons/yacc.c:1518 data/skeletons/yacc.c:1748 +#: data/skeletons/yacc.c:2158 msgid "memory exhausted" msgstr "メモリを使い果たしました" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bootloader.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bootloader.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bootloader.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bootloader.po 2022-02-11 23:04:14.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: 2021-08-02 17:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:14+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: \n" #. ok button label @@ -133,7 +133,7 @@ #. txt_power_off msgid "Halt the system now?" -msgstr "システムを中止しますか？" +msgstr "システムを停止しますか?" #. txt_password msgid "Password\n" @@ -479,112 +479,112 @@ #. txt_install_ubuntu_safegraphics msgid "^Install Ubuntu (safe graphics)" -msgstr "" +msgstr "Ubuntu をインストールする (セーフグラフィック) (^I)" #. txt_install_edubuntu_safegraphics msgid "^Install Edubuntu (safe graphics)" -msgstr "" +msgstr "Edubuntu をインストールする (セーフグラフィック) (^I)" #. txt_install_kubuntu_safegraphics msgid "^Install Kubuntu (safe graphics)" -msgstr "" +msgstr "Kubuntu をインストールする (セーフグラフィック) (^|)" #. txt_install_xubuntu_safegraphics msgid "^Install Xubuntu (safe graphics)" -msgstr "" +msgstr "Xubuntu をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_mid_safegraphics msgid "^Install Ubuntu MID (safe graphics)" -msgstr "" +msgstr "Ubuntu MID をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_netbook_safegraphics msgid "^Install Ubuntu Netbook (safe graphics)" -msgstr "" +msgstr "Ubuntu Netbook をインストールする (セーフグラフィック) (^I)" #. txt_install_kubuntu_netbook_safegraphics msgid "^Install Kubuntu Netbook (safe graphics)" -msgstr "" +msgstr "Kubuntu Netbook をインストールする (セーフグラフィック) (^I)" #. txt_install_lubuntu_safegraphics msgid "^Install Lubuntu (safe graphics)" -msgstr "" +msgstr "Lubuntu をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_gnome_safegraphics msgid "^Install Ubuntu GNOME (safe graphics)" -msgstr "" +msgstr "Ubuntu GNOME をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_mate_safegraphics msgid "^Install Ubuntu MATE (safe graphics)" -msgstr "" +msgstr "Ubuntu MATE をインストールする (セーフグラフィック) (^I)" #. txt_install_mythbuntu_safegraphics msgid "^Install Mythbuntu (safe graphics)" -msgstr "" +msgstr "Mythbuntu をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_kylin_safegraphics msgid "^Install Ubuntu Kylin (safe graphics)" -msgstr "" +msgstr "Ubuntu Kylin をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_kylin_netbook_safegraphics msgid "^Install Ubuntu Kylin Netbook (safe graphics)" -msgstr "" +msgstr "Ubuntu Kylin Netbook をインストールする (セーフグラフィック) (^I)" #. txt_install_ubuntu_studio_safegraphics msgid "^Install Ubuntu Studio (safe graphics)" -msgstr "" +msgstr "Ubuntu Studio をインストールする (セーフグラフィック) (^I)" #. txt_try_ubuntu_safegraphics msgid "^Try Ubuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_edubuntu_safegraphics msgid "^Try Edubuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Edubuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_kubuntu_safegraphics msgid "^Try Kubuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Kubuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_xubuntu_safegraphics msgid "^Try Xubuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Xubuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_mid_safegraphics msgid "^Try Ubuntu MID without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu MID を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_netbook_safegraphics msgid "^Try Ubuntu Netbook without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu Netbook を試してみる (セーフグラフィック)(^T)" #. txt_try_kubuntu_netbook_safegraphics msgid "^Try Kubuntu Netbook without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Kubuntu Netbook を試してみる (セーフグラフィック)(^T)" #. txt_try_lubuntu_safegraphics msgid "^Try Lubuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Lubuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_gnome_safegraphics msgid "^Try Ubuntu GNOME without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu GNOME を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_mate_safegraphics msgid "^Try Ubuntu MATE without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu MATE を試してみる (セーフグラフィック)(^T)" #. txt_try_mythbuntu_safegraphics msgid "^Try Mythbuntu without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Mythbuntu を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_kylin_safegraphics msgid "^Try Ubuntu Kylin without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu Kylin を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_kylin_netbook_safegraphics msgid "^Try Ubuntu Kylin Netbook without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu Kylin Netbook を試してみる (セーフグラフィック)(^T)" #. txt_try_ubuntu_studio_safegraphics msgid "^Try Ubuntu Studio without installing (safe graphics)" -msgstr "" +msgstr "インストールせずに Ubuntu Studio を試してみる (セーフグラフィック)(^T)" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/byobu.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/byobu.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/byobu.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/byobu.po 2022-02-11 23:04:25.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: 2021-08-02 17:57+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:53+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bzr.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bzr.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/bzr.po 2021-08-03 08:53:43.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/bzr.po 2022-02-11 23:04:26.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: 2021-08-02 17:12+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:06+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: bzrlib/add.py:95 msgid "skipping {0} (larger than {1} of {2} bytes)" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cinder.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cinder.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cinder.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cinder.po 2022-02-11 23:04:21.000000000 +0000 @@ -14,16 +14,16 @@ "Project-Id-Version: cinder 9.0.1.dev15\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" "POT-Creation-Date: 2016-04-27 07:15+0000\n" -"PO-Revision-Date: 2021-05-06 11:48+0000\n" +"PO-Revision-Date: 2022-02-09 21:15+0000\n" "Last-Translator: Yoshiki Eguchi \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: 2021-08-02 18:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 17:16+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Generated-By: Babel 2.0\n" +"Language: ja\n" #: cinder/context.py:107 #, python-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/colord.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/colord.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/colord.po 2021-08-03 08:53:43.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/colord.po 2022-02-11 23:04:26.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:14+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:11+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. TRANSLATORS: command line option diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/command-not-found.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/command-not-found.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/command-not-found.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/command-not-found.po 2022-02-11 23:04:17.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2020-08-26 15:05+0000\n" +"POT-Creation-Date: 2021-10-05 18:45+0000\n" "PO-Revision-Date: 2020-04-06 13:25+0000\n" "Last-Translator: Shinichirou Yamada " "\n" @@ -15,14 +15,14 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:24+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:19+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: ../CommandNotFound/CommandNotFound.py:156 +#: ../CommandNotFound/CommandNotFound.py:210 msgid "Do you want to install it? (N/y)" msgstr "インストールしますか? (N/y)" -#: ../CommandNotFound/CommandNotFound.py:165 +#: ../CommandNotFound/CommandNotFound.py:218 msgid "y" msgstr "y" @@ -71,12 +71,12 @@ msgid "Please ask your administrator." msgstr "管理者に確認してください。" -#: ../CommandNotFound/CommandNotFound.py:231 +#: ../CommandNotFound/CommandNotFound.py:281 #, python-format msgid "You will have to enable the component called '%s'" msgstr "'%s' リポジトリを有効にしてください" -#: ../CommandNotFound/CommandNotFound.py:252 +#: ../CommandNotFound/CommandNotFound.py:289 #, python-format msgid "You will have to enable component called '%s'" msgstr "'%s' リポジトリを有効にしてください" @@ -90,24 +90,24 @@ msgid "See 'snap info %s' for additional versions." msgstr "他のバージョンについては 'snap info %s' を確認してください。" -#: ../CommandNotFound/CommandNotFound.py:314 +#: ../CommandNotFound/CommandNotFound.py:245 #, python-format msgid "Command '%(command)s' is available in '%(place)s'" msgstr "コマンド '%(command)s' は '%(place)s' で利用できます" -#: ../CommandNotFound/CommandNotFound.py:316 +#: ../CommandNotFound/CommandNotFound.py:247 #, python-format msgid "Command '%(command)s' is available in the following places" msgstr "コマンド '%(command)s' は以下の場所で利用できます" -#: ../CommandNotFound/CommandNotFound.py:321 +#: ../CommandNotFound/CommandNotFound.py:252 #, python-format msgid "" "The command could not be located because '%s' is not included in the PATH " "environment variable." msgstr "'%s'がPATH環境変数に含まれていないためコマンドを特定できませんでした。" -#: ../CommandNotFound/CommandNotFound.py:323 +#: ../CommandNotFound/CommandNotFound.py:254 msgid "" "This is most likely caused by the lack of administrative privileges " "associated with your user account." @@ -136,29 +136,29 @@ "it." msgstr "" -#: ../command-not-found:93 ../command-not-found:96 +#: ../command-not-found:91 #, c-format msgid "%s: command not found" msgstr "%s: コマンドが見つかりません" -#: ../CommandNotFound/util.py:25 +#: ../CommandNotFound/util.py:26 msgid "Sorry, command-not-found has crashed! Please file a bug report at:" msgstr "申し訳ありません、command-not-foundがクラッシュしました! バグ報告を行なってください:" -#: ../CommandNotFound/util.py:27 +#: ../CommandNotFound/util.py:28 msgid "Please include the following information with the report:" msgstr "以下の情報を報告に含めるようにしてください:" -#: ../CommandNotFound/util.py:29 +#: ../CommandNotFound/util.py:30 #, python-format msgid "command-not-found version: %s" msgstr "command-not-found バージョン: %s" -#: ../CommandNotFound/util.py:30 +#: ../CommandNotFound/util.py:31 #, python-format msgid "Python version: %d.%d.%d %s %d" msgstr "Python バージョン: %d.%d.%d %s %d" -#: ../CommandNotFound/util.py:36 +#: ../CommandNotFound/util.py:37 msgid "Exception information:" msgstr "例外情報:" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/coreutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/coreutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/coreutils.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/coreutils.po 2022-02-11 23:04:19.000000000 +0000 @@ -18,10 +18,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:07+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: lib/argmatch.c:132 #, c-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cpio.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cpio.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cpio.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cpio.po 2022-02-11 23:04:15.000000000 +0000 @@ -19,61 +19,60 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 14:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" -#: gnu/argmatch.c:135 +#: gnu/argmatch.c:134 #, c-format msgid "invalid argument %s for %s" msgstr "%2$s に対する引数 %1$s が間違っています" -#: gnu/argmatch.c:136 +#: gnu/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "%2$s に対する引数 %1$s が曖昧です" -#: gnu/argmatch.c:155 -#, c-format +#: gnu/argmatch.c:154 msgid "Valid arguments are:" msgstr "有効な引数:" -#: gnu/argp-help.c:149 +#: gnu/argp-help.c:148 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" msgstr "ARGP_HELP_FMT: %s の値は %s の値以下です" -#: gnu/argp-help.c:222 +#: gnu/argp-help.c:224 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" msgstr "%.*s: ARGP_HELP_FMT パラメータには値が必要です" -#: gnu/argp-help.c:237 +#: gnu/argp-help.c:234 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" msgstr "%.*s: 不明な ARGP_HELP_FMT パラメータ" -#: gnu/argp-help.c:249 +#: gnu/argp-help.c:247 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT 中にごみがあります: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1227 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "長い形式のオプションで必須または任意の引数は、それに対応する短い形式のオプションでも同様に必須または任意です。" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1614 msgid "Usage:" msgstr "使用法:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1618 msgid " or: " msgstr " または: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1630 msgid " [OPTION...]" msgstr " [OPTION...]" @@ -82,45 +81,44 @@ msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "詳細は '%s --help' または '%s --usage' を実行して下さい。\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1685 #, c-format msgid "Report bugs to %s.\n" msgstr "バグを発見したら %s 宛に報告して下さい。\n" -#: gnu/argp-help.c:1929 gnu/error.c:155 +#: gnu/argp-help.c:1886 gnu/error.c:191 msgid "Unknown system error" msgstr "不明なシステムエラー" -#: gnu/argp-parse.c:83 +#: gnu/argp-parse.c:81 msgid "give this help list" msgstr "このヘルプを表示する" -#: gnu/argp-parse.c:84 +#: gnu/argp-parse.c:82 msgid "give a short usage message" msgstr "短い使用方法を表示する" -#: gnu/argp-parse.c:85 tests/genfile.c:131 +#: gnu/argp-parse.c:83 tests/genfile.c:131 msgid "NAME" msgstr "NAME" -#: gnu/argp-parse.c:85 +#: gnu/argp-parse.c:84 msgid "set the program name" msgstr "プログラム名を設定する" -#: gnu/argp-parse.c:86 +#: gnu/argp-parse.c:85 msgid "SECS" msgstr "SECS" -#: gnu/argp-parse.c:87 +#: gnu/argp-parse.c:86 msgid "hang for SECS seconds (default 3600)" msgstr "SECS 秒でハング (デフォルト 3600)" -#: gnu/argp-parse.c:144 +#: gnu/argp-parse.c:143 msgid "print program version" msgstr "プログラムのバージョンを表示する" #: gnu/argp-parse.c:160 -#, c-format msgid "(PROGRAM ERROR) No version known!?" msgstr "(プログラムエラー) 不明なバージョン!?" @@ -133,7 +131,7 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(プログラムエラー) オプションは認識されているべきです!?" -#: gnu/closeout.c:114 src/util.c:93 src/util.c:96 src/util.c:145 +#: gnu/closeout.c:112 src/util.c:93 src/util.c:96 src/util.c:146 #, c-format msgid "write error" msgstr "書き込みエラー" @@ -143,17 +141,17 @@ msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: オプション '%s' は曖昧です。次のものが可能です:" -#: gnu/getopt.c:531 gnu/getopt.c:547 +#: gnu/getopt.c:619 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: オプション '%s' は曖昧です\n" -#: gnu/getopt.c:580 gnu/getopt.c:584 +#: gnu/getopt.c:654 gnu/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション '--%s' は引数を取ることができません\n" -#: gnu/getopt.c:593 gnu/getopt.c:598 +#: gnu/getopt.c:667 gnu/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' は引数を取ることができません\n" @@ -163,32 +161,32 @@ msgid "%s: option '--%s' requires an argument\n" msgstr "%s: オプション '--%s' は引数が必要です\n" -#: gnu/getopt.c:698 gnu/getopt.c:701 +#: gnu/getopt.c:772 gnu/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: オプション '--%s' を認識できません\n" -#: gnu/getopt.c:709 gnu/getopt.c:712 +#: gnu/getopt.c:783 gnu/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: オプション '%c%s' を認識できません\n" -#: gnu/getopt.c:761 gnu/getopt.c:764 +#: gnu/getopt.c:835 gnu/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効なオプション -- '%c'\n" -#: gnu/getopt.c:814 gnu/getopt.c:831 gnu/getopt.c:1034 gnu/getopt.c:1052 +#: gnu/getopt.c:891 gnu/getopt.c:908 gnu/getopt.c:1118 gnu/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションには引数が必要です -- '%c'\n" -#: gnu/getopt.c:884 gnu/getopt.c:900 +#: gnu/getopt.c:964 gnu/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション '-W %s' は曖昧です\n" -#: gnu/getopt.c:924 gnu/getopt.c:942 +#: gnu/getopt.c:1004 gnu/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション '-W %s' は引数を取ることができません\n" @@ -198,53 +196,55 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: オプション '-W %s' は引数が必要です\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34 msgid "memory exhausted" msgstr "メモリを使い果たしました" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:38 #, c-format msgid "unable to record current working directory" msgstr "現在の作業ディレクトリを記録することができません" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:57 #, c-format msgid "failed to return to initial working directory" msgstr "初期作業ディレクトリに戻るのに失敗しました" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:354 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:355 msgid "'" msgstr "'" -#: gnu/version-etc.c:76 +#: gnu/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" msgstr "パッケージ作成者: %s (%s)\n" -#: gnu/version-etc.c:79 +#: gnu/version-etc.c:77 #, c-format msgid "Packaged by %s\n" msgstr "パッケージ作成者: %s\n" @@ -252,11 +252,11 @@ #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. -#: gnu/version-etc.c:86 +#: gnu/version-etc.c:84 msgid "(C)" msgstr "(C)" -#: gnu/version-etc.c:88 +#: gnu/version-etc.c:86 msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later " @@ -273,19 +273,19 @@ "\n" #. TRANSLATORS: %s denotes an author name. -#: gnu/version-etc.c:104 +#: gnu/version-etc.c:102 #, c-format msgid "Written by %s.\n" msgstr "作者 %s。\n" #. TRANSLATORS: Each %s denotes an author name. -#: gnu/version-etc.c:108 +#: gnu/version-etc.c:106 #, c-format msgid "Written by %s and %s.\n" msgstr "作者 %s および %s。\n" #. TRANSLATORS: Each %s denotes an author name. -#: gnu/version-etc.c:112 +#: gnu/version-etc.c:110 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "作者 %s、 %s、および %s。\n" @@ -293,7 +293,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:119 +#: gnu/version-etc.c:117 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -305,7 +305,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:126 +#: gnu/version-etc.c:124 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -317,7 +317,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:133 +#: gnu/version-etc.c:131 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -329,7 +329,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:141 +#: gnu/version-etc.c:139 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -341,7 +341,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:149 +#: gnu/version-etc.c:147 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -355,7 +355,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:158 +#: gnu/version-etc.c:156 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -369,7 +369,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:169 +#: gnu/version-etc.c:167 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -384,7 +384,7 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). -#: gnu/version-etc.c:247 +#: gnu/version-etc.c:245 #, c-format msgid "" "\n" @@ -394,22 +394,22 @@ "バグを発見したら <%s> に報告して下さい。\n" "翻訳に関するバグはに報告してください。\n" -#: gnu/version-etc.c:249 +#: gnu/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" msgstr "%s のバグは <%s> に報告してください。\n" -#: gnu/version-etc.c:253 +#: gnu/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" msgstr "%s のホームページ: <%s>\n" -#: gnu/version-etc.c:255 +#: gnu/version-etc.c:253 #, c-format msgid "%s home page: \n" msgstr "%s のホームページ: \n" -#: gnu/version-etc.c:258 +#: gnu/version-etc.c:256 msgid "General help using GNU software: \n" msgstr "GNU ソフトウェアを使用する際の一般的なヘルプ: \n" @@ -417,7 +417,7 @@ #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/error.c:58 lib/error.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: 関数 %s が失敗しました" @@ -426,74 +426,74 @@ #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/error.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: 警告: 関数 %s が失敗しました" -#: lib/error.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: モードを %s に変更できません" -#: lib/error.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: 所有権を %lu、 gid %lu に変更できません" -#: lib/error.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: %s へのハードリンクを作成できません" -#: lib/error.c:179 lib/error.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s: %3$lu バイトを読み込み中に %2$s バイト目で読み込みエラーが発生しました" -#: lib/error.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s: 警告: %3$lu バイトを読み込み中に %2$s バイト目で読み込みエラーが発生しました<" -#: lib/error.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: %s まで seek できません" -#: lib/error.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: 警告: %s まで seek できません<" -#: lib/error.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: %s へのシンボリックリンクを作成できません" -#: lib/error.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s: %3$lu バイト中 %2$lu バイトのみ書き込みました" -#: lib/names.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "メンバ名から先頭の `%s' を削除しています" -#: lib/names.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "ハードリンク先から `%s' を削除しています" -#: lib/names.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "`.' を空メンバ名に置換しています" -#: lib/names.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "`.' を空のハードリンク先に置換しています" @@ -522,84 +522,84 @@ msgid "Cannot redirect files for remote shell" msgstr "リモートシェルへファイルをリダイレクトできません" -#: lib/rtapelib.c:515 +#: lib/rtapelib.c:516 #, c-format msgid "Cannot execute remote shell" msgstr "リモートシェルが実行できません" -#: rmt/rmt.c:413 +#: rmt/rmt.c:432 msgid "Seek direction out of range" msgstr "seek 方向が範囲外です" -#: rmt/rmt.c:419 +#: rmt/rmt.c:438 msgid "Invalid seek direction" msgstr "無効な seek 方向です" -#: rmt/rmt.c:427 +#: rmt/rmt.c:446 msgid "Invalid seek offset" msgstr "無効な seek オフセットです" -#: rmt/rmt.c:433 +#: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "seek オフセットが範囲外です" -#: rmt/rmt.c:474 rmt/rmt.c:525 rmt/rmt.c:589 +#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 msgid "Invalid byte count" msgstr "無効なバイト数です" -#: rmt/rmt.c:480 rmt/rmt.c:531 rmt/rmt.c:595 rmt/rmt.c:606 +#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" msgstr "バイト数が範囲外です" -#: rmt/rmt.c:539 +#: rmt/rmt.c:558 msgid "Premature eof" msgstr "予期しないファイル終端 (EOF) です" -#: rmt/rmt.c:582 +#: rmt/rmt.c:601 msgid "Invalid operation code" msgstr "無効な操作コードです" -#: rmt/rmt.c:617 rmt/rmt.c:661 +#: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" msgstr "操作はサポートされていません" -#: rmt/rmt.c:645 +#: rmt/rmt.c:664 msgid "Unexpected arguments" msgstr "予期しない引数です" -#: rmt/rmt.c:670 +#: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "リモートプロセスからコマンドを受け取りながらテープドライブを操作する" -#: rmt/rmt.c:677 src/main.c:123 tests/genfile.c:167 +#: rmt/rmt.c:696 src/main.c:129 tests/genfile.c:167 msgid "NUMBER" msgstr "NUMBER" -#: rmt/rmt.c:678 +#: rmt/rmt.c:697 msgid "set debug level" msgstr "デバッグレベルを設定する" -#: rmt/rmt.c:679 src/main.c:151 src/main.c:157 tests/genfile.c:133 +#: rmt/rmt.c:698 src/main.c:166 src/main.c:172 tests/genfile.c:133 #: tests/genfile.c:181 tests/genfile.c:185 tests/genfile.c:188 #: tests/genfile.c:194 msgid "FILE" msgstr "FILE" -#: rmt/rmt.c:680 +#: rmt/rmt.c:699 msgid "set debug output file name" msgstr "デバッグ出力ファイル名を設定する" -#: rmt/rmt.c:696 rmt/rmt.c:764 +#: rmt/rmt.c:715 rmt/rmt.c:783 #, c-format msgid "cannot open %s" msgstr "%s を開けません" -#: rmt/rmt.c:761 tests/genfile.c:885 tests/genfile.c:902 +#: rmt/rmt.c:780 tests/genfile.c:953 tests/genfile.c:970 #, c-format msgid "too many arguments" msgstr "引数が多すぎます" -#: rmt/rmt.c:803 +#: rmt/rmt.c:822 msgid "Garbage command" msgstr "ゴミのコマンドです" @@ -624,67 +624,67 @@ msgid "%s: checksum error (0x%x, should be 0x%x)" msgstr "%s: チェックサムエラー (0x%x は 0x%x であるべきです)" -#: src/copyin.c:208 src/copypass.c:129 +#: src/copyin.c:200 src/copypass.c:135 #, c-format msgid "%s not created: newer or same age version exists" msgstr "%s が作成されませんでした: より新しいまたは同じ更新日時の版が存在します" -#: src/copyin.c:218 src/copypass.c:137 +#: src/copyin.c:210 src/copypass.c:143 #, c-format msgid "cannot remove current %s" msgstr "現在の %s を削除できません" -#: src/copyin.c:279 src/copyin.c:476 src/copyin.c:601 src/copypass.c:394 +#: src/copyin.c:271 src/copyin.c:467 src/copyin.c:582 src/copypass.c:391 #, c-format msgid "cannot link %s to %s" msgstr "%s から %s へのリンクを作成できません" -#: src/copyin.c:509 +#: src/copyin.c:500 #, c-format msgid "cannot swap halfwords of %s: odd number of halfwords" msgstr "%s のハーフワードを交換できません: ハーフワード数が奇数です" -#: src/copyin.c:517 +#: src/copyin.c:508 #, c-format msgid "cannot swap bytes of %s: odd number of bytes" msgstr "%s のバイトを交換できません: バイト数が奇数です<" -#: src/copyin.c:673 +#: src/copyin.c:659 #, c-format msgid "%s: Cannot symlink to %s" msgstr "%s: %s へのシンボリックリンクを作成できません" -#: src/copyin.c:727 src/copyout.c:850 src/copypass.c:317 +#: src/copyin.c:713 src/copyout.c:832 src/copypass.c:314 #, c-format msgid "%s: unknown file type" msgstr "%s: 不明なファイルタイプです" -#: src/copyin.c:912 src/copyin.c:919 +#: src/copyin.c:848 src/copyin.c:855 #, c-format msgid "Malformed number %.*s" msgstr "%.*s は不正な形式の数です" -#: src/copyin.c:929 +#: src/copyin.c:865 #, c-format msgid "Archive value %.*s is out of range" msgstr "書庫の値 %.*s は範囲外です" -#: src/copyin.c:964 +#: src/copyin.c:904 #, c-format msgid "premature end of archive" msgstr "予期しない書庫終了です" -#: src/copyin.c:1184 +#: src/copyin.c:1120 #, c-format msgid "warning: archive header has reverse byte-order" msgstr "警告: 書庫のヘッダのバイト順が逆です" -#: src/copyin.c:1331 +#: src/copyin.c:1260 #, c-format msgid "standard input is closed" msgstr "標準入力が閉じました" -#: src/copyin.c:1497 src/copyout.c:893 src/copypass.c:335 +#: src/copyin.c:1435 src/copyout.c:874 src/copypass.c:332 #, c-format msgid "%lu block\n" msgid_plural "%lu blocks\n" @@ -700,68 +700,68 @@ msgid "%s: value %s %s out of allowed range 0..%s" msgstr "" -#: src/copyout.c:308 +#: src/copyout.c:304 #, c-format msgid "%s: truncating %s" msgstr "%s: %s を切り詰めています" -#: src/copyout.c:343 src/copyout.c:406 src/copyout.c:480 +#: src/copyout.c:339 src/copyout.c:402 src/copyout.c:476 msgid "inode number" msgstr "iノード番号" -#: src/copyout.c:346 src/copyout.c:409 src/copyout.c:484 +#: src/copyout.c:342 src/copyout.c:405 src/copyout.c:480 msgid "file mode" msgstr "ファイルのモード" -#: src/copyout.c:349 src/copyout.c:411 src/copyout.c:488 +#: src/copyout.c:345 src/copyout.c:407 src/copyout.c:484 msgid "uid" msgstr "uid" -#: src/copyout.c:352 src/copyout.c:413 src/copyout.c:492 +#: src/copyout.c:348 src/copyout.c:409 src/copyout.c:488 msgid "gid" msgstr "gid" -#: src/copyout.c:355 src/copyout.c:416 src/copyout.c:496 +#: src/copyout.c:351 src/copyout.c:412 src/copyout.c:492 msgid "number of links" msgstr "リンク数" -#: src/copyout.c:358 src/copyout.c:421 +#: src/copyout.c:354 src/copyout.c:417 msgid "modification time" msgstr "更新日時" -#: src/copyout.c:361 src/copyout.c:428 src/copyout.c:515 +#: src/copyout.c:357 src/copyout.c:424 src/copyout.c:516 msgid "file size" msgstr "ファイルサイズ" -#: src/copyout.c:365 +#: src/copyout.c:361 msgid "device major number" msgstr "デバイスメジャー番号" -#: src/copyout.c:369 +#: src/copyout.c:365 msgid "device minor number" msgstr "デバイスマイナー番号" -#: src/copyout.c:373 +#: src/copyout.c:369 msgid "rdev major" msgstr "rdev メジャー番号" -#: src/copyout.c:377 +#: src/copyout.c:373 msgid "rdev minor" msgstr "rdev マイナー番号" -#: src/copyout.c:381 src/copyout.c:424 src/copyout.c:505 +#: src/copyout.c:377 src/copyout.c:420 src/copyout.c:503 msgid "name size" msgstr "名前のサイズ" -#: src/copyout.c:403 +#: src/copyout.c:399 msgid "device number" msgstr "デバイス番号" -#: src/copyout.c:418 +#: src/copyout.c:414 msgid "rdev" msgstr "rdev" -#: src/copyout.c:476 +#: src/copyout.c:472 #, c-format msgid "%s: truncating inode number" msgstr "%s: iノード番号を切り詰めています" @@ -776,37 +776,37 @@ msgid "%s: value %s %s out of allowed range 0..%lu" msgstr "" -#: src/copyin.c:95 src/copyout.c:562 +#: src/copyout.c:564 #, c-format msgid "%s: file name too long" msgstr "%s: ファイル名が長すぎます" -#: src/copyout.c:619 +#: src/copyout.c:621 #, c-format msgid "standard output is closed" msgstr "標準出力が閉じました" -#: src/copyout.c:640 src/copypass.c:86 +#: src/copyout.c:644 src/copypass.c:99 #, c-format msgid "blank line ignored" msgstr "空行が無視されました" -#: src/copyout.c:775 +#: src/copyout.c:757 #, c-format msgid "%s not dumped: not a regular file" msgstr "%s はダンプされませんでした: 通常ファイルではありません" -#: src/copyout.c:826 +#: src/copyout.c:808 #, c-format msgid "%s: symbolic link too long" msgstr "%s: シンボリックリンクが長すぎます" -#: src/copypass.c:389 +#: src/copypass.c:386 #, c-format msgid "%s linked to %s" msgstr "%s は %s にリンクされました" -#: src/main.c:73 +#: src/main.c:76 msgid "" "GNU `cpio' copies files to and from archives\n" "\n" @@ -828,32 +828,32 @@ " # NAME-LIST にあるファイル名のファイルをディレクトリ DIR にコピーする\n" " cpio -p DIR < NAME-LIST\n" -#: src/main.c:87 +#: src/main.c:92 #, c-format msgid "%s is meaningless with %s" msgstr "%s は %s と併せて指定しても意味がありません" -#: src/main.c:93 +#: src/main.c:98 msgid "Main operation mode:" msgstr "主操作モード:" -#: src/main.c:95 +#: src/main.c:100 msgid "Create the archive (run in copy-out mode)" msgstr "書庫を作成する (copy-out モードで実行)" -#: src/main.c:97 +#: src/main.c:102 msgid "Extract files from an archive (run in copy-in mode)" msgstr "書庫からファイルを抽出する (copy-in モードで実行)" -#: src/main.c:99 +#: src/main.c:104 msgid "Run in copy-pass mode" msgstr "copy-pass モードで実行" -#: src/main.c:101 +#: src/main.c:106 msgid "Print a table of contents of the input" msgstr "入力の目次を表示する" -#: src/main.c:107 +#: src/main.c:112 msgid "Operation modifiers valid in any mode:" msgstr "全てのモードで有効な動作指定:" @@ -865,59 +865,59 @@ msgid "Change to directory DIR" msgstr "ディレクトリ DIR に移動する" -#: src/main.c:112 +#: src/main.c:118 msgid "Archive file is local, even if its name contains colons" msgstr "ファイル名にコロン (:) が含まれていても書庫ファイルをローカルにあるとする" -#: src/main.c:113 tests/genfile.c:154 +#: src/main.c:119 tests/genfile.c:154 msgid "FORMAT" msgstr "FORMAT" -#: src/main.c:114 +#: src/main.c:120 msgid "Use given archive FORMAT" msgstr "書庫の形式として FORMAT を使用する" -#: src/main.c:116 +#: src/main.c:122 msgid "Set the I/O block size to 5120 bytes" msgstr "I/O ブロックサイズを 5120 バイトに設定する" -#: src/main.c:117 +#: src/main.c:123 msgid "BLOCK-SIZE" msgstr "BLOCK-SIZE" -#: src/main.c:118 +#: src/main.c:124 msgid "Set the I/O block size to BLOCK-SIZE * 512 bytes" msgstr "I/O ブロックサイズを BLOCK-SIZE * 512 バイトに設定する" -#: src/main.c:120 +#: src/main.c:126 msgid "Use the old portable (ASCII) archive format" msgstr "古く可搬性のある (ASCII) 書庫形式を使用する" -#: src/main.c:122 +#: src/main.c:128 msgid "Print a \".\" for each file processed" msgstr "ファイルを処理するごとに \".\" を表示する" -#: src/main.c:124 +#: src/main.c:130 msgid "Set the I/O block size to the given NUMBER of bytes" msgstr "I/O ブロックサイズを指定した NUMBER バイトに設定する" -#: src/main.c:136 +#: src/main.c:132 msgid "Do not print the number of blocks copied" msgstr "コピーしたブロック数を表示しない" -#: src/main.c:138 +#: src/main.c:134 msgid "Verbosely list the files processed" msgstr "処理したファイルを冗長に一覧表示する" -#: src/main.c:141 +#: src/main.c:137 msgid "Enable debugging info" msgstr "デバッグ情報を有効にする" -#: src/main.c:143 +#: src/main.c:139 msgid "FLAG" msgstr "FLAG" -#: src/main.c:144 +#: src/main.c:140 msgid "" "Control warning display. Currently FLAG is one of 'none', 'truncate', 'all'. " "Multiple options accumulate." @@ -925,11 +925,11 @@ "警告表示を制御する。現在のところ FLAG は 'none'、'truncate'、'all' " "のうち一つとなる。複数のオプションを指定した時は累積される。" -#: src/main.c:209 +#: src/main.c:141 msgid "[USER][:.][GROUP]" msgstr "[USER][:.][GROUP]" -#: src/main.c:210 +#: src/main.c:142 msgid "" "Set the ownership of all files created to the specified USER and/or GROUP" msgstr "作成する全てのファイルの所有権を USER および/または GROUP で指定されたものに設定する" @@ -938,11 +938,11 @@ msgid "Operation modifiers valid in copy-in and copy-out modes" msgstr "copy-in および copy-out モードで有効な動作指定" -#: src/main.c:109 src/main.c:176 src/main.c:205 +#: src/main.c:148 src/main.c:183 src/main.c:193 msgid "[[USER@]HOST:]FILE-NAME" msgstr "[[USER@]HOST:]FILE-NAME" -#: src/main.c:110 +#: src/main.c:149 msgid "" "Use this FILE-NAME instead of standard input or output. Optional USER and " "HOST specify the user and host names in case of a remote archive" @@ -950,15 +950,15 @@ "標準入力または標準出力の代わりに FILE-NAME を使用する。オプションの USER および HOST " "はリモート書庫操作時のユーザ名およびホスト名として使用する" -#: src/main.c:125 tests/genfile.c:170 +#: src/main.c:150 tests/genfile.c:170 msgid "STRING" msgstr "STRING" -#: src/main.c:126 +#: src/main.c:151 msgid "Print STRING when the end of a volume of the backup media is reached" msgstr "バックアップ媒体のボリュームの終了に達したときに STRING を表示する" -#: src/main.c:133 src/mt.c:182 tests/genfile.c:191 +#: src/main.c:153 src/mt.c:182 tests/genfile.c:191 msgid "COMMAND" msgstr "COMMAND" @@ -966,52 +966,52 @@ msgid "Use COMMAND instead of rsh" msgstr "rsh の代わりに COMMAND を実行する" -#: src/main.c:150 +#: src/main.c:160 msgid "Operation modifiers valid only in copy-in mode:" msgstr "copy-in モードでのみ有効な動作指定:" -#: src/main.c:129 +#: src/main.c:162 msgid "Only copy files that do not match any of the given patterns" msgstr "指定したパターンに一致しないファイルのみコピーする" -#: src/main.c:131 +#: src/main.c:164 msgid "In the verbose table of contents listing, show numeric UID and GID" msgstr "目次一覧の表示を冗長にし、UID および GID を数値で表示する" -#: src/main.c:152 +#: src/main.c:167 msgid "" "Read additional patterns specifying filenames to extract or list from FILE" msgstr "抽出または一覧表示するファイル名を指定する追加のパターンを FILE から読み込む" -#: src/main.c:154 +#: src/main.c:169 msgid "" "When reading a CRC format archive, only verify the CRC's of each file in the " "archive, don't actually extract the files" msgstr "CRC 形式の書庫を読み出すときに、書庫内の各ファイルの CRC を検査するだけで、実際にはファイルを抽出しない" -#: src/main.c:156 +#: src/main.c:171 msgid "Interactively rename files" msgstr "対話的にファイル名を変更する" -#: src/main.c:160 +#: src/main.c:175 msgid "" "Swap both halfwords of words and bytes of halfwords in the data. Equivalent " "to -sS" msgstr "データ内のワード中のハーフワードおよびハーフワード中のバイトを両方とも交換する。 -sS と同等" -#: src/main.c:162 +#: src/main.c:177 msgid "Swap the bytes of each halfword in the files" msgstr "ファイル内の各ハーフワードのバイトを交換する" -#: src/main.c:164 +#: src/main.c:179 msgid "Swap the halfwords of each word (4 bytes) in the files" msgstr "ファイル内の各ワード (4バイト) のバイトを交換する" -#: src/main.c:167 +#: src/main.c:182 msgid "Extract files to standard output" msgstr "ファイルを標準出力に対して抽出する" -#: src/main.c:206 +#: src/main.c:184 msgid "" "Archive filename to use instead of standard input. Optional USER and HOST " "specify the user and host names in case of a remote archive" @@ -1019,15 +1019,15 @@ "標準入力の代わりに FILE-NAME というファイル名の書庫を使用する。オプションの USER および HOST " "はリモート書庫操作時のユーザ名およびホスト名として使用する" -#: src/main.c:173 +#: src/main.c:190 msgid "Operation modifiers valid only in copy-out mode:" msgstr "copy-out モードでのみ有効な動作指定:" -#: src/main.c:175 +#: src/main.c:192 msgid "Append to an existing archive." msgstr "既存の書庫に追加する" -#: src/main.c:177 +#: src/main.c:194 msgid "" "Archive filename to use instead of standard output. Optional USER and HOST " "specify the user and host names in case of a remote archive" @@ -1047,27 +1047,27 @@ msgid "Create device-independent (reproducible) archives" msgstr "デバイスに依存しない (再作成可能な) 書庫を作成する" -#: src/main.c:183 +#: src/main.c:207 msgid "Operation modifiers valid only in copy-pass mode:" msgstr "copy-pass モードでのみ有効な動作指定:" -#: src/main.c:185 +#: src/main.c:209 msgid "Link files instead of copying them, when possible" msgstr "可能な場合にはコピーする代わりにリンクを作成する" -#: src/main.c:192 +#: src/main.c:216 msgid "Operation modifiers valid in copy-in and copy-out modes:" msgstr "copy-in および copy-out モードで有効な動作指定:" -#: src/main.c:194 +#: src/main.c:218 msgid "Do not strip file system prefix components from the file names" msgstr "ファイルシステムに関連して先頭に付加される要素をファイル名から取り除かない" -#: src/main.c:197 +#: src/main.c:221 msgid "Create all files relative to the current directory" msgstr "全てのファイルをカレントディレクトリから相対的に作成する" -#: src/main.c:202 +#: src/main.c:226 msgid "Operation modifiers valid in copy-out and copy-pass modes:" msgstr "copy-out および copy-pass モードで有効な動作指定:" @@ -1076,51 +1076,49 @@ "Filenames in the list are delimited by null characters instead of newlines" msgstr "一覧にあるファイル名が改行の代わりに NULL 文字で区切られているとして扱う" -#: src/main.c:208 +#: src/main.c:230 msgid "" "Dereference symbolic links (copy the files that they point to instead of " "copying the links)." msgstr "シンボリックリンクを辿る (リンクをコピーする代わりにリンクが指すファイルをコピーする)" -#: src/main.c:212 +#: src/main.c:232 msgid "Reset the access times of files after reading them" msgstr "読み込み後にファイルのアクセス日時を元に戻す" -#: src/main.c:218 +#: src/main.c:238 msgid "Operation modifiers valid in copy-in and copy-pass modes:" msgstr "copy-in および copy-pass モードで有効な動作指定:" -#: src/main.c:220 +#: src/main.c:240 msgid "Retain previous file modification times when creating files" msgstr "ファイル作成時に前回ファイル更新日時を取得する" -#: src/main.c:222 +#: src/main.c:242 msgid "Create leading directories where needed" msgstr "必要に応じてディレクトリを作成する" -#: src/main.c:224 +#: src/main.c:244 msgid "Do not change the ownership of the files" msgstr "ファイルの所有権を変更しない" -#: src/main.c:226 +#: src/main.c:246 msgid "Replace all files unconditionally" msgstr "無条件に全てのファイルを置換する" -#: src/main.c:228 +#: src/main.c:248 msgid "Write files with large blocks of zeros as sparse files" msgstr "多数の値が 0 のブロックが存在するファイルを疎な (sparce) ファイルとして書き込む" -#: src/main.c:304 src/main.c:321 -#, c-format +#: src/main.c:324 src/main.c:341 msgid "invalid block size" msgstr "無効なブロックサイズです" -#: src/main.c:310 src/main.c:342 -#, c-format +#: src/main.c:330 src/main.c:366 msgid "Archive format multiply defined" msgstr "書庫の形式が複数回定義されています" -#: src/main.c:360 +#: src/main.c:384 #, c-format msgid "" "invalid archive format `%s'; valid formats are:\n" @@ -1129,27 +1127,24 @@ "`%s' は無効な書庫の形式です。有効な形式:\n" "crc newc odc bin ustar tar (全て大文字でも認識されます)" -#: src/main.c:367 src/main.c:417 src/main.c:431 -#, c-format +#: src/main.c:391 src/main.c:436 src/main.c:450 msgid "Mode already defined" msgstr "モードは既に定義されています" -#: src/main.c:411 -#, c-format +#: src/main.c:430 msgid "--no-preserve-owner cannot be used with --owner" msgstr "--no-preserve-owner は --owner と同時に使用できません" -#: src/main.c:454 -#, c-format +#: src/main.c:485 msgid "--owner cannot be used with --no-preserve-owner" msgstr "--owner は --no-preserve-owner と同時に使用できません" -#: src/main.c:501 +#: src/main.c:532 #, c-format msgid "Invalid value for --warning option: %s" msgstr "--warning オプションに対する無効な値です: %s" -#: src/main.c:531 +#: src/main.c:562 msgid "[destination-directory]" msgstr "[destination-directory]" @@ -1157,59 +1152,53 @@ msgid "You must specify one of -oipt options." msgstr "" -#: src/main.c:589 -#, c-format +#: src/main.c:624 msgid "Both -I and -F are used in copy-in mode" msgstr "-I および -F は copy-in モードで使用されます" -#: src/main.c:601 src/main.c:637 -#, c-format +#: src/main.c:636 src/main.c:676 msgid "Too many arguments" msgstr "引数が多すぎます" -#: src/main.c:620 -#, c-format +#: src/main.c:655 msgid "" "--append is used but no archive file name is given (use -F or -O options)" msgstr "--append が使用されましたがファイル名が指定されていません (-F または -O オプションを使用してください)" -#: src/main.c:626 -#, c-format +#: src/main.c:662 msgid "Both -O and -F are used in copy-out mode" msgstr "copy-out モードで -O および -F の両方が使用されています" -#: src/main.c:639 -#, c-format +#: src/main.c:678 msgid "Not enough arguments" msgstr "十分な引数がありません" -#: src/main.c:643 -#, c-format +#: src/main.c:682 msgid "" "Archive format is not specified in copy-pass mode (use --format option)" msgstr "copy-pass モードで書庫の形式が指定されていません (--format オプションを使用してください)" -#: src/main.c:665 +#: src/main.c:708 #, c-format msgid "-F can be used only with --create or --extract" msgstr "-F は --create または --extract と併せてのみ使用できます" -#: src/main.c:668 +#: src/main.c:711 #, c-format msgid "Cannot open %s" msgstr "%s を開けません" -#: src/main.c:740 +#: src/main.c:783 #, c-format msgid "error closing archive" msgstr "書庫を閉じるときにエラーが発生しました" -#: src/makepath.c:96 src/makepath.c:155 +#: src/makepath.c:82 src/makepath.c:129 #, c-format msgid "cannot make directory `%s'" msgstr "ディレクトリ `%s' を作成できません" -#: src/makepath.c:131 src/makepath.c:181 +#: src/makepath.c:105 src/makepath.c:155 #, c-format msgid "`%s' exists but is not a directory" msgstr "`%s' は存在しますがディレクトリではありません" @@ -1268,20 +1257,20 @@ msgid "%s: rmtclose failed" msgstr "%s: rmtclose が失敗しました" -#: src/tar.c:309 +#: src/tar.c:303 #, c-format msgid "invalid header: checksum error" msgstr "無効なヘッダ: チェックサムエラー" -#: src/userspec.c:116 +#: src/userspec.c:122 msgid "invalid user" msgstr "無効なユーザ" -#: src/userspec.c:122 +#: src/userspec.c:128 msgid "cannot get the login group of a numeric UID" msgstr "数字のUIDのログイングループを取得できません" -#: src/userspec.c:162 +#: src/userspec.c:175 msgid "invalid group" msgstr "無効なグループ" @@ -1290,74 +1279,74 @@ msgid "write error: partial write" msgstr "書き込みエラー: 部分書き込み" -#: src/util.c:207 src/util.c:376 +#: src/util.c:210 src/util.c:376 #, c-format msgid "read error" msgstr "読み取りエラー" -#: src/util.c:210 +#: src/util.c:212 #, c-format msgid "premature end of file" msgstr "予期しないファイル終端 (EOF) です" -#: src/util.c:495 src/util.c:545 +#: src/util.c:495 src/util.c:546 #, c-format msgid "File %s shrunk by %s byte, padding with zeros" msgid_plural "File %s shrunk by %s bytes, padding with zeros" msgstr[0] "ファイル %s は %s バイト縮められ、ゼロで埋められます" -#: src/util.c:501 src/util.c:551 +#: src/util.c:502 src/util.c:553 #, c-format msgid "Read error at byte %lld in file %s, padding with zeros" msgstr "ファイル %2$s の %1$lld バイトで読み取りエラーが発生しました。ゼロで埋められます" -#: src/util.c:586 +#: src/util.c:588 #, c-format msgid "File %s grew, % new byte not copied" msgid_plural "File %s grew, % new bytes not copied" msgstr[0] "ファイル %s は大きくなり、新しい % バイトはコピーされません" -#: src/util.c:592 +#: src/util.c:594 #, c-format msgid "File %s was modified while being copied" msgstr "ファイル %s はコピー中に更新されました" -#: src/util.c:620 +#: src/util.c:608 #, c-format msgid "virtual memory exhausted" msgstr "仮想メモリを使い果たしました" -#: src/util.c:626 +#: src/util.c:614 #, c-format msgid "Creating intermediate directory `%s'" msgstr "中間ディレクトリ `%s' を作成しています" -#: src/util.c:663 src/util.c:669 +#: src/util.c:651 src/util.c:657 #, c-format msgid "cannot seek on output" msgstr "出力を seek できません" -#: src/util.c:841 +#: src/util.c:875 #, c-format msgid "Found end of tape. Load next tape and press RETURN. " msgstr "テープ終端に達しました。次のテープを入れて RETURN を押してください。 " -#: src/util.c:843 +#: src/util.c:877 #, c-format msgid "Found end of tape. To continue, type device/file name when ready.\n" msgstr "テープ終端に達しました。準備が完了したら、継続するためにデバイス名/ファイル名を入力してください。\n" -#: src/util.c:866 +#: src/util.c:900 #, c-format msgid "To continue, type device/file name when ready.\n" msgstr "準備が完了したら、継続するためにデバイス名/ファイル名を入力してください。\n" -#: src/util.c:891 +#: src/util.c:925 #, c-format msgid "internal error: tape descriptor changed from %d to %d" msgstr "内部エラー: テープの記述子が %d から %d に変更されました" -#: src/util.c:1610 +#: src/util.c:1487 #, c-format msgid "%s is not a directory" msgstr "%s はディレクトリではありません" @@ -1508,7 +1497,7 @@ msgid "Negative size: %s" msgstr "負のサイズです: %s" -#: tests/genfile.c:266 tests/genfile.c:568 +#: tests/genfile.c:266 tests/genfile.c:630 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) に失敗しました" @@ -1537,8 +1526,8 @@ msgid "[ARGS...]" msgstr "[ARGS...]" -#: tests/genfile.c:429 tests/genfile.c:469 tests/genfile.c:522 -#: tests/genfile.c:672 tests/genfile.c:686 +#: tests/genfile.c:429 tests/genfile.c:469 tests/genfile.c:571 +#: tests/genfile.c:734 tests/genfile.c:748 #, c-format msgid "cannot open `%s'" msgstr "`%s' を開くことができません" @@ -1552,22 +1541,22 @@ msgid "file name contains null character" msgstr "ファイル名に NULL 文字が含まれています" -#: tests/genfile.c:517 +#: tests/genfile.c:566 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "疎な (sparse) ファイルを標準出力に対して生成できません。--file オプションを使用してください" -#: tests/genfile.c:595 +#: tests/genfile.c:657 #, c-format msgid "incorrect mask (near `%s')" msgstr "無効なマスクです (`%s' 周辺)" -#: tests/genfile.c:601 tests/genfile.c:634 +#: tests/genfile.c:663 tests/genfile.c:696 #, c-format msgid "Unknown field `%s'" msgstr "`%s' は不明なフィールドです" -#: tests/genfile.c:661 +#: tests/genfile.c:723 #, c-format msgid "cannot set time on `%s'" msgstr "`%s' の時間を設定できません" @@ -1582,42 +1571,42 @@ msgid "command failed: %s" msgstr "コマンドに失敗: %s" -#: tests/genfile.c:700 +#: tests/genfile.c:767 #, c-format msgid "cannot unlink `%s'" msgstr "`%s' を unlink できません" -#: tests/genfile.c:826 +#: tests/genfile.c:894 #, c-format msgid "Command exited successfully\n" msgstr "コマンドは正常に終了しました\n" -#: tests/genfile.c:828 +#: tests/genfile.c:896 #, c-format msgid "Command failed with status %d\n" msgstr "コマンドは終了コード %d で終了しました\n" -#: tests/genfile.c:832 +#: tests/genfile.c:900 #, c-format msgid "Command terminated on signal %d\n" msgstr "コマンドはシグナル %d により終了しました\n" -#: tests/genfile.c:834 +#: tests/genfile.c:902 #, c-format msgid "Command stopped on signal %d\n" msgstr "コマンドはシグナル %d により中断されました\n" -#: tests/genfile.c:837 +#: tests/genfile.c:905 #, c-format msgid "Command dumped core\n" msgstr "コマンドはコアダンプしました\n" -#: tests/genfile.c:840 +#: tests/genfile.c:908 #, c-format msgid "Command terminated\n" msgstr "コマンドは終了しました\n" -#: tests/genfile.c:872 +#: tests/genfile.c:940 #, c-format msgid "--stat requires file names" msgstr "--stat はファイル名が必要です" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cpplib.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cpplib.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cpplib.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cpplib.po 2022-02-11 23:04:24.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: 2021-08-02 18:52+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cracklib.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cracklib.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cracklib.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cracklib.po 2022-02-11 23:04:19.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: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: \n" #: lib/fascist.c:516 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cryptsetup.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cryptsetup.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cryptsetup.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cryptsetup.po 2022-02-11 23:04:19.000000000 +0000 @@ -14,66 +14,66 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:01+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:54+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: lib/libdevmapper.c:405 +#: lib/libdevmapper.c:396 msgid "Cannot initialize device-mapper, running as non-root user." msgstr "" -#: lib/libdevmapper.c:408 +#: lib/libdevmapper.c:399 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?" msgstr "" -#: lib/libdevmapper.c:1149 +#: lib/libdevmapper.c:1170 msgid "Requested deferred flag is not supported." msgstr "" -#: lib/libdevmapper.c:1216 +#: lib/libdevmapper.c:1239 #, c-format msgid "DM-UUID for device %s was truncated." msgstr "" -#: lib/libdevmapper.c:1547 +#: lib/libdevmapper.c:1567 msgid "Unknown dm target type." msgstr "" -#: lib/libdevmapper.c:1660 lib/libdevmapper.c:1665 lib/libdevmapper.c:1725 -#: lib/libdevmapper.c:1728 +#: lib/libdevmapper.c:1688 lib/libdevmapper.c:1693 lib/libdevmapper.c:1757 +#: lib/libdevmapper.c:1760 msgid "Requested dm-crypt performance options are not supported." msgstr "" -#: lib/libdevmapper.c:1672 lib/libdevmapper.c:1676 +#: lib/libdevmapper.c:1700 lib/libdevmapper.c:1704 msgid "" "Requested dm-verity data corruption handling options are not supported." msgstr "" -#: lib/libdevmapper.c:1680 +#: lib/libdevmapper.c:1708 msgid "Requested dm-verity FEC options are not supported." msgstr "" -#: lib/libdevmapper.c:1684 +#: lib/libdevmapper.c:1712 msgid "Requested data integrity options are not supported." msgstr "" -#: lib/libdevmapper.c:1686 +#: lib/libdevmapper.c:1714 msgid "Requested sector_size option is not supported." msgstr "" -#: lib/libdevmapper.c:1691 +#: lib/libdevmapper.c:1719 lib/libdevmapper.c:1723 msgid "Requested automatic recalculation of integrity tags is not supported." msgstr "" -#: lib/libdevmapper.c:1699 +#: lib/libdevmapper.c:1731 msgid "Requested dm-integrity bitmap mode is not supported." msgstr "" -#: lib/libdevmapper.c:1695 lib/libdevmapper.c:1731 lib/libdevmapper.c:1734 -#: lib/luks2/luks2_json_metadata.c:2170 +#: lib/libdevmapper.c:1727 lib/libdevmapper.c:1763 lib/libdevmapper.c:1766 +#: lib/luks2/luks2_json_metadata.c:2204 msgid "Discard/TRIM is not supported." msgstr "" -#: lib/libdevmapper.c:2663 +#: lib/libdevmapper.c:2705 #, c-format msgid "Failed to query dm-%s segment." msgstr "" @@ -106,60 +106,60 @@ msgid "Error reading from RNG." msgstr "" -#: lib/setup.c:229 +#: lib/setup.c:226 msgid "Cannot initialize crypto RNG backend." msgstr "" -#: lib/setup.c:235 +#: lib/setup.c:232 msgid "Cannot initialize crypto backend." msgstr "" -#: lib/setup.c:266 lib/setup.c:2046 lib/verity/verity.c:119 +#: lib/setup.c:263 lib/setup.c:2079 lib/verity/verity.c:119 #, c-format msgid "Hash algorithm %s not supported." msgstr "" -#: lib/setup.c:269 lib/loopaes/loopaes.c:90 +#: lib/setup.c:266 lib/loopaes/loopaes.c:90 #, c-format msgid "Key processing error (using hash %s)." msgstr "" -#: lib/setup.c:335 lib/setup.c:362 +#: lib/setup.c:332 lib/setup.c:359 msgid "Cannot determine device type. Incompatible activation of device?" msgstr "" -#: lib/setup.c:341 lib/setup.c:3050 +#: lib/setup.c:338 lib/setup.c:3142 msgid "This operation is supported only for LUKS device." msgstr "" -#: lib/setup.c:368 +#: lib/setup.c:365 msgid "This operation is supported only for LUKS2 device." msgstr "" -#: lib/setup.c:423 lib/luks2/luks2_reencrypt.c:2345 +#: lib/setup.c:420 lib/luks2/luks2_reencrypt.c:2440 msgid "All key slots full." msgstr "" -#: lib/setup.c:434 +#: lib/setup.c:431 #, c-format msgid "Key slot %d is invalid, please select between 0 and %d." msgstr "" -#: lib/setup.c:440 +#: lib/setup.c:437 #, c-format msgid "Key slot %d is full, please select another one." msgstr "" -#: lib/setup.c:525 lib/setup.c:2824 +#: lib/setup.c:522 lib/setup.c:2900 msgid "Device size is not aligned to device logical block size." msgstr "" -#: lib/setup.c:624 +#: lib/setup.c:620 #, c-format msgid "Header detected but device %s is too small." msgstr "" -#: lib/setup.c:661 +#: lib/setup.c:661 lib/setup.c:2845 msgid "This operation is not supported for this device type." msgstr "" @@ -167,284 +167,285 @@ msgid "Illegal operation with reencryption in-progress." msgstr "" -#: lib/setup.c:832 lib/luks1/keymanage.c:475 +#: lib/setup.c:834 lib/luks1/keymanage.c:527 #, c-format msgid "Unsupported LUKS version %d." msgstr "" -#: lib/setup.c:849 lib/setup.c:1539 lib/setup.c:1959 +#: lib/setup.c:1542 lib/setup.c:1992 msgid "Detached metadata device is not supported for this crypt type." msgstr "" -#: lib/setup.c:1427 lib/setup.c:2544 lib/setup.c:2616 lib/setup.c:2628 -#: lib/setup.c:2777 lib/setup.c:4517 +#: lib/setup.c:1430 lib/setup.c:2610 lib/setup.c:2683 lib/setup.c:2695 +#: lib/setup.c:2853 lib/setup.c:4643 #, c-format msgid "Device %s is not active." msgstr "" -#: lib/setup.c:1444 +#: lib/setup.c:1447 #, c-format msgid "Underlying device for crypt device %s disappeared." msgstr "" -#: lib/setup.c:1524 +#: lib/setup.c:1527 msgid "Invalid plain crypt parameters." msgstr "" -#: lib/setup.c:1529 lib/setup.c:1949 src/integritysetup.c:74 +#: lib/setup.c:1532 lib/setup.c:1982 msgid "Invalid key size." msgstr "" -#: lib/setup.c:1534 lib/setup.c:1954 lib/setup.c:2157 +#: lib/setup.c:1537 lib/setup.c:1987 lib/setup.c:2190 msgid "UUID is not supported for this crypt type." msgstr "" -#: lib/setup.c:1549 lib/setup.c:1739 lib/luks2/luks2_reencrypt.c:2308 -#: src/cryptsetup.c:1238 src/cryptsetup.c:3945 +#: lib/setup.c:1552 lib/setup.c:1754 lib/luks2/luks2_reencrypt.c:2401 +#: src/cryptsetup.c:1358 src/cryptsetup.c:3723 msgid "Unsupported encryption sector size." msgstr "" -#: lib/setup.c:1557 lib/setup.c:1864 lib/setup.c:2818 +#: lib/setup.c:1560 lib/setup.c:1895 lib/setup.c:2894 msgid "Device size is not aligned to requested sector size." msgstr "" -#: lib/setup.c:1608 lib/setup.c:1727 +#: lib/setup.c:1612 lib/setup.c:1732 msgid "Can't format LUKS without device." msgstr "" -#: lib/setup.c:1614 lib/setup.c:1733 +#: lib/setup.c:1618 lib/setup.c:1738 msgid "Requested data alignment is not compatible with data offset." msgstr "" -#: lib/setup.c:1682 lib/setup.c:1851 +#: lib/setup.c:1686 lib/setup.c:1882 msgid "WARNING: Data offset is outside of currently available data device.\n" msgstr "" -#: lib/setup.c:1692 lib/setup.c:1879 lib/setup.c:1900 lib/setup.c:2169 +#: lib/setup.c:1696 lib/setup.c:1912 lib/setup.c:1933 lib/setup.c:2202 #, c-format msgid "Cannot wipe header on device %s." msgstr "" -#: lib/setup.c:1744 +#: lib/setup.c:1763 msgid "" "WARNING: The device activation will fail, dm-crypt is missing support for " "requested encryption sector size.\n" msgstr "" -#: lib/setup.c:1766 +#: lib/setup.c:1786 msgid "Volume key is too small for encryption with integrity extensions." msgstr "" -#: lib/setup.c:1821 +#: lib/setup.c:1856 #, c-format msgid "Cipher %s-%s (key size %zd bits) is not available." msgstr "" -#: lib/setup.c:1854 +#: lib/setup.c:1885 #, c-format msgid "WARNING: LUKS2 metadata size changed to % bytes.\n" msgstr "" -#: lib/setup.c:1858 +#: lib/setup.c:1889 #, c-format msgid "WARNING: LUKS2 keyslots area size changed to % bytes.\n" msgstr "" -#: lib/setup.c:1882 lib/utils_device.c:834 lib/luks1/keyencryption.c:255 -#: lib/luks2/luks2_reencrypt.c:2356 lib/luks2/luks2_reencrypt.c:3367 +#: lib/setup.c:1915 lib/utils_device.c:909 lib/luks1/keyencryption.c:255 +#: lib/luks2/luks2_reencrypt.c:2451 lib/luks2/luks2_reencrypt.c:3488 #, c-format msgid "Device %s is too small." msgstr "" -#: lib/setup.c:1893 lib/setup.c:1919 +#: lib/setup.c:1926 lib/setup.c:1952 #, c-format msgid "Cannot format device %s in use." msgstr "" -#: lib/setup.c:1896 lib/setup.c:1922 +#: lib/setup.c:1929 lib/setup.c:1955 #, c-format msgid "Cannot format device %s, permission denied." msgstr "" -#: lib/setup.c:1908 lib/setup.c:2229 +#: lib/setup.c:1941 lib/setup.c:2262 #, c-format msgid "Cannot format integrity for device %s." msgstr "" -#: lib/setup.c:1926 +#: lib/setup.c:1959 #, c-format msgid "Cannot format device %s." msgstr "" -#: lib/setup.c:1944 +#: lib/setup.c:1977 msgid "Can't format LOOPAES without device." msgstr "" -#: lib/setup.c:1989 +#: lib/setup.c:2022 msgid "Can't format VERITY without device." msgstr "" -#: lib/setup.c:2000 lib/verity/verity.c:102 +#: lib/setup.c:2033 lib/verity/verity.c:102 #, c-format msgid "Unsupported VERITY hash type %d." msgstr "" -#: lib/setup.c:2006 lib/verity/verity.c:110 +#: lib/setup.c:2039 lib/verity/verity.c:110 msgid "Unsupported VERITY block size." msgstr "" -#: lib/setup.c:2011 lib/verity/verity.c:74 +#: lib/setup.c:2044 lib/verity/verity.c:74 msgid "Unsupported VERITY hash offset." msgstr "" -#: lib/setup.c:2016 +#: lib/setup.c:2049 msgid "Unsupported VERITY FEC offset." msgstr "" -#: lib/setup.c:2040 +#: lib/setup.c:2073 msgid "Data area overlaps with hash area." msgstr "" -#: lib/setup.c:2065 +#: lib/setup.c:2098 msgid "Hash area overlaps with FEC area." msgstr "" -#: lib/setup.c:2072 +#: lib/setup.c:2105 msgid "Data area overlaps with FEC area." msgstr "" -#: lib/setup.c:2286 +#: lib/setup.c:2320 #, c-format msgid "Unknown crypt device type %s requested." msgstr "" -#: lib/setup.c:2550 lib/setup.c:2622 lib/setup.c:2635 +#: lib/setup.c:2616 lib/setup.c:2688 lib/setup.c:2701 #, c-format msgid "Unsupported parameters on device %s." msgstr "" -#: lib/setup.c:2556 lib/setup.c:2641 lib/luks2/luks2_reencrypt.c:2408 -#: lib/luks2/luks2_reencrypt.c:2737 +#: lib/setup.c:2622 lib/setup.c:2708 lib/luks2/luks2_reencrypt.c:2503 +#: lib/luks2/luks2_reencrypt.c:2847 #, c-format msgid "Mismatching parameters on device %s." msgstr "" -#: lib/setup.c:2661 +#: lib/setup.c:2728 msgid "Crypt devices mismatch." msgstr "" -#: lib/setup.c:2698 lib/setup.c:2703 lib/luks2/luks2_reencrypt.c:2054 -#: lib/luks2/luks2_reencrypt.c:3145 +#: lib/setup.c:2765 lib/setup.c:2770 lib/luks2/luks2_reencrypt.c:2143 +#: lib/luks2/luks2_reencrypt.c:3255 #, c-format msgid "Failed to reload device %s." msgstr "" -#: lib/setup.c:2708 lib/setup.c:2713 lib/luks2/luks2_reencrypt.c:2025 -#: lib/luks2/luks2_reencrypt.c:2032 +#: lib/setup.c:2776 lib/setup.c:2782 lib/luks2/luks2_reencrypt.c:2114 +#: lib/luks2/luks2_reencrypt.c:2121 #, c-format msgid "Failed to suspend device %s." msgstr "" -#: lib/setup.c:2718 lib/luks2/luks2_reencrypt.c:2039 -#: lib/luks2/luks2_reencrypt.c:3080 lib/luks2/luks2_reencrypt.c:3149 +#: lib/setup.c:2788 lib/luks2/luks2_reencrypt.c:2128 +#: lib/luks2/luks2_reencrypt.c:3190 lib/luks2/luks2_reencrypt.c:3259 #, c-format msgid "Failed to resume device %s." msgstr "" -#: lib/setup.c:2732 +#: lib/setup.c:2803 #, c-format msgid "Fatal error while reloading device %s (on top of device %s)." msgstr "" -#: lib/setup.c:2735 lib/setup.c:2737 +#: lib/setup.c:2806 lib/setup.c:2808 #, c-format msgid "Failed to switch device %s to dm-error." msgstr "" -#: lib/setup.c:2809 +#: lib/setup.c:2885 msgid "Cannot resize loop device." msgstr "" -#: lib/setup.c:2882 +#: lib/setup.c:2958 msgid "Do you really want to change UUID of device?" msgstr "" -#: lib/setup.c:2958 +#: lib/setup.c:3034 msgid "Header backup file does not contain compatible LUKS header." msgstr "" -#: lib/setup.c:3058 +#: lib/setup.c:3150 #, c-format msgid "Volume %s is not active." msgstr "" -#: lib/setup.c:3069 +#: lib/setup.c:3161 #, c-format msgid "Volume %s is already suspended." msgstr "" -#: lib/setup.c:3082 +#: lib/setup.c:3174 #, c-format msgid "Suspend is not supported for device %s." msgstr "" -#: lib/setup.c:3084 +#: lib/setup.c:3176 #, c-format msgid "Error during suspending device %s." msgstr "" -#: lib/setup.c:3117 lib/setup.c:3184 lib/setup.c:3267 +#: lib/setup.c:3248 lib/setup.c:3296 lib/setup.c:3366 #, c-format msgid "Volume %s is not suspended." msgstr "" -#: lib/setup.c:3146 +#: lib/setup.c:3212 #, c-format msgid "Resume is not supported for device %s." msgstr "" -#: lib/setup.c:3148 lib/setup.c:3216 lib/setup.c:3297 +#: lib/setup.c:3214 #, c-format msgid "Error during resuming device %s." msgstr "" -#: lib/setup.c:3343 lib/setup.c:3531 +#: lib/setup.c:3428 lib/setup.c:3633 msgid "Cannot add key slot, all slots disabled and no volume key provided." msgstr "" -#: lib/setup.c:3483 +#: lib/setup.c:3585 msgid "Failed to swap new key slot." msgstr "" -#: lib/setup.c:3282 lib/setup.c:3648 lib/setup.c:4314 lib/setup.c:4327 -#: lib/setup.c:4335 lib/setup.c:4348 lib/setup.c:4698 lib/setup.c:5844 +#: lib/setup.c:3381 lib/setup.c:3750 lib/setup.c:4423 lib/setup.c:4436 +#: lib/setup.c:4444 lib/setup.c:4457 lib/setup.c:4826 lib/setup.c:6008 msgid "Volume key does not match the volume." msgstr "" -#: lib/setup.c:3669 +#: lib/setup.c:3771 #, c-format msgid "Key slot %d is invalid." msgstr "" -#: lib/setup.c:3675 src/cryptsetup.c:1584 src/cryptsetup.c:1929 +#: lib/setup.c:3777 src/cryptsetup.c:1701 src/cryptsetup.c:2041 +#: src/cryptsetup.c:2632 src/cryptsetup.c:2689 #, c-format msgid "Keyslot %d is not active." msgstr "" -#: lib/setup.c:3694 +#: lib/setup.c:3796 msgid "Device header overlaps with data area." msgstr "" -#: lib/setup.c:3981 +#: lib/setup.c:4089 msgid "Reencryption in-progress. Cannot activate device." msgstr "" -#: lib/setup.c:3983 lib/luks2/luks2_json_metadata.c:2253 -#: lib/luks2/luks2_reencrypt.c:2836 +#: lib/setup.c:4091 lib/luks2/luks2_json_metadata.c:2287 +#: lib/luks2/luks2_reencrypt.c:2946 msgid "Failed to get reencryption lock." msgstr "" -#: lib/setup.c:3996 lib/luks2/luks2_reencrypt.c:2855 +#: lib/setup.c:4104 lib/luks2/luks2_reencrypt.c:2965 msgid "LUKS2 reencryption recovery failed." msgstr "" @@ -452,63 +453,63 @@ msgid "Device type is not properly initialised." msgstr "" -#: lib/setup.c:4182 +#: lib/setup.c:4290 #, c-format msgid "Cannot use device %s, name is invalid or still in use." msgstr "" -#: lib/setup.c:4175 +#: lib/setup.c:4283 #, c-format msgid "Device %s already exists." msgstr "" -#: lib/setup.c:4301 +#: lib/setup.c:4410 msgid "Incorrect volume key specified for plain device." msgstr "" -#: lib/setup.c:4410 +#: lib/setup.c:4526 msgid "Incorrect root hash specified for verity device." msgstr "" -#: lib/setup.c:4496 lib/setup.c:4512 lib/luks2/luks2_json_metadata.c:2306 -#: src/cryptsetup.c:2676 +#: lib/setup.c:4622 lib/setup.c:4638 lib/luks2/luks2_json_metadata.c:2340 +#: src/cryptsetup.c:2785 #, c-format msgid "Device %s is still in use." msgstr "" -#: lib/setup.c:4521 +#: lib/setup.c:4647 #, c-format msgid "Invalid device %s." msgstr "" -#: lib/setup.c:4637 +#: lib/setup.c:4763 msgid "Volume key buffer too small." msgstr "" -#: lib/setup.c:4645 +#: lib/setup.c:4771 msgid "Cannot retrieve volume key for plain device." msgstr "" -#: lib/setup.c:4664 +#: lib/setup.c:4792 #, c-format msgid "This operation is not supported for %s crypt device." msgstr "" -#: lib/setup.c:4870 +#: lib/setup.c:4998 lib/setup.c:5009 msgid "Dump operation is not supported for this device type." msgstr "" -#: lib/setup.c:5195 +#: lib/setup.c:5337 #, c-format msgid "Data offset is not multiple of %u bytes." msgstr "" -#: lib/setup.c:5480 +#: lib/setup.c:5622 #, c-format msgid "Cannot convert device %s which is still in use." msgstr "" -#: lib/setup.c:5777 +#: lib/setup.c:5941 #, c-format msgid "Failed to assign keyslot %u as the new volume key." msgstr "" @@ -517,25 +518,25 @@ msgid "Failed to initialise default LUKS2 keyslot parameters." msgstr "" -#: lib/setup.c:5856 +#: lib/setup.c:6020 #, c-format msgid "Failed to assign keyslot %d to digest." msgstr "" -#: lib/setup.c:4443 lib/setup.c:5920 +#: lib/setup.c:4559 lib/setup.c:6084 msgid "Failed to load key in kernel keyring." msgstr "" -#: lib/setup.c:5987 +#: lib/setup.c:6151 msgid "Kernel keyring is not supported by the kernel." msgstr "" -#: lib/setup.c:5997 lib/luks2/luks2_reencrypt.c:2952 +#: lib/setup.c:6161 lib/luks2/luks2_reencrypt.c:3062 #, c-format msgid "Failed to read passphrase from keyring (error %d)." msgstr "" -#: lib/setup.c:6021 +#: lib/setup.c:6185 msgid "Failed to acquire global memory-hard access serialization lock." msgstr "" @@ -547,7 +548,7 @@ msgid "Cannot unlock memory." msgstr "" -#: lib/utils.c:168 lib/tcrypt/tcrypt.c:497 +#: lib/utils.c:168 lib/tcrypt/tcrypt.c:502 msgid "Failed to open key file." msgstr "" @@ -555,32 +556,32 @@ msgid "Cannot read keyfile from a terminal." msgstr "" -#: lib/utils.c:190 +#: lib/utils.c:189 msgid "Failed to stat key file." msgstr "" -#: lib/utils.c:198 lib/utils.c:219 +#: lib/utils.c:197 lib/utils.c:218 msgid "Cannot seek to requested keyfile offset." msgstr "" -#: lib/utils.c:213 lib/utils.c:228 src/utils_password.c:188 -#: src/utils_password.c:201 +#: lib/utils.c:212 lib/utils.c:227 src/utils_password.c:219 +#: src/utils_password.c:231 msgid "Out of memory while reading passphrase." msgstr "" -#: lib/utils.c:248 +#: lib/utils.c:247 msgid "Error reading passphrase." msgstr "" -#: lib/utils.c:265 +#: lib/utils.c:264 msgid "Nothing to read on input." msgstr "" -#: lib/utils.c:272 +#: lib/utils.c:271 msgid "Maximum keyfile size exceeded." msgstr "" -#: lib/utils.c:277 +#: lib/utils.c:276 msgid "Cannot read requested amount of data." msgstr "" @@ -590,47 +591,47 @@ msgid "Device %s doesn't exist or access denied." msgstr "" -#: lib/utils_device.c:197 +#: lib/utils_device.c:218 #, c-format msgid "Device %s is not compatible." msgstr "" -#: lib/utils_device.c:648 +#: lib/utils_device.c:720 #, c-format msgid "Device %s is too small. Need at least % bytes." msgstr "" -#: lib/utils_device.c:729 +#: lib/utils_device.c:801 #, c-format msgid "Cannot use device %s which is in use (already mapped or mounted)." msgstr "" -#: lib/utils_device.c:733 +#: lib/utils_device.c:805 #, c-format msgid "Cannot use device %s, permission denied." msgstr "" -#: lib/utils_device.c:736 +#: lib/utils_device.c:808 #, c-format msgid "Cannot get info about device %s." msgstr "" -#: lib/utils_device.c:759 +#: lib/utils_device.c:831 msgid "Cannot use a loopback device, running as non-root user." msgstr "" -#: lib/utils_device.c:769 +#: lib/utils_device.c:842 msgid "" "Attaching loopback device failed (loop device with autoclear flag is " "required)." msgstr "" -#: lib/utils_device.c:815 +#: lib/utils_device.c:890 #, c-format msgid "Requested offset is beyond real size of device %s." msgstr "" -#: lib/utils_device.c:823 +#: lib/utils_device.c:898 #, c-format msgid "Device %s has zero size." msgstr "" @@ -716,8 +717,8 @@ "Locking aborted. The locking path %s/%s is unusable (%s is not a directory)." msgstr "" -#: lib/utils_wipe.c:184 src/cryptsetup_reencrypt.c:941 -#: src/cryptsetup_reencrypt.c:1025 +#: lib/utils_wipe.c:184 src/cryptsetup_reencrypt.c:922 +#: src/cryptsetup_reencrypt.c:1010 msgid "Cannot seek to device offset." msgstr "" @@ -741,9 +742,9 @@ msgid "Cipher specification should be in [cipher]-[mode]-[iv] format." msgstr "" -#: lib/luks1/keyencryption.c:97 lib/luks1/keymanage.c:344 -#: lib/luks1/keymanage.c:635 lib/luks1/keymanage.c:1080 -#: lib/luks2/luks2_json_metadata.c:1260 lib/luks2/luks2_keyslot.c:734 +#: lib/luks1/keyencryption.c:97 lib/luks1/keymanage.c:364 +#: lib/luks1/keymanage.c:674 lib/luks1/keymanage.c:1125 +#: lib/luks2/luks2_json_metadata.c:1276 lib/luks2/luks2_keyslot.c:740 #, c-format msgid "Cannot write to device %s, permission denied." msgstr "" @@ -761,13 +762,13 @@ msgid "IO error while encrypting keyslot." msgstr "" -#: lib/luks1/keyencryption.c:246 lib/luks1/keymanage.c:347 -#: lib/luks1/keymanage.c:588 lib/luks1/keymanage.c:638 lib/tcrypt/tcrypt.c:670 -#: lib/verity/verity.c:80 lib/verity/verity.c:178 lib/verity/verity_hash.c:311 -#: lib/verity/verity_hash.c:322 lib/verity/verity_hash.c:342 -#: lib/verity/verity_fec.c:241 lib/verity/verity_fec.c:253 -#: lib/verity/verity_fec.c:258 lib/luks2/luks2_json_metadata.c:1263 -#: src/cryptsetup_reencrypt.c:200 src/cryptsetup_reencrypt.c:212 +#: lib/luks1/keyencryption.c:246 lib/luks1/keymanage.c:367 +#: lib/luks1/keymanage.c:627 lib/luks1/keymanage.c:677 lib/tcrypt/tcrypt.c:677 +#: lib/verity/verity.c:80 lib/verity/verity.c:193 lib/verity/verity_hash.c:320 +#: lib/verity/verity_hash.c:329 lib/verity/verity_hash.c:349 +#: lib/verity/verity_fec.c:251 lib/verity/verity_fec.c:263 +#: lib/verity/verity_fec.c:268 lib/luks2/luks2_json_metadata.c:1279 +#: src/cryptsetup_reencrypt.c:177 src/cryptsetup_reencrypt.c:189 #, c-format msgid "Cannot open device %s." msgstr "" @@ -776,40 +777,40 @@ msgid "IO error while decrypting keyslot." msgstr "" -#: lib/luks1/keymanage.c:110 +#: lib/luks1/keymanage.c:130 #, c-format msgid "Device %s is too small. (LUKS1 requires at least % bytes.)" msgstr "" -#: lib/luks1/keymanage.c:131 lib/luks1/keymanage.c:139 -#: lib/luks1/keymanage.c:151 lib/luks1/keymanage.c:162 -#: lib/luks1/keymanage.c:174 +#: lib/luks1/keymanage.c:151 lib/luks1/keymanage.c:159 +#: lib/luks1/keymanage.c:171 lib/luks1/keymanage.c:182 +#: lib/luks1/keymanage.c:194 #, c-format msgid "LUKS keyslot %u is invalid." msgstr "" -#: lib/luks1/keymanage.c:228 lib/luks1/keymanage.c:472 -#: lib/luks2/luks2_json_metadata.c:1091 src/cryptsetup.c:1445 -#: src/cryptsetup.c:1571 src/cryptsetup.c:1628 src/cryptsetup.c:1684 -#: src/cryptsetup.c:1751 src/cryptsetup.c:1854 src/cryptsetup.c:1918 -#: src/cryptsetup.c:2148 src/cryptsetup.c:2343 src/cryptsetup.c:2403 -#: src/cryptsetup.c:2469 src/cryptsetup.c:2633 src/cryptsetup.c:3291 -#: src/cryptsetup.c:3300 src/cryptsetup_reencrypt.c:1388 +#: lib/luks1/keymanage.c:248 lib/luks1/keymanage.c:524 +#: lib/luks2/luks2_json_metadata.c:1107 src/cryptsetup.c:1557 +#: src/cryptsetup.c:1688 src/cryptsetup.c:1743 src/cryptsetup.c:1798 +#: src/cryptsetup.c:1863 src/cryptsetup.c:1966 src/cryptsetup.c:2030 +#: src/cryptsetup.c:2259 src/cryptsetup.c:2472 src/cryptsetup.c:2532 +#: src/cryptsetup.c:2597 src/cryptsetup.c:2741 src/cryptsetup.c:3423 +#: src/cryptsetup.c:3432 src/cryptsetup_reencrypt.c:1373 #, c-format msgid "Device %s is not a valid LUKS device." msgstr "" -#: lib/luks1/keymanage.c:246 lib/luks2/luks2_json_metadata.c:1108 +#: lib/luks1/keymanage.c:266 lib/luks2/luks2_json_metadata.c:1124 #, c-format msgid "Requested header backup file %s already exists." msgstr "" -#: lib/luks1/keymanage.c:248 lib/luks2/luks2_json_metadata.c:1110 +#: lib/luks1/keymanage.c:268 lib/luks2/luks2_json_metadata.c:1126 #, c-format msgid "Cannot create header backup file %s." msgstr "" -#: lib/luks1/keymanage.c:255 lib/luks2/luks2_json_metadata.c:1117 +#: lib/luks1/keymanage.c:275 lib/luks2/luks2_json_metadata.c:1133 #, c-format msgid "Cannot write header backup file %s." msgstr "" @@ -818,139 +819,140 @@ msgid "Backup file doesn't contain valid LUKS header." msgstr "" -#: lib/luks1/keymanage.c:299 lib/luks1/keymanage.c:549 -#: lib/luks2/luks2_json_metadata.c:1190 +#: lib/luks1/keymanage.c:319 lib/luks1/keymanage.c:590 +#: lib/luks2/luks2_json_metadata.c:1206 #, c-format msgid "Cannot open header backup file %s." msgstr "" -#: lib/luks1/keymanage.c:307 lib/luks2/luks2_json_metadata.c:1198 +#: lib/luks1/keymanage.c:327 lib/luks2/luks2_json_metadata.c:1214 #, c-format msgid "Cannot read header backup file %s." msgstr "" -#: lib/luks1/keymanage.c:317 +#: lib/luks1/keymanage.c:337 msgid "Data offset or key size differs on device and backup, restore failed." msgstr "" -#: lib/luks1/keymanage.c:325 +#: lib/luks1/keymanage.c:345 #, c-format msgid "Device %s %s%s" msgstr "デバイス %s %s%s" -#: lib/luks1/keymanage.c:326 +#: lib/luks1/keymanage.c:346 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks1/keymanage.c:327 +#: lib/luks1/keymanage.c:347 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1232 +#: lib/luks1/keymanage.c:348 lib/luks2/luks2_json_metadata.c:1248 msgid "" "\n" "WARNING: real device header has different UUID than backup!" msgstr "" -#: lib/luks1/keymanage.c:375 +#: lib/luks1/keymanage.c:395 msgid "Non standard key size, manual repair required." msgstr "" -#: lib/luks1/keymanage.c:380 +#: lib/luks1/keymanage.c:405 msgid "Non standard keyslots alignment, manual repair required." msgstr "" -#: lib/luks1/keymanage.c:390 +#: lib/luks1/keymanage.c:441 msgid "Repairing keyslots." msgstr "" -#: lib/luks1/keymanage.c:409 +#: lib/luks1/keymanage.c:460 #, c-format msgid "Keyslot %i: offset repaired (%u -> %u)." msgstr "" -#: lib/luks1/keymanage.c:417 +#: lib/luks1/keymanage.c:468 #, c-format msgid "Keyslot %i: stripes repaired (%u -> %u)." msgstr "" -#: lib/luks1/keymanage.c:426 +#: lib/luks1/keymanage.c:477 #, c-format msgid "Keyslot %i: bogus partition signature." msgstr "" -#: lib/luks1/keymanage.c:431 +#: lib/luks1/keymanage.c:482 #, c-format msgid "Keyslot %i: salt wiped." msgstr "" -#: lib/luks1/keymanage.c:448 +#: lib/luks1/keymanage.c:499 msgid "Writing LUKS header to disk." msgstr "" -#: lib/luks1/keymanage.c:453 +#: lib/luks1/keymanage.c:504 msgid "Repair failed." msgstr "" -#: lib/luks1/keymanage.c:481 lib/luks1/keymanage.c:750 +#: lib/luks1/keymanage.c:427 lib/luks1/keymanage.c:533 +#: lib/luks1/keymanage.c:789 #, c-format msgid "Requested LUKS hash %s is not supported." msgstr "" -#: lib/luks1/keymanage.c:509 src/cryptsetup.c:1145 +#: lib/luks1/keymanage.c:571 src/cryptsetup.c:1243 msgid "No known problems detected for LUKS header." msgstr "" -#: lib/luks1/keymanage.c:660 +#: lib/luks1/keymanage.c:699 #, c-format msgid "Error during update of LUKS header on device %s." msgstr "" -#: lib/luks1/keymanage.c:668 +#: lib/luks1/keymanage.c:707 #, c-format msgid "Error re-reading LUKS header after update on device %s." msgstr "" -#: lib/luks1/keymanage.c:744 +#: lib/luks1/keymanage.c:783 msgid "" "Data offset for LUKS header must be either 0 or higher than header size." msgstr "" -#: lib/luks1/keymanage.c:755 lib/luks1/keymanage.c:825 -#: lib/luks2/luks2_json_format.c:283 lib/luks2/luks2_json_metadata.c:1009 -#: src/cryptsetup.c:2796 +#: lib/luks1/keymanage.c:794 lib/luks1/keymanage.c:863 +#: lib/luks2/luks2_json_format.c:287 lib/luks2/luks2_json_metadata.c:1015 +#: src/cryptsetup.c:2904 msgid "Wrong LUKS UUID format provided." msgstr "" -#: lib/luks1/keymanage.c:778 +#: lib/luks1/keymanage.c:816 msgid "Cannot create LUKS header: reading random salt failed." msgstr "" -#: lib/luks1/keymanage.c:804 +#: lib/luks1/keymanage.c:842 #, c-format msgid "Cannot create LUKS header: header digest failed (using hash %s)." msgstr "" -#: lib/luks1/keymanage.c:848 +#: lib/luks1/keymanage.c:886 #, c-format msgid "Key slot %d active, purge first." msgstr "" -#: lib/luks1/keymanage.c:854 +#: lib/luks1/keymanage.c:892 #, c-format msgid "Key slot %d material includes too few stripes. Header manipulation?" msgstr "" -#: lib/luks1/keymanage.c:1066 +#: lib/luks1/keymanage.c:1111 #, c-format msgid "Key slot %d is invalid, please select keyslot between 0 and %d." msgstr "" -#: lib/luks1/keymanage.c:1084 lib/luks2/luks2_keyslot.c:738 +#: lib/luks1/keymanage.c:1129 lib/luks2/luks2_keyslot.c:744 #, c-format msgid "Cannot wipe device %s." msgstr "" @@ -971,7 +973,7 @@ msgid "Kernel doesn't support loop-AES compatible mapping." msgstr "" -#: lib/tcrypt/tcrypt.c:504 +#: lib/tcrypt/tcrypt.c:509 #, c-format msgid "Error reading keyfile %s." msgstr "" @@ -981,20 +983,20 @@ msgid "Maximum TCRYPT passphrase length (%d) exceeded." msgstr "" -#: lib/tcrypt/tcrypt.c:595 +#: lib/tcrypt/tcrypt.c:602 #, c-format msgid "PBKDF2 hash algorithm %s not available, skipping." msgstr "" -#: lib/tcrypt/tcrypt.c:611 src/cryptsetup.c:1022 +#: lib/tcrypt/tcrypt.c:618 src/cryptsetup.c:1110 msgid "Required kernel crypto interface not available." msgstr "" -#: lib/tcrypt/tcrypt.c:613 src/cryptsetup.c:1024 +#: lib/tcrypt/tcrypt.c:620 src/cryptsetup.c:1112 msgid "Ensure you have algif_skcipher kernel module loaded." msgstr "" -#: lib/tcrypt/tcrypt.c:753 +#: lib/tcrypt/tcrypt.c:760 #, c-format msgid "Activation is not supported for %d sector size." msgstr "" @@ -1003,7 +1005,7 @@ msgid "Kernel doesn't support activation for this TCRYPT legacy mode." msgstr "" -#: lib/tcrypt/tcrypt.c:790 +#: lib/tcrypt/tcrypt.c:797 #, c-format msgid "Activating TCRYPT system encryption for partition %s." msgstr "" @@ -1012,7 +1014,7 @@ msgid "Kernel doesn't support TCRYPT compatible mapping." msgstr "" -#: lib/tcrypt/tcrypt.c:1090 +#: lib/tcrypt/tcrypt.c:1088 msgid "This function is not supported without TCRYPT header load." msgstr "" @@ -1035,21 +1037,21 @@ msgid "VERITY header corrupted." msgstr "" -#: lib/verity/verity.c:165 +#: lib/verity/verity.c:173 #, c-format msgid "Wrong VERITY UUID format provided on device %s." msgstr "" -#: lib/verity/verity.c:198 +#: lib/verity/verity.c:217 #, c-format msgid "Error during update of verity header on device %s." msgstr "" -#: lib/verity/verity.c:267 +#: lib/verity/verity.c:287 msgid "Errors cannot be repaired with FEC device." msgstr "" -#: lib/verity/verity.c:269 +#: lib/verity/verity.c:289 #, c-format msgid "Found %u repairable errors with FEC device." msgstr "" @@ -1058,21 +1060,21 @@ msgid "Kernel doesn't support dm-verity mapping." msgstr "" -#: lib/verity/verity.c:323 +#: lib/verity/verity.c:347 msgid "Verity device detected corruption after activation." msgstr "" -#: lib/verity/verity_hash.c:59 +#: lib/verity/verity_hash.c:66 #, c-format msgid "Spare area is not zeroed at position %." msgstr "" -#: lib/verity/verity_hash.c:163 lib/verity/verity_hash.c:290 -#: lib/verity/verity_hash.c:303 +#: lib/verity/verity_hash.c:167 lib/verity/verity_hash.c:300 +#: lib/verity/verity_hash.c:311 msgid "Device offset overflow." msgstr "" -#: lib/verity/verity_hash.c:203 +#: lib/verity/verity_hash.c:218 #, c-format msgid "Verification failed at position %." msgstr "" @@ -1081,27 +1083,27 @@ msgid "Invalid size parameters for verity device." msgstr "" -#: lib/verity/verity_hash.c:296 +#: lib/verity/verity_hash.c:307 msgid "Hash area overflow." msgstr "" -#: lib/verity/verity_hash.c:373 +#: lib/verity/verity_hash.c:380 msgid "Verification of data area failed." msgstr "" -#: lib/verity/verity_hash.c:378 +#: lib/verity/verity_hash.c:385 msgid "Verification of root hash failed." msgstr "" -#: lib/verity/verity_hash.c:384 +#: lib/verity/verity_hash.c:391 msgid "Input/output error while creating hash area." msgstr "" -#: lib/verity/verity_hash.c:386 +#: lib/verity/verity_hash.c:393 msgid "Creation of hash area failed." msgstr "" -#: lib/verity/verity_hash.c:433 +#: lib/verity/verity_hash.c:428 #, c-format msgid "" "WARNING: Kernel cannot activate device if data block size exceeds page size " @@ -1112,39 +1114,39 @@ msgid "Failed to allocate RS context." msgstr "" -#: lib/verity/verity_fec.c:146 +#: lib/verity/verity_fec.c:149 msgid "Failed to allocate buffer." msgstr "" -#: lib/verity/verity_fec.c:156 +#: lib/verity/verity_fec.c:159 #, c-format msgid "Failed to read RS block % byte %d." msgstr "" -#: lib/verity/verity_fec.c:169 +#: lib/verity/verity_fec.c:172 #, c-format msgid "Failed to read parity for RS block %." msgstr "" -#: lib/verity/verity_fec.c:177 +#: lib/verity/verity_fec.c:180 #, c-format msgid "Failed to repair parity for block %." msgstr "" -#: lib/verity/verity_fec.c:188 +#: lib/verity/verity_fec.c:192 #, c-format msgid "Failed to write parity for RS block %." msgstr "" -#: lib/verity/verity_fec.c:223 +#: lib/verity/verity_fec.c:228 msgid "Block sizes must match for FEC." msgstr "" -#: lib/verity/verity_fec.c:229 +#: lib/verity/verity_fec.c:234 msgid "Invalid number of parity bytes." msgstr "" -#: lib/verity/verity_fec.c:265 +#: lib/verity/verity_fec.c:303 #, c-format msgid "Failed to determine size for device %s." msgstr "" @@ -1153,123 +1155,123 @@ msgid "Kernel doesn't support dm-integrity mapping." msgstr "" -#: lib/luks2/luks2_disk_metadata.c:383 lib/luks2/luks2_json_metadata.c:967 -#: lib/luks2/luks2_json_metadata.c:1252 +#: lib/luks2/luks2_disk_metadata.c:393 lib/luks2/luks2_json_metadata.c:973 +#: lib/luks2/luks2_json_metadata.c:1268 #, c-format msgid "Failed to acquire write lock on device %s." msgstr "" -#: lib/luks2/luks2_disk_metadata.c:392 +#: lib/luks2/luks2_disk_metadata.c:402 msgid "" "Detected attempt for concurrent LUKS2 metadata update. Aborting operation." msgstr "" -#: lib/luks2/luks2_disk_metadata.c:691 lib/luks2/luks2_disk_metadata.c:712 +#: lib/luks2/luks2_disk_metadata.c:701 lib/luks2/luks2_disk_metadata.c:722 msgid "" "Device contains ambiguous signatures, cannot auto-recover LUKS2.\n" "Please run \"cryptsetup repair\" for recovery." msgstr "" -#: lib/luks2/luks2_json_format.c:227 +#: lib/luks2/luks2_json_format.c:230 msgid "Requested data offset is too small." msgstr "" -#: lib/luks2/luks2_json_format.c:271 +#: lib/luks2/luks2_json_format.c:275 #, c-format msgid "" "WARNING: keyslots area (% bytes) is very small, available LUKS2 " "keyslot count is very limited.\n" msgstr "" -#: lib/luks2/luks2_json_metadata.c:954 lib/luks2/luks2_json_metadata.c:1082 -#: lib/luks2/luks2_json_metadata.c:1158 lib/luks2/luks2_keyslot_luks2.c:92 +#: lib/luks2/luks2_json_metadata.c:960 lib/luks2/luks2_json_metadata.c:1098 +#: lib/luks2/luks2_json_metadata.c:1174 lib/luks2/luks2_keyslot_luks2.c:92 #: lib/luks2/luks2_keyslot_luks2.c:114 #, c-format msgid "Failed to acquire read lock on device %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1175 +#: lib/luks2/luks2_json_metadata.c:1191 #, c-format msgid "Forbidden LUKS2 requirements detected in backup %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1216 +#: lib/luks2/luks2_json_metadata.c:1232 msgid "Data offset differ on device and backup, restore failed." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1222 +#: lib/luks2/luks2_json_metadata.c:1238 msgid "" "Binary header with keyslot areas size differ on device and backup, restore " "failed." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1229 +#: lib/luks2/luks2_json_metadata.c:1245 #, c-format msgid "Device %s %s%s%s%s" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1230 +#: lib/luks2/luks2_json_metadata.c:1246 msgid "" "does not contain LUKS2 header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1231 +#: lib/luks2/luks2_json_metadata.c:1247 msgid "" "already contains LUKS2 header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1233 +#: lib/luks2/luks2_json_metadata.c:1249 msgid "" "\n" "WARNING: unknown LUKS2 requirements detected in real device header!\n" "Replacing header with backup may corrupt the data on that device!" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1235 +#: lib/luks2/luks2_json_metadata.c:1251 msgid "" "\n" "WARNING: Unfinished offline reencryption detected on the device!\n" "Replacing header with backup may corrupt data." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1333 +#: lib/luks2/luks2_json_metadata.c:1349 #, c-format msgid "Ignored unknown flag %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2020 lib/luks2/luks2_reencrypt.c:1746 +#: lib/luks2/luks2_json_metadata.c:2054 lib/luks2/luks2_reencrypt.c:1843 #, c-format msgid "Missing key for dm-crypt segment %u" msgstr "" -#: lib/luks2/luks2_json_metadata.c:2032 lib/luks2/luks2_reencrypt.c:1764 +#: lib/luks2/luks2_json_metadata.c:2066 lib/luks2/luks2_reencrypt.c:1857 msgid "Failed to set dm-crypt segment." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2038 lib/luks2/luks2_reencrypt.c:1770 +#: lib/luks2/luks2_json_metadata.c:2072 lib/luks2/luks2_reencrypt.c:1863 msgid "Failed to set dm-linear segment." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2165 +#: lib/luks2/luks2_json_metadata.c:2199 msgid "Unsupported device integrity configuration." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2251 +#: lib/luks2/luks2_json_metadata.c:2285 msgid "Reencryption in-progress. Cannot deactivate device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2262 lib/luks2/luks2_reencrypt.c:3190 +#: lib/luks2/luks2_json_metadata.c:2296 lib/luks2/luks2_reencrypt.c:3300 #, c-format msgid "Failed to replace suspended device %s with dm-error target." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2342 +#: lib/luks2/luks2_json_metadata.c:2376 msgid "Failed to read LUKS2 requirements." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2349 +#: lib/luks2/luks2_json_metadata.c:2383 msgid "Unmet LUKS2 requirements detected." msgstr "" @@ -1281,11 +1283,11 @@ msgid "Online reencryption in progress. Aborting." msgstr "" -#: lib/luks2/luks2_keyslot.c:547 lib/luks2/luks2_keyslot.c:584 +#: lib/luks2/luks2_keyslot.c:554 lib/luks2/luks2_keyslot.c:591 msgid "Not enough available memory to open a keyslot." msgstr "" -#: lib/luks2/luks2_keyslot.c:549 lib/luks2/luks2_keyslot.c:586 +#: lib/luks2/luks2_keyslot.c:556 lib/luks2/luks2_keyslot.c:593 msgid "Keyslot open failed." msgstr "" @@ -1294,7 +1296,7 @@ msgid "Cannot use %s-%s cipher for keyslot encryption." msgstr "" -#: lib/luks2/luks2_keyslot_luks2.c:480 +#: lib/luks2/luks2_keyslot_luks2.c:485 msgid "No space for new keyslot." msgstr "" @@ -1353,105 +1355,105 @@ msgid "Cannot convert to LUKS1 format - keyslot %u is not LUKS1 compatible." msgstr "" -#: lib/luks2/luks2_reencrypt.c:892 +#: lib/luks2/luks2_reencrypt.c:993 #, c-format msgid "" "Hotzone size must be multiple of calculated zone alignment (%zu bytes)." msgstr "" -#: lib/luks2/luks2_reencrypt.c:897 +#: lib/luks2/luks2_reencrypt.c:998 #, c-format msgid "" "Device size must be multiple of calculated zone alignment (%zu bytes)." msgstr "" -#: lib/luks2/luks2_reencrypt.c:941 +#: lib/luks2/luks2_reencrypt.c:1042 #, c-format msgid "Unsupported resilience mode %s" msgstr "" -#: lib/luks2/luks2_reencrypt.c:1158 lib/luks2/luks2_reencrypt.c:1313 -#: lib/luks2/luks2_reencrypt.c:1396 lib/luks2/luks2_reencrypt.c:1430 -#: lib/luks2/luks2_reencrypt.c:3030 +#: lib/luks2/luks2_reencrypt.c:1259 lib/luks2/luks2_reencrypt.c:1414 +#: lib/luks2/luks2_reencrypt.c:1497 lib/luks2/luks2_reencrypt.c:1531 +#: lib/luks2/luks2_reencrypt.c:3140 msgid "Failed to initialize old segment storage wrapper." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1172 lib/luks2/luks2_reencrypt.c:1291 +#: lib/luks2/luks2_reencrypt.c:1273 lib/luks2/luks2_reencrypt.c:1392 msgid "Failed to initialize new segment storage wrapper." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1340 +#: lib/luks2/luks2_reencrypt.c:1441 msgid "Failed to read checksums for current hotzone." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1347 lib/luks2/luks2_reencrypt.c:3038 +#: lib/luks2/luks2_reencrypt.c:1448 lib/luks2/luks2_reencrypt.c:3148 #, c-format msgid "Failed to read hotzone area starting at %." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1366 +#: lib/luks2/luks2_reencrypt.c:1467 #, c-format msgid "Failed to decrypt sector %zu." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1372 +#: lib/luks2/luks2_reencrypt.c:1473 #, c-format msgid "Failed to recover sector %zu." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1867 +#: lib/luks2/luks2_reencrypt.c:1956 #, c-format msgid "" "Source and target device sizes don't match. Source %, target: " "%." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1965 +#: lib/luks2/luks2_reencrypt.c:2054 #, c-format msgid "Failed to activate hotzone device %s." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1982 +#: lib/luks2/luks2_reencrypt.c:2071 #, c-format msgid "Failed to activate overlay device %s with actual origin table." msgstr "" -#: lib/luks2/luks2_reencrypt.c:1989 +#: lib/luks2/luks2_reencrypt.c:2078 #, c-format msgid "Failed to load new mapping for device %s." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2060 +#: lib/luks2/luks2_reencrypt.c:2149 msgid "Failed to refresh reencryption devices stack." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2216 +#: lib/luks2/luks2_reencrypt.c:2309 msgid "Failed to set new keyslots area size." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2318 +#: lib/luks2/luks2_reencrypt.c:2413 #, c-format msgid "" "Data shift is not aligned to requested encryption sector size (% " "bytes)." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2339 +#: lib/luks2/luks2_reencrypt.c:2434 #, c-format msgid "" "Data device is not aligned to requested encryption sector size (% " "bytes)." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2360 +#: lib/luks2/luks2_reencrypt.c:2455 #, c-format msgid "" "Data shift (% sectors) is less than future data offset (% " "sectors)." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2366 lib/luks2/luks2_reencrypt.c:2779 -#: lib/luks2/luks2_reencrypt.c:2800 +#: lib/luks2/luks2_reencrypt.c:2461 lib/luks2/luks2_reencrypt.c:2889 +#: lib/luks2/luks2_reencrypt.c:2910 #, c-format msgid "Failed to open %s in exclusive mode (already mapped or mounted)." msgstr "" @@ -1460,241 +1462,241 @@ msgid "No LUKS2 reencryption in progress." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2540 lib/luks2/luks2_reencrypt.c:3295 +#: lib/luks2/luks2_reencrypt.c:2635 lib/luks2/luks2_reencrypt.c:3415 msgid "Failed to load LUKS2 reencryption context." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2619 +#: lib/luks2/luks2_reencrypt.c:2715 msgid "Failed to get reencryption state." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2623 +#: lib/luks2/luks2_reencrypt.c:2719 msgid "Device is not in reencryption." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2630 +#: lib/luks2/luks2_reencrypt.c:2726 msgid "Reencryption process is already running." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2632 +#: lib/luks2/luks2_reencrypt.c:2728 msgid "Failed to acquire reencryption lock." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2650 +#: lib/luks2/luks2_reencrypt.c:2746 msgid "Cannot proceed with reencryption. Run reencryption recovery first." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2750 +#: lib/luks2/luks2_reencrypt.c:2860 msgid "Active device size and requested reencryption size don't match." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2764 +#: lib/luks2/luks2_reencrypt.c:2874 msgid "Illegal device size requested in reencryption parameters." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2834 +#: lib/luks2/luks2_reencrypt.c:2944 msgid "Reencryption in-progress. Cannot perform recovery." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2906 +#: lib/luks2/luks2_reencrypt.c:3016 msgid "LUKS2 reencryption already initialized in metadata." msgstr "" -#: lib/luks2/luks2_reencrypt.c:2913 +#: lib/luks2/luks2_reencrypt.c:3023 msgid "Failed to initialize LUKS2 reencryption in metadata." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3004 +#: lib/luks2/luks2_reencrypt.c:3114 msgid "Failed to set device segments for next reencryption hotzone." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3046 +#: lib/luks2/luks2_reencrypt.c:3156 msgid "Failed to write reencryption resilience metadata." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3053 +#: lib/luks2/luks2_reencrypt.c:3163 msgid "Decryption failed." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3058 +#: lib/luks2/luks2_reencrypt.c:3168 #, c-format msgid "Failed to write hotzone area starting at %." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3063 +#: lib/luks2/luks2_reencrypt.c:3173 msgid "Failed to sync data." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3071 +#: lib/luks2/luks2_reencrypt.c:3181 msgid "" "Failed to update metadata after current reencryption hotzone completed." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3138 +#: lib/luks2/luks2_reencrypt.c:3248 msgid "Failed to write LUKS2 metadata." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3161 +#: lib/luks2/luks2_reencrypt.c:3271 msgid "Failed to wipe backup segment data." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3174 +#: lib/luks2/luks2_reencrypt.c:3284 msgid "Failed to disable reencryption requirement flag." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3182 +#: lib/luks2/luks2_reencrypt.c:3292 #, c-format msgid "" "Fatal error while reencrypting chunk starting at %, % " "sectors long." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3191 +#: lib/luks2/luks2_reencrypt.c:3301 msgid "Do not resume the device unless replaced with error target manually." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3240 +#: lib/luks2/luks2_reencrypt.c:3353 msgid "Cannot proceed with reencryption. Unexpected reencryption status." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3246 +#: lib/luks2/luks2_reencrypt.c:3359 msgid "Missing or invalid reencrypt context." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3253 +#: lib/luks2/luks2_reencrypt.c:3366 msgid "Failed to initialize reencryption device stack." msgstr "" -#: lib/luks2/luks2_reencrypt.c:3272 lib/luks2/luks2_reencrypt.c:3308 +#: lib/luks2/luks2_reencrypt.c:3385 lib/luks2/luks2_reencrypt.c:3428 msgid "Failed to update reencryption context." msgstr "" -#: lib/luks2/luks2_token.c:262 +#: lib/luks2/luks2_token.c:263 msgid "No free token slot." msgstr "" -#: lib/luks2/luks2_token.c:269 +#: lib/luks2/luks2_token.c:270 #, c-format msgid "Failed to create builtin token %s." msgstr "" -#: src/cryptsetup.c:166 +#: src/cryptsetup.c:108 msgid "Can't do passphrase verification on non-tty inputs." msgstr "" -#: src/cryptsetup.c:229 +#: src/cryptsetup.c:171 msgid "Keyslot encryption parameters can be set only for LUKS2 device." msgstr "" -#: src/cryptsetup.c:259 src/cryptsetup.c:971 src/cryptsetup.c:1281 -#: src/cryptsetup.c:3157 src/cryptsetup_reencrypt.c:723 -#: src/cryptsetup_reencrypt.c:793 +#: src/cryptsetup.c:245 src/cryptsetup.c:1057 src/cryptsetup.c:1401 +#: src/cryptsetup.c:3288 src/cryptsetup_reencrypt.c:700 +#: src/cryptsetup_reencrypt.c:770 msgid "No known cipher specification pattern detected." msgstr "" -#: src/cryptsetup.c:267 +#: src/cryptsetup.c:253 msgid "" "WARNING: The --hash parameter is being ignored in plain mode with keyfile " "specified.\n" msgstr "" -#: src/cryptsetup.c:275 +#: src/cryptsetup.c:261 msgid "" "WARNING: The --keyfile-size option is being ignored, the read size is the " "same as the encryption key size.\n" msgstr "" -#: src/cryptsetup.c:315 +#: src/cryptsetup.c:301 #, c-format msgid "" "Detected device signature(s) on %s. Proceeding further may damage existing " "data." msgstr "" -#: src/cryptsetup.c:321 src/cryptsetup.c:1102 src/cryptsetup.c:1154 -#: src/cryptsetup.c:1258 src/cryptsetup.c:1331 src/cryptsetup.c:1986 -#: src/cryptsetup.c:2694 src/cryptsetup.c:2817 src/integritysetup.c:233 +#: src/cryptsetup.c:307 src/cryptsetup.c:1197 src/cryptsetup.c:1253 +#: src/cryptsetup.c:1378 src/cryptsetup.c:1451 src/cryptsetup.c:2099 +#: src/cryptsetup.c:2805 src/cryptsetup.c:2927 src/integritysetup.c:176 msgid "Operation aborted.\n" msgstr "" -#: src/cryptsetup.c:389 +#: src/cryptsetup.c:375 msgid "Option --key-file is required." msgstr "" -#: src/cryptsetup.c:442 +#: src/cryptsetup.c:426 msgid "Enter VeraCrypt PIM: " msgstr "" -#: src/cryptsetup.c:451 +#: src/cryptsetup.c:435 msgid "Invalid PIM value: parse error." msgstr "" -#: src/cryptsetup.c:454 +#: src/cryptsetup.c:438 msgid "Invalid PIM value: 0." msgstr "" -#: src/cryptsetup.c:457 +#: src/cryptsetup.c:441 msgid "Invalid PIM value: outside of range." msgstr "" -#: src/cryptsetup.c:480 +#: src/cryptsetup.c:464 msgid "No device header detected with this passphrase." msgstr "" -#: src/cryptsetup.c:584 +#: src/cryptsetup.c:588 msgid "" "Header dump with volume key is sensitive information\n" "which allows access to encrypted partition without passphrase.\n" "This dump should be always stored encrypted on safe place." msgstr "" -#: src/cryptsetup.c:681 +#: src/cryptsetup.c:756 src/veritysetup.c:318 src/integritysetup.c:313 #, c-format msgid "Device %s is still active and scheduled for deferred removal.\n" msgstr "" -#: src/cryptsetup.c:709 +#: src/cryptsetup.c:790 msgid "" "Resize of active device requires volume key in keyring but --disable-keyring " "option is set." msgstr "" -#: src/cryptsetup.c:850 +#: src/cryptsetup.c:936 msgid "Benchmark interrupted." msgstr "" -#: src/cryptsetup.c:871 +#: src/cryptsetup.c:957 #, c-format msgid "PBKDF2-%-9s N/A\n" msgstr "" -#: src/cryptsetup.c:873 +#: src/cryptsetup.c:959 #, c-format msgid "PBKDF2-%-9s %7u iterations per second for %zu-bit key\n" msgstr "" -#: src/cryptsetup.c:887 +#: src/cryptsetup.c:973 #, c-format msgid "%-10s N/A\n" msgstr "" -#: src/cryptsetup.c:889 +#: src/cryptsetup.c:975 #, c-format msgid "" "%-10s %4u iterations, %5u memory, %1u parallel threads (CPUs) for %zu-bit " "key (requested %u ms time)\n" msgstr "" -#: src/cryptsetup.c:913 +#: src/cryptsetup.c:999 msgid "Result of benchmark is not reliable." msgstr "" -#: src/cryptsetup.c:963 +#: src/cryptsetup.c:1049 msgid "# Tests are approximate using memory only (no storage IO).\n" msgstr "" #. TRANSLATORS: The string is header of a table and must be exactly (right side) aligned. -#: src/cryptsetup.c:983 +#: src/cryptsetup.c:1069 #, c-format msgid "#%*s Algorithm | Key | Encryption | Decryption\n" msgstr "" @@ -1705,258 +1707,258 @@ msgstr "" #. TRANSLATORS: The string is header of a table and must be exactly (right side) aligned. -#: src/cryptsetup.c:1006 +#: src/cryptsetup.c:1092 msgid "# Algorithm | Key | Encryption | Decryption\n" msgstr "" -#: src/cryptsetup.c:1015 +#: src/cryptsetup.c:1103 msgid "N/A" msgstr "" -#: src/cryptsetup.c:1095 +#: src/cryptsetup.c:1190 msgid "" "Seems device does not require reencryption recovery.\n" "Do you want to proceed anyway?" msgstr "" -#: src/cryptsetup.c:1101 +#: src/cryptsetup.c:1196 msgid "Really proceed with LUKS2 reencryption recovery?" msgstr "" -#: src/cryptsetup.c:1110 +#: src/cryptsetup.c:1204 msgid "Enter passphrase for reencryption recovery: " msgstr "" -#: src/cryptsetup.c:1153 +#: src/cryptsetup.c:1252 msgid "Really try to repair LUKS device header?" msgstr "" -#: src/cryptsetup.c:1172 src/integritysetup.c:146 +#: src/cryptsetup.c:1277 src/integritysetup.c:90 msgid "" "Wiping device to initialize integrity checksum.\n" "You can interrupt this by pressing CTRL+c (rest of not wiped device will " "contain invalid checksum).\n" msgstr "" -#: src/cryptsetup.c:1194 src/integritysetup.c:168 +#: src/cryptsetup.c:1299 src/integritysetup.c:112 #, c-format msgid "Cannot deactivate temporary device %s." msgstr "" -#: src/cryptsetup.c:1243 +#: src/cryptsetup.c:1363 msgid "Integrity option can be used only for LUKS2 format." msgstr "" -#: src/cryptsetup.c:1248 src/cryptsetup.c:1308 +#: src/cryptsetup.c:1368 src/cryptsetup.c:1428 msgid "Unsupported LUKS2 metadata size options." msgstr "" -#: src/cryptsetup.c:1265 +#: src/cryptsetup.c:1385 #, c-format msgid "Cannot create header file %s." msgstr "" -#: src/cryptsetup.c:1288 src/integritysetup.c:195 src/integritysetup.c:204 -#: src/integritysetup.c:213 src/integritysetup.c:284 src/integritysetup.c:293 -#: src/integritysetup.c:303 +#: src/cryptsetup.c:1408 src/integritysetup.c:138 src/integritysetup.c:146 +#: src/integritysetup.c:155 src/integritysetup.c:230 src/integritysetup.c:238 +#: src/integritysetup.c:248 msgid "No known integrity specification pattern detected." msgstr "" -#: src/cryptsetup.c:1301 +#: src/cryptsetup.c:1421 #, c-format msgid "Cannot use %s as on-disk header." msgstr "" -#: src/cryptsetup.c:1325 src/integritysetup.c:227 +#: src/cryptsetup.c:1445 src/integritysetup.c:170 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "" -#: src/cryptsetup.c:1366 src/cryptsetup.c:1700 src/cryptsetup.c:1767 -#: src/cryptsetup.c:1869 src/cryptsetup.c:1935 src/cryptsetup_reencrypt.c:553 +#: src/cryptsetup.c:1478 src/cryptsetup.c:1814 src/cryptsetup.c:1879 +#: src/cryptsetup.c:1981 src/cryptsetup.c:2047 src/cryptsetup_reencrypt.c:530 msgid "Failed to set pbkdf parameters." msgstr "" -#: src/cryptsetup.c:1451 +#: src/cryptsetup.c:1563 msgid "Reduced data offset is allowed only for detached LUKS header." msgstr "" -#: src/cryptsetup.c:1462 src/cryptsetup.c:1773 +#: src/cryptsetup.c:1574 src/cryptsetup.c:1885 msgid "" "Cannot determine volume key size for LUKS without keyslots, please use --key-" "size option." msgstr "" -#: src/cryptsetup.c:1500 +#: src/cryptsetup.c:1619 msgid "Device activated but cannot make flags persistent." msgstr "" -#: src/cryptsetup.c:1581 src/cryptsetup.c:1651 +#: src/cryptsetup.c:1698 src/cryptsetup.c:1766 #, c-format msgid "Keyslot %d is selected for deletion." msgstr "" -#: src/cryptsetup.c:1593 src/cryptsetup.c:1654 +#: src/cryptsetup.c:1710 src/cryptsetup.c:1770 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "" -#: src/cryptsetup.c:1594 +#: src/cryptsetup.c:1711 msgid "Enter any remaining passphrase: " msgstr "" -#: src/cryptsetup.c:1595 src/cryptsetup.c:1656 +#: src/cryptsetup.c:1712 src/cryptsetup.c:1772 msgid "Operation aborted, the keyslot was NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:1633 +#: src/cryptsetup.c:1748 msgid "Enter passphrase to be deleted: " msgstr "" -#: src/cryptsetup.c:1714 src/cryptsetup.c:1788 src/cryptsetup.c:1822 +#: src/cryptsetup.c:1828 src/cryptsetup.c:1900 src/cryptsetup.c:1934 msgid "Enter new passphrase for key slot: " msgstr "" -#: src/cryptsetup.c:1805 src/cryptsetup_reencrypt.c:1343 +#: src/cryptsetup.c:1917 src/cryptsetup_reencrypt.c:1328 #, c-format msgid "Enter any existing passphrase: " msgstr "" -#: src/cryptsetup.c:1873 +#: src/cryptsetup.c:1985 msgid "Enter passphrase to be changed: " msgstr "" -#: src/cryptsetup.c:1889 src/cryptsetup_reencrypt.c:1329 +#: src/cryptsetup.c:2001 src/cryptsetup_reencrypt.c:1314 msgid "Enter new passphrase: " msgstr "" -#: src/cryptsetup.c:1939 +#: src/cryptsetup.c:2051 msgid "Enter passphrase for keyslot to be converted: " msgstr "" -#: src/cryptsetup.c:1963 +#: src/cryptsetup.c:2075 msgid "Only one device argument for isLuks operation is supported." msgstr "" -#: src/cryptsetup.c:2219 src/cryptsetup.c:2240 +#: src/cryptsetup.c:2347 src/cryptsetup.c:2366 msgid "Option --header-backup-file is required." msgstr "" -#: src/cryptsetup.c:2270 +#: src/cryptsetup.c:2397 #, c-format msgid "%s is not cryptsetup managed device." msgstr "" -#: src/cryptsetup.c:2281 +#: src/cryptsetup.c:2408 #, c-format msgid "Refresh is not supported for device type %s" msgstr "" -#: src/cryptsetup.c:2323 +#: src/cryptsetup.c:2454 #, c-format msgid "Unrecognized metadata device type %s." msgstr "" -#: src/cryptsetup.c:2326 +#: src/cryptsetup.c:2456 msgid "Command requires device and mapped name as arguments." msgstr "" -#: src/cryptsetup.c:2348 +#: src/cryptsetup.c:2477 #, c-format msgid "" "This operation will erase all keyslots on device %s.\n" "Device will become unusable after this operation." msgstr "" -#: src/cryptsetup.c:2355 +#: src/cryptsetup.c:2484 msgid "Operation aborted, keyslots were NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:2392 +#: src/cryptsetup.c:2523 msgid "Invalid LUKS type, only luks1 and luks2 are supported." msgstr "" -#: src/cryptsetup.c:2410 +#: src/cryptsetup.c:2539 #, c-format msgid "Device is already %s type." msgstr "" -#: src/cryptsetup.c:2415 +#: src/cryptsetup.c:2546 #, c-format msgid "This operation will convert %s to %s format.\n" msgstr "" -#: src/cryptsetup.c:2421 +#: src/cryptsetup.c:2549 msgid "Operation aborted, device was NOT converted.\n" msgstr "" -#: src/cryptsetup.c:2461 +#: src/cryptsetup.c:2589 msgid "Option --priority, --label or --subsystem is missing." msgstr "" -#: src/cryptsetup.c:2495 src/cryptsetup.c:2528 src/cryptsetup.c:2551 +#: src/cryptsetup.c:2623 src/cryptsetup.c:2660 src/cryptsetup.c:2680 #, c-format msgid "Token %d is invalid." msgstr "" -#: src/cryptsetup.c:2498 src/cryptsetup.c:2554 +#: src/cryptsetup.c:2626 src/cryptsetup.c:2683 #, c-format msgid "Token %d in use." msgstr "" -#: src/cryptsetup.c:2505 +#: src/cryptsetup.c:2638 #, c-format msgid "Failed to add luks2-keyring token %d." msgstr "" -#: src/cryptsetup.c:2514 src/cryptsetup.c:2576 +#: src/cryptsetup.c:2646 src/cryptsetup.c:2709 #, c-format msgid "Failed to assign token %d to keyslot %d." msgstr "" -#: src/cryptsetup.c:2531 +#: src/cryptsetup.c:2663 #, c-format msgid "Token %d is not in use." msgstr "" -#: src/cryptsetup.c:2566 +#: src/cryptsetup.c:2700 msgid "Failed to import token from file." msgstr "" -#: src/cryptsetup.c:2591 +#: src/cryptsetup.c:2725 #, c-format msgid "Failed to get token %d for export." msgstr "" -#: src/cryptsetup.c:2606 +#: src/cryptsetup.c:4045 msgid "--key-description parameter is mandatory for token add action." msgstr "" -#: src/cryptsetup.c:2612 src/cryptsetup.c:2620 +#: src/cryptsetup.c:4051 msgid "Action requires specific token. Use --token-id parameter." msgstr "" -#: src/cryptsetup.c:2625 +#: src/cryptsetup.c:2693 #, c-format msgid "Invalid token operation %s." msgstr "" -#: src/cryptsetup.c:2680 +#: src/cryptsetup.c:2789 #, c-format msgid "Auto-detected active dm device '%s' for data device %s.\n" msgstr "" -#: src/cryptsetup.c:2684 +#: src/cryptsetup.c:2793 #, c-format msgid "Device %s is not a block device.\n" msgstr "" -#: src/cryptsetup.c:2686 +#: src/cryptsetup.c:2795 #, c-format msgid "Failed to auto-detect device %s holders." msgstr "" -#: src/cryptsetup.c:2688 +#: src/cryptsetup.c:2799 #, c-format msgid "" "Unable to decide if device %s is activated or not.\n" @@ -1965,45 +1967,45 @@ "To run reencryption in online mode, use --active-name parameter instead.\n" msgstr "" -#: src/cryptsetup.c:2768 +#: src/cryptsetup.c:2836 msgid "Invalid LUKS device type." msgstr "" -#: src/cryptsetup.c:2773 +#: src/cryptsetup.c:2886 msgid "" "Encryption without detached header (--header) is not possible without data " "device size reduction (--reduce-device-size)." msgstr "" -#: src/cryptsetup.c:2778 +#: src/cryptsetup.c:2891 msgid "" "Requested data offset must be less than or equal to half of --reduce-device-" "size parameter." msgstr "" -#: src/cryptsetup.c:2787 +#: src/cryptsetup.c:2900 #, c-format msgid "" "Adjusting --reduce-device-size value to twice the --offset % " "(sectors).\n" msgstr "" -#: src/cryptsetup.c:2791 +#: src/cryptsetup.c:2881 msgid "Encryption is supported only for LUKS2 format." msgstr "" -#: src/cryptsetup.c:2813 +#: src/cryptsetup.c:2923 #, c-format msgid "" "Detected LUKS device on %s. Do you want to encrypt that LUKS device again?" msgstr "" -#: src/cryptsetup.c:2828 +#: src/cryptsetup.c:2941 #, c-format msgid "Temporary header file %s already exists. Aborting." msgstr "" -#: src/cryptsetup.c:2830 src/cryptsetup.c:2837 +#: src/cryptsetup.c:2943 src/cryptsetup.c:2950 #, c-format msgid "Cannot create temporary header file %s." msgstr "" @@ -2013,194 +2015,194 @@ msgid "%s/%s is now active and ready for online encryption." msgstr "" -#: src/cryptsetup.c:3065 src/cryptsetup.c:3071 +#: src/cryptsetup.c:3189 src/cryptsetup.c:3195 msgid "Not enough free keyslots for reencryption." msgstr "" -#: src/cryptsetup.c:3091 src/cryptsetup_reencrypt.c:1294 +#: src/cryptsetup.c:3215 src/cryptsetup_reencrypt.c:1279 msgid "" "Key file can be used only with --key-slot or with exactly one key slot " "active." msgstr "" -#: src/cryptsetup.c:3100 src/cryptsetup_reencrypt.c:1341 -#: src/cryptsetup_reencrypt.c:1352 +#: src/cryptsetup.c:3224 src/cryptsetup_reencrypt.c:1326 +#: src/cryptsetup_reencrypt.c:1337 #, c-format msgid "Enter passphrase for key slot %d: " msgstr "" -#: src/cryptsetup.c:3108 +#: src/cryptsetup.c:3233 #, c-format msgid "Enter passphrase for key slot %u: " msgstr "" -#: src/cryptsetup.c:3283 +#: src/cryptsetup.c:3415 msgid "Command requires device as argument." msgstr "" -#: src/cryptsetup.c:3305 +#: src/cryptsetup.c:3437 msgid "" "Only LUKS2 format is currently supported. Please use cryptsetup-reencrypt " "tool for LUKS1." msgstr "" -#: src/cryptsetup.c:3317 +#: src/cryptsetup.c:3449 msgid "" "Legacy offline reencryption already in-progress. Use cryptsetup-reencrypt " "utility." msgstr "" -#: src/cryptsetup.c:3327 src/cryptsetup_reencrypt.c:178 +#: src/cryptsetup.c:3459 src/cryptsetup_reencrypt.c:155 msgid "Reencryption of device with integrity profile is not supported." msgstr "" -#: src/cryptsetup.c:3335 +#: src/cryptsetup.c:3467 msgid "LUKS2 reencryption already initialized. Aborting operation." msgstr "" -#: src/cryptsetup.c:3339 +#: src/cryptsetup.c:3471 msgid "LUKS2 device is not in reencryption." msgstr "" -#: src/cryptsetup.c:3366 +#: src/cryptsetup.c:3498 msgid " [--type ] []" msgstr "" -#: src/cryptsetup.c:3366 src/veritysetup.c:399 src/integritysetup.c:480 +#: src/cryptsetup.c:3498 src/veritysetup.c:480 src/integritysetup.c:446 msgid "open device as " msgstr "" -#: src/cryptsetup.c:3367 src/cryptsetup.c:3368 src/cryptsetup.c:3369 -#: src/veritysetup.c:400 src/veritysetup.c:401 src/integritysetup.c:481 -#: src/integritysetup.c:482 +#: src/cryptsetup.c:3499 src/cryptsetup.c:3500 src/cryptsetup.c:3501 +#: src/veritysetup.c:481 src/veritysetup.c:482 src/integritysetup.c:447 +#: src/integritysetup.c:448 msgid "" msgstr "" -#: src/cryptsetup.c:3367 src/veritysetup.c:400 src/integritysetup.c:481 +#: src/cryptsetup.c:3499 src/veritysetup.c:481 src/integritysetup.c:447 msgid "close device (remove mapping)" msgstr "" -#: src/cryptsetup.c:3368 +#: src/cryptsetup.c:3500 msgid "resize active device" msgstr "" -#: src/cryptsetup.c:3369 +#: src/cryptsetup.c:3501 msgid "show device status" msgstr "" -#: src/cryptsetup.c:3370 +#: src/cryptsetup.c:3502 msgid "[--cipher ]" msgstr "" -#: src/cryptsetup.c:3370 +#: src/cryptsetup.c:3502 msgid "benchmark cipher" msgstr "" -#: src/cryptsetup.c:3371 src/cryptsetup.c:3372 src/cryptsetup.c:3373 -#: src/cryptsetup.c:3374 src/cryptsetup.c:3375 src/cryptsetup.c:3382 -#: src/cryptsetup.c:3383 src/cryptsetup.c:3384 src/cryptsetup.c:3385 -#: src/cryptsetup.c:3386 src/cryptsetup.c:3387 src/cryptsetup.c:3388 -#: src/cryptsetup.c:3389 src/cryptsetup.c:3390 +#: src/cryptsetup.c:3503 src/cryptsetup.c:3504 src/cryptsetup.c:3505 +#: src/cryptsetup.c:3506 src/cryptsetup.c:3507 src/cryptsetup.c:3514 +#: src/cryptsetup.c:3515 src/cryptsetup.c:3516 src/cryptsetup.c:3517 +#: src/cryptsetup.c:3518 src/cryptsetup.c:3519 src/cryptsetup.c:3520 +#: src/cryptsetup.c:3521 src/cryptsetup.c:3522 msgid "" msgstr "" -#: src/cryptsetup.c:3371 +#: src/cryptsetup.c:3503 msgid "try to repair on-disk metadata" msgstr "" -#: src/cryptsetup.c:3372 +#: src/cryptsetup.c:3504 msgid "reencrypt LUKS2 device" msgstr "" -#: src/cryptsetup.c:3373 +#: src/cryptsetup.c:3505 msgid "erase all keyslots (remove encryption key)" msgstr "" -#: src/cryptsetup.c:3374 +#: src/cryptsetup.c:3506 msgid "convert LUKS from/to LUKS2 format" msgstr "" -#: src/cryptsetup.c:3375 +#: src/cryptsetup.c:3507 msgid "set permanent configuration options for LUKS2" msgstr "" -#: src/cryptsetup.c:3376 src/cryptsetup.c:3377 +#: src/cryptsetup.c:3508 src/cryptsetup.c:3509 msgid " []" msgstr "" -#: src/cryptsetup.c:3376 +#: src/cryptsetup.c:3508 msgid "formats a LUKS device" msgstr "" -#: src/cryptsetup.c:3377 +#: src/cryptsetup.c:3509 msgid "add key to LUKS device" msgstr "" -#: src/cryptsetup.c:3378 src/cryptsetup.c:3379 src/cryptsetup.c:3380 +#: src/cryptsetup.c:3510 src/cryptsetup.c:3511 src/cryptsetup.c:3512 msgid " []" msgstr "" -#: src/cryptsetup.c:3378 +#: src/cryptsetup.c:3510 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:3379 +#: src/cryptsetup.c:3511 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:3380 +#: src/cryptsetup.c:3512 msgid "converts a key to new pbkdf parameters" msgstr "" -#: src/cryptsetup.c:3381 +#: src/cryptsetup.c:3513 msgid " " msgstr "" -#: src/cryptsetup.c:3381 +#: src/cryptsetup.c:3513 msgid "wipes key with number from LUKS device" msgstr "" -#: src/cryptsetup.c:3382 +#: src/cryptsetup.c:3514 msgid "print UUID of LUKS device" msgstr "" -#: src/cryptsetup.c:3383 +#: src/cryptsetup.c:3515 msgid "tests for LUKS partition header" msgstr "" -#: src/cryptsetup.c:3384 +#: src/cryptsetup.c:3516 msgid "dump LUKS partition information" msgstr "" -#: src/cryptsetup.c:3385 +#: src/cryptsetup.c:3517 msgid "dump TCRYPT device information" msgstr "" -#: src/cryptsetup.c:3387 +#: src/cryptsetup.c:3519 msgid "Suspend LUKS device and wipe key (all IOs are frozen)" msgstr "" -#: src/cryptsetup.c:3388 +#: src/cryptsetup.c:3520 msgid "Resume suspended LUKS device" msgstr "" -#: src/cryptsetup.c:3389 +#: src/cryptsetup.c:3521 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:3390 +#: src/cryptsetup.c:3522 msgid "Restore LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:3391 +#: src/cryptsetup.c:3523 msgid " " msgstr "" -#: src/cryptsetup.c:3391 +#: src/cryptsetup.c:3523 msgid "Manipulate LUKS2 tokens" msgstr "" -#: src/cryptsetup.c:3409 src/veritysetup.c:417 src/integritysetup.c:498 +#: src/cryptsetup.c:3543 src/veritysetup.c:498 src/integritysetup.c:464 msgid "" "\n" " is one of:\n" @@ -2214,7 +2216,7 @@ "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n" msgstr "" -#: src/cryptsetup.c:3419 +#: src/cryptsetup.c:3553 #, c-format msgid "" "\n" @@ -2224,14 +2226,14 @@ " optional key file for the new key for luksAddKey action\n" msgstr "" -#: src/cryptsetup.c:3426 +#: src/cryptsetup.c:3560 #, c-format msgid "" "\n" "Default compiled-in metadata format is %s (for luksFormat action).\n" msgstr "" -#: src/cryptsetup.c:3431 +#: src/cryptsetup.c:3572 #, c-format msgid "" "\n" @@ -2243,7 +2245,7 @@ "\tIteration time: %d, Memory required: %dkB, Parallel threads: %d\n" msgstr "" -#: src/cryptsetup.c:3442 +#: src/cryptsetup.c:3583 #, c-format msgid "" "\n" @@ -2253,220 +2255,218 @@ "\tLUKS: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:3451 +#: src/cryptsetup.c:3592 msgid "" "\tLUKS: Default keysize with XTS mode (two internal keys) will be doubled.\n" msgstr "" -#: src/cryptsetup.c:3467 src/veritysetup.c:575 src/integritysetup.c:642 +#: src/cryptsetup.c:3610 src/veritysetup.c:637 src/integritysetup.c:620 #, c-format msgid "%s: requires %s as arguments" msgstr "" -#: src/cryptsetup.c:3500 src/veritysetup.c:462 src/integritysetup.c:536 -#: src/cryptsetup_reencrypt.c:1607 +#: src/cryptsetup.c:3741 src/veritysetup.c:561 src/integritysetup.c:543 +#: src/cryptsetup_reencrypt.c:1641 msgid "Show this help message" msgstr "" -#: src/cryptsetup.c:3501 src/veritysetup.c:463 src/integritysetup.c:537 -#: src/cryptsetup_reencrypt.c:1608 +#: src/cryptsetup.c:3742 src/veritysetup.c:562 src/integritysetup.c:544 +#: src/cryptsetup_reencrypt.c:1642 msgid "Display brief usage" msgstr "" -#: src/cryptsetup.c:3502 src/veritysetup.c:464 src/integritysetup.c:538 -#: src/cryptsetup_reencrypt.c:1609 +#: src/cryptsetup.c:3743 src/veritysetup.c:563 src/integritysetup.c:545 +#: src/cryptsetup_reencrypt.c:1643 msgid "Print package version" msgstr "" -#: src/cryptsetup.c:3506 src/veritysetup.c:468 src/integritysetup.c:542 -#: src/cryptsetup_reencrypt.c:1613 +#: src/cryptsetup.c:3754 src/veritysetup.c:574 src/integritysetup.c:556 +#: src/cryptsetup_reencrypt.c:1654 msgid "Help options:" msgstr "" -#: src/cryptsetup.c:3507 src/veritysetup.c:469 src/integritysetup.c:543 -#: src/cryptsetup_reencrypt.c:1614 +#: tokens/ssh/cryptsetup-ssh.c:147 msgid "Shows more detailed error messages" msgstr "" -#: src/cryptsetup.c:3508 src/veritysetup.c:470 src/integritysetup.c:544 -#: src/cryptsetup_reencrypt.c:1615 +#: tokens/ssh/cryptsetup-ssh.c:148 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:3509 +#: tokens/ssh/cryptsetup-ssh.c:149 msgid "Show debug messages including JSON metadata" msgstr "" -#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1617 +#: src/cryptsetup.c:3597 src/cryptsetup_reencrypt.c:1637 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "" -#: src/cryptsetup.c:3511 src/cryptsetup_reencrypt.c:1619 +#: src/cryptsetup.c:3598 src/cryptsetup_reencrypt.c:1639 msgid "The hash used to create the encryption key from the passphrase" msgstr "" -#: src/cryptsetup.c:3512 +#: src/cryptsetup.c:3599 msgid "Verifies the passphrase by asking for it twice" msgstr "" -#: src/cryptsetup.c:3513 src/cryptsetup_reencrypt.c:1621 +#: src/cryptsetup.c:3600 src/cryptsetup_reencrypt.c:1641 msgid "Read the key from a file" msgstr "" -#: src/cryptsetup.c:3514 +#: src/cryptsetup.c:3601 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:3515 +#: src/cryptsetup.c:3602 msgid "Dump volume (master) key instead of keyslots info" msgstr "" -#: src/cryptsetup.c:3516 src/cryptsetup_reencrypt.c:1618 +#: src/cryptsetup.c:3603 src/cryptsetup_reencrypt.c:1638 msgid "The size of the encryption key" msgstr "" -#: src/cryptsetup.c:3516 src/cryptsetup.c:3579 src/integritysetup.c:562 -#: src/integritysetup.c:566 src/integritysetup.c:570 -#: src/cryptsetup_reencrypt.c:1618 +#: src/cryptsetup.c:3603 src/cryptsetup.c:3666 src/integritysetup.c:579 +#: src/integritysetup.c:583 src/integritysetup.c:587 +#: src/cryptsetup_reencrypt.c:1638 msgid "BITS" msgstr "" -#: src/cryptsetup.c:3517 src/cryptsetup_reencrypt.c:1634 +#: src/cryptsetup.c:3604 src/cryptsetup_reencrypt.c:1654 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:3517 src/cryptsetup.c:3518 src/cryptsetup.c:3519 -#: src/cryptsetup.c:3520 src/cryptsetup.c:3523 src/cryptsetup.c:3576 -#: src/cryptsetup.c:3577 src/cryptsetup.c:3585 src/cryptsetup.c:3586 -#: src/veritysetup.c:473 src/veritysetup.c:474 src/veritysetup.c:475 -#: src/veritysetup.c:478 src/veritysetup.c:479 src/integritysetup.c:551 -#: src/integritysetup.c:557 src/integritysetup.c:558 -#: src/cryptsetup_reencrypt.c:1633 src/cryptsetup_reencrypt.c:1634 -#: src/cryptsetup_reencrypt.c:1635 src/cryptsetup_reencrypt.c:1636 +#: src/cryptsetup.c:3604 src/cryptsetup.c:3605 src/cryptsetup.c:3606 +#: src/cryptsetup.c:3607 src/cryptsetup.c:3610 src/cryptsetup.c:3663 +#: src/cryptsetup.c:3664 src/cryptsetup.c:3672 src/cryptsetup.c:3673 +#: src/veritysetup.c:483 src/veritysetup.c:484 src/veritysetup.c:485 +#: src/veritysetup.c:488 src/veritysetup.c:489 src/integritysetup.c:568 +#: src/integritysetup.c:574 src/integritysetup.c:575 +#: src/cryptsetup_reencrypt.c:1653 src/cryptsetup_reencrypt.c:1654 +#: src/cryptsetup_reencrypt.c:1655 src/cryptsetup_reencrypt.c:1656 msgid "bytes" msgstr "" -#: src/cryptsetup.c:3518 src/cryptsetup_reencrypt.c:1633 +#: src/cryptsetup.c:3605 src/cryptsetup_reencrypt.c:1653 msgid "Number of bytes to skip in keyfile" msgstr "" -#: src/cryptsetup.c:3519 +#: src/cryptsetup.c:3606 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:3520 +#: src/cryptsetup.c:3607 msgid "Number of bytes to skip in newly added keyfile" msgstr "" -#: src/cryptsetup.c:3521 +#: src/cryptsetup.c:3608 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:3522 +#: src/cryptsetup.c:3609 msgid "The size of the device" msgstr "" -#: src/cryptsetup.c:3522 src/cryptsetup.c:3524 src/cryptsetup.c:3525 -#: src/cryptsetup.c:3531 src/integritysetup.c:552 src/integritysetup.c:559 +#: src/cryptsetup.c:3609 src/cryptsetup.c:3611 src/cryptsetup.c:3612 +#: src/cryptsetup.c:3618 src/integritysetup.c:569 src/integritysetup.c:576 msgid "SECTORS" msgstr "" -#: src/cryptsetup.c:3523 src/cryptsetup_reencrypt.c:1636 +#: src/cryptsetup.c:3610 src/cryptsetup_reencrypt.c:1656 msgid "Use only specified device size (ignore rest of device). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3524 +#: src/cryptsetup.c:3611 msgid "The start offset in the backend device" msgstr "" -#: src/cryptsetup.c:3525 +#: src/cryptsetup.c:3612 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "" -#: src/cryptsetup.c:3526 +#: src/cryptsetup.c:3613 msgid "Create a readonly mapping" msgstr "" -#: src/cryptsetup.c:3527 src/integritysetup.c:545 -#: src/cryptsetup_reencrypt.c:1624 +#: src/cryptsetup.c:3614 src/integritysetup.c:562 +#: src/cryptsetup_reencrypt.c:1644 msgid "Do not ask for confirmation" msgstr "" -#: src/cryptsetup.c:3528 +#: src/cryptsetup.c:3615 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "" -#: src/cryptsetup.c:3528 src/cryptsetup.c:3529 src/integritysetup.c:546 -#: src/cryptsetup_reencrypt.c:1625 +#: src/cryptsetup.c:3615 src/cryptsetup.c:3616 src/integritysetup.c:563 +#: src/cryptsetup_reencrypt.c:1645 msgid "secs" msgstr "" -#: src/cryptsetup.c:3529 src/integritysetup.c:546 -#: src/cryptsetup_reencrypt.c:1625 +#: src/cryptsetup.c:3616 src/integritysetup.c:563 +#: src/cryptsetup_reencrypt.c:1645 msgid "Progress line update (in seconds)" msgstr "" -#: src/cryptsetup.c:3530 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3617 src/cryptsetup_reencrypt.c:1646 msgid "How often the input of the passphrase can be retried" msgstr "" -#: src/cryptsetup.c:3531 +#: src/cryptsetup.c:3618 msgid "Align payload at sector boundaries - for luksFormat" msgstr "" -#: src/cryptsetup.c:3532 +#: src/cryptsetup.c:3619 msgid "File with LUKS header and keyslots backup" msgstr "" -#: src/cryptsetup.c:3533 src/cryptsetup_reencrypt.c:1627 +#: src/cryptsetup.c:3620 src/cryptsetup_reencrypt.c:1647 msgid "Use /dev/random for generating volume key" msgstr "" -#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1628 +#: src/cryptsetup.c:3621 src/cryptsetup_reencrypt.c:1648 msgid "Use /dev/urandom for generating volume key" msgstr "" -#: src/cryptsetup.c:3535 +#: src/cryptsetup.c:3622 msgid "Share device with another non-overlapping crypt segment" msgstr "" -#: src/cryptsetup.c:3536 src/veritysetup.c:482 +#: src/cryptsetup.c:3623 src/veritysetup.c:492 msgid "UUID for device to use" msgstr "" -#: src/cryptsetup.c:3537 src/integritysetup.c:579 +#: src/cryptsetup.c:3624 src/integritysetup.c:599 msgid "Allow discards (aka TRIM) requests for device" msgstr "" -#: src/cryptsetup.c:3538 src/cryptsetup_reencrypt.c:1645 +#: src/cryptsetup.c:3625 src/cryptsetup_reencrypt.c:1665 msgid "Device or file with separated LUKS header" msgstr "" -#: src/cryptsetup.c:3539 +#: src/cryptsetup.c:3626 msgid "Do not activate device, just check passphrase" msgstr "" -#: src/cryptsetup.c:3540 +#: src/cryptsetup.c:3627 msgid "Use hidden header (hidden TCRYPT device)" msgstr "" -#: src/cryptsetup.c:3541 +#: src/cryptsetup.c:3628 msgid "Device is system TCRYPT drive (with bootloader)" msgstr "" -#: src/cryptsetup.c:3542 +#: src/cryptsetup.c:3629 msgid "Use backup (secondary) TCRYPT header" msgstr "" -#: src/cryptsetup.c:3543 +#: src/cryptsetup.c:3630 msgid "Scan also for VeraCrypt compatible device" msgstr "" -#: src/cryptsetup.c:3544 +#: src/cryptsetup.c:3631 msgid "Personal Iteration Multiplier for VeraCrypt compatible device" msgstr "" -#: src/cryptsetup.c:3545 +#: src/cryptsetup.c:3632 msgid "Query Personal Iteration Multiplier for VeraCrypt compatible device" msgstr "" @@ -2474,107 +2474,107 @@ msgid "Type of device metadata: luks, luks1, luks2, plain, loopaes, tcrypt" msgstr "" -#: src/cryptsetup.c:3547 +#: src/cryptsetup.c:3634 msgid "Disable password quality check (if enabled)" msgstr "" -#: src/cryptsetup.c:3548 +#: src/cryptsetup.c:3635 msgid "Use dm-crypt same_cpu_crypt performance compatibility option" msgstr "" -#: src/cryptsetup.c:3549 +#: src/cryptsetup.c:3636 msgid "Use dm-crypt submit_from_crypt_cpus performance compatibility option" msgstr "" -#: src/cryptsetup.c:3552 +#: src/cryptsetup.c:3639 msgid "Device removal is deferred until the last user closes it" msgstr "" -#: src/cryptsetup.c:3553 +#: src/cryptsetup.c:3640 msgid "Use global lock to serialize memory hard PBKDF (OOM workaround)" msgstr "" -#: src/cryptsetup.c:3554 +#: src/cryptsetup.c:3641 msgid "PBKDF iteration time for LUKS (in ms)" msgstr "" -#: src/cryptsetup.c:3554 src/cryptsetup_reencrypt.c:1623 +#: src/cryptsetup.c:3641 src/cryptsetup_reencrypt.c:1643 msgid "msecs" msgstr "" -#: src/cryptsetup.c:3555 src/cryptsetup_reencrypt.c:1641 +#: src/cryptsetup.c:3642 src/cryptsetup_reencrypt.c:1661 msgid "PBKDF algorithm (for LUKS2): argon2i, argon2id, pbkdf2" msgstr "" -#: src/cryptsetup.c:3556 src/cryptsetup_reencrypt.c:1642 +#: src/cryptsetup.c:3643 src/cryptsetup_reencrypt.c:1662 msgid "PBKDF memory cost limit" msgstr "" -#: src/cryptsetup.c:3556 src/cryptsetup_reencrypt.c:1642 +#: src/cryptsetup.c:3643 src/cryptsetup_reencrypt.c:1662 msgid "kilobytes" msgstr "" -#: src/cryptsetup.c:3557 src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup.c:3644 src/cryptsetup_reencrypt.c:1663 msgid "PBKDF parallel cost" msgstr "" -#: src/cryptsetup.c:3557 src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup.c:3644 src/cryptsetup_reencrypt.c:1663 msgid "threads" msgstr "" -#: src/cryptsetup.c:3558 src/cryptsetup_reencrypt.c:1644 +#: src/cryptsetup.c:3645 src/cryptsetup_reencrypt.c:1664 msgid "PBKDF iterations cost (forced, disables benchmark)" msgstr "" -#: src/cryptsetup.c:3559 +#: src/cryptsetup.c:3646 msgid "Keyslot priority: ignore, normal, prefer" msgstr "" -#: src/cryptsetup.c:3560 +#: src/cryptsetup.c:3647 msgid "Disable locking of on-disk metadata" msgstr "" -#: src/cryptsetup.c:3561 +#: src/cryptsetup.c:3648 msgid "Disable loading volume keys via kernel keyring" msgstr "" -#: src/cryptsetup.c:3562 +#: src/cryptsetup.c:3649 msgid "Data integrity algorithm (LUKS2 only)" msgstr "" -#: src/cryptsetup.c:3563 src/integritysetup.c:573 +#: src/cryptsetup.c:3650 src/integritysetup.c:590 msgid "Disable journal for integrity device" msgstr "" -#: src/cryptsetup.c:3564 src/integritysetup.c:547 +#: src/cryptsetup.c:3651 src/integritysetup.c:564 msgid "Do not wipe device after format" msgstr "" -#: src/cryptsetup.c:3566 +#: src/cryptsetup.c:3653 msgid "Do not ask for passphrase if activation by token fails" msgstr "" -#: src/cryptsetup.c:3567 +#: src/cryptsetup.c:3654 msgid "Token number (default: any)" msgstr "" -#: src/cryptsetup.c:3568 +#: src/cryptsetup.c:3655 msgid "Key description" msgstr "" -#: src/cryptsetup.c:3569 +#: src/cryptsetup.c:3656 msgid "Encryption sector size (default: 512 bytes)" msgstr "" -#: src/cryptsetup.c:3571 +#: src/cryptsetup.c:3658 msgid "Set activation flags persistent for device" msgstr "" -#: src/cryptsetup.c:3572 +#: src/cryptsetup.c:3659 msgid "Set label for the LUKS2 device" msgstr "" -#: src/cryptsetup.c:3573 +#: src/cryptsetup.c:3660 msgid "Set subsystem label for the LUKS2 device" msgstr "" @@ -2582,75 +2582,75 @@ msgid "Create unbound (no assigned data segment) LUKS2 keyslot" msgstr "" -#: src/cryptsetup.c:3575 +#: src/cryptsetup.c:3662 msgid "Read or write the json from or to a file" msgstr "" -#: src/cryptsetup.c:3576 +#: src/cryptsetup.c:3663 msgid "LUKS2 header metadata area size" msgstr "" -#: src/cryptsetup.c:3577 +#: src/cryptsetup.c:3664 msgid "LUKS2 header keyslots area size" msgstr "" -#: src/cryptsetup.c:3578 +#: src/cryptsetup.c:3665 msgid "Refresh (reactivate) device with new parameters" msgstr "" -#: src/cryptsetup.c:3579 +#: src/cryptsetup.c:3666 msgid "LUKS2 keyslot: The size of the encryption key" msgstr "" -#: src/cryptsetup.c:3580 +#: src/cryptsetup.c:3667 msgid "LUKS2 keyslot: The cipher used for keyslot encryption" msgstr "" -#: src/cryptsetup.c:3581 +#: src/cryptsetup.c:3668 msgid "Encrypt LUKS2 device (in-place encryption)." msgstr "" -#: src/cryptsetup.c:3582 +#: src/cryptsetup.c:3669 msgid "Decrypt LUKS2 device (remove encryption)." msgstr "" -#: src/cryptsetup.c:3583 +#: src/cryptsetup.c:3670 msgid "Initialize LUKS2 reencryption in metadata only." msgstr "" -#: src/cryptsetup.c:3584 +#: src/cryptsetup.c:3671 msgid "Resume initialized LUKS2 reencryption only." msgstr "" -#: src/cryptsetup.c:3585 src/cryptsetup_reencrypt.c:1635 +#: src/cryptsetup.c:3672 src/cryptsetup_reencrypt.c:1655 msgid "Reduce data device size (move data offset). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3586 +#: src/cryptsetup.c:3673 msgid "Maximal reencryption hotzone size." msgstr "" -#: src/cryptsetup.c:3587 +#: src/cryptsetup.c:3674 msgid "Reencryption hotzone resilience type (checksum,journal,none)" msgstr "" -#: src/cryptsetup.c:3588 +#: src/cryptsetup.c:3675 msgid "Reencryption hotzone checksums hash" msgstr "" -#: src/cryptsetup.c:3589 +#: src/cryptsetup.c:3676 msgid "Override device autodetection of dm device to be reencrypted" msgstr "" -#: src/cryptsetup.c:3605 src/veritysetup.c:505 src/integritysetup.c:595 +#: src/cryptsetup.c:3771 src/veritysetup.c:592 src/integritysetup.c:573 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup.c:3656 src/veritysetup.c:539 src/integritysetup.c:606 +#: src/cryptsetup.c:3780 src/veritysetup.c:601 src/integritysetup.c:584 msgid "Argument missing." msgstr "" -#: src/cryptsetup.c:3725 src/veritysetup.c:570 src/integritysetup.c:637 +#: src/cryptsetup.c:3850 src/veritysetup.c:632 src/integritysetup.c:615 msgid "Unknown action." msgstr "" @@ -2687,7 +2687,7 @@ msgid "Option --persistent is not allowed with --test-passphrase.\n" msgstr "" -#: src/cryptsetup.c:3775 +#: src/cryptsetup.c:3867 msgid "" "Option --key-size is allowed only for luksFormat, luksAddKey,\n" "open and benchmark actions. To limit read from keyfile use --keyfile-" @@ -2716,60 +2716,60 @@ "devices.\n" msgstr "" -#: src/cryptsetup.c:3803 src/cryptsetup_reencrypt.c:1708 +#: src/cryptsetup.c:3694 src/cryptsetup.c:3706 src/cryptsetup_reencrypt.c:1623 msgid "Key size must be a multiple of 8 bits" msgstr "" -#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1394 -#: src/cryptsetup_reencrypt.c:1713 +#: src/cryptsetup.c:3648 src/cryptsetup_reencrypt.c:1379 +#: src/cryptsetup_reencrypt.c:1704 msgid "Key slot is invalid." msgstr "" -#: src/cryptsetup.c:3816 +#: src/cryptsetup.c:3901 msgid "Option --key-file takes precedence over specified key file argument." msgstr "" -#: src/cryptsetup.c:3823 src/veritysetup.c:582 src/integritysetup.c:663 -#: src/cryptsetup_reencrypt.c:1687 +#: src/cryptsetup.c:3915 src/veritysetup.c:594 src/integritysetup.c:686 +#: src/cryptsetup_reencrypt.c:1707 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:3827 +#: src/cryptsetup.c:3907 msgid "Only one --key-file argument is allowed." msgstr "" -#: src/cryptsetup.c:3831 src/cryptsetup_reencrypt.c:1679 -#: src/cryptsetup_reencrypt.c:1717 +#: src/cryptsetup.c:3911 src/cryptsetup_reencrypt.c:1689 +#: src/cryptsetup_reencrypt.c:1708 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:3835 +#: src/cryptsetup.c:3927 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3839 +#: src/cryptsetup.c:3931 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" -#: src/cryptsetup.c:3843 +#: src/cryptsetup.c:3935 msgid "Option --align-payload is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3847 +#: src/cryptsetup.c:3939 msgid "" "Options --luks2-metadata-size and --opt-luks2-keyslots-size are allowed only " "for luksFormat with LUKS2." msgstr "" -#: src/cryptsetup.c:3852 +#: src/cryptsetup.c:3944 msgid "Invalid LUKS2 metadata size specification." msgstr "" -#: src/cryptsetup.c:3856 +#: src/cryptsetup.c:3948 msgid "Invalid LUKS2 keyslots size specification." msgstr "" -#: src/cryptsetup.c:3860 +#: src/cryptsetup.c:3915 msgid "Options --align-payload and --offset cannot be combined." msgstr "" @@ -2862,98 +2862,98 @@ msgid "Cannot disable metadata locking.\n" msgstr "" -#: src/cryptsetup.c:3992 +#: src/cryptsetup.c:3680 msgid "Invalid max reencryption hotzone size specification." msgstr "" -#: src/cryptsetup.c:4000 src/cryptsetup_reencrypt.c:1722 -#: src/cryptsetup_reencrypt.c:1727 +#: src/cryptsetup.c:4093 src/cryptsetup_reencrypt.c:1742 +#: src/cryptsetup_reencrypt.c:1747 msgid "Invalid device size specification." msgstr "" -#: src/cryptsetup.c:4003 +#: src/cryptsetup.c:3711 msgid "Maximum device reduce size is 1 GiB." msgstr "" -#: src/cryptsetup.c:4006 src/cryptsetup_reencrypt.c:1733 +#: src/cryptsetup.c:3714 src/cryptsetup_reencrypt.c:1631 msgid "Reduce size must be multiple of 512 bytes sector." msgstr "" -#: src/cryptsetup.c:4011 +#: src/cryptsetup.c:4104 msgid "Invalid data size specification." msgstr "" -#: src/cryptsetup.c:4016 +#: src/cryptsetup.c:4109 msgid "Reduce size overflow." msgstr "" -#: src/cryptsetup.c:4020 +#: src/cryptsetup.c:4012 msgid "LUKS2 decryption requires option --header." msgstr "" -#: src/cryptsetup.c:4024 +#: src/cryptsetup.c:3675 msgid "Device size must be multiple of 512 bytes sector." msgstr "" -#: src/cryptsetup.c:4028 +#: src/cryptsetup.c:4016 msgid "Options --reduce-device-size and --data-size cannot be combined." msgstr "" -#: src/cryptsetup.c:4032 +#: src/cryptsetup.c:4020 msgid "Options --device-size and --size cannot be combined." msgstr "" -#: src/veritysetup.c:67 +#: src/veritysetup.c:54 msgid "Invalid salt string specified." msgstr "" -#: src/veritysetup.c:98 +#: src/veritysetup.c:87 #, c-format msgid "Cannot create hash image %s for writing." msgstr "" -#: src/veritysetup.c:108 +#: src/veritysetup.c:97 #, c-format msgid "Cannot create FEC image %s for writing." msgstr "" -#: src/veritysetup.c:182 +#: src/veritysetup.c:236 msgid "Invalid root hash string specified." msgstr "" -#: src/veritysetup.c:397 +#: src/veritysetup.c:478 msgid " " msgstr "" -#: src/veritysetup.c:397 src/integritysetup.c:479 +#: src/veritysetup.c:478 src/integritysetup.c:445 msgid "format device" msgstr "" -#: src/veritysetup.c:398 +#: src/veritysetup.c:407 msgid " " msgstr "" -#: src/veritysetup.c:398 +#: src/veritysetup.c:479 msgid "verify device" msgstr "" -#: src/veritysetup.c:399 +#: src/veritysetup.c:408 msgid " " msgstr "" -#: src/veritysetup.c:401 src/integritysetup.c:482 +#: src/veritysetup.c:482 src/integritysetup.c:448 msgid "show active device status" msgstr "" -#: src/veritysetup.c:402 +#: src/veritysetup.c:483 msgid "" msgstr "" -#: src/veritysetup.c:402 src/integritysetup.c:483 +#: src/veritysetup.c:483 src/integritysetup.c:449 msgid "show on-disk information" msgstr "" -#: src/veritysetup.c:421 +#: src/veritysetup.c:502 #, c-format msgid "" "\n" @@ -2963,7 +2963,7 @@ " hash of the root node on \n" msgstr "" -#: src/veritysetup.c:428 +#: src/veritysetup.c:509 #, c-format msgid "" "\n" @@ -2972,83 +2972,83 @@ "Hash format: %u\n" msgstr "" -#: src/veritysetup.c:471 +#: src/veritysetup.c:481 msgid "Do not use verity superblock" msgstr "" -#: src/veritysetup.c:472 +#: src/veritysetup.c:482 msgid "Format type (1 - normal, 0 - original Chrome OS)" msgstr "" -#: src/veritysetup.c:472 +#: src/veritysetup.c:482 msgid "number" msgstr "" -#: src/veritysetup.c:473 +#: src/veritysetup.c:483 msgid "Block size on the data device" msgstr "" -#: src/veritysetup.c:474 +#: src/veritysetup.c:484 msgid "Block size on the hash device" msgstr "" -#: src/veritysetup.c:475 +#: src/veritysetup.c:485 msgid "FEC parity bytes" msgstr "" -#: src/veritysetup.c:476 +#: src/veritysetup.c:486 msgid "The number of blocks in the data file" msgstr "" -#: src/veritysetup.c:476 +#: src/veritysetup.c:486 msgid "blocks" msgstr "" -#: src/veritysetup.c:477 +#: src/veritysetup.c:487 msgid "Path to device with error correction data" msgstr "" -#: src/veritysetup.c:477 src/integritysetup.c:549 +#: src/veritysetup.c:487 src/integritysetup.c:566 msgid "path" msgstr "" -#: src/veritysetup.c:478 +#: src/veritysetup.c:488 msgid "Starting offset on the hash device" msgstr "" -#: src/veritysetup.c:479 +#: src/veritysetup.c:489 msgid "Starting offset on the FEC device" msgstr "" -#: src/veritysetup.c:480 +#: src/veritysetup.c:490 msgid "Hash algorithm" msgstr "" -#: src/veritysetup.c:480 +#: src/veritysetup.c:490 msgid "string" msgstr "" -#: src/veritysetup.c:481 +#: src/veritysetup.c:491 msgid "Salt" msgstr "" -#: src/veritysetup.c:481 +#: src/veritysetup.c:491 msgid "hex string" msgstr "" -#: src/veritysetup.c:484 +#: src/veritysetup.c:494 msgid "Restart kernel if corruption is detected" msgstr "" -#: src/veritysetup.c:486 +#: src/veritysetup.c:496 msgid "Ignore corruption, log it only" msgstr "" -#: src/veritysetup.c:487 +#: src/veritysetup.c:497 msgid "Do not verify zeroed blocks" msgstr "" -#: src/veritysetup.c:488 +#: src/veritysetup.c:498 msgid "Verify data block only the first time it is read" msgstr "" @@ -3064,30 +3064,30 @@ "together.\n" msgstr "" -#: src/integritysetup.c:84 src/utils_password.c:305 +#: src/utils_tools.c:511 #, c-format msgid "Cannot read keyfile %s." msgstr "" -#: src/integritysetup.c:88 src/utils_password.c:310 +#: src/utils_tools.c:516 #, c-format msgid "Cannot read %d bytes from keyfile %s." msgstr "" -#: src/integritysetup.c:254 +#: src/integritysetup.c:201 #, c-format msgid "Formatted with tag size %u, internal integrity %s.\n" msgstr "" -#: src/integritysetup.c:479 src/integritysetup.c:483 +#: src/integritysetup.c:445 src/integritysetup.c:449 msgid "" msgstr "" -#: src/integritysetup.c:480 +#: src/integritysetup.c:446 msgid " " msgstr "" -#: src/integritysetup.c:502 +#: src/integritysetup.c:468 #, c-format msgid "" "\n" @@ -3103,103 +3103,103 @@ "\tTag size: %u bytes, Checksum algorithm: %s\n" msgstr "" -#: src/integritysetup.c:549 +#: src/integritysetup.c:566 msgid "Path to data device (if separated)" msgstr "" -#: src/integritysetup.c:551 +#: src/integritysetup.c:568 msgid "Journal size" msgstr "" -#: src/integritysetup.c:552 +#: src/integritysetup.c:569 msgid "Interleave sectors" msgstr "" -#: src/integritysetup.c:553 +#: src/integritysetup.c:570 msgid "Journal watermark" msgstr "" -#: src/integritysetup.c:553 +#: src/integritysetup.c:570 msgid "percent" msgstr "" -#: src/integritysetup.c:554 +#: src/integritysetup.c:571 msgid "Journal commit time" msgstr "" -#: src/integritysetup.c:554 src/integritysetup.c:556 +#: src/integritysetup.c:571 src/integritysetup.c:573 msgid "ms" msgstr "" -#: src/integritysetup.c:555 +#: src/integritysetup.c:572 msgid "Number of 512-byte sectors per bit (bitmap mode)." msgstr "" -#: src/integritysetup.c:556 +#: src/integritysetup.c:573 msgid "Bitmap mode flush time" msgstr "" -#: src/integritysetup.c:557 +#: src/integritysetup.c:574 msgid "Tag size (per-sector)" msgstr "" -#: src/integritysetup.c:558 +#: src/integritysetup.c:575 msgid "Sector size" msgstr "" -#: src/integritysetup.c:559 +#: src/integritysetup.c:576 msgid "Buffers size" msgstr "" -#: src/integritysetup.c:561 +#: src/integritysetup.c:578 msgid "Data integrity algorithm" msgstr "" -#: src/integritysetup.c:562 +#: src/integritysetup.c:579 msgid "The size of the data integrity key" msgstr "" -#: src/integritysetup.c:563 +#: src/integritysetup.c:580 msgid "Read the integrity key from a file" msgstr "" -#: src/integritysetup.c:565 +#: src/integritysetup.c:582 msgid "Journal integrity algorithm" msgstr "" -#: src/integritysetup.c:566 +#: src/integritysetup.c:583 msgid "The size of the journal integrity key" msgstr "" -#: src/integritysetup.c:567 +#: src/integritysetup.c:584 msgid "Read the journal integrity key from a file" msgstr "" -#: src/integritysetup.c:569 +#: src/integritysetup.c:586 msgid "Journal encryption algorithm" msgstr "" -#: src/integritysetup.c:570 +#: src/integritysetup.c:587 msgid "The size of the journal encryption key" msgstr "" -#: src/integritysetup.c:571 +#: src/integritysetup.c:588 msgid "Read the journal encryption key from a file" msgstr "" -#: src/integritysetup.c:574 +#: src/integritysetup.c:591 msgid "Recovery mode (no journal, no tag checking)" msgstr "" -#: src/integritysetup.c:575 +#: src/integritysetup.c:592 msgid "Use bitmap to track changes and disable journal for integrity device" msgstr "" -#: src/integritysetup.c:576 +#: src/integritysetup.c:593 msgid "Recalculate initial tags automatically." msgstr "" -#: src/integritysetup.c:649 +#: src/integritysetup.c:672 msgid "Option --integrity-recalculate can be used only for open action." msgstr "" @@ -3209,11 +3209,11 @@ "-no-wipe can be used only for format action.\n" msgstr "" -#: src/integritysetup.c:675 +#: src/integritysetup.c:698 msgid "Invalid journal size specification." msgstr "" -#: src/integritysetup.c:680 +#: src/integritysetup.c:628 msgid "Both key file and key size options must be specified." msgstr "" @@ -3221,293 +3221,293 @@ msgid "Integrity algorithm must be specified if integrity key is used." msgstr "" -#: src/integritysetup.c:688 +#: src/integritysetup.c:632 msgid "" "Both journal integrity key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:691 +#: src/integritysetup.c:635 msgid "" "Journal integrity algorithm must be specified if journal integrity key is " "used." msgstr "" -#: src/integritysetup.c:696 +#: src/integritysetup.c:639 msgid "" "Both journal encryption key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:699 +#: src/integritysetup.c:642 msgid "" "Journal encryption algorithm must be specified if journal encryption key is " "used." msgstr "" -#: src/integritysetup.c:703 +#: src/integritysetup.c:646 msgid "Recovery and bitmap mode options are mutually exclusive." msgstr "" -#: src/integritysetup.c:707 +#: src/integritysetup.c:653 msgid "Journal options cannot be used in bitmap mode." msgstr "" -#: src/integritysetup.c:711 +#: src/integritysetup.c:658 msgid "Bitmap options can be used only in bitmap mode." msgstr "" -#: src/cryptsetup_reencrypt.c:172 +#: src/cryptsetup_reencrypt.c:149 msgid "Reencryption already in-progress." msgstr "" -#: src/cryptsetup_reencrypt.c:208 +#: src/cryptsetup_reencrypt.c:185 #, c-format msgid "Cannot exclusively open %s, device in use." msgstr "" -#: src/cryptsetup_reencrypt.c:222 src/cryptsetup_reencrypt.c:1135 +#: src/cryptsetup_reencrypt.c:199 src/cryptsetup_reencrypt.c:1120 msgid "Allocation of aligned memory failed." msgstr "" -#: src/cryptsetup_reencrypt.c:229 +#: src/cryptsetup_reencrypt.c:206 #, c-format msgid "Cannot read device %s." msgstr "" -#: src/cryptsetup_reencrypt.c:240 +#: src/cryptsetup_reencrypt.c:217 #, c-format msgid "Marking LUKS1 device %s unusable." msgstr "" -#: src/cryptsetup_reencrypt.c:244 +#: src/cryptsetup_reencrypt.c:221 #, c-format msgid "Setting LUKS2 offline reencrypt flag on device %s." msgstr "" -#: src/cryptsetup_reencrypt.c:261 +#: src/cryptsetup_reencrypt.c:238 #, c-format msgid "Cannot write device %s." msgstr "" -#: src/cryptsetup_reencrypt.c:309 +#: src/cryptsetup_reencrypt.c:286 msgid "Cannot write reencryption log file." msgstr "" -#: src/cryptsetup_reencrypt.c:365 +#: src/cryptsetup_reencrypt.c:342 msgid "Cannot read reencryption log file." msgstr "" -#: src/cryptsetup_reencrypt.c:403 +#: src/cryptsetup_reencrypt.c:380 #, c-format msgid "Log file %s exists, resuming reencryption.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:452 +#: src/cryptsetup_reencrypt.c:429 msgid "Activating temporary device using old LUKS header." msgstr "" -#: src/cryptsetup_reencrypt.c:462 +#: src/cryptsetup_reencrypt.c:439 msgid "Activating temporary device using new LUKS header." msgstr "" -#: src/cryptsetup_reencrypt.c:472 +#: src/cryptsetup_reencrypt.c:449 msgid "Activation of temporary devices failed." msgstr "" -#: src/cryptsetup_reencrypt.c:559 +#: src/cryptsetup_reencrypt.c:536 msgid "Failed to set data offset." msgstr "" -#: src/cryptsetup_reencrypt.c:565 +#: src/cryptsetup_reencrypt.c:542 msgid "Failed to set metadata size." msgstr "" -#: src/cryptsetup_reencrypt.c:573 +#: src/cryptsetup_reencrypt.c:550 #, c-format msgid "New LUKS header for device %s created." msgstr "" -#: src/cryptsetup_reencrypt.c:633 +#: src/cryptsetup_reencrypt.c:610 #, c-format msgid "" "This version of cryptsetup-reencrypt can't handle new internal token type %s." msgstr "" -#: src/cryptsetup_reencrypt.c:655 +#: src/cryptsetup_reencrypt.c:632 msgid "Failed to read activation flags from backup header." msgstr "" -#: src/cryptsetup_reencrypt.c:659 +#: src/cryptsetup_reencrypt.c:636 msgid "Failed to write activation flags to new header." msgstr "" -#: src/cryptsetup_reencrypt.c:663 src/cryptsetup_reencrypt.c:667 +#: src/cryptsetup_reencrypt.c:640 src/cryptsetup_reencrypt.c:644 msgid "Failed to read requirements from backup header." msgstr "" -#: src/cryptsetup_reencrypt.c:705 +#: src/cryptsetup_reencrypt.c:682 #, c-format msgid "%s header backup of device %s created." msgstr "" -#: src/cryptsetup_reencrypt.c:768 +#: src/cryptsetup_reencrypt.c:745 msgid "Creation of LUKS backup headers failed." msgstr "" -#: src/cryptsetup_reencrypt.c:901 +#: src/cryptsetup_reencrypt.c:878 #, c-format msgid "Cannot restore %s header on device %s." msgstr "" -#: src/cryptsetup_reencrypt.c:903 +#: src/cryptsetup_reencrypt.c:880 #, c-format msgid "%s header on device %s restored." msgstr "" -#: src/cryptsetup_reencrypt.c:1107 src/cryptsetup_reencrypt.c:1113 +#: src/cryptsetup_reencrypt.c:1092 src/cryptsetup_reencrypt.c:1098 msgid "Cannot open temporary LUKS device." msgstr "" -#: src/cryptsetup_reencrypt.c:1118 src/cryptsetup_reencrypt.c:1123 +#: src/cryptsetup_reencrypt.c:1103 src/cryptsetup_reencrypt.c:1108 msgid "Cannot get device size." msgstr "" -#: src/cryptsetup_reencrypt.c:1158 +#: src/cryptsetup_reencrypt.c:1143 msgid "IO error during reencryption." msgstr "" -#: src/cryptsetup_reencrypt.c:1189 +#: src/cryptsetup_reencrypt.c:1174 msgid "Provided UUID is invalid." msgstr "" -#: src/cryptsetup_reencrypt.c:1423 +#: src/cryptsetup_reencrypt.c:1408 msgid "Cannot open reencryption log file." msgstr "" -#: src/cryptsetup_reencrypt.c:1429 +#: src/cryptsetup_reencrypt.c:1414 msgid "" "No decryption in progress, provided UUID can be used only to resume " "suspended decryption process." msgstr "" -#: src/cryptsetup_reencrypt.c:1504 +#: src/cryptsetup_reencrypt.c:1489 #, c-format msgid "Changed pbkdf parameters in keyslot %i." msgstr "" -#: src/cryptsetup_reencrypt.c:1616 +#: src/cryptsetup_reencrypt.c:1636 msgid "Reencryption block size" msgstr "" -#: src/cryptsetup_reencrypt.c:1616 +#: src/cryptsetup_reencrypt.c:1636 msgid "MiB" msgstr "" -#: src/cryptsetup_reencrypt.c:1620 +#: src/cryptsetup_reencrypt.c:1640 msgid "Do not change key, no data area reencryption" msgstr "" -#: src/cryptsetup_reencrypt.c:1622 +#: src/cryptsetup_reencrypt.c:1642 msgid "Read new volume (master) key from file" msgstr "" -#: src/cryptsetup_reencrypt.c:1623 +#: src/cryptsetup_reencrypt.c:1643 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "" -#: src/cryptsetup_reencrypt.c:1629 +#: src/cryptsetup_reencrypt.c:1649 msgid "Use direct-io when accessing devices" msgstr "" -#: src/cryptsetup_reencrypt.c:1630 +#: src/cryptsetup_reencrypt.c:1650 msgid "Use fsync after each block" msgstr "" -#: src/cryptsetup_reencrypt.c:1631 +#: src/cryptsetup_reencrypt.c:1651 msgid "Update log file after every block" msgstr "" -#: src/cryptsetup_reencrypt.c:1632 +#: src/cryptsetup_reencrypt.c:1652 msgid "Use only this slot (others will be disabled)" msgstr "" -#: src/cryptsetup_reencrypt.c:1637 +#: src/cryptsetup_reencrypt.c:1657 msgid "Create new header on not encrypted device" msgstr "" -#: src/cryptsetup_reencrypt.c:1638 +#: src/cryptsetup_reencrypt.c:1658 msgid "Permanently decrypt device (remove encryption)" msgstr "" -#: src/cryptsetup_reencrypt.c:1639 +#: src/cryptsetup_reencrypt.c:1659 msgid "The UUID used to resume decryption" msgstr "" -#: src/cryptsetup_reencrypt.c:1640 +#: src/cryptsetup_reencrypt.c:1660 msgid "Type of LUKS metadata: luks1, luks2" msgstr "" -#: src/cryptsetup_reencrypt.c:1659 +#: src/cryptsetup_reencrypt.c:1669 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup_reencrypt.c:1667 +#: src/cryptsetup_reencrypt.c:1677 #, c-format msgid "Reencryption will change: %s%s%s%s%s%s." msgstr "" -#: src/cryptsetup_reencrypt.c:1668 +#: src/cryptsetup_reencrypt.c:1678 msgid "volume key" msgstr "" -#: src/cryptsetup_reencrypt.c:1670 +#: src/cryptsetup_reencrypt.c:1680 msgid "set hash to " msgstr "" -#: src/cryptsetup_reencrypt.c:1671 +#: src/cryptsetup_reencrypt.c:1681 msgid ", set cipher to " msgstr "" -#: src/cryptsetup_reencrypt.c:1675 +#: src/cryptsetup_reencrypt.c:1685 msgid "Argument required." msgstr "" -#: src/cryptsetup_reencrypt.c:1703 +#: src/cryptsetup_reencrypt.c:1614 msgid "" "Only values between 1 MiB and 64 MiB allowed for reencryption block size." msgstr "" -#: src/cryptsetup_reencrypt.c:1730 +#: src/cryptsetup_reencrypt.c:1628 msgid "Maximum device reduce size is 64 MiB." msgstr "" -#: src/cryptsetup_reencrypt.c:1737 +#: src/cryptsetup_reencrypt.c:1712 msgid "" "Option --new must be used together with --reduce-device-size or --header." msgstr "" -#: src/cryptsetup_reencrypt.c:1741 +#: src/cryptsetup_reencrypt.c:1716 msgid "" "Option --keep-key can be used only with --hash, --iter-time or --pbkdf-force-" "iterations." msgstr "" -#: src/cryptsetup_reencrypt.c:1745 +#: src/cryptsetup_reencrypt.c:1720 msgid "Option --new cannot be used together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1749 +#: src/cryptsetup_reencrypt.c:1726 msgid "Option --decrypt is incompatible with specified parameters." msgstr "" -#: src/cryptsetup_reencrypt.c:1753 +#: src/cryptsetup_reencrypt.c:1730 msgid "Option --uuid is allowed only together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1757 +#: src/cryptsetup_reencrypt.c:1734 msgid "Invalid luks type. Use one of these: 'luks', 'luks1' or 'luks2'." msgstr "" -#: src/utils_tools.c:151 +#: src/utils_tools.c:127 msgid "Error reading response from terminal." msgstr "" @@ -3515,27 +3515,27 @@ msgid "Command successful.\n" msgstr "" -#: src/utils_tools.c:194 +#: src/utils_tools.c:167 msgid "wrong or missing parameters" msgstr "" -#: src/utils_tools.c:196 +#: src/utils_tools.c:169 msgid "no permission or bad passphrase" msgstr "" -#: src/utils_tools.c:198 +#: src/utils_tools.c:171 msgid "out of memory" msgstr "" -#: src/utils_tools.c:200 +#: src/utils_tools.c:173 msgid "wrong device or file specified" msgstr "" -#: src/utils_tools.c:202 +#: src/utils_tools.c:175 msgid "device already exists or device is busy" msgstr "" -#: src/utils_tools.c:204 +#: src/utils_tools.c:177 msgid "unknown error" msgstr "" @@ -3544,152 +3544,152 @@ msgid "Command failed with code %i (%s).\n" msgstr "" -#: src/utils_tools.c:283 +#: src/utils_tools.c:257 #, c-format msgid "Key slot %i created." msgstr "" -#: src/utils_tools.c:285 +#: src/utils_tools.c:259 #, c-format msgid "Key slot %i unlocked." msgstr "" -#: src/utils_tools.c:287 +#: src/utils_tools.c:261 #, c-format msgid "Key slot %i removed." msgstr "" -#: src/utils_tools.c:296 +#: src/utils_tools.c:270 #, c-format msgid "Token %i created." msgstr "" -#: src/utils_tools.c:298 +#: src/utils_tools.c:272 #, c-format msgid "Token %i removed." msgstr "" -#: src/utils_tools.c:464 +#: src/utils_tools.c:463 msgid "" "\n" "Wipe interrupted." msgstr "" -#: src/utils_tools.c:475 +#: src/utils_blockdev.c:192 #, c-format msgid "WARNING: Device %s already contains a '%s' partition signature.\n" msgstr "" -#: src/utils_tools.c:483 +#: src/utils_blockdev.c:200 #, c-format msgid "WARNING: Device %s already contains a '%s' superblock signature.\n" msgstr "" -#: src/utils_tools.c:504 src/utils_tools.c:568 +#: src/utils_blockdev.c:221 src/utils_blockdev.c:285 msgid "Failed to initialize device signature probes." msgstr "" -#: src/utils_tools.c:548 +#: src/utils_blockdev.c:265 #, c-format msgid "Failed to stat device %s." msgstr "" -#: src/utils_tools.c:561 +#: src/utils_tools.c:562 #, c-format msgid "Device %s is in use. Can not proceed with format operation." msgstr "" -#: src/utils_tools.c:563 +#: src/utils_blockdev.c:280 #, c-format msgid "Failed to open file %s in read/write mode." msgstr "" -#: src/utils_tools.c:577 +#: src/utils_tools.c:578 #, c-format msgid "" "Existing '%s' partition signature (offset: % bytes) on device %s " "will be wiped." msgstr "" -#: src/utils_tools.c:580 +#: src/utils_tools.c:581 #, c-format msgid "" "Existing '%s' superblock signature (offset: % bytes) on device %s " "will be wiped." msgstr "" -#: src/utils_tools.c:583 +#: src/utils_blockdev.c:300 msgid "Failed to wipe device signature." msgstr "" -#: src/utils_tools.c:590 +#: src/utils_blockdev.c:307 #, c-format msgid "Failed to probe device %s for a signature." msgstr "" -#: src/utils_tools.c:629 +#: src/utils_tools.c:492 msgid "" "\n" "Reencryption interrupted." msgstr "" -#: src/utils_password.c:43 src/utils_password.c:75 +#: src/utils_password.c:41 src/utils_password.c:74 #, c-format msgid "Cannot check password quality: %s" msgstr "" -#: src/utils_password.c:51 +#: src/utils_password.c:49 #, c-format msgid "" "Password quality check failed:\n" " %s" msgstr "" -#: src/utils_password.c:83 +#: src/utils_password.c:81 #, c-format msgid "Password quality check failed: Bad passphrase (%s)" msgstr "" -#: src/utils_password.c:193 src/utils_password.c:208 +#: src/utils_password.c:224 src/utils_password.c:238 msgid "Error reading passphrase from terminal." msgstr "" -#: src/utils_password.c:206 +#: src/utils_password.c:236 msgid "Verify passphrase: " msgstr "パスフレーズを確認: " -#: src/utils_password.c:213 +#: src/utils_password.c:243 msgid "Passphrases do not match." msgstr "" -#: src/utils_password.c:250 +#: src/utils_password.c:280 msgid "Cannot use offset with terminal input." msgstr "" -#: src/utils_password.c:253 +#: src/utils_password.c:283 #, c-format msgid "Enter passphrase: " msgstr "" -#: src/utils_password.c:256 +#: src/utils_password.c:286 #, c-format msgid "Enter passphrase for %s: " msgstr "" -#: src/utils_password.c:287 +#: src/utils_password.c:317 msgid "No key available with this passphrase." msgstr "" -#: src/utils_password.c:289 +#: src/utils_password.c:319 msgid "No usable keyslot is available." msgstr "" -#: src/utils_password.c:328 +#: src/utils_tools.c:541 #, c-format msgid "Cannot open keyfile %s for write." msgstr "" -#: src/utils_password.c:335 +#: src/utils_tools.c:548 #, c-format msgid "Cannot write to keyfile %s." msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cups.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cups.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/cups.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/cups.po 2022-02-11 23:04:14.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:51+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:47+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: systemv/lpstat.c:1871 systemv/lpstat.c:1990 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dctrl-tools.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dctrl-tools.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dctrl-tools.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dctrl-tools.po 2022-02-11 23:04:20.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: 2021-08-02 17:24+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:18+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: \n" #: lib/paragraph.c:172 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debconf.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debconf.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debconf.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debconf.po 2022-02-11 23:04:23.000000000 +0000 @@ -14,45 +14,45 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: ../Debconf/AutoSelect.pm:88 +#: ../Debconf/AutoSelect.pm:89 #, perl-format msgid "falling back to frontend: %s" msgstr "フロントエンドをフォールバックします: %s" -#: ../Debconf/AutoSelect.pm:96 +#: ../Debconf/AutoSelect.pm:97 #, perl-format msgid "unable to initialize frontend: %s" msgstr "フロントエンドの初期化に失敗しました: %s" -#: ../Debconf/AutoSelect.pm:102 +#: ../Debconf/AutoSelect.pm:103 #, perl-format msgid "Unable to start a frontend: %s" msgstr "フロントエンドの起動ができませんでした: %s" -#: ../Debconf/Config.pm:130 +#: ../Debconf/Config.pm:131 msgid "Config database not specified in config file." msgstr "設定データベースが設定ファイルで指定されていません。" -#: ../Debconf/Config.pm:134 +#: ../Debconf/Config.pm:135 msgid "Template database not specified in config file." msgstr "テンプレートデータベースが設定ファイルで指定されていません。" -#: ../Debconf/Config.pm:139 +#: ../Debconf/Config.pm:140 msgid "" "The Sigils and Smileys options in the config file are no longer used. Please " "remove them." msgstr "設定ファイルの Sigils と Smileys オプションは使われなくなりました。削除してください。" -#: ../Debconf/Config.pm:153 +#: ../Debconf/Config.pm:157 #, perl-format msgid "Problem setting up the database defined by stanza %s of %s." msgstr "%2$s の %1$s で定義されたデータベースを設定するのに問題が発生しました。" -#: ../Debconf/Config.pm:228 +#: ../Debconf/Config.pm:232 msgid "" " -f, --frontend\t\tSpecify debconf frontend to use.\n" " -p, --priority\t\tSpecify minimum priority question to show.\n" @@ -62,12 +62,12 @@ " -p, --priority\t\t表示する最小優先度を指定する。\n" " --terse\t\t\t簡潔モードを有効にする。\n" -#: ../Debconf/Config.pm:308 +#: ../Debconf/Config.pm:312 #, perl-format msgid "Ignoring invalid priority \"%s\"" msgstr "不正なプロパティ \"%s\" を無視します" -#: ../Debconf/Config.pm:309 +#: ../Debconf/Config.pm:313 #, perl-format msgid "Valid priorities are: %s" msgstr "有効なプロパティは次のとおりです: %s" @@ -129,7 +129,7 @@ "入力値 \"%s\" は C における選択肢にはありません! " "これは起こるはずがないことです。テンプレートファイルが正しくローカライズされていない恐れがあります。" -#: ../Debconf/Element/Teletype/Multiselect.pm:27 +#: ../Debconf/Element/Teletype/Multiselect.pm:59 msgid "none of the above" msgstr "上記以外" @@ -162,18 +162,18 @@ msgstr "" "Dialog フロントエンドはダムターミナル、emacs のシェルバッファ、もしくはユーザーが制御しているターミナルではない場合には動作しません。" -#: ../Debconf/FrontEnd/Dialog.pm:105 +#: ../Debconf/FrontEnd/Dialog.pm:107 msgid "" "No usable dialog-like program is installed, so the dialog based frontend " "cannot be used." msgstr "利用可能な dialog 系のプログラムがインストールされていないため、ダイアログ形式のフロントエンドは使用できません。" -#: ../Debconf/FrontEnd/Dialog.pm:112 +#: ../Debconf/FrontEnd/Dialog.pm:114 msgid "" "Dialog frontend requires a screen at least 13 lines tall and 31 columns wide." msgstr "Dialog フロントエンドはすくなくとも 13 行あり、幅 31 文字ある画面を必要とします。" -#: ../Debconf/FrontEnd/Dialog.pm:296 +#: ../Debconf/FrontEnd/Dialog.pm:331 msgid "Package configuration" msgstr "パッケージの設定" @@ -224,8 +224,7 @@ msgid "Continue" msgstr "" -#: ../Debconf/FrontEnd/Gnome.pm:218 ../Debconf/FrontEnd/Kde.pm:100 -#: ../Debconf/FrontEnd/Kde.pm:104 +#: ../Debconf/FrontEnd/Gnome.pm:218 #, perl-format msgid "Debconf on %s" msgstr "%s の Debconf" @@ -242,7 +241,7 @@ msgid "This frontend requires a controlling tty." msgstr "このフロントエンドはユーザーが操作している tty を必要とします。" -#: ../Debconf/FrontEnd/Readline.pm:58 +#: ../Debconf/FrontEnd/Readline.pm:62 msgid "Term::ReadLine::GNU is incompatable with emacs shell buffers." msgstr "Term::ReadLine::GNU フロントエンドは emacs のシェルバッファと互換性がありません。" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debian-tasks.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debian-tasks.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debian-tasks.po 2021-08-03 08:53:39.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debian-tasks.po 2022-02-11 23:04:22.000000000 +0000 @@ -14,17 +14,17 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:04+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. Description -#: ../po/debian-tasks.desc:10001 +#: ../po/debian-tasks.desc:11001 msgid "standard system utilities" msgstr "標準システムユーティリティ" #. Description -#: ../po/debian-tasks.desc:10001 +#: ../po/debian-tasks.desc:11001 msgid "" "This task sets up a basic user environment, providing a reasonably small " "selection of services and tools usable on the command line." diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debianutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debianutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/debianutils.po 2021-08-03 08:53:34.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/debianutils.po 2022-02-11 23:04:17.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: 2021-08-02 17:56+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:52+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #. type: TH diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2021-08-03 08:53:34.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2022-02-11 23:04:16.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: 2021-08-02 18:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2022-02-11 23:04:19.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: 2021-08-02 18:12+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:08+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: searchproviders/brainstorm.desktop:5 msgctxt "Name" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/diffutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/diffutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/diffutils.po 2021-08-03 08:53:38.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/diffutils.po 2022-02-11 23:04:21.000000000 +0000 @@ -19,29 +19,29 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:13+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:07+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:132 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:133 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:154 +#: lib/argmatch.c:152 lib/argmatch.h:223 msgid "Valid arguments are:" msgstr "" -#: lib/c-stack.c:208 lib/c-stack.c:301 +#: lib/c-stack.c:187 msgid "program error" msgstr "プログラムエラー" -#: lib/c-stack.c:209 lib/c-stack.c:302 +#: lib/c-stack.c:188 msgid "stack overflow" msgstr "スタックオーバーフロー" @@ -201,11 +201,11 @@ #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "`" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "'" @@ -277,7 +277,7 @@ msgid "Unmatched ) or \\)" msgstr ") または \\) が不一致です" -#: lib/regcomp.c:688 +#: lib/regcomp.c:676 msgid "No previous regular expression" msgstr "以前に正規表現がありません" @@ -285,23 +285,23 @@ msgid "memory exhausted" msgstr "メモリを使い果たしました" -#: lib/xfreopen.c:35 +#: lib/xfreopen.c:34 msgid "stdin" msgstr "標準入力" -#: lib/xfreopen.c:36 +#: lib/xfreopen.c:35 msgid "stdout" msgstr "標準出力" -#: lib/xfreopen.c:37 +#: lib/xfreopen.c:36 msgid "stderr" msgstr "標準エラー出力" -#: lib/xfreopen.c:38 +#: lib/xfreopen.c:37 msgid "unknown stream" msgstr "不明なストリーム" -#: lib/xfreopen.c:39 +#: lib/xfreopen.c:38 #, c-format msgid "failed to reopen %s with mode %s" msgstr "%s をモード %s で再度開くことに失敗しました" @@ -349,19 +349,19 @@ msgstr "" #. TRANSLATORS: %s denotes an author name. -#: lib/version-etc.c:102 +#: lib/version-etc.c:105 #, c-format msgid "Written by %s.\n" msgstr "作者 %s。\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:106 +#: lib/version-etc.c:109 #, c-format msgid "Written by %s and %s.\n" msgstr "作者 %s および %s。\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:110 +#: lib/version-etc.c:113 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "作者 %s、 %s、および %s。\n" @@ -369,7 +369,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:117 +#: lib/version-etc.c:120 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -381,7 +381,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:124 +#: lib/version-etc.c:127 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -393,7 +393,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:131 +#: lib/version-etc.c:134 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -405,7 +405,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:139 +#: lib/version-etc.c:142 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -417,7 +417,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:147 +#: lib/version-etc.c:150 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -431,7 +431,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:156 +#: lib/version-etc.c:159 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -445,7 +445,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:167 +#: lib/version-etc.c:170 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -470,12 +470,12 @@ "バグを発見したら <%s> に報告して下さい。\n" "翻訳に関するバグはに報告してください。\n" -#: lib/version-etc.c:247 +#: lib/version-etc.c:251 #, c-format msgid "Report %s bugs to: %s\n" msgstr "%s のバグは <%s> に報告してください。\n" -#: lib/version-etc.c:251 +#: lib/version-etc.c:255 lib/version-etc.c:257 #, c-format msgid "%s home page: <%s>\n" msgstr "%s のホームページ: <%s>\n" @@ -489,7 +489,7 @@ msgid "General help using GNU software: \n" msgstr "" -#: src/analyze.c:454 src/diff.c:1404 +#: src/analyze.c:454 src/diff.c:1406 #, c-format msgid "Files %s and %s differ\n" msgstr "ファイル %s と %s は異なります\n" @@ -499,54 +499,54 @@ msgid "Binary files %s and %s differ\n" msgstr "バイナリーファイル %s と%s は異なります\n" -#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 +#: src/analyze.c:706 src/diff3.c:1470 src/util.c:1254 msgid "No newline at end of file" msgstr "ファイル末尾に改行がありません" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:45 +#: src/cmp.c:46 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 +#: src/cmp.c:120 src/diff.c:879 src/diff3.c:467 src/sdiff.c:160 #, c-format msgid "Try '%s --help' for more information." msgstr "" -#: src/cmp.c:137 +#: src/cmp.c:138 #, c-format msgid "invalid --ignore-initial value '%s'" msgstr "" -#: src/cmp.c:147 +#: src/cmp.c:148 #, c-format msgid "options -l and -s are incompatible" msgstr "オプション -l と -s は同時に指定できません" -#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 +#: src/cmp.c:156 src/diff.c:887 src/diff3.c:474 src/sdiff.c:168 src/sdiff.c:316 +#: src/sdiff.c:323 src/sdiff.c:876 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "書き込みに失敗しました" -#: src/cmp.c:157 src/diff.c:887 src/diff.c:1469 src/diff3.c:471 src/sdiff.c:169 +#: src/cmp.c:158 src/diff.c:889 src/diff.c:1471 src/diff3.c:476 src/sdiff.c:170 msgid "standard output" msgstr "標準出力" -#: src/cmp.c:161 +#: src/cmp.c:162 msgid "-b, --print-bytes print differing bytes" msgstr "-b, --print-bytes 異なるバイトを表示する" -#: src/cmp.c:162 +#: src/cmp.c:163 msgid "" "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "-i, --ignore-initial=SKIP 両方の入力の先頭 SKIP バイトをスキップする" -#: src/cmp.c:163 +#: src/cmp.c:164 msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" @@ -554,37 +554,37 @@ "-i, --ignore-initial=SKIP1:SKIP2 FILE1 の先頭 SKIP1 バイトと FILE2 の先頭\n" " SKIP2 バイトをスキップする" -#: src/cmp.c:165 +#: src/cmp.c:166 msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "-l, --verbose バイト数および異なるバイトの値を出力する" -#: src/cmp.c:166 +#: src/cmp.c:167 msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" msgstr "-n, --bytes=LIMIT 最大 LIMIT バイトを比較する" -#: src/cmp.c:167 +#: src/cmp.c:168 msgid "-s, --quiet, --silent suppress all normal output" msgstr "-s, --quiet, --silent 通常の表示をすべて抑止する" -#: src/cmp.c:168 +#: src/cmp.c:169 msgid " --help display this help and exit" msgstr " --help このメッセージを表示して終了する" -#: src/cmp.c:169 +#: src/cmp.c:170 msgid "-v, --version output version information and exit" msgstr "-v, --version バージョン情報を表示して終了する" -#: src/cmp.c:178 +#: src/cmp.c:179 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" msgstr "使用法: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -#: src/cmp.c:180 +#: src/cmp.c:181 msgid "Compare two files byte by byte." msgstr "2つのファイルをバイトごとに比較します。" -#: src/cmp.c:182 +#: src/cmp.c:183 msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." @@ -592,12 +592,12 @@ "オプションの SKIP1 と SKIP2 はそれぞれのファイルの先頭からスキップする\n" "バイト数を指定します(デフォルトは 0)。" -#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 +#: src/cmp.c:186 src/diff.c:999 src/diff3.c:514 src/sdiff.c:211 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長い形式のオプションで必須の引数は、それに対応する短い形式のオプションでも同様に必須です。\n" -#: src/cmp.c:191 +#: src/cmp.c:192 msgid "" "SKIP values may be followed by the following multiplicative suffixes:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" @@ -607,256 +607,256 @@ "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824。また、 T, P, E, Z, Y も同様です。" -#: src/cmp.c:194 +#: src/cmp.c:195 msgid "If a FILE is '-' or missing, read standard input." msgstr "" -#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 +#: src/cmp.c:196 src/diff.c:987 src/sdiff.c:221 msgid "" "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "終了コードは、入力ファイルが同じ場合は 0、入力ファイルが異なる場合は 1、\n" "問題が発生したときは 2 になります。" -#: src/cmp.c:240 +#: src/cmp.c:243 #, c-format msgid "invalid --bytes value '%s'" msgstr "" -#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 +#: src/cmp.c:269 src/diff.c:797 src/diff3.c:361 src/sdiff.c:567 #, c-format msgid "missing operand after '%s'" msgstr "" -#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 +#: src/cmp.c:281 src/diff.c:799 src/diff3.c:363 src/sdiff.c:569 #, c-format msgid "extra operand '%s'" msgstr "" -#: src/cmp.c:498 +#: src/cmp.c:507 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s 異なります: バイト %s、行 %s\n" -#: src/cmp.c:514 +#: src/cmp.c:523 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s 異なります: バイト %s、行 %s %3o %s %3o %s\n" -#: src/cmp.c:571 +#: src/cmp.c:580 #, c-format msgid "cmp: EOF on %s which is empty\n" msgstr "" -#: src/cmp.c:585 +#: src/cmp.c:594 #, c-format msgid "cmp: EOF on %s after byte %s, line %s\n" msgstr "" -#: src/cmp.c:586 +#: src/cmp.c:595 #, c-format msgid "cmp: EOF on %s after byte %s, in line %s\n" msgstr "" -#: src/cmp.c:592 +#: src/cmp.c:601 #, c-format msgid "cmp: EOF on %s after byte %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:54 +#: src/diff.c:55 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:353 +#: src/diff.c:355 #, c-format msgid "invalid context length '%s'" msgstr "" -#: src/diff.c:436 +#: src/diff.c:438 #, c-format msgid "pagination not supported on this host" msgstr "このホストではページ割付けをサポートしません" -#: src/diff.c:451 src/diff3.c:336 +#: src/diff.c:453 src/diff3.c:341 #, c-format msgid "too many file label options" msgstr "ファイル・ラベル・オプションが多すぎます" -#: src/diff.c:528 +#: src/diff.c:530 #, c-format msgid "invalid width '%s'" msgstr "" -#: src/diff.c:532 +#: src/diff.c:534 msgid "conflicting width options" msgstr "幅のオプションが競合しています" -#: src/diff.c:557 +#: src/diff.c:559 #, c-format msgid "invalid horizon length '%s'" msgstr "" -#: src/diff.c:613 +#: src/diff.c:615 #, c-format msgid "invalid tabsize '%s'" msgstr "" -#: src/diff.c:617 +#: src/diff.c:619 msgid "conflicting tabsize options" msgstr "タブ幅のオプションが競合しています" -#: src/diff.c:772 +#: src/diff.c:774 msgid "--from-file and --to-file both specified" msgstr "--from-file および --to-file の両方が指定されています" -#: src/diff.c:891 +#: src/diff.c:893 msgid " --normal output a normal diff (the default)" msgstr " --normal 通常の diff を出力する (デフォルト)" -#: src/diff.c:892 +#: src/diff.c:894 msgid "-q, --brief report only when files differ" msgstr "-q, --brief ファイルが異なるかどうかのみ表示する" -#: src/diff.c:893 +#: src/diff.c:895 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files 両方のファイルが同一であるかどうかのみ表示する" -#: src/diff.c:894 +#: src/diff.c:896 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] コンテキスト diff 形式で前後 NUM (デフォルト: 3) 行を表示する" -#: src/diff.c:895 +#: src/diff.c:897 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] ユニファイド diff 形式で前後 NUM (デフォルト: 3) 行を表示する" -#: src/diff.c:896 +#: src/diff.c:898 msgid "-e, --ed output an ed script" msgstr "-e, --ed ed スクリプトを出力する" -#: src/diff.c:897 +#: src/diff.c:899 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs RCS 形式の diff を出力する" -#: src/diff.c:898 +#: src/diff.c:900 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side 出力を2列にする" -#: src/diff.c:899 +#: src/diff.c:901 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-W, --width=NUM 表示する列を最大 NUM (デフォルト: 130) 列にする" -#: src/diff.c:900 +#: src/diff.c:902 msgid "" " --left-column output only the left column of common lines" msgstr " --left-column 共通行は左側の列のみ表示する" -#: src/diff.c:901 +#: src/diff.c:903 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines 共通行の出力を抑止する" -#: src/diff.c:903 +#: src/diff.c:905 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function 変更がある C 関数を表示する" -#: src/diff.c:904 +#: src/diff.c:906 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE RE に一致する最も近い行を表示する" -#: src/diff.c:905 +#: src/diff.c:907 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -#: src/diff.c:908 +#: src/diff.c:910 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs 出力時にタブをスペースに展開する" -#: src/diff.c:909 +#: src/diff.c:911 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる" -#: src/diff.c:910 +#: src/diff.c:912 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列に設定する" -#: src/diff.c:911 +#: src/diff.c:913 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr " --suppress-blank-empty 空の出力行の前後ではスペースまたはタブを抑止する" -#: src/diff.c:912 +#: src/diff.c:914 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -#: src/diff.c:914 +#: src/diff.c:916 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive サブディレクトリーを再帰的に比較する" -#: src/diff.c:915 +#: src/diff.c:917 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:916 +#: src/diff.c:918 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file 存在しないファイルを空ファイルとして扱う" -#: src/diff.c:917 +#: src/diff.c:919 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file 存在しない最初のファイルを空ファイルとして扱う" -#: src/diff.c:918 +#: src/diff.c:920 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr " --ignore-file-name-case ファイル名の大文字と小文字を区別しない" -#: src/diff.c:919 +#: src/diff.c:921 msgid "" " --no-ignore-file-name-case consider case when comparing file names" msgstr " --no-ignore-file-name-case ファイル名の大文字と小文字を区別する" -#: src/diff.c:920 +#: src/diff.c:922 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=PAT PAT に一致するファイルを除外する" -#: src/diff.c:921 +#: src/diff.c:923 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "-X, --exclude-from=FILE FILE 内のパターンに一致するファイルを除外する" -#: src/diff.c:922 +#: src/diff.c:924 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S, --starting-file=FILE ディレクトリーを比較する時に FILE から始める" -#: src/diff.c:923 +#: src/diff.c:925 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -864,7 +864,7 @@ " --from-file=FILE1 すべての被演算子と FILE1 を比較する\n" " FILE1 はディレクトリーでもよい" -#: src/diff.c:925 +#: src/diff.c:927 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -872,69 +872,69 @@ " --to-file=FILE2 すべての被演算子を FILE2 を比較する\n" " FILE2 はディレクトリーでもよい" -#: src/diff.c:928 +#: src/diff.c:930 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i, --ignore-case ファイル内容の比較時に大文字と小文字を区別しない" -#: src/diff.c:929 +#: src/diff.c:931 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion タブ展開によって発生する違いを無視する" -#: src/diff.c:930 +#: src/diff.c:932 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space 行末にあるスペースを無視する" -#: src/diff.c:931 +#: src/diff.c:933 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change スペース数により生じる違いを無視する" -#: src/diff.c:932 +#: src/diff.c:934 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space すべてのスペースを無視する" -#: src/diff.c:933 +#: src/diff.c:935 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -#: src/diff.c:934 +#: src/diff.c:936 msgid "" "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -#: src/diff.c:936 +#: src/diff.c:938 msgid "-a, --text treat all files as text" msgstr "-a, --text すべてのファイルをテキストとして扱う" -#: src/diff.c:937 +#: src/diff.c:939 msgid "" " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 入力から CR (キャリッジリターン) を除去する" -#: src/diff.c:939 +#: src/diff.c:941 msgid " --binary read and write data in binary mode" msgstr " --binary バイナリーモードでデータを読み書きする" -#: src/diff.c:942 +#: src/diff.c:944 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -#: src/diff.c:943 +#: src/diff.c:945 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT GTYPE の入力グループを GFMT で整形する" -#: src/diff.c:944 +#: src/diff.c:946 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT すべての入力行を LFMT で整形する" -#: src/diff.c:945 +#: src/diff.c:947 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT LTYPE 入力行を LFMT で整形する" -#: src/diff.c:946 +#: src/diff.c:948 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -942,12 +942,12 @@ " これらの書式整形オプションは -D/--ifdef に適用される diff の出力をきれいに\n" " 見えるように制御するために提供されます。" -#: src/diff.c:948 +#: src/diff.c:950 msgid "" " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -#: src/diff.c:949 +#: src/diff.c:951 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -975,7 +975,7 @@ " M L+1\n" " %(A=B?T:E) A と B が等しい場合は T、等しくない場合は E" -#: src/diff.c:961 +#: src/diff.c:963 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -987,7 +987,7 @@ " %l 行末にあるすべての種類の改行文字を除いた行の内容\n" " %[-][WIDTH][.[PREC]]{doxX}n printf 書式の入力行" -#: src/diff.c:965 +#: src/diff.c:967 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1001,16 +1001,16 @@ " %c'\\OOO' 八進数コード OOO\n" " C 文字 C (他の文字も同様に表す)" -#: src/diff.c:971 +#: src/diff.c:973 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal 差分の大きさが最小となるように違いを検出する" -#: src/diff.c:972 +#: src/diff.c:974 msgid "" " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr " --horizon-lines=NUM 差分の前後にある共通部分を NUM 行保持する" -#: src/diff.c:973 +#: src/diff.c:975 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " --speed-large-files 巨大なファイルに小さな差分が分散していると仮定する" @@ -1022,115 +1022,115 @@ " or 'auto' (the default)" msgstr "" -#: src/diff.c:976 +#: src/diff.c:978 msgid "" " --palette=PALETTE the colors to use when --color is active; PALETTE " "is\n" " a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:979 +#: src/diff.c:981 msgid " --help display this help and exit" msgstr " --help このヘルプを表示して終了する" -#: src/diff.c:980 +#: src/diff.c:982 msgid "-v, --version output version information and exit" msgstr "-v, --version バージョン情報を表示して終了する" -#: src/diff.c:982 +#: src/diff.c:984 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -#: src/diff.c:983 +#: src/diff.c:985 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "--from-file または --to-file が与えられた場合、FILE に制限はありません。" -#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 +#: src/diff.c:986 src/diff3.c:533 src/sdiff.c:220 msgid "If a FILE is '-', read standard input." msgstr "" -#: src/diff.c:994 +#: src/diff.c:996 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "使用法: %s [OPTION]... FILES\n" -#: src/diff.c:995 +#: src/diff.c:997 msgid "Compare FILES line by line." msgstr "FILES を行ごとに比較します。" -#: src/diff.c:1032 +#: src/diff.c:1034 #, c-format msgid "conflicting %s option value '%s'" msgstr "" -#: src/diff.c:1045 +#: src/diff.c:1047 #, c-format msgid "conflicting output style options" msgstr "出力形式オプションが競合しています" -#: src/diff.c:1061 +#: src/diff.c:1063 #, c-format msgid "invalid color '%s'" msgstr "" -#: src/diff.c:1117 src/diff.c:1327 +#: src/diff.c:1119 src/diff.c:1329 #, c-format msgid "Only in %s: %s\n" msgstr "%s のみに存在: %s\n" -#: src/diff.c:1251 +#: src/diff.c:1253 msgid "cannot compare '-' to a directory" msgstr "" -#: src/diff.c:1286 +#: src/diff.c:1288 msgid "-D option not supported with directories" msgstr "-D オプションはディレクトリーにはサポートされません" -#: src/diff.c:1295 +#: src/diff.c:1297 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "共通のサブディレクトリー: %s と %s\n" -#: src/diff.c:1337 src/diff.c:1387 +#: src/diff.c:1339 src/diff.c:1389 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "ファイル %s は %s です。一方、ファイル %s は %s です\n" -#: src/diff.c:1373 +#: src/diff.c:1375 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "" -#: src/diff.c:1460 +#: src/diff.c:1462 #, c-format msgid "Files %s and %s are identical\n" msgstr "ファイル %s と %s は同一です\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:42 +#: src/diff3.c:43 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:351 +#: src/diff3.c:356 #, c-format msgid "incompatible options" msgstr "同時に指定できないオプションです" -#: src/diff3.c:391 +#: src/diff3.c:396 msgid "'-' specified for more than one input file" msgstr "" -#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 -#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 +#: src/diff3.c:447 src/diff3.c:1295 src/diff3.c:1698 src/diff3.c:1753 +#: src/sdiff.c:308 src/sdiff.c:846 src/sdiff.c:857 msgid "read failed" msgstr "読み込みに失敗しました" -#: src/diff3.c:475 +#: src/diff3.c:480 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A, --show-all 競合をすべて括弧でくくり、変更をすべて出力する" -#: src/diff3.c:477 +#: src/diff3.c:482 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1138,30 +1138,30 @@ "-e, --ed OLDFILE、YOURFILE、MYFILE の間の違いを ed\n" " スクリプトとして出力する" -#: src/diff3.c:479 +#: src/diff3.c:484 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap -e と同様だが、競合を括弧でくくる" -#: src/diff3.c:480 +#: src/diff3.c:485 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3, --easy-only -e と同様だが、3ファイル競合で無い部分のみ出力する" -#: src/diff3.c:481 +#: src/diff3.c:486 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x, --overlap-only -e と同様だが、3ファイル競合の部分のみ出力する" -#: src/diff3.c:482 +#: src/diff3.c:487 msgid "-X like -x, but bracket conflicts" msgstr "-X -x と同様だが、競合を括弧でくくる" -#: src/diff3.c:483 +#: src/diff3.c:488 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -#: src/diff3.c:485 +#: src/diff3.c:490 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1169,23 +1169,23 @@ "-m, --merge 他のオプションを指定していない場合、-A 従って\n" " 実際に併合されたファイルを出力する" -#: src/diff3.c:488 +#: src/diff3.c:493 msgid "-a, --text treat all files as text" msgstr "-a, --text すべてのファイルをテキストとして扱う" -#: src/diff3.c:489 +#: src/diff3.c:494 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 入力から末尾のキャリッジリターンを除去する" -#: src/diff3.c:490 +#: src/diff3.c:495 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる" -#: src/diff3.c:491 +#: src/diff3.c:496 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM ファイル比較に PROGRAM を使用する" -#: src/diff3.c:492 +#: src/diff3.c:497 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1193,24 +1193,24 @@ "-L, --label=LABEL ファイル名の代わりに LABEL を使用する\n" " (3回まで繰り返し指定できる)" -#: src/diff3.c:495 +#: src/diff3.c:500 msgid " --help display this help and exit" msgstr " --help このヘルプを表示して終了する" -#: src/diff3.c:496 +#: src/diff3.c:501 msgid "-v, --version output version information and exit" msgstr "-v, --version バージョン情報を表示して終了する" -#: src/diff3.c:505 +#: src/diff3.c:510 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:507 +#: src/diff3.c:512 msgid "Compare three files line by line." msgstr "3つのファイルを行ごとに比較します。" -#: src/diff3.c:517 +#: src/diff3.c:522 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1233,47 +1233,47 @@ "併合されたファイルを出力します。通常の入力としては、これは ed を使用す\n" "るより強固です。\n" -#: src/diff3.c:529 +#: src/diff3.c:534 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "終了コードは、成功した場合は 0、競合がある場合は 1、\n" "問題が発生したときは 2 になります。" -#: src/diff3.c:722 +#: src/diff3.c:727 msgid "internal error: screwup in format of diff blocks" msgstr "内部エラー: 差分ブロックの形式をうまく処理できませんでした" -#: src/diff3.c:1017 +#: src/diff3.c:1022 #, c-format msgid "%s: diff failed: " msgstr "%s: diff に失敗しました: " -#: src/diff3.c:1039 +#: src/diff3.c:1044 msgid "internal error: invalid diff type in process_diff" msgstr "内部エラー: process_diff 内に無効な差分型があります" -#: src/diff3.c:1064 +#: src/diff3.c:1069 msgid "invalid diff format; invalid change separator" msgstr "無効な差分形式です。無効な変更区切りです" -#: src/diff3.c:1300 +#: src/diff3.c:1305 msgid "invalid diff format; incomplete last line" msgstr "無効な差分形式です。最後の行が不完全です" -#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 +#: src/diff3.c:1329 src/sdiff.c:276 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "" -#: src/diff3.c:1349 +#: src/diff3.c:1354 msgid "invalid diff format; incorrect leading line chars" msgstr "無効な差分形式です。行の先頭文字が誤っています" -#: src/diff3.c:1422 +#: src/diff3.c:1427 msgid "internal error: invalid diff type passed to output" msgstr "内部エラー: 無効な差分型が出力に渡されました" -#: src/diff3.c:1695 src/diff3.c:1752 +#: src/diff3.c:1700 src/diff3.c:1757 msgid "input file shrank" msgstr "入力ファイルが小さくなりました" @@ -1288,117 +1288,117 @@ msgstr "%s: 再帰的なディレクトリループです" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:43 +#: src/sdiff.c:44 msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:173 +#: src/sdiff.c:174 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o, --output=FILE 対話的に操作し、出力を FILE に送る" -#: src/sdiff.c:175 +#: src/sdiff.c:176 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i, --ignore-case 大文字と小文字を区別しない" -#: src/sdiff.c:176 +#: src/sdiff.c:177 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion タブ展開によって発生する違いを無視する" -#: src/sdiff.c:177 +#: src/sdiff.c:178 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space 行末にあるスペースを無視する" -#: src/sdiff.c:178 +#: src/sdiff.c:179 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change スペース数により生じる違いを無視する" -#: src/sdiff.c:179 +#: src/sdiff.c:180 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space すべてのスペースを無視する" -#: src/sdiff.c:180 +#: src/sdiff.c:181 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B, --ignore-blank-lines 空白類文字だけの行により生じる違いを無視する" -#: src/sdiff.c:181 +#: src/sdiff.c:182 msgid "" "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" msgstr "" -#: src/sdiff.c:182 +#: src/sdiff.c:183 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 入力から末尾のキャリッジリターンを除去する" -#: src/sdiff.c:183 +#: src/sdiff.c:184 msgid "-a, --text treat all files as text" msgstr "-a, --text すべてのファイルをテキストとして扱う" -#: src/sdiff.c:185 +#: src/sdiff.c:186 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "-w, --width=NUM 表示する列を最大 NUM (デフォルト: 130) 列にする" -#: src/sdiff.c:186 +#: src/sdiff.c:187 msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l, --left-column 共通行は左側の列のみ表示する" -#: src/sdiff.c:187 +#: src/sdiff.c:188 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s, --suppress-common-lines 共通行の出力を抑止する" -#: src/sdiff.c:189 +#: src/sdiff.c:190 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs 出力時にタブをスペースに展開する" -#: src/sdiff.c:190 +#: src/sdiff.c:191 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr " --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列に設定する" -#: src/sdiff.c:192 +#: src/sdiff.c:193 msgid "" "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal 差分の大きさが最小となるように違いを検出する" -#: src/sdiff.c:193 +#: src/sdiff.c:194 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "-H, --speed-large-files 巨大なファイルに小さな差分が分散していると仮定する" -#: src/sdiff.c:194 +#: src/sdiff.c:195 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM ファイル比較に PROGRAM を使用する" -#: src/sdiff.c:196 +#: src/sdiff.c:197 msgid " --help display this help and exit" msgstr " --help このヘルプを表示して終了する" -#: src/sdiff.c:197 +#: src/sdiff.c:198 msgid "-v, --version output version information and exit" msgstr "-v, --version バージョン情報を表示して終了する" -#: src/sdiff.c:206 +#: src/sdiff.c:207 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "使用法: %s [OPTION]... FILE1 FILE2\n" -#: src/sdiff.c:208 +#: src/sdiff.c:209 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "FILE1 と FILE2 の差分を2段組で比較しながら併合します。" -#: src/sdiff.c:329 +#: src/sdiff.c:330 msgid "cannot interactively merge standard input" msgstr "標準出力は対話的に併合できません" -#: src/sdiff.c:595 +#: src/sdiff.c:597 msgid "both files to be compared are directories" msgstr "比較対象は両方ともディレクトリー" -#: src/sdiff.c:818 +#: src/sdiff.c:820 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/doc-base.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/doc-base.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/doc-base.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/doc-base.po 2022-02-11 23:04:23.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: 2021-08-02 16:10+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: \n" #: ../../install-docs.in:104 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dpkg-dev.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dpkg-dev.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dpkg-dev.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dpkg-dev.po 2022-02-11 23:04:23.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: 2021-08-02 16:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: scripts/dpkg-architecture.pl scripts/dpkg-buildflags.pl #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl @@ -522,7 +522,8 @@ " is the control file to process (default: debian/control)." msgstr "" -#: scripts/dpkg-checkbuilddeps.pl:184 scripts/dpkg-source.pl:253 +#: scripts/dpkg-checkbuilddeps.pl scripts/dpkg-shlibdeps.pl +#: scripts/dpkg-source.pl #, perl-format msgid "error occurred while parsing %s" msgstr "" @@ -775,7 +776,7 @@ msgid "package %s: " msgstr "" -#: scripts/dpkg-gencontrol.pl:191 +#: scripts/dpkg-gencontrol.pl #, perl-format msgid "" "current host architecture '%s' does not appear in package's architecture " @@ -787,19 +788,19 @@ msgid "%s field of package %s: " msgstr "" -#: scripts/dpkg-gencontrol.pl:250 scripts/dpkg-gencontrol.pl:258 +#: scripts/dpkg-gencontrol.pl #, perl-format msgid "error occurred while parsing %s field: %s" msgstr "" -#: scripts/dpkg-gencontrol.pl:263 +#: scripts/dpkg-gencontrol.pl #, perl-format msgid "" "the %s field contains an arch-specific dependency but the package is " "architecture all" msgstr "" -#: scripts/dpkg-gencontrol.pl:287 +#: scripts/dpkg-gencontrol.pl #, perl-format msgid "%s package with udeb specific field %s" msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dpkg.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dpkg.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dpkg.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dpkg.po 2022-02-11 23:04:25.000000000 +0000 @@ -29,8 +29,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: 2021-08-02 16:10+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: lib/dpkg/ar.c @@ -971,7 +971,7 @@ msgid "unable to check file '%s' lock status" msgstr "ファイル '%s' のロック状態を確認できません" -#: lib/dpkg/file.c:146 +#: lib/dpkg/file.c #, c-format msgid "%s is locked by another process" msgstr "%s が別のプロセスによってロックされています" @@ -1315,7 +1315,7 @@ msgid "no package information in '%.255s'" msgstr "`%.255s' にパッケージ情報がありません" -#: lib/dpkg/parsehelp.c:45 +#: lib/dpkg/parsehelp.c #, c-format msgid "" "parsing file '%.255s' near line %d package '%.255s':\n" @@ -1324,7 +1324,7 @@ "ファイル '%.255s' を解析。%d 行目付近、パッケージ '%.255s':\n" " %.255s" -#: lib/dpkg/parsehelp.c:48 +#: lib/dpkg/parsehelp.c #, c-format msgid "" "parsing file '%.255s' near line %d:\n" @@ -2307,7 +2307,7 @@ msgid "%s: failed to rename '%.250s' to '%.250s': %s" msgstr "%s: '%.250s' から '%.250s' に名前を変更できませんでした: %s" -#: src/configure.c +#: src/configure.c src/unpack.c #, c-format msgid "%s: failed to remove '%.250s': %s" msgstr "%s: '%.250s' の削除に失敗しました: %s" @@ -3122,7 +3122,7 @@ msgid "Configure any package which may help this one" msgstr "これが助けになるかもしれないパッケージを設定する" -#: src/main.c:225 +#: src/force.c msgid "Process incidental packages even when on hold" msgstr "保持していても付帯パッケージを処理する" @@ -4339,7 +4339,7 @@ msgid "Debian %s package trigger utility version %s.\n" msgstr "Debian %s パッケージトリガユーティリティバージョン %s。\n" -#: src/trigcmd.c:67 +#: src/trigcmd.c #, c-format msgid "" "Usage: %s [ ...] \n" @@ -6207,7 +6207,7 @@ msgid "unknown argument '%s'" msgstr "`%s' は不明な引数です" -#: utils/update-alternatives.c:2343 +#: utils/update-alternatives.c msgid "--install needs " msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です" @@ -6233,11 +6233,11 @@ msgid "--%s needs " msgstr "--%s は <名前> が必要です" -#: utils/update-alternatives.c:2388 +#: utils/update-alternatives.c msgid "--slave only allowed with --install" msgstr "--slave は --install と一緒のみ許可されています" -#: utils/update-alternatives.c:2390 +#: utils/update-alternatives.c msgid "--slave needs " msgstr "--slave は<リンク> <名前> <パス> が必要です" @@ -6256,7 +6256,7 @@ msgid "--%s needs a argument" msgstr "--%s は <ファイル> の引数が必要です" -#: utils/update-alternatives.c:2453 +#: utils/update-alternatives.c msgid "" "need --display, --query, --list, --get-selections, --config, --set, --set-" "selections, --install, --remove, --all, --remove-all or --auto" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dselect.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dselect.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/dselect.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/dselect.po 2022-02-11 23:04:25.000000000 +0000 @@ -28,8 +28,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:02+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: dselect/basecmds.cc diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/e2fsprogs.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/e2fsprogs.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/e2fsprogs.po 2021-08-03 08:53:34.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/e2fsprogs.po 2022-02-11 23:04:16.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: 2021-08-02 16:07+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:57+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: e2fsck/badblocks.c:23 misc/mke2fs.c:221 #, c-format @@ -34,9 +34,9 @@ #: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1584 #: e2fsck/unix.c:1698 misc/badblocks.c:1264 misc/badblocks.c:1272 #: misc/badblocks.c:1286 misc/badblocks.c:1298 misc/dumpe2fs.c:437 -#: misc/dumpe2fs.c:702 misc/dumpe2fs.c:706 misc/e2image.c:1437 -#: misc/e2image.c:1635 misc/e2image.c:1656 misc/mke2fs.c:237 -#: misc/tune2fs.c:2880 misc/tune2fs.c:2980 resize/main.c:416 +#: misc/dumpe2fs.c:702 misc/dumpe2fs.c:706 misc/e2image.c:1440 +#: misc/e2image.c:1638 misc/e2image.c:1659 misc/mke2fs.c:237 +#: misc/tune2fs.c:2887 misc/tune2fs.c:2987 resize/main.c:416 #, c-format msgid "while trying to open %s" msgstr "" @@ -153,11 +153,11 @@ msgid "while trying to open '%s'" msgstr "" -#: e2fsck/scantest.c:114 misc/e2image.c:1330 +#: e2fsck/scantest.c:114 misc/e2image.c:1331 msgid "while opening inode scan" msgstr "" -#: misc/e2image.c:1349 +#: misc/e2image.c:1350 msgid "while getting next inode" msgstr "" @@ -166,31 +166,31 @@ msgid "%u inodes scanned.\n" msgstr "" -#: e2fsck/journal.c:1263 +#: e2fsck/journal.c:1273 msgid "reading journal superblock\n" msgstr "" -#: e2fsck/journal.c:1336 +#: e2fsck/journal.c:1346 #, c-format msgid "%s: no valid journal superblock found\n" msgstr "" -#: e2fsck/journal.c:1345 +#: e2fsck/journal.c:1355 #, c-format msgid "%s: journal too short\n" msgstr "" -#: e2fsck/journal.c:1660 misc/fuse2fs.c:3797 +#: e2fsck/journal.c:1670 misc/fuse2fs.c:3797 #, c-format msgid "%s: recovering journal\n" msgstr "" -#: e2fsck/journal.c:1662 +#: e2fsck/journal.c:1672 #, c-format msgid "%s: won't do journal recovery while read-only\n" msgstr "" -#: e2fsck/journal.c:1689 +#: e2fsck/journal.c:1699 #, c-format msgid "while trying to re-open %s" msgstr "" @@ -428,25 +428,25 @@ msgid "unknown quota type" msgstr "" -#: e2fsck/pass1b.c:222 +#: e2fsck/pass1b.c:223 msgid "multiply claimed inode map" msgstr "" -#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:830 +#: e2fsck/pass1b.c:673 e2fsck/pass1b.c:831 #, c-format msgid "internal error: can't find dup_blk for %llu\n" msgstr "" -#: e2fsck/pass1b.c:957 +#: e2fsck/pass1b.c:958 msgid "returned from clone_file_block" msgstr "" -#: e2fsck/pass1b.c:981 +#: e2fsck/pass1b.c:982 #, c-format msgid "internal error: couldn't lookup EA block record for %llu" msgstr "" -#: e2fsck/pass1b.c:994 +#: e2fsck/pass1b.c:995 #, c-format msgid "internal error: couldn't lookup EA inode record for %u" msgstr "" @@ -456,7 +456,7 @@ msgid "while hashing entry with e_value_inum = %u" msgstr "" -#: e2fsck/pass1.c:767 e2fsck/pass2.c:1133 +#: e2fsck/pass1.c:767 e2fsck/pass2.c:1153 msgid "reading directory block" msgstr "ディレクトリブロックを読み込み中" @@ -476,7 +476,7 @@ msgid "regular file inode map" msgstr "" -#: e2fsck/pass1.c:1248 misc/e2image.c:1289 +#: e2fsck/pass1.c:1248 misc/e2image.c:1290 msgid "in-use block map" msgstr "" @@ -488,49 +488,49 @@ msgid "opening inode scan" msgstr "" -#: e2fsck/pass1.c:2103 +#: e2fsck/pass1.c:2101 msgid "Pass 1" msgstr "パス 1" -#: e2fsck/pass1.c:2164 +#: e2fsck/pass1.c:2162 #, c-format msgid "reading indirect blocks of inode %u" msgstr "" -#: e2fsck/pass1.c:2215 +#: e2fsck/pass1.c:2213 msgid "bad inode map" msgstr "" -#: e2fsck/pass1.c:2255 +#: e2fsck/pass1.c:2253 msgid "inode in bad block map" msgstr "" -#: e2fsck/pass1.c:2275 +#: e2fsck/pass1.c:2273 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:2306 +#: e2fsck/pass1.c:2304 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:2431 +#: e2fsck/pass1.c:2429 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:3726 +#: e2fsck/pass1.c:3724 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:4147 +#: e2fsck/pass1.c:4145 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:4153 +#: e2fsck/pass1.c:4151 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:4159 +#: e2fsck/pass1.c:4157 msgid "inode table" msgstr "iノード テーブル" @@ -538,7 +538,7 @@ msgid "Pass 2" msgstr "パス 2" -#: e2fsck/pass2.c:1206 e2fsck/pass2.c:1390 +#: e2fsck/pass2.c:1226 e2fsck/pass2.c:1412 msgid "Can not continue." msgstr "続けられませんでした." @@ -2856,11 +2856,11 @@ msgid "while calling ext2fs_adjust_ea_refcount2 for inode %u" msgstr "" -#: e2fsck/super.c:374 +#: e2fsck/super.c:375 msgid "Truncating" msgstr "" -#: e2fsck/super.c:375 +#: e2fsck/super.c:376 msgid "Clearing" msgstr "" @@ -3036,7 +3036,7 @@ msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:240 misc/badblocks.c:1001 misc/tune2fs.c:3072 misc/util.c:129 +#: e2fsck/unix.c:240 misc/badblocks.c:1001 misc/tune2fs.c:3079 misc/util.c:129 #: resize/main.c:356 #, c-format msgid "while determining whether %s is mounted." @@ -3197,7 +3197,7 @@ msgstr "" #: e2fsck/unix.c:946 e2fsck/unix.c:1024 misc/e2initrd_helper.c:330 -#: misc/tune2fs.c:1772 misc/tune2fs.c:2072 misc/tune2fs.c:2090 +#: misc/tune2fs.c:1779 misc/tune2fs.c:2079 misc/tune2fs.c:2097 #, c-format msgid "Unable to resolve '%s'" msgstr "" @@ -3264,8 +3264,8 @@ msgstr "" #: e2fsck/unix.c:1314 e2fsck/unix.c:1366 misc/e2undo.c:240 misc/e2undo.c:285 -#: misc/mke2fs.c:2724 misc/mke2fs.c:2775 misc/tune2fs.c:2797 -#: misc/tune2fs.c:2842 resize/main.c:188 resize/main.c:233 +#: misc/mke2fs.c:2758 misc/mke2fs.c:2809 misc/tune2fs.c:2804 +#: misc/tune2fs.c:2849 resize/main.c:188 resize/main.c:233 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3273,13 +3273,13 @@ "\n" msgstr "" -#: e2fsck/unix.c:1355 misc/e2undo.c:274 misc/mke2fs.c:2764 misc/tune2fs.c:2831 +#: e2fsck/unix.c:1355 misc/e2undo.c:274 misc/mke2fs.c:2798 misc/tune2fs.c:2838 #: resize/main.c:222 #, c-format msgid "while trying to delete %s" msgstr "" -#: e2fsck/unix.c:1381 misc/mke2fs.c:2790 resize/main.c:243 +#: e2fsck/unix.c:1381 misc/mke2fs.c:2824 resize/main.c:243 msgid "while trying to setup undo file\n" msgstr "" @@ -3887,8 +3887,8 @@ msgid "while reading inode %u" msgstr "" -#: misc/create_inode.c:90 misc/create_inode.c:297 misc/create_inode.c:362 -#: misc/create_inode.c:400 +#: misc/create_inode.c:90 misc/create_inode.c:296 misc/create_inode.c:361 +#: misc/create_inode.c:399 msgid "while expanding directory" msgstr "" @@ -3897,7 +3897,7 @@ msgid "while linking \"%s\"" msgstr "" -#: misc/create_inode.c:105 misc/create_inode.c:134 misc/create_inode.c:331 +#: misc/create_inode.c:105 misc/create_inode.c:134 misc/create_inode.c:330 #, c-format msgid "while writing inode %u" msgstr "" @@ -3912,7 +3912,7 @@ msgid "while opening inode %u" msgstr "" -#: misc/create_inode.c:178 misc/create_inode.c:205 misc/create_inode.c:1065 +#: misc/create_inode.c:178 misc/create_inode.c:205 misc/create_inode.c:1066 #: misc/e2undo.c:186 misc/e2undo.c:483 misc/e2undo.c:489 misc/e2undo.c:495 #: misc/mke2fs.c:361 msgid "while allocating memory" @@ -3933,104 +3933,104 @@ msgid "while closing inode %u" msgstr "" -#: misc/create_inode.c:284 +#: misc/create_inode.c:283 #, c-format msgid "while allocating inode \"%s\"" msgstr "" -#: misc/create_inode.c:303 +#: misc/create_inode.c:302 #, c-format msgid "while creating inode \"%s\"" msgstr "" -#: misc/create_inode.c:369 +#: misc/create_inode.c:368 #, c-format msgid "while creating symlink \"%s\"" msgstr "" -#: misc/create_inode.c:387 misc/create_inode.c:651 misc/create_inode.c:985 +#: misc/create_inode.c:386 misc/create_inode.c:650 misc/create_inode.c:986 #, c-format msgid "while looking up \"%s\"" msgstr "" -#: misc/create_inode.c:407 +#: misc/create_inode.c:406 #, c-format msgid "while creating directory \"%s\"" msgstr "" -#: misc/create_inode.c:637 +#: misc/create_inode.c:636 #, c-format msgid "while opening \"%s\" to copy" msgstr "" -#: misc/create_inode.c:827 +#: misc/create_inode.c:828 #, c-format msgid "while changing working directory to \"%s\"" msgstr "" -#: misc/create_inode.c:837 +#: misc/create_inode.c:838 #, c-format msgid "while scanning directory \"%s\"" msgstr "" -#: misc/create_inode.c:847 +#: misc/create_inode.c:848 #, c-format msgid "while lstat \"%s\"" msgstr "" -#: misc/create_inode.c:897 +#: misc/create_inode.c:898 #, c-format msgid "while creating special file \"%s\"" msgstr "" -#: misc/create_inode.c:906 +#: misc/create_inode.c:907 msgid "malloc failed" msgstr "" -#: misc/create_inode.c:914 +#: misc/create_inode.c:915 #, c-format msgid "while trying to read link \"%s\"" msgstr "" -#: misc/create_inode.c:921 +#: misc/create_inode.c:922 msgid "symlink increased in size between lstat() and readlink()" msgstr "" -#: misc/create_inode.c:932 +#: misc/create_inode.c:933 #, c-format msgid "while writing symlink\"%s\"" msgstr "" -#: misc/create_inode.c:943 +#: misc/create_inode.c:944 #, c-format msgid "while writing file \"%s\"" msgstr "" -#: misc/create_inode.c:956 +#: misc/create_inode.c:957 #, c-format msgid "while making dir \"%s\"" msgstr "" -#: misc/create_inode.c:974 +#: misc/create_inode.c:975 msgid "while changing directory" msgstr "" -#: misc/create_inode.c:980 +#: misc/create_inode.c:981 #, c-format msgid "ignoring entry \"%s\"" msgstr "" -#: misc/create_inode.c:993 +#: misc/create_inode.c:994 #, c-format msgid "while setting inode for \"%s\"" msgstr "" -#: misc/create_inode.c:1000 +#: misc/create_inode.c:1001 #, c-format msgid "while setting xattrs for \"%s\"" msgstr "" -#: misc/create_inode.c:1026 +#: misc/create_inode.c:1027 msgid "while saving inode data" msgstr "" @@ -4181,7 +4181,7 @@ msgid "reading MMP block %llu from '%s'\n" msgstr "" -#: misc/dumpe2fs.c:519 misc/mke2fs.c:809 misc/tune2fs.c:2112 +#: misc/dumpe2fs.c:519 misc/mke2fs.c:811 misc/tune2fs.c:2119 msgid "Couldn't allocate memory to parse options!\n" msgstr "" @@ -4209,12 +4209,12 @@ "\tblocksize=\n" msgstr "" -#: misc/dumpe2fs.c:661 misc/mke2fs.c:1907 +#: misc/dumpe2fs.c:661 misc/mke2fs.c:1911 #, c-format msgid "\tUsing %s\n" msgstr "\t%sを使います\n" -#: misc/dumpe2fs.c:708 misc/e2image.c:1637 misc/tune2fs.c:2998 +#: misc/dumpe2fs.c:708 misc/e2image.c:1640 misc/tune2fs.c:3005 #: resize/main.c:418 msgid "Couldn't find valid filesystem superblock.\n" msgstr "" @@ -4235,199 +4235,199 @@ "\n" msgstr "" -#: misc/e2image.c:107 +#: misc/e2image.c:108 #, c-format msgid "" "Usage: %s [ -r|-Q ] [ -f ] [ -b superblock ] [ -B blocksize ] device image-" "file\n" msgstr "" -#: misc/e2image.c:110 +#: misc/e2image.c:111 #, c-format msgid " %s -I device image-file\n" msgstr "" -#: misc/e2image.c:111 +#: misc/e2image.c:112 #, c-format msgid "" " %s -ra [ -cfnp ] [ -o src_offset ] [ -O dest_offset ] src_fs [ " "dest_fs ]\n" msgstr "" -#: misc/e2image.c:176 misc/e2image.c:592 misc/e2image.c:598 misc/e2image.c:1200 +#: misc/e2image.c:177 misc/e2image.c:593 misc/e2image.c:599 misc/e2image.c:1201 msgid "while allocating buffer" msgstr "" -#: misc/e2image.c:181 +#: misc/e2image.c:182 #, c-format msgid "Writing block %llu\n" msgstr "" -#: misc/e2image.c:195 +#: misc/e2image.c:196 #, c-format msgid "error writing block %llu" msgstr "" -#: misc/e2image.c:199 +#: misc/e2image.c:200 msgid "error in generic_write()" msgstr "" -#: misc/e2image.c:216 +#: misc/e2image.c:217 msgid "Error: header size is bigger than wrt_size\n" msgstr "" -#: misc/e2image.c:221 +#: misc/e2image.c:222 msgid "Couldn't allocate header buffer\n" msgstr "" -#: misc/e2image.c:249 +#: misc/e2image.c:250 msgid "while writing superblock" msgstr "" -#: misc/e2image.c:258 +#: misc/e2image.c:259 msgid "while writing inode table" msgstr "" -#: misc/e2image.c:266 +#: misc/e2image.c:267 msgid "while writing block bitmap" msgstr "" -#: misc/e2image.c:274 +#: misc/e2image.c:275 msgid "while writing inode bitmap" msgstr "" -#: misc/e2image.c:516 +#: misc/e2image.c:517 #, c-format msgid "Corrupt directory block %llu: bad rec_len (%d)\n" msgstr "" -#: misc/e2image.c:528 +#: misc/e2image.c:529 #, c-format msgid "Corrupt directory block %llu: bad name_len (%d)\n" msgstr "" -#: misc/e2image.c:569 +#: misc/e2image.c:570 #, c-format msgid "%llu / %llu blocks (%d%%)" msgstr "" -#: misc/e2image.c:602 misc/e2image.c:642 +#: misc/e2image.c:603 misc/e2image.c:643 msgid "Copying " msgstr "" -#: misc/e2image.c:639 +#: misc/e2image.c:640 msgid "" "Stopping now will destroy the filesystem, interrupt again if you are sure\n" msgstr "" -#: misc/e2image.c:665 +#: misc/e2image.c:666 #, c-format msgid " %s remaining at %.2f MB/s" msgstr "" -#: misc/e2image.c:677 misc/e2image.c:1210 +#: misc/e2image.c:678 misc/e2image.c:1211 #, c-format msgid "error reading block %llu" msgstr "" -#: misc/e2image.c:732 +#: misc/e2image.c:733 #, c-format msgid "Copied %llu / %llu blocks (%d%%) in %s " msgstr "" -#: misc/e2image.c:737 +#: misc/e2image.c:738 #, c-format msgid "at %.2f MB/s" msgstr "" -#: misc/e2image.c:773 +#: misc/e2image.c:774 msgid "while allocating l1 table" msgstr "" -#: misc/e2image.c:818 +#: misc/e2image.c:819 msgid "while allocating l2 cache" msgstr "" -#: misc/e2image.c:841 +#: misc/e2image.c:842 msgid "" "Warning: There are still tables in the cache while putting the cache, data " "will be lost so the image may not be valid.\n" msgstr "" -#: misc/e2image.c:1167 +#: misc/e2image.c:1168 msgid "while allocating ext2_qcow2_image" msgstr "" -#: misc/e2image.c:1174 +#: misc/e2image.c:1175 msgid "while initializing ext2_qcow2_image" msgstr "" -#: misc/e2image.c:1234 misc/e2image.c:1252 +#: misc/e2image.c:1235 misc/e2image.c:1253 msgid "Programming error: multiple sequential refcount blocks created!\n" msgstr "" -#: misc/e2image.c:1293 +#: misc/e2image.c:1294 msgid "while allocating block bitmap" msgstr "" -#: misc/e2image.c:1302 +#: misc/e2image.c:1303 msgid "while allocating scramble block bitmap" msgstr "" -#: misc/e2image.c:1325 +#: misc/e2image.c:1326 msgid "Scanning inodes...\n" msgstr "" -#: misc/e2image.c:1337 +#: misc/e2image.c:1338 msgid "Can't allocate block buffer" msgstr "" -#: misc/e2image.c:1376 misc/e2image.c:1390 +#: misc/e2image.c:1379 misc/e2image.c:1393 #, c-format msgid "while iterating over inode %u" msgstr "" -#: misc/e2image.c:1422 +#: misc/e2image.c:1425 msgid "Raw and qcow2 images cannot be installed" msgstr "" -#: misc/e2image.c:1444 +#: misc/e2image.c:1447 msgid "error reading bitmaps" msgstr "" -#: misc/e2image.c:1456 +#: misc/e2image.c:1459 msgid "while opening device file" msgstr "" -#: misc/e2image.c:1467 +#: misc/e2image.c:1470 msgid "while restoring the image table" msgstr "" -#: misc/e2image.c:1573 +#: misc/e2image.c:1576 msgid "-a option can only be used with raw or QCOW2 images." msgstr "" -#: misc/e2image.c:1578 +#: misc/e2image.c:1581 msgid "-b option can only be used with raw or QCOW2 images." msgstr "" -#: misc/e2image.c:1584 +#: misc/e2image.c:1587 msgid "Offsets are only allowed with raw images." msgstr "" -#: misc/e2image.c:1589 +#: misc/e2image.c:1592 msgid "Move mode is only allowed with raw images." msgstr "" -#: misc/e2image.c:1594 +#: misc/e2image.c:1597 msgid "Move mode requires all data mode." msgstr "" -#: misc/e2image.c:1604 +#: misc/e2image.c:1607 msgid "checking if mounted" msgstr "" -#: misc/e2image.c:1611 +#: misc/e2image.c:1614 msgid "" "\n" "Running e2image on a R/W mounted filesystem can result in an\n" @@ -4435,51 +4435,51 @@ "Use -f option if you really want to do that.\n" msgstr "" -#: misc/e2image.c:1665 +#: misc/e2image.c:1668 msgid "QCOW2 image can not be written to the stdout!\n" msgstr "" -#: misc/e2image.c:1671 +#: misc/e2image.c:1674 msgid "Can not stat output\n" msgstr "" -#: misc/e2image.c:1681 +#: misc/e2image.c:1684 #, c-format msgid "Image (%s) is compressed\n" msgstr "" -#: misc/e2image.c:1684 +#: misc/e2image.c:1687 #, c-format msgid "Image (%s) is encrypted\n" msgstr "" -#: misc/e2image.c:1687 +#: misc/e2image.c:1690 #, c-format msgid "Image (%s) is corrupted\n" msgstr "" -#: misc/e2image.c:1691 +#: misc/e2image.c:1694 #, c-format msgid "while trying to convert qcow2 image (%s) into raw image (%s)" msgstr "" -#: misc/e2image.c:1701 +#: misc/e2image.c:1704 msgid "The -c option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1706 +#: misc/e2image.c:1709 msgid "The -c option not supported when writing to stdout\n" msgstr "" -#: misc/e2image.c:1713 +#: misc/e2image.c:1716 msgid "while allocating check_buf" msgstr "" -#: misc/e2image.c:1719 +#: misc/e2image.c:1722 msgid "The -p option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1729 +#: misc/e2image.c:1732 #, c-format msgid "%d blocks already contained the data to be copied\n" msgstr "" @@ -4509,7 +4509,7 @@ msgid "e2label: not an ext2 filesystem\n" msgstr "e2label: ext2 ファイルシステムではありません\n" -#: misc/e2label.c:97 misc/tune2fs.c:3207 +#: misc/e2label.c:97 misc/tune2fs.c:3214 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -4524,7 +4524,7 @@ msgid "e2label: error writing superblock\n" msgstr "" -#: misc/e2label.c:117 misc/tune2fs.c:1764 +#: misc/e2label.c:117 misc/tune2fs.c:1771 #, c-format msgid "Usage: e2label device [newlabel]\n" msgstr "" @@ -4845,7 +4845,7 @@ msgid "%s: %s.\n" msgstr "" -#: misc/fuse2fs.c:3783 misc/fuse2fs.c:3802 misc/tune2fs.c:3098 +#: misc/fuse2fs.c:3783 misc/fuse2fs.c:3802 misc/tune2fs.c:3105 #, c-format msgid "Please run e2fsck -fy %s.\n" msgstr "" @@ -4951,7 +4951,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:345 misc/mke2fs.c:3285 +#: misc/mke2fs.c:345 misc/mke2fs.c:3318 msgid "while marking bad blocks as used" msgstr "" @@ -4970,7 +4970,7 @@ "Could not write %d blocks in inode table starting at %llu: %s\n" msgstr "" -#: misc/mke2fs.c:459 misc/mke2fs.c:2837 misc/mke2fs.c:3245 +#: misc/mke2fs.c:459 misc/mke2fs.c:2870 misc/mke2fs.c:3278 msgid "done \n" msgstr "" @@ -5012,34 +5012,34 @@ msgid "Warning: could not read block 0: %s\n" msgstr "" -#: misc/mke2fs.c:599 +#: misc/mke2fs.c:601 #, c-format msgid "Warning: could not erase sector %d: %s\n" msgstr "" -#: misc/mke2fs.c:622 +#: misc/mke2fs.c:624 msgid "while initializing journal superblock" msgstr "" -#: misc/mke2fs.c:630 +#: misc/mke2fs.c:632 msgid "Zeroing journal device: " msgstr "" -#: misc/mke2fs.c:642 +#: misc/mke2fs.c:644 #, c-format msgid "while zeroing journal device (block %llu, count %d)" msgstr "" -#: misc/mke2fs.c:660 +#: misc/mke2fs.c:662 msgid "while writing journal superblock" msgstr "" -#: misc/mke2fs.c:674 +#: misc/mke2fs.c:676 #, c-format msgid "Creating filesystem with %llu %dk blocks and %u inodes\n" msgstr "" -#: misc/mke2fs.c:682 +#: misc/mke2fs.c:684 #, c-format msgid "" "warning: %llu blocks unused.\n" @@ -5051,159 +5051,159 @@ msgid "Filesystem label=%s\n" msgstr "" -#: misc/mke2fs.c:690 +#: misc/mke2fs.c:692 #, c-format msgid "OS type: %s\n" msgstr "" -#: misc/mke2fs.c:692 +#: misc/mke2fs.c:694 #, c-format msgid "Block size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:695 +#: misc/mke2fs.c:697 #, c-format msgid "Cluster size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:699 +#: misc/mke2fs.c:701 #, c-format msgid "Fragment size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:701 +#: misc/mke2fs.c:703 #, c-format msgid "Stride=%u blocks, Stripe width=%u blocks\n" msgstr "" -#: misc/mke2fs.c:703 +#: misc/mke2fs.c:705 #, c-format msgid "%u inodes, %llu blocks\n" msgstr "" -#: misc/mke2fs.c:705 +#: misc/mke2fs.c:707 #, c-format msgid "%llu blocks (%2.2f%%) reserved for the super user\n" msgstr "" -#: misc/mke2fs.c:708 +#: misc/mke2fs.c:710 #, c-format msgid "First data block=%u\n" msgstr "" -#: misc/mke2fs.c:710 +#: misc/mke2fs.c:712 #, c-format msgid "Root directory owner=%u:%u\n" msgstr "" -#: misc/mke2fs.c:712 +#: misc/mke2fs.c:714 #, c-format msgid "Maximum filesystem blocks=%lu\n" msgstr "" -#: misc/mke2fs.c:716 +#: misc/mke2fs.c:718 #, c-format msgid "%u block groups\n" msgstr "" -#: misc/mke2fs.c:718 +#: misc/mke2fs.c:720 #, c-format msgid "%u block group\n" msgstr "" -#: misc/mke2fs.c:720 +#: misc/mke2fs.c:722 #, c-format msgid "%u blocks per group, %u clusters per group\n" msgstr "" -#: misc/mke2fs.c:723 +#: misc/mke2fs.c:725 #, c-format msgid "%u blocks per group, %u fragments per group\n" msgstr "" -#: misc/mke2fs.c:725 +#: misc/mke2fs.c:727 #, c-format msgid "%u inodes per group\n" msgstr "" -#: misc/mke2fs.c:734 +#: misc/mke2fs.c:736 #, c-format msgid "Filesystem UUID: %s\n" msgstr "" -#: misc/mke2fs.c:735 +#: misc/mke2fs.c:737 msgid "Superblock backups stored on blocks: " msgstr "" -#: misc/mke2fs.c:831 +#: misc/mke2fs.c:833 #, c-format msgid "%s requires '-O 64bit'\n" msgstr "" -#: misc/mke2fs.c:837 +#: misc/mke2fs.c:839 #, c-format msgid "'%s' must be before 'resize=%u'\n" msgstr "" -#: misc/mke2fs.c:850 +#: misc/mke2fs.c:852 #, c-format msgid "Invalid desc_size: '%s'\n" msgstr "" -#: misc/mke2fs.c:864 +#: misc/mke2fs.c:866 #, c-format msgid "Invalid hash seed: %s\n" msgstr "" -#: misc/mke2fs.c:876 +#: misc/mke2fs.c:878 #, c-format msgid "Invalid offset: %s\n" msgstr "" -#: misc/mke2fs.c:890 misc/tune2fs.c:2140 +#: misc/mke2fs.c:892 misc/tune2fs.c:2147 #, c-format msgid "Invalid mmp_update_interval: %s\n" msgstr "" -#: misc/mke2fs.c:907 +#: misc/mke2fs.c:909 #, c-format msgid "Invalid # of backup superblocks: %s\n" msgstr "" -#: misc/mke2fs.c:929 +#: misc/mke2fs.c:931 #, c-format msgid "Invalid stride parameter: %s\n" msgstr "" -#: misc/mke2fs.c:944 +#: misc/mke2fs.c:946 #, c-format msgid "Invalid stripe-width parameter: %s\n" msgstr "" -#: misc/mke2fs.c:967 +#: misc/mke2fs.c:969 #, c-format msgid "Invalid resize parameter: %s\n" msgstr "" -#: misc/mke2fs.c:974 +#: misc/mke2fs.c:976 msgid "The resize maximum must be greater than the filesystem size.\n" msgstr "" -#: misc/mke2fs.c:998 +#: misc/mke2fs.c:1000 msgid "On-line resizing not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1024 misc/mke2fs.c:1033 +#: misc/mke2fs.c:1026 misc/mke2fs.c:1035 #, c-format msgid "Invalid root_owner: '%s'\n" msgstr "" -#: misc/mke2fs.c:1078 +#: misc/mke2fs.c:1080 #, c-format msgid "Invalid encoding: %s" msgstr "" -#: misc/mke2fs.c:1096 +#: misc/mke2fs.c:1098 #, c-format msgid "" "\n" @@ -5232,7 +5232,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:1123 +#: misc/mke2fs.c:1125 #, c-format msgid "" "\n" @@ -5240,52 +5240,52 @@ "\n" msgstr "" -#: misc/mke2fs.c:1134 misc/tune2fs.c:2276 +#: misc/mke2fs.c:1136 misc/tune2fs.c:2283 #, c-format msgid "error: Invalid encoding flag: %s\n" msgstr "" -#: misc/mke2fs.c:1140 misc/tune2fs.c:2285 +#: misc/mke2fs.c:1142 misc/tune2fs.c:2292 #, c-format msgid "" "error: An encoding must be explicitly specified when passing encoding-flags\n" msgstr "" -#: misc/mke2fs.c:1190 +#: misc/mke2fs.c:1192 #, c-format msgid "" "Syntax error in mke2fs config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: misc/mke2fs.c:1203 misc/tune2fs.c:1105 +#: misc/mke2fs.c:1205 misc/tune2fs.c:1107 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:1215 misc/tune2fs.c:422 +#: misc/mke2fs.c:1217 misc/tune2fs.c:424 #, c-format msgid "Invalid mount option set: %s\n" msgstr "" -#: misc/mke2fs.c:1351 +#: misc/mke2fs.c:1353 #, c-format msgid "" "\n" "Your mke2fs.conf file does not define the %s filesystem type.\n" msgstr "" -#: misc/mke2fs.c:1355 +#: misc/mke2fs.c:1357 msgid "" "You probably need to install an updated mke2fs.conf file.\n" "\n" msgstr "" -#: misc/mke2fs.c:1359 +#: misc/mke2fs.c:1361 msgid "Aborting...\n" msgstr "" -#: misc/mke2fs.c:1400 +#: misc/mke2fs.c:1402 #, c-format msgid "" "\n" @@ -5293,154 +5293,154 @@ "\n" msgstr "" -#: misc/mke2fs.c:1587 +#: misc/mke2fs.c:1591 msgid "Couldn't allocate memory for new PATH.\n" msgstr "" -#: misc/mke2fs.c:1624 +#: misc/mke2fs.c:1628 #, c-format msgid "Couldn't init profile successfully (error: %ld).\n" msgstr "" -#: misc/mke2fs.c:1657 +#: misc/mke2fs.c:1661 #, c-format msgid "invalid block size - %s" msgstr "" -#: misc/mke2fs.c:1661 +#: misc/mke2fs.c:1665 #, c-format msgid "Warning: blocksize %d not usable on most systems.\n" msgstr "" -#: misc/mke2fs.c:1677 +#: misc/mke2fs.c:1681 #, c-format msgid "invalid cluster size - %s" msgstr "" -#: misc/mke2fs.c:1690 +#: misc/mke2fs.c:1694 msgid "'-R' is deprecated, use '-E' instead" msgstr "" -#: misc/mke2fs.c:1704 misc/tune2fs.c:1866 +#: misc/mke2fs.c:1708 misc/tune2fs.c:1873 #, c-format msgid "bad error behavior - %s" msgstr "" -#: misc/mke2fs.c:1716 +#: misc/mke2fs.c:1720 msgid "Illegal number for blocks per group" msgstr "" -#: misc/mke2fs.c:1721 +#: misc/mke2fs.c:1725 msgid "blocks per group must be multiple of 8" msgstr "" -#: misc/mke2fs.c:1729 +#: misc/mke2fs.c:1733 msgid "Illegal number for flex_bg size" msgstr "" -#: misc/mke2fs.c:1735 +#: misc/mke2fs.c:1739 msgid "flex_bg size must be a power of 2" msgstr "" -#: misc/mke2fs.c:1740 +#: misc/mke2fs.c:1744 #, c-format msgid "flex_bg size (%lu) must be less than or equal to 2^31" msgstr "" -#: misc/mke2fs.c:1750 +#: misc/mke2fs.c:1754 #, c-format msgid "invalid inode ratio %s (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1760 +#: misc/mke2fs.c:1764 #, c-format msgid "invalid inode size - %s" msgstr "" -#: misc/mke2fs.c:1775 +#: misc/mke2fs.c:1779 msgid "" "Warning: -K option is deprecated and should not be used anymore. Use '-E " "nodiscard' extended option instead!\n" msgstr "" -#: misc/mke2fs.c:1786 +#: misc/mke2fs.c:1790 msgid "in malloc for bad_blocks_filename" msgstr "" -#: misc/mke2fs.c:1795 +#: misc/mke2fs.c:1799 #, c-format msgid "" "Warning: label too long; will be truncated to '%s'\n" "\n" msgstr "" -#: misc/mke2fs.c:1804 +#: misc/mke2fs.c:1808 #, c-format msgid "invalid reserved blocks percent - %s" msgstr "" -#: misc/mke2fs.c:1819 +#: misc/mke2fs.c:1823 #, c-format msgid "bad num inodes - %s" msgstr "" -#: misc/mke2fs.c:1832 +#: misc/mke2fs.c:1836 msgid "while allocating fs_feature string" msgstr "" -#: misc/mke2fs.c:1849 +#: misc/mke2fs.c:1853 #, c-format msgid "bad revision level - %s" msgstr "" -#: misc/mke2fs.c:1854 +#: misc/mke2fs.c:1858 #, c-format msgid "while trying to create revision %d" msgstr "" -#: misc/mke2fs.c:1868 +#: misc/mke2fs.c:1872 msgid "The -t option may only be used once" msgstr "" -#: misc/mke2fs.c:1876 +#: misc/mke2fs.c:1880 msgid "The -T option may only be used once" msgstr "" -#: misc/mke2fs.c:1932 misc/mke2fs.c:3368 +#: misc/mke2fs.c:1936 misc/mke2fs.c:3401 #, c-format msgid "while trying to open journal device %s\n" msgstr "" -#: misc/mke2fs.c:1938 +#: misc/mke2fs.c:1942 #, c-format msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n" msgstr "" -#: misc/mke2fs.c:1944 +#: misc/mke2fs.c:1948 #, c-format msgid "Using journal device's blocksize: %d\n" msgstr "" -#: misc/mke2fs.c:1955 +#: misc/mke2fs.c:1959 #, c-format msgid "invalid blocks '%s' on device '%s'" msgstr "" -#: misc/mke2fs.c:1985 +#: misc/mke2fs.c:1979 msgid "filesystem" msgstr "" -#: misc/mke2fs.c:2003 resize/main.c:499 +#: misc/mke2fs.c:2011 resize/main.c:506 msgid "while trying to determine filesystem size" msgstr "" -#: misc/mke2fs.c:2009 +#: misc/mke2fs.c:2017 msgid "" "Couldn't determine device size; you must specify\n" "the size of the filesystem\n" msgstr "" -#: misc/mke2fs.c:2016 +#: misc/mke2fs.c:2024 msgid "" "Device size reported to be zero. Invalid partition specified, or\n" "\tpartition table wasn't reread after running fdisk, due to\n" @@ -5448,142 +5448,142 @@ "\tto re-read your partition table.\n" msgstr "" -#: misc/mke2fs.c:2033 +#: misc/mke2fs.c:2041 msgid "Filesystem larger than apparent device size." msgstr "" -#: misc/mke2fs.c:2053 +#: misc/mke2fs.c:2064 msgid "Failed to parse fs types list\n" msgstr "" -#: misc/mke2fs.c:2103 +#: misc/mke2fs.c:2114 msgid "The HURD does not support the filetype feature.\n" msgstr "" -#: misc/mke2fs.c:2108 +#: misc/mke2fs.c:2119 msgid "The HURD does not support the huge_file feature.\n" msgstr "" -#: misc/mke2fs.c:2113 +#: misc/mke2fs.c:2124 msgid "The HURD does not support the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:2118 +#: misc/mke2fs.c:2129 msgid "The HURD does not support the ea_inode feature.\n" msgstr "" -#: misc/mke2fs.c:2128 +#: misc/mke2fs.c:2139 msgid "while trying to determine hardware sector size" msgstr "" -#: misc/mke2fs.c:2134 +#: misc/mke2fs.c:2145 msgid "while trying to determine physical sector size" msgstr "" -#: misc/mke2fs.c:2166 +#: misc/mke2fs.c:2177 msgid "while setting blocksize; too small for device\n" msgstr "" -#: misc/mke2fs.c:2171 +#: misc/mke2fs.c:2182 #, c-format msgid "" "Warning: specified blocksize %d is less than device physical sectorsize %d\n" msgstr "" -#: misc/mke2fs.c:2195 +#: misc/mke2fs.c:2206 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to be expressed\n" "\tin 32 bits using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2209 +#: misc/mke2fs.c:2220 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to create\n" "\ta filesystem using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2231 +#: misc/mke2fs.c:2242 msgid "fs_types for mke2fs.conf resolution: " msgstr "" -#: misc/mke2fs.c:2238 +#: misc/mke2fs.c:2249 msgid "Filesystem features not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2246 +#: misc/mke2fs.c:2257 msgid "Sparse superblocks not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2256 +#: misc/mke2fs.c:2267 msgid "Journals not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2269 +#: misc/mke2fs.c:2280 #, c-format msgid "invalid reserved blocks percent - %lf" msgstr "" -#: misc/mke2fs.c:2286 +#: misc/mke2fs.c:2297 msgid "" "Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to " "rectify.\n" msgstr "" -#: misc/mke2fs.c:2306 +#: misc/mke2fs.c:2317 msgid "The cluster size may not be smaller than the block size.\n" msgstr "" -#: misc/mke2fs.c:2312 +#: misc/mke2fs.c:2323 msgid "specifying a cluster size requires the bigalloc feature" msgstr "" -#: misc/mke2fs.c:2332 +#: misc/mke2fs.c:2343 #, c-format msgid "warning: Unable to get device geometry for %s\n" msgstr "" -#: misc/mke2fs.c:2344 +#: misc/mke2fs.c:2355 #, c-format msgid "%s alignment is offset by %lu bytes.\n" msgstr "" -#: misc/mke2fs.c:2346 +#: misc/mke2fs.c:2357 #, c-format msgid "" "This may result in very poor performance, (re)-partitioning suggested.\n" msgstr "" -#: misc/mke2fs.c:2376 +#: misc/mke2fs.c:2387 #, c-format msgid "%d-byte blocks too big for system (max %d)" msgstr "" -#: misc/mke2fs.c:2380 +#: misc/mke2fs.c:2391 #, c-format msgid "" "Warning: %d-byte blocks too big for system (max %d), forced to continue\n" msgstr "" -#: misc/mke2fs.c:2388 +#: misc/mke2fs.c:2399 #, c-format msgid "" "Suggestion: Use Linux kernel >= 3.18 for improved stability of the metadata " "and journal checksum features.\n" msgstr "" -#: misc/mke2fs.c:2434 +#: misc/mke2fs.c:2445 #, c-format msgid "Unknown filename encoding from profile: %s" msgstr "" -#: misc/mke2fs.c:2445 +#: misc/mke2fs.c:2456 #, c-format msgid "Unknown encoding flags from profile: %s" msgstr "" -#: misc/mke2fs.c:2470 +#: misc/mke2fs.c:2481 #, c-format msgid "" "\n" @@ -5593,7 +5593,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:2485 +#: misc/mke2fs.c:2496 #, c-format msgid "%d byte inodes are too small for project quota" msgstr "" @@ -5604,17 +5604,17 @@ "They can not be both enabled simultaneously.\n" msgstr "" -#: misc/mke2fs.c:2507 +#: misc/mke2fs.c:2518 msgid "Can't support bigalloc feature without extents feature" msgstr "" -#: misc/mke2fs.c:2514 +#: misc/mke2fs.c:2525 msgid "" "The resize_inode and meta_bg features are not compatible.\n" "They can not be both enabled simultaneously.\n" msgstr "" -#: misc/mke2fs.c:2522 +#: misc/mke2fs.c:2510 msgid "" "\n" "Warning: the bigalloc feature is still under development\n" @@ -5622,39 +5622,39 @@ "\n" msgstr "" -#: misc/mke2fs.c:2534 +#: misc/mke2fs.c:2546 msgid "reserved online resize blocks not supported on non-sparse filesystem" msgstr "" -#: misc/mke2fs.c:2543 +#: misc/mke2fs.c:2555 msgid "blocks per group count out of range" msgstr "" -#: misc/mke2fs.c:2565 +#: misc/mke2fs.c:2577 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified" msgstr "" -#: misc/mke2fs.c:2577 +#: misc/mke2fs.c:2589 #, c-format msgid "invalid inode size %d (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:2592 +#: misc/mke2fs.c:2604 #, c-format msgid "%d byte inodes are too small for inline data; specify larger size" msgstr "" -#: misc/mke2fs.c:2607 +#: misc/mke2fs.c:2630 #, c-format msgid "too many inodes (%llu), raise inode ratio?" msgstr "" -#: misc/mke2fs.c:2615 +#: misc/mke2fs.c:2638 #, c-format msgid "too many inodes (%llu), specify < 2^32 inodes" msgstr "" -#: misc/mke2fs.c:2629 +#: misc/mke2fs.c:2652 #, c-format msgid "" "inode_size (%u) * inodes_count (%u) too big for a\n" @@ -5662,154 +5662,154 @@ "\tor lower inode count (-N).\n" msgstr "" -#: misc/mke2fs.c:2816 +#: misc/mke2fs.c:2849 msgid "Discarding device blocks: " msgstr "" -#: misc/mke2fs.c:2832 +#: misc/mke2fs.c:2865 msgid "failed - " msgstr "" -#: misc/mke2fs.c:2891 +#: misc/mke2fs.c:2924 msgid "while initializing quota context" msgstr "" -#: misc/mke2fs.c:2898 +#: misc/mke2fs.c:2931 msgid "while writing quota inodes" msgstr "" -#: misc/mke2fs.c:2923 +#: misc/mke2fs.c:2956 #, c-format msgid "bad error behavior in profile - %s" msgstr "" -#: misc/mke2fs.c:3002 +#: misc/mke2fs.c:3035 msgid "in malloc for android_sparse_params" msgstr "" -#: misc/mke2fs.c:3016 +#: misc/mke2fs.c:3049 msgid "while setting up superblock" msgstr "" -#: misc/mke2fs.c:3032 +#: misc/mke2fs.c:3065 msgid "" "Extents are not enabled. The file extent tree can be checksummed, whereas " "block maps cannot. Not enabling extents reduces the coverage of metadata " "checksumming. Pass -O extents to rectify.\n" msgstr "" -#: misc/mke2fs.c:3039 +#: misc/mke2fs.c:3072 msgid "" "64-bit filesystem support is not enabled. The larger fields afforded by " "this feature enable full-strength checksumming. Pass -O 64bit to rectify.\n" msgstr "" -#: misc/mke2fs.c:3047 +#: misc/mke2fs.c:3080 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:3071 +#: misc/mke2fs.c:3104 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n" msgstr "" -#: misc/mke2fs.c:3170 +#: misc/mke2fs.c:3203 #, c-format msgid "unknown os - %s" msgstr "" -#: misc/mke2fs.c:3233 +#: misc/mke2fs.c:3266 msgid "Allocating group tables: " msgstr "" -#: misc/mke2fs.c:3241 +#: misc/mke2fs.c:3274 msgid "while trying to allocate filesystem tables" msgstr "" -#: misc/mke2fs.c:3267 +#: misc/mke2fs.c:3300 msgid "" "\n" "\twhile converting subcluster bitmap" msgstr "" -#: misc/mke2fs.c:3295 +#: misc/mke2fs.c:3328 #, c-format msgid "%s may be further corrupted by superblock rewrite\n" msgstr "" -#: misc/mke2fs.c:3336 +#: misc/mke2fs.c:3369 #, c-format msgid "while zeroing block %llu at end of filesystem" msgstr "" -#: misc/mke2fs.c:3349 +#: misc/mke2fs.c:3382 msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:3361 misc/tune2fs.c:1567 +#: misc/mke2fs.c:3394 misc/tune2fs.c:1569 msgid "journal" msgstr "ジャーナル" -#: misc/mke2fs.c:3373 +#: misc/mke2fs.c:3406 #, c-format msgid "Adding journal to device %s: " msgstr "" -#: misc/mke2fs.c:3380 +#: misc/mke2fs.c:3413 #, c-format msgid "" "\n" "\twhile trying to add journal to device %s" msgstr "" -#: misc/mke2fs.c:3385 misc/mke2fs.c:3415 misc/mke2fs.c:3457 -#: misc/mk_hugefiles.c:602 misc/tune2fs.c:1596 misc/tune2fs.c:1615 +#: misc/mke2fs.c:3418 misc/mke2fs.c:3448 misc/mke2fs.c:3490 +#: misc/mk_hugefiles.c:602 misc/tune2fs.c:1598 misc/tune2fs.c:1620 msgid "done\n" msgstr "" -#: misc/mke2fs.c:3392 +#: misc/mke2fs.c:3425 msgid "Skipping journal creation in super-only mode\n" msgstr "" -#: misc/mke2fs.c:3402 +#: misc/mke2fs.c:3435 #, c-format msgid "Creating journal (%u blocks): " msgstr "" -#: misc/mke2fs.c:3411 +#: misc/mke2fs.c:3444 msgid "" "\n" "\twhile trying to create journal" msgstr "" -#: misc/mke2fs.c:3423 misc/tune2fs.c:1170 +#: misc/mke2fs.c:3456 misc/tune2fs.c:1172 msgid "" "\n" "Error while enabling multiple mount protection feature." msgstr "" -#: misc/mke2fs.c:3428 +#: misc/mke2fs.c:3461 #, c-format msgid "" "Multiple mount protection is enabled with update interval %d seconds.\n" msgstr "" -#: misc/mke2fs.c:3448 +#: misc/mke2fs.c:3481 msgid "Copying files into the device: " msgstr "" -#: misc/mke2fs.c:3454 +#: misc/mke2fs.c:3487 msgid "while populating file system" msgstr "" -#: misc/mke2fs.c:3461 +#: misc/mke2fs.c:3494 msgid "Writing superblocks and filesystem accounting information: " msgstr "" -#: misc/mke2fs.c:3468 +#: misc/mke2fs.c:3501 msgid "while writing out and closing file system" msgstr "" -#: misc/mke2fs.c:3471 +#: misc/mke2fs.c:3504 msgid "" "done\n" "\n" @@ -5914,19 +5914,19 @@ msgid "while trying to open external journal" msgstr "" -#: misc/tune2fs.c:292 misc/tune2fs.c:2888 +#: misc/tune2fs.c:292 misc/tune2fs.c:2895 #, c-format msgid "%s is not a journal device.\n" msgstr "" -#: misc/tune2fs.c:301 misc/tune2fs.c:2897 +#: misc/tune2fs.c:301 misc/tune2fs.c:2904 #, c-format msgid "" "Journal superblock is corrupted, nr_users\n" "is too high (%d).\n" msgstr "" -#: misc/tune2fs.c:308 misc/tune2fs.c:2904 +#: misc/tune2fs.c:308 misc/tune2fs.c:2911 msgid "Filesystem's UUID not found on journal device.\n" msgstr "" @@ -5948,171 +5948,171 @@ msgid "while clearing journal inode" msgstr "" -#: misc/tune2fs.c:404 +#: misc/tune2fs.c:406 msgid "while writing journal inode" msgstr "" -#: misc/tune2fs.c:440 misc/tune2fs.c:465 misc/tune2fs.c:478 +#: misc/tune2fs.c:442 misc/tune2fs.c:467 misc/tune2fs.c:480 msgid "(and reboot afterwards!)\n" msgstr "" -#: misc/tune2fs.c:493 +#: misc/tune2fs.c:495 #, c-format msgid "After running e2fsck, please run `resize2fs %s %s" msgstr "" -#: misc/tune2fs.c:496 +#: misc/tune2fs.c:498 #, c-format msgid "Please run `resize2fs %s %s" msgstr "" -#: misc/tune2fs.c:500 +#: misc/tune2fs.c:502 #, c-format msgid " -z \"%s\"" msgstr "" -#: misc/tune2fs.c:502 +#: misc/tune2fs.c:504 #, c-format msgid "' to enable 64-bit mode.\n" msgstr "" -#: misc/tune2fs.c:504 +#: misc/tune2fs.c:506 #, c-format msgid "' to disable 64-bit mode.\n" msgstr "" -#: misc/tune2fs.c:1072 +#: misc/tune2fs.c:1074 msgid "" "WARNING: Could not confirm kernel support for metadata_csum_seed.\n" " This requires Linux >= v4.4.\n" msgstr "" -#: misc/tune2fs.c:1108 +#: misc/tune2fs.c:1110 #, c-format msgid "Clearing filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1114 +#: misc/tune2fs.c:1116 #, c-format msgid "Setting filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1123 +#: misc/tune2fs.c:1125 msgid "" "The has_journal feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1131 +#: misc/tune2fs.c:1133 msgid "" "The needs_recovery flag is set. Please run e2fsck before clearing\n" "the has_journal flag.\n" msgstr "" -#: misc/tune2fs.c:1149 +#: misc/tune2fs.c:1151 msgid "" "Setting filesystem feature 'sparse_super' not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1162 +#: misc/tune2fs.c:1164 msgid "" "The multiple mount protection feature can't\n" "be set if the filesystem is mounted or\n" "read-only.\n" msgstr "" -#: misc/tune2fs.c:1180 +#: misc/tune2fs.c:1182 #, c-format msgid "" "Multiple mount protection has been enabled with update interval %ds.\n" msgstr "" -#: misc/tune2fs.c:1189 +#: misc/tune2fs.c:1191 msgid "" "The multiple mount protection feature cannot\n" "be disabled if the filesystem is readonly.\n" msgstr "" -#: misc/tune2fs.c:1197 +#: misc/tune2fs.c:1199 msgid "Error while reading bitmaps\n" msgstr "" -#: misc/tune2fs.c:1206 +#: misc/tune2fs.c:1208 #, c-format msgid "Magic number in MMP block does not match. expected: %x, actual: %x\n" msgstr "" -#: misc/tune2fs.c:1211 +#: misc/tune2fs.c:1213 msgid "while reading MMP block." msgstr "" -#: misc/tune2fs.c:1261 +#: misc/tune2fs.c:1263 msgid "" "Clearing the flex_bg flag would cause the the filesystem to be\n" "inconsistent.\n" msgstr "" -#: misc/tune2fs.c:1272 +#: misc/tune2fs.c:1274 msgid "" "The huge_file feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1283 +#: misc/tune2fs.c:1285 msgid "Enabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1286 +#: misc/tune2fs.c:1288 msgid "Cannot enable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1292 +#: misc/tune2fs.c:1294 msgid "" "Extents are not enabled. The file extent tree can be checksummed, whereas " "block maps cannot. Not enabling extents reduces the coverage of metadata " "checksumming. Re-run with -O extent to rectify.\n" msgstr "" -#: misc/tune2fs.c:1299 +#: misc/tune2fs.c:1301 msgid "" "64-bit filesystem support is not enabled. The larger fields afforded by " "this feature enable full-strength checksumming. Run resize2fs -b to " "rectify.\n" msgstr "" -#: misc/tune2fs.c:1325 +#: misc/tune2fs.c:1327 msgid "Disabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1328 +#: misc/tune2fs.c:1330 msgid "Cannot disable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1369 +#: misc/tune2fs.c:1371 msgid "Cannot enable uninit_bg on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1384 +#: misc/tune2fs.c:1386 msgid "Cannot disable uninit_bg on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1403 +#: misc/tune2fs.c:1405 #, c-format msgid "Cannot enable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1413 +#: misc/tune2fs.c:1415 #, c-format msgid "Cannot disable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1443 +#: misc/tune2fs.c:1445 #, c-format msgid "Cannot enable project feature; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1464 +#: misc/tune2fs.c:1466 msgid "" "\n" "Warning: '^quota' option overrides '-Q'arguments.\n" @@ -6124,79 +6124,79 @@ "enabled.\n" msgstr "" -#: misc/tune2fs.c:1493 +#: misc/tune2fs.c:1495 msgid "" "Setting feature 'metadata_csum_seed' is only supported\n" "on filesystems with the metadata_csum feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1511 +#: misc/tune2fs.c:1513 msgid "" "UUID has changed since enabling metadata_csum. Filesystem must be unmounted " "\n" "to safely rewrite all metadata to match the new UUID.\n" msgstr "" -#: misc/tune2fs.c:1517 +#: misc/tune2fs.c:1519 msgid "Recalculating checksums could take some time." msgstr "" -#: misc/tune2fs.c:1560 +#: misc/tune2fs.c:1562 msgid "The filesystem already has a journal.\n" msgstr "" -#: misc/tune2fs.c:1580 +#: misc/tune2fs.c:1582 #, c-format msgid "" "\n" "\twhile trying to open journal on %s\n" msgstr "" -#: misc/tune2fs.c:1584 +#: misc/tune2fs.c:1586 #, c-format msgid "Creating journal on device %s: " msgstr "" -#: misc/tune2fs.c:1592 +#: misc/tune2fs.c:1594 #, c-format msgid "while adding filesystem to journal on %s" msgstr "" -#: misc/tune2fs.c:1598 +#: misc/tune2fs.c:1600 msgid "Creating journal inode: " msgstr "" -#: misc/tune2fs.c:1612 +#: misc/tune2fs.c:1614 msgid "" "\n" "\twhile trying to create journal file" msgstr "" -#: misc/tune2fs.c:1650 +#: misc/tune2fs.c:1656 #, c-format msgid "Cannot enable project quota; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1663 +#: misc/tune2fs.c:1669 msgid "while initializing quota context in support library" msgstr "" -#: misc/tune2fs.c:1678 +#: misc/tune2fs.c:1685 #, c-format msgid "while updating quota limits (%d)" msgstr "" -#: misc/tune2fs.c:1688 +#: misc/tune2fs.c:1695 #, c-format msgid "while writing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1706 +#: misc/tune2fs.c:1713 #, c-format msgid "while removing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1749 +#: misc/tune2fs.c:1756 msgid "" "\n" "Bad quota options specified.\n" @@ -6210,65 +6210,65 @@ "\n" msgstr "" -#: misc/tune2fs.c:1807 +#: misc/tune2fs.c:1814 #, c-format msgid "Couldn't parse date/time specifier: %s" msgstr "" -#: misc/tune2fs.c:1839 misc/tune2fs.c:1850 +#: misc/tune2fs.c:1846 misc/tune2fs.c:1857 #, c-format msgid "bad mounts count - %s" msgstr "" -#: misc/tune2fs.c:1893 +#: misc/tune2fs.c:1900 #, c-format msgid "bad gid/group name - %s" msgstr "" -#: misc/tune2fs.c:1926 +#: misc/tune2fs.c:1933 #, c-format msgid "bad interval - %s" msgstr "" -#: misc/tune2fs.c:1955 +#: misc/tune2fs.c:1962 #, c-format msgid "bad reserved block ratio - %s" msgstr "" -#: misc/tune2fs.c:1970 +#: misc/tune2fs.c:1977 msgid "-o may only be specified once" msgstr "" -#: misc/tune2fs.c:1979 +#: misc/tune2fs.c:1986 msgid "-O may only be specified once" msgstr "" -#: misc/tune2fs.c:1996 +#: misc/tune2fs.c:2003 #, c-format msgid "bad reserved blocks count - %s" msgstr "" -#: misc/tune2fs.c:2025 +#: misc/tune2fs.c:2032 #, c-format msgid "bad uid/user name - %s" msgstr "" -#: misc/tune2fs.c:2042 +#: misc/tune2fs.c:2049 #, c-format msgid "bad inode size - %s" msgstr "" -#: misc/tune2fs.c:2049 +#: misc/tune2fs.c:2056 #, c-format msgid "Inode size must be a power of two- %s" msgstr "" -#: misc/tune2fs.c:2149 +#: misc/tune2fs.c:2156 #, c-format msgid "mmp_update_interval too big: %lu\n" msgstr "" -#: misc/tune2fs.c:2154 +#: misc/tune2fs.c:2161 #, c-format msgid "Setting multiple mount protection update interval to %lu second\n" msgid_plural "" @@ -6276,27 +6276,27 @@ msgstr[0] "" msgstr[1] "" -#: misc/tune2fs.c:2163 +#: misc/tune2fs.c:2170 #, c-format msgid "Setting filesystem error flag to force fsck.\n" msgstr "" -#: misc/tune2fs.c:2181 +#: misc/tune2fs.c:2188 #, c-format msgid "Invalid RAID stride: %s\n" msgstr "" -#: misc/tune2fs.c:2196 +#: misc/tune2fs.c:2203 #, c-format msgid "Invalid RAID stripe-width: %s\n" msgstr "" -#: misc/tune2fs.c:2211 +#: misc/tune2fs.c:2218 #, c-format msgid "Invalid hash algorithm: %s\n" msgstr "" -#: misc/tune2fs.c:2217 +#: misc/tune2fs.c:2224 #, c-format msgid "Setting default hash algorithm to %s (%d)\n" msgstr "" @@ -6321,72 +6321,72 @@ "\t^test_fs\n" msgstr "" -#: misc/tune2fs.c:2706 +#: misc/tune2fs.c:2713 msgid "Failed to read inode bitmap\n" msgstr "" -#: misc/tune2fs.c:2711 +#: misc/tune2fs.c:2718 msgid "Failed to read block bitmap\n" msgstr "" -#: misc/tune2fs.c:2728 resize/resize2fs.c:1279 +#: misc/tune2fs.c:2735 resize/resize2fs.c:1372 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:2731 +#: misc/tune2fs.c:2738 msgid "Failed to allocate block bitmap when increasing inode size\n" msgstr "" -#: misc/tune2fs.c:2737 +#: misc/tune2fs.c:2744 msgid "Not enough space to increase inode size \n" msgstr "" -#: misc/tune2fs.c:2742 +#: misc/tune2fs.c:2749 msgid "Failed to relocate blocks during inode resize \n" msgstr "" -#: misc/tune2fs.c:2774 +#: misc/tune2fs.c:2781 msgid "" "Error in resizing the inode size.\n" "Run e2undo to undo the file system changes. \n" msgstr "" -#: misc/tune2fs.c:2985 +#: misc/tune2fs.c:2992 msgid "" "If you are sure the filesystem is not in use on any node, run:\n" "'tune2fs -f -E clear_mmp {device}'\n" msgstr "" -#: misc/tune2fs.c:2992 +#: misc/tune2fs.c:2999 #, c-format msgid "" "MMP block magic is bad. Try to fix it by running:\n" "'e2fsck -f %s'\n" msgstr "" -#: misc/tune2fs.c:3004 +#: misc/tune2fs.c:3011 msgid "Cannot modify a journal device.\n" msgstr "" -#: misc/tune2fs.c:3017 +#: misc/tune2fs.c:3024 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:3024 +#: misc/tune2fs.c:3031 msgid "Shrinking inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:3029 +#: misc/tune2fs.c:3036 #, c-format msgid "Invalid inode size %lu (max %d)\n" msgstr "" -#: misc/tune2fs.c:3035 +#: misc/tune2fs.c:3042 msgid "Resizing inodes could take some time." msgstr "" -#: misc/tune2fs.c:3084 +#: misc/tune2fs.c:3091 #, c-format msgid "" "Warning: The journal is dirty. You may wish to replay the journal like:\n" @@ -6397,154 +6397,154 @@ "by journal recovery.\n" msgstr "" -#: misc/tune2fs.c:3093 +#: misc/tune2fs.c:3100 #, c-format msgid "Recovering journal.\n" msgstr "" -#: misc/tune2fs.c:3117 +#: misc/tune2fs.c:3124 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3123 +#: misc/tune2fs.c:3130 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3128 +#: misc/tune2fs.c:3135 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:3133 +#: misc/tune2fs.c:3140 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:3138 +#: misc/tune2fs.c:3145 #, c-format msgid "interval between checks is too big (%lu)" msgstr "" -#: misc/tune2fs.c:3145 +#: misc/tune2fs.c:3152 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:3152 +#: misc/tune2fs.c:3159 #, c-format msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n" msgstr "" -#: misc/tune2fs.c:3159 +#: misc/tune2fs.c:3166 #, c-format msgid "reserved blocks count is too big (%llu)" msgstr "" -#: misc/tune2fs.c:3166 +#: misc/tune2fs.c:3173 #, c-format msgid "Setting reserved blocks count to %llu\n" msgstr "" -#: misc/tune2fs.c:3171 +#: misc/tune2fs.c:3178 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:3174 +#: misc/tune2fs.c:3181 msgid "" "\n" "Setting the sparse superblock flag not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3184 +#: misc/tune2fs.c:3191 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:3189 +#: misc/tune2fs.c:3196 msgid "" "\n" "Clearing the sparse superblock flag not supported.\n" msgstr "" -#: misc/tune2fs.c:3197 +#: misc/tune2fs.c:3204 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:3203 +#: misc/tune2fs.c:3210 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:3235 +#: misc/tune2fs.c:3242 msgid "Error in using clear_mmp. It must be used with -f\n" msgstr "" -#: misc/tune2fs.c:3253 +#: misc/tune2fs.c:3260 msgid "" "The quota feature may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3280 +#: misc/tune2fs.c:3287 msgid "Setting the UUID on this filesystem could take some time." msgstr "" -#: misc/tune2fs.c:3297 +#: misc/tune2fs.c:3304 msgid "The UUID may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3300 +#: misc/tune2fs.c:3307 msgid "" "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' " "and re-run this command.\n" msgstr "" -#: misc/tune2fs.c:3331 +#: misc/tune2fs.c:3338 msgid "Invalid UUID format\n" msgstr "" -#: misc/tune2fs.c:3347 +#: misc/tune2fs.c:3354 msgid "Need to update journal superblock.\n" msgstr "" -#: misc/tune2fs.c:3369 +#: misc/tune2fs.c:3376 msgid "" "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3376 +#: misc/tune2fs.c:3383 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3394 +#: misc/tune2fs.c:3401 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:3398 +#: misc/tune2fs.c:3405 msgid "Failed to change inode size\n" msgstr "" -#: misc/tune2fs.c:3412 +#: misc/tune2fs.c:3419 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:3417 +#: misc/tune2fs.c:3424 #, c-format msgid "Setting stripe width to %d\n" msgstr "" -#: misc/tune2fs.c:3424 +#: misc/tune2fs.c:3431 #, c-format msgid "Setting extended default mount options to '%s'\n" msgstr "" @@ -6827,37 +6827,37 @@ msgid "while getting stat information for %s" msgstr "" -#: resize/main.c:453 +#: resize/main.c:457 #, c-format msgid "" "Please run 'e2fsck -f %s' first.\n" "\n" msgstr "" -#: resize/main.c:472 +#: resize/main.c:476 #, c-format msgid "Estimated minimum size of the filesystem: %llu\n" msgstr "" -#: resize/main.c:509 +#: resize/main.c:516 #, c-format msgid "Invalid new size: %s\n" msgstr "" -#: resize/main.c:528 +#: resize/main.c:535 msgid "New size too large to be expressed in 32 bits\n" msgstr "" -#: resize/main.c:548 +#: resize/main.c:555 #, c-format msgid "New size smaller than minimum (%llu)\n" msgstr "" -#: resize/main.c:555 +#: resize/main.c:562 msgid "Invalid stride length" msgstr "" -#: resize/main.c:579 +#: resize/main.c:586 #, c-format msgid "" "The containing partition (or device) is only %llu (%dk) blocks.\n" @@ -6865,82 +6865,82 @@ "\n" msgstr "" -#: resize/main.c:586 +#: resize/main.c:593 #, c-format msgid "Cannot set and unset 64bit feature.\n" msgstr "" -#: resize/main.c:590 +#: resize/main.c:597 #, c-format msgid "" "Cannot change the 64bit feature on a filesystem that is larger than 2^32 " "blocks.\n" msgstr "" -#: resize/main.c:596 +#: resize/main.c:603 #, c-format msgid "Cannot change the 64bit feature while the filesystem is mounted.\n" msgstr "" -#: resize/main.c:602 +#: resize/main.c:609 #, c-format msgid "" "Please enable the extents feature with tune2fs before enabling the 64bit " "feature.\n" msgstr "" -#: resize/main.c:608 +#: resize/main.c:617 #, c-format msgid "" "The filesystem is already %llu (%dk) blocks long. Nothing to do!\n" "\n" msgstr "" -#: resize/main.c:616 +#: resize/main.c:627 #, c-format msgid "The filesystem is already 64-bit.\n" msgstr "" -#: resize/main.c:621 +#: resize/main.c:632 #, c-format msgid "The filesystem is already 32-bit.\n" msgstr "" -#: resize/main.c:635 +#: resize/main.c:646 #, c-format msgid "Converting the filesystem to 64-bit.\n" msgstr "" -#: resize/main.c:637 +#: resize/main.c:648 #, c-format msgid "Converting the filesystem to 32-bit.\n" msgstr "" -#: resize/main.c:639 +#: resize/main.c:650 #, c-format msgid "Resizing the filesystem on %s to %llu (%dk) blocks.\n" msgstr "" -#: resize/main.c:649 +#: resize/main.c:660 #, c-format msgid "while trying to resize %s" msgstr "" -#: resize/main.c:652 +#: resize/main.c:663 #, c-format msgid "" "Please run 'e2fsck -fy %s' to fix the filesystem\n" "after the aborted resize operation.\n" msgstr "" -#: resize/main.c:658 +#: resize/main.c:668 #, c-format msgid "" "The filesystem on %s is now %llu (%dk) blocks long.\n" "\n" msgstr "" -#: resize/main.c:673 +#: resize/main.c:683 #, c-format msgid "while trying to truncate %s" msgstr "" @@ -7013,32 +7013,32 @@ "this system.\n" msgstr "" -#: resize/resize2fs.c:760 +#: resize/resize2fs.c:769 #, c-format msgid "inodes (%llu) must be less than %u\n" msgstr "" -#: resize/resize2fs.c:1039 +#: resize/resize2fs.c:1127 msgid "reserved blocks" msgstr "予約ブロック数" -#: resize/resize2fs.c:1284 +#: resize/resize2fs.c:1377 msgid "meta-data blocks" msgstr "メタデータブロック" -#: resize/resize2fs.c:1388 resize/resize2fs.c:2430 +#: resize/resize2fs.c:1481 resize/resize2fs.c:2523 msgid "new meta blocks" msgstr "" -#: resize/resize2fs.c:2654 +#: resize/resize2fs.c:2747 msgid "Should never happen! No sb in last super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2659 +#: resize/resize2fs.c:2752 msgid "Should never happen! Unexpected old_desc in super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2732 +#: resize/resize2fs.c:2825 msgid "Should never happen: resize inode corrupt!\n" msgstr "" @@ -7887,63 +7887,63 @@ msgid "\tlast mounted on %s on %s" msgstr "" -#: lib/support/plausible.c:117 +#: lib/support/plausible.c:122 #, c-format msgid "\tlast mounted on %s" msgstr "" -#: lib/support/plausible.c:120 +#: lib/support/plausible.c:125 #, c-format msgid "\tcreated on %s" msgstr "" -#: lib/support/plausible.c:123 +#: lib/support/plausible.c:128 #, c-format msgid "\tlast modified on %s" msgstr "" -#: lib/support/plausible.c:157 +#: lib/support/plausible.c:162 #, c-format msgid "Found a %s partition table in %s\n" msgstr "" -#: lib/support/plausible.c:187 +#: misc/mke2fs.c:1994 lib/support/plausible.c:192 #, c-format msgid "The file %s does not exist and no size was specified.\n" msgstr "" -#: lib/support/plausible.c:195 +#: misc/mke2fs.c:2006 lib/support/plausible.c:200 #, c-format msgid "Creating regular file %s\n" msgstr "" -#: lib/support/plausible.c:198 +#: lib/support/plausible.c:203 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: lib/support/plausible.c:201 +#: lib/support/plausible.c:206 msgid "" "\n" "The device apparently does not exist; did you specify it correctly?\n" msgstr "" -#: lib/support/plausible.c:223 +#: lib/support/plausible.c:228 #, c-format msgid "%s is not a block special device.\n" msgstr "" -#: lib/support/plausible.c:245 +#: lib/support/plausible.c:250 #, c-format msgid "%s contains a %s file system labelled '%s'\n" msgstr "" -#: lib/support/plausible.c:248 +#: lib/support/plausible.c:253 #, c-format msgid "%s contains a %s file system\n" msgstr "" -#: lib/support/plausible.c:272 +#: lib/support/plausible.c:277 #, c-format msgid "%s contains `%s' data\n" msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/ecryptfs-utils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/ecryptfs-utils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/ecryptfs-utils.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/ecryptfs-utils.po 2022-02-11 23:04:18.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: 2021-08-02 17:42+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:37+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. Name #: ../src/desktop/ecryptfs-record-passphrase:1 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/eject.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/eject.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/eject.po 2021-08-03 08:53:30.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/eject.po 2022-02-11 23:04: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: 2021-08-02 16:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:02+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../eject.c:156 #, c-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/elfutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/elfutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/elfutils.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/elfutils.po 2022-02-11 23:04:18.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: 2021-08-02 17:33+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:28+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: lib/color.c:53 @@ -38,7 +38,7 @@ #: lib/color.c:194 src/objdump.c:728 #, c-format msgid "cannot allocate memory" -msgstr "" +msgstr "メモリーを割り当てられません" #: lib/printversion.c:40 #, c-format @@ -48,11 +48,11 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: lib/xmalloc.c:48 lib/xmalloc.c:61 lib/xmalloc.c:73 src/readelf.c:3461 -#: src/readelf.c:11512 src/unstrip.c:312 src/unstrip.c:2404 src/unstrip.c:2609 +#: lib/xmalloc.c:48 lib/xmalloc.c:61 lib/xmalloc.c:73 src/readelf.c:11582 +#: src/unstrip.c:312 #, c-format msgid "memory exhausted" -msgstr "メモリー消費済み" +msgstr "メモリー枯渇" #: libasm/asm_error.c:65 libdw/dwarf_error.c:57 libdwfl/libdwflP.h:51 #: libelf/elf_error.c:60 @@ -62,7 +62,7 @@ #: libasm/asm_error.c:66 libdw/dwarf_error.c:67 libdwfl/libdwflP.h:53 #: libelf/elf_error.c:91 msgid "out of memory" -msgstr "メモリー不足" +msgstr "メモリー不足です" #: libasm/asm_error.c:67 msgid "cannot create output file" @@ -70,7 +70,7 @@ #: libasm/asm_error.c:68 msgid "invalid parameter" -msgstr "不当なパラメーター" +msgstr "不当なパラメーターです" #: libasm/asm_error.c:69 msgid "cannot change mode of output file" @@ -82,28 +82,28 @@ #: libasm/asm_error.c:71 msgid "duplicate symbol" -msgstr "重複シンボル" +msgstr "重複シンボルです" #: libasm/asm_error.c:72 msgid "invalid section type for operation" -msgstr "操作に不当なセクションタイプ" +msgstr "操作に不当なセクションタイプです" #: libasm/asm_error.c:73 msgid "error during output of data" -msgstr "データの出力中にエラー" +msgstr "データ出力中のエラーです" #: libasm/asm_error.c:74 msgid "no backend support available" -msgstr "バックエンドサポートが利用できません" +msgstr "バックエンドサポートを利用できません" #: libasm/asm_error.c:83 libdw/dwarf_error.c:58 libdwfl/libdwflP.h:52 #: libelf/elf_error.c:63 msgid "unknown error" -msgstr "不明なエラー" +msgstr "不明なエラーです" #: libdw/dwarf_error.c:59 msgid "invalid access" -msgstr "不当なアクセス" +msgstr "不当なアクセスです" #: libdw/dwarf_error.c:60 msgid "no regular file" @@ -111,11 +111,11 @@ #: libdw/dwarf_error.c:61 msgid "I/O error" -msgstr "I/O エラー" +msgstr "I/O エラーです" #: libdw/dwarf_error.c:62 msgid "invalid ELF file" -msgstr "不当な ELF ファイル" +msgstr "不当な ELF ファイルです" #: libdw/dwarf_error.c:63 msgid "no DWARF information" @@ -123,31 +123,31 @@ #: libdw/dwarf_error.c:64 msgid "cannot decompress DWARF" -msgstr "" +msgstr "DWARF を展開できません" #: libdw/dwarf_error.c:65 msgid "no ELF file" -msgstr "ELF ファイルがありません" +msgstr "ELF ファイルではありません" #: libdw/dwarf_error.c:66 msgid "cannot get ELF header" -msgstr "ELF ヘッダーを得られません" +msgstr "ELF ヘッダーを取得できません" #: libdw/dwarf_error.c:68 msgid "not implemented" -msgstr "未実装" +msgstr "未実装です" #: libdw/dwarf_error.c:69 libelf/elf_error.c:111 libelf/elf_error.c:159 msgid "invalid command" -msgstr "不当なコマンド" +msgstr "不当なコマンドです" #: libdw/dwarf_error.c:70 msgid "invalid version" -msgstr "不当なバージョン" +msgstr "不当なバージョンです" #: libdw/dwarf_error.c:71 msgid "invalid file" -msgstr "不当なファイル" +msgstr "不当なファイルです" #: libdw/dwarf_error.c:72 msgid "no entries found" @@ -155,23 +155,23 @@ #: libdw/dwarf_error.c:73 msgid "invalid DWARF" -msgstr "不当な DWARF" +msgstr "不当な DWARFです" #: libdw/dwarf_error.c:74 msgid "no string data" -msgstr "文字データがありません" +msgstr "文字列データではありません" #: libdw/dwarf_error.c:75 msgid ".debug_str section missing" -msgstr "" +msgstr ".debug_str セクションが見つかりません" #: libdw/dwarf_error.c:76 msgid ".debug_line_str section missing" -msgstr "" +msgstr ".debug_line_str セクションが見つかりません" #: libdw/dwarf_error.c:77 msgid ".debug_str_offsets section missing" -msgstr "" +msgstr ".debug_str_offsets セクションが見つかりません" #: libdw/dwarf_error.c:78 msgid "no address value" @@ -179,23 +179,23 @@ #: libdw/dwarf_error.c:79 msgid "no constant value" -msgstr "固定値ではありません" +msgstr "定数値ではありません" #: libdw/dwarf_error.c:80 msgid "no reference value" -msgstr "参照値がありません" +msgstr "参照値ではありません" #: libdw/dwarf_error.c:81 msgid "invalid reference value" -msgstr "不当な参照値" +msgstr "不当な参照値です" #: libdw/dwarf_error.c:82 msgid ".debug_line section missing" -msgstr ".debug_line セクションがありません" +msgstr ".debug_line セクションが見つかりません" #: libdw/dwarf_error.c:83 msgid "invalid .debug_line section" -msgstr "不当な .debug_line セクション" +msgstr "不当な .debug_line セクションです" #: libdw/dwarf_error.c:84 msgid "debug information too big" @@ -203,11 +203,11 @@ #: libdw/dwarf_error.c:85 msgid "invalid DWARF version" -msgstr "不当な DWARF バージョン" +msgstr "不当な DWARF バージョンです" #: libdw/dwarf_error.c:86 msgid "invalid directory index" -msgstr "不当なディレクトリー索引" +msgstr "不当なディレクトリー索引です" #: libdw/dwarf_error.c:87 libdwfl/libdwflP.h:73 msgid "address out of range" @@ -215,15 +215,15 @@ #: libdw/dwarf_error.c:88 msgid ".debug_loc section missing" -msgstr "" +msgstr ".debug_loc セクションが見つかりません" #: libdw/dwarf_error.c:89 msgid ".debug_loclists section missing" -msgstr "" +msgstr ".debug_loclists セクション見つかりません" #: libdw/dwarf_error.c:90 msgid "not a location list value" -msgstr "" +msgstr "ロケーションリスト値ではありません" #: libdw/dwarf_error.c:91 msgid "no block data" @@ -231,89 +231,89 @@ #: libdw/dwarf_error.c:92 msgid "invalid line index" -msgstr "不当な行索引" +msgstr "不当な行索引です" #: libdw/dwarf_error.c:93 msgid "invalid address range index" -msgstr "不当なアドレス範囲索引" +msgstr "不当なアドレス範囲索引です" #: libdw/dwarf_error.c:94 libdwfl/libdwflP.h:74 msgid "no matching address range" -msgstr "アドレス範囲に対応しません" +msgstr "一致するアドレス範囲がありません" #: libdw/dwarf_error.c:95 msgid "no flag value" -msgstr "フラグ値がありません" +msgstr "フラグ値ではありません" #: libdw/dwarf_error.c:96 libelf/elf_error.c:236 msgid "invalid offset" -msgstr "不当なオフセット" +msgstr "不当なオフセットです" #: libdw/dwarf_error.c:97 msgid ".debug_ranges section missing" -msgstr ".debug_ranges セクションがありません" +msgstr ".debug_ranges セクションが見つかりません" #: libdw/dwarf_error.c:98 msgid ".debug_rnglists section missing" -msgstr "" +msgstr ".debug_rnglists セクションが見つかりません" #: libdw/dwarf_error.c:99 msgid "invalid CFI section" -msgstr "不当な CFI セクション" +msgstr "不当な CFI セクションです" #: libdw/dwarf_error.c:100 msgid "no alternative debug link found" -msgstr "" +msgstr "代替デバッグリンクが見つかりません" #: libdw/dwarf_error.c:101 msgid "invalid opcode" -msgstr "" +msgstr "不当なオペコードです" #: libdw/dwarf_error.c:102 msgid "not a CU (unit) DIE" -msgstr "" +msgstr "CU (unit) DIE ではありません" #: libdw/dwarf_error.c:103 msgid "unknown language code" -msgstr "" +msgstr "不明な言語コードです" #: libdw/dwarf_error.c:104 msgid ".debug_addr section missing" -msgstr "" +msgstr ".debug_addr セクションが見つかりません" #: libdwfl/argp-std.c:47 src/stack.c:643 src/unstrip.c:2550 msgid "Input selection options:" -msgstr "選択オプションを入力してください:" +msgstr "入力選択オプション：" #: libdwfl/argp-std.c:48 msgid "Find addresses in FILE" -msgstr "ふぁいる 中のアドレスを探す" +msgstr "FILE の中から アドレスを探す" #: libdwfl/argp-std.c:50 msgid "Find addresses from signatures found in COREFILE" -msgstr "COREFILE 中で見つかった署名からアドレスを探す" +msgstr "COREFILE 中で 見つかった 署名から アドレスを 探す" #: libdwfl/argp-std.c:52 msgid "Find addresses in files mapped into process PID" -msgstr "プロセス PID に対応するファイル中のアドレスを探す" +msgstr "プロセス PID に 対応する ファイル中の アドレスを 探す" #: libdwfl/argp-std.c:54 msgid "" "Find addresses in files mapped as read from FILE in Linux /proc/PID/maps " "format" -msgstr "Linux の /proc/PID/maps 形式の ふぁいる から読み込んだものに対応するファイルのアドレスを探す" +msgstr "Linux の /proc/PID/maps 形式の FILE から 読み込んだ マッピング された ファイル から アドレスを 探す" #: libdwfl/argp-std.c:56 msgid "Find addresses in the running kernel" -msgstr "実行中のカーネルのアドレスを探す" +msgstr "実行中の カーネルから アドレスを 探す" #: libdwfl/argp-std.c:58 msgid "Kernel with all modules" -msgstr "全てのモジュール付きのカーネル" +msgstr "全ての モジュール付きの カーネル" #: libdwfl/argp-std.c:60 src/stack.c:650 msgid "Search path for separate debuginfo files" -msgstr "分離した debuginfo ファイルべきパスを探す" +msgstr "分離された debuginfo ファイルを 探索する パス" #: libdwfl/argp-std.c:161 msgid "only one of -e, -p, -k, -K, or --core allowed" @@ -326,20 +326,20 @@ #. Non-fatal to have no modules since we do have the kernel. #: libdwfl/argp-std.c:238 msgid "cannot find kernel modules" -msgstr "カーネルモジュールを見つけられません" +msgstr "カーネルモジュールが見つかりません" #: libdwfl/argp-std.c:255 msgid "cannot find kernel or modules" -msgstr "カーネルかモジュールを見つけられません" +msgstr "カーネルまたはモジュールが見つかりません" #: libdwfl/argp-std.c:294 #, c-format msgid "cannot read ELF core file: %s" -msgstr "ELF コアファイルを読めません: %s" +msgstr "ELF コアファイルを読み込めません: %s" #: libdwfl/argp-std.c:317 msgid "Not enough memory" -msgstr "" +msgstr "メモリーが十分ではありません" #: libdwfl/argp-std.c:327 msgid "No modules recognized in core file" @@ -347,155 +347,155 @@ #: libdwfl/libdwflP.h:54 msgid "See errno" -msgstr "" +msgstr "errno を参照してください" #: libdwfl/libdwflP.h:55 msgid "See elf_errno" -msgstr "" +msgstr "elf_errno を参照してください" #: libdwfl/libdwflP.h:56 msgid "See dwarf_errno" -msgstr "" +msgstr "dwarf_errno を参照してください" #: libdwfl/libdwflP.h:57 msgid "See ebl_errno (XXX missing)" -msgstr "" +msgstr "ebl_errno を参照してください（XXX が見つかりません）" #: libdwfl/libdwflP.h:58 msgid "gzip decompression failed" -msgstr "" +msgstr "gzip の展開に失敗しました" #: libdwfl/libdwflP.h:59 msgid "bzip2 decompression failed" -msgstr "" +msgstr "bzip2 の展開に失敗しました" #: libdwfl/libdwflP.h:60 msgid "LZMA decompression failed" -msgstr "" +msgstr "LZMA の展開に失敗しました" #: libdwfl/libdwflP.h:62 msgid "no support library found for machine" -msgstr "" +msgstr "マシン用のサポートライブラリが見つかりません" #: libdwfl/libdwflP.h:63 msgid "Callbacks missing for ET_REL file" -msgstr "" +msgstr "ET_REL ファイル用のコールバックが見つかりません" #: libdwfl/libdwflP.h:64 msgid "Unsupported relocation type" -msgstr "" +msgstr "未対応のリロケーションタイプです" #: libdwfl/libdwflP.h:65 msgid "r_offset is bogus" -msgstr "" +msgstr "r_offset が偽物です" #: libdwfl/libdwflP.h:66 libelf/elf_error.c:115 libelf/elf_error.c:175 msgid "offset out of range" -msgstr "オフセットが範囲を越えている" +msgstr "オフセットが範囲外です" #: libdwfl/libdwflP.h:67 msgid "relocation refers to undefined symbol" -msgstr "" +msgstr "リロケーションが未定義シンボルを参照しています" #: libdwfl/libdwflP.h:68 msgid "Callback returned failure" -msgstr "" +msgstr "コールバックが失敗を返しました" #: libdwfl/libdwflP.h:69 msgid "No DWARF information found" -msgstr "" +msgstr "DWARF 情報が見つかりません" #: libdwfl/libdwflP.h:70 msgid "No symbol table found" -msgstr "" +msgstr "シンボルテーブルが見つかりません" #: libdwfl/libdwflP.h:71 msgid "No ELF program headers" -msgstr "" +msgstr "ELF プログラムヘッダーではありません" #: libdwfl/libdwflP.h:72 msgid "address range overlaps an existing module" -msgstr "" +msgstr "アドレス範囲が既存モジュールと重なります" #: libdwfl/libdwflP.h:75 msgid "image truncated" -msgstr "" +msgstr "イメージが切り詰められています" #: libdwfl/libdwflP.h:76 msgid "ELF file opened" -msgstr "" +msgstr "既に ELF ファイルを開いています" #: libdwfl/libdwflP.h:77 msgid "not a valid ELF file" -msgstr "" +msgstr "不当な ELF ファイルです" #: libdwfl/libdwflP.h:78 msgid "cannot handle DWARF type description" -msgstr "" +msgstr "DWARF type description を操作できません" #: libdwfl/libdwflP.h:79 msgid "ELF file does not match build ID" -msgstr "" +msgstr "ELF ファイルがビルド ID と一致しません" #: libdwfl/libdwflP.h:80 msgid "corrupt .gnu.prelink_undo section data" -msgstr "" +msgstr ".gnu.prelink_undo セクションデータが壊れています" #: libdwfl/libdwflP.h:81 msgid "Internal error due to ebl" -msgstr "" +msgstr "ebl に起因する内部エラー" #: libdwfl/libdwflP.h:82 msgid "Missing data in core file" -msgstr "" +msgstr "コアファイルの中にデータが見つかりません" #: libdwfl/libdwflP.h:83 msgid "Invalid register" -msgstr "" +msgstr "不当なレジスターです" #: libdwfl/libdwflP.h:84 msgid "Error reading process memory" -msgstr "" +msgstr "プロセスメモリーの読み込みエラーです" #: libdwfl/libdwflP.h:85 msgid "Couldn't find architecture of any ELF" -msgstr "" +msgstr "ELF のアーキテクチャが１つも見つかりませんでした" #: libdwfl/libdwflP.h:86 msgid "Error parsing /proc filesystem" -msgstr "" +msgstr "/proc ファイルシステムのパースエラーです" #: libdwfl/libdwflP.h:87 msgid "Invalid DWARF" -msgstr "" +msgstr "不当な DWARF です" #: libdwfl/libdwflP.h:88 msgid "Unsupported DWARF" -msgstr "" +msgstr "未対応の DWARF です" #: libdwfl/libdwflP.h:89 msgid "Unable to find more threads" -msgstr "" +msgstr "これ以上スレッドが見つかりません" #: libdwfl/libdwflP.h:90 msgid "Dwfl already has attached state" -msgstr "" +msgstr "Dwfl は既にアタッチ状態です" #: libdwfl/libdwflP.h:91 msgid "Dwfl has no attached state" -msgstr "" +msgstr "Dwfl はアタッチ状態ではありません" #: libdwfl/libdwflP.h:92 msgid "Unwinding not supported for this architecture" -msgstr "" +msgstr "このアーキテクチャに対応していない巻き戻しです" #: libdwfl/libdwflP.h:93 msgid "Invalid argument" -msgstr "" +msgstr "不当な引数です" #: libdwfl/libdwflP.h:94 msgid "Not an ET_CORE ELF file" -msgstr "" +msgstr "ET_CORE ELF ファイルではありません" #: libebl/eblbackendname.c:41 msgid "No backend" @@ -516,12 +516,12 @@ #: libebl/eblobjnote.c:58 #, c-format msgid "unknown SDT version %u\n" -msgstr "" +msgstr "不明な SDT バージョン %u です\n" #: libebl/eblobjnote.c:76 #, c-format msgid "invalid SDT probe descriptor\n" -msgstr "" +msgstr "不当な SDT probe 記述子です\n" #: libebl/eblobjnote.c:126 #, c-format @@ -556,7 +556,7 @@ #: libebl/eblobjnote.c:300 #, c-format msgid " Build ID: " -msgstr " ビルト ID: " +msgstr " ビルド ID: " #. A non-null terminated version string. #: libebl/eblobjnote.c:311 @@ -580,96 +580,96 @@ #: libelf/elf_error.c:67 msgid "unknown version" -msgstr "不明なバージョン" +msgstr "不明なバージョンです" #: libelf/elf_error.c:71 msgid "unknown type" -msgstr "不明なタイプ" +msgstr "不明なタイプです" #: libelf/elf_error.c:75 msgid "invalid `Elf' handle" -msgstr "無効な `Elf' の処理" +msgstr "無効な `Elf' のハンドルです" #: libelf/elf_error.c:79 msgid "invalid size of source operand" -msgstr "ソース演算子の大きさが無効" +msgstr "ソース演算子の大きさが無効です" #: libelf/elf_error.c:83 msgid "invalid size of destination operand" -msgstr "宛先演算子の大きさが無効" +msgstr "宛先演算子の大きさが無効です" -#: libelf/elf_error.c:87 src/readelf.c:6217 +#: libelf/elf_error.c:87 src/readelf.c:6215 #, c-format msgid "invalid encoding" -msgstr "無効なエンコード" +msgstr "無効なエンコードです" #: libelf/elf_error.c:95 msgid "invalid file descriptor" -msgstr "不当なファイル記述子" +msgstr "不当なファイル記述子です" #: libelf/elf_error.c:99 msgid "invalid ELF file data" -msgstr "" +msgstr "不当な ELF ファイルデータです" #: libelf/elf_error.c:103 msgid "invalid operation" -msgstr "不当な操作" +msgstr "不当な操作です" #: libelf/elf_error.c:107 msgid "ELF version not set" -msgstr "ELF のバージョンが設定されていない" +msgstr "ELF のバージョンが設定されていません" #: libelf/elf_error.c:119 msgid "invalid fmag field in archive header" -msgstr "アーカイブヘッダーの不当な fmag 領域" +msgstr "アーカイブヘッダーの不当な fmag 領域です" #: libelf/elf_error.c:123 msgid "invalid archive file" -msgstr "不当なアーカイブファイル" +msgstr "不当なアーカイブファイルです" #: libelf/elf_error.c:127 msgid "descriptor is not for an archive" -msgstr "記述子はアーカイブ用ではありません" +msgstr "記述子がアーカイブ用ではありません" #: libelf/elf_error.c:131 msgid "no index available" -msgstr "索引が使えません" +msgstr "利用できる索引がありません" #: libelf/elf_error.c:135 msgid "cannot read data from file" -msgstr "ファイルからデータを読みません" +msgstr "ファイルからデータを読み込めません" #: libelf/elf_error.c:139 msgid "cannot write data to file" -msgstr "ファイルへデータを書けません" +msgstr "ファイルへデータを書き込めません" #: libelf/elf_error.c:143 msgid "invalid binary class" -msgstr "不当なバイナリークラス" +msgstr "不当なバイナリークラスです" #: libelf/elf_error.c:147 msgid "invalid section index" -msgstr "不当なセクション索引" +msgstr "不当なセクション索引です" #: libelf/elf_error.c:151 msgid "invalid operand" -msgstr "不当なオペランド" +msgstr "不当なオペランドです" #: libelf/elf_error.c:155 msgid "invalid section" -msgstr "不当なセクション" +msgstr "不当なセクションです" #: libelf/elf_error.c:163 msgid "executable header not created first" -msgstr "エクゼキュータブルヘッダーが最初に作られていません" +msgstr "実行可能ヘッダーが最初に作られていません" #: libelf/elf_error.c:167 msgid "file descriptor disabled" -msgstr "ファイル記述子が機能しません" +msgstr "ファイル記述子が無効化されています" #: libelf/elf_error.c:171 msgid "archive/member file descriptor mismatch" -msgstr "" +msgstr "アーカイブ/メンバーのファイル記述子の不整合です" #: libelf/elf_error.c:179 msgid "cannot manipulate null section" @@ -677,21 +677,21 @@ #: libelf/elf_error.c:183 msgid "data/scn mismatch" -msgstr "データ/scnが不整合です" +msgstr "データ/scnの不整合です" #: libelf/elf_error.c:187 msgid "invalid section header" -msgstr "不当なセクションヘッダー" +msgstr "不当なセクションヘッダーです" -#: libelf/elf_error.c:191 src/readelf.c:10023 src/readelf.c:10623 -#: src/readelf.c:10724 src/readelf.c:10906 +#: libelf/elf_error.c:191 src/readelf.c:10093 src/readelf.c:10693 +#: src/readelf.c:10794 src/readelf.c:10976 #, c-format msgid "invalid data" -msgstr "不当なデータ" +msgstr "不当なデータです" #: libelf/elf_error.c:195 msgid "unknown data encoding" -msgstr "不明なデータエンコード" +msgstr "不明なデータエンコードです" #: libelf/elf_error.c:199 msgid "section `sh_size' too small for data" @@ -699,15 +699,15 @@ #: libelf/elf_error.c:203 msgid "invalid section alignment" -msgstr "不当なセクション調整" +msgstr "不当なセクションアラインメントです" #: libelf/elf_error.c:207 msgid "invalid section entry size" -msgstr "不当なセクション項目の大きさ" +msgstr "不当なセクション項目の大きさです" #: libelf/elf_error.c:211 msgid "update() for write on read-only file" -msgstr "読込み専用ファイルでの書込みのための update()" +msgstr "読み込み専用ファイルへの書き込みの update() です" #: libelf/elf_error.c:215 msgid "no such file" @@ -715,12 +715,12 @@ #: libelf/elf_error.c:219 msgid "only relocatable files can contain section groups" -msgstr "リロケータブルファイルのみセクショングループを含むことができます" +msgstr "リロケータブルファイルのみがセクショングループを含むことができます" #: libelf/elf_error.c:224 msgid "" "program header only allowed in executables, shared objects, and core files" -msgstr "プログラムヘッダーはエクゼキュータブルか、共用オブジェクト、コアファイルにのみ認められています" +msgstr "プログラムヘッダーは、実行可能ファイル、共有オブジェクト、コアファイルにのみ認められています" #: libelf/elf_error.c:231 msgid "file has no program header" @@ -728,96 +728,96 @@ #: libelf/elf_error.c:241 msgid "invalid section type" -msgstr "" +msgstr "不当なセクションタイプです" #: libelf/elf_error.c:246 msgid "invalid section flags" -msgstr "" +msgstr "不当なセクションフラグです" #: libelf/elf_error.c:251 msgid "section does not contain compressed data" -msgstr "" +msgstr "セクションが圧縮データを含んでいません" #: libelf/elf_error.c:256 msgid "section contains compressed data" -msgstr "" +msgstr "セクションが圧縮データを含んでいます" #: libelf/elf_error.c:261 msgid "unknown compression type" -msgstr "" +msgstr "不明な圧縮タイプです" #: libelf/elf_error.c:266 msgid "cannot compress data" -msgstr "" +msgstr "データを圧縮できません" #: libelf/elf_error.c:271 msgid "cannot decompress data" -msgstr "" +msgstr "データを展開できません" #: src/addr2line.c:57 msgid "Input format options:" -msgstr "" +msgstr "入力フォーマットオプション：" #: src/addr2line.c:59 msgid "Treat addresses as offsets relative to NAME section." -msgstr "" +msgstr "アドレスを NAME セクションに 対する 相対 オフセット として 扱う" #: src/addr2line.c:61 msgid "Output format options:" -msgstr "" +msgstr "出力フォーマットオプション：" #: src/addr2line.c:62 msgid "Print address before each entry" -msgstr "" +msgstr "各項目の前にアドレスを表示" #: src/addr2line.c:63 msgid "Show only base names of source files" -msgstr "" +msgstr "ソースファイルの ベースネーム のみ 表示" #: src/addr2line.c:65 msgid "Show absolute file names using compilation directory" -msgstr "" +msgstr "コンパイルディレクトリを 使用して 絶対ファイル名を 表示" #: src/addr2line.c:66 msgid "Also show function names" -msgstr "" +msgstr "関数名も表示" #: src/addr2line.c:67 msgid "Also show symbol or section names" -msgstr "" +msgstr "シンボル名 または セクション名も 表示" #: src/addr2line.c:68 msgid "Also show symbol and the section names" -msgstr "" +msgstr "シンボル名と セクション名も 表示" #: src/addr2line.c:69 msgid "Also show line table flags" -msgstr "" +msgstr "行テーブルフラグも表示" #: src/addr2line.c:71 msgid "" "Show all source locations that caused inline expansion of subroutines at the " "address." -msgstr "" +msgstr "アドレスの サブルーチンの インライン展開を 引き起こした 全ての ソース位置を 表示" #: src/addr2line.c:74 msgid "Show demangled symbols (ARG is always ignored)" -msgstr "" +msgstr "デマングルされた シンボルを 表示 （ARGは常に無視される）" #: src/addr2line.c:76 msgid "Print all information on one line, and indent inlines" -msgstr "" +msgstr "全ての 情報を 一行で 表示し、 字下げする" -#: src/addr2line.c:78 src/elfcmp.c:70 src/findtextrel.c:65 src/nm.c:100 +#: src/addr2line.c:78 src/elfcmp.c:70 src/findtextrel.c:66 src/nm.c:100 #: src/strings.c:78 msgid "Miscellaneous:" -msgstr "雑則:" +msgstr "Misc:" #. Short description of program. #: src/addr2line.c:86 msgid "" "Locate source files and line information for ADDRs (in a.out by default)." -msgstr "" +msgstr "ADDR のソースファイルと行の情報を 検索する （デフォルトでは a.out から）" #. Strings for arguments in help texts. #: src/addr2line.c:90 @@ -837,7 +837,7 @@ #: src/addr2line.c:652 #, c-format msgid "cannot find symbol '%s'" -msgstr "" +msgstr "シンボル '%s' が見つかりません" #: src/addr2line.c:657 #, c-format @@ -846,7 +846,7 @@ #: src/ar.c:67 msgid "Commands:" -msgstr "コマンド:" +msgstr "コマンド：" #: src/ar.c:68 msgid "Delete files from archive." @@ -862,23 +862,23 @@ #: src/ar.c:71 msgid "Quick append files to archive." -msgstr "アーカイブへの即座のファイル追加。" +msgstr "アーカイブへ ファイルを 素早く 追加。" #: src/ar.c:73 msgid "Replace existing or insert new file into archive." -msgstr "アーカイブへの既存のファイルの置き換えか、新しいファイルの挿入。" +msgstr "アーカイブの既存ファイルの置き換えまたは新しいファイルの挿入。" #: src/ar.c:74 msgid "Display content of archive." -msgstr "アーカイブの内容の表示" +msgstr "アーカイブの内容の表示。" #: src/ar.c:75 msgid "Extract files from archive." -msgstr "アーカイブからのファイルの取出し" +msgstr "アーカイブからのファイルの取出し。" #: src/ar.c:77 msgid "Command Modifiers:" -msgstr "コマンド修飾子:" +msgstr "コマンド修飾子：" #: src/ar.c:78 msgid "Preserve original dates." @@ -890,11 +890,11 @@ #: src/ar.c:81 msgid "Do not replace existing files with extracted files." -msgstr "既存のファイルを抽出したファイルで置き換えない。" +msgstr "抽出したファイルで既存のファイルを置き換えない。" #: src/ar.c:82 msgid "Allow filename to be truncated if necessary." -msgstr "必要ならばファイル名の切り捨てを認める。" +msgstr "必要ならば ファイル名の 切り詰めを 認める。" #: src/ar.c:84 msgid "Provide verbose output." @@ -918,7 +918,7 @@ #: src/ar.c:89 msgid "Suppress message when library has to be created." -msgstr "ライブラリーを生成しなければならない時にメッセージを抑止する。" +msgstr "ライブラリーを 生作成なければ ならない時に メッセージを 抑止する。" #: src/ar.c:91 msgid "Use full path for file matching." @@ -926,12 +926,12 @@ #: src/ar.c:92 msgid "Update only older files in archive." -msgstr "アーカイブの古いファイルのみ更新する。" +msgstr "アーカイブの 古い ファイルのみ 更新する。" #. Short description of program. #: src/ar.c:98 msgid "Create, modify, and extract from archives." -msgstr "アーカイブから作成や、修正、抽出する。" +msgstr "アーカイブの作成や修正、アーカイブからの抽出を行う。" #. Strings for arguments in help texts. #: src/ar.c:101 @@ -961,7 +961,7 @@ #: src/ar.c:218 #, c-format msgid "invalid COUNT parameter %s" -msgstr "不当な COUNT パラメーター %s" +msgstr "不当な COUNT パラメーター %s です" #: src/ar.c:225 #, c-format @@ -976,7 +976,7 @@ #: src/ar.c:244 #, c-format msgid "command option required" -msgstr "" +msgstr "コマンドオプションが必要です" #: src/ar.c:295 #, c-format @@ -986,7 +986,7 @@ #: src/ar.c:389 #, c-format msgid "cannot open archive '%s'" -msgstr "アーカイブ '%s' を開くことができません" +msgstr "アーカイブ '%s' を開けません" #: src/ar.c:399 #, c-format @@ -1001,7 +1001,7 @@ #: src/ar.c:407 #, c-format msgid "cannot stat archive '%s'" -msgstr "アーカイブに stat できません: '%s'" +msgstr "アーカイブ '%s' を stat できません" #: src/ar.c:419 #, c-format @@ -1011,22 +1011,22 @@ #: src/ar.c:472 src/ar.c:927 src/ar.c:1134 #, c-format msgid "cannot create hash table" -msgstr "ハッシュテーブルを生成できません" +msgstr "ハッシュテーブルを作成できません" #: src/ar.c:479 src/ar.c:934 src/ar.c:1143 #, c-format msgid "cannot insert into hash table" -msgstr "ハッシュに挿入できません" +msgstr "ハッシュテーブルに挿入できません" #: src/ar.c:487 src/ranlib.c:148 #, c-format msgid "cannot stat '%s'" -msgstr "'%s' に stat できません" +msgstr "'%s' を stat できません" #: src/ar.c:589 #, c-format msgid "cannot read content of %s: %s" -msgstr "%s の内容を読むことができません: %s" +msgstr "%s の内容を読み込めません: %s" #: src/ar.c:632 #, c-format @@ -1036,7 +1036,7 @@ #: src/ar.c:654 #, c-format msgid "failed to write %s" -msgstr "%s への書込みに失敗しました" +msgstr "%s への書き込みに失敗しました" #: src/ar.c:666 #, c-format @@ -1056,7 +1056,7 @@ #: src/ar.c:764 src/ar.c:1019 src/ar.c:1423 src/ranlib.c:222 #, c-format msgid "cannot create new file" -msgstr "新しいファイルを生成できません" +msgstr "新しいファイルを作成できません" #: src/ar.c:1225 #, c-format @@ -1086,50 +1086,50 @@ #: src/ar.c:1288 #, c-format msgid "cannot get ELF descriptor for %s: %s\n" -msgstr "%s の ELF 記述子を得られません: %s\n" +msgstr "%s の ELF 記述子を取得できません: %s\n" #: src/ar.c:1308 #, c-format msgid "cannot read %s: %s" -msgstr "%s を読みません: %s" +msgstr "%s を読み込めません: %s" #: src/ar.c:1483 #, c-format msgid "cannot represent ar_date" -msgstr "" +msgstr "ar_date を表現できません" #: src/ar.c:1489 #, c-format msgid "cannot represent ar_uid" -msgstr "" +msgstr "ar_uid を表現できません" #: src/ar.c:1495 #, c-format msgid "cannot represent ar_gid" -msgstr "" +msgstr "ar_gid を表現できません" #: src/ar.c:1501 #, c-format msgid "cannot represent ar_mode" -msgstr "" +msgstr "ar_mode を表現できません" #: src/ar.c:1507 #, c-format msgid "cannot represent ar_size" -msgstr "" +msgstr "ar_size を表現できません" #: src/arlib-argp.c:32 msgid "Use zero for uid, gid, and date in archive members." -msgstr "" +msgstr "アーカイブメンバの uid、 gid、 日付に ゼロを 使用する。" #: src/arlib-argp.c:34 msgid "Use actual uid, gid, and date in archive members." -msgstr "" +msgstr "アーカイブメンバに 実際のuid、 gid、 日付を 使用する。" #: src/arlib-argp.c:63 #, c-format msgid "%s (default)" -msgstr "" +msgstr "%s （デフォルト）" #. The archive is too big. #: src/arlib.c:213 @@ -1140,38 +1140,38 @@ #: src/arlib.c:226 #, c-format msgid "cannot read ELF header of %s(%s): %s" -msgstr "%s(%s) の ELF ヘッダーを読めません: %s" +msgstr "%s(%s) の ELF ヘッダーを読み込めません: %s" #: src/elfcmp.c:60 msgid "Control options:" -msgstr "" +msgstr "制御オプション：" #: src/elfcmp.c:62 msgid "Output all differences, not just the first" -msgstr "" +msgstr "最初のものに限らず、 全ての差異を 出力する" #: src/elfcmp.c:63 msgid "" "Control treatment of gaps in loadable segments [ignore|match] (default: " "ignore)" -msgstr "" +msgstr "ロード可能セグメントの gap の 扱いを 制御する [ignore|match] （デフォルト： ignore）" #: src/elfcmp.c:65 msgid "Ignore permutation of buckets in SHT_HASH section" -msgstr "" +msgstr "SHT_HASH セクションの バケットの 並べ替えを 無視" #: src/elfcmp.c:67 msgid "Ignore differences in build ID" -msgstr "" +msgstr "ビルド ID の差異を 無視" #: src/elfcmp.c:68 msgid "Output nothing; yield exit status only" -msgstr "" +msgstr "何も出力しない。 終了ステータスのみを生じさせる" #. Short description of program. #: src/elfcmp.c:75 msgid "Compare relevant parts of two ELF files for equality." -msgstr "" +msgstr "２つの ELF ファイルの 関連のある部分の 等価性を 比較する。" #. Strings for arguments in help texts. #: src/elfcmp.c:79 @@ -1180,12 +1180,12 @@ #: src/elfcmp.c:141 msgid "Invalid number of parameters.\n" -msgstr "" +msgstr "不当なパラメータ数です\n" #: src/elfcmp.c:172 src/elfcmp.c:177 #, c-format msgid "cannot get ELF header of '%s': %s" -msgstr "" +msgstr "'%s' の ELF ヘッダーを取得できません: %s" #: src/elfcmp.c:203 #, c-format @@ -1195,7 +1195,7 @@ #: src/elfcmp.c:210 src/elfcmp.c:213 #, c-format msgid "cannot get section count of '%s': %s" -msgstr "" +msgstr "'%s' のセクションヘッダー数を取得できません: %s" #: src/elfcmp.c:218 #, c-format @@ -1205,7 +1205,7 @@ #: src/elfcmp.c:225 src/elfcmp.c:228 #, c-format msgid "cannot get program header count of '%s': %s" -msgstr "" +msgstr "'%s' のプログラムヘッダー数を取得できません: %s" #: src/elfcmp.c:233 #, c-format @@ -1215,7 +1215,7 @@ #: src/elfcmp.c:241 src/elfcmp.c:244 #, c-format msgid "cannot get hdrstrndx of '%s': %s" -msgstr "" +msgstr "'%s' の hdrstrndx を取得できません: %s" #: src/elfcmp.c:249 #, c-format @@ -1245,7 +1245,7 @@ #: src/elfcmp.c:365 src/elfcmp.c:371 #, c-format msgid "cannot get symbol in '%s': %s" -msgstr "" +msgstr "'%s' のシンボルを取得できません: %s" #: src/elfcmp.c:393 #, c-format @@ -1310,7 +1310,7 @@ #: src/elfcmp.c:595 src/elfcmp.c:600 #, c-format msgid "cannot load data of '%s': %s" -msgstr "" +msgstr "'%s' のデータをロードできません: %s" #: src/elfcmp.c:619 src/elfcmp.c:625 #, c-format @@ -1330,39 +1330,39 @@ #: src/elfcmp.c:706 #, c-format msgid "Invalid value '%s' for --gaps parameter." -msgstr "" +msgstr "--gaps パラメータ に対する不当な値 '%s' です" -#: src/elfcmp.c:734 src/findtextrel.c:205 src/nm.c:364 src/ranlib.c:141 -#: src/size.c:272 src/strings.c:185 src/strip.c:1030 src/strip.c:1067 -#: src/unstrip.c:2195 src/unstrip.c:2224 +#: src/elfcmp.c:734 src/findtextrel.c:195 src/nm.c:364 src/ranlib.c:141 +#: src/size.c:272 src/strings.c:185 src/strip.c:1035 src/strip.c:1072 +#: src/unstrip.c:2197 src/unstrip.c:2226 #, c-format msgid "cannot open '%s'" msgstr "'%s' を開けません" -#: src/elfcmp.c:738 src/findtextrel.c:212 src/ranlib.c:158 +#: src/elfcmp.c:738 src/findtextrel.c:214 src/ranlib.c:158 #, c-format msgid "cannot create ELF descriptor for '%s': %s" -msgstr "" +msgstr "'%s' の ELF 記述子を作成できません: %s" #: src/elfcmp.c:743 #, c-format msgid "cannot create EBL descriptor for '%s'" -msgstr "" +msgstr "'%s' の EBL 記述子を作成できません" -#: src/elfcmp.c:761 src/findtextrel.c:394 +#: src/elfcmp.c:761 src/findtextrel.c:385 #, c-format msgid "cannot get section header of section %zu: %s" -msgstr "" +msgstr "セクション %zu のセクションヘッダーを取得できません: %s" #: src/elfcmp.c:771 #, c-format msgid "cannot get content of section %zu: %s" -msgstr "" +msgstr "セクション %zu の内容を取得できません: %s" #: src/elfcmp.c:781 src/elfcmp.c:795 #, c-format msgid "cannot get relocation: %s" -msgstr "" +msgstr "リロケーションを取得できません: %s" #: src/elfcompress.c:117 src/strip.c:308 src/unstrip.c:117 #, c-format @@ -1372,27 +1372,27 @@ #: src/elfcompress.c:124 #, c-format msgid "-t option specified twice" -msgstr "" +msgstr "-t オプションが 2 回指定されています" #: src/elfcompress.c:133 #, c-format msgid "unknown compression type '%s'" -msgstr "" +msgstr "不明な圧縮タイプ '%s'" #. We need at least one input file. #: src/elfcompress.c:145 src/elfcompress.c:1345 #, c-format msgid "No input file given" -msgstr "" +msgstr "入力ファイルが与えられていません" #: src/elfcompress.c:151 src/elfcompress.c:1350 #, c-format msgid "Only one input file allowed together with '-o'" -msgstr "" +msgstr "'-o' と一緒の場合は入力ファイルは 1 つしか認められません" #: src/elfcompress.c:1307 msgid "Place (de)compressed output into FILE" -msgstr "" +msgstr "圧縮（展開）した出力を FILE に置く" #: src/elfcompress.c:1310 msgid "" @@ -1405,11 +1405,11 @@ msgid "" "SECTION name to (de)compress, SECTION is an extended wildcard pattern " "(defaults to '.?(z)debug*')" -msgstr "" +msgstr "圧縮（展開）する セクション名。 SECTION は 拡張 ワイルドカード パターン（デフォルトで '.?(z)debug*'）" #: src/elfcompress.c:1316 msgid "Print a message for each section being (de)compressed" -msgstr "" +msgstr "圧縮（展開） されている 各セクション に対する メッセージを 表示" #: src/elfcompress.c:1319 msgid "" @@ -1423,25 +1423,25 @@ #: src/elfcompress.c:1325 msgid "Be silent when a section cannot be compressed" -msgstr "" +msgstr "セクションを圧縮できないときに静かにする" #. Strings for arguments in help texts. -#: src/elfclassify.c:980 src/elfcompress.c:1334 src/elflint.c:77 +#: src/elfclassify.c:979 src/elfcompress.c:1334 src/elflint.c:77 #: src/readelf.c:158 msgid "FILE..." msgstr "ふぁいる..." #: src/elfcompress.c:1335 msgid "Compress or decompress sections in an ELF file." -msgstr "" +msgstr "ELF ファイルの セクションを 圧縮 または 展開する" #: src/elflint.c:63 msgid "Be extremely strict, flag level 2 features." -msgstr "非常に厳密にやってください、フラグレベル 2 機能。" +msgstr "非常に厳格にする。 フラグレベル 2 機能。" #: src/elflint.c:64 msgid "Do not print anything if successful" -msgstr "成功したら何も印刷しない" +msgstr "成功した場合は何も表示しない" #: src/elflint.c:65 msgid "Binary is a separate debuginfo file" @@ -1451,7 +1451,7 @@ msgid "" "Binary has been created with GNU ld and is therefore known to be broken in " "certain ways" -msgstr "バイナリーは GNU ld で作成され、従ってある方法で壊れているのが知られている" +msgstr "バイナリーは GNU ld で作成され、 従って、 ある方法で 壊れることが 知られている" #. Short description of program. #: src/elflint.c:73 @@ -1484,7 +1484,7 @@ #: src/elflint.c:284 #, c-format msgid " error while freeing sub-ELF descriptor: %s\n" -msgstr " 副-ELF 記述子を解放している時にエラー: %s\n" +msgstr " sub-ELF 記述子を解放している時にエラー: %s\n" #. We cannot do anything. #: src/elflint.c:292 @@ -1515,7 +1515,7 @@ #: src/elflint.c:380 #, c-format msgid "unsupported ABI version e_ident[%d] == %d\n" -msgstr "" +msgstr "不明な ABI バージョン e_ident[%d] == %d\n" #: src/elflint.c:385 #, c-format @@ -1580,7 +1580,7 @@ #: src/elflint.c:487 #, c-format msgid "invalid number of program header table entries\n" -msgstr "" +msgstr "プログラムヘッダー項目数として不当な数\n" #: src/elflint.c:504 #, c-format @@ -1628,7 +1628,7 @@ #, c-format msgid "" "section [%2d] '%s': section group [%2zu] '%s' does not precede group member\n" -msgstr "" +msgstr "セクション [%2d] '%s': セクショングループ [%2zu] '%s' がグループメンバーより前にありません\n" #: src/elflint.c:610 src/elflint.c:1498 src/elflint.c:1549 src/elflint.c:1655 #: src/elflint.c:1991 src/elflint.c:2317 src/elflint.c:2943 src/elflint.c:3106 @@ -3207,125 +3207,125 @@ msgid "text relocation flag set but not needed\n" msgstr "" -#: src/findtextrel.c:60 +#: src/findtextrel.c:61 msgid "Input Selection:" -msgstr "" +msgstr "入力選択：" -#: src/findtextrel.c:61 +#: src/findtextrel.c:62 msgid "Prepend PATH to all file names" -msgstr "" +msgstr "全ての ファイル名に対して PATH を先頭に 付け加える" -#: src/findtextrel.c:63 +#: src/findtextrel.c:64 msgid "Use PATH as root of debuginfo hierarchy" -msgstr "" +msgstr "debuginfo 階層の ルートとして PATH を使用する" #. Short description of program. -#: src/findtextrel.c:70 +#: src/findtextrel.c:71 msgid "Locate source of text relocations in FILEs (a.out by default)." -msgstr "" +msgstr "FILE （デフォルトでは a.out）の テキスト リロケーションの ソースを 検索する" #. Strings for arguments in help texts. -#: src/findtextrel.c:74 src/nm.c:108 src/objdump.c:71 src/size.c:80 +#: src/findtextrel.c:75 src/nm.c:108 src/objdump.c:71 src/size.c:80 #: src/strings.c:87 src/strip.c:101 msgid "[FILE...]" msgstr "[ふぁいる...]" -#: src/findtextrel.c:222 +#: src/findtextrel.c:224 #, c-format msgid "cannot get ELF header '%s': %s" -msgstr "" +msgstr "ELF ヘッダー '%s' を取得できません: %s" -#: src/findtextrel.c:233 +#: src/findtextrel.c:235 #, c-format msgid "'%s' is not a DSO or PIE" -msgstr "" +msgstr "'%s' は DSO または PIE ではありません" -#: src/findtextrel.c:253 +#: src/findtextrel.c:255 #, c-format msgid "getting get section header of section %zu: %s" msgstr "" -#: src/findtextrel.c:277 +#: src/findtextrel.c:279 #, c-format msgid "cannot read dynamic section: %s" -msgstr "" +msgstr "dynamic セクションを読み込めません: %s" -#: src/findtextrel.c:298 +#: src/findtextrel.c:300 #, c-format msgid "no text relocations reported in '%s'" msgstr "" -#: src/findtextrel.c:310 +#: src/findtextrel.c:311 #, c-format msgid "while reading ELF file" -msgstr "" +msgstr "ELF ファイルの読み込み中" -#: src/findtextrel.c:314 +#: src/findtextrel.c:315 #, c-format msgid "cannot get program header count: %s" -msgstr "" +msgstr "プログラムヘッダー数を取得できません: %s" -#: src/findtextrel.c:325 src/findtextrel.c:342 +#: src/findtextrel.c:326 src/findtextrel.c:341 #, c-format msgid "cannot get program header index at offset %zd: %s" -msgstr "" +msgstr "オフセット %zd に位置するプログラムヘッダー索引を取得できません: %s" -#: src/findtextrel.c:406 +#: src/findtextrel.c:397 #, c-format msgid "cannot get symbol table section %zu in '%s': %s" msgstr "" -#: src/findtextrel.c:427 src/findtextrel.c:450 +#: src/findtextrel.c:418 src/findtextrel.c:441 #, c-format msgid "cannot get relocation at index %d in section %zu in '%s': %s" msgstr "" -#: src/findtextrel.c:516 +#: src/findtextrel.c:507 #, c-format msgid "%s not compiled with -fpic/-fPIC\n" -msgstr "" +msgstr "%s は -fpic/-fPIC 付きでコンパイルされていません\n" -#: src/findtextrel.c:570 +#: src/findtextrel.c:561 #, c-format msgid "" "the file containing the function '%s' is not compiled with -fpic/-fPIC\n" -msgstr "" +msgstr "関数 '%s' を含むファイルは -fpic/-fPIC 付きでコンパイルされていません\n" -#: src/findtextrel.c:577 src/findtextrel.c:597 +#: src/findtextrel.c:568 src/findtextrel.c:588 #, c-format msgid "" "the file containing the function '%s' might not be compiled with -fpic/-" "fPIC\n" -msgstr "" +msgstr "関数 '%s' を含むファイルは -fpic/-fPIC 付きでコンパイルされていないかもしれません\n" -#: src/findtextrel.c:585 +#: src/findtextrel.c:576 #, c-format msgid "" "either the file containing the function '%s' or the file containing the " "function '%s' is not compiled with -fpic/-fPIC\n" -msgstr "" +msgstr "関数 '%s' を含むファイル または 関数 '%s' を含むファイルは -fpic/-fPIC 付きでコンパイルされていません\n" -#: src/findtextrel.c:605 +#: src/findtextrel.c:596 #, c-format msgid "" "a relocation modifies memory at offset %llu in a write-protected segment\n" -msgstr "" +msgstr "リロケーションは 書き込み禁止セグメントの オフセット %llu に位置するメモリを 修正します\n" #: src/nm.c:66 src/strip.c:70 msgid "Output selection:" -msgstr "出力選択:" +msgstr "出力選択：" #: src/nm.c:67 msgid "Display debugger-only symbols" -msgstr "デバッガー専用シンボルを表示" +msgstr "デバッガ専用シンボルを表示" #: src/nm.c:68 msgid "Display only defined symbols" -msgstr "定義されたシンボルのみを表示" +msgstr "定義済みシンボルのみを表示" #: src/nm.c:71 msgid "Display dynamic symbols instead of normal symbols" -msgstr "通常シンボルの代わりに動的シンボルを表示" +msgstr "通常シンボルの 代わりに 動的シンボルを 表示" #: src/nm.c:72 msgid "Display only external symbols" @@ -3337,21 +3337,22 @@ #: src/nm.c:75 msgid "Include index for symbols from archive members" -msgstr "アーカイブメンバーからのシンボルの索引を含める" +msgstr "アーカイブメンバからの シンボルの 索引を 含める" #: src/nm.c:77 src/size.c:54 msgid "Output format:" -msgstr "出力形式:" +msgstr "出力形式：" #: src/nm.c:79 msgid "Print name of the input file before every symbol" -msgstr "全てのシンボルの前に入力ファイル名を印刷" +msgstr "各シンボルの 前に 入力ファイル名を 表示" #: src/nm.c:82 msgid "" "Use the output format FORMAT. FORMAT can be `bsd', `sysv' or `posix'. The " "default is `sysv'" -msgstr "出力形式として FORMATを使う。FORMAT は `bsd'か、`sysv'、`posix' のどれか。省略値は `sysv'" +msgstr "" +"出力形式として FORMAT を使う。 FORMAT は `bsd'、`sysv'、`posix' のいずれか。デフォルトは `sysv'" #: src/nm.c:84 msgid "Same as --format=bsd" @@ -3363,23 +3364,23 @@ #: src/nm.c:86 src/size.c:60 msgid "Use RADIX for printing symbol values" -msgstr "シンボル値を印刷するために RADIX を使う" +msgstr "シンボル値の 表示に RADIX を使う" #: src/nm.c:87 msgid "Mark special symbols" -msgstr "" +msgstr "特別なシンボルに印を点ける" #: src/nm.c:89 msgid "Print size of defined symbols" -msgstr "定義されたシンボルの印刷サイズ" +msgstr "定義済みシンボルのサイズを表示" #: src/nm.c:91 src/size.c:68 src/strip.c:75 src/unstrip.c:69 msgid "Output options:" -msgstr "出力オプション:" +msgstr "出力オプション：" #: src/nm.c:92 msgid "Sort symbols numerically by address" -msgstr "シンボルをアドレスにより数値的に並べ替える" +msgstr "シンボルを アドレスにより 数値的に 並べ替える" #: src/nm.c:94 msgid "Do not sort the symbols" @@ -3391,16 +3392,16 @@ #: src/nm.c:98 msgid "Decode low-level symbol names into source code names" -msgstr "" +msgstr "低水準の シンボル名を ソースコード上の 名前に デコードする" #. Short description of program. #: src/nm.c:105 msgid "List symbols from FILEs (a.out by default)." -msgstr "ふぁいる からシンボルを表示 (デフォルトではa.out)。" +msgstr "FILE のシンボルを一覧表示 (デフォルトではa.out)。" #: src/nm.c:116 src/objdump.c:79 msgid "Output formatting" -msgstr "" +msgstr "出力形式：" #: src/nm.c:140 src/objdump.c:103 src/size.c:105 src/strip.c:133 #, c-format @@ -3408,12 +3409,12 @@ msgstr "" #: src/nm.c:381 src/nm.c:393 src/size.c:288 src/size.c:297 src/size.c:308 -#: src/strip.c:2763 +#: src/strip.c:2767 #, c-format msgid "while closing '%s'" msgstr "'%s' を閉じている最中" -#: src/nm.c:403 src/objdump.c:280 src/strip.c:818 +#: src/nm.c:403 src/objdump.c:280 src/strip.c:822 #, c-format msgid "%s: File format not recognized" msgstr "%s: ファイル形式を認識できませんでした" @@ -3445,24 +3446,24 @@ msgid "%s%s%s: file format not recognized" msgstr "%s%s%s: ファイル形式を認識できません" -#: src/nm.c:705 +#: src/nm.c:704 #, c-format msgid "cannot create search tree" msgstr "検索ツリーを生成できません" -#: src/nm.c:746 src/nm.c:1239 src/objdump.c:782 src/readelf.c:637 +#: src/nm.c:745 src/nm.c:1238 src/objdump.c:781 src/readelf.c:637 #: src/readelf.c:1451 src/readelf.c:1602 src/readelf.c:1803 src/readelf.c:2009 #: src/readelf.c:2199 src/readelf.c:2377 src/readelf.c:2453 src/readelf.c:2719 -#: src/readelf.c:2795 src/readelf.c:2882 src/readelf.c:3480 src/readelf.c:3530 -#: src/readelf.c:3600 src/readelf.c:11339 src/readelf.c:12533 -#: src/readelf.c:12744 src/readelf.c:12813 src/size.c:398 src/size.c:470 -#: src/strip.c:1084 +#: src/readelf.c:2795 src/readelf.c:2882 src/readelf.c:3478 src/readelf.c:3528 +#: src/readelf.c:3598 src/readelf.c:11409 src/readelf.c:12603 +#: src/readelf.c:12814 src/readelf.c:12883 src/size.c:398 src/size.c:470 +#: src/strip.c:1089 #, c-format msgid "cannot get section header string table index" msgstr "セクションヘッダー文字列テーブル索引が得られません" #. We always print this prolog. -#: src/nm.c:771 +#: src/nm.c:770 #, c-format msgid "" "\n" @@ -3476,7 +3477,7 @@ "\n" #. The header line. -#: src/nm.c:774 +#: src/nm.c:773 #, c-format msgid "" "%*s%-*s %-*s Class Type %-*s %*s Section\n" @@ -3485,60 +3486,60 @@ "%*s%-*s %-*s クラス タイプ %-*s %*s セクション\n" "\n" -#: src/nm.c:1250 +#: src/nm.c:1249 #, c-format msgid "%s: entry size in section %zd `%s' is not what we expect" msgstr "" -#: src/nm.c:1255 +#: src/nm.c:1254 #, c-format msgid "%s: size of section %zd `%s' is not multiple of entry size" msgstr "" -#: src/nm.c:1336 +#: src/nm.c:1335 #, c-format msgid "%s: entries (%zd) in section %zd `%s' is too large" msgstr "" #. XXX Add machine specific object file types. -#: src/nm.c:1572 +#: src/nm.c:1571 #, c-format msgid "%s%s%s%s: Invalid operation" msgstr "%s%s%s%s: 不当な操作" -#: src/nm.c:1622 +#: src/nm.c:1621 #, c-format msgid "%s%s%s: no symbols" msgstr "%s%s%s: シンボルがありません" #: src/objdump.c:52 msgid "Mode selection:" -msgstr "" +msgstr "モード選択：" #: src/objdump.c:53 msgid "Display relocation information." -msgstr "" +msgstr "リロケーション 情報の 表示" #: src/objdump.c:55 msgid "Display the full contents of all sections requested" -msgstr "" +msgstr "要求された 全ての セクションの 最大限の 内容を 表示" #: src/objdump.c:57 msgid "Display assembler code of executable sections" -msgstr "" +msgstr "実行可能 セクションの アセンブラコードを 表示" #: src/objdump.c:59 msgid "Output content selection:" -msgstr "" +msgstr "出力内容選択:" #: src/objdump.c:61 msgid "Only display information for section NAME." -msgstr "" +msgstr "NAME セクションの情報のみを表示" #. Short description of program. #: src/objdump.c:67 msgid "Show information from FILEs (a.out by default)." -msgstr "" +msgstr "FILE から情報を表示する （デフォルトでは a.out）" #: src/objdump.c:218 src/readelf.c:582 msgid "No operation specified.\n" @@ -3577,12 +3578,12 @@ #: src/objdump.c:687 #, c-format msgid "cannot disassemble" -msgstr "" +msgstr "逆アセンブルできません" #. Short description of program. #: src/ranlib.c:63 msgid "Generate an index to speed access to archives." -msgstr "" +msgstr "アーカイブへのアクセス加速のための索引生成" #. Strings for arguments in help texts. #: src/ranlib.c:66 @@ -3592,12 +3593,12 @@ #: src/ranlib.c:102 #, c-format msgid "Archive name required" -msgstr "" +msgstr "アーカイブ名が必要です" #: src/ranlib.c:166 #, c-format msgid "'%s' is no archive" -msgstr "" +msgstr "'%s' はアーカイブではありません" #: src/ranlib.c:201 #, c-format @@ -3606,12 +3607,12 @@ #: src/readelf.c:97 msgid "ELF input selection:" -msgstr "" +msgstr "ELF入力選択：" #: src/readelf.c:99 msgid "" "Use the named SECTION (default .gnu_debugdata) as (compressed) ELF input data" -msgstr "" +msgstr "ELF 入力データとして SECTION （デフォルトでは .gnu_debugdata） を使用する" #: src/readelf.c:102 msgid "" @@ -3621,7 +3622,7 @@ #: src/readelf.c:104 msgid "ELF output selection:" -msgstr "" +msgstr "ELF出力選択：" #: src/readelf.c:106 msgid "All these plus -p .strtab -p .dynstr -p .comment" @@ -3637,7 +3638,7 @@ #: src/readelf.c:110 msgid "Display histogram of bucket list lengths" -msgstr "バケットリスト長の柱状図を表示" +msgstr "バケットリスト長のヒストグラムを表示" #: src/readelf.c:111 msgid "Display the program headers" @@ -3649,35 +3650,35 @@ #: src/readelf.c:114 msgid "Display the section groups" -msgstr "" +msgstr "セクショングループを表示" #: src/readelf.c:115 msgid "Display the sections' headers" -msgstr "" +msgstr "セクションヘッダーを表示" #: src/readelf.c:118 msgid "Display the symbol table sections" -msgstr "" +msgstr "シンボルテーブルセクションを表示" #: src/readelf.c:121 msgid "Display versioning information" -msgstr "バージョニング情報の表示" +msgstr "バージョニング情報を表示" #: src/readelf.c:122 msgid "Display the ELF notes" -msgstr "" +msgstr "ELF notes を表示" #: src/readelf.c:124 msgid "Display architecture specific information, if any" -msgstr "" +msgstr "(もしあれば)アーキテクチャー固有の情報を表示" #: src/readelf.c:126 msgid "Display sections for exception handling" -msgstr "例外を取り扱うためのセクションを表示" +msgstr "例外ハンドリングのセクションを表示" #: src/readelf.c:128 msgid "Additional output selection:" -msgstr "" +msgstr "追加の出力選択：" #: src/readelf.c:130 msgid "" @@ -3688,11 +3689,11 @@ #: src/readelf.c:134 msgid "Dump the uninterpreted contents of SECTION, by number or name" -msgstr "数字か名前で解釈できないセクションの内容をダンプする" +msgstr "SECTION の 未解釈の 内容を ダンプする。 番号 または 名前で指定する" #: src/readelf.c:136 msgid "Print string contents of sections" -msgstr "セクションの文字列内容を印刷する" +msgstr "セクションの文字列内容を表示" #: src/readelf.c:139 msgid "Display the symbol index of an archive" @@ -3700,7 +3701,7 @@ #: src/readelf.c:141 msgid "Output control:" -msgstr "出力制御:" +msgstr "出力制御：" #: src/readelf.c:143 msgid "Do not find symbol names for addresses in DWARF data" @@ -3724,7 +3725,7 @@ #. Short description of program. #: src/readelf.c:154 msgid "Print information from ELF file in human-readable form." -msgstr "ELF ファイルから人間が読める形で情報を印刷する。" +msgstr "ELF ファイルから人間が読める形で情報を表示する。" #. Look up once. #: src/readelf.c:350 @@ -3745,7 +3746,7 @@ msgid "cannot generate Elf descriptor: %s" msgstr "Elf 記述子を生成できません: %s" -#: src/readelf.c:628 src/readelf.c:955 src/strip.c:1179 +#: src/readelf.c:628 src/readelf.c:955 src/strip.c:1184 #, c-format msgid "cannot determine number of sections: %s" msgstr "セクション数を決定できません: %s" @@ -3753,37 +3754,37 @@ #: src/readelf.c:646 src/readelf.c:1265 src/readelf.c:1475 #, c-format msgid "cannot get section: %s" -msgstr "セクションを得られません: %s" +msgstr "セクションを取得できません: %s" -#: src/readelf.c:655 src/readelf.c:1272 src/readelf.c:1483 src/readelf.c:12764 -#: src/unstrip.c:397 src/unstrip.c:428 src/unstrip.c:489 src/unstrip.c:610 -#: src/unstrip.c:631 src/unstrip.c:671 src/unstrip.c:887 src/unstrip.c:1222 -#: src/unstrip.c:1349 src/unstrip.c:1373 src/unstrip.c:1429 src/unstrip.c:1470 -#: src/unstrip.c:1663 src/unstrip.c:1814 src/unstrip.c:1957 src/unstrip.c:2056 +#: src/readelf.c:655 src/readelf.c:1272 src/readelf.c:1483 src/readelf.c:12834 +#: src/unstrip.c:397 src/unstrip.c:428 src/unstrip.c:491 src/unstrip.c:612 +#: src/unstrip.c:633 src/unstrip.c:673 src/unstrip.c:889 src/unstrip.c:1224 +#: src/unstrip.c:1351 src/unstrip.c:1375 src/unstrip.c:1431 src/unstrip.c:1472 +#: src/unstrip.c:1665 src/unstrip.c:1816 src/unstrip.c:1959 src/unstrip.c:2058 #, c-format msgid "cannot get section header: %s" -msgstr "セクションヘッダーを得られません: %s" +msgstr "セクションヘッダーを取得できません: %s" #: src/readelf.c:663 #, c-format msgid "cannot get section name" -msgstr "" +msgstr "セクション名を取得できません" -#: src/readelf.c:672 src/readelf.c:6636 src/readelf.c:10611 src/readelf.c:10713 -#: src/readelf.c:10891 +#: src/readelf.c:672 src/readelf.c:6634 src/readelf.c:10681 src/readelf.c:10783 +#: src/readelf.c:10961 #, c-format msgid "cannot get %s content: %s" -msgstr "%s の内容を得られません: %s" +msgstr "%s の内容を取得できません: %s" #: src/readelf.c:688 #, c-format msgid "cannot create temp file '%s'" -msgstr "" +msgstr "一時ファイル '%s' を作成できません" #: src/readelf.c:697 #, c-format msgid "cannot write section data" -msgstr "" +msgstr "セクションデータを書き込みできません" #: src/readelf.c:703 src/readelf.c:720 src/readelf.c:749 #, c-format @@ -3793,12 +3794,12 @@ #: src/readelf.c:710 #, c-format msgid "error while rewinding file descriptor" -msgstr "" +msgstr "ファイル記述子を巻き戻している時にエラー" #: src/readelf.c:744 #, c-format msgid "'%s' is not an archive, cannot print archive index" -msgstr "'%s' はアーカイブではなく、アーカイブ索引を印刷できません" +msgstr "'%s' はアーカイブではなく、アーカイブ索引を表示できません" #: src/readelf.c:848 #, c-format @@ -3823,22 +3824,22 @@ #: src/readelf.c:940 #, c-format msgid "cannot read ELF header: %s" -msgstr "ELF ヘッダーが読めません: %s" +msgstr "ELF ヘッダーを読み込めません: %s" #: src/readelf.c:948 #, c-format msgid "cannot create EBL handle" -msgstr "EBL ヘッダーを生成できません" +msgstr "EBL ハンドルを作成できません" #: src/readelf.c:961 #, c-format msgid "cannot determine number of program headers: %s" -msgstr "" +msgstr "プログラムヘッダの数を決定できません: %s" #: src/readelf.c:993 #, c-format msgid "cannot read ELF: %s" -msgstr "" +msgstr "ELFを読み込めません: %s" #: src/readelf.c:1054 msgid "NONE (None)" @@ -4099,7 +4100,7 @@ " セクションからセグメントへのマッビング:\n" " セグメント セクション..." -#: src/readelf.c:1464 src/unstrip.c:2115 src/unstrip.c:2157 src/unstrip.c:2164 +#: src/readelf.c:1464 src/unstrip.c:2117 src/unstrip.c:2159 src/unstrip.c:2166 #, c-format msgid "cannot get program header: %s" msgstr "プログラムヘッダーを得られません: %s" @@ -4136,18 +4137,18 @@ msgid "" msgstr "<不当なセクション>" -#: src/readelf.c:1660 src/readelf.c:2387 src/readelf.c:3496 src/readelf.c:12635 -#: src/readelf.c:12642 src/readelf.c:12686 src/readelf.c:12693 +#: src/readelf.c:1660 src/readelf.c:2387 src/readelf.c:3494 src/readelf.c:12705 +#: src/readelf.c:12712 src/readelf.c:12756 src/readelf.c:12763 msgid "Couldn't uncompress section" msgstr "" -#: src/readelf.c:1665 src/readelf.c:2392 src/readelf.c:3501 +#: src/readelf.c:1665 src/readelf.c:2392 src/readelf.c:3499 #, c-format msgid "cannot get section [%zd] header: %s" msgstr "" #: src/readelf.c:1809 src/readelf.c:2459 src/readelf.c:2725 src/readelf.c:2801 -#: src/readelf.c:3105 src/readelf.c:3179 src/readelf.c:5409 +#: src/readelf.c:3105 src/readelf.c:3179 src/readelf.c:5407 #, c-format msgid "invalid sh_link value in section %zu" msgstr "" @@ -4448,7 +4449,7 @@ msgid "invalid data in gnu.hash section %d" msgstr "" -#: src/readelf.c:3452 +#: src/readelf.c:3451 #, c-format msgid "" " Symbol Bias: %u\n" @@ -4457,7 +4458,7 @@ " シンボルの偏り: %u\n" " ビットマスクの大きさ: %zu バイト %%% ビット設定 第2ハッシュシフト: %u\n" -#: src/readelf.c:3541 +#: src/readelf.c:3539 #, c-format msgid "" "\n" @@ -4469,13 +4470,13 @@ "\n" "オフセット %3$#0 のライブラリー一覧セクション [%1$2zu] '%2$s' には %4$d 個の項目があります:\n" -#: src/readelf.c:3555 +#: src/readelf.c:3553 msgid "" " Library Time Stamp Checksum Version " "Flags" msgstr " ライブラリー タイムスタンプ チェックサム バージョン フラグ" -#: src/readelf.c:3614 +#: src/readelf.c:3612 #, c-format msgid "" "\n" @@ -4485,102 +4486,102 @@ "\n" "オフセット %4$#0 の %3$ バイトのオブジェクト属性セクション [%1$2zu] '%2$s':\n" -#: src/readelf.c:3631 +#: src/readelf.c:3629 msgid " Owner Size\n" msgstr " 所有者 大きさ\n" -#: src/readelf.c:3655 +#: src/readelf.c:3653 #, c-format msgid " %-13s %4\n" msgstr " %-13s %4\n" #. Unknown subsection, print and skip. -#: src/readelf.c:3694 +#: src/readelf.c:3692 #, c-format msgid " %-4u %12\n" msgstr " %-4u %12\n" #. Tag_File -#: src/readelf.c:3699 +#: src/readelf.c:3697 #, c-format msgid " File: %11\n" msgstr " ファイル: %11\n" -#: src/readelf.c:3748 +#: src/readelf.c:3746 #, c-format msgid " %s: %, %s\n" msgstr " %s: %、%s\n" -#: src/readelf.c:3751 +#: src/readelf.c:3749 #, c-format msgid " %s: %\n" msgstr " %s: %\n" -#: src/readelf.c:3754 +#: src/readelf.c:3752 #, c-format msgid " %s: %s\n" msgstr " %s: %s\n" -#: src/readelf.c:3764 +#: src/readelf.c:3762 #, c-format msgid " %u: %\n" msgstr " %u: %\n" -#: src/readelf.c:3767 +#: src/readelf.c:3765 #, c-format msgid " %u: %s\n" msgstr " %u: %s\n" -#: src/readelf.c:3837 +#: src/readelf.c:3835 #, c-format msgid "sprintf failure" msgstr "" -#: src/readelf.c:4319 +#: src/readelf.c:4317 msgid "empty block" msgstr "空ブロック" -#: src/readelf.c:4322 +#: src/readelf.c:4320 #, c-format msgid "%zu byte block:" msgstr "%zu バイトのブロック:" -#: src/readelf.c:4800 +#: src/readelf.c:4798 #, c-format msgid "%*s[%2] %s \n" msgstr "" -#: src/readelf.c:4867 +#: src/readelf.c:4865 #, c-format msgid "%s %# used with different address sizes" msgstr "" -#: src/readelf.c:4874 +#: src/readelf.c:4872 #, c-format msgid "%s %# used with different offset sizes" msgstr "" -#: src/readelf.c:4881 +#: src/readelf.c:4879 #, c-format msgid "%s %# used with different base addresses" msgstr "" -#: src/readelf.c:4888 +#: src/readelf.c:4886 #, c-format msgid "%s %# used with different attribute %s and %s" msgstr "" -#: src/readelf.c:4988 +#: src/readelf.c:4986 #, c-format msgid " [%6tx] \n" msgstr "" -#: src/readelf.c:4996 +#: src/readelf.c:4994 #, c-format msgid " [%6tx] ... % bytes ...\n" msgstr "" -#: src/readelf.c:5099 +#: src/readelf.c:5097 #, c-format msgid "" "\n" @@ -4591,7 +4592,7 @@ "オフセット %3$# の DWARF セクション [%1$2zu] '%2$s':\n" " [ コード]\n" -#: src/readelf.c:5107 +#: src/readelf.c:5105 #, c-format msgid "" "\n" @@ -4600,20 +4601,20 @@ "\n" "オフセット % の略語セクション:\n" -#: src/readelf.c:5120 +#: src/readelf.c:5118 #, c-format msgid " *** error while reading abbreviation: %s\n" msgstr " *** 略語を読んでいる間にエラー: %s\n" -#: src/readelf.c:5136 +#: src/readelf.c:5134 #, c-format msgid " [%5u] offset: %, children: %s, tag: %s\n" msgstr " [%5u] オフセット: %、子: %s、タグ: %s\n" -#: src/readelf.c:5169 src/readelf.c:5478 src/readelf.c:5645 src/readelf.c:6030 -#: src/readelf.c:6646 src/readelf.c:8386 src/readelf.c:9075 src/readelf.c:9548 -#: src/readelf.c:9799 src/readelf.c:9965 src/readelf.c:10352 -#: src/readelf.c:10412 +#: src/readelf.c:5167 src/readelf.c:5476 src/readelf.c:5643 src/readelf.c:6028 +#: src/readelf.c:6644 src/readelf.c:8399 src/readelf.c:9145 src/readelf.c:9618 +#: src/readelf.c:9869 src/readelf.c:10035 src/readelf.c:10422 +#: src/readelf.c:10482 #, c-format msgid "" "\n" @@ -4622,52 +4623,52 @@ "\n" "オフセット %3$# の DWARF セクション [%1$2zu] '%2$s':\n" -#: src/readelf.c:5182 +#: src/readelf.c:5180 #, c-format msgid "cannot get .debug_addr section data: %s" msgstr "" -#: src/readelf.c:5282 src/readelf.c:5306 src/readelf.c:5690 src/readelf.c:9120 +#: src/readelf.c:5280 src/readelf.c:5304 src/readelf.c:5688 src/readelf.c:9190 #, c-format msgid " Length: %8\n" msgstr "" -#: src/readelf.c:5284 src/readelf.c:5321 src/readelf.c:5703 src/readelf.c:9133 +#: src/readelf.c:5282 src/readelf.c:5319 src/readelf.c:5701 src/readelf.c:9203 #, c-format msgid " DWARF version: %8\n" msgstr "" -#: src/readelf.c:5285 src/readelf.c:5330 src/readelf.c:5712 src/readelf.c:9142 +#: src/readelf.c:5283 src/readelf.c:5328 src/readelf.c:5710 src/readelf.c:9212 #, c-format msgid " Address size: %8\n" msgstr "" -#: src/readelf.c:5287 src/readelf.c:5340 src/readelf.c:5722 src/readelf.c:9152 +#: src/readelf.c:5285 src/readelf.c:5338 src/readelf.c:5720 src/readelf.c:9222 #, c-format msgid " Segment size: %8\n" msgstr "" -#: src/readelf.c:5325 src/readelf.c:5707 src/readelf.c:9137 src/readelf.c:10544 +#: src/readelf.c:5323 src/readelf.c:5705 src/readelf.c:9207 src/readelf.c:10614 #, c-format msgid "Unknown version" msgstr "" -#: src/readelf.c:5335 src/readelf.c:5548 src/readelf.c:5717 src/readelf.c:9147 +#: src/readelf.c:5333 src/readelf.c:5546 src/readelf.c:5715 src/readelf.c:9217 #, c-format msgid "unsupported address size" msgstr "" -#: src/readelf.c:5346 src/readelf.c:5559 src/readelf.c:5727 src/readelf.c:9157 +#: src/readelf.c:5344 src/readelf.c:5557 src/readelf.c:5725 src/readelf.c:9227 #, c-format msgid "unsupported segment size" msgstr "" -#: src/readelf.c:5399 src/readelf.c:5473 +#: src/readelf.c:5397 src/readelf.c:5471 #, c-format msgid "cannot get .debug_aranges content: %s" msgstr ".debug_aragnes の内容を得られません: %s" -#: src/readelf.c:5414 +#: src/readelf.c:5412 #, c-format msgid "" "\n" @@ -4679,143 +4680,143 @@ "\n" "オフセット %3$# の DWARF セクション [%1$2zu] '%2$s' には %4$zu 個の項目があります:\n" -#: src/readelf.c:5445 +#: src/readelf.c:5443 #, c-format msgid " [%*zu] ???\n" msgstr " [%*zu] ???\n" -#: src/readelf.c:5447 +#: src/readelf.c:5445 #, c-format msgid "" " [%*zu] start: %0#*, length: %5, CU DIE offset: %6\n" msgstr " [%*zu] 開始: %0#*、長さ: %5、CU DIE オフセット: %6\n" -#: src/readelf.c:5491 src/readelf.c:8413 +#: src/readelf.c:5489 src/readelf.c:8426 #, c-format msgid "" "\n" "Table at offset %zu:\n" msgstr "" -#: src/readelf.c:5495 src/readelf.c:5671 src/readelf.c:6670 src/readelf.c:8424 -#: src/readelf.c:9101 +#: src/readelf.c:5493 src/readelf.c:5669 src/readelf.c:6668 src/readelf.c:8437 +#: src/readelf.c:9171 #, c-format msgid "invalid data in section [%zu] '%s'" msgstr "セクション [%zu] '%s' の不当なデータ" -#: src/readelf.c:5511 +#: src/readelf.c:5509 #, c-format msgid "" "\n" " Length: %6\n" msgstr "" -#: src/readelf.c:5523 +#: src/readelf.c:5521 #, c-format msgid " DWARF version: %6\n" msgstr "" -#: src/readelf.c:5527 +#: src/readelf.c:5525 #, c-format msgid "unsupported aranges version" msgstr "" -#: src/readelf.c:5538 +#: src/readelf.c:5536 #, c-format msgid " CU offset: %6\n" msgstr "" -#: src/readelf.c:5544 +#: src/readelf.c:5542 #, c-format msgid " Address size: %6\n" msgstr "" -#: src/readelf.c:5555 +#: src/readelf.c:5553 #, c-format msgid "" " Segment size: %6\n" "\n" msgstr "" -#: src/readelf.c:5610 +#: src/readelf.c:5608 #, c-format msgid " %zu padding bytes\n" msgstr "" -#: src/readelf.c:5654 +#: src/readelf.c:5652 #, c-format msgid "cannot get .debug_rnglists content: %s" msgstr "" -#: src/readelf.c:5677 src/readelf.c:9107 +#: src/readelf.c:5675 src/readelf.c:9177 #, c-format msgid "" "Table at Offset 0x%:\n" "\n" msgstr "" -#: src/readelf.c:5732 src/readelf.c:9162 +#: src/readelf.c:5730 src/readelf.c:9232 #, c-format msgid " Offset entries: %8\n" msgstr "" -#: src/readelf.c:5748 src/readelf.c:9178 +#: src/readelf.c:5746 src/readelf.c:9248 #, c-format msgid " Unknown CU base: " msgstr "" -#: src/readelf.c:5750 src/readelf.c:9180 +#: src/readelf.c:5748 src/readelf.c:9250 #, c-format msgid " CU [%6] base: " msgstr "" -#: src/readelf.c:5756 src/readelf.c:9186 +#: src/readelf.c:5754 src/readelf.c:9256 #, c-format msgid " Not associated with a CU.\n" msgstr "" -#: src/readelf.c:5767 src/readelf.c:9197 +#: src/readelf.c:5765 src/readelf.c:9267 #, c-format msgid "too many offset entries for unit length" msgstr "" -#: src/readelf.c:5771 src/readelf.c:9201 +#: src/readelf.c:5769 src/readelf.c:9271 #, c-format msgid " Offsets starting at 0x%:\n" msgstr "" -#: src/readelf.c:5823 +#: src/readelf.c:5821 #, c-format msgid "invalid range list data" msgstr "" -#: src/readelf.c:6008 src/readelf.c:9526 +#: src/readelf.c:6006 src/readelf.c:9596 #, c-format msgid "" " %zu padding bytes\n" "\n" msgstr "" -#: src/readelf.c:6025 +#: src/readelf.c:6023 #, c-format msgid "cannot get .debug_ranges content: %s" msgstr ".degub_ranges の内容を得られません: %s" -#: src/readelf.c:6061 src/readelf.c:9581 +#: src/readelf.c:6059 src/readelf.c:9651 #, c-format msgid "" "\n" " Unknown CU base: " msgstr "" -#: src/readelf.c:6063 src/readelf.c:9583 +#: src/readelf.c:6061 src/readelf.c:9653 #, c-format msgid "" "\n" " CU [%6] base: " msgstr "" -#: src/readelf.c:6072 src/readelf.c:9609 src/readelf.c:9635 +#: src/readelf.c:6070 src/readelf.c:9679 src/readelf.c:9705 #, c-format msgid " [%6tx] \n" msgstr " [%6tx] <不当なデータ>\n" @@ -4827,21 +4828,21 @@ " " msgstr "" -#: src/readelf.c:6107 src/readelf.c:9729 +#: src/readelf.c:6105 src/readelf.c:9799 #, c-format msgid " [%6tx] empty list\n" msgstr "" -#: src/readelf.c:6367 +#: src/readelf.c:6365 msgid " \n" msgstr "" -#: src/readelf.c:6624 +#: src/readelf.c:6622 #, c-format msgid "cannot get ELF: %s" msgstr "" -#: src/readelf.c:6642 +#: src/readelf.c:6640 #, c-format msgid "" "\n" @@ -4850,7 +4851,7 @@ "\n" "オフセット %3$# の フレーム情報呼出しセクション [%1$2zu] '%2$s':\n" -#: src/readelf.c:6692 +#: src/readelf.c:6690 #, c-format msgid "" "\n" @@ -4859,65 +4860,65 @@ "\n" " [%6tx] ゼロ終端\n" -#: src/readelf.c:6793 src/readelf.c:6947 +#: src/readelf.c:6791 src/readelf.c:6945 #, c-format msgid "invalid augmentation length" msgstr "" -#: src/readelf.c:6808 +#: src/readelf.c:6806 msgid "FDE address encoding: " msgstr "FDE アドレスエンコード " -#: src/readelf.c:6814 +#: src/readelf.c:6812 msgid "LSDA pointer encoding: " msgstr "LSDA ポインターエンコード: " -#: src/readelf.c:6924 +#: src/readelf.c:6922 #, c-format msgid " (offset: %#)" msgstr " (オフセット: %#)" -#: src/readelf.c:6931 +#: src/readelf.c:6929 #, c-format msgid " (end offset: %#)" msgstr " (終了オフセット: %#)" -#: src/readelf.c:6968 +#: src/readelf.c:6966 #, c-format msgid " %-26sLSDA pointer: %#\n" msgstr " %-26sLSDA ポインター: %#\n" -#: src/readelf.c:7053 +#: src/readelf.c:7051 #, c-format msgid "DIE [%] cannot get attribute code: %s" msgstr "" -#: src/readelf.c:7063 +#: src/readelf.c:7061 #, c-format msgid "DIE [%] cannot get attribute form: %s" msgstr "" -#: src/readelf.c:7085 +#: src/readelf.c:7083 #, c-format msgid "DIE [%] cannot get attribute '%s' (%s) value: %s" msgstr "" -#: src/readelf.c:7415 +#: src/readelf.c:7413 #, c-format msgid "invalid file (%): %s" msgstr "" -#: src/readelf.c:7419 +#: src/readelf.c:7417 #, c-format msgid "no srcfiles for CU [%]" msgstr "" -#: src/readelf.c:7423 +#: src/readelf.c:7421 #, c-format msgid "couldn't get DWARF CU: %s" msgstr "" -#: src/readelf.c:7738 +#: src/readelf.c:7736 #, c-format msgid "" "\n" @@ -4928,12 +4929,12 @@ "オフセット %3$# の DWARF セクション [%1$2zu] '%2$s':\n" " [オフセット]\n" -#: src/readelf.c:7788 +#: src/readelf.c:7786 #, c-format msgid "cannot get next unit: %s" msgstr "" -#: src/readelf.c:7808 +#: src/readelf.c:7806 #, c-format msgid "" " Type unit at offset %:\n" @@ -4942,7 +4943,7 @@ " Type signature: %#, Type offset: %# [%]\n" msgstr "" -#: src/readelf.c:7820 +#: src/readelf.c:7818 #, c-format msgid "" " Compilation unit at offset %:\n" @@ -4953,37 +4954,37 @@ " バージョン: %2$、略語セクションオフセット: %3$、アドレスの大きさ: " "%4$、オフセットの大きさ: %5$\n" -#: src/readelf.c:7830 src/readelf.c:7993 +#: src/readelf.c:7828 src/readelf.c:7989 #, c-format msgid " Unit type: %s (%)" msgstr "" -#: src/readelf.c:7857 +#: src/readelf.c:7855 #, c-format msgid "unknown version (%d) or unit type (%d)" msgstr "" -#: src/readelf.c:7886 +#: src/readelf.c:7884 #, c-format msgid "cannot get DIE offset: %s" msgstr "DIE オフセットを得られません: %s" -#: src/readelf.c:7895 +#: src/readelf.c:7893 #, c-format msgid "cannot get tag of DIE at offset [%] in section '%s': %s" msgstr "" -#: src/readelf.c:7933 +#: src/readelf.c:7929 #, c-format msgid "cannot get next DIE: %s\n" msgstr "次の DIE を得られません: %s\n" -#: src/readelf.c:7941 +#: src/readelf.c:7937 #, c-format msgid "cannot get next DIE: %s" msgstr "次の DIE を得られません: %s" -#: src/readelf.c:7985 +#: src/readelf.c:7981 #, c-format msgid "" " Split compilation unit at offset %:\n" @@ -4991,7 +4992,7 @@ "%, Offset size: %\n" msgstr "" -#: src/readelf.c:8037 +#: src/readelf.c:8033 #, c-format msgid "" "\n" @@ -4999,18 +5000,18 @@ "\n" msgstr "" -#: src/readelf.c:8369 +#: src/readelf.c:8365 #, c-format msgid "unknown form: %s" msgstr "" -#: src/readelf.c:8400 +#: src/readelf.c:8413 #, c-format msgid "cannot get line data section data: %s" msgstr "ラインデータセクションデータを得られません: %s" #. Print what we got so far. -#: src/readelf.c:8502 +#: src/readelf.c:8517 #, c-format msgid "" "\n" @@ -5029,33 +5030,33 @@ "Opcodes:\n" msgstr "" -#: src/readelf.c:8524 +#: src/readelf.c:8539 #, c-format msgid "cannot handle .debug_line version: %u\n" -msgstr "" +msgstr ".debug_line バージョンを扱えません: %u\n" -#: src/readelf.c:8532 +#: src/readelf.c:8547 #, c-format msgid "cannot handle address size: %u\n" -msgstr "" +msgstr "アドレスサイズを扱えません: %u\n" -#: src/readelf.c:8540 +#: src/readelf.c:8555 #, c-format msgid "cannot handle segment selector size: %u\n" -msgstr "" +msgstr "セグメントセレクタサイズを扱えません: %u\n" -#: src/readelf.c:8550 +#: src/readelf.c:8565 #, c-format msgid "invalid data at offset %tu in section [%zu] '%s'" msgstr "セクション [%2$zu] '%3$s' 中のオフセット %1$tu に不当なデータ" -#: src/readelf.c:8565 +#: src/readelf.c:8580 #, c-format msgid " [%*] %hhu argument\n" msgid_plural " [%*] %hhu arguments\n" msgstr[0] " [%*] %hhu パラメーター\n" -#: src/readelf.c:8576 +#: src/readelf.c:8591 msgid "" "\n" "Directory table:" @@ -5063,22 +5064,22 @@ "\n" "ディレクトリーテーブル:" -#: src/readelf.c:8582 src/readelf.c:8659 +#: src/readelf.c:8597 src/readelf.c:8674 #, c-format msgid " [" msgstr "" -#: src/readelf.c:8653 +#: src/readelf.c:8668 msgid "" "\n" "File name table:" msgstr "" -#: src/readelf.c:8714 +#: src/readelf.c:8729 msgid " Entry Dir Time Size Name" msgstr "" -#: src/readelf.c:8757 +#: src/readelf.c:8779 msgid "" "\n" "Line number statements:" @@ -5086,117 +5087,117 @@ "\n" "行 番号 文:" -#: src/readelf.c:8777 +#: src/readelf.c:8794 #, c-format msgid "invalid maximum operations per instruction is zero" msgstr "" -#: src/readelf.c:8811 +#: src/readelf.c:8828 #, c-format msgid " special opcode %u: address+%u = " msgstr "" -#: src/readelf.c:8815 +#: src/readelf.c:8832 #, c-format msgid ", op_index = %u, line%+d = %zu\n" msgstr "" -#: src/readelf.c:8818 +#: src/readelf.c:8835 #, c-format msgid ", line%+d = %zu\n" msgstr "" -#: src/readelf.c:8836 +#: src/readelf.c:8853 #, c-format msgid " extended opcode %u: " msgstr " 拡張命令コード %u: " -#: src/readelf.c:8841 +#: src/readelf.c:8858 msgid " end of sequence" msgstr "" -#: src/readelf.c:8859 +#: src/readelf.c:8876 #, c-format msgid " set address to " msgstr "" -#: src/readelf.c:8887 +#: src/readelf.c:8904 #, c-format msgid "" " define new file: dir=%u, mtime=%, length=%, name=%s\n" msgstr "" -#: src/readelf.c:8901 +#: src/readelf.c:8918 #, c-format msgid " set discriminator to %u\n" msgstr "" #. Unknown, ignore it. -#: src/readelf.c:8906 +#: src/readelf.c:8976 msgid " unknown opcode" -msgstr "" +msgstr " 不明なオペコード" #. Takes no argument. -#: src/readelf.c:8918 +#: src/readelf.c:8988 msgid " copy" msgstr " 複写" -#: src/readelf.c:8929 +#: src/readelf.c:8999 #, c-format msgid " advance address by %u to " msgstr "" -#: src/readelf.c:8933 src/readelf.c:8994 +#: src/readelf.c:9003 src/readelf.c:9064 #, c-format msgid ", op_index to %u" msgstr "" -#: src/readelf.c:8945 +#: src/readelf.c:9015 #, c-format msgid " advance line by constant %d to %\n" msgstr " 行を定数 %d だけ進めて % にする\n" -#: src/readelf.c:8955 +#: src/readelf.c:9025 #, c-format msgid " set file to %\n" msgstr " ファイルを % に設定する\n" -#: src/readelf.c:8966 +#: src/readelf.c:9036 #, c-format msgid " set column to %\n" msgstr " カラムを % に設定する\n" -#: src/readelf.c:8973 +#: src/readelf.c:9043 #, c-format msgid " set '%s' to %\n" msgstr " '%s' を % に設定する\n" #. Takes no argument. -#: src/readelf.c:8979 +#: src/readelf.c:9049 msgid " set basic block flag" msgstr " 基本ブロックフラグを設定する" -#: src/readelf.c:8990 +#: src/readelf.c:9060 #, c-format msgid " advance address by constant %u to " msgstr "" -#: src/readelf.c:9010 +#: src/readelf.c:9080 #, c-format msgid " advance address by fixed value %u to \n" msgstr "" #. Takes no argument. -#: src/readelf.c:9020 +#: src/readelf.c:9090 msgid " set prologue end flag" msgstr " プロローグ終了フラグを設定する" #. Takes no argument. -#: src/readelf.c:9025 +#: src/readelf.c:9095 msgid " set epilogue begin flag" msgstr " エピローグ開始フラグを設定する" -#: src/readelf.c:9035 +#: src/readelf.c:9105 #, c-format msgid " set isa to %u\n" msgstr "" @@ -5204,102 +5205,102 @@ #. This is a new opcode the generator but not we know about. #. Read the parameters associated with it but then discard #. everything. Read all the parameters for this opcode. -#: src/readelf.c:9044 +#: src/readelf.c:9114 #, c-format msgid " unknown opcode with % parameter:" msgid_plural " unknown opcode with % parameters:" msgstr[0] " % 個のパラメーターのある不明な命令コード:" -#: src/readelf.c:9084 +#: src/readelf.c:9154 #, c-format msgid "cannot get .debug_loclists content: %s" -msgstr "" +msgstr ".debug_loclists の内容を取得できません: %s" -#: src/readelf.c:9290 +#: src/readelf.c:9360 #, c-format msgid "invalid loclists data" msgstr "" -#: src/readelf.c:9543 +#: src/readelf.c:9613 #, c-format msgid "cannot get .debug_loc content: %s" msgstr ".debug_loc の内容を得られません: %s" -#: src/readelf.c:9756 src/readelf.c:10800 +#: src/readelf.c:9826 src/readelf.c:10870 msgid " \n" msgstr "" -#: src/readelf.c:9811 src/readelf.c:9974 +#: src/readelf.c:9881 src/readelf.c:10044 #, c-format msgid "cannot get macro information section data: %s" msgstr "マクロ情報セクションのデータを得られません: %s" -#: src/readelf.c:9891 +#: src/readelf.c:9961 #, c-format msgid "%*s*** non-terminated string at end of section" msgstr "%*s*** 最後のセクションの終端していない文字列" -#: src/readelf.c:9914 +#: src/readelf.c:9984 #, c-format msgid "%*s*** missing DW_MACINFO_start_file argument at end of section" msgstr "" -#: src/readelf.c:10015 +#: src/readelf.c:10085 #, c-format msgid " Offset: 0x%\n" msgstr "" -#: src/readelf.c:10027 +#: src/readelf.c:10097 #, c-format msgid " Version: %\n" msgstr "" -#: src/readelf.c:10033 src/readelf.c:10920 +#: src/readelf.c:10103 src/readelf.c:10990 #, c-format msgid " unknown version, cannot parse section\n" msgstr "" -#: src/readelf.c:10040 +#: src/readelf.c:10110 #, c-format msgid " Flag: 0x%" msgstr "" -#: src/readelf.c:10069 +#: src/readelf.c:10139 #, c-format msgid " Offset length: %\n" msgstr "" -#: src/readelf.c:10077 +#: src/readelf.c:10147 #, c-format msgid " .debug_line offset: 0x%\n" msgstr "" -#: src/readelf.c:10102 +#: src/readelf.c:10172 #, c-format msgid " extension opcode table, % items:\n" msgstr "" -#: src/readelf.c:10109 +#: src/readelf.c:10179 #, c-format msgid " [%]" msgstr "" -#: src/readelf.c:10121 +#: src/readelf.c:10191 #, c-format msgid " % arguments:" msgstr "" -#: src/readelf.c:10136 +#: src/readelf.c:10206 #, c-format msgid " no arguments." msgstr "" -#: src/readelf.c:10337 +#: src/readelf.c:10407 #, c-format msgid " [%5d] DIE offset: %6, CU DIE offset: %6, name: %s\n" msgstr " [%5d] DIE オフセット: %6, CU DIE オフセット: %6, 名前: %s\n" -#: src/readelf.c:10381 +#: src/readelf.c:10451 #, c-format msgid "" "\n" @@ -5307,37 +5308,37 @@ " %*s String\n" msgstr "" -#: src/readelf.c:10396 +#: src/readelf.c:10466 #, c-format msgid " *** error, missing string terminator\n" msgstr "" -#: src/readelf.c:10425 +#: src/readelf.c:10495 #, c-format msgid "cannot get .debug_str_offsets section data: %s" msgstr "" -#: src/readelf.c:10524 +#: src/readelf.c:10594 #, c-format msgid " Length: %8\n" msgstr "" -#: src/readelf.c:10526 +#: src/readelf.c:10596 #, c-format msgid " Offset size: %8\n" msgstr "" -#: src/readelf.c:10540 +#: src/readelf.c:10610 #, c-format msgid " DWARF version: %8\n" msgstr "" -#: src/readelf.c:10549 +#: src/readelf.c:10619 #, c-format msgid " Padding: %8\n" msgstr "" -#: src/readelf.c:10603 +#: src/readelf.c:10673 #, c-format msgid "" "\n" @@ -5346,7 +5347,7 @@ "\n" "呼出しフレーム検索テーブルセクション [%2zu] '.eh_frame_hdr':\n" -#: src/readelf.c:10705 +#: src/readelf.c:10775 #, c-format msgid "" "\n" @@ -5355,22 +5356,22 @@ "\n" "例外取扱いテーブルセクション [%2zu] '.gcc_except_table':\n" -#: src/readelf.c:10728 +#: src/readelf.c:10798 #, c-format msgid " LPStart encoding: %#x " msgstr " LPStart コード化: %#x " -#: src/readelf.c:10740 +#: src/readelf.c:10810 #, c-format msgid " TType encoding: %#x " msgstr " TType コード化: %#x " -#: src/readelf.c:10755 +#: src/readelf.c:10825 #, c-format msgid " Call site encoding: %#x " msgstr " 呼出しサイトコード化: %#x " -#: src/readelf.c:10768 +#: src/readelf.c:10838 msgid "" "\n" " Call site table:" @@ -5378,7 +5379,7 @@ "\n" " 呼出しサイトテーブル:" -#: src/readelf.c:10782 +#: src/readelf.c:10852 #, c-format msgid "" " [%4u] Call site start: %#\n" @@ -5391,88 +5392,88 @@ " 離着陸場: %#\n" " 行動: %u\n" -#: src/readelf.c:10855 +#: src/readelf.c:10925 #, c-format msgid "invalid TType encoding" msgstr "不当な TType コード化" -#: src/readelf.c:10882 +#: src/readelf.c:10952 #, c-format msgid "" "\n" "GDB section [%2zu] '%s' at offset %# contains % bytes :\n" msgstr "" -#: src/readelf.c:10911 +#: src/readelf.c:10981 #, c-format msgid " Version: %\n" msgstr "" -#: src/readelf.c:10929 +#: src/readelf.c:10999 #, c-format msgid " CU offset: %#\n" msgstr "" -#: src/readelf.c:10936 +#: src/readelf.c:11006 #, c-format msgid " TU offset: %#\n" msgstr "" -#: src/readelf.c:10943 +#: src/readelf.c:11013 #, c-format msgid " address offset: %#\n" msgstr "" -#: src/readelf.c:10950 +#: src/readelf.c:11020 #, c-format msgid " symbol offset: %#\n" msgstr "" -#: src/readelf.c:10957 +#: src/readelf.c:11027 #, c-format msgid " constant offset: %#\n" msgstr "" -#: src/readelf.c:10971 +#: src/readelf.c:11041 #, c-format msgid "" "\n" " CU list at offset %# contains %zu entries:\n" msgstr "" -#: src/readelf.c:10996 +#: src/readelf.c:11066 #, c-format msgid "" "\n" " TU list at offset %# contains %zu entries:\n" msgstr "" -#: src/readelf.c:11025 +#: src/readelf.c:11095 #, c-format msgid "" "\n" " Address list at offset %# contains %zu entries:\n" msgstr "" -#: src/readelf.c:11057 +#: src/readelf.c:11127 #, c-format msgid "" "\n" " Symbol table at offset %# contains %zu slots:\n" msgstr "" -#: src/readelf.c:11195 +#: src/readelf.c:11265 #, c-format msgid "cannot get debug context descriptor: %s" msgstr "デバッグ内容記述子を得られません: %s" -#: src/readelf.c:11563 src/readelf.c:12190 src/readelf.c:12301 -#: src/readelf.c:12359 +#: src/readelf.c:11633 src/readelf.c:12260 src/readelf.c:12371 +#: src/readelf.c:12429 #, c-format msgid "cannot convert core note data: %s" msgstr "コアノートデータの変換ができません: %s" -#: src/readelf.c:11926 +#: src/readelf.c:11996 #, c-format msgid "" "\n" @@ -5481,21 +5482,21 @@ "\n" "%*s... < %u 回の繰返し> ..." -#: src/readelf.c:12438 +#: src/readelf.c:12508 msgid " Owner Data size Type\n" msgstr " 所有者 データ大きさタイプ\n" -#: src/readelf.c:12466 +#: src/readelf.c:12536 #, c-format msgid " %-13.*s %9 %s\n" msgstr " %-13.*s %9 %s\n" -#: src/readelf.c:12518 +#: src/readelf.c:12588 #, c-format msgid "cannot get content of note: %s" -msgstr "" +msgstr "ノートセクションの内容を取得できません: %s" -#: src/readelf.c:12552 +#: src/readelf.c:12622 #, c-format msgid "" "\n" @@ -5504,7 +5505,7 @@ "\n" "オフセット %4$#0 の %3$ バイトのノートセクション [%1$2zu] '%2$s':\n" -#: src/readelf.c:12575 +#: src/readelf.c:12645 #, c-format msgid "" "\n" @@ -5513,26 +5514,26 @@ "\n" "オフセット %2$#0 の %1$ バイトのノートセグメント:\n" -#: src/readelf.c:12622 +#: src/readelf.c:12692 #, c-format msgid "" "\n" "Section [%zu] '%s' has no data to dump.\n" msgstr "" -#: src/readelf.c:12649 src/readelf.c:12700 +#: src/readelf.c:12719 src/readelf.c:12770 #, c-format msgid "cannot get data for section [%zu] '%s': %s" msgstr "" -#: src/readelf.c:12654 +#: src/readelf.c:12724 #, c-format msgid "" "\n" "Hex dump of section [%zu] '%s', % bytes at offset %#0:\n" msgstr "" -#: src/readelf.c:12659 +#: src/readelf.c:12729 #, c-format msgid "" "\n" @@ -5540,21 +5541,21 @@ "%#0:\n" msgstr "" -#: src/readelf.c:12673 +#: src/readelf.c:12743 #, c-format msgid "" "\n" "Section [%zu] '%s' has no strings to dump.\n" msgstr "" -#: src/readelf.c:12705 +#: src/readelf.c:12775 #, c-format msgid "" "\n" "String section [%zu] '%s' contains % bytes at offset %#0:\n" msgstr "" -#: src/readelf.c:12710 +#: src/readelf.c:12780 #, c-format msgid "" "\n" @@ -5562,7 +5563,7 @@ "offset %#0:\n" msgstr "" -#: src/readelf.c:12759 +#: src/readelf.c:12829 #, c-format msgid "" "\n" @@ -5571,7 +5572,7 @@ "\n" "セクション [%lu] がありません" -#: src/readelf.c:12789 +#: src/readelf.c:12859 #, c-format msgid "" "\n" @@ -5580,12 +5581,12 @@ "\n" "セクション '%s' がありません" -#: src/readelf.c:12846 +#: src/readelf.c:12916 #, c-format msgid "cannot get symbol index of archive '%s': %s" msgstr "アーカイブのシンボル索引 '%s' を得られません: %s" -#: src/readelf.c:12849 +#: src/readelf.c:12919 #, c-format msgid "" "\n" @@ -5594,19 +5595,21 @@ "\n" "アーカイブ '%s' にはシンボル索引がありません\n" -#: src/readelf.c:12853 +#: src/readelf.c:12923 #, c-format msgid "" "\n" "Index of archive '%s' has %zu entries:\n" msgstr "" +"\n" +"アーカイブ '%s' の索引は %zu 個の項目を持ちます:\n" -#: src/readelf.c:12871 +#: src/readelf.c:12941 #, c-format msgid "cannot extract member at offset %zu in '%s': %s" -msgstr "" +msgstr "'%2$s' の オフセット %1$zu のメンバーを抽出できません: %3$s" -#: src/readelf.c:12876 +#: src/readelf.c:12946 #, c-format msgid "Archive member '%s' contains:\n" msgstr "アーカイブメンバー '%s' には以下があります:\n" @@ -5615,7 +5618,8 @@ msgid "" "Use the output format FORMAT. FORMAT can be `bsd' or `sysv'. The default " "is `bsd'" -msgstr "出力形式として FORMAT を使ってください。FORMAT は `bsd'か、`sysv' のどちらかです。省略値は `bsd'です" +msgstr "" +"出力形式として FORMAT を使ってください。 FORMAT は `bsd'、 `sysv' のどちらかです。 デフォルトは `bsd'です" #: src/size.c:58 msgid "Same as `--format=sysv'" @@ -5639,11 +5643,11 @@ #: src/size.c:66 msgid "Similar to `--format=sysv' output but in one line" -msgstr "`--format=sysv' の出力と似ていますが、1行です" +msgstr "`--format=sysv' の出力と 似ていますが、 1行です" #: src/size.c:70 msgid "Print size and permission flags for loadable segments" -msgstr "ロード可能セグメントのための印刷の大きさと許可フラグ" +msgstr "ロード可能セグメント の大きさと 許可フラグの 表示" #: src/size.c:71 msgid "Display the total sizes (bsd only)" @@ -5652,7 +5656,7 @@ #. Short description of program. #: src/size.c:76 msgid "List section sizes of FILEs (a.out by default)." -msgstr "ふぁいる のセクションの大きさの一覧 (省略値は a.out)" +msgstr "FILE のセクションの 大きさの 一覧表示 (デフォルトでは a.out)" #: src/size.c:240 #, c-format @@ -5686,7 +5690,7 @@ #: src/stack.c:493 #, c-format msgid "Cannot open core file '%s'" -msgstr "" +msgstr "コアファイル'%s' を開くことができません" #: src/stack.c:553 #, c-format @@ -5710,63 +5714,63 @@ #: src/stack.c:645 msgid "Show stack of process PID" -msgstr "" +msgstr "process PID のスタックを表示" #: src/stack.c:647 msgid "Show stack found in COREFILE" -msgstr "" +msgstr "COREFILE で見つかったスタックを表示" #: src/stack.c:648 msgid "(optional) EXECUTABLE that produced COREFILE" -msgstr "" +msgstr "(optional) COREFILE を生成した EXECUTABLE" #: src/stack.c:652 msgid "Output selection options:" -msgstr "" +msgstr "出力選択オプション：" #: src/stack.c:654 msgid "Additionally show frame activation" -msgstr "" +msgstr "frame activation を さらに 表示" #: src/stack.c:656 msgid "Additionally try to lookup DWARF debuginfo name for frame address" -msgstr "" +msgstr "フレーム アドレスに 対する DWARF debuginfo name の検索を さらに試みる" #: src/stack.c:659 msgid "" "Additionally show inlined function frames using DWARF debuginfo if available " "(implies -d)" -msgstr "" +msgstr "可能であれば DWARF debuginfo を使って インライン 関数の フレームを表示 （暗黙的に -d を伴う）" #: src/stack.c:661 msgid "Additionally show module file information" -msgstr "" +msgstr "モジュール ファイル情報を さらに 表示" #: src/stack.c:663 msgid "Additionally show source file information" -msgstr "" +msgstr "ソース ファイル情報を さらに 表示" #: src/stack.c:665 msgid "" "Show all additional information (activation, debugname, inlines, module and " "source)" -msgstr "" +msgstr "全ての 追加情報を 表示 （activation, debugname, inlines, module, source）" #: src/stack.c:667 msgid "Do not resolve address to function symbol name" -msgstr "" +msgstr "アドレスを 関数シンボル名に 解決しない" #: src/stack.c:669 msgid "Show raw function symbol names, do not try to demangle names" -msgstr "" +msgstr "生の 関数シンボル名を 表示し、 デマングルを 試みない" #: src/stack.c:671 msgid "Show module build-id, load address and pc offset" -msgstr "" +msgstr "モジュールの ビルド ID、ロードアドレスと PC オフセット を表示" #: src/stack.c:673 msgid "Show the backtrace of only one thread" -msgstr "" +msgstr "１つのスレッドだけのバックトレースを表示" #: src/stack.c:675 msgid "Show at most MAXFRAMES per thread (default 256, use 0 for unlimited)" @@ -5774,7 +5778,7 @@ #: src/stack.c:677 msgid "Show module memory map with build-id, elf and debug files detected" -msgstr "" +msgstr "検出された ビルド ID、 elf、 debug ファイル付きで モジュールの メモリマップを 表示" #: src/stack.c:685 msgid "" @@ -5791,20 +5795,20 @@ #: src/stack.c:760 #, c-format msgid "Couldn't show any frames." -msgstr "" +msgstr "フレームを表示できません" #: src/strings.c:65 msgid "Output Selection:" -msgstr "" +msgstr "出力選択：" #: src/strings.c:66 msgid "Scan entire file, not only loaded sections" -msgstr "" +msgstr "ロードされる セクションだけ でなく ファイル全体を スキャンする" #: src/strings.c:68 msgid "" "Only NUL-terminated sequences of MIN-LEN characters or more are printed" -msgstr "" +msgstr "ヌル終端された MIN-LEN 文字以上の シーケンス のみを 表示" #: src/strings.c:69 msgid "" @@ -5814,20 +5818,20 @@ #: src/strings.c:73 msgid "Print name of the file before each string." -msgstr "" +msgstr "各文字列の 前に ファイル名を表示" #: src/strings.c:75 msgid "Print location of the string in base 8, 10, or 16 respectively." -msgstr "" +msgstr "文字列の 位置を 基数 8、 10、 16 で 各々表示" #: src/strings.c:76 msgid "Alias for --radix=o" -msgstr "" +msgstr "--radix=o と同じ" #. Short description of program. #: src/strings.c:83 msgid "Print the strings of printable characters in files." -msgstr "" +msgstr "ファイル中の表示可能文字からなる文字列を表示する。" #: src/strings.c:256 src/strings.c:291 #, c-format @@ -5861,27 +5865,27 @@ #: src/strip.c:71 msgid "Place stripped output into FILE" -msgstr "はぎ取った出力を ふぁいる に置く" +msgstr "ストリップした 出力を FILE に置く" #: src/strip.c:72 msgid "Extract the removed sections into FILE" -msgstr "抽出した取り除いたセクションを ふぁいる に置く" +msgstr "抽出して 取り除いた セクションを FILE に置く" #: src/strip.c:73 msgid "Embed name FILE instead of -f argument" -msgstr "-f パラメーターの代わりに 名前 ふぁいる を有効にする" +msgstr "-f 引数の 代わりに 名前 FILE を有効にする" #: src/strip.c:77 msgid "Remove all debugging symbols" -msgstr "デバッグ用のシンボルを全て取り除く" +msgstr "デバッグ用 シンボルを 全て 取り除く" #: src/strip.c:81 msgid "Remove section headers (not recommended)" -msgstr "" +msgstr "セクションヘッダーを 取り除く （非推奨）" #: src/strip.c:83 msgid "Copy modified/access timestamps to the output" -msgstr "修正/アクセスタイムスタンプを出力へ複写する" +msgstr "修正/アクセス タイムスタンプを 出力へ 複製する" #: src/strip.c:85 msgid "" @@ -5907,17 +5911,19 @@ "Remove the named section. SECTION is an extended wildcard pattern. May be " "given more than once. Only non-allocated sections can be removed." msgstr "" +"指定された セクションを 取り除く。 SECTION は 拡張 ワイルド カード パターン。 ２回以上 与え られても よい。割り当て されない " +"セクション のみ 取り除ける。" #: src/strip.c:91 msgid "" "Keep the named section. SECTION is an extended wildcard pattern. May be " "given more than once." -msgstr "" +msgstr "指定された セクションを 保持する。 SECTION は 拡張 ワイルド カード パターン。 ２回以上 与え られても よい。" #. Short description of program. #: src/strip.c:98 msgid "Discard symbols from object files." -msgstr "オブジェクトファイルからシンボルを破棄する" +msgstr "オブジェクトファイルからシンボルを捨て去る" #: src/strip.c:247 #, c-format @@ -5949,24 +5955,24 @@ #: src/strip.c:362 #, c-format msgid "cannot both keep and remove .comment section" -msgstr "" +msgstr ".comment セクションを保持しつつ取り除くことはできません" #: src/strip.c:481 #, c-format msgid "bad relocation" msgstr "" -#: src/strip.c:747 src/strip.c:771 +#: src/strip.c:751 src/strip.c:775 #, c-format msgid "cannot stat input file '%s'" msgstr "入力ファイル '%s' を stat できません" -#: src/strip.c:761 +#: src/strip.c:765 #, c-format msgid "while opening '%s'" msgstr "'%s' を開いている間" -#: src/strip.c:799 +#: src/strip.c:803 #, c-format msgid "%s: cannot use -o or -f when stripping archive" msgstr "%s: アーカイブから抜き出している時は -o や -f は使えません" @@ -5977,171 +5983,171 @@ #. result = handle_ar (fd, elf, NULL, fname, #. preserve_dates ? tv : NULL); #. -#: src/strip.c:811 +#: src/strip.c:815 #, c-format msgid "%s: no support for stripping archive" -msgstr "" +msgstr "%s: アーカイブのストリップには対応していません" -#: src/strip.c:1047 +#: src/strip.c:1052 #, c-format msgid "cannot open EBL backend" msgstr "EBL バックエンドを開けません" -#: src/strip.c:1092 +#: src/strip.c:1097 #, c-format msgid "cannot get number of phdrs" -msgstr "" +msgstr "phdrs の数を取得できません" -#: src/strip.c:1106 src/strip.c:1149 +#: src/strip.c:1111 src/strip.c:1154 #, c-format msgid "cannot create new ehdr for file '%s': %s" -msgstr "" +msgstr "ファイル '%s' の新しい ehdr を作成できません: %s" -#: src/strip.c:1116 src/strip.c:1159 +#: src/strip.c:1121 src/strip.c:1164 #, c-format msgid "cannot create new phdr for file '%s': %s" -msgstr "" +msgstr "ファイル '%s' の新しい phdr を作成できません: %s" -#: src/strip.c:1240 +#: src/strip.c:1244 #, c-format msgid "illformed file '%s'" msgstr "不適格なファイル '%s'" -#: src/strip.c:1250 +#: src/strip.c:1254 #, c-format msgid "Cannot remove allocated section '%s'" -msgstr "" +msgstr "割り当てされるセクション '%s' は取り除けません" -#: src/strip.c:1259 +#: src/strip.c:1263 #, c-format msgid "Cannot both keep and remove section '%s'" -msgstr "" +msgstr "セクション '%s' を保持しつつ取り除くことはできません" -#: src/strip.c:1624 src/strip.c:1739 +#: src/strip.c:1628 src/strip.c:1743 #, c-format msgid "while generating output file: %s" msgstr "出力ファイルを生成している間: %s" -#: src/strip.c:1688 +#: src/strip.c:1692 #, c-format msgid "%s: error while updating ELF header: %s" -msgstr "" +msgstr "%s: ELF ヘッダーの更新中にエラー: %s" -#: src/strip.c:1697 +#: src/strip.c:1701 #, c-format msgid "%s: error while getting shdrstrndx: %s" -msgstr "" +msgstr "%s: shdrstrndx の取得中にエラー: %s" -#: src/strip.c:1705 src/strip.c:2550 +#: src/strip.c:1709 src/strip.c:2554 #, c-format msgid "%s: error updating shdrstrndx: %s" -msgstr "" +msgstr "%s: shdrstrndx の更新中にエラー: %s" -#: src/strip.c:1722 +#: src/strip.c:1726 #, c-format msgid "while preparing output for '%s'" msgstr "'%s' のための出力を準備している間" -#: src/strip.c:1784 src/strip.c:1847 +#: src/strip.c:1788 src/strip.c:1851 #, c-format msgid "while create section header section: %s" msgstr "セクションヘッダーセクションを生成している間: %s" -#: src/strip.c:1793 +#: src/strip.c:1797 #, c-format msgid "cannot allocate section data: %s" msgstr "セクションデータを割り当てられません: %s" -#: src/strip.c:1859 +#: src/strip.c:1863 #, c-format msgid "while create section header string table: %s" msgstr "セクションヘッダー文字列テーブルを生成中: %s" -#: src/strip.c:1866 +#: src/strip.c:1870 #, c-format msgid "no memory to create section header string table" -msgstr "" +msgstr "セクションヘッダー文字列テーブルを作成するメモリがありません" -#: src/strip.c:2079 +#: src/strip.c:2083 #, c-format msgid "Cannot remove symbol [%zd] from allocated symbol table [%zd]" msgstr "" -#: src/strip.c:2466 src/strip.c:2574 +#: src/strip.c:2470 src/strip.c:2578 #, c-format msgid "while writing '%s': %s" msgstr "'%s' を書込み中: %s" -#: src/strip.c:2477 +#: src/strip.c:2481 #, c-format msgid "while creating '%s'" msgstr "'%s' を生成中" -#: src/strip.c:2500 +#: src/strip.c:2504 #, c-format msgid "while computing checksum for debug information" msgstr "デバッグ情報のチェックサムを計算中" -#: src/strip.c:2541 +#: src/strip.c:2545 #, c-format msgid "%s: error while creating ELF header: %s" msgstr "%s: ELF ヘッダーを生成している間にエラー: %s" -#: src/strip.c:2559 +#: src/strip.c:2563 #, c-format msgid "%s: error while reading the file: %s" msgstr "%s: ファイルを読込み中にエラー: %s" -#: src/strip.c:2599 src/strip.c:2619 +#: src/strip.c:2603 src/strip.c:2623 #, c-format msgid "while writing '%s'" -msgstr "" +msgstr "書き込み中 '%s'" -#: src/strip.c:2656 src/strip.c:2663 +#: src/strip.c:2660 src/strip.c:2667 #, c-format msgid "error while finishing '%s': %s" msgstr "'%s' の終了中にエラー: %s" -#: src/strip.c:2680 src/strip.c:2756 +#: src/strip.c:2684 src/strip.c:2760 #, c-format msgid "cannot set access and modification date of '%s'" msgstr "'%s' のアクセスと変更日付を設定できません" #: src/unstrip.c:66 msgid "Match MODULE against file names, not module names" -msgstr "" +msgstr "モジュール名ではなく ファイル名で MODULE を一致させる" #: src/unstrip.c:67 msgid "Silently skip unfindable files" -msgstr "" +msgstr "見つからない ファイルを 静かに スキップ" #: src/unstrip.c:70 msgid "Place output into FILE" -msgstr "" +msgstr "出力を FILE に置く" #: src/unstrip.c:72 msgid "Create multiple output files under DIRECTORY" -msgstr "" +msgstr "複数の 出力ファイルを DIRECTORY の下に 作成" #: src/unstrip.c:73 msgid "Use module rather than file names" -msgstr "" +msgstr "ファイル名ではなく モジュール名を 使用" #: src/unstrip.c:75 msgid "Create output for modules that have no separate debug information" -msgstr "" +msgstr "分離された デバッグ情報を 持たない モジュール用に 出力を 作成" #: src/unstrip.c:78 msgid "Apply relocations to section contents in ET_REL files" -msgstr "" +msgstr "ET_REL ファイルの セクション内容に リロケーションを 適用" #: src/unstrip.c:80 msgid "Only list module and file names, build IDs" -msgstr "" +msgstr "モジュール名、 ファイル名、 ビルドIDの リスト表示のみ" #: src/unstrip.c:82 msgid "Force combining files even if some ELF headers don't seem to match" -msgstr "" +msgstr "いくつかの ELF ヘッダー が 一致しない ように 見えた としても ファイルの 結合を 強制" #: src/unstrip.c:126 #, c-format @@ -6161,306 +6167,306 @@ #: src/unstrip.c:185 #, c-format msgid "output directory '%s'" -msgstr "" +msgstr "出力ディレクトリ '%s'" #: src/unstrip.c:194 #, c-format msgid "exactly two file arguments are required" -msgstr "" +msgstr "ちょうど２つの引数が必要です" #: src/unstrip.c:200 #, c-format msgid "-m, -a, -R, and -i options not allowed with explicit files" -msgstr "" +msgstr "明示的なファイルを使用する際は -m, -a, -R, -i オプションは認められていません" #: src/unstrip.c:213 #, c-format msgid "-o or -d is required when using implicit files" -msgstr "" +msgstr "暗黙的なファイルを使用する際は -o または -d が必要です" #: src/unstrip.c:236 #, c-format msgid "cannot create ELF header: %s" -msgstr "" +msgstr "ELF ヘッダーを作成できません: %s" #: src/unstrip.c:240 #, c-format msgid "cannot get shdrstrndx:%s" -msgstr "" +msgstr "shdrstrndx を取得できません: %s" -#: src/unstrip.c:244 src/unstrip.c:2086 +#: src/unstrip.c:244 src/unstrip.c:2088 #, c-format msgid "cannot get ELF header: %s" -msgstr "" +msgstr "ELF ヘッダーを取得できません: %s" #: src/unstrip.c:254 #, c-format msgid "cannot get new zero section: %s" -msgstr "" +msgstr "新しい zero セクションを取得できません: %s" #: src/unstrip.c:257 #, c-format msgid "cannot update new zero section: %s" -msgstr "" +msgstr "新しい zero セクションを更新できません: %s" #: src/unstrip.c:261 #, c-format msgid "cannot copy ELF header: %s" -msgstr "" +msgstr "ELF ヘッダーを複製できません: %s" -#: src/unstrip.c:265 src/unstrip.c:2104 src/unstrip.c:2147 +#: src/unstrip.c:265 src/unstrip.c:2106 src/unstrip.c:2149 #, c-format msgid "cannot get number of program headers: %s" -msgstr "" +msgstr "プログラムヘッダ数を取得できません: %s" -#: src/unstrip.c:270 src/unstrip.c:2108 +#: src/unstrip.c:270 src/unstrip.c:2110 #, c-format msgid "cannot create program headers: %s" -msgstr "" +msgstr "プログラムヘッダーを作成できません: %s" #: src/unstrip.c:276 #, c-format msgid "cannot copy program header: %s" -msgstr "" +msgstr "プログラムヘッダーを複製できません: %s" #: src/unstrip.c:286 #, c-format msgid "cannot copy section header: %s" -msgstr "" +msgstr "セクションヘッダーを複製できません: %s" -#: src/unstrip.c:289 src/unstrip.c:1708 +#: src/unstrip.c:289 src/unstrip.c:1710 #, c-format msgid "cannot get section data: %s" -msgstr "" +msgstr "セクションデータを取得できません: %s" -#: src/unstrip.c:291 src/unstrip.c:1710 +#: src/unstrip.c:291 src/unstrip.c:1712 #, c-format msgid "cannot copy section data: %s" -msgstr "" +msgstr "セクションデータを複製できません: %s" #: src/unstrip.c:319 #, c-format msgid "cannot create directory '%s'" -msgstr "" +msgstr "ディレクトリ '%s' を作成できません" -#: src/unstrip.c:393 src/unstrip.c:657 src/unstrip.c:691 src/unstrip.c:859 -#: src/unstrip.c:1750 +#: src/unstrip.c:393 src/unstrip.c:659 src/unstrip.c:693 src/unstrip.c:861 +#: src/unstrip.c:1752 #, c-format msgid "cannot get symbol table entry: %s" -msgstr "" +msgstr "シンボルテーブル項目を取得できません: %s" -#: src/unstrip.c:409 src/unstrip.c:660 src/unstrip.c:681 src/unstrip.c:694 -#: src/unstrip.c:1771 src/unstrip.c:1966 src/unstrip.c:1990 +#: src/unstrip.c:409 src/unstrip.c:662 src/unstrip.c:683 src/unstrip.c:696 +#: src/unstrip.c:1773 src/unstrip.c:1968 src/unstrip.c:1992 #, c-format msgid "cannot update symbol table: %s" -msgstr "" +msgstr "シンボルテーブルを更新できません: %s" #: src/unstrip.c:419 #, c-format msgid "cannot update section header: %s" -msgstr "" +msgstr "セクションヘッダーを更新できません: %s" -#: src/unstrip.c:467 src/unstrip.c:481 +#: src/unstrip.c:468 src/unstrip.c:483 #, c-format msgid "cannot update relocation: %s" -msgstr "" +msgstr "リロケーションを更新できません: %s" -#: src/unstrip.c:580 +#: src/unstrip.c:582 #, c-format msgid "cannot get symbol version: %s" -msgstr "" +msgstr "シンボルバージョンを取得できません: %s" -#: src/unstrip.c:593 +#: src/unstrip.c:595 #, c-format msgid "unexpected section type in [%zu] with sh_link to symtab" msgstr "" -#: src/unstrip.c:867 +#: src/unstrip.c:869 #, c-format msgid "invalid string offset in symbol [%zu]" -msgstr "" +msgstr "シンボル [%zu] の中に不当な文字列オフセットがあります" -#: src/unstrip.c:1025 src/unstrip.c:1433 +#: src/unstrip.c:1027 src/unstrip.c:1435 #, c-format msgid "cannot read section [%zu] name: %s" -msgstr "" +msgstr "セクション [%zu] の名前を読み込めません: %s" -#: src/unstrip.c:1040 +#: src/unstrip.c:1042 #, c-format msgid "bad sh_link for group section: %s" -msgstr "" +msgstr "グループセクションに対する誤った sh_link です: %s" -#: src/unstrip.c:1046 +#: src/unstrip.c:1048 #, c-format msgid "couldn't get shdr for group section: %s" -msgstr "" +msgstr "グループセクションに対する shdr を取得できませんでした: %s" -#: src/unstrip.c:1051 +#: src/unstrip.c:1053 #, c-format msgid "bad data for group symbol section: %s" -msgstr "" +msgstr "グループシンボルセクションに対する誤ったデータです: %s" -#: src/unstrip.c:1057 +#: src/unstrip.c:1059 #, c-format msgid "couldn't get symbol for group section: %s" -msgstr "" +msgstr "グループセクションに対するシンボルを取得できませんでした: %s" -#: src/unstrip.c:1062 +#: src/unstrip.c:1064 #, c-format msgid "bad symbol name for group section: %s" -msgstr "" +msgstr "グループセクションに対する誤ったシンボル名です: %s" -#: src/unstrip.c:1118 src/unstrip.c:1137 src/unstrip.c:1175 +#: src/unstrip.c:1120 src/unstrip.c:1139 src/unstrip.c:1177 #, c-format msgid "cannot read '.gnu.prelink_undo' section: %s" msgstr "" -#: src/unstrip.c:1155 +#: src/unstrip.c:1157 #, c-format msgid "overflow with shnum = %zu in '%s' section" msgstr "" -#: src/unstrip.c:1166 +#: src/unstrip.c:1168 #, c-format msgid "invalid contents in '%s' section" msgstr "" -#: src/unstrip.c:1073 src/unstrip.c:1554 +#: src/unstrip.c:1075 src/unstrip.c:1556 #, c-format msgid "cannot find matching section for [%zu] '%s'" msgstr "" -#: src/unstrip.c:1337 src/unstrip.c:1353 src/unstrip.c:1634 src/unstrip.c:1925 +#: src/unstrip.c:1339 src/unstrip.c:1355 src/unstrip.c:1636 src/unstrip.c:1927 #, c-format msgid "cannot add section name to string table: %s" msgstr "" -#: src/unstrip.c:1362 +#: src/unstrip.c:1364 #, c-format msgid "cannot update section header string table data: %s" msgstr "" -#: src/unstrip.c:1391 src/unstrip.c:1395 +#: src/unstrip.c:1393 src/unstrip.c:1397 #, c-format msgid "cannot get section header string table section index: %s" msgstr "" -#: src/unstrip.c:1399 src/unstrip.c:1403 src/unstrip.c:1649 +#: src/unstrip.c:1401 src/unstrip.c:1405 src/unstrip.c:1651 #, c-format msgid "cannot get section count: %s" msgstr "" -#: src/unstrip.c:1406 +#: src/unstrip.c:1408 #, c-format msgid "more sections in stripped file than debug file -- arguments reversed?" msgstr "" -#: src/unstrip.c:1458 src/unstrip.c:1569 +#: src/unstrip.c:1460 src/unstrip.c:1571 #, c-format msgid "cannot read section header string table: %s" msgstr "" -#: src/unstrip.c:1628 +#: src/unstrip.c:1630 #, c-format msgid "cannot add new section: %s" msgstr "" -#: src/unstrip.c:1758 +#: src/unstrip.c:1760 #, c-format msgid "symbol [%zu] has invalid section index" -msgstr "" +msgstr "シンボル [%zu] が不当なセクション索引を持っています" -#: src/unstrip.c:1790 +#: src/unstrip.c:1792 #, c-format msgid "group has invalid section index [%zd]" -msgstr "" +msgstr "グループが不当なセクション索引 [%zd] を持っています" -#: src/unstrip.c:2065 +#: src/unstrip.c:2067 #, c-format msgid "cannot read section data: %s" -msgstr "" +msgstr "セクションデータを読み込めません: %s" -#: src/unstrip.c:2094 +#: src/unstrip.c:2096 #, c-format msgid "cannot update ELF header: %s" msgstr "ELF ヘッダーを更新できません: %s" -#: src/unstrip.c:2118 +#: src/unstrip.c:2120 #, c-format msgid "cannot update program header: %s" msgstr "" -#: src/unstrip.c:2123 src/unstrip.c:2206 +#: src/unstrip.c:2125 src/unstrip.c:2208 #, c-format msgid "cannot write output file: %s" msgstr "" -#: src/unstrip.c:2174 +#: src/unstrip.c:2176 #, c-format msgid "DWARF data not adjusted for prelinking bias; consider prelink -u" msgstr "" -#: src/unstrip.c:2177 +#: src/unstrip.c:2179 #, c-format msgid "" "DWARF data in '%s' not adjusted for prelinking bias; consider prelink -u" msgstr "" -#: src/unstrip.c:2197 src/unstrip.c:2249 src/unstrip.c:2261 src/unstrip.c:2351 +#: src/unstrip.c:2199 src/unstrip.c:2251 src/unstrip.c:2263 src/unstrip.c:2353 #, c-format msgid "cannot create ELF descriptor: %s" msgstr "" -#: src/unstrip.c:2235 +#: src/unstrip.c:2237 msgid "WARNING: " msgstr "" -#: src/unstrip.c:2237 +#: src/unstrip.c:2239 msgid ", use --force" msgstr "" -#: src/unstrip.c:2265 +#: src/unstrip.c:2267 msgid "ELF header identification (e_ident) different" msgstr "" -#: src/unstrip.c:2269 +#: src/unstrip.c:2271 msgid "ELF header type (e_type) different" msgstr "" -#: src/unstrip.c:2273 +#: src/unstrip.c:2275 msgid "ELF header machine type (e_machine) different" msgstr "" -#: src/unstrip.c:2277 +#: src/unstrip.c:2279 msgid "stripped program header (e_phnum) smaller than unstripped" msgstr "" -#: src/unstrip.c:2308 +#: src/unstrip.c:2310 #, c-format msgid "cannot find stripped file for module '%s': %s" msgstr "" -#: src/unstrip.c:2312 +#: src/unstrip.c:2314 #, c-format msgid "cannot open stripped file '%s' for module '%s': %s" msgstr "" -#: src/unstrip.c:2327 +#: src/unstrip.c:2329 #, c-format msgid "cannot find debug file for module '%s': %s" msgstr "" -#: src/unstrip.c:2331 +#: src/unstrip.c:2333 #, c-format msgid "cannot open debug file '%s' for module '%s': %s" msgstr "" -#: src/unstrip.c:2344 +#: src/unstrip.c:2346 #, c-format msgid "module '%s' file '%s' is not stripped" msgstr "" -#: src/unstrip.c:2375 +#: src/unstrip.c:2377 #, c-format msgid "cannot cache section addresses for module '%s': %s" msgstr "" @@ -6509,14 +6515,14 @@ "was found, or . if FILE contains the debug information." msgstr "" -#: tests/backtrace.c:436 +#: tests/backtrace.c:483 msgid "Run executable" msgstr "" #: tests/dwflmodtest.c:209 msgid "Additionally show function names" -msgstr "" +msgstr "関数名を さらに 表示" #: tests/dwflmodtest.c:210 msgid "Show instances of inlined functions" -msgstr "" +msgstr "インライン関数の実体を表示" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/example-content.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/example-content.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/example-content.po 2021-08-03 08:53:35.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/example-content.po 2022-02-11 23:04:17.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: 2021-08-02 17:23+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:17+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fcitx-mozc.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fcitx-mozc.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fcitx-mozc.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fcitx-mozc.po 2022-02-11 23:04:14.000000000 +0000 @@ -21,8 +21,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:06+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: ../eim.cc:187 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fetchmail.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fetchmail.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fetchmail.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fetchmail.po 2022-02-11 23:04:25.000000000 +0000 @@ -17,10 +17,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:18+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 15:09+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: checkalias.c:174 #, c-format @@ -159,43 +159,43 @@ "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "最大取り込み数である %d 通に達しました; メッセージが %d 通、サーバ %s にアカウント %s 宛で残されています。\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "%d 秒間サーバ %s の接続応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "%d 秒間サーバ %s の応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "%d 秒間 %s の応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "転送先のプログラムの応答を %d 秒間待ちましたが制限時間を超過しました。\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "%d 秒間待機しましたが制限時間を超過しました。\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail 実行中に制限時間の超過が繰り返し発生しました" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "" "Fetchmail saw more than %d timeouts while attempting to get mail from " "%s@%s.\n" msgstr "Fetchmail 実行中に %d 回以上、%s@%s 宛に届いたメール受信を試みましたが、その度に制限時間を超過しました。\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -211,74 +211,74 @@ "再起動しない限り fetchmail はこのメールボックスより\n" "メールを取り出しませんので注意して下さい。\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "サーバへの接続開始前に実行したコマンドがシグナル %d で終了しました\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "サーバへの接続開始前に実行したコマンドがステータス %d を返して終了しました。\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "%s にあるべき HESIOD pobox がありません。\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Lead server の名前がありません。\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "%s の 公式 DNS 名(%s)を検索できませんでした: %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "%s プロトコルを利用した %s への接続に失敗しました" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "SSL による接続に失敗しました。\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "アカウント %s@%s が Lock-busy 状態です。\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "%s@%s のサーバが busy 状態です。\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "%s@%s%s の認証に失敗しました\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (以前は認証されました)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "" "これについてのヘルプは http://www.fetchmail.info/fetchmail-FAQ.html#R15 を見てください\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "fetchmail 実行中 %s@%s の認証に失敗" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail 実行中に %s@%s 宛に届いたメールを取り出せませんでした。\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -291,7 +291,7 @@ "他の要因によるものであると思われますが、何故 login に失敗したのか\n" "サーバから有益な情報が送信されていないため、fetchmail では判断しかねます。" -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -310,7 +310,7 @@ "fetchmail デーモンは引続き接続を試みます。\n" "サービスが復旧しない限り何も通知が出されないことを了承願います。" -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -328,174 +328,174 @@ "fetchmail デーモンは引続き接続を試みます。\n" "サービスが復旧しない限り何も通知が出されないことを了承願います。" -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "すぐに %s@%s 宛メッセージの再取得を試みます\n" -#: driver.c:1247 +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" -msgstr "%s@%s に対する不明なログイン又は認証のエラーです。\n" +msgstr "%s@%s に対する不明なログイン又は認証のエラーです\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "%s@%s に対する認証が行われました。\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "fetchmail %s@%s 認証完了" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "%s@%s のログインが完了し fetchmail によるアクセスが可能となりました。\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "サービスが復帰しました。\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "選択をして下さい。選択されない場合はフォルダ %s に再度アクセスします。\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "選択をして下さい。選択されない場合はデフォルトのフォルダに再度アクセスします。\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "アカウント %s , サーバ %s (フォルダ %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "アカウント %s , サーバ %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "%s にアクセスしています。\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d 通のメッセージ (そのうち %d 通は %s) が%s宛に届いています" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "既に読み込んでいます" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d 通のメッセージが %s 宛に届いています" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d バイト)\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "%s 宛にメッセージは届いておりません。\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "メッセージ数が偽造されています!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "多くのメールがスキップされました(%d > %d) %s による一時的なエラーのためです\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "socket" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "RFC822 ヘッダの欠落か誤謬" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "クライアント/サーバ同期" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "クライアント/サーバプロトコル" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "サーバの lock busy" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP 通信" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS 参照" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "不明なエラー" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "%sエラーが発生しました。%s@%sからメールを受信し SMTP サーバ %s へ送信しているところでした。\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "(不明なホスト)" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "%sエラーが %s@%s よりメールを受信している最中に発生しました。\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "接続終了後に実行したコマンドがシグナル %d で終了しました\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "接続終了後に実行するコマンドがステータス %d を返しました。\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Kerberos V4 には対応しておりません。\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Kerberos V5 には対応しておりません。\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "オプション --flush と %s は同時に設定できません。\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "オプション --all と %s は同時に設定できません。\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "オプション --limit と %s は同時に設定できません。\n" @@ -617,19 +617,19 @@ msgid "Unknown ETRN error %d\n" msgstr "不明な ETRN のエラーです (%d)\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "オプション --keep は ETRN とは同時に利用できません。\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "オプション --flush は ETRN とは同時に利用できません。\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "オプション --folder は ETRN とは同時に利用できません。\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "オプション --check は ETRN とは同時に利用できません。\n" @@ -664,259 +664,259 @@ msgid "could not get current working directory\n" msgstr "カレントディレクトリを取得できません\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "fetchmail リリース %s" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "nodetach オプションが有効ですので、logfile オプションを無視します。\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "デーモンモードではありませんので、logfile オプションを無視します。\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "ログファイル \"%s\" が存在しませんので logfile オプションを無視します。\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "ログファイル \"%s\" には書き込みできません、中止します。\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "" "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "syslog と logfile オプションが両方とも設定されているので syslog を無視し、%s にログを書き込みます" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "コマンドライン%s%sよりオプションを設定します。\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " 及び " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "メールサーバの準備が整いません -- おそらく %s が存在しないためです\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: メールサーバが指定されておりません。\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: 実行中の fetchmail は存在しません。\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: エラーの発生により%s fetchmail (PID=%ld) を終了します。\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "バックグラウンドの" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "フォアグラウンドの" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail (PID=%ld) を終了しました。\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "" "fetchmail: can't check mail while another fetchmail to same host is " "running.\n" msgstr "fetchmail: 同じホストに対して別の fetchmail が交信しているためメールの確認が出来ません。\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "" "fetchmail: can't poll specified hosts with another fetchmail running at " "%ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) が実行中のため指定されたホストと接続できません。\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) がフォアグラウンド動作中です。\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "" "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: バックグラウンドで fetchmail が動作中のためオプションが受け付けられません。\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: バックグラウンドの fetchmail (PID=%ld) が動作を再開しました。\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: 同時に動作していた fetchmail (PID=%ld) が突然消滅しました。\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: %s@%s にログインするためのパスワードがありません。\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "%s@%s にログインするためのパスワードを入力して下さい : " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: バックグラウンドに移れません。終了します。\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "fetchmail %s デーモンを動作開始します\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "ログを追加するために %s を開くことが出来ませんでした\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check モードが有効なので、メールを取り込みません\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "%s の編集された時間を調べることができません。(エラー %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "%s が編集されたため fetchmail を再起動します。\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "ディレクトリが回復できないので、再実行は失敗するでしょう。\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "fetchmail の再起動に失敗しました。\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "認証失敗か制限時間超過が頻発したため %s との交信を飛ばします。\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "時間間隔に達していないので %s の一時保管を行いません。\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Query status=0 (SUCCESS)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Query status=1 (NOMAIL)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Query status=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Query status=3 (AUTHFAIL)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Query status=4 (PROTOCOL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Query status=5 (SYNTAX)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Query status=6 (IOERR)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Query status=7 (ERROR)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Query status=8 (EXCLUDE)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Query status=9 (LOCKBUSY)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Query status=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Query status=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Query status=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Query status=13 (MAXFETCH)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Query status=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "全ての接続が動作不全に陥ってしまいました。終了します。\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "%s から %d秒休眠状態になります。\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "%s 信号を受信したため動作を再開しました。\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "%d 番の信号を受信したため動作を再開しました。\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "%s に動作を再開しました。\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "通常の終了です。status %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "動作制御ファイルの編集時間を確認することができませんでした。\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "警告 : 設定ファイル中にホスト %s を複数回記述しています\n" @@ -925,680 +925,680 @@ msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n" msgstr "fetchmail: エラー : 設定ファイル中に \"defaults\" を複数回記述しています\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "SSL 対応がコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "KERBEROS v4 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "KERBEROS v5 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "GSSAPI 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "" "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: 警告 : %s より multidrop fetch を確認するための DNS が有効でありません。\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "警告: %s へのマルチドロップを行うにはエンベロープオプションが必要です!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "警告: すべてのメールが postmaster 宛にフォワードされてしまう可能性があります!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "" "fetchmail: %s configuration invalid, specify positive port number for " "service or port\n" msgstr "fetchmail: サーバ %s の設定が無効です。サービス番号、ポート番号は負の数ではいけません。\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "" "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: サーバ %s の設定が無効です。 RPOP では privileged port を利用する必要があります。\n" -#: fetchmail.c:1429 +#: fetchmail.c:1447 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "サーバ %s の設定が無効です。LMTP はデフォルトの SMTP ポートを利用できません。\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "fetchall と keep オプションはデーモンモード、休止モードでは同時に指定できません。\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "" "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: エラー: アイドルモードは複数のフォルダまたはアカウントに対しては動作しません!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "シグナル %d で終了しました。\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が開始されました。\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "POP2 に対応した設定が行われておりません。\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "POP3 に対応した設定が行われておりません。\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "IMAP に対応した設定が行われておりません。\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "ETRN に対応した設定が行われておりません。\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "ODMR に対応した設定が行われておりません。\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "対応していないプロトコルが選択されました。\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が終了しました。\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "交信間隔は %d 秒です。\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "ログファイルは %s です。\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "ID ファイルは %s です。\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "進行状況のメッセージは syslog を通して記録されます。\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail はアドレスを書き換え、Received を生成しません。\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail はログファイル中にも進行状況を示す . を書き込みます。\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail は誤った宛先の書かれたメッセージを %s に転送します。\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail は postmaster 宛にエラーメールを送信します。\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail は送り主にエラーメッセージを送信します。\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail は恒久的なエラーを恒久的なものとして扱います（メッセージを破棄）。\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail は恒久的なエラーを一時的なものとして扱います（メッセージを保存）。\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "アカウント %s@%s でのオプションです。\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " メールはホスト %s を介してやりとりされます。\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " このサーバに対してのアクセスは %d の間隔で行われます。\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " サーバの本名は %s です。\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にはアクセスされません。\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にアクセスされます。\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " パスワード入力が必要です。\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP secret = \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = \"%s\".\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " パスワード = \"%s\"\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Kerberos %s 認証による KPOP プロトコルを利用します" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " %s プロトコルを利用します" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (%s サービスを利用します)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (デフォルトのポートを利用します)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (UIDL の利用を強制します)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " 利用可能な全ての認証方式を試みます。\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " パスワードによる認証を強制的に行います。\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " MSN 認証を強制的に行います。\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " NTLM 認証を強制的に行います。\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " OTP による認証を強制的に行います。\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI 方式による認証を強制的に行います。\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos V4 方式による認証を強制的に行います。\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos V5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " End-to-end 暗号化であるとします。\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " メールサービスは %s によって行われます。\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL による暗号化通信が行われます。\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " %s プロトコルを利用します。\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " SSL サーバ証明書の確認が設定されました。\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " SSL サーバ証明書の確認を無効にしました。\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " SSL 信頼する証明書はファイル %s に格納されています。\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " SSL 信用可能証明書は %s に格納されています。\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSLサーバの CommonName: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL key fingerprint (server key と照合されました): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " サーバの応答制限時間は %d 秒です" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (デフォルト)。\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " デフォルトのメールボックスが選択されました。\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " 選択されたメールボックス:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " すべてのメッセージを取得します。 (--all on)\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " 新しいメッセージだけを取得します。 (--all off)\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " 取得したメッセージをサーバにも保持します。 (--keep on)\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " 取得したメッセージはサーバに保持しません (--keep off)\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid "" " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " 古いメッセージは取得の前に消去されます。 (--flush on)\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid "" " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " メッセージ取得の前に古いメッセージを消去しません。 (--flush off)\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid "" " Oversized messages will be flushed before message retrieval (--limitflush " "on).\n" msgstr " 容量超過したメッセージは取得の前に消去されます。 (--limitflush on)\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid "" " Oversized messages will not be flushed before message retrieval (--" "limitflush off).\n" msgstr " メッセージ取得の前に容量超過したメッセージを消去しません。 (--limitflush off)\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " server-local アドレスへの書き換えを行います。 (--norewrite off)\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " server-local アドレスへの書き換えを行いません。 (--norewrite on)\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " 改行記号の除去を行います。 (stripcr on)\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " 改行記号の除去を行いません。 (stripcr off)\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " 改行記号の追加を行います。 (forcecr on)\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " 改行記号の追加を行いません。 (forcecr off)\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid "" " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Content-Transfer-Encoding の変換を行いません。 (pass8bits on)\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid "" " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Content-Transfer-Encoding の変換を行います。 (pass8bits off)\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME のデコードを行います。 (mimedecode on)\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME のデコードを行いません。 (mimedecode off)\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " サーバアクセス後、休止します。 (idle on)\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " サーバアクセス後、休止しません。 (idle off)\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " 記述のある Status 行を破棄します。 (dropstatus on)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " 記述のある Status 行を保持します。 (dropstatus off)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Delivered-To 行を保持します。 (dropdelivered on)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Delivered-To 行を破棄します。 (dropdelivered off)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " メッセージの大きさの最大 %d バイトに制限されます。 (--limit %d)\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--limit 0)\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " メッセージの大きさに対する警告は %d 秒毎に行われます。 (--warnings %d)\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " サーバアクセスの度にメッセージの大きさの警告を行います。 (--warnings 0)\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " 一回の接続で取得できるメッセージは %d 通に制限されます。(--fetchlimit %d)\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " 一回の接続で取得できるメッセージの数に制限はありません。 (--fetchlimit 0)\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " 取得できるメッセージのサイズは %d に制限されます。(--fetchsizelimit %d)\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--fetchsizelimit 0)\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " 接続ごとに UID の二分木検索を行います。(--fastuidl 1)\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid "" " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " %d 回 (%d 接続のうち) UID の二分木検索を行います。(--fastuidl %d)\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " 接続ごとに UID の線形検索を行います。(--fastuidl 0)\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " 一回の接続で転送できるメッセージは %d 通に制限されます。\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " 一回の接続で転送できるメッセージの数に制限はありません。 (--batchlimit 0)\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " メッセージは %d 通毎に削除されます。 (--expunge %d)\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " メッセージを削除する間隔は設定されていません。 (--expunge 0)\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " メールを取得するドメインは :" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (デフォルト)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " ファイル %s に BSMTP 形式でメッセージが追記されます。\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " アプリケーション\"%s\"によってメッセージが送信されます。\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " 受信したメッセージは %cMTP によって次に示すサーバへ転送されます :" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " ホストの MAIL FROM 行のアドレスは %s です。\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " SMTP によって配信される RCPT TO 行に記されたアドレスは %s です。\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " 送信先のスパムブロックに対する応答は :" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " スパムブロックは行われません。\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって行われます。\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " 接続前に実行する命令はありません。\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって切断されます。\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " 接続終了時に行う命令はありません。\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " このホストに対する localname は宣言されていません。\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " `multi-drop' モード: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " `single-drop' モード: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d 個の localname が存在します。\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " multidrop アドレスを検索する DNS が有効です。\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " multidrop アドレスを検索する DNS が無効です。\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid "" " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " サーバの別名は multidrop アドレスと IP アドレスで比較されます。\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " サーバの別名は multidrop アドレスとホスト名で比較されます。\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Envelope-address によるルーティングは行われません。\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Envelope header は %s とされます。\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " %d 個を超える Envelope header はスキップされます。\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefix %s はユーザ ID から除去されます。\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Prefix は除去されません。\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " 予め宣言されたメールサーバの別名:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " ローカルドメイン:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " 接続はインターフェイス %s を通して行われます。\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " 接続に利用すべきインターフェイスの指定はありません。\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " 接続は %s の状態を監視して行われます。\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " 状態を監視して接続はおこないません。\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " サーバとの接続にはプラグイン \"%s\" を利用します。(--plugin %s)\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " サーバとの接続に利用するプラグインの指定はありません。\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " アプリケーションとの接続にはプラグアウト\"%s\"を利用します。(--plugout %s)\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " アプリケーションとの接続に利用するプラグアウトの指定はありません。\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " このホストからの UID は記録されていません。\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d 個の UID が記録されています。\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " 接続情報は Received ヘッダに追加されます。\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Poll 追跡情報は Received ヘッダに追加されません。\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " 不良ヘッダを持つメッセージを拒否します。\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " 不良ヘッダを持つメッセージを受け入れます。\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " プロパティ \"%s\" は無視されます。\n" @@ -1711,125 +1711,125 @@ msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: スレッドは %d 秒間スリープします。\n" -#: imap.c:75 +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "IMAP サーバから BYE 応答を受け取りました: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "\"%s\" 内でメッセージ数が偽造されています!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "\"%s\" 内でEXPUNGEの数が偽造されています!" -#: imap.c:355 +#: imap.c:91 msgid "Protocol identified as IMAP4 rev 1\n" msgstr "プロトコルは IMAP4 rev 1 と認識されました。\n" -#: imap.c:361 +#: imap.c:95 msgid "Protocol identified as IMAP4 rev 0\n" msgstr "プロトコルは IMAP4 rev 0 と認識されました。\n" -#: imap.c:368 +#: imap.c:99 msgid "Protocol identified as IMAP2 or IMAP2BIS\n" msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n" -#: imap.c:385 +#: imap.c:111 msgid "will idle after poll\n" msgstr "接続の後、休止します。\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: TLS へのアップグレードに成功。\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: TLS へのアップグレードに失敗。\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: 警告: サーバーが STARTTLS を提案しましたが sslproto '' が提示されました。\n" -#: imap.c:607 +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n" -#: imap.c:691 +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "メッセージの削除数が合いません (%d (実際) != %d (予想))\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu は未読です。\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u は未読です。\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "再アクセスに失敗しました。\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d 通のメッセージが再アクセスの後に存在します。\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "メールボックスの選択に失敗しました\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "最初のアクセスから %d 通のメッセージがあります。\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "削除に失敗しました。\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "削除の後、%d 通のメッセージが残っています。\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "未読メッセージの検索に失敗しました。\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u は未読です。\n" -#: imap.c:1078 +#: imap.c:1156 msgid "" "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "警告: サーバからメッセージサイズとして報告された数値が不適切だったので無視します。\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "正しくないFETCH応答が返ってきました: %s\n" @@ -1934,7 +1934,7 @@ msgid "challenge mismatch\n" msgstr "challenge の不一致です。\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: ロックファイル \"%s\" の読み込みに失敗しました。: %s\n" @@ -1943,7 +1943,7 @@ msgid "fetchmail: removing stale lockfile\n" msgstr "fetchmail: 古いロックファイルを削除します。\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: ロックファイル \"%s\" を開けません。: %s\n" @@ -2008,19 +2008,19 @@ msgid "receiving message data\n" msgstr "メッセージを受信しています\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "オプション --keep は ODMR では対応しておりません。\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "オプション --flush は ODMR では対応しておりません。\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "オプション --folder は ODMR では対応しておりません。\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "オプション --check は ODMR では対応しておりません。\n" @@ -2032,7 +2032,7 @@ msgid "Could not decode OTP challenge\n" msgstr "OTP challenge のデコードが出来ませんでした。\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Secret pass phrase: " @@ -2381,7 +2381,7 @@ msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 はパスワードによる認証のみサポートします。断念します。\n" -#: pop3.c:330 +#: pop3.c:338 msgid "" "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "警告: \"Maillennium POP3\"サーバです。TOP の代わりに RETR コマンドを使用します。\n" @@ -2394,71 +2394,71 @@ msgid "The CAPA command is however necessary for TLS.\n" msgstr "CAPA コマンドは TLS では必須です。\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています。\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: 警告: サーバーが STLS を提案しましたが sslproto '' が提示されました。\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "使用を許可されたすべての認証手段を試みましたが、すべて失敗しました。実行を継続できません。\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "greeting 中に APOP タイムスタンプが存在しません。\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "greeting 中の タイムスタンプが不正です。\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "無効な APOP タイムスタンプです。\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "POP3_auth 中で定義されていないプロトコルが要求されました。\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "上流サーバからの UIDL 応答に対応できません。\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "サーバが誤ったメッセージの UID に応答しました。\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) は削除されましたが、まだ存在しています!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "サーバリストにメッセージが挿入されています。取り扱うことができません。\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "プロトコルエラーです。\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "UIDL を取り込み中にプロトコルエラーが発生しました\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "POP3 では --folder オプションは利用できません。\n" @@ -2507,11 +2507,11 @@ msgid "File %s must be owned by you.\n" msgstr "%s の所有者は貴方自身である必要があります。\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "不明なシステムエラーです" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (ログメッセージが不完全です)\n" @@ -2884,80 +2884,80 @@ msgid "smtp listener protocol error\n" msgstr "SMTP リスナでプロトコルエラーが発生しました\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc ができませんでした。\n" -#: socket.c:174 +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair に失敗しました。\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork できませんでした。\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 ができませんでした。\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "%s を実行中です。(ホスト %s サービス %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) ができませんでした。\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\") エラー: %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "オプション --service を足して試してください(FAQ の R12 も参照のこと)。\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "不明 (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "%s/%s へ接続しようとしています..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "ソケット %s を作成できません\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "名前 %d: ソケットファミリー %d タイプ %d を作成できません: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "接続に失敗しました。\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "%s:%s への接続に失敗しました。バッファ [%s/%s] : %s\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "名前 %d: %s:%s [%s/%s] への接続を開けません: %s\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "接続しました。\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2966,133 +2966,133 @@ "今回の問い合わせで接続エラーが発生しました:\n" "%s" -#: socket.c:417 +#: socket.c:443 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL からの報告: %s\n" -#: socket.c:652 +#: socket.c:670 #, c-format msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" msgstr "SSL の検証コールバック深度 %d: preverify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:689 msgid "Server certificate:\n" msgstr "サーバ証明書:\n" -#: socket.c:663 +#: socket.c:694 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "root から peer への証明パスで深さ %d で始まっています\n" -#: socket.c:666 +#: socket.c:697 #, c-format msgid "Certificate at depth %d:\n" msgstr "深さ%d での証明書:\n" -#: socket.c:672 +#: socket.c:703 #, c-format msgid "Issuer Organization: %s\n" msgstr "発行元の組織: %s\n" -#: socket.c:675 +#: socket.c:706 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "警告 : 発行元の組織名が長過ぎます。(捏造された可能性があります)\n" -#: socket.c:677 +#: socket.c:708 msgid "Unknown Organization\n" msgstr "不明な組織です。\n" -#: socket.c:679 +#: socket.c:710 #, c-format msgid "Issuer CommonName: %s\n" msgstr "発行元の CommonName: %s\n" -#: socket.c:682 +#: socket.c:713 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "警告 : 発行元の CommonName が長過ぎます。 (捏造された可能性があります)\n" -#: socket.c:684 +#: socket.c:715 msgid "Unknown Issuer CommonName\n" msgstr "不明な発行元の CommonName です。\n" -#: socket.c:690 +#: socket.c:721 #, c-format msgid "Subject CommonName: %s\n" msgstr "Subject CommonName: %s\n" -#: socket.c:696 +#: socket.c:727 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "不正証明書 : Subject CommonName が長過ぎます。\n" -#: socket.c:702 +#: socket.c:733 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "不正証明書 : Subject CommonName が NUL を含んでいます。中止します。\n" -#: socket.c:730 +#: socket.c:761 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "サブジェクトの別名: %s\n" -#: socket.c:736 +#: socket.c:767 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "不正証明書 : サブジェクトの別名 が NUL を含んでいます。中止します。\n" -#: socket.c:753 +#: socket.c:784 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "サーバの CommonName が一致しません : %s != %s\n" -#: socket.c:760 +#: socket.c:791 msgid "Server name not set, could not verify certificate!\n" msgstr "サーバ名が設定されておらず、証明書を検証できません。\n" -#: socket.c:765 +#: socket.c:796 msgid "Unknown Server CommonName\n" msgstr "不明なサーバの CommonName です。\n" -#: socket.c:767 +#: socket.c:798 msgid "Server name not specified in certificate!\n" msgstr "証明書中にサーバ名が指定されていません。\n" -#: socket.c:779 +#: socket.c:810 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() ができませんでした。\n" -#: socket.c:783 +#: socket.c:814 msgid "Out of memory!\n" msgstr "メモリ不足です。\n" -#: socket.c:791 +#: socket.c:822 msgid "Digest text buffer too small!\n" msgstr "ダイジェストテキストバッファが少な過ぎます。\n" -#: socket.c:797 +#: socket.c:828 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s の key fingerprint は次の通りです。: %s\n" -#: socket.c:801 +#: socket.c:832 #, c-format msgid "%s fingerprints match.\n" msgstr "%s の fingerprints が一致しました。\n" -#: socket.c:803 +#: socket.c:834 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s の fingerprints が一致しませんでした。\n" -#: socket.c:815 +#: socket.c:846 #, c-format msgid "Server certificate verification error: %s\n" msgstr "サーバ証明書検証エラー: %s\n" -#: socket.c:830 +#: socket.c:861 #, c-format msgid "Broken certification chain at: %s\n" msgstr "証明パスが %s で壊れています\n" -#: socket.c:832 +#: socket.c:863 msgid "" "This could mean that the server did not provide the intermediate CA's " "certificate(s), which is nothing fetchmail could do anything about. For " @@ -3102,7 +3102,7 @@ "このエラーは、サーバが中間CAの証明書を提供しなかったことを意味し、fetchmail はどうすることもできません。詳しくは fetchmail " "に同梱されているドキュメント README.SSL-SERVER を参照してください。\n" -#: socket.c:842 +#: socket.c:873 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "トラストアンカー証明書がありません: %s\n" @@ -3118,51 +3118,51 @@ "を走らせる必要があることを示しています。詳しくは、マニュアルページの --sslcertpath と --sslcertfile " "についての記述を参照してください。\n" -#: socket.c:919 socket.c:995 +#: socket.c:950 socket.c:1026 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "使用中の OpenSSL バージョンは SSL v3 をサポートしていません。\n" -#: socket.c:937 socket.c:1013 +#: socket.c:968 socket.c:1044 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "使用中の OpenSSL バージョンは TLS v1.1 をサポートしていません。\n" -#: socket.c:948 socket.c:1024 +#: socket.c:979 socket.c:1055 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "使用中の OpenSSL バージョンは TLS v1.2 をサポートしていません。\n" -#: socket.c:959 socket.c:1035 +#: socket.c:990 socket.c:1066 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "使用中の OpenSSL バージョンは TLS v1.3 をサポートしていません。\n" -#: socket.c:968 socket.c:1045 +#: socket.c:999 socket.c:1076 #, c-format msgid "" "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "無効な SSL プロトコル `%s' が指定されたため、デフォルトの自動選択 (auto)を利用します。\n" -#: socket.c:1078 +#: socket.c:1115 #, c-format msgid "" "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "読み込んだ OpenSSL ライブラリ %#lx はヘッダーの %#lx より古く、動作しません。\n" -#: socket.c:1083 +#: socket.c:1120 #, c-format msgid "" "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "読み込んだ OpenSSL ライブラリ %#lx はヘッダーの %#lx より新しいので、続けます。\n" -#: socket.c:1103 +#: socket.c:1140 msgid "File descriptor out of range for SSL" msgstr "ファイル識別子が SSL としては長過ぎます" -#: socket.c:1124 +#: socket.c:1162 msgid "" "Note that some distributions disable older protocol versions in weird non-" "standard ways. Try a newer protocol version.\n" msgstr "古いプロトコルバージョンを、おかしな方法で無効にするディストリビューションもあります。新しいプロトコルバージョンを試してください。\n" -#: socket.c:1192 +#: socket.c:1259 #, c-format msgid "" "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to " @@ -3170,7 +3170,7 @@ msgstr "" "警告: SSL_set_tlsext_host_name(%p, \"%s\") が失敗しました (code %#lx), 続けます。\n" -#: socket.c:1207 +#: socket.c:1289 #, c-format msgid "" "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying " @@ -3178,43 +3178,43 @@ msgstr "" "警告: X509_VERIFY_PARAM_set1_host(%p, \"%s\") が失敗しました (code %#x), 続けます。\n" -#: socket.c:1244 +#: socket.c:1342 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "サーバーが SSL_connect() での接続を 確立する前に切断しました。\n" -#: socket.c:1247 +#: socket.c:1345 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "SSL_connect() の実行中にシステムエラーが発生 : %s\n" -#: socket.c:1247 +#: socket.c:1345 msgid "handshake failed at protocol or connection level." msgstr "ハンドシェイクがプロトコルレベルまたはコネクションレベルで失敗しました。" -#: socket.c:1267 +#: socket.c:1365 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "現在の SSL/TLS 暗号を取得することができません - セッションが確立されていない?\n" -#: socket.c:1270 +#: socket.c:1368 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: プロトコル %s 暗号 %s を使用中、 %d/%d 秘密/処理済み ビット数\n" -#: socket.c:1277 +#: socket.c:1375 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "証明書/fingerprint 検証が幾つか飛ばされました。\n" -#: socket.c:1294 +#: socket.c:1392 msgid "" "Warning: the connection is insecure, continuing anyways. (Better use --" "sslcertck!)\n" msgstr "警告:接続は保護されていません、続けます。(--sslcertckの使用をお勧めします!)\n" -#: socket.c:1336 +#: socket.c:1434 msgid "Cygwin socket read retry\n" msgstr "Cygwin ソケット読み込み リトライ\n" -#: socket.c:1339 +#: socket.c:1437 msgid "Cygwin socket read retry failed!\n" msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/findutils.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/findutils.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/findutils.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/findutils.po 2022-02-11 23:04:14.000000000 +0000 @@ -15,10 +15,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 15:10+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: find/exec.c:123 #, c-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/flex.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/flex.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/flex.po 2021-08-03 08:53:36.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/flex.po 2022-02-11 23:04:19.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: 2021-08-02 16:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:11+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fprintd.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fprintd.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fprintd.po 2021-08-03 08:53:33.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fprintd.po 2022-02-11 23:04:16.000000000 +0000 @@ -16,258 +16,258 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:55+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: ../data/net.reactivated.fprint.device.policy.in.h:1 +#: data/net.reactivated.fprint.device.policy.in:13 msgid "Verify a fingerprint" msgstr "指紋の検証" -#: ../data/net.reactivated.fprint.device.policy.in.h:2 +#: data/net.reactivated.fprint.device.policy.in:14 msgid "Privileges are required to verify fingerprints." msgstr "指紋を検証するには特権が必要になります。" -#: ../data/net.reactivated.fprint.device.policy.in.h:3 +#: data/net.reactivated.fprint.device.policy.in:23 msgid "Enroll new fingerprints" msgstr "新しい指紋の登録" -#: ../data/net.reactivated.fprint.device.policy.in.h:4 +#: data/net.reactivated.fprint.device.policy.in:24 msgid "Privileges are required to enroll new fingerprints." msgstr "新しい指紋を登録するには特権が必要になります。" -#: ../data/net.reactivated.fprint.device.policy.in.h:5 +#: data/net.reactivated.fprint.device.policy.in:33 msgid "Select a user to enroll" msgstr "登録するユーザーの選択" -#: ../data/net.reactivated.fprint.device.policy.in.h:6 +#: data/net.reactivated.fprint.device.policy.in:34 msgid "Privileges are required to enroll new fingerprints for other users." msgstr "他のユーザーに対する新しい指紋を登録するには特権が必要になります。" -#: ../src/device.c:385 +#: src/device.c:690 #, c-format msgid "Device was not claimed before use" msgstr "装置が使用前に要求されませんでした" -#: ../src/device.c:395 +#: src/device.c:699 #, c-format msgid "Device already in use by another user" msgstr "装置がすでに他のユーザーにより使用されています" -#: ../pam/fingerprint-strings.h:31 +#: pam/fingerprint-strings.h:50 msgid "Place your finger on the fingerprint reader" msgstr "指紋読取装置に指を置いてください" -#: ../pam/fingerprint-strings.h:32 +#: pam/fingerprint-strings.h:51 #, c-format msgid "Place your finger on %s" msgstr "%s に指を置いてください" -#: ../pam/fingerprint-strings.h:33 +#: pam/fingerprint-strings.h:52 msgid "Swipe your finger across the fingerprint reader" msgstr "指紋読取装置に指をなぞってください" -#: ../pam/fingerprint-strings.h:34 +#: pam/fingerprint-strings.h:53 #, c-format msgid "Swipe your finger across %s" msgstr "%s に指をなぞってください" -#: ../pam/fingerprint-strings.h:36 +#: pam/fingerprint-strings.h:55 msgid "Place your left thumb on the fingerprint reader" msgstr "指紋読取装置に左の親指を置いてください" -#: ../pam/fingerprint-strings.h:37 +#: pam/fingerprint-strings.h:56 #, c-format msgid "Place your left thumb on %s" msgstr "%s に左の親指を置いてください" -#: ../pam/fingerprint-strings.h:38 +#: pam/fingerprint-strings.h:57 msgid "Swipe your left thumb across the fingerprint reader" msgstr "指紋読取装置に左の親指をなぞってください" -#: ../pam/fingerprint-strings.h:39 +#: pam/fingerprint-strings.h:58 #, c-format msgid "Swipe your left thumb across %s" msgstr "%s に左の親指をなぞってください" -#: ../pam/fingerprint-strings.h:41 +#: pam/fingerprint-strings.h:60 msgid "Place your left index finger on the fingerprint reader" msgstr "指紋読取装置に左の人指し指を置いてください" -#: ../pam/fingerprint-strings.h:42 +#: pam/fingerprint-strings.h:61 #, c-format msgid "Place your left index finger on %s" msgstr "%s に左の人指し指を置いてください" -#: ../pam/fingerprint-strings.h:43 +#: pam/fingerprint-strings.h:62 msgid "Swipe your left index finger across the fingerprint reader" msgstr "指紋読取装置に左の人指し指をなぞってください" -#: ../pam/fingerprint-strings.h:44 +#: pam/fingerprint-strings.h:63 #, c-format msgid "Swipe your left index finger across %s" msgstr "%s に左の人指し指をなぞってください" -#: ../pam/fingerprint-strings.h:46 +#: pam/fingerprint-strings.h:65 msgid "Place your left middle finger on the fingerprint reader" msgstr "指紋読取装置に左の中指を置いてください" -#: ../pam/fingerprint-strings.h:47 +#: pam/fingerprint-strings.h:66 #, c-format msgid "Place your left middle finger on %s" msgstr "%s に左の中指を置いてください" -#: ../pam/fingerprint-strings.h:48 +#: pam/fingerprint-strings.h:67 msgid "Swipe your left middle finger across the fingerprint reader" msgstr "指紋読取装置に左の人指し指をなぞってください" -#: ../pam/fingerprint-strings.h:49 +#: pam/fingerprint-strings.h:68 #, c-format msgid "Swipe your left middle finger across %s" msgstr "%s に左の中指をなぞってください" -#: ../pam/fingerprint-strings.h:51 +#: pam/fingerprint-strings.h:70 msgid "Place your left ring finger on the fingerprint reader" msgstr "指紋読取装置に左の薬指を置いてください" -#: ../pam/fingerprint-strings.h:52 +#: pam/fingerprint-strings.h:71 #, c-format msgid "Place your left ring finger on %s" msgstr "%s に左の薬指を置いてください" -#: ../pam/fingerprint-strings.h:53 +#: pam/fingerprint-strings.h:72 msgid "Swipe your left ring finger across the fingerprint reader" msgstr "指紋読取装置に左の薬指をなぞってください" -#: ../pam/fingerprint-strings.h:54 +#: pam/fingerprint-strings.h:73 #, c-format msgid "Swipe your left ring finger across %s" msgstr "%s に左の薬指をなぞってください" -#: ../pam/fingerprint-strings.h:56 +#: pam/fingerprint-strings.h:75 msgid "Place your left little finger on the fingerprint reader" msgstr "指紋読取装置に左の小指を置いてください" -#: ../pam/fingerprint-strings.h:57 +#: pam/fingerprint-strings.h:76 #, c-format msgid "Place your left little finger on %s" msgstr "%s に左の小指を置いてください" -#: ../pam/fingerprint-strings.h:58 +#: pam/fingerprint-strings.h:77 msgid "Swipe your left little finger across the fingerprint reader" msgstr "指紋読取装置に左の小指をなぞってください" -#: ../pam/fingerprint-strings.h:59 +#: pam/fingerprint-strings.h:78 #, c-format msgid "Swipe your left little finger across %s" msgstr "%s に左の小指をなぞってください" -#: ../pam/fingerprint-strings.h:61 +#: pam/fingerprint-strings.h:80 msgid "Place your right thumb on the fingerprint reader" msgstr "指紋読取装置に右の親指を置いてください" -#: ../pam/fingerprint-strings.h:62 +#: pam/fingerprint-strings.h:81 #, c-format msgid "Place your right thumb on %s" msgstr "%s に右の親指を置いてください" -#: ../pam/fingerprint-strings.h:63 +#: pam/fingerprint-strings.h:82 msgid "Swipe your right thumb across the fingerprint reader" msgstr "指紋読取装置に右の親指をなぞってください" -#: ../pam/fingerprint-strings.h:64 +#: pam/fingerprint-strings.h:83 #, c-format msgid "Swipe your right thumb across %s" msgstr "%s に右の親指をなぞってください" -#: ../pam/fingerprint-strings.h:66 +#: pam/fingerprint-strings.h:85 msgid "Place your right index finger on the fingerprint reader" msgstr "指紋読取装置に右の人指し指を置いてください" -#: ../pam/fingerprint-strings.h:67 +#: pam/fingerprint-strings.h:86 #, c-format msgid "Place your right index finger on %s" msgstr "%s に右の人差し指を置いてください" -#: ../pam/fingerprint-strings.h:68 +#: pam/fingerprint-strings.h:87 msgid "Swipe your right index finger across the fingerprint reader" msgstr "指紋読取装置に右の人差し指をなぞってください" -#: ../pam/fingerprint-strings.h:69 +#: pam/fingerprint-strings.h:88 #, c-format msgid "Swipe your right index finger across %s" msgstr "%s に右の人指し指をなぞってください" -#: ../pam/fingerprint-strings.h:71 +#: pam/fingerprint-strings.h:90 msgid "Place your right middle finger on the fingerprint reader" msgstr "指紋読取装置に右の中指を置いてください" -#: ../pam/fingerprint-strings.h:72 +#: pam/fingerprint-strings.h:91 #, c-format msgid "Place your right middle finger on %s" msgstr "%s に右の中指を置いてください" -#: ../pam/fingerprint-strings.h:73 +#: pam/fingerprint-strings.h:92 msgid "Swipe your right middle finger across the fingerprint reader" msgstr "指紋読取装置に右の中指をなぞってください" -#: ../pam/fingerprint-strings.h:74 +#: pam/fingerprint-strings.h:93 #, c-format msgid "Swipe your right middle finger across %s" msgstr "%s に右の中指をなぞってください" -#: ../pam/fingerprint-strings.h:76 +#: pam/fingerprint-strings.h:95 msgid "Place your right ring finger on the fingerprint reader" msgstr "指紋読取装置に右の薬指を置いてください" -#: ../pam/fingerprint-strings.h:77 +#: pam/fingerprint-strings.h:96 #, c-format msgid "Place your right ring finger on %s" msgstr "%s に右の薬指を置いてください" -#: ../pam/fingerprint-strings.h:78 +#: pam/fingerprint-strings.h:97 msgid "Swipe your right ring finger across the fingerprint reader" msgstr "指紋読取装置に右の薬指をなぞってください" -#: ../pam/fingerprint-strings.h:79 +#: pam/fingerprint-strings.h:98 #, c-format msgid "Swipe your right ring finger across %s" msgstr "%s に右の薬指をなぞってください" -#: ../pam/fingerprint-strings.h:81 +#: pam/fingerprint-strings.h:100 msgid "Place your right little finger on the fingerprint reader" msgstr "指紋読取装置に右の薬指を置いてください" -#: ../pam/fingerprint-strings.h:82 +#: pam/fingerprint-strings.h:101 #, c-format msgid "Place your right little finger on %s" msgstr "%s に右の小指を置いてください" -#: ../pam/fingerprint-strings.h:83 +#: pam/fingerprint-strings.h:102 msgid "Swipe your right little finger across the fingerprint reader" msgstr "指紋読取装置に右の薬指をなぞってください" -#: ../pam/fingerprint-strings.h:84 +#: pam/fingerprint-strings.h:103 #, c-format msgid "Swipe your right little finger across %s" msgstr "%s に右の小指をなぞってください" -#: ../pam/fingerprint-strings.h:131 ../pam/fingerprint-strings.h:157 +#: pam/fingerprint-strings.h:171 pam/fingerprint-strings.h:199 msgid "Place your finger on the reader again" msgstr "もう一度読み取り装置に指を置いてください" -#: ../pam/fingerprint-strings.h:133 ../pam/fingerprint-strings.h:159 +#: pam/fingerprint-strings.h:173 pam/fingerprint-strings.h:201 msgid "Swipe your finger again" msgstr "もう一度指をなぞってください" -#: ../pam/fingerprint-strings.h:136 ../pam/fingerprint-strings.h:162 +#: pam/fingerprint-strings.h:176 pam/fingerprint-strings.h:204 msgid "Swipe was too short, try again" msgstr "なぞる幅が短すぎます、もう一度試してください" -#: ../pam/fingerprint-strings.h:138 ../pam/fingerprint-strings.h:164 +#: pam/fingerprint-strings.h:178 pam/fingerprint-strings.h:206 msgid "Your finger was not centered, try swiping your finger again" msgstr "指が真ん中にありませんでした、もう一度指をなぞってみてください" -#: ../pam/fingerprint-strings.h:140 ../pam/fingerprint-strings.h:166 +#: pam/fingerprint-strings.h:180 pam/fingerprint-strings.h:208 msgid "Remove your finger, and try swiping your finger again" msgstr "指をどかして、もう一度指をなぞってみてください" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/friendly-recovery.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/friendly-recovery.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/friendly-recovery.po 2021-08-03 08:53:42.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/friendly-recovery.po 2022-02-11 23:04:25.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: 2021-08-02 17:43+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:39+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fwupd.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fwupd.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/fwupd.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/fwupd.po 2022-02-11 23:04:14.000000000 +0000 @@ -0,0 +1,615 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fwupd package. +# +# Translators: +# Green, 2021 +# Nobuhiro Iwamatsu , 2021 +# Takuro Onoue , 2021 +# YOSHIDUMI, Rentaro, 2021 +msgid "" +msgstr "" +"Project-Id-Version: fwupd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-26 23:11+0000\n" +"PO-Revision-Date: 2017-02-26 13:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Japanese " +"(http://www.transifex.com/freedesktop/fwupd/language/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2022-02-11 17:29+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" +"Language: ja\n" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:1 +msgid "Install signed system firmware" +msgstr "署名済みシステムファームウェアを導入する" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:3 +msgid "Authentication is required to update the firmware on this machine" +msgstr "当機でファームウェアを更新するには認証が必要です" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:4 +msgid "Install unsigned system firmware" +msgstr "署名のないシステムファームウェアを導入する" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:5 +msgid "Install old version of system firmware" +msgstr "" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:7 +msgid "Authentication is required to downgrade the firmware on this machine" +msgstr "この機器のファームウェアをダウングレードするには認証が必要です。" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:8 +msgid "Install signed device firmware" +msgstr "署名済みデバイスファームウェアを導入する" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:10 +msgid "" +"Authentication is required to update the firmware on a removable device" +msgstr "外付け機器でファームウェアを更新するには認証が必要です" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:11 +msgid "Install unsigned device firmware" +msgstr "署名のないデバイスファームウェアを導入する" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:13 +msgid "" +"Authentication is required to downgrade the firmware on a removable device" +msgstr "外付け機器でファームウェアをダウングレードするには認証が必要です" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:14 +msgid "Unlock the device to allow access" +msgstr "アクセスを許可するために機器を開錠してください" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:16 +msgid "Authentication is required to unlock a device" +msgstr "機器を開錠するには認証が必要です" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:17 +msgid "Update the stored device verification information" +msgstr "保存された機器の検証情報を更新する" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:19 +msgid "" +"Authentication is required to update the stored checksums for the device" +msgstr "保存された機器の検査合計を更新するには認証が必要です" + +#. TRANSLATORS: this is a command alias, e.g. 'get-devices' +#: ../libdfu/dfu-tool.c:121 ../plugins/synapticsmst/synapticsmst-tool.c:115 +#: ../src/fu-util.c:109 +#, c-format +msgid "Alias to %s" +msgstr "%sの別名" + +#. TRANSLATORS: error message +#: ../libdfu/dfu-tool.c:194 ../plugins/synapticsmst/synapticsmst-tool.c:362 +#: ../src/fu-util.c:173 +msgid "Command not found" +msgstr "コマンドが見付かりません" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1115 +msgid "Reading" +msgstr "" + +#. TRANSLATORS: write from host to device +#: ../libdfu/dfu-tool.c:1121 +msgid "Writing" +msgstr "" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1127 +msgid "Verifying" +msgstr "" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1133 +msgid "Erasing" +msgstr "" + +#. TRANSLATORS: waiting for device +#: ../libdfu/dfu-tool.c:1139 +msgid "Detaching" +msgstr "" + +#. TRANSLATORS: waiting for device +#: ../libdfu/dfu-tool.c:1145 +msgid "Attaching" +msgstr "" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../libdfu/dfu-tool.c:1367 +msgid "Added" +msgstr "" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../libdfu/dfu-tool.c:1378 +msgid "Removed" +msgstr "" + +#. TRANSLATORS: this is when a device is hotplugged +#. TRANSLATORS: this is when the daemon state changes +#: ../libdfu/dfu-tool.c:1387 ../src/fu-util.c:965 +msgid "Changed" +msgstr "" + +#. TRANSLATORS: this is when a device ctrl+c's a watch +#: ../libdfu/dfu-tool.c:1395 ../src/fu-util.c:927 +msgid "Cancelled" +msgstr "" + +#. TRANSLATORS: Appstream ID for the hardware type +#: ../libdfu/dfu-tool.c:1904 ../src/fu-util.c:878 +msgid "ID" +msgstr "" + +#. TRANSLATORS: interface name, e.g. "Flash" +#. TRANSLATORS: device name, e.g. 'ColorHug2' +#: ../libdfu/dfu-tool.c:1910 ../libdfu/dfu-tool.c:1916 +#: ../libdfu/dfu-tool.c:2003 +msgid "Name" +msgstr "" + +#. TRANSLATORS: this is the encryption method used when writing +#: ../libdfu/dfu-tool.c:1923 +msgid "Cipher" +msgstr "" + +#. TRANSLATORS: these are areas of memory on the chip +#: ../libdfu/dfu-tool.c:1937 +msgid "Region" +msgstr "" + +#. TRANSLATORS: detected a DFU device +#: ../libdfu/dfu-tool.c:1972 +msgid "Found" +msgstr "" + +#. TRANSLATORS: DFU protocol version, e.g. 1.1 +#: ../libdfu/dfu-tool.c:1980 +msgid "Protocol" +msgstr "" + +#. TRANSLATORS: probably not run as root... +#. TRANSLATORS: device has failed to report status +#. TRANSLATORS: device status, e.g. "OK" +#: ../libdfu/dfu-tool.c:1992 ../libdfu/dfu-tool.c:1995 +#: ../libdfu/dfu-tool.c:2018 +msgid "Status" +msgstr "" + +#: ../libdfu/dfu-tool.c:1992 +msgid "Unknown: permission denied" +msgstr "" + +#. TRANSLATORS: serial number, e.g. '00012345' +#: ../libdfu/dfu-tool.c:2009 +msgid "Serial" +msgstr "" + +#. TRANSLATORS: device mode, e.g. runtime or DFU +#: ../libdfu/dfu-tool.c:2014 +msgid "Mode" +msgstr "" + +#. TRANSLATORS: device state, i.e. appIDLE +#: ../libdfu/dfu-tool.c:2022 +msgid "State" +msgstr "" + +#. TRANSLATORS: transfer size in bytes +#: ../libdfu/dfu-tool.c:2030 +msgid "Transfer Size" +msgstr "" + +#. TRANSLATORS: device quirks, i.e. things that +#. * it does that we have to work around +#: ../libdfu/dfu-tool.c:2038 +msgid "Quirks" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2117 +msgid "Convert firmware to DFU format" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2123 +msgid "Merge multiple firmware files into one" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2129 +msgid "Set vendor ID on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2135 +msgid "Set product ID on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2141 +msgid "Set element address on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2147 +msgid "Set the firmware size for the target" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2153 +msgid "Set release version on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2159 +msgid "Set alternative number on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2165 +msgid "Set alternative name on firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2171 +msgid "Attach DFU capable device back to runtime" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2177 +msgid "Read firmware from device into a file" +msgstr "ファームウェアを機器からファイルに読み込む" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2183 +msgid "Read firmware from one partition into a file" +msgstr "ファームウェアをひとつの領域からファイルに読み込む" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2189 +msgid "Write firmware from file into device" +msgstr "ファームウェアをファイルから機器に書き込む" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2195 +msgid "Write firmware from file into one partition" +msgstr "ファームウェアをファイルから 1 つの領域に書き込む" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2201 +msgid "List currently attached DFU capable devices" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2207 +msgid "Detach currently attached DFU capable device" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2213 +msgid "Dump details about a firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2219 +msgid "Watch DFU devices being hotplugged" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2225 +msgid "Encrypt firmware data" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2231 +msgid "Decrypt firmware data" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2237 +msgid "Sets metadata on a firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2243 +msgid "Replace data in an existing firmware file" +msgstr "既存のファームウェアファイル内のデータを置き換えます" + +#. TRANSLATORS: DFU stands for device firmware update +#: ../libdfu/dfu-tool.c:2269 +msgid "DFU Utility" +msgstr "DFU ユーティリティ" + +#. TRANSLATORS: the user didn't read the man page +#: ../libdfu/dfu-tool.c:2274 ../plugins/synapticsmst/synapticsmst-tool.c:439 +#: ../src/fu-util.c:1202 +msgid "Failed to parse arguments" +msgstr "引数の解析に失敗しました" + +#. TRANSLATORS: command description +#: ../plugins/synapticsmst/synapticsmst-tool.c:408 +msgid "Enumerate all Synaptics MST devices" +msgstr "" + +#. TRANSLATORS: command description +#: ../plugins/synapticsmst/synapticsmst-tool.c:414 +msgid "Flash firmware file to MST device" +msgstr "" + +#: ../plugins/synapticsmst/synapticsmst-tool.c:434 +msgid "Synaptics Multistream Transport Utility" +msgstr "" + +#. TRANSLATORS: turn on all debugging +#: ../src/fu-debug.c:130 +msgid "Show debugging information for all files" +msgstr "" + +#. TRANSLATORS: for the --verbose arg +#: ../src/fu-debug.c:180 +msgid "Debugging Options" +msgstr "" + +#. TRANSLATORS: for the --verbose arg +#: ../src/fu-debug.c:182 +msgid "Show debugging options" +msgstr "" + +#. TRANSLATORS: exit after we've started up, used for user profiling +#: ../src/fu-main.c:2757 +msgid "Exit after a small delay" +msgstr "" + +#. TRANSLATORS: exit straight away, used for automatic profiling +#: ../src/fu-main.c:2760 +msgid "Exit after the engine has loaded" +msgstr "" + +#. TRANSLATORS: program name +#: ../src/fu-main.c:2773 +msgid "Firmware Update Daemon" +msgstr "" + +#. TRANSLATORS: program summary +#: ../src/fu-main.c:2778 +msgid "Firmware Update D-Bus Service" +msgstr "" + +#. TRANSLATORS: daemon is inactive +#: ../src/fu-util.c:183 +msgid "Idle…" +msgstr "" + +#. TRANSLATORS: decompressing the firmware file +#: ../src/fu-util.c:187 +msgid "Decompressing…" +msgstr "" + +#. TRANSLATORS: parsing the firmware information +#: ../src/fu-util.c:191 +msgid "Loading…" +msgstr "" + +#. TRANSLATORS: restarting the device to pick up new F/W +#: ../src/fu-util.c:195 +msgid "Restarting device…" +msgstr "" + +#. TRANSLATORS: writing to the flash chips +#: ../src/fu-util.c:199 +msgid "Writing…" +msgstr "" + +#. TRANSLATORS: verifying we wrote the firmware correctly +#: ../src/fu-util.c:203 +msgid "Verifying…" +msgstr "" + +#. TRANSLATORS: scheduing an update to be done on the next boot +#: ../src/fu-util.c:207 +msgid "Scheduling…" +msgstr "" + +#. TRANSLATORS: currect daemon status is unknown +#: ../src/fu-util.c:214 +msgid "Unknown" +msgstr "" + +#. TRANSLATORS: nothing attached that can be upgraded +#: ../src/fu-util.c:283 +msgid "No hardware detected with firmware update capability" +msgstr "" + +#. TRANSLATOR: the plugin only supports offline +#: ../src/fu-util.c:317 +msgid "Retrying as an offline update" +msgstr "" + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second is a version number +#. * e.g. "1.2.3" +#: ../src/fu-util.c:457 +#, c-format +msgid "Reinstalling %s with %s... " +msgstr "" + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second and third are +#. * version numbers e.g. "1.2.3" +#: ../src/fu-util.c:464 +#, c-format +msgid "Downgrading %s from %s to %s... " +msgstr "" + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second and third are +#. * version numbers e.g. "1.2.3" +#: ../src/fu-util.c:472 +#, c-format +msgid "Updating %s from %s to %s... " +msgstr "" + +#: ../src/fu-util.c:499 +msgid "Done!" +msgstr "" + +#: ../src/fu-util.c:541 ../src/fu-util.c:790 +msgid "OK" +msgstr "" + +#. TRANSLATORS: first replacement is device name +#: ../src/fu-util.c:874 +#, c-format +msgid "%s has firmware updates:" +msgstr "" + +#: ../src/fu-util.c:884 +msgid "GUID" +msgstr "" + +#. TRANSLATORS: section header for firmware version +#: ../src/fu-util.c:888 +msgid "Update Version" +msgstr "" + +#. TRANSLATORS: section header for firmware checksum +#: ../src/fu-util.c:892 +msgid "Update Checksum" +msgstr "" + +#: ../src/fu-util.c:899 +msgid "Update Checksum Type" +msgstr "" + +#. TRANSLATORS: section header for firmware remote http:// +#: ../src/fu-util.c:903 +msgid "Update Location" +msgstr "" + +#. TRANSLATORS: section header for long firmware desc +#: ../src/fu-util.c:914 +msgid "Update Description" +msgstr "" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../src/fu-util.c:938 +msgid "Device added:" +msgstr "" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../src/fu-util.c:948 +msgid "Device removed:" +msgstr "" + +#. TRANSLATORS: this is when a device has been updated +#: ../src/fu-util.c:958 +msgid "Device changed:" +msgstr "" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1068 +msgid "Show extra debugging information" +msgstr "追加のデバッグ情報を表示します" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1074 +msgid "Schedule installation for next reboot when possible" +msgstr "" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1077 +msgid "Allow re-installing existing firmware versions" +msgstr "" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1080 +msgid "Allow downgrading firmware versions" +msgstr "" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1083 +msgid "Override plugin warning" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1106 +msgid "Get all devices that support firmware updates" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1112 +msgid "Install prepared updates now" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1118 +msgid "Install a firmware file on this hardware" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1124 +msgid "Gets details about a firmware file" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1130 +msgid "Gets the list of updates for connected hardware" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1136 +msgid "Updates all firmware to latest versions available" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1142 +msgid "Gets the cryptographic hash of the dumped firmware" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1148 +msgid "Unlocks the device for firmware access" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1154 +msgid "Clears the results from the last update" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1160 +msgid "Gets the results from the last update" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1166 +msgid "Refresh metadata from remote server" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1172 +msgid "Update the stored metadata with current ROM contents" +msgstr "" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1178 +msgid "Monitor the daemon for events" +msgstr "" + +#. TRANSLATORS: program name +#: ../src/fu-util.c:1197 +msgid "Firmware Utility" +msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gas.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gas.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gas.po 2021-08-03 08:53:33.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gas.po 2022-02-11 23:04:16.000000000 +0000 @@ -15,46 +15,46 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:03+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:53+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: app.c:494 app.c:508 +#: app.c:548 app.c:562 msgid "end of file in comment" msgstr "コメント内でファイル終端 (EOF) に達しました" -#: app.c:586 app.c:631 +#: app.c:640 app.c:685 #, c-format msgid "end of file in string; '%c' inserted" msgstr "文字列内でファイル終端 (EOF) に達しました。 '%c' が挿入されました" -#: app.c:657 +#: app.c:711 #, c-format msgid "unknown escape '\\%c' in string; ignored" msgstr "不明なエスケープ '\\%c' が文字列内にあります。無視されました" -#: app.c:831 input-scrub.c:363 +#: app.c:887 input-scrub.c:363 msgid "end of file not at end of a line; newline inserted" msgstr "行末 (EOL) 以外の場所でファイル終端 (EOF) に達しました。改行が挿入されました" -#: app.c:993 +#: app.c:1049 msgid "end of file in multiline comment" msgstr "複数行コメント内でファイル終端 (EOF) に達しました" -#: app.c:1067 +#: app.c:1123 msgid "end of file after a one-character quote; \\0 inserted" msgstr "" -#: app.c:1075 +#: app.c:1131 msgid "end of file in escape character" msgstr "エスケープ文字内でファイル終端 (EOF) に達しました" -#: app.c:1087 +#: app.c:1143 msgid "missing close quote; (assumed)" msgstr "" -#: app.c:1155 app.c:1210 app.c:1222 app.c:1300 +#: app.c:1211 app.c:1266 app.c:1278 app.c:1356 msgid "end of file in comment; newline inserted" msgstr "コメント内でファイル終端 (EOF) に達しました。改行が挿入されました" @@ -179,12 +179,12 @@ msgid " --elf-stt-common=[no|yes] " msgstr "" -#: as.c:317 as.c:328 config/tc-i386.c:13799 config/tc-i386.c:13819 +#: as.c:317 as.c:328 config/tc-i386.c:13918 config/tc-i386.c:13938 #, c-format msgid "(default: yes)\n" msgstr "" -#: as.c:319 as.c:330 config/tc-i386.c:13801 config/tc-i386.c:13821 +#: as.c:319 as.c:330 config/tc-i386.c:13920 config/tc-i386.c:13940 #, c-format msgid "(default: no)\n" msgstr "" @@ -234,7 +234,7 @@ " --gstabs+ generate STABS debug info with GNU extensions\n" msgstr " --gstabs+ GNU 拡張がある STABS デバッグ情報を生成する\n" -#: as.c:316 +#: as.c:340 #, c-format msgid " --gdwarf-2 generate DWARF2 debugging information\n" msgstr " --gdwarf-2 DWARF2 デバッグ情報を生成する\n" @@ -246,12 +246,12 @@ "information\n" msgstr "" -#: as.c:320 +#: as.c:344 #, c-format msgid " --hash-size= set the hash table size close to \n" msgstr " --hash-size= ハッシュ表サイズを ぐらいに設定する\n" -#: as.c:322 +#: as.c:346 #, c-format msgid " --help show this message and exit\n" msgstr " --help このメッセージを表示して終了する\n" @@ -322,7 +322,7 @@ msgid " -R fold data section into text section\n" msgstr "" -#: as.c:346 +#: as.c:370 #, c-format msgid "" " --reduce-memory-overheads \n" @@ -436,13 +436,13 @@ "バグを発見したら <%s> に報告して下さい。\n" "翻訳に関するバグはに報告してください。\n" -#: as.c:646 +#: as.c:648 #, c-format msgid "unrecognized option -%c%s" msgstr "認識できないオプション -%c%s です" #. This output is intended to follow the GNU standards document. -#: as.c:688 +#: as.c:703 #, c-format msgid "GNU assembler %s\n" msgstr "GNU アセンブラ %s\n" @@ -452,7 +452,7 @@ msgid "Copyright (C) 2020 Free Software Foundation, Inc.\n" msgstr "" -#: as.c:690 +#: as.c:705 #, c-format msgid "" "This program is free software; you may redistribute it under the terms of\n" @@ -463,137 +463,137 @@ "the GNU General Public License version 3 or later.\n" "This program has absolutely no warranty.\n" -#: as.c:695 +#: as.c:710 #, c-format msgid "" "This assembler was configured for a target of `%s' and default,\n" "cpu type `%s'.\n" msgstr "" -#: as.c:699 +#: as.c:714 #, c-format msgid "This assembler was configured for a target of `%s'.\n" msgstr "このアセンブラはターゲット `%s' に対して設定されています。\n" -#: as.c:707 +#: as.c:722 msgid "multiple emulation names specified" msgstr "複数のエミュレーション名が指定されました" -#: as.c:709 +#: as.c:724 msgid "emulations not handled in this configuration" msgstr "この設定ではエミュレーションは取り扱えません" -#: as.c:714 +#: as.c:729 #, c-format msgid "alias = %s\n" msgstr "alias = %s\n" -#: as.c:715 +#: as.c:730 #, c-format msgid "canonical = %s\n" msgstr "canonical = %s\n" -#: as.c:716 +#: as.c:731 #, c-format msgid "cpu-type = %s\n" msgstr "cpu-type = %s\n" -#: as.c:718 +#: as.c:733 #, c-format msgid "format = %s\n" msgstr "format = %s\n" -#: as.c:721 +#: as.c:736 #, c-format msgid "bfd-target = %s\n" msgstr "bfd-target = %s\n" -#: as.c:738 +#: as.c:753 #, c-format msgid "Invalid --compress-debug-sections option: `%s'" msgstr "" -#: as.c:741 +#: as.c:756 #, c-format msgid "--compress-debug-sections=%s is unsupported" msgstr "" -#: as.c:766 +#: as.c:781 msgid "bad defsym; format is --defsym name=value" msgstr "defsym が間違っています。形式は --defsym name=value です" -#: as.c:786 +#: as.c:801 msgid "no file name following -t option" msgstr "-t オプションの後にファイル名が続いていません" -#: as.c:801 +#: as.c:816 #, c-format msgid "failed to read instruction table %s\n" msgstr "命令表 %s の読み込みに失敗しました\n" -#: as.c:874 +#: as.c:889 #, c-format msgid "Invalid --gdwarf-cie-version `%s'" msgstr "" -#: as.c:967 +#: as.c:982 #, c-format msgid "Invalid --size-check= option: `%s'" msgstr "無効な --size-check= オプションです: `%s'" -#: as.c:976 +#: as.c:991 #, c-format msgid "Invalid --elf-stt-common= option: `%s'" msgstr "" -#: as.c:990 +#: as.c:1005 #, c-format msgid "Invalid --generate-missing-build-notes option: `%s'" msgstr "" -#: as.c:1061 +#: as.c:1076 #, c-format msgid "invalid listing option `%c'" msgstr "" -#: as.c:1022 +#: as.c:1072 msgid "--hash-size needs a numeric argument" msgstr "--hash-size には数値の引数が必要です" -#: as.c:1124 +#: as.c:1139 #, c-format msgid "%s: total time in assembly: %ld.%06ld\n" msgstr "%s: アセンブルの合計時間: %ld.%06ld\n" -#: as.c:1288 +#: as.c:1303 msgid "libbfd ABI mismatch" msgstr "" -#: as.c:1333 +#: as.c:1348 #, c-format msgid "The input '%s' and output '%s' files are the same" msgstr "" -#: as.c:1443 +#: as.c:1458 #, c-format msgid "%d warning" msgid_plural "%d warnings" msgstr[0] "" msgstr[1] "" -#: as.c:1445 +#: as.c:1460 #, c-format msgid "%d error" msgid_plural "%d errors" msgstr[0] "" msgstr[1] "" -#: as.c:1449 +#: as.c:1464 #, c-format msgid "%s, treating warnings as errors" msgstr "" -#: as.c:1460 +#: as.c:1475 #, c-format msgid "%s, %s, generating bad object file\n" msgstr "" @@ -607,33 +607,33 @@ #. * We have a GROSS internal error. #. * This should never happen. #. -#: atof-generic.c:437 config/tc-m68k.c:3503 +#: atof-generic.c:455 config/tc-m68k.c:3503 msgid "failed sanity check" msgstr "" #: cgen.c:106 config/tc-alpha.c:2095 config/tc-alpha.c:2119 -#: config/tc-arc.c:4058 config/tc-arc.c:4131 config/tc-d10v.c:550 -#: config/tc-d30v.c:534 config/tc-mn10200.c:1098 config/tc-mn10300.c:1752 -#: config/tc-ppc.c:3920 config/tc-s390.c:1334 config/tc-s390.c:1457 -#: config/tc-s390.c:1591 config/tc-v850.c:2538 config/tc-v850.c:2609 -#: config/tc-v850.c:2656 config/tc-v850.c:2693 config/tc-v850.c:2730 -#: config/tc-v850.c:2993 +#: config/tc-arc.c:4053 config/tc-arc.c:4126 config/tc-d10v.c:550 +#: config/tc-d30v.c:534 config/tc-mn10200.c:1091 config/tc-mn10300.c:1752 +#: config/tc-ppc.c:3939 config/tc-s390.c:1334 config/tc-s390.c:1457 +#: config/tc-s390.c:1591 config/tc-v850.c:2535 config/tc-v850.c:2606 +#: config/tc-v850.c:2653 config/tc-v850.c:2690 config/tc-v850.c:2727 +#: config/tc-v850.c:2990 msgid "too many fixups" msgstr "修正が多すぎます" #: cgen.c:371 cgen.c:391 config/tc-d10v.c:461 config/tc-d30v.c:450 -#: config/tc-mn10200.c:1040 config/tc-mn10300.c:1677 config/tc-ppc.c:3443 -#: config/tc-s390.c:1318 config/tc-v850.c:2647 config/tc-v850.c:2681 -#: config/tc-v850.c:2721 config/tc-v850.c:2966 config/tc-z80.c:785 +#: config/tc-mn10200.c:1033 config/tc-mn10300.c:1677 config/tc-ppc.c:3462 +#: config/tc-s390.c:1318 config/tc-v850.c:2644 config/tc-v850.c:2678 +#: config/tc-v850.c:2718 config/tc-v850.c:2963 config/tc-z80.c:785 msgid "illegal operand" msgstr "不正な被演算子です" -#: cgen.c:395 config/tc-avr.c:900 config/tc-d10v.c:463 config/tc-d30v.c:452 +#: cgen.c:395 config/tc-avr.c:910 config/tc-d10v.c:463 config/tc-d30v.c:452 #: config/tc-h8300.c:496 config/tc-mcore.c:662 config/tc-microblaze.c:613 -#: config/tc-mmix.c:495 config/tc-mn10200.c:1043 config/tc-mn10300.c:1680 -#: config/tc-msp430.c:417 config/tc-ppc.c:3445 config/tc-s390.c:1323 -#: config/tc-sh.c:988 config/tc-v850.c:2651 config/tc-v850.c:2685 -#: config/tc-v850.c:2725 config/tc-v850.c:2969 config/tc-xgate.c:895 +#: config/tc-mmix.c:495 config/tc-mn10200.c:1036 config/tc-mn10300.c:1680 +#: config/tc-msp430.c:417 config/tc-ppc.c:3464 config/tc-s390.c:1323 +#: config/tc-sh.c:988 config/tc-v850.c:2648 config/tc-v850.c:2682 +#: config/tc-v850.c:2722 config/tc-v850.c:2966 config/tc-xgate.c:895 #: config/tc-z80.c:932 config/tc-z8k.c:349 msgid "missing operand" msgstr "被演算子がありません" @@ -646,23 +646,16 @@ msgid "operand mask overflow" msgstr "被演算子のマスクがオーバーフローしました" -#. We can't actually support subtracting a symbol. -#: cgen.c:858 config/tc-arm.c:2076 config/tc-arm.c:11321 config/tc-arm.c:11373 -#: config/tc-arm.c:11655 config/tc-arm.c:12551 config/tc-arm.c:13691 -#: config/tc-arm.c:13731 config/tc-arm.c:14104 config/tc-arm.c:14146 -#: config/tc-arm.c:21386 config/tc-arm.c:21446 config/tc-avr.c:1551 -#: config/tc-avr.c:1563 config/tc-avr.c:1827 config/tc-cris.c:4054 -#: config/tc-d10v.c:1506 config/tc-d30v.c:1909 config/tc-ft32.c:574 -#: config/tc-ft32.c:587 config/tc-mips.c:9707 config/tc-mips.c:11017 -#: config/tc-mips.c:12314 config/tc-mips.c:12997 config/tc-nds32.c:7829 -#: config/tc-pru.c:746 config/tc-pru.c:756 config/tc-spu.c:960 -#: config/tc-spu.c:984 config/tc-tilegx.c:1479 config/tc-tilepro.c:1337 -#: config/tc-v850.c:3451 config/tc-vax.c:282 config/tc-xstormy16.c:482 -#: config/tc-xtensa.c:6009 config/tc-xtensa.c:13092 config/tc-z80.c:3856 +#: cgen.c:858 config/tc-arm.c:2054 config/tc-arm.c:11343 config/tc-arm.c:11395 +#: config/tc-arm.c:11683 config/tc-arm.c:12579 config/tc-arm.c:13719 +#: config/tc-arm.c:13759 config/tc-arm.c:14132 config/tc-arm.c:14174 +#: config/tc-arm.c:21420 config/tc-arm.c:21480 config/tc-mips.c:9707 +#: config/tc-mips.c:11017 config/tc-mips.c:12314 config/tc-mips.c:12997 +#: config/tc-spu.c:981 config/tc-xtensa.c:13092 msgid "expression too complex" msgstr "式が複雑すぎます" -#: cgen.c:959 config/tc-ppc.c:7200 config/tc-s390.c:2372 config/tc-v850.c:3503 +#: cgen.c:959 config/tc-ppc.c:7467 config/tc-s390.c:2369 config/tc-v850.c:3499 #: config/tc-xstormy16.c:541 msgid "unresolved expression that must be resolved" msgstr "解決されなければ行けない式が解決されていません" @@ -672,7 +665,7 @@ msgid "internal error: can't install fix for reloc type %d (`%s')" msgstr "" -#: cgen.c:1035 config/tc-nios2.c:1355 config/tc-pru.c:787 +#: cgen.c:1035 config/tc-nios2.c:1355 config/tc-pru.c:786 msgid "relocation is not supported" msgstr "再配置はサポートされていません" @@ -740,20 +733,20 @@ msgid "here is the \"else\" of the unterminated conditional" msgstr "ここが終端されていない \"else\" です" -#: config/atof-ieee.c:140 +#: config/atof-ieee.c:148 msgid "cannot create floating-point number" msgstr "浮動小数を作成できません" -#: config/atof-ieee.c:318 +#: config/atof-ieee.c:335 msgid "NaNs are not supported by this target" msgstr "" -#: config/atof-ieee.c:362 config/atof-ieee.c:407 +#: config/atof-ieee.c:392 msgid "Infinities are not supported by this target" msgstr "" -#: config/atof-ieee.c:829 config/atof-vax.c:449 config/tc-arm.c:1322 -#: config/tc-ia64.c:11600 config/tc-tic30.c:1241 config/tc-tic4x.c:2565 +#: config/atof-ieee.c:825 config/atof-vax.c:449 config/tc-arm.c:1284 +#: config/tc-ia64.c:11595 config/tc-tic30.c:1241 config/tc-tic4x.c:2567 msgid "Unrecognized or unsupported floating point constant" msgstr "認識できないまたはサポートされていない浮動小数定数です" @@ -772,7 +765,7 @@ msgid "Symbol `%s' can not be both weak and common" msgstr "シンボル `%s' は弱いシンボルと共通シンボルの両方になることができません" -#: config/obj-coff.c:135 dw2gencfi.c:334 +#: config/obj-coff.c:134 dw2gencfi.c:334 #, c-format msgid "Inserting \"%s\" into structure table failed: %s" msgstr "" @@ -905,7 +898,7 @@ msgid "bad .common segment %s" msgstr "間違った .common セグメント %s です" -#: config/obj-elf.c:420 config/tc-aarch64.c:2009 +#: config/obj-elf.c:420 config/tc-aarch64.c:1968 msgid "Missing symbol name in directive" msgstr "指示内にシンボル名がありません" @@ -928,72 +921,72 @@ #. assembly might get the section type wrong; Even high #. profile projects like glibc have done so in the past. #. So don't error in this case. -#: config/obj-elf.c:797 +#: config/obj-elf.c:813 #, c-format msgid "ignoring changed section type for %s" msgstr "" -#: config/obj-elf.c:815 +#: config/obj-elf.c:831 #, c-format msgid "ignoring changed section attributes for %s" msgstr "" -#: config/obj-elf.c:781 +#: config/obj-elf.c:776 #, c-format msgid "ignoring changed section entity size for %s" msgstr "" -#: config/obj-elf.c:845 +#: config/obj-elf.c:841 msgid "unrecognized .section attribute: want a,e,w,x,M,S,G,T or number" msgstr "" -#: config/obj-elf.c:980 +#: config/obj-elf.c:994 msgid "extraneous characters at end of numeric section type" msgstr "" -#: config/obj-elf.c:986 read.c:3010 +#: config/obj-elf.c:1000 read.c:3010 msgid "unrecognized section type" msgstr "認識できないセクション型です" -#: config/obj-elf.c:1018 +#: config/obj-elf.c:1032 msgid "unrecognized section attribute" msgstr "認識できないセクション属性です" -#: config/obj-elf.c:1049 config/tc-alpha.c:4206 +#: config/obj-elf.c:1063 config/tc-alpha.c:4206 msgid "missing name" msgstr "名前がありません" -#: config/obj-elf.c:1153 +#: config/obj-elf.c:1167 #, c-format msgid "section name '%s' already defined as another symbol" msgstr "" -#: config/obj-elf.c:1245 +#: config/obj-elf.c:1259 msgid "invalid merge entity size" msgstr "" -#: config/obj-elf.c:1252 +#: config/obj-elf.c:1266 msgid "entity size for SHF_MERGE not specified" msgstr "" -#: config/obj-elf.c:1280 +#: config/obj-elf.c:1294 msgid "? section flag ignored with G present" msgstr "G があるため ? セクションフラグが無視されました" -#: config/obj-elf.c:1305 +#: config/obj-elf.c:1319 msgid "group name for SHF_GROUP not specified" msgstr "SHF_GROUP 用のグループ名が指定されていません" -#: config/obj-elf.c:1331 +#: config/obj-elf.c:1345 #, c-format msgid "unsupported mbind section info: %s" msgstr "" -#: config/obj-elf.c:1409 +#: config/obj-elf.c:1423 msgid "character following name is not '#'" msgstr "名前の後に続く文字が '#' ではありません" -#: config/obj-elf.c:1436 +#: config/obj-elf.c:1450 #, c-format msgid "SHF_ALLOC isn't set for GNU_MBIND section: %s" msgstr "" @@ -1002,147 +995,147 @@ msgid "GNU_MBIND section is supported only by GNU and FreeBSD targets" msgstr "" -#: config/obj-elf.c:1584 +#: config/obj-elf.c:1598 msgid ".previous without corresponding .section; ignored" msgstr "対応する .section が無い .previous です。無視されました" -#: config/obj-elf.c:1610 +#: config/obj-elf.c:1624 msgid ".popsection without corresponding .pushsection; ignored" msgstr "対応する .pushsection が無い .popsection です。無視されました" -#: config/obj-elf.c:1723 +#: config/obj-elf.c:1737 msgid "expected comma after name in .symver" msgstr ".symver 内の名前の後にはコンマ (,) が予期されます" -#: config/obj-elf.c:1740 config/obj-elf.c:2644 +#: config/obj-elf.c:1754 config/obj-elf.c:2658 #, c-format msgid "`%s' can't be versioned to common symbol '%s'" msgstr "" -#: config/obj-elf.c:1654 config/obj-elf.c:1749 +#: config/obj-elf.c:1668 config/obj-elf.c:1763 #, c-format msgid "missing version name in `%s' for symbol `%s'" msgstr "`%s' 内にシンボル `%s' 用のバージョン名がありません" -#: config/obj-elf.c:2928 +#: config/obj-elf.c:2966 #, c-format msgid "multiple versions [`%s'|`%s'] for symbol `%s'" msgstr "複数のバージョン [`%s'|`%s'] がシンボル `%s' 用にあります" -#: config/obj-elf.c:1817 +#: config/obj-elf.c:1831 #, c-format msgid "expected `%s' to have already been set for .vtable_inherit" msgstr "" -#: config/obj-elf.c:1827 +#: config/obj-elf.c:1841 msgid "expected comma after name in .vtable_inherit" msgstr ".vtable_inherit 内の名前の後にはコンマ (,) が予期されます" -#: config/obj-elf.c:1888 +#: config/obj-elf.c:1902 msgid "expected comma after name in .vtable_entry" msgstr ".vtable_entry 内の名前の後にはコンマ (,) が予期されます" -#: config/obj-elf.c:2027 +#: config/obj-elf.c:2041 #, c-format msgid "Attribute name not recognised: %s" msgstr "" -#: config/obj-elf.c:2044 +#: config/obj-elf.c:2058 msgid "expected numeric constant" msgstr "" -#: config/obj-elf.c:2053 config/tc-arm.c:7048 +#: config/obj-elf.c:2067 config/tc-arm.c:7056 msgid "expected comma" msgstr "" -#: config/obj-elf.c:2086 +#: config/obj-elf.c:2100 msgid "bad string constant" msgstr "" -#: config/obj-elf.c:2090 +#: config/obj-elf.c:2104 msgid "expected , " msgstr "" -#: config/obj-elf.c:2223 +#: config/obj-elf.c:2237 msgid "expected quoted string" msgstr "引用符付き文字列が予期されます" -#: config/obj-elf.c:2243 +#: config/obj-elf.c:2257 #, c-format msgid "expected comma after name `%s' in .size directive" msgstr ".size 指示内の名前 `%s' の後にはコンマ (,) が予期されます" -#: config/obj-elf.c:2252 +#: config/obj-elf.c:2266 msgid "missing expression in .size directive" msgstr ".size 指示内に式がありません" -#: config/obj-elf.c:2372 +#: config/obj-elf.c:2386 #, c-format msgid "symbol '%s' is already defined" msgstr "シンボル '%s' はすでに定義されています" -#: config/obj-elf.c:2392 +#: config/obj-elf.c:2406 #, c-format msgid "symbol type \"%s\" is supported only by GNU and FreeBSD targets" msgstr "" -#: config/obj-elf.c:2408 +#: config/obj-elf.c:2422 #, c-format msgid "symbol type \"%s\" is supported only by GNU targets" msgstr "シンボル型 \"%s\" は GNU ターゲットでのみサポートされます" -#: config/obj-elf.c:2418 +#: config/obj-elf.c:2432 #, c-format msgid "unrecognized symbol type \"%s\"" msgstr "認識できないシンボル型 \"%s\" です" -#: config/obj-elf.c:2439 +#: config/obj-elf.c:2453 #, c-format msgid "cannot change type of common symbol '%s'" msgstr "" -#: config/obj-elf.c:2451 +#: config/obj-elf.c:2465 #, c-format msgid "symbol '%s' already has its type set" msgstr "" -#: config/obj-elf.c:2617 config/obj-elf.c:2620 +#: config/obj-elf.c:2631 config/obj-elf.c:2634 #, c-format msgid ".size expression for %s does not evaluate to a constant" msgstr "%s 用の .size 式の評価結果が定数値ではありません" -#: config/obj-elf.c:2918 +#: config/obj-elf.c:2956 #, c-format msgid "" "invalid attempt to declare external version name as default in symbol `%s'" msgstr "" -#: config/obj-elf.c:2716 ecoff.c:3578 +#: config/obj-elf.c:2741 ecoff.c:3578 #, c-format msgid "symbol `%s' can not be both weak and common" msgstr "シンボル `%s' は弱いシンボルと共通シンボルの両方に同時になることはできません" -#: config/obj-elf.c:2829 +#: config/obj-elf.c:2867 #, c-format msgid "assuming all members of group `%s' are COMDAT" msgstr "" -#: config/obj-elf.c:2841 +#: config/obj-elf.c:2879 #, c-format msgid "can't create group: %s" msgstr "グループを作成できません: %s" -#: config/obj-elf.c:3020 +#: config/obj-elf.c:3058 #, c-format msgid "failed to set up debugging information: %s" msgstr "デバッグ情報のセットアップに失敗しました: %s" -#: config/obj-elf.c:3040 +#: config/obj-elf.c:3078 #, c-format msgid "can't start writing .mdebug section: %s" msgstr ".mdebug セクションの書き込みを開始できません: %s" -#: config/obj-elf.c:3048 +#: config/obj-elf.c:3086 #, c-format msgid "could not write .mdebug section: %s" msgstr ".mdebug セクションを書き込めませんでした: %s" @@ -1191,7 +1184,7 @@ msgid "missing sizeof_stub expression" msgstr "" -#: config/obj-macho.c:478 config/tc-ia64.c:1080 config/tc-ia64.c:11761 +#: config/obj-macho.c:478 config/tc-ia64.c:1081 config/tc-ia64.c:11756 #: config/tc-score.c:6093 expr.c:1213 read.c:1783 msgid "expected symbol name" msgstr "" @@ -1204,14 +1197,14 @@ msgid "missing size expression" msgstr "" -#: config/obj-macho.c:506 config/tc-ia64.c:1115 read.c:1827 +#: config/obj-macho.c:506 config/tc-ia64.c:1116 read.c:1827 #, c-format msgid "size (%ld) out of range, ignored" msgstr "" -#: config/obj-macho.c:516 config/tc-score.c:6248 dwarf2dbg.c:1309 ecoff.c:3346 -#: read.c:1839 read.c:1942 read.c:2693 read.c:3266 read.c:3772 symbols.c:495 -#: symbols.c:590 +#: config/obj-macho.c:516 config/tc-score.c:6248 dwarf2dbg.c:1394 ecoff.c:3346 +#: read.c:1839 read.c:1942 read.c:2693 read.c:3266 read.c:3860 symbols.c:515 +#: symbols.c:610 #, c-format msgid "symbol `%s' is already defined" msgstr "" @@ -1370,99 +1363,99 @@ msgid "attaching copyright header %s: %s" msgstr "著作権ヘッダ %s を付加中: %s" -#: config/tc-aarch64.c:374 +#: config/tc-aarch64.c:381 msgid "integer 32-bit register expected" msgstr "" -#: config/tc-aarch64.c:377 +#: config/tc-aarch64.c:384 msgid "integer 64-bit register expected" msgstr "" -#: config/tc-aarch64.c:380 +#: config/tc-aarch64.c:387 msgid "integer register expected" msgstr "" -#: config/tc-aarch64.c:383 +#: config/tc-aarch64.c:390 msgid "64-bit integer or SP register expected" msgstr "" -#: config/tc-aarch64.c:386 config/tc-mcore.c:840 config/tc-mcore.c:1356 +#: config/tc-aarch64.c:393 config/tc-mcore.c:840 config/tc-mcore.c:1356 #: config/tc-mcore.c:1410 msgid "base register expected" msgstr "" -#: config/tc-aarch64.c:389 +#: config/tc-aarch64.c:396 msgid "integer or zero register expected" msgstr "" -#: config/tc-aarch64.c:392 +#: config/tc-aarch64.c:399 msgid "offset register expected" msgstr "" -#: config/tc-aarch64.c:395 +#: config/tc-aarch64.c:402 msgid "integer or SP register expected" msgstr "" -#: config/tc-aarch64.c:398 +#: config/tc-aarch64.c:405 msgid "integer, zero or SP register expected" msgstr "" -#: config/tc-aarch64.c:401 +#: config/tc-aarch64.c:408 msgid "8-bit SIMD scalar register expected" msgstr "" -#: config/tc-aarch64.c:404 +#: config/tc-aarch64.c:411 msgid "16-bit SIMD scalar or floating-point half precision register expected" msgstr "" -#: config/tc-aarch64.c:408 +#: config/tc-aarch64.c:415 msgid "" "32-bit SIMD scalar or floating-point single precision register expected" msgstr "" -#: config/tc-aarch64.c:412 +#: config/tc-aarch64.c:419 msgid "" "64-bit SIMD scalar or floating-point double precision register expected" msgstr "" -#: config/tc-aarch64.c:416 +#: config/tc-aarch64.c:423 msgid "" "128-bit SIMD scalar or floating-point quad precision register expected" msgstr "" -#: config/tc-aarch64.c:421 config/tc-arm.c:4746 +#: config/tc-aarch64.c:428 config/tc-arm.c:4750 msgid "register expected" msgstr "" #. any [BHSDQ]P FP -#: config/tc-aarch64.c:424 +#: config/tc-aarch64.c:431 msgid "SIMD scalar or floating-point register expected" msgstr "" #. any V reg -#: config/tc-aarch64.c:427 +#: config/tc-aarch64.c:434 msgid "vector register expected" msgstr "" -#: config/tc-aarch64.c:430 +#: config/tc-aarch64.c:437 msgid "SVE vector register expected" msgstr "" -#: config/tc-aarch64.c:433 +#: config/tc-aarch64.c:440 msgid "SVE predicate register expected" msgstr "" -#: config/tc-aarch64.c:436 +#: config/tc-aarch64.c:443 #, c-format msgid "invalid register type %d" msgstr "" -#: config/tc-aarch64.c:611 config/tc-aarch64.c:613 config/tc-arm.c:1196 +#: config/tc-aarch64.c:618 config/tc-aarch64.c:620 config/tc-arm.c:1201 #: config/tc-score.c:6492 expr.c:1379 read.c:2675 msgid "bad expression" msgstr "" -#: config/tc-aarch64.c:624 config/tc-sparc.c:3376 +#: config/tc-aarch64.c:631 config/tc-sparc.c:3376 msgid "bad segment" msgstr "" @@ -1470,746 +1463,746 @@ msgid "invalid floating point number" msgstr "" -#: config/tc-aarch64.c:890 +#: config/tc-aarch64.c:849 #, c-format msgid "bad size %d in vector width specifier" msgstr "" -#: config/tc-aarch64.c:923 +#: config/tc-aarch64.c:882 #, c-format msgid "unexpected character `%c' in element size" msgstr "" -#: config/tc-aarch64.c:925 +#: config/tc-aarch64.c:884 msgid "missing element size" msgstr "" -#: config/tc-aarch64.c:934 +#: config/tc-aarch64.c:893 #, c-format msgid "invalid element size %d and vector size combination %c" msgstr "" -#: config/tc-aarch64.c:969 +#: config/tc-aarch64.c:928 #, c-format msgid "unexpected character `%c' in predication type" msgstr "" -#: config/tc-aarch64.c:972 +#: config/tc-aarch64.c:931 msgid "missing predication type" msgstr "" -#: config/tc-aarch64.c:1067 +#: config/tc-aarch64.c:1026 msgid "this type of register can't be indexed" msgstr "" -#: config/tc-aarch64.c:1073 +#: config/tc-aarch64.c:1032 msgid "index not allowed inside register list" msgstr "" -#: config/tc-aarch64.c:1084 config/tc-aarch64.c:2054 config/tc-aarch64.c:2256 -#: config/tc-arm.c:1816 config/tc-arm.c:4022 config/tc-arm.c:5196 -#: config/tc-arm.c:7335 +#: config/tc-aarch64.c:1043 config/tc-aarch64.c:2013 config/tc-aarch64.c:2215 +#: config/tc-arm.c:1778 config/tc-arm.c:4000 config/tc-arm.c:5204 +#: config/tc-arm.c:7345 msgid "constant expression required" msgstr "" #. Indexed vector register expected. -#: config/tc-aarch64.c:1096 +#: config/tc-aarch64.c:1055 msgid "indexed vector register expected" msgstr "" -#: config/tc-aarch64.c:1103 +#: config/tc-aarch64.c:1062 msgid "invalid use of vector register" msgstr "" -#: config/tc-aarch64.c:1195 config/tc-arm.c:2132 +#: config/tc-aarch64.c:1154 config/tc-arm.c:2110 msgid "expecting {" msgstr "" -#: config/tc-aarch64.c:1220 +#: config/tc-aarch64.c:1179 msgid "invalid vector register in list" msgstr "" -#: config/tc-aarch64.c:1227 +#: config/tc-aarch64.c:1186 msgid "invalid scalar register in list" msgstr "" -#: config/tc-aarch64.c:1240 +#: config/tc-aarch64.c:1199 msgid "invalid range in vector register list" msgstr "" -#: config/tc-aarch64.c:1253 +#: config/tc-aarch64.c:1212 msgid "type mismatch in vector register list" msgstr "" -#: config/tc-aarch64.c:1270 +#: config/tc-aarch64.c:1229 msgid "end of vector register list not found" msgstr "" -#: config/tc-aarch64.c:1287 +#: config/tc-aarch64.c:1246 msgid "constant expression required." msgstr "" -#: config/tc-aarch64.c:1297 +#: config/tc-aarch64.c:1256 msgid "expected index" msgstr "" -#: config/tc-aarch64.c:1304 +#: config/tc-aarch64.c:1263 msgid "too many registers in vector register list" msgstr "" -#: config/tc-aarch64.c:1309 +#: config/tc-aarch64.c:1268 msgid "empty vector register list" msgstr "" -#: config/tc-aarch64.c:1331 config/tc-arm.c:2568 +#: config/tc-aarch64.c:1290 config/tc-arm.c:2546 #, c-format msgid "ignoring attempt to redefine built-in register '%s'" msgstr "" -#: config/tc-aarch64.c:1337 config/tc-arm.c:2573 +#: config/tc-aarch64.c:1296 config/tc-arm.c:2551 #, c-format msgid "ignoring redefinition of register alias '%s'" msgstr "" -#: config/tc-aarch64.c:1382 config/tc-arm.c:2638 +#: config/tc-aarch64.c:1341 config/tc-arm.c:2616 #, c-format msgid "unknown register '%s' -- .req ignored" msgstr "" -#: config/tc-aarch64.c:1440 config/tc-arm.c:2846 +#: config/tc-aarch64.c:1399 config/tc-arm.c:2824 msgid "invalid syntax for .req directive" msgstr "" -#: config/tc-aarch64.c:1465 config/tc-arm.c:2884 +#: config/tc-aarch64.c:1424 config/tc-arm.c:2862 msgid "invalid syntax for .unreq directive" msgstr "" -#: config/tc-aarch64.c:1471 config/tc-arm.c:2891 +#: config/tc-aarch64.c:1430 config/tc-arm.c:2869 #, c-format msgid "unknown register alias '%s'" msgstr "不明なレジスタ別名 '%s' です" -#: config/tc-aarch64.c:1473 +#: config/tc-aarch64.c:1432 #, c-format msgid "ignoring attempt to undefine built-in register '%s'" msgstr "" -#: config/tc-aarch64.c:1797 config/tc-arm.c:3634 config/tc-arm.c:3661 -#: config/tc-arm.c:3674 +#: config/tc-aarch64.c:1756 config/tc-arm.c:3612 config/tc-arm.c:3639 +#: config/tc-arm.c:3652 msgid "literal pool overflow" msgstr "" -#: config/tc-aarch64.c:1979 config/tc-aarch64.c:6398 config/tc-arm.c:3895 -#: config/tc-arm.c:7766 +#: config/tc-aarch64.c:1938 config/tc-aarch64.c:6917 config/tc-arm.c:3873 +#: config/tc-arm.c:7778 msgid "unrecognized relocation suffix" msgstr "" -#: config/tc-aarch64.c:1981 +#: config/tc-aarch64.c:1940 msgid "unimplemented relocation suffix" msgstr "" -#: config/tc-aarch64.c:2223 config/tc-aarch64.c:2414 config/tc-aarch64.c:2458 +#: config/tc-aarch64.c:2182 config/tc-aarch64.c:2373 config/tc-aarch64.c:2417 #: config/tc-csky.c:2314 msgid "immediate operand required" msgstr "" -#: config/tc-aarch64.c:2232 +#: config/tc-aarch64.c:2191 msgid "missing immediate expression" msgstr "" -#: config/tc-aarch64.c:2438 config/tc-aarch64.c:6221 config/tc-aarch64.c:6241 +#: config/tc-aarch64.c:2397 config/tc-aarch64.c:6740 config/tc-aarch64.c:6760 msgid "invalid floating-point constant" msgstr "" -#: config/tc-aarch64.c:3241 config/tc-arm.c:5536 config/tc-arm.c:5546 +#: config/tc-aarch64.c:3200 config/tc-arm.c:5544 config/tc-arm.c:5554 msgid "shift expression expected" msgstr "" -#: config/tc-aarch64.c:3249 +#: config/tc-aarch64.c:3208 msgid "shift operator expected" msgstr "" -#: config/tc-aarch64.c:3257 +#: config/tc-aarch64.c:3216 msgid "invalid use of 'MSL'" msgstr "" -#: config/tc-aarch64.c:3265 +#: config/tc-aarch64.c:3224 msgid "invalid use of 'MUL'" msgstr "" -#: config/tc-aarch64.c:3274 +#: config/tc-aarch64.c:3233 msgid "extending shift is not permitted" msgstr "" -#: config/tc-aarch64.c:3282 +#: config/tc-aarch64.c:3241 msgid "'ROR' shift is not permitted" msgstr "" -#: config/tc-aarch64.c:3290 +#: config/tc-aarch64.c:3249 msgid "only 'LSL' shift is permitted" msgstr "" -#: config/tc-aarch64.c:3298 +#: config/tc-aarch64.c:3257 msgid "only 'MUL' is permitted" msgstr "" -#: config/tc-aarch64.c:3316 +#: config/tc-aarch64.c:3275 msgid "only 'MUL VL' is permitted" msgstr "" -#: config/tc-aarch64.c:3324 +#: config/tc-aarch64.c:3283 msgid "invalid shift for the register offset addressing mode" msgstr "" -#: config/tc-aarch64.c:3332 +#: config/tc-aarch64.c:3291 msgid "invalid shift operator" msgstr "" -#: config/tc-aarch64.c:3366 +#: config/tc-aarch64.c:3325 msgid "missing shift amount" msgstr "" -#: config/tc-aarch64.c:3373 +#: config/tc-aarch64.c:3332 msgid "constant shift amount required" msgstr "" -#: config/tc-aarch64.c:3382 +#: config/tc-aarch64.c:3341 msgid "shift amount out of range 0 to 63" msgstr "" -#: config/tc-aarch64.c:3432 +#: config/tc-aarch64.c:3391 msgid "unexpected shift operator" msgstr "" -#: config/tc-aarch64.c:3468 +#: config/tc-aarch64.c:3427 msgid "unexpected register in the immediate operand" msgstr "" -#: config/tc-aarch64.c:3493 +#: config/tc-aarch64.c:3452 msgid "integer register expected in the extended/shifted operand register" msgstr "" -#: config/tc-aarch64.c:3528 config/tc-aarch64.c:3666 config/tc-aarch64.c:3799 -#: config/tc-aarch64.c:3983 config/tc-aarch64.c:4025 +#: config/tc-aarch64.c:3487 config/tc-aarch64.c:3625 config/tc-aarch64.c:3758 +#: config/tc-aarch64.c:3958 config/tc-aarch64.c:4000 msgid "unknown relocation modifier" msgstr "" -#: config/tc-aarch64.c:3535 config/tc-aarch64.c:3685 config/tc-aarch64.c:3806 -#: config/tc-aarch64.c:3990 config/tc-aarch64.c:4032 +#: config/tc-aarch64.c:3494 config/tc-aarch64.c:3644 config/tc-aarch64.c:3765 +#: config/tc-aarch64.c:3965 config/tc-aarch64.c:4007 msgid "this relocation modifier is not allowed on this instruction" msgstr "" -#: config/tc-aarch64.c:3694 config/tc-aarch64.c:3818 +#: config/tc-aarch64.c:3653 config/tc-aarch64.c:3777 msgid "invalid relocation expression" msgstr "" -#: config/tc-aarch64.c:3711 +#: config/tc-aarch64.c:3670 msgid "invalid address" msgstr "" -#: config/tc-aarch64.c:3768 +#: config/tc-aarch64.c:3727 msgid "invalid use of 32-bit register offset" msgstr "" -#: config/tc-aarch64.c:3777 +#: config/tc-aarch64.c:3736 msgid "offset has different size from base" msgstr "" -#: config/tc-aarch64.c:3783 +#: config/tc-aarch64.c:3742 msgid "invalid use of 64-bit register offset" msgstr "" #. [Xn],#expr -#: config/tc-aarch64.c:3832 config/tc-aarch64.c:3890 +#: config/tc-aarch64.c:3791 config/tc-aarch64.c:3849 msgid "invalid expression in the address" msgstr "" -#: config/tc-aarch64.c:3846 config/tc-arm.c:6135 config/tc-arm.c:6728 +#: config/tc-aarch64.c:3805 config/tc-arm.c:6143 config/tc-arm.c:6736 msgid "']' expected" msgstr "" -#: config/tc-aarch64.c:3854 +#: config/tc-aarch64.c:3813 msgid "register offset not allowed in pre-indexed addressing mode" msgstr "" -#: config/tc-aarch64.c:3869 config/tc-arm.c:6171 +#: config/tc-aarch64.c:3828 config/tc-arm.c:6179 msgid "cannot combine pre- and post-indexing" msgstr "" #. Reject [Rn]! -#: config/tc-aarch64.c:3914 +#: config/tc-aarch64.c:3873 msgid "missing offset in the pre-indexed address" msgstr "" -#: config/tc-aarch64.c:3861 +#: config/tc-aarch64.c:4029 msgid "unknown or missing option to PSB" msgstr "" -#: config/tc-aarch64.c:3869 +#: config/tc-aarch64.c:4037 msgid "the specified option is not accepted for PSB" msgstr "" -#: config/tc-aarch64.c:4192 config/tc-aarch64.c:4206 +#: config/tc-aarch64.c:4167 config/tc-aarch64.c:4181 msgid "unknown option to BTI" msgstr "" -#: config/tc-aarch64.c:4270 +#: config/tc-aarch64.c:4781 #, c-format msgid "selected processor does not support PSTATE field name '%s'" msgstr "" -#: config/tc-aarch64.c:4275 config/tc-aarch64.c:4317 +#: config/tc-aarch64.c:4786 config/tc-aarch64.c:4828 #, c-format msgid "selected processor does not support system register name '%s'" msgstr "" -#: config/tc-aarch64.c:4278 config/tc-aarch64.c:4320 +#: config/tc-aarch64.c:4789 config/tc-aarch64.c:4831 #, c-format msgid "" "system register name '%s' is deprecated and may be removed in a future " "release" msgstr "" -#: config/tc-aarch64.c:4362 +#: config/tc-aarch64.c:4873 msgid "immediate value out of range " msgstr "" -#: config/tc-aarch64.c:4876 +#: config/tc-aarch64.c:5392 #, c-format msgid "Info: " msgstr "" -#: config/tc-aarch64.c:4911 config/tc-score.c:2752 config/tc-score.c:6481 +#: config/tc-aarch64.c:5440 config/tc-score.c:2752 config/tc-score.c:6481 #, c-format msgid "%s -- `%s'" msgstr "" -#: config/tc-aarch64.c:4913 +#: config/tc-aarch64.c:5442 #, c-format msgid "%s at operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:4919 +#: config/tc-aarch64.c:5448 #, c-format msgid "operand %d must be %s -- `%s'" msgstr "" -#: config/tc-aarch64.c:4925 +#: config/tc-aarch64.c:5454 #, c-format msgid "operand mismatch -- `%s'" msgstr "" #. Print the hint. -#: config/tc-aarch64.c:4985 +#: config/tc-aarch64.c:5514 msgid " did you mean this?" msgstr "" -#: config/tc-aarch64.c:4988 config/tc-aarch64.c:5015 +#: config/tc-aarch64.c:5517 config/tc-aarch64.c:5544 #, c-format msgid " %s" msgstr "" -#: config/tc-aarch64.c:4993 +#: config/tc-aarch64.c:5522 msgid " other valid variant(s):" msgstr "" -#: config/tc-aarch64.c:5022 +#: config/tc-aarch64.c:5557 #, c-format msgid "operand %d must be the same register as operand 1 -- `%s'" msgstr "" -#: config/tc-aarch64.c:5028 +#: config/tc-aarch64.c:5563 #, c-format msgid "%s out of range %d to %d at operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:5029 config/tc-aarch64.c:5033 config/tc-aarch64.c:7041 +#: config/tc-aarch64.c:5564 config/tc-aarch64.c:5568 config/tc-aarch64.c:7666 msgid "immediate value" msgstr "" -#: config/tc-aarch64.c:5032 +#: config/tc-aarch64.c:5567 #, c-format msgid "%s must be %d at operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:5039 +#: config/tc-aarch64.c:5574 #, c-format msgid "" "invalid number of registers in the list; only 1 register is expected at " "operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:5043 +#: config/tc-aarch64.c:5578 #, c-format msgid "" "invalid number of registers in the list; %d registers are expected at " "operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:5049 +#: config/tc-aarch64.c:5584 #, c-format msgid "immediate value must be a multiple of %d at operand %d -- `%s'" msgstr "" -#: config/tc-aarch64.c:5367 +#: config/tc-aarch64.c:5885 msgid "bad vector arrangement type" msgstr "" -#: config/tc-aarch64.c:5496 +#: config/tc-aarch64.c:6014 msgid "the specified relocation type is not allowed for MOVK" msgstr "" -#: config/tc-aarch64.c:5544 config/tc-aarch64.c:5555 +#: config/tc-aarch64.c:6062 config/tc-aarch64.c:6073 msgid "the specified relocation type is not allowed for 32-bit register" msgstr "" -#: config/tc-aarch64.c:5755 +#: config/tc-aarch64.c:6273 msgid "comma expected between operands" msgstr "" -#: config/tc-aarch64.c:5906 +#: config/tc-aarch64.c:6425 msgid "the top half of a 128-bit FP/SIMD register is expected" msgstr "" -#: config/tc-aarch64.c:5981 config/tc-arm.c:2241 config/tc-arm.c:2286 +#: config/tc-aarch64.c:6500 config/tc-arm.c:2219 config/tc-arm.c:2264 #: config/tc-h8300.c:1042 msgid "invalid register list" msgstr "" -#: config/tc-aarch64.c:5988 +#: config/tc-aarch64.c:6507 msgid "expected element type rather than vector type" msgstr "" -#: config/tc-aarch64.c:6009 +#: config/tc-aarch64.c:6528 msgid "missing type suffix" msgstr "" -#: config/tc-aarch64.c:6028 +#: config/tc-aarch64.c:6547 msgid "C0 - C15 expected" msgstr "" -#: config/tc-aarch64.c:6135 config/tc-aarch64.c:6159 +#: config/tc-aarch64.c:6654 config/tc-aarch64.c:6678 msgid "immediate zero expected" msgstr "" -#: config/tc-aarch64.c:6256 +#: config/tc-aarch64.c:6775 msgid "shift not allowed for bitmask immediate" msgstr "" -#: config/tc-aarch64.c:6310 +#: config/tc-aarch64.c:6829 msgid "can't mix relocation modifier with explicit shift" msgstr "" -#: config/tc-aarch64.c:6359 config/tc-arm.c:15901 config/tc-arm.c:15926 -#: config/tc-arm.c:15937 config/tc-arm.c:15944 +#: config/tc-aarch64.c:6878 config/tc-arm.c:15929 config/tc-arm.c:15954 +#: config/tc-arm.c:15965 config/tc-arm.c:15972 msgid "invalid condition" msgstr "" -#: config/tc-aarch64.c:6385 +#: config/tc-aarch64.c:6904 msgid "invalid pc-relative address" msgstr "" #. Only permit "=value" in the literal load instructions. #. The literal will be generated by programmer_friendly_fixup. -#: config/tc-aarch64.c:6393 +#: config/tc-aarch64.c:6912 msgid "invalid use of \"=immediate\"" msgstr "" -#: config/tc-aarch64.c:6458 config/tc-aarch64.c:6490 config/tc-aarch64.c:6508 -#: config/tc-aarch64.c:6532 config/tc-aarch64.c:6552 config/tc-aarch64.c:6571 -#: config/tc-aarch64.c:6594 config/tc-aarch64.c:6630 config/tc-aarch64.c:6637 -#: config/tc-aarch64.c:6665 config/tc-aarch64.c:6685 config/tc-aarch64.c:6710 -#: config/tc-aarch64.c:6728 config/tc-aarch64.c:6736 config/tc-aarch64.c:6753 -#: config/tc-aarch64.c:6777 +#: config/tc-aarch64.c:6977 config/tc-aarch64.c:7009 config/tc-aarch64.c:7027 +#: config/tc-aarch64.c:7051 config/tc-aarch64.c:7071 config/tc-aarch64.c:7090 +#: config/tc-aarch64.c:7113 config/tc-aarch64.c:7179 config/tc-aarch64.c:7186 +#: config/tc-aarch64.c:7214 config/tc-aarch64.c:7235 config/tc-aarch64.c:7260 +#: config/tc-aarch64.c:7278 config/tc-aarch64.c:7286 config/tc-aarch64.c:7303 +#: config/tc-aarch64.c:7327 msgid "invalid addressing mode" msgstr "" -#: config/tc-aarch64.c:6474 +#: config/tc-aarch64.c:6993 msgid "the optional immediate offset can only be 0" msgstr "" -#: config/tc-aarch64.c:6513 config/tc-aarch64.c:6537 config/tc-aarch64.c:6557 +#: config/tc-aarch64.c:7032 config/tc-aarch64.c:7056 config/tc-aarch64.c:7076 msgid "relocation not allowed" msgstr "" -#: config/tc-aarch64.c:6604 +#: config/tc-aarch64.c:7123 msgid "writeback value must be an immediate constant" msgstr "" #. Make sure this has priority over #. "invalid addressing mode". -#: config/tc-aarch64.c:6645 +#: config/tc-aarch64.c:7194 msgid "constant offset required" msgstr "" -#: config/tc-aarch64.c:6789 +#: config/tc-aarch64.c:7339 msgid "unknown or missing system register name" msgstr "" -#: config/tc-aarch64.c:6801 +#: config/tc-aarch64.c:7134 config/tc-aarch64.c:7353 msgid "unknown or missing PSTATE field name" msgstr "" -#: config/tc-aarch64.c:6833 +#: config/tc-aarch64.c:7387 msgid "unknown or missing operation name" msgstr "" -#: config/tc-aarch64.c:6846 +#: config/tc-aarch64.c:7400 msgid "the specified option is not accepted in ISB" msgstr "" -#: config/tc-aarch64.c:6919 config/tc-aarch64.c:8132 config/tc-arm.c:8048 +#: config/tc-aarch64.c:7544 config/tc-aarch64.c:8792 config/tc-arm.c:8060 #, c-format msgid "unhandled operand code %d" msgstr "" -#: config/tc-aarch64.c:6961 +#: config/tc-aarch64.c:7586 msgid "unexpected comma before the omitted optional operand" msgstr "" -#: config/tc-aarch64.c:6989 +#: config/tc-aarch64.c:7614 msgid "unexpected characters following instruction" msgstr "" -#: config/tc-aarch64.c:7067 config/tc-arm.c:5661 config/tc-arm.c:6279 -#: config/tc-arm.c:8852 +#: config/tc-aarch64.c:7692 config/tc-arm.c:5669 config/tc-arm.c:6287 +#: config/tc-arm.c:8874 msgid "constant expression expected" msgstr "" -#: config/tc-aarch64.c:7074 +#: config/tc-aarch64.c:7699 msgid "literal pool insertion failed" msgstr "" -#: config/tc-aarch64.c:7145 config/tc-aarch64.c:7160 +#: config/tc-aarch64.c:7770 config/tc-aarch64.c:7785 #, c-format msgid "unpredictable transfer with writeback -- `%s'" msgstr "" -#: config/tc-aarch64.c:7164 config/tc-aarch64.c:7178 +#: config/tc-aarch64.c:7789 config/tc-aarch64.c:7803 #, c-format msgid "unpredictable load of register pair -- `%s'" msgstr "" -#: config/tc-aarch64.c:7185 config/tc-aarch64.c:7198 +#: config/tc-aarch64.c:7810 config/tc-aarch64.c:7823 #, c-format msgid "unpredictable: identical transfer and status registers --`%s'" msgstr "" -#: config/tc-aarch64.c:7223 +#: config/tc-aarch64.c:7852 #, c-format msgid "previous `%s' sequence has not been closed" msgstr "" -#: config/tc-aarch64.c:7302 +#: config/tc-aarch64.c:7947 #, c-format msgid "unknown mnemonic `%s' -- `%s'" msgstr "" -#: config/tc-aarch64.c:7310 +#: config/tc-aarch64.c:7955 #, c-format msgid "unexpected comma after the mnemonic name `%s' -- `%s'" msgstr "" -#: config/tc-aarch64.c:7368 +#: config/tc-aarch64.c:8013 #, c-format msgid "selected processor does not support `%s'" msgstr "" -#: config/tc-aarch64.c:7791 config/tc-arm.c:28047 +#: config/tc-aarch64.c:8451 config/tc-arm.c:28125 msgid "GOT already in the symbol table" msgstr "" -#: config/tc-aarch64.c:7954 +#: config/tc-aarch64.c:8614 msgid "immediate cannot be moved by a single instruction" msgstr "" -#: config/tc-aarch64.c:7998 config/tc-aarch64.c:8043 config/tc-aarch64.c:8069 -#: config/tc-arm.c:16445 config/tc-arm.c:18142 config/tc-arm.c:18722 -#: config/tc-arm.c:18749 config/tc-arm.c:19537 config/tc-arm.c:20372 -#: config/tc-arm.c:21389 config/tc-arm.c:21449 config/tc-metag.c:2443 +#: config/tc-aarch64.c:8658 config/tc-aarch64.c:8703 config/tc-aarch64.c:8729 +#: config/tc-arm.c:16473 config/tc-arm.c:18170 config/tc-arm.c:18750 +#: config/tc-arm.c:18777 config/tc-arm.c:19565 config/tc-arm.c:20400 +#: config/tc-arm.c:21423 config/tc-arm.c:21483 config/tc-metag.c:2443 #: config/tc-metag.c:2452 config/tc-metag.c:2491 config/tc-metag.c:2500 #: config/tc-metag.c:3019 config/tc-metag.c:3028 msgid "immediate out of range" msgstr "" -#: config/tc-aarch64.c:8062 config/tc-metag.c:4654 config/tc-xtensa.c:4243 +#: config/tc-aarch64.c:8722 config/tc-metag.c:4654 config/tc-xtensa.c:4243 msgid "invalid immediate" msgstr "" -#: config/tc-aarch64.c:8127 config/tc-tic6x.c:3855 config/tc-tic6x.c:3920 +#: config/tc-aarch64.c:8787 config/tc-tic6x.c:3855 config/tc-tic6x.c:3920 #: config/tc-tic6x.c:3947 config/tc-tic6x.c:3975 msgid "immediate offset out of range" msgstr "" -#: config/tc-aarch64.c:8201 config/tc-arm.c:28385 config/tc-arm.c:28453 -#: config/tc-arm.c:28735 +#: config/tc-aarch64.c:8861 config/tc-arm.c:28463 config/tc-arm.c:28531 +#: config/tc-arm.c:28813 #, c-format msgid "undefined symbol %s used as an immediate value" msgstr "" -#: config/tc-aarch64.c:8213 +#: config/tc-aarch64.c:8873 msgid "pc-relative load offset not word aligned" msgstr "" -#: config/tc-aarch64.c:8216 +#: config/tc-aarch64.c:8876 msgid "pc-relative load offset out of range" msgstr "" -#: config/tc-aarch64.c:8228 +#: config/tc-aarch64.c:8888 msgid "pc-relative address offset out of range" msgstr "" -#: config/tc-aarch64.c:8240 config/tc-aarch64.c:8255 +#: config/tc-aarch64.c:8900 config/tc-aarch64.c:8915 msgid "conditional branch target not word aligned" msgstr "" -#: config/tc-aarch64.c:8243 config/tc-aarch64.c:8258 config/tc-arm.c:29030 +#: config/tc-aarch64.c:8903 config/tc-aarch64.c:8918 config/tc-arm.c:29108 msgid "conditional branch out of range" msgstr "" -#: config/tc-aarch64.c:8271 +#: config/tc-aarch64.c:8931 msgid "branch target not word aligned" msgstr "" -#: config/tc-aarch64.c:8274 config/tc-arm.c:925 config/tc-arm.c:29836 +#: config/tc-aarch64.c:8934 config/tc-arm.c:929 config/tc-arm.c:29914 #: config/tc-mips.c:16069 config/tc-mips.c:16085 config/tc-mips.c:16175 msgid "branch out of range" msgstr "" -#: config/tc-aarch64.c:8333 config/tc-arm.c:28626 config/tc-arm.c:28641 -#: config/tc-arm.c:28656 config/tc-arm.c:28667 config/tc-arm.c:28690 -#: config/tc-arm.c:29540 config/tc-moxie.c:714 config/tc-pj.c:449 -#: config/tc-sh.c:3728 +#: config/tc-aarch64.c:4632 config/tc-aarch64.c:8993 config/tc-arm.c:28704 +#: config/tc-arm.c:28719 config/tc-arm.c:28734 config/tc-arm.c:28745 +#: config/tc-arm.c:28768 config/tc-arm.c:29618 config/tc-moxie.c:714 +#: config/tc-pj.c:449 config/tc-sh.c:3728 msgid "offset out of range" msgstr "" -#: config/tc-aarch64.c:8348 +#: config/tc-aarch64.c:9008 msgid "unsigned value out of range" msgstr "" -#: config/tc-aarch64.c:8359 +#: config/tc-aarch64.c:9019 msgid "signed value out of range" msgstr "" -#: config/tc-aarch64.c:8509 +#: config/tc-aarch64.c:9169 #, c-format msgid "unexpected %s fixup" msgstr "" -#: config/tc-aarch64.c:8574 config/tc-arm.c:30256 config/tc-arm.c:30277 -#: config/tc-mips.c:18436 config/tc-or1k.c:345 config/tc-score.c:7448 +#: config/tc-aarch64.c:9234 config/tc-arm.c:30334 config/tc-arm.c:30355 +#: config/tc-mips.c:18429 config/tc-or1k.c:345 config/tc-score.c:7448 #, c-format msgid "cannot represent %s relocation in this object file format" msgstr "" -#: config/tc-aarch64.c:8607 +#: config/tc-aarch64.c:9267 #, c-format msgid "cannot do %u-byte relocation" msgstr "" -#: config/tc-aarch64.c:8227 config/tc-arm.c:25283 config/tc-score.c:6297 -#: config/tc-score.c:6527 config/tc-score.c:6532 +#: config/tc-aarch64.c:8683 config/tc-arm.c:30182 config/tc-score.c:6293 +#: config/tc-score.c:6523 config/tc-score.c:6528 msgid "virtual memory exhausted" msgstr "仮想メモリが足りなくなりました" -#: config/tc-aarch64.c:9012 config/tc-arm.c:31091 +#: config/tc-aarch64.c:9672 config/tc-arm.c:31169 msgid "assemble for big-endian" msgstr "" -#: config/tc-aarch64.c:9013 config/tc-arm.c:31092 +#: config/tc-aarch64.c:9673 config/tc-arm.c:31170 msgid "assemble for little-endian" msgstr "" -#: config/tc-aarch64.c:9016 +#: config/tc-aarch64.c:9676 msgid "temporary switch for dumping" msgstr "" -#: config/tc-aarch64.c:9018 +#: config/tc-aarch64.c:9678 msgid "output verbose error messages" msgstr "" -#: config/tc-aarch64.c:9020 +#: config/tc-aarch64.c:9680 msgid "do not output verbose error messages" msgstr "" -#: config/tc-aarch64.c:9358 config/tc-arm.c:32213 +#: config/tc-aarch64.c:10056 config/tc-arm.c:32328 msgid "invalid architectural extension" msgstr "" -#: config/tc-aarch64.c:9383 config/tc-arm.c:32245 +#: config/tc-aarch64.c:10081 config/tc-arm.c:32360 msgid "must specify extensions to add before specifying those to remove" msgstr "" -#: config/tc-aarch64.c:9391 config/tc-arm.c:32253 +#: config/tc-aarch64.c:10089 config/tc-arm.c:32368 msgid "missing architectural extension" msgstr "" -#: config/tc-aarch64.c:9418 config/tc-arm.c:32339 +#: config/tc-aarch64.c:10116 config/tc-arm.c:32454 #, c-format msgid "unknown architectural extension `%s'" msgstr "" -#: config/tc-aarch64.c:9442 config/tc-arm.c:32389 config/tc-metag.c:5832 +#: config/tc-aarch64.c:10140 config/tc-arm.c:32504 config/tc-metag.c:5832 #, c-format msgid "missing cpu name `%s'" msgstr "" -#: config/tc-aarch64.c:9456 config/tc-aarch64.c:9672 config/tc-arm.c:32424 -#: config/tc-arm.c:33225 config/tc-csky.c:1218 config/tc-metag.c:5843 +#: config/tc-aarch64.c:10154 config/tc-aarch64.c:10370 config/tc-arm.c:32539 +#: config/tc-arm.c:33346 config/tc-csky.c:1218 config/tc-metag.c:5843 #, c-format msgid "unknown cpu `%s'" msgstr "" -#: config/tc-aarch64.c:9474 config/tc-arm.c:32442 +#: config/tc-aarch64.c:10172 config/tc-arm.c:32557 #, c-format msgid "missing architecture name `%s'" msgstr "" -#: config/tc-aarch64.c:9488 config/tc-aarch64.c:9719 config/tc-arm.c:32464 -#: config/tc-arm.c:33260 config/tc-arm.c:33290 config/tc-score.c:7683 +#: config/tc-aarch64.c:10186 config/tc-aarch64.c:10417 config/tc-arm.c:32579 +#: config/tc-arm.c:33381 config/tc-arm.c:33411 config/tc-score.c:7683 #, c-format msgid "unknown architecture `%s'\n" msgstr "" -#: config/tc-aarch64.c:9511 +#: config/tc-aarch64.c:10209 #, c-format msgid "missing abi name `%s'" msgstr "" -#: config/tc-aarch64.c:9522 +#: config/tc-aarch64.c:10220 #, c-format msgid "unknown abi `%s'\n" msgstr "" -#: config/tc-aarch64.c:9528 +#: config/tc-aarch64.c:10226 msgid "\t specify for ABI " msgstr "" -#: config/tc-aarch64.c:9531 config/tc-arm.c:32551 config/tc-metag.c:5909 +#: config/tc-aarch64.c:10229 config/tc-arm.c:32666 config/tc-metag.c:5909 msgid "\t assemble for CPU " msgstr "" -#: config/tc-aarch64.c:9533 config/tc-arm.c:32553 +#: config/tc-aarch64.c:10231 config/tc-arm.c:32668 msgid "\t assemble for architecture " msgstr "" -#: config/tc-aarch64.c:9572 config/tc-aarch64.c:9591 config/tc-arm.c:32621 -#: config/tc-arm.c:32639 config/tc-arm.c:32659 config/tc-metag.c:5933 +#: config/tc-aarch64.c:10270 config/tc-aarch64.c:10289 config/tc-arm.c:32736 +#: config/tc-arm.c:32754 config/tc-arm.c:32774 config/tc-metag.c:5933 #, c-format msgid "option `-%c%s' is deprecated: %s" msgstr "" -#: config/tc-aarch64.c:9611 +#: config/tc-aarch64.c:10309 #, c-format msgid " AArch64-specific assembler options:\n" msgstr "" -#: config/tc-aarch64.c:9622 config/tc-arc.c:3581 config/tc-arm.c:32690 +#: config/tc-aarch64.c:10320 config/tc-arc.c:3576 config/tc-arm.c:32805 #, c-format msgid " -EB assemble code for a big-endian cpu\n" msgstr "" -#: config/tc-aarch64.c:9627 config/tc-arc.c:3583 config/tc-arm.c:32695 +#: config/tc-aarch64.c:10325 config/tc-arc.c:3578 config/tc-arm.c:32810 #, c-format msgid " -EL assemble code for a little-endian cpu\n" msgstr "" @@ -2283,7 +2276,7 @@ msgid "opcode `%s' not supported for target %s" msgstr "命令コード `%s' はターゲット %s 用にはサポートされていません" -#: config/tc-alpha.c:1189 config/tc-alpha.c:3363 config/tc-avr.c:1905 +#: config/tc-alpha.c:1189 config/tc-alpha.c:3363 config/tc-avr.c:1915 #: config/tc-msp430.c:4361 config/tc-wasm32.c:753 #, c-format msgid "unknown opcode `%s'" @@ -2364,8 +2357,8 @@ msgid "sequence number in use for !tlsgd!%ld" msgstr "!tlsgd!%ld 用の順序番号が使用中です" -#: config/tc-alpha.c:1992 config/tc-arc.c:2848 config/tc-mn10200.c:854 -#: config/tc-mn10300.c:1150 config/tc-ppc.c:2019 config/tc-s390.c:668 +#: config/tc-alpha.c:1992 config/tc-arc.c:2848 config/tc-mn10200.c:847 +#: config/tc-mn10300.c:1150 config/tc-ppc.c:2028 config/tc-s390.c:668 #: config/tc-tilegx.c:422 config/tc-tilegx.c:472 config/tc-tilepro.c:375 msgid "operand" msgstr "被演算子" @@ -2382,12 +2375,12 @@ msgid "can not resolve expression" msgstr "式を計算できません" -#: config/tc-alpha.c:3512 config/tc-microblaze.c:204 config/tc-ppc.c:2352 +#: config/tc-alpha.c:3512 config/tc-microblaze.c:204 config/tc-ppc.c:2365 #, c-format msgid ".COMMon length (%ld.) <0! Ignored." msgstr ".COMMon 長 (%ld.) が 0 未満です! 無視されました。" -#: config/tc-alpha.c:3523 config/tc-ia64.c:1091 config/tc-sparc.c:4270 +#: config/tc-alpha.c:3523 config/tc-ia64.c:1092 config/tc-sparc.c:4270 #: config/tc-v850.c:306 msgid "Ignoring attempt to re-define symbol" msgstr "シンボル再定義の試みを無視しています" @@ -2433,12 +2426,12 @@ msgid "bad .mask directive" msgstr "間違った .mask 指示です" -#: config/tc-alpha.c:3872 config/tc-mips.c:19918 config/tc-score.c:5736 +#: config/tc-alpha.c:3872 config/tc-mips.c:19911 config/tc-score.c:5736 #: ecoff.c:3161 msgid ".frame outside of .ent" msgstr ".ent の外側に .frame があります" -#: config/tc-alpha.c:3883 config/tc-mips.c:19929 ecoff.c:3172 +#: config/tc-alpha.c:3883 config/tc-mips.c:19922 ecoff.c:3172 msgid "bad .frame directive" msgstr "間違った .frame 指示です" @@ -2604,7 +2597,7 @@ msgstr "内部エラー: マクロ `%s' をハッシュ化できません: %s" #: config/tc-alpha.c:5545 config/tc-arc.c:2520 config/tc-arc.c:2534 -#: config/tc-arm.c:897 config/tc-xtensa.c:5487 config/tc-xtensa.c:5563 +#: config/tc-arm.c:901 config/tc-xtensa.c:5487 config/tc-xtensa.c:5563 #: config/tc-xtensa.c:5680 config/tc-z80.c:3675 msgid "syntax error" msgstr "" @@ -2629,12 +2622,12 @@ "-replace/-noreplace\tenable or disable the optimization of procedure calls\n" msgstr "" -#: config/tc-alpha.c:5942 config/tc-arc.c:3128 +#: config/tc-alpha.c:5942 config/tc-arc.c:3123 #, c-format msgid "unhandled relocation type %s" msgstr "取り扱われない再配置型 %s です" -#: config/tc-alpha.c:5955 config/tc-arc.c:3136 +#: config/tc-alpha.c:5955 config/tc-arc.c:3131 msgid "non-absolute expression in constant field" msgstr "" @@ -2652,14 +2645,14 @@ msgid "!samegp reloc against symbol without .prologue: %s" msgstr ".prologue が無いシンボルに対する !samegp 再配置です: %s" -#: config/tc-alpha.c:6236 config/tc-arc.c:3259 config/tc-csky.c:5645 +#: config/tc-alpha.c:6236 config/tc-arc.c:3254 config/tc-csky.c:5646 #: config/tc-tilegx.c:1745 config/tc-tilepro.c:1522 config/tc-wasm32.c:813 #: config/tc-xtensa.c:6190 #, c-format msgid "cannot represent `%s' relocation in object file" msgstr "" -#: config/tc-alpha.c:6242 config/tc-arc.c:3265 +#: config/tc-alpha.c:6242 config/tc-arc.c:3260 #, c-format msgid "internal error? cannot generate `%s' relocation" msgstr "内部エラー? `%s' 再配置を生成できません" @@ -2669,14 +2662,14 @@ msgid "frame reg expected, using $%d." msgstr "" -#: config/tc-arc.c:771 +#: config/tc-arc.c:770 #, c-format msgid "internal error: can't hash opcode '%s': %s" msgstr "" -#: config/tc-arc.c:779 config/tc-arc.c:2556 config/tc-arc.c:2574 -#: config/tc-arc.c:2627 config/tc-arc.c:2651 config/tc-arc.c:4850 -#: config/tc-arc.c:4917 config/tc-cr16.c:805 config/tc-cr16.c:828 +#: config/tc-arc.c:778 config/tc-arc.c:2600 config/tc-arc.c:2618 +#: config/tc-arc.c:2671 config/tc-arc.c:2695 config/tc-arc.c:4900 +#: config/tc-arc.c:4967 config/tc-cr16.c:805 config/tc-cr16.c:828 #: config/tc-cris.c:1195 config/tc-crx.c:535 config/tc-crx.c:562 #: config/tc-crx.c:580 config/tc-pdp11.c:193 msgid "Virtual memory exhausted" @@ -2704,7 +2697,7 @@ msgid "unknown architecture: %s\n" msgstr "" -#: config/tc-arc.c:891 config/tc-ia64.c:7487 config/tc-tilegx.c:262 +#: config/tc-arc.c:891 config/tc-ia64.c:7480 config/tc-tilegx.c:262 msgid "Could not set architecture and machine" msgstr "" @@ -2740,7 +2733,7 @@ msgid "extra comma" msgstr "" -#: config/tc-arc.c:1335 config/tc-pru.c:1450 config/tc-pru.c:1698 +#: config/tc-arc.c:1335 config/tc-pru.c:1449 config/tc-pru.c:1697 #: config/tc-xtensa.c:2090 msgid "missing argument" msgstr "" @@ -2785,29 +2778,29 @@ msgid "unknown opcode '%s'" msgstr "" -#: config/tc-arc.c:2493 +#: config/tc-arc.c:2537 #, c-format msgid "Inserting \"%s\" into register table failed: %s" msgstr "" -#: config/tc-arc.c:2529 +#: config/tc-arc.c:2573 #, c-format msgid "Inserting \"%s\" into address type table failed: %s" msgstr "" -#: config/tc-arc.c:2602 config/tc-arc.c:5068 config/tc-h8300.c:78 +#: config/tc-arc.c:2602 config/tc-arc.c:5063 config/tc-h8300.c:78 #: config/tc-h8300.c:87 config/tc-h8300.c:97 config/tc-h8300.c:107 #: config/tc-h8300.c:117 config/tc-h8300.c:128 config/tc-h8300.c:242 #: config/tc-hppa.c:6820 config/tc-hppa.c:6826 config/tc-hppa.c:6832 #: config/tc-hppa.c:6838 config/tc-hppa.c:8225 config/tc-lm32.c:197 #: config/tc-mips.c:3690 config/tc-mips.c:4187 config/tc-mn10300.c:935 -#: config/tc-mn10300.c:940 config/tc-mn10300.c:2440 config/tc-riscv.c:1221 -#: config/tc-riscv.c:3878 config/tc-xc16x.c:79 config/tc-xc16x.c:86 +#: config/tc-mn10300.c:940 config/tc-mn10300.c:2440 config/tc-riscv.c:1263 +#: config/tc-riscv.c:4430 config/tc-xc16x.c:79 config/tc-xc16x.c:86 #: config/tc-xc16x.c:93 msgid "could not set architecture and machine" msgstr "アーキテクチャおよびマシンを設定できませんでした" -#: config/tc-arc.c:2644 config/tc-arc.c:4837 +#: config/tc-arc.c:2688 config/tc-arc.c:4887 #, c-format msgid "internal error: can't hash aux register '%s': %s" msgstr "" @@ -2831,7 +2824,7 @@ msgid "can't resolve `%s' {%s section} - `%s' {%s section}" msgstr "" -#: config/tc-arc.c:2999 +#: config/tc-arc.c:2994 #, c-format msgid "PC relative relocation not allowed for (internal) type %d" msgstr "" @@ -2840,35 +2833,35 @@ #. the insn. #. FIXME! Check for the conditionality of #. the insn. -#: config/tc-arc.c:3044 config/tc-arc.c:4025 +#: config/tc-arc.c:3039 config/tc-arc.c:4020 msgid "TLS_*_S9 relocs are not supported yet" msgstr "" #. I cannot fix an GOTPC relocation because I need to relax it #. from ld rx,[pcl,@sym@gotpc] to add rx,pcl,@sym@gotpc. -#: config/tc-arc.c:3080 +#: config/tc-arc.c:3075 msgid "Unsupported operation on reloc" msgstr "" -#: config/tc-arc.c:3156 config/tc-arc.c:3172 +#: config/tc-arc.c:3151 config/tc-arc.c:3167 msgid "unknown fixup size" msgstr "" -#: config/tc-arc.c:3306 +#: config/tc-arc.c:3301 msgid "no relaxation found for this instruction." msgstr "" -#: config/tc-arc.c:3559 +#: config/tc-arc.c:3554 #, c-format msgid "ARC-specific assembler options:\n" msgstr "" -#: config/tc-arc.c:3585 +#: config/tc-arc.c:3580 #, c-format msgid " -mrelax enable relaxation\n" msgstr "" -#: config/tc-arc.c:3588 +#: config/tc-arc.c:3583 #, c-format msgid "" "The following ARC-specific assembler options are deprecated and are " @@ -2876,7 +2869,7 @@ "for compatibility only:\n" msgstr "" -#: config/tc-arc.c:3591 +#: config/tc-arc.c:3586 #, c-format msgid "" " -mEA\n" @@ -2906,664 +2899,664 @@ " -mxy\n" msgstr "" -#: config/tc-arc.c:3681 +#: config/tc-arc.c:3676 #, c-format msgid "Unable to find %s relocation for instruction %s" msgstr "" -#: config/tc-arc.c:3976 +#: config/tc-arc.c:3971 #, c-format msgid "Unable to use @plt relocation for insn %s" msgstr "" -#: config/tc-arc.c:3995 +#: config/tc-arc.c:3990 #, c-format msgid "Unable to use @pcl relocation for insn %s" msgstr "" -#: config/tc-arc.c:4051 +#: config/tc-arc.c:4046 #, c-format msgid "invalid relocation %s for field" msgstr "" -#: config/tc-arc.c:4161 +#: config/tc-arc.c:4156 #, c-format msgid "Insn %s has a jump/branch instruction %s in its delay slot." msgstr "" -#: config/tc-arc.c:4166 +#: config/tc-arc.c:4161 #, c-format msgid "Insn %s has an instruction %s with limm in its delay slot." msgstr "" -#: config/tc-arc.c:4276 config/tc-microblaze.c:2567 config/tc-mn10300.c:1069 -#: config/tc-sh.c:418 config/tc-z80.c:1119 read.c:4701 +#: config/tc-arc.c:4271 config/tc-microblaze.c:2567 config/tc-mn10300.c:1069 +#: config/tc-sh.c:418 config/tc-z80.c:1119 read.c:4794 #, c-format msgid "unsupported BFD relocation size %u" msgstr "" -#: config/tc-arc.c:4296 +#: config/tc-arc.c:4291 #, c-format msgid "Jump/Branch instruction detected at the end of the ZOL label @%s" msgstr "" -#: config/tc-arc.c:4303 +#: config/tc-arc.c:4298 #, c-format msgid "Kernel instruction detected at the end of the ZOL label @%s" msgstr "" -#: config/tc-arc.c:4308 +#: config/tc-arc.c:4303 #, c-format msgid "" "A jump instruction with long immediate detected at the end of the ZOL label " "@%s" msgstr "" -#: config/tc-arc.c:4314 +#: config/tc-arc.c:4309 #, c-format msgid "An illegal use of delay slot detected at the end of the ZOL label @%s" msgstr "" -#: config/tc-arc.c:4423 +#: config/tc-arc.c:4418 msgid "expected comma after instruction name" msgstr "" -#: config/tc-arc.c:4435 +#: config/tc-arc.c:4430 msgid "expected comma after major opcode" msgstr "" -#: config/tc-arc.c:4620 +#: config/tc-arc.c:4615 #, c-format msgid "Pseudocode already used %s" msgstr "" -#: config/tc-arc.c:4628 +#: config/tc-arc.c:4623 #, c-format msgid "major opcode not in range [0x%02x - 0x%02x]" msgstr "" -#: config/tc-arc.c:4632 +#: config/tc-arc.c:4627 msgid "minor opcode not in range [0x00 - 0x3f]" msgstr "" -#: config/tc-arc.c:4638 +#: config/tc-arc.c:4633 msgid "Improper use of OP1_IMM_IMPLIED" msgstr "" -#: config/tc-arc.c:4644 +#: config/tc-arc.c:4639 msgid "Improper use of OP1_MUST_BE_IMM" msgstr "" -#: config/tc-arc.c:4656 +#: config/tc-arc.c:4651 msgid "Couldn't generate extension instruction opcodes" msgstr "" -#: config/tc-arc.c:4691 +#: config/tc-arc.c:4686 msgid "expected comma after name" msgstr "" -#: config/tc-arc.c:4702 +#: config/tc-arc.c:4697 #, c-format msgid "%s second argument cannot be a negative number %d" msgstr "" -#: config/tc-arc.c:4717 +#: config/tc-arc.c:4712 msgid "expected comma after register number" msgstr "" -#: config/tc-arc.c:4738 +#: config/tc-arc.c:4733 msgid "invalid mode" msgstr "無効なモードです" -#: config/tc-arc.c:4756 +#: config/tc-arc.c:4751 msgid "expected comma after register mode" msgstr "" -#: config/tc-arc.c:4771 +#: config/tc-arc.c:4766 msgid "shortcut designator invalid" msgstr "" -#: config/tc-arc.c:4869 +#: config/tc-arc.c:4864 #, c-format msgid "core register %s value (%d) too large" msgstr "" -#: config/tc-arc.c:4886 +#: config/tc-arc.c:4881 #, c-format msgid "condition code %s value (%d) too large" msgstr "" -#: config/tc-arc.c:4903 +#: config/tc-arc.c:4898 msgid "Unknown extension" msgstr "" -#: config/tc-arc.c:5006 +#: config/tc-arc.c:5001 msgid "Overwrite explicitly set Tag_ARC_CPU_base" msgstr "" -#: config/tc-arc.c:5054 +#: config/tc-arc.c:5049 msgid "Overwrite explicitly set Tag_ARC_ABI_rf16 to full register file" msgstr "" -#: config/tc-arm.c:708 +#: config/tc-arm.c:711 msgid "ARM register expected" msgstr "" -#: config/tc-arm.c:709 +#: config/tc-arm.c:712 msgid "bad or missing co-processor number" msgstr "" -#: config/tc-arm.c:710 +#: config/tc-arm.c:713 msgid "co-processor register expected" msgstr "" -#: config/tc-arm.c:711 +#: config/tc-arm.c:714 msgid "FPA register expected" msgstr "" -#: config/tc-arm.c:712 +#: config/tc-arm.c:715 msgid "VFP single precision register expected" msgstr "" -#: config/tc-arm.c:713 +#: config/tc-arm.c:716 msgid "VFP/Neon double precision register expected" msgstr "" -#: config/tc-arm.c:714 +#: config/tc-arm.c:717 msgid "Neon quad precision register expected" msgstr "" -#: config/tc-arm.c:715 +#: config/tc-arm.c:718 msgid "VFP single or double precision register expected" msgstr "" -#: config/tc-arm.c:716 +#: config/tc-arm.c:719 msgid "Neon double or quad precision register expected" msgstr "" -#: config/tc-arm.c:717 +#: config/tc-arm.c:720 msgid "Neon single or double precision register expected" msgstr "" -#: config/tc-arm.c:718 +#: config/tc-arm.c:721 msgid "VFP single, double or Neon quad precision register expected" msgstr "" -#: config/tc-arm.c:720 +#: config/tc-arm.c:723 msgid "VFP system register expected" msgstr "" -#: config/tc-arm.c:721 +#: config/tc-arm.c:724 msgid "Maverick MVF register expected" msgstr "" -#: config/tc-arm.c:722 +#: config/tc-arm.c:725 msgid "Maverick MVD register expected" msgstr "" -#: config/tc-arm.c:723 +#: config/tc-arm.c:726 msgid "Maverick MVFX register expected" msgstr "" -#: config/tc-arm.c:724 +#: config/tc-arm.c:727 msgid "Maverick MVDX register expected" msgstr "" -#: config/tc-arm.c:725 +#: config/tc-arm.c:728 msgid "Maverick MVAX register expected" msgstr "" -#: config/tc-arm.c:726 +#: config/tc-arm.c:729 msgid "Maverick DSPSC register expected" msgstr "" -#: config/tc-arm.c:727 +#: config/tc-arm.c:730 msgid "iWMMXt data register expected" msgstr "" -#: config/tc-arm.c:728 config/tc-arm.c:7848 +#: config/tc-arm.c:731 config/tc-arm.c:7860 msgid "iWMMXt control register expected" msgstr "" -#: config/tc-arm.c:729 +#: config/tc-arm.c:732 msgid "iWMMXt scalar register expected" msgstr "" -#: config/tc-arm.c:730 +#: config/tc-arm.c:733 msgid "XScale accumulator register expected" msgstr "" -#: config/tc-arm.c:731 +#: config/tc-arm.c:734 msgid "MVE vector register expected" msgstr "" #. For score5u : div/mul will pop warning message, mmu/alw/asw will pop error message. -#: config/tc-arm.c:898 config/tc-score.c:259 +#: config/tc-arm.c:902 config/tc-score.c:259 msgid "bad arguments to instruction" msgstr "" -#: config/tc-arm.c:899 +#: config/tc-arm.c:903 msgid "r13 not allowed here" msgstr "" -#: config/tc-arm.c:900 +#: config/tc-arm.c:904 msgid "r15 not allowed here" msgstr "" -#: config/tc-arm.c:901 +#: config/tc-arm.c:905 msgid "Odd register not allowed here" msgstr "" -#: config/tc-arm.c:902 +#: config/tc-arm.c:906 msgid "Even register not allowed here" msgstr "" -#: config/tc-arm.c:903 +#: config/tc-arm.c:907 msgid "instruction cannot be conditional" msgstr "" -#: config/tc-arm.c:904 +#: config/tc-arm.c:908 msgid "registers may not be the same" msgstr "" -#: config/tc-arm.c:905 +#: config/tc-arm.c:909 msgid "lo register required" msgstr "" -#: config/tc-arm.c:906 +#: config/tc-arm.c:910 msgid "instruction not supported in Thumb16 mode" msgstr "" -#: config/tc-arm.c:907 +#: config/tc-arm.c:911 msgid "instruction does not accept this addressing mode" msgstr "" -#: config/tc-arm.c:908 +#: config/tc-arm.c:912 msgid "branch must be last instruction in IT block" msgstr "" -#: config/tc-arm.c:909 +#: config/tc-arm.c:913 msgid "branch out of range or not a multiple of 2" msgstr "" -#: config/tc-arm.c:911 +#: config/tc-arm.c:915 msgid "instruction not allowed in IT block" msgstr "" -#: config/tc-arm.c:912 +#: config/tc-arm.c:916 msgid "instruction missing MVE vector predication code" msgstr "" -#: config/tc-arm.c:913 +#: config/tc-arm.c:917 msgid "selected FPU does not support instruction" msgstr "" -#: config/tc-arm.c:914 +#: config/tc-arm.c:918 msgid "thumb conditional instruction should be in IT block" msgstr "" -#: config/tc-arm.c:916 +#: config/tc-arm.c:920 msgid "vector predicated instruction should be in VPT/VPST block" msgstr "" -#: config/tc-arm.c:917 +#: config/tc-arm.c:921 msgid "incorrect condition in IT block" msgstr "" -#: config/tc-arm.c:918 +#: config/tc-arm.c:922 msgid "incorrect condition in VPT/VPST block" msgstr "" -#: config/tc-arm.c:919 +#: config/tc-arm.c:923 msgid "IT falling in the range of a previous IT block" msgstr "" -#: config/tc-arm.c:920 +#: config/tc-arm.c:924 msgid "missing .fnstart before unwinding directive" msgstr "" -#: config/tc-arm.c:922 +#: config/tc-arm.c:926 msgid "cannot use register index with PC-relative addressing" msgstr "" -#: config/tc-arm.c:924 +#: config/tc-arm.c:928 msgid "cannot use writeback with PC-relative addressing" msgstr "" -#: config/tc-arm.c:926 +#: config/tc-arm.c:930 msgid "selected processor does not support fp16 instruction" msgstr "" -#: config/tc-arm.c:927 +#: config/tc-arm.c:931 msgid "selected processor does not support bf16 instruction" msgstr "" -#: config/tc-arm.c:930 +#: config/tc-arm.c:934 msgid "using " msgstr "" -#: config/tc-arm.c:931 +#: config/tc-arm.c:935 msgid "relocation valid in thumb1 code only" msgstr "" -#: config/tc-arm.c:932 +#: config/tc-arm.c:936 msgid "Warning: instruction is UNPREDICTABLE in an IT block" msgstr "" -#: config/tc-arm.c:934 +#: config/tc-arm.c:938 msgid "Warning: instruction is UNPREDICTABLE in a VPT block" msgstr "" -#: config/tc-arm.c:936 +#: config/tc-arm.c:940 msgid "Warning: instruction is UNPREDICTABLE with PC operand" msgstr "" -#: config/tc-arm.c:938 +#: config/tc-arm.c:942 msgid "Warning: instruction is UNPREDICTABLE with SP operand" msgstr "" -#: config/tc-arm.c:940 +#: config/tc-arm.c:944 msgid "bad type in SIMD instruction" msgstr "" -#: config/tc-arm.c:942 +#: config/tc-arm.c:946 msgid "" "GAS auto-detection mode and -march=all is deprecated for MVE, please use a " "valid -march or -mcpu option." msgstr "" -#: config/tc-arm.c:944 +#: config/tc-arm.c:948 msgid "" "Warning: 32-bit element size and same destination and source operands makes " "instruction UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:946 +#: config/tc-arm.c:950 msgid "bad element type for instruction" msgstr "" -#: config/tc-arm.c:947 +#: config/tc-arm.c:951 msgid "MVE vector register Q[0..7] expected" msgstr "" -#: config/tc-arm.c:1167 +#: config/tc-arm.c:1172 msgid "immediate expression requires a # prefix" msgstr "" -#: config/tc-arm.c:1196 read.c:3940 +#: config/tc-arm.c:1201 read.c:4028 msgid "missing expression" msgstr "" -#: config/tc-arm.c:1210 config/tc-arm.c:5674 config/tc-score.c:1209 +#: config/tc-arm.c:1215 config/tc-arm.c:5682 config/tc-score.c:1209 msgid "invalid constant" msgstr "" -#: config/tc-arm.c:1388 +#: config/tc-arm.c:1350 msgid "expected #constant" msgstr "" -#: config/tc-arm.c:1560 config/tc-arm.c:1591 +#: config/tc-arm.c:1522 config/tc-arm.c:1553 #, c-format msgid "bad size %d in type specifier" msgstr "" -#: config/tc-arm.c:1567 +#: config/tc-arm.c:1529 msgid "unexpected type character `b' -- did you mean `bf'?" msgstr "" -#: config/tc-arm.c:1574 +#: config/tc-arm.c:1536 #, c-format msgid "unexpected character `%c' in type specifier" msgstr "" -#: config/tc-arm.c:1641 +#: config/tc-arm.c:1603 msgid "only one type should be specified for operand" msgstr "" -#: config/tc-arm.c:1647 +#: config/tc-arm.c:1609 msgid "vector type expected" msgstr "" -#: config/tc-arm.c:1756 +#: config/tc-arm.c:1718 msgid "expected MVE register [q0..q7]" msgstr "" -#: config/tc-arm.c:1776 +#: config/tc-arm.c:1738 msgid "can't redefine type for operand" msgstr "" -#: config/tc-arm.c:1792 +#: config/tc-arm.c:1754 msgid "only D and Q registers may be indexed" msgstr "" -#: config/tc-arm.c:1794 +#: config/tc-arm.c:1756 msgid "only D registers may be indexed" msgstr "" -#: config/tc-arm.c:1800 +#: config/tc-arm.c:1762 msgid "can't change index for operand" msgstr "" -#: config/tc-arm.c:1863 +#: config/tc-arm.c:1825 msgid "register operand expected, but got scalar" msgstr "" -#: config/tc-arm.c:1914 +#: config/tc-arm.c:1876 msgid "scalar must have an index" msgstr "" -#: config/tc-arm.c:1919 config/tc-arm.c:20217 config/tc-arm.c:20300 -#: config/tc-arm.c:20967 +#: config/tc-arm.c:1881 config/tc-arm.c:20245 config/tc-arm.c:20328 +#: config/tc-arm.c:21001 msgid "scalar index out of range" msgstr "" -#: config/tc-arm.c:1989 +#: config/tc-arm.c:1959 msgid "r0-r12, lr or APSR expected" msgstr "" -#: config/tc-arm.c:2008 +#: config/tc-arm.c:1986 msgid "bad range in register list" msgstr "" -#: config/tc-arm.c:2016 config/tc-arm.c:2025 config/tc-arm.c:2066 +#: config/tc-arm.c:1994 config/tc-arm.c:2003 config/tc-arm.c:2044 #, c-format msgid "Warning: duplicated register (r%d) in register list" msgstr "" -#: config/tc-arm.c:2028 +#: config/tc-arm.c:2006 msgid "Warning: register range not in ascending order" msgstr "" -#: config/tc-arm.c:2039 +#: config/tc-arm.c:2017 msgid "missing `}'" msgstr "" -#: config/tc-arm.c:2055 +#: config/tc-arm.c:2033 msgid "invalid register mask" msgstr "" -#: config/tc-arm.c:2199 config/tc-arm.c:2307 +#: config/tc-arm.c:2177 config/tc-arm.c:2285 msgid "VPR expected last" msgstr "" -#: config/tc-arm.c:2205 +#: config/tc-arm.c:2183 msgid "VFP single precision register or VPR expected" msgstr "" #. regtype == REG_TYPE_VFD. -#: config/tc-arm.c:2208 +#: config/tc-arm.c:2186 msgid "VFP/Neon double precision register or VPR expected" msgstr "" -#: config/tc-arm.c:2225 config/tc-arm.c:2269 +#: config/tc-arm.c:2203 config/tc-arm.c:2247 msgid "register out of range in list" msgstr "" -#: config/tc-arm.c:2247 config/tc-arm.c:4542 config/tc-arm.c:4676 +#: config/tc-arm.c:2225 config/tc-arm.c:4546 config/tc-arm.c:4680 msgid "register list not in ascending order" msgstr "" -#: config/tc-arm.c:2278 +#: config/tc-arm.c:2256 msgid "register range not in ascending order" msgstr "" -#: config/tc-arm.c:2317 +#: config/tc-arm.c:2295 msgid "non-contiguous register range" msgstr "" -#: config/tc-arm.c:2377 +#: config/tc-arm.c:2355 msgid "register stride must be 1" msgstr "" -#: config/tc-arm.c:2378 +#: config/tc-arm.c:2356 msgid "register stride must be 1 or 2" msgstr "" -#: config/tc-arm.c:2379 +#: config/tc-arm.c:2357 msgid "mismatched element/structure types in list" msgstr "" -#: config/tc-arm.c:2449 +#: config/tc-arm.c:2427 msgid "don't use Rn-Rm syntax with non-unit stride" msgstr "" -#: config/tc-arm.c:2504 +#: config/tc-arm.c:2482 msgid "error parsing element/structure list" msgstr "" -#: config/tc-arm.c:2510 +#: config/tc-arm.c:2488 msgid "expected }" msgstr "" -#: config/tc-arm.c:2600 +#: config/tc-arm.c:2578 msgid "attempt to redefine typed alias" msgstr "" -#: config/tc-arm.c:2735 +#: config/tc-arm.c:2713 msgid "bad type for register" msgstr "" -#: config/tc-arm.c:2746 config/tc-nios2.c:1797 +#: config/tc-arm.c:2724 config/tc-nios2.c:1797 msgid "expression must be constant" msgstr "" -#: config/tc-arm.c:2763 +#: config/tc-arm.c:2741 msgid "can't redefine the type of a register alias" msgstr "" -#: config/tc-arm.c:2770 +#: config/tc-arm.c:2748 msgid "you must specify a single type only" msgstr "" -#: config/tc-arm.c:2783 +#: config/tc-arm.c:2761 msgid "can't redefine the index of a scalar alias" msgstr "" -#: config/tc-arm.c:2791 +#: config/tc-arm.c:2769 msgid "scalar index must be constant" msgstr "" -#: config/tc-arm.c:2800 +#: config/tc-arm.c:2778 msgid "expecting ]" msgstr "" -#: config/tc-arm.c:2852 +#: config/tc-arm.c:2830 msgid "invalid syntax for .dn directive" msgstr "" -#: config/tc-arm.c:2858 +#: config/tc-arm.c:2836 msgid "invalid syntax for .qn directive" msgstr "" -#: config/tc-arm.c:2893 +#: config/tc-arm.c:2871 #, c-format msgid "ignoring attempt to use .unreq on fixed register name: '%s'" msgstr "" -#: config/tc-arm.c:3155 +#: config/tc-arm.c:3133 #, c-format msgid "Failed to find real start of function: %s\n" msgstr "" -#: config/tc-arm.c:3172 +#: config/tc-arm.c:3150 msgid "selected processor does not support THUMB opcodes" msgstr "" -#: config/tc-arm.c:3185 +#: config/tc-arm.c:3163 msgid "selected processor does not support ARM opcodes" msgstr "" -#: config/tc-arm.c:3197 +#: config/tc-arm.c:3175 #, c-format msgid "invalid instruction size selected (%d)" msgstr "" -#: config/tc-arm.c:3229 +#: config/tc-arm.c:3207 #, c-format msgid "invalid operand to .code directive (%d) (expecting 16 or 32)" msgstr "" -#: config/tc-arm.c:3284 +#: config/tc-arm.c:3262 #, c-format msgid "expected comma after name \"%s\"" msgstr "" -#: config/tc-arm.c:3334 config/tc-m32r.c:584 +#: config/tc-arm.c:3312 config/tc-m32r.c:584 #, c-format msgid "symbol `%s' already defined" msgstr "" -#: config/tc-arm.c:3367 +#: config/tc-arm.c:3345 #, c-format msgid "unrecognized syntax mode \"%s\"" msgstr "" -#: config/tc-arm.c:3410 +#: config/tc-arm.c:3388 msgid ".ref pseudo-op only available with -mccs flag." msgstr "" -#: config/tc-arm.c:3451 +#: config/tc-arm.c:3429 msgid ".asmfunc repeated." msgstr "" -#: config/tc-arm.c:3455 +#: config/tc-arm.c:3433 msgid ".asmfunc without function." msgstr "" -#: config/tc-arm.c:3461 +#: config/tc-arm.c:3439 msgid ".asmfunc pseudo-op only available with -mccs flag." msgstr "" -#: config/tc-arm.c:3472 +#: config/tc-arm.c:3450 msgid ".endasmfunc without a .asmfunc." msgstr "" -#: config/tc-arm.c:3476 +#: config/tc-arm.c:3454 msgid ".endasmfunc without function." msgstr "" -#: config/tc-arm.c:3487 +#: config/tc-arm.c:3465 msgid ".endasmfunc pseudo-op only available with -mccs flag." msgstr "" -#: config/tc-arm.c:3496 +#: config/tc-arm.c:3474 msgid ".def pseudo-op only available with -mccs flag." msgstr "" -#: config/tc-arm.c:3654 +#: config/tc-arm.c:3632 msgid "invalid type for literal pool" msgstr "" -#: config/tc-arm.c:3734 config/tc-tic54x.c:5331 +#: config/tc-arm.c:3712 config/tc-tic54x.c:5331 #, c-format msgid "Invalid label '%s'" msgstr "" -#: config/tc-arm.c:3910 +#: config/tc-arm.c:3888 msgid "(plt) is only valid on branch targets" msgstr "" -#: config/tc-arm.c:3916 config/tc-csky.c:7649 config/tc-s390.c:1202 +#: config/tc-arm.c:3894 config/tc-csky.c:7650 config/tc-s390.c:1202 #: config/tc-s390.c:1872 config/tc-xtensa.c:1712 #, c-format msgid "%s relocations do not fit in %d byte" @@ -3571,411 +3564,411 @@ msgstr[0] "" msgstr[1] "" -#: config/tc-arm.c:3998 +#: config/tc-arm.c:3976 msgid ".inst.n operand too big. Use .inst.w instead" msgstr "" -#: config/tc-arm.c:4018 +#: config/tc-arm.c:3996 msgid "cannot determine Thumb instruction size. Use .inst.n/.inst.w instead" msgstr "" -#: config/tc-arm.c:4048 +#: config/tc-arm.c:4026 msgid "width suffixes are invalid in ARM mode" msgstr "" -#: config/tc-arm.c:4090 dwarf2dbg.c:1345 +#: config/tc-arm.c:4068 dwarf2dbg.c:1429 msgid "expected 0 or 1" msgstr "" -#: config/tc-arm.c:4094 +#: config/tc-arm.c:4072 msgid "missing comma" msgstr "" -#: config/tc-arm.c:4127 +#: config/tc-arm.c:4105 msgid "duplicate .fnstart directive" msgstr "" -#: config/tc-arm.c:4158 config/tc-tic6x.c:410 +#: config/tc-arm.c:4136 config/tc-tic6x.c:410 msgid "duplicate .handlerdata directive" msgstr "" -#: config/tc-arm.c:4177 +#: config/tc-arm.c:4155 msgid ".fnend directive without .fnstart" msgstr "" -#: config/tc-arm.c:4244 config/tc-tic6x.c:391 +#: config/tc-arm.c:4222 config/tc-tic6x.c:391 msgid "personality routine specified for cantunwind frame" msgstr "" -#: config/tc-arm.c:4261 config/tc-tic6x.c:452 +#: config/tc-arm.c:4239 config/tc-tic6x.c:452 msgid "duplicate .personalityindex directive" msgstr "" -#: config/tc-arm.c:4268 config/tc-tic6x.c:459 +#: config/tc-arm.c:4246 config/tc-tic6x.c:459 msgid "bad personality routine number" msgstr "" -#: config/tc-arm.c:4290 config/tc-tic6x.c:476 +#: config/tc-arm.c:4268 config/tc-tic6x.c:476 msgid "duplicate .personality directive" msgstr "" -#: config/tc-arm.c:4314 config/tc-arm.c:4444 config/tc-arm.c:4494 +#: config/tc-arm.c:4318 config/tc-arm.c:4448 config/tc-arm.c:4498 msgid "expected register list" msgstr "" -#: config/tc-arm.c:4396 +#: config/tc-arm.c:4400 msgid "expected , " msgstr "" -#: config/tc-arm.c:4405 +#: config/tc-arm.c:4409 msgid "number of registers must be in the range [1:4]" msgstr "" -#: config/tc-arm.c:4556 config/tc-arm.c:4690 +#: config/tc-arm.c:4560 config/tc-arm.c:4694 msgid "bad register range" msgstr "" -#: config/tc-arm.c:4756 +#: config/tc-arm.c:4760 msgid "FPA .unwind_save does not take a register list" msgstr "" -#: config/tc-arm.c:4784 +#: config/tc-arm.c:4792 msgid ".unwind_save does not support this kind of register" msgstr "" -#: config/tc-arm.c:4823 +#: config/tc-arm.c:4831 msgid "SP and PC not permitted in .unwind_movsp directive" msgstr "" -#: config/tc-arm.c:4828 +#: config/tc-arm.c:4836 msgid "unexpected .unwind_movsp directive" msgstr "" -#: config/tc-arm.c:4855 +#: config/tc-arm.c:4863 msgid "stack increment must be multiple of 4" msgstr "" -#: config/tc-arm.c:4887 +#: config/tc-arm.c:4895 msgid "expected , " msgstr "" -#: config/tc-arm.c:4905 +#: config/tc-arm.c:4913 msgid "register must be either sp or set by a previousunwind_movsp directive" msgstr "" -#: config/tc-arm.c:4944 +#: config/tc-arm.c:4952 msgid "expected , " msgstr "" -#: config/tc-arm.c:4956 +#: config/tc-arm.c:4964 msgid "unwind opcode too long" msgstr "" -#: config/tc-arm.c:4961 +#: config/tc-arm.c:4969 msgid "invalid unwind opcode" msgstr "" -#: config/tc-arm.c:5076 config/tc-arm.c:32368 +#: config/tc-arm.c:5084 config/tc-arm.c:32483 #, c-format msgid "unrecognised float16 format \"%s\"" msgstr "" -#: config/tc-arm.c:5087 +#: config/tc-arm.c:5095 msgid "float16 format cannot be set more than once, ignoring." msgstr "" -#: config/tc-arm.c:5202 config/tc-arm.c:6285 config/tc-arm.c:11658 -#: config/tc-arm.c:12191 config/tc-arm.c:14311 config/tc-arm.c:16262 -#: config/tc-arm.c:16297 config/tc-arm.c:17225 config/tc-arm.c:19148 -#: config/tc-arm.c:19156 config/tc-arm.c:19163 config/tc-arm.c:20808 -#: config/tc-arm.c:29417 config/tc-arm.c:29481 config/tc-arm.c:29489 +#: config/tc-arm.c:5210 config/tc-arm.c:6293 config/tc-arm.c:11686 +#: config/tc-arm.c:12219 config/tc-arm.c:14339 config/tc-arm.c:16290 +#: config/tc-arm.c:16325 config/tc-arm.c:17253 config/tc-arm.c:19176 +#: config/tc-arm.c:19184 config/tc-arm.c:19191 config/tc-arm.c:20842 +#: config/tc-arm.c:29495 config/tc-arm.c:29559 config/tc-arm.c:29567 #: config/tc-metag.c:5174 config/tc-z8k.c:1161 config/tc-z8k.c:1171 msgid "immediate value out of range" msgstr "" -#: config/tc-arm.c:5372 +#: config/tc-arm.c:5380 msgid "invalid FPA immediate expression" msgstr "" -#: config/tc-arm.c:5558 +#: config/tc-arm.c:5566 msgid "'UXTW' not allowed here" msgstr "" -#: config/tc-arm.c:5566 +#: config/tc-arm.c:5574 msgid "'LSL' or 'ASR' required" msgstr "" -#: config/tc-arm.c:5574 +#: config/tc-arm.c:5582 msgid "'LSL' required" msgstr "" -#: config/tc-arm.c:5582 +#: config/tc-arm.c:5590 msgid "'ASR' required" msgstr "" -#: config/tc-arm.c:5589 +#: config/tc-arm.c:5597 msgid "'UXTW' required" msgstr "" -#: config/tc-arm.c:5668 +#: config/tc-arm.c:5676 msgid "invalid rotation" msgstr "" -#: config/tc-arm.c:5850 config/tc-arm.c:6063 +#: config/tc-arm.c:5858 config/tc-arm.c:6071 msgid "unknown group relocation" msgstr "" -#: config/tc-arm.c:5886 +#: config/tc-arm.c:5894 msgid "alignment must be constant" msgstr "" -#: config/tc-arm.c:6097 +#: config/tc-arm.c:6105 msgid "this group relocation is not allowed on this instruction" msgstr "" -#: config/tc-arm.c:6153 +#: config/tc-arm.c:6161 msgid "'}' expected at end of 'option' field" msgstr "" -#: config/tc-arm.c:6158 +#: config/tc-arm.c:6166 msgid "cannot combine index with option" msgstr "" -#: config/tc-arm.c:6423 +#: config/tc-arm.c:6431 msgid "unexpected bit specified after APSR" msgstr "" -#: config/tc-arm.c:6435 +#: config/tc-arm.c:6443 msgid "selected processor does not support DSP extension" msgstr "" -#: config/tc-arm.c:6447 +#: config/tc-arm.c:6455 msgid "bad bitmask specified after APSR" msgstr "" -#: config/tc-arm.c:6471 +#: config/tc-arm.c:6479 msgid "writing to APSR without specifying a bitmask is deprecated" msgstr "" -#: config/tc-arm.c:6483 config/tc-arm.c:13414 config/tc-arm.c:13459 -#: config/tc-arm.c:13463 +#: config/tc-arm.c:6491 config/tc-arm.c:13442 config/tc-arm.c:13487 +#: config/tc-arm.c:13491 msgid "" "selected processor does not support requested special purpose register" msgstr "" -#: config/tc-arm.c:6488 +#: config/tc-arm.c:6496 msgid "flag for {c}psr instruction expected" msgstr "" -#: config/tc-arm.c:6546 +#: config/tc-arm.c:6554 msgid "unrecognized CPS flag" msgstr "" -#: config/tc-arm.c:6553 +#: config/tc-arm.c:6561 msgid "missing CPS flags" msgstr "" -#: config/tc-arm.c:6576 config/tc-arm.c:6582 +#: config/tc-arm.c:6584 config/tc-arm.c:6590 msgid "valid endian specifiers are be or le" msgstr "" -#: config/tc-arm.c:6604 +#: config/tc-arm.c:6612 msgid "missing rotation field after comma" msgstr "" -#: config/tc-arm.c:6619 +#: config/tc-arm.c:6627 msgid "rotation can only be 0, 8, 16, or 24" msgstr "" -#: config/tc-arm.c:6648 +#: config/tc-arm.c:6656 msgid "condition required" msgstr "" -#: config/tc-arm.c:6690 config/tc-arm.c:9827 +#: config/tc-arm.c:6698 config/tc-arm.c:9849 msgid "'[' expected" msgstr "" -#: config/tc-arm.c:6703 +#: config/tc-arm.c:6711 msgid "',' expected" msgstr "" -#: config/tc-arm.c:6720 +#: config/tc-arm.c:6728 msgid "invalid shift" msgstr "" -#: config/tc-arm.c:6800 +#: config/tc-arm.c:6808 msgid "expected ARM or MVE vector register" msgstr "" -#: config/tc-arm.c:6849 +#: config/tc-arm.c:6857 msgid "can't use Neon quad register here" msgstr "" -#: config/tc-arm.c:6918 +#: config/tc-arm.c:6926 msgid "expected or or operand" msgstr "" -#: config/tc-arm.c:7018 +#: config/tc-arm.c:7026 msgid "VFP single, double or MVE vector register expected" msgstr "" -#: config/tc-arm.c:7038 +#: config/tc-arm.c:7046 msgid "parse error" msgstr "" -#: config/tc-arm.c:7340 +#: config/tc-arm.c:7350 msgid "immediate value 48 or 64 expected" msgstr "" #. ISB can only take SY as an option. -#: config/tc-arm.c:7389 +#: config/tc-arm.c:7399 msgid "invalid barrier type" msgstr "" -#: config/tc-arm.c:7563 +#: config/tc-arm.c:7575 msgid "only floating point zero is allowed as immediate value" msgstr "" -#: config/tc-arm.c:7658 +#: config/tc-arm.c:7670 msgid "immediate value is out of range" msgstr "" -#: config/tc-arm.c:7833 +#: config/tc-arm.c:7845 msgid "iWMMXt data or control register expected" msgstr "" -#: config/tc-arm.c:7874 +#: config/tc-arm.c:7886 msgid "Banked registers are not available with this architecture." msgstr "" -#: config/tc-arm.c:8122 +#: config/tc-arm.c:8134 msgid "operand must be LR register" msgstr "" -#: config/tc-arm.c:8193 config/tc-score.c:264 +#: config/tc-arm.c:8215 config/tc-score.c:264 msgid "garbage following instruction" msgstr "" #. If REG is R13 (the stack pointer), warn that its use is #. deprecated. -#: config/tc-arm.c:8243 +#: config/tc-arm.c:8265 msgid "use of r13 is deprecated" msgstr "" -#: config/tc-arm.c:8261 config/tc-arm.c:20514 +#: config/tc-arm.c:8283 config/tc-arm.c:20542 msgid "" "ARMv8.2 scalar fp16 instruction cannot be conditional, the behaviour is " "UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:8336 +#: config/tc-arm.c:8358 msgid "D register out of range for selected VFP version" msgstr "" -#: config/tc-arm.c:8433 config/tc-arm.c:11353 +#: config/tc-arm.c:8455 config/tc-arm.c:11375 msgid "Instruction does not support =N addresses" msgstr "" -#: config/tc-arm.c:8441 +#: config/tc-arm.c:8463 msgid "instruction does not accept preindexed addressing" msgstr "" #. unindexed - only for coprocessor -#: config/tc-arm.c:8457 config/tc-arm.c:11416 +#: config/tc-arm.c:8479 config/tc-arm.c:11438 msgid "instruction does not accept unindexed addressing" msgstr "" -#: config/tc-arm.c:8465 +#: config/tc-arm.c:8487 msgid "destination register same as write-back base" msgstr "" -#: config/tc-arm.c:8466 +#: config/tc-arm.c:8488 msgid "source register same as write-back base" msgstr "" -#: config/tc-arm.c:8516 +#: config/tc-arm.c:8538 msgid "use of PC in this instruction is deprecated" msgstr "" -#: config/tc-arm.c:8539 +#: config/tc-arm.c:8561 msgid "instruction does not accept scaled register index" msgstr "" -#: config/tc-arm.c:8844 +#: config/tc-arm.c:8866 msgid "invalid pseudo operation" msgstr "" -#: config/tc-arm.c:9084 +#: config/tc-arm.c:9106 msgid "invalid co-processor operand" msgstr "" -#: config/tc-arm.c:9100 +#: config/tc-arm.c:9122 msgid "instruction does not support unindexed addressing" msgstr "" -#: config/tc-arm.c:9115 +#: config/tc-arm.c:9137 msgid "pc may not be used with write-back" msgstr "" -#: config/tc-arm.c:9120 +#: config/tc-arm.c:9142 msgid "instruction does not support writeback" msgstr "" -#: config/tc-arm.c:9226 +#: config/tc-arm.c:9248 msgid "Rn must not overlap other operands" msgstr "" -#: config/tc-arm.c:9231 +#: config/tc-arm.c:9253 msgid "swp{b} use is obsoleted for ARMv8 and later" msgstr "" -#: config/tc-arm.c:9234 +#: config/tc-arm.c:9256 msgid "swp{b} use is deprecated for ARMv6 and ARMv7" msgstr "" -#: config/tc-arm.c:9353 config/tc-arm.c:9372 config/tc-arm.c:9385 -#: config/tc-arm.c:12028 config/tc-arm.c:12059 config/tc-arm.c:12081 +#: config/tc-arm.c:9375 config/tc-arm.c:9394 config/tc-arm.c:9407 +#: config/tc-arm.c:12056 config/tc-arm.c:12087 config/tc-arm.c:12109 msgid "bit-field extends past end of register" msgstr "" -#: config/tc-arm.c:9415 +#: config/tc-arm.c:9437 msgid "the only valid suffixes here are '(plt)' and '(tlscall)'" msgstr "" -#: config/tc-arm.c:9468 +#: config/tc-arm.c:9490 msgid "use of r15 in blx in ARM mode is not really useful" msgstr "" -#: config/tc-arm.c:9490 +#: config/tc-arm.c:9512 msgid "use of r15 in bx in ARM mode is not really useful" msgstr "" -#: config/tc-arm.c:9516 +#: config/tc-arm.c:9538 msgid "use of r15 in bxj is not really useful" msgstr "" -#: config/tc-arm.c:9564 +#: config/tc-arm.c:9586 msgid "This coprocessor register access is deprecated in ARMv8" msgstr "" -#: config/tc-arm.c:9772 config/tc-arm.c:9781 +#: config/tc-arm.c:9794 config/tc-arm.c:9803 msgid "writeback of base register is UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:9775 +#: config/tc-arm.c:9797 msgid "writeback of base register when in register list is UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:9785 +#: config/tc-arm.c:9807 msgid "" "if writeback register is in list, it must be the lowest reg in the list" msgstr "" -#: config/tc-arm.c:9822 +#: config/tc-arm.c:9844 msgid "first transfer register must be even" msgstr "" -#: config/tc-arm.c:9825 +#: config/tc-arm.c:9847 msgid "can only transfer two consecutive registers" msgstr "" @@ -3983,1361 +3976,1361 @@ #. have been called in the first place. #. If op 2 were present and equal to PC, this function wouldn't #. have been called in the first place. -#: config/tc-arm.c:9826 config/tc-arm.c:9896 config/tc-arm.c:10627 -#: config/tc-arm.c:12903 +#: config/tc-arm.c:9848 config/tc-arm.c:9918 config/tc-arm.c:10649 +#: config/tc-arm.c:12931 msgid "r14 not allowed here" msgstr "" -#: config/tc-arm.c:9838 +#: config/tc-arm.c:9860 msgid "base register written back, and overlaps second transfer register" msgstr "" -#: config/tc-arm.c:9848 +#: config/tc-arm.c:9870 msgid "index register overlaps transfer register" msgstr "" -#: config/tc-arm.c:9877 config/tc-arm.c:10594 +#: config/tc-arm.c:9899 config/tc-arm.c:10616 msgid "offset must be zero in ARM encoding" msgstr "" -#: config/tc-arm.c:9890 config/tc-arm.c:10621 +#: config/tc-arm.c:9912 config/tc-arm.c:10643 msgid "even register required" msgstr "" -#: config/tc-arm.c:9893 +#: config/tc-arm.c:9915 msgid "can only load two consecutive registers" msgstr "" -#: config/tc-arm.c:9911 +#: config/tc-arm.c:9933 msgid "ldr to register 15 must be 4-byte aligned" msgstr "" -#: config/tc-arm.c:9934 config/tc-arm.c:9966 +#: config/tc-arm.c:9956 config/tc-arm.c:9988 msgid "this instruction requires a post-indexed address" msgstr "" -#: config/tc-arm.c:9993 +#: config/tc-arm.c:10015 msgid "Rd and Rm should be different in mla" msgstr "" -#: config/tc-arm.c:10020 config/tc-arm.c:13278 +#: config/tc-arm.c:10042 config/tc-arm.c:13306 msgid ":lower16: not allowed in this instruction" msgstr "" -#: config/tc-arm.c:10022 config/tc-arm.c:13283 +#: config/tc-arm.c:10044 config/tc-arm.c:13311 msgid ":upper16: not allowed in this instruction" msgstr "" -#: config/tc-arm.c:10039 +#: config/tc-arm.c:10061 msgid "operand 1 must be FPSCR" msgstr "" -#: config/tc-arm.c:10092 config/tc-arm.c:10101 config/tc-arm.c:10155 -#: config/tc-arm.c:10164 +#: config/tc-arm.c:10114 config/tc-arm.c:10123 config/tc-arm.c:10177 +#: config/tc-arm.c:10186 msgid "selected processor does not support instruction" msgstr "" -#: config/tc-arm.c:10104 config/tc-arm.c:10167 +#: config/tc-arm.c:10126 config/tc-arm.c:10189 msgid "accessing MVE system register without MVE is UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:10195 config/tc-arm.c:13397 +#: config/tc-arm.c:10217 config/tc-arm.c:13425 msgid "bad register for mrs" msgstr "" -#: config/tc-arm.c:10202 config/tc-arm.c:13421 +#: config/tc-arm.c:10224 config/tc-arm.c:13449 msgid "'APSR', 'CPSR' or 'SPSR' expected" msgstr "" -#: config/tc-arm.c:10243 +#: config/tc-arm.c:10265 msgid "Rd and Rm should be different in mul" msgstr "" -#: config/tc-arm.c:10262 config/tc-arm.c:10539 config/tc-arm.c:13560 +#: config/tc-arm.c:10284 config/tc-arm.c:10561 config/tc-arm.c:13588 msgid "rdhi and rdlo must be different" msgstr "" -#: config/tc-arm.c:10268 +#: config/tc-arm.c:10290 msgid "rdhi, rdlo and rm must all be different" msgstr "" -#: config/tc-arm.c:10334 +#: config/tc-arm.c:10356 msgid "'[' expected after PLD mnemonic" msgstr "" -#: config/tc-arm.c:10336 config/tc-arm.c:10351 +#: config/tc-arm.c:10358 config/tc-arm.c:10373 msgid "post-indexed expression used in preload instruction" msgstr "" -#: config/tc-arm.c:10338 config/tc-arm.c:10353 +#: config/tc-arm.c:10360 config/tc-arm.c:10375 msgid "writeback used in preload instruction" msgstr "" -#: config/tc-arm.c:10340 config/tc-arm.c:10355 +#: config/tc-arm.c:10362 config/tc-arm.c:10377 msgid "unindexed addressing used in preload instruction" msgstr "" -#: config/tc-arm.c:10349 +#: config/tc-arm.c:10371 msgid "'[' expected after PLI mnemonic" msgstr "" -#: config/tc-arm.c:10364 config/tc-arm.c:13729 +#: config/tc-arm.c:10386 config/tc-arm.c:13757 msgid "push/pop do not support {reglist}^" msgstr "" -#: config/tc-arm.c:10442 config/tc-arm.c:13906 +#: config/tc-arm.c:10464 config/tc-arm.c:13934 msgid "setend use is deprecated for ARMv8" msgstr "" -#: config/tc-arm.c:10463 config/tc-arm.c:13967 config/tc-arm.c:13999 -#: config/tc-arm.c:14042 +#: config/tc-arm.c:10485 config/tc-arm.c:13995 config/tc-arm.c:14027 +#: config/tc-arm.c:14070 msgid "extraneous shift as part of operand to shift insn" msgstr "" -#: config/tc-arm.c:10473 config/tc-arm.c:14105 +#: config/tc-arm.c:10495 config/tc-arm.c:14133 msgid "immediate too large (bigger than 0xF)" msgstr "" -#: config/tc-arm.c:10497 config/tc-arm.c:10506 +#: config/tc-arm.c:10519 config/tc-arm.c:10528 msgid "selected processor does not support SETPAN instruction" msgstr "" -#: config/tc-arm.c:10565 +#: config/tc-arm.c:10587 msgid "SRS base register must be r13" msgstr "" -#: config/tc-arm.c:10624 +#: config/tc-arm.c:10646 msgid "can only store two consecutive registers" msgstr "" -#: config/tc-arm.c:10746 config/tc-arm.c:10767 +#: config/tc-arm.c:10768 config/tc-arm.c:10789 msgid "only two consecutive VFP SP registers allowed here" msgstr "" -#: config/tc-arm.c:10795 config/tc-arm.c:10810 +#: config/tc-arm.c:10817 config/tc-arm.c:10832 msgid "this addressing mode requires base-register writeback" msgstr "" #. If srcsize is 16, inst.operands[1].imm must be in the range 0-16. #. i.e. immbits must be in range 0 - 16. -#: config/tc-arm.c:10939 +#: config/tc-arm.c:10961 msgid "immediate value out of range, expected range [0, 16]" msgstr "" #. If srcsize is 32, inst.operands[1].imm must be in the range 1-32. #. i.e. immbits must be in range 0 - 31. -#: config/tc-arm.c:10946 +#: config/tc-arm.c:10968 msgid "immediate value out of range, expected range [1, 32]" msgstr "" -#: config/tc-arm.c:11012 +#: config/tc-arm.c:11034 msgid "this instruction does not support indexing" msgstr "" -#: config/tc-arm.c:11035 +#: config/tc-arm.c:11057 msgid "only r15 allowed here" msgstr "" -#: config/tc-arm.c:11170 +#: config/tc-arm.c:11192 msgid "immediate operand requires iWMMXt2" msgstr "" -#: config/tc-arm.c:11314 +#: config/tc-arm.c:11336 msgid "shift by register not allowed in thumb mode" msgstr "" -#: config/tc-arm.c:11326 config/tc-arm.c:14151 config/tc-arm.c:28708 +#: config/tc-arm.c:11348 config/tc-arm.c:14179 config/tc-arm.c:28786 msgid "shift expression is too large" msgstr "" -#: config/tc-arm.c:11359 +#: config/tc-arm.c:11381 msgid "cannot use register index with this instruction" msgstr "" -#: config/tc-arm.c:11361 +#: config/tc-arm.c:11383 msgid "Thumb does not support negative register indexing" msgstr "" -#: config/tc-arm.c:11363 +#: config/tc-arm.c:11385 msgid "Thumb does not support register post-indexing" msgstr "" -#: config/tc-arm.c:11365 +#: config/tc-arm.c:11387 msgid "Thumb does not support register indexing with writeback" msgstr "" -#: config/tc-arm.c:11367 +#: config/tc-arm.c:11389 msgid "Thumb supports only LSL in shifted register indexing" msgstr "" -#: config/tc-arm.c:11376 config/tc-arm.c:19882 +#: config/tc-arm.c:11398 config/tc-arm.c:19910 msgid "shift out of range" msgstr "" -#: config/tc-arm.c:11385 +#: config/tc-arm.c:11407 msgid "cannot use writeback with this instruction" msgstr "" -#: config/tc-arm.c:11406 +#: config/tc-arm.c:11428 msgid "cannot use post-indexing with PC-relative addressing" msgstr "" -#: config/tc-arm.c:11407 +#: config/tc-arm.c:11429 msgid "cannot use post-indexing with this instruction" msgstr "" -#: config/tc-arm.c:11653 +#: config/tc-arm.c:11681 msgid "only SUBS PC, LR, #const allowed" msgstr "" -#: config/tc-arm.c:11736 config/tc-arm.c:11896 config/tc-arm.c:11993 -#: config/tc-arm.c:13358 config/tc-arm.c:13666 +#: config/tc-arm.c:11764 config/tc-arm.c:11924 config/tc-arm.c:12021 +#: config/tc-arm.c:13386 config/tc-arm.c:13694 msgid "shift must be constant" msgstr "" -#: config/tc-arm.c:11741 +#: config/tc-arm.c:11769 msgid "shift value over 3 not allowed in thumb mode" msgstr "" -#: config/tc-arm.c:11743 +#: config/tc-arm.c:11771 msgid "only LSL shift allowed in thumb mode" msgstr "" -#: config/tc-arm.c:11767 config/tc-arm.c:11911 config/tc-arm.c:12008 -#: config/tc-arm.c:13371 +#: config/tc-arm.c:11795 config/tc-arm.c:11939 config/tc-arm.c:12036 +#: config/tc-arm.c:13399 msgid "unshifted register required" msgstr "" -#: config/tc-arm.c:11782 config/tc-arm.c:12019 config/tc-arm.c:13521 +#: config/tc-arm.c:11810 config/tc-arm.c:12047 config/tc-arm.c:13549 msgid "dest must overlap one source register" msgstr "" -#: config/tc-arm.c:11914 config/tc-csky.c:6003 +#: config/tc-arm.c:11942 config/tc-csky.c:6004 msgid "dest and source1 must be the same register" msgstr "" -#: config/tc-arm.c:12154 +#: config/tc-arm.c:12182 msgid "" "selected architecture does not support wide conditional branch instruction" msgstr "" -#: config/tc-arm.c:12187 +#: config/tc-arm.c:12215 msgid "instruction is always unconditional" msgstr "" -#: config/tc-arm.c:12362 +#: config/tc-arm.c:12390 msgid "selected processor does not support 'A' form of this instruction" msgstr "" -#: config/tc-arm.c:12365 +#: config/tc-arm.c:12393 msgid "Thumb does not support the 2-argument form of this instruction" msgstr "" -#: config/tc-arm.c:12490 +#: config/tc-arm.c:12518 msgid "SP not allowed in register list" msgstr "" -#: config/tc-arm.c:12494 config/tc-arm.c:12601 +#: config/tc-arm.c:12522 config/tc-arm.c:12629 msgid "" "having the base register in the register list when using write back is " "UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:12502 +#: config/tc-arm.c:12530 msgid "LR and PC should not both be in register list" msgstr "" -#: config/tc-arm.c:12510 +#: config/tc-arm.c:12538 msgid "PC not allowed in register list" msgstr "" -#: config/tc-arm.c:12553 +#: config/tc-arm.c:12581 msgid "Thumb load/store multiple does not support {reglist}^" msgstr "" -#: config/tc-arm.c:12578 config/tc-arm.c:12656 +#: config/tc-arm.c:12606 config/tc-arm.c:12684 #, c-format msgid "value stored for r%d is UNKNOWN" msgstr "" -#: config/tc-arm.c:12649 +#: config/tc-arm.c:12677 msgid "Thumb-2 instruction only valid in unified syntax" msgstr "" -#: config/tc-arm.c:12653 config/tc-arm.c:12663 +#: config/tc-arm.c:12681 config/tc-arm.c:12691 msgid "this instruction will write back the base register" msgstr "" -#: config/tc-arm.c:12666 +#: config/tc-arm.c:12694 msgid "this instruction will not write back the base register" msgstr "" -#: config/tc-arm.c:12697 +#: config/tc-arm.c:12725 msgid "r14 not allowed as first register when second register is omitted" msgstr "" -#: config/tc-arm.c:12797 +#: config/tc-arm.c:12825 msgid "" "This instruction may be unpredictable if executed on M-profile cores with " "interrupts enabled." msgstr "" -#: config/tc-arm.c:12826 config/tc-arm.c:12839 config/tc-arm.c:12875 +#: config/tc-arm.c:12854 config/tc-arm.c:12867 config/tc-arm.c:12903 msgid "Thumb does not support this addressing mode" msgstr "" -#: config/tc-arm.c:12843 +#: config/tc-arm.c:12871 msgid "byte or halfword not valid for base register" msgstr "" -#: config/tc-arm.c:12846 +#: config/tc-arm.c:12874 msgid "r15 based store not allowed" msgstr "" -#: config/tc-arm.c:12848 +#: config/tc-arm.c:12876 msgid "invalid base register for register offset" msgstr "" -#: config/tc-arm.c:12905 +#: config/tc-arm.c:12933 msgid "r12 not allowed here" msgstr "" -#: config/tc-arm.c:12911 +#: config/tc-arm.c:12939 msgid "base register written back, and overlaps one of transfer registers" msgstr "" -#: config/tc-arm.c:13039 +#: config/tc-arm.c:13067 #, c-format msgid "" "Use of r%u as a source register is deprecated when r%u is the destination " "register." msgstr "" -#: config/tc-arm.c:13234 +#: config/tc-arm.c:13262 msgid "shifts in CMP/MOV instructions are only supported in unified syntax" msgstr "" -#: config/tc-arm.c:13262 +#: config/tc-arm.c:13290 msgid "only lo regs allowed with immediate" msgstr "" -#: config/tc-arm.c:13439 +#: config/tc-arm.c:13467 msgid "Thumb encoding does not support an immediate here" msgstr "" -#: config/tc-arm.c:13526 +#: config/tc-arm.c:13554 msgid "Thumb-2 MUL must not set flags" msgstr "" -#: config/tc-arm.c:13591 +#: config/tc-arm.c:13619 msgid "Thumb does not support NOP with hints" msgstr "" -#: config/tc-arm.c:13751 config/tc-arm.c:13763 +#: config/tc-arm.c:13779 config/tc-arm.c:13791 msgid "invalid register list to push/pop instruction" msgstr "" -#: config/tc-arm.c:14026 +#: config/tc-arm.c:14054 msgid "source1 and dest must be same register" msgstr "" -#: config/tc-arm.c:14051 +#: config/tc-arm.c:14079 msgid "ror #imm not supported" msgstr "" -#: config/tc-arm.c:14102 +#: config/tc-arm.c:14130 msgid "SMC is not permitted on this architecture" msgstr "" -#: config/tc-arm.c:14268 +#: config/tc-arm.c:14296 msgid "Thumb encoding does not support rotation" msgstr "" -#: config/tc-arm.c:14288 +#: config/tc-arm.c:14316 msgid "instruction requires register index" msgstr "" -#: config/tc-arm.c:14298 +#: config/tc-arm.c:14326 msgid "instruction does not allow shifted index" msgstr "" -#: config/tc-arm.c:14454 config/tc-arm.c:29852 +#: config/tc-arm.c:14482 config/tc-arm.c:29930 msgid "out of range label-relative fixup value" msgstr "" -#: config/tc-arm.c:14778 +#: config/tc-arm.c:14806 msgid "invalid neon suffix for non neon instruction" msgstr "" -#: config/tc-arm.c:15173 config/tc-arm.c:15526 config/tc-arm.c:17011 -#: config/tc-arm.c:17091 config/tc-arm.c:17148 config/tc-arm.c:19029 -#: config/tc-arm.c:21212 config/tc-arm.c:21399 +#: config/tc-arm.c:15201 config/tc-arm.c:15554 config/tc-arm.c:17039 +#: config/tc-arm.c:17119 config/tc-arm.c:17176 config/tc-arm.c:19057 +#: config/tc-arm.c:21246 config/tc-arm.c:21433 msgid "invalid instruction shape" msgstr "" -#: config/tc-arm.c:15425 +#: config/tc-arm.c:15453 msgid "types specified in both the mnemonic and operands" msgstr "" -#: config/tc-arm.c:15462 +#: config/tc-arm.c:15490 msgid "operand types can't be inferred" msgstr "" -#: config/tc-arm.c:15468 +#: config/tc-arm.c:15496 msgid "type specifier has the wrong number of parts" msgstr "" -#: config/tc-arm.c:15554 config/tc-arm.c:19300 config/tc-arm.c:19307 +#: config/tc-arm.c:15582 config/tc-arm.c:19328 config/tc-arm.c:19335 msgid "operand size must match register width" msgstr "" -#: config/tc-arm.c:15576 +#: config/tc-arm.c:15604 msgid "inconsistent types in Neon instruction" msgstr "" -#: config/tc-arm.c:15997 +#: config/tc-arm.c:16025 msgid "Type is not allowed for this instruction" msgstr "" -#: config/tc-arm.c:16072 +#: config/tc-arm.c:16100 msgid "MVE vector or ARM register expected" msgstr "" -#: config/tc-arm.c:16189 +#: config/tc-arm.c:16217 msgid "immediate must be either 1, 2, 4 or 8" msgstr "" -#: config/tc-arm.c:16346 +#: config/tc-arm.c:16374 msgid "immediate operand expected in the range [1,8]" msgstr "" -#: config/tc-arm.c:16347 +#: config/tc-arm.c:16375 msgid "immediate operand expected in the range [1,16]" msgstr "" -#: config/tc-arm.c:16489 +#: config/tc-arm.c:16517 msgid "expected LR" msgstr "" -#: config/tc-arm.c:16988 config/tc-arm.c:17068 config/tc-arm.c:18665 -#: config/tc-arm.c:20499 +#: config/tc-arm.c:17016 config/tc-arm.c:17096 config/tc-arm.c:18693 +#: config/tc-arm.c:20527 msgid "immediate out of range for shift" msgstr "" -#: config/tc-arm.c:17282 +#: config/tc-arm.c:17310 msgid "first and second operands shall be the same register" msgstr "" -#: config/tc-arm.c:17396 config/tc-arm.c:17458 +#: config/tc-arm.c:17424 config/tc-arm.c:17486 msgid "destination register and offset register may not be the same" msgstr "" -#: config/tc-arm.c:17408 config/tc-arm.c:17527 +#: config/tc-arm.c:17436 config/tc-arm.c:17555 msgid "immediate must be a multiple of 4 in the range of +/-[0,508]" msgstr "" -#: config/tc-arm.c:17410 +#: config/tc-arm.c:17438 msgid "immediate must be a multiple of 8 in the range of +/-[0,1016]" msgstr "" -#: config/tc-arm.c:17431 +#: config/tc-arm.c:17459 msgid "can not shift offsets when accessing less than half-word" msgstr "" -#: config/tc-arm.c:17433 +#: config/tc-arm.c:17461 msgid "" "shift immediate must be 1, 2 or 3 for half-word, word or double-word " "accesses respectively" msgstr "" -#: config/tc-arm.c:17520 +#: config/tc-arm.c:17548 msgid "immediate must be in the range of +/-[0,127]" msgstr "" -#: config/tc-arm.c:17523 +#: config/tc-arm.c:17551 msgid "immediate must be a multiple of 2 in the range of +/-[0,254]" msgstr "" -#: config/tc-arm.c:17537 config/tc-arm.c:18363 +#: config/tc-arm.c:17565 config/tc-arm.c:18391 msgid "MVE vector register in the range [Q0..Q7] expected" msgstr "" -#: config/tc-arm.c:17853 config/tc-arm.c:19721 +#: config/tc-arm.c:17881 config/tc-arm.c:19749 msgid "scalar out of range for multiply instruction" msgstr "" -#: config/tc-arm.c:17941 +#: config/tc-arm.c:17969 msgid "index must be in the range 0 to 3" msgstr "" -#: config/tc-arm.c:17944 +#: config/tc-arm.c:17972 msgid "indexed register must be less than 8" msgstr "" -#: config/tc-arm.c:18145 config/tc-arm.c:21463 +#: config/tc-arm.c:18173 config/tc-arm.c:21497 msgid "" "Warning: 32-bit element size and same first and third operand makes " "instruction UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:18504 +#: config/tc-arm.c:18532 msgid "instruction form not available on this architecture." msgstr "" -#: config/tc-arm.c:18507 +#: config/tc-arm.c:18535 msgid "this instruction implies use of ARMv8.1 AdvSIMD." msgstr "" -#: config/tc-arm.c:18614 config/tc-arm.c:18639 +#: config/tc-arm.c:18642 config/tc-arm.c:18667 msgid "immediate out of range for insert" msgstr "" -#: config/tc-arm.c:18786 +#: config/tc-arm.c:18814 msgid "immediate out of range for narrowing operation" msgstr "" -#: config/tc-arm.c:18933 +#: config/tc-arm.c:18961 msgid "operands 0 and 1 must be the same register" msgstr "" -#: config/tc-arm.c:19039 config/tc-arm.c:21311 +#: config/tc-arm.c:19067 config/tc-arm.c:21345 msgid "invalid rounding mode" msgstr "" -#: config/tc-arm.c:19511 +#: config/tc-arm.c:19539 msgid "operand size must be specified for immediate VMOV" msgstr "" -#: config/tc-arm.c:19521 +#: config/tc-arm.c:19549 msgid "immediate has bits set outside the operand size" msgstr "" -#: config/tc-arm.c:19756 +#: config/tc-arm.c:19784 msgid "" "vfmal/vfmsl with FP16 type cannot be conditional, the behaviour is " "UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:19864 +#: config/tc-arm.c:19892 msgid "Instruction form not available on this architecture." msgstr "" -#: config/tc-arm.c:19918 +#: config/tc-arm.c:19946 msgid "" "Warning: 64-bit element size and same destination and source operands makes " "instruction UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:19923 +#: config/tc-arm.c:19951 msgid "elements must be smaller than reversal region" msgstr "" -#: config/tc-arm.c:20015 +#: config/tc-arm.c:20043 msgid "" "Index one must be [2,3] and index two must be two less than index one." msgstr "" -#: config/tc-arm.c:20017 +#: config/tc-arm.c:19951 msgid "General purpose registers may not be the same" msgstr "" -#: config/tc-arm.c:20216 config/tc-arm.c:20299 +#: config/tc-arm.c:20244 config/tc-arm.c:20327 msgid "bad type for scalar" msgstr "" -#: config/tc-arm.c:20355 +#: config/tc-arm.c:20383 msgid "" "immediate constant is valid both as a bit-pattern and a floating point value " "(using the fp value)" msgstr "" -#: config/tc-arm.c:20407 config/tc-arm.c:20418 +#: config/tc-arm.c:20435 config/tc-arm.c:20446 msgid "VFP registers must be adjacent" msgstr "" -#: config/tc-arm.c:20508 +#: config/tc-arm.c:20536 msgid "invalid suffix" msgstr "" -#: config/tc-arm.c:20662 +#: config/tc-arm.c:20690 msgid "bad list length for table lookup" msgstr "" -#: config/tc-arm.c:20695 +#: config/tc-arm.c:20723 msgid "writeback (!) must be used for VLDMDB and VSTMDB" msgstr "" -#: config/tc-arm.c:20698 config/tc-arm.c:20723 config/tc-arm.c:20744 +#: config/tc-arm.c:20726 config/tc-arm.c:20752 msgid "register list must contain at least 1 and at most 16 registers" msgstr "" -#: config/tc-arm.c:20766 config/tc-arm.c:20799 +#: config/tc-arm.c:20800 config/tc-arm.c:20833 msgid "Use of PC here is UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:20768 +#: config/tc-arm.c:20802 msgid "Use of PC here is deprecated" msgstr "" -#: config/tc-arm.c:20802 +#: config/tc-arm.c:20836 msgid "instruction does not accept register index" msgstr "" -#: config/tc-arm.c:20805 +#: config/tc-arm.c:20839 msgid "instruction does not accept PC-relative addressing" msgstr "" -#: config/tc-arm.c:20827 config/tc-arm.c:20836 +#: config/tc-arm.c:20861 config/tc-arm.c:20870 msgid "Instruction not permitted on this architecture" msgstr "" -#: config/tc-arm.c:20885 +#: config/tc-arm.c:20919 msgid "bad alignment" msgstr "" -#: config/tc-arm.c:20902 +#: config/tc-arm.c:20936 msgid "bad list type for instruction" msgstr "" -#: config/tc-arm.c:20946 +#: config/tc-arm.c:20980 msgid "unsupported alignment for instruction" msgstr "" -#: config/tc-arm.c:20965 config/tc-arm.c:21059 config/tc-arm.c:21071 -#: config/tc-arm.c:21081 config/tc-arm.c:21095 +#: config/tc-arm.c:20999 config/tc-arm.c:21093 config/tc-arm.c:21105 +#: config/tc-arm.c:21115 config/tc-arm.c:21129 msgid "bad list length" msgstr "" -#: config/tc-arm.c:20970 +#: config/tc-arm.c:21004 msgid "stride of 2 unavailable when element size is 8" msgstr "" -#: config/tc-arm.c:21003 config/tc-arm.c:21079 +#: config/tc-arm.c:21037 config/tc-arm.c:21113 msgid "can't use alignment with this instruction" msgstr "" -#: config/tc-arm.c:21151 +#: config/tc-arm.c:21185 msgid "post-index must be a register" msgstr "" -#: config/tc-arm.c:21153 +#: config/tc-arm.c:21187 msgid "bad register for post-index" msgstr "" -#: config/tc-arm.c:21375 +#: config/tc-arm.c:21409 msgid "scalar out of range" msgstr "" -#: config/tc-arm.c:21508 +#: config/tc-arm.c:21542 msgid "" "Dot Product instructions cannot be conditional, the behaviour is " "UNPREDICTABLE" msgstr "" -#: config/tc-arm.c:21583 config/tc-arm.c:21611 config/tc-arm.c:22293 +#: config/tc-arm.c:21617 config/tc-arm.c:21645 config/tc-arm.c:22327 msgid "index must be 0 or 1" msgstr "" -#: config/tc-arm.c:21586 config/tc-arm.c:21614 config/tc-arm.c:22296 +#: config/tc-arm.c:21620 config/tc-arm.c:21648 config/tc-arm.c:22330 msgid "indexed register must be less than 16" msgstr "" -#: config/tc-arm.c:22647 config/tc-arm.c:22751 +#: config/tc-arm.c:22711 config/tc-arm.c:22815 msgid "conditional infixes are deprecated in unified syntax" msgstr "" -#: config/tc-arm.c:22962 +#: config/tc-arm.c:23026 msgid "Warning: conditional outside an IT block for Thumb." msgstr "" -#: config/tc-arm.c:23290 +#: config/tc-arm.c:23354 msgid "Short branches, Undefined, SVC, LDM/STM" msgstr "" -#: config/tc-arm.c:23291 +#: config/tc-arm.c:23355 msgid "Miscellaneous 16-bit instructions" msgstr "" -#: config/tc-arm.c:23292 +#: config/tc-arm.c:23356 msgid "ADR" msgstr "" -#: config/tc-arm.c:23293 +#: config/tc-arm.c:23357 msgid "Literal loads" msgstr "" -#: config/tc-arm.c:23294 +#: config/tc-arm.c:23358 msgid "Hi-register ADD, MOV, CMP, BX, BLX using pc" msgstr "" -#: config/tc-arm.c:23295 +#: config/tc-arm.c:23359 msgid "Hi-register ADD, MOV, CMP using pc" msgstr "" #. NOTE: 0x00dd is not the real encoding, instead, it is the 'tvalue' #. field in asm_opcode. 'tvalue' is used at the stage this check happen. -#: config/tc-arm.c:23298 +#: config/tc-arm.c:23362 msgid "ADD/SUB sp, sp #imm" msgstr "" -#: config/tc-arm.c:23320 +#: config/tc-arm.c:23384 msgid "" "IT blocks containing 32-bit Thumb instructions are performance deprecated in " "ARMv8-A and ARMv8-R" msgstr "" -#: config/tc-arm.c:23332 +#: config/tc-arm.c:23396 #, c-format msgid "" "IT blocks containing 16-bit Thumb instructions of the following class are " "performance deprecated in ARMv8-A and ARMv8-R: %s" msgstr "" -#: config/tc-arm.c:23346 +#: config/tc-arm.c:23410 msgid "" "IT blocks containing more than one conditional instruction are performance " "deprecated in ARMv8-A and ARMv8-R" msgstr "" -#: config/tc-arm.c:23464 +#: config/tc-arm.c:23528 #, c-format msgid "bad instruction `%s'" msgstr "" -#: config/tc-arm.c:23470 +#: config/tc-arm.c:23534 msgid "s suffix on comparison instruction is deprecated" msgstr "" -#: config/tc-arm.c:23490 +#: config/tc-arm.c:23554 msgid "SVC is not permitted on this architecture" msgstr "" -#: config/tc-arm.c:23492 +#: config/tc-arm.c:23556 #, c-format msgid "selected processor does not support `%s' in Thumb mode" msgstr "" -#: config/tc-arm.c:23498 +#: config/tc-arm.c:23562 msgid "Thumb does not support conditional execution" msgstr "" -#: config/tc-arm.c:23518 +#: config/tc-arm.c:23582 #, c-format msgid "" "selected processor does not support 32bit wide variant of instruction `%s'" msgstr "" -#: config/tc-arm.c:23521 +#: config/tc-arm.c:23585 #, c-format msgid "selected processor does not support `%s' in Thumb-2 mode" msgstr "" -#: config/tc-arm.c:23546 +#: config/tc-arm.c:23610 #, c-format msgid "cannot honor width suffix -- `%s'" msgstr "" -#: config/tc-arm.c:23588 +#: config/tc-arm.c:23652 #, c-format msgid "selected processor does not support `%s' in ARM mode" msgstr "" -#: config/tc-arm.c:23593 +#: config/tc-arm.c:23657 #, c-format msgid "width suffixes are invalid in ARM mode -- `%s'" msgstr "" -#: config/tc-arm.c:23626 +#: config/tc-arm.c:23690 #, c-format msgid "attempt to use an ARM instruction on a Thumb-only processor -- `%s'" msgstr "" -#: config/tc-arm.c:23644 +#: config/tc-arm.c:23708 #, c-format msgid "section '%s' finished with an open IT block." msgstr "" -#: config/tc-arm.c:23647 +#: config/tc-arm.c:23711 #, c-format msgid "section '%s' finished with an open VPT/VPST block." msgstr "" -#: config/tc-arm.c:23654 +#: config/tc-arm.c:23718 msgid "file finished with an open IT block." msgstr "" -#: config/tc-arm.c:23656 +#: config/tc-arm.c:23720 msgid "file finished with an open VPT/VPST block." msgstr "" -#: config/tc-arm.c:27353 +#: config/tc-arm.c:27431 #, c-format msgid "alignments greater than %d bytes not supported in .text sections." msgstr "" -#: config/tc-arm.c:27619 config/tc-ia64.c:3590 +#: config/tc-arm.c:27697 config/tc-ia64.c:3591 #, c-format msgid "Group section `%s' has no group signature" msgstr "" -#: config/tc-arm.c:27665 +#: config/tc-arm.c:27743 msgid "handlerdata in cantunwind frame" msgstr "" -#: config/tc-arm.c:27682 +#: config/tc-arm.c:27760 msgid "too many unwind opcodes for personality routine 0" msgstr "" -#: config/tc-arm.c:27713 +#: config/tc-arm.c:27791 msgid "attempt to recreate an unwind entry" msgstr "" -#: config/tc-arm.c:27723 +#: config/tc-arm.c:27801 msgid "too many unwind opcodes" msgstr "" -#: config/tc-arm.c:28023 +#: config/tc-arm.c:28101 #, c-format msgid "[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s" msgstr "" -#: config/tc-arm.c:28387 config/tc-arm.c:28455 +#: config/tc-arm.c:28465 config/tc-arm.c:28533 #, c-format msgid "symbol %s is in a different section" msgstr "" -#: config/tc-arm.c:28389 config/tc-arm.c:28457 +#: config/tc-arm.c:28467 config/tc-arm.c:28535 #, c-format msgid "symbol %s is weak and may be overridden later" msgstr "" -#: config/tc-arm.c:28434 config/tc-arm.c:28806 +#: config/tc-arm.c:28512 config/tc-arm.c:28884 #, c-format msgid "invalid constant (%lx) after fixup" msgstr "" -#: config/tc-arm.c:28490 +#: config/tc-arm.c:28568 #, c-format msgid "unable to compute ADRL instructions for PC offset of 0x%lx" msgstr "" -#: config/tc-arm.c:28526 config/tc-arm.c:28556 +#: config/tc-arm.c:28604 config/tc-arm.c:28634 msgid "invalid literal constant: pool needs to be closer" msgstr "" -#: config/tc-arm.c:28529 config/tc-arm.c:28578 +#: config/tc-arm.c:28607 config/tc-arm.c:28656 #, c-format msgid "bad immediate value for offset (%ld)" msgstr "" -#: config/tc-arm.c:28559 +#: config/tc-arm.c:28637 #, c-format msgid "bad immediate value for 8-bit offset (%ld)" msgstr "" -#: config/tc-arm.c:28619 +#: config/tc-arm.c:28697 msgid "offset not a multiple of 4" msgstr "" -#: config/tc-arm.c:28822 +#: config/tc-arm.c:28900 msgid "invalid smc expression" msgstr "" -#: config/tc-arm.c:28832 +#: config/tc-arm.c:28910 msgid "invalid hvc expression" msgstr "" -#: config/tc-arm.c:28843 config/tc-arm.c:28852 +#: config/tc-arm.c:28921 config/tc-arm.c:28930 msgid "invalid swi expression" msgstr "" -#: config/tc-arm.c:28862 +#: config/tc-arm.c:28940 msgid "invalid expression in load/store multiple" msgstr "" -#: config/tc-arm.c:28924 +#: config/tc-arm.c:29002 #, c-format msgid "blx to '%s' an ARM ISA state function changed to bl" msgstr "" -#: config/tc-arm.c:28943 +#: config/tc-arm.c:29021 msgid "misaligned branch destination" msgstr "" -#: config/tc-arm.c:29064 +#: config/tc-arm.c:29142 #, c-format msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl" msgstr "" -#: config/tc-arm.c:29113 +#: config/tc-arm.c:29191 msgid "Thumb2 branch out of range" msgstr "" -#: config/tc-arm.c:29165 config/tc-arm.c:29198 +#: config/tc-arm.c:29243 config/tc-arm.c:29276 msgid "Relocation supported only in FDPIC mode" msgstr "" -#: config/tc-arm.c:29228 +#: config/tc-arm.c:29306 msgid "rel31 relocation overflow" msgstr "" -#: config/tc-arm.c:29250 config/tc-arm.c:29256 config/tc-arm.c:29260 -#: config/tc-arm.c:29307 +#: config/tc-arm.c:29328 config/tc-arm.c:29334 config/tc-arm.c:29338 +#: config/tc-arm.c:29385 msgid "co-processor offset out of range" msgstr "" -#: config/tc-arm.c:29324 +#: config/tc-arm.c:29402 #, c-format msgid "invalid offset, target not word aligned (0x%08lX)" msgstr "" -#: config/tc-arm.c:29334 config/tc-arm.c:29343 config/tc-arm.c:29351 -#: config/tc-arm.c:29359 config/tc-arm.c:29367 +#: config/tc-arm.c:29412 config/tc-arm.c:29421 config/tc-arm.c:29429 +#: config/tc-arm.c:29437 config/tc-arm.c:29445 #, c-format msgid "invalid offset, value too big (0x%08lX)" msgstr "" -#: config/tc-arm.c:29408 +#: config/tc-arm.c:29486 msgid "invalid Hi register with immediate" msgstr "" -#: config/tc-arm.c:29424 +#: config/tc-arm.c:29502 msgid "invalid immediate for stack address calculation" msgstr "" -#: config/tc-arm.c:29443 +#: config/tc-arm.c:29521 msgid "address calculation needs a strongly defined nearby symbol" msgstr "" -#: config/tc-arm.c:29459 +#: config/tc-arm.c:29537 msgid "symbol too far away" msgstr "" -#: config/tc-arm.c:29471 +#: config/tc-arm.c:29549 #, c-format msgid "invalid immediate for address calculation (value = 0x%08lX)" msgstr "" -#: config/tc-arm.c:29501 +#: config/tc-arm.c:29579 #, c-format msgid "invalid immediate: %ld is out of range" msgstr "" -#: config/tc-arm.c:29513 +#: config/tc-arm.c:29591 #, c-format msgid "invalid shift value: %ld" msgstr "" -#: config/tc-arm.c:29583 config/tc-arm.c:29654 +#: config/tc-arm.c:29661 config/tc-arm.c:29732 #, c-format msgid "the offset 0x%08lX is not representable" msgstr "" -#: config/tc-arm.c:29615 +#: config/tc-arm.c:29693 #, c-format msgid "Unable to process relocation for thumb opcode: %lx" msgstr "" -#: config/tc-arm.c:29694 +#: config/tc-arm.c:29772 #, c-format msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)" msgstr "" -#: config/tc-arm.c:29733 +#: config/tc-arm.c:29811 #, c-format msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)" msgstr "" -#: config/tc-arm.c:29773 +#: config/tc-arm.c:29851 #, c-format msgid "bad offset 0x%08lX (must be word-aligned)" msgstr "" -#: config/tc-arm.c:29778 +#: config/tc-arm.c:29856 #, c-format msgid "bad offset 0x%08lX (must be an 8-bit number of words)" msgstr "" -#: config/tc-arm.c:29999 config/tc-score.c:7359 +#: config/tc-arm.c:30077 config/tc-score.c:7359 #, c-format msgid "bad relocation fixup type (%d)" msgstr "" -#: config/tc-arm.c:30117 +#: config/tc-arm.c:30195 msgid "literal referenced across section boundary" msgstr "" -#: config/tc-arm.c:30197 +#: config/tc-arm.c:30275 msgid "internal relocation (type: IMMEDIATE) not fixed up" msgstr "" -#: config/tc-arm.c:30202 +#: config/tc-arm.c:30280 msgid "ADRL used for a symbol not defined in the same file" msgstr "" -#: config/tc-arm.c:30209 +#: config/tc-arm.c:30287 #, c-format msgid "%s used for a symbol not defined in the same file" msgstr "" -#: config/tc-arm.c:30225 +#: config/tc-arm.c:30303 #, c-format msgid "undefined local label `%s'" msgstr "" -#: config/tc-arm.c:30231 +#: config/tc-arm.c:30309 msgid "internal_relocation (type: OFFSET_IMM) not fixed up" msgstr "" -#: config/tc-arm.c:30253 config/tc-cris.c:4000 config/tc-csky.c:1152 -#: config/tc-ft32.c:709 config/tc-mcore.c:1929 config/tc-microblaze.c:2007 +#: config/tc-arm.c:30331 config/tc-cris.c:4000 config/tc-csky.c:1152 +#: config/tc-ft32.c:708 config/tc-mcore.c:1932 config/tc-microblaze.c:2007 #: config/tc-mmix.c:2907 config/tc-moxie.c:823 config/tc-ns32k.c:2245 #: config/tc-score.c:7446 msgid "" msgstr "" -#: config/tc-arm.c:30652 +#: config/tc-arm.c:30730 #, c-format msgid "%s: unexpected function type: %d" msgstr "" -#: config/tc-arm.c:30792 +#: config/tc-arm.c:30870 msgid "use of old and new-style options to set CPU type" msgstr "" -#: config/tc-arm.c:30811 +#: config/tc-arm.c:30889 msgid "use of old and new-style options to set FPU type" msgstr "" -#: config/tc-arm.c:30890 +#: config/tc-arm.c:30968 msgid "hard-float conflicts with specified fpu" msgstr "" -#: config/tc-arm.c:31081 +#: config/tc-arm.c:31159 msgid "generate PIC code" msgstr "" -#: config/tc-arm.c:31082 +#: config/tc-arm.c:31160 msgid "assemble Thumb code" msgstr "" -#: config/tc-arm.c:31083 +#: config/tc-arm.c:31161 msgid "support ARM/Thumb interworking" msgstr "" -#: config/tc-arm.c:31085 +#: config/tc-arm.c:31163 msgid "code uses 32-bit program counter" msgstr "" -#: config/tc-arm.c:31086 +#: config/tc-arm.c:31164 msgid "code uses 26-bit program counter" msgstr "" -#: config/tc-arm.c:31087 +#: config/tc-arm.c:31165 msgid "floating point args are in fp regs" msgstr "" -#: config/tc-arm.c:31089 +#: config/tc-arm.c:31167 msgid "re-entrant code" msgstr "" -#: config/tc-arm.c:31090 +#: config/tc-arm.c:31168 msgid "code is ATPCS conformant" msgstr "" #. These are recognized by the assembler, but have no affect on code. -#: config/tc-arm.c:31096 +#: config/tc-arm.c:31174 msgid "use frame pointer" msgstr "" -#: config/tc-arm.c:31097 +#: config/tc-arm.c:31175 msgid "use stack size checking" msgstr "" -#: config/tc-arm.c:31100 +#: config/tc-arm.c:31178 msgid "do not warn on use of deprecated feature" msgstr "" -#: config/tc-arm.c:31103 +#: config/tc-arm.c:31181 msgid "" "warn about performance deprecated IT instructions in ARMv8-A and ARMv8-R" msgstr "" -#: config/tc-arm.c:31107 +#: config/tc-arm.c:31185 msgid "warn about symbols that match instruction names [default]" msgstr "" -#: config/tc-arm.c:31108 +#: config/tc-arm.c:31186 msgid "disable warnings about symobls that match instructions" msgstr "" #. DON'T add any new processors to this list -- we want the whole list #. to go away... Add them to the processors table instead. -#: config/tc-arm.c:31124 config/tc-arm.c:31125 +#: config/tc-arm.c:31202 config/tc-arm.c:31203 msgid "use -mcpu=arm1" msgstr "" -#: config/tc-arm.c:31126 config/tc-arm.c:31127 +#: config/tc-arm.c:31204 config/tc-arm.c:31205 msgid "use -mcpu=arm2" msgstr "" -#: config/tc-arm.c:31128 config/tc-arm.c:31129 +#: config/tc-arm.c:31206 config/tc-arm.c:31207 msgid "use -mcpu=arm250" msgstr "" -#: config/tc-arm.c:31130 config/tc-arm.c:31131 +#: config/tc-arm.c:31208 config/tc-arm.c:31209 msgid "use -mcpu=arm3" msgstr "" -#: config/tc-arm.c:31132 config/tc-arm.c:31133 +#: config/tc-arm.c:31210 config/tc-arm.c:31211 msgid "use -mcpu=arm6" msgstr "" -#: config/tc-arm.c:31134 config/tc-arm.c:31135 +#: config/tc-arm.c:31212 config/tc-arm.c:31213 msgid "use -mcpu=arm600" msgstr "" -#: config/tc-arm.c:31136 config/tc-arm.c:31137 +#: config/tc-arm.c:31214 config/tc-arm.c:31215 msgid "use -mcpu=arm610" msgstr "" -#: config/tc-arm.c:31138 config/tc-arm.c:31139 +#: config/tc-arm.c:31216 config/tc-arm.c:31217 msgid "use -mcpu=arm620" msgstr "" -#: config/tc-arm.c:31140 config/tc-arm.c:31141 +#: config/tc-arm.c:31218 config/tc-arm.c:31219 msgid "use -mcpu=arm7" msgstr "" -#: config/tc-arm.c:31142 config/tc-arm.c:31143 +#: config/tc-arm.c:31220 config/tc-arm.c:31221 msgid "use -mcpu=arm70" msgstr "" -#: config/tc-arm.c:31144 config/tc-arm.c:31145 +#: config/tc-arm.c:31222 config/tc-arm.c:31223 msgid "use -mcpu=arm700" msgstr "" -#: config/tc-arm.c:31146 config/tc-arm.c:31147 +#: config/tc-arm.c:31224 config/tc-arm.c:31225 msgid "use -mcpu=arm700i" msgstr "" -#: config/tc-arm.c:31148 config/tc-arm.c:31149 +#: config/tc-arm.c:31226 config/tc-arm.c:31227 msgid "use -mcpu=arm710" msgstr "" -#: config/tc-arm.c:31150 config/tc-arm.c:31151 +#: config/tc-arm.c:31228 config/tc-arm.c:31229 msgid "use -mcpu=arm710c" msgstr "" -#: config/tc-arm.c:31152 config/tc-arm.c:31153 +#: config/tc-arm.c:31230 config/tc-arm.c:31231 msgid "use -mcpu=arm720" msgstr "" -#: config/tc-arm.c:31154 config/tc-arm.c:31155 +#: config/tc-arm.c:31232 config/tc-arm.c:31233 msgid "use -mcpu=arm7d" msgstr "" -#: config/tc-arm.c:31156 config/tc-arm.c:31157 +#: config/tc-arm.c:31234 config/tc-arm.c:31235 msgid "use -mcpu=arm7di" msgstr "" -#: config/tc-arm.c:31158 config/tc-arm.c:31159 +#: config/tc-arm.c:31236 config/tc-arm.c:31237 msgid "use -mcpu=arm7m" msgstr "" -#: config/tc-arm.c:31160 config/tc-arm.c:31161 +#: config/tc-arm.c:31238 config/tc-arm.c:31239 msgid "use -mcpu=arm7dm" msgstr "" -#: config/tc-arm.c:31162 config/tc-arm.c:31163 +#: config/tc-arm.c:31240 config/tc-arm.c:31241 msgid "use -mcpu=arm7dmi" msgstr "" -#: config/tc-arm.c:31164 config/tc-arm.c:31165 +#: config/tc-arm.c:31242 config/tc-arm.c:31243 msgid "use -mcpu=arm7100" msgstr "" -#: config/tc-arm.c:31166 config/tc-arm.c:31167 +#: config/tc-arm.c:31244 config/tc-arm.c:31245 msgid "use -mcpu=arm7500" msgstr "" -#: config/tc-arm.c:31168 config/tc-arm.c:31169 +#: config/tc-arm.c:31246 config/tc-arm.c:31247 msgid "use -mcpu=arm7500fe" msgstr "" -#: config/tc-arm.c:31170 config/tc-arm.c:31171 config/tc-arm.c:31172 -#: config/tc-arm.c:31173 +#: config/tc-arm.c:31248 config/tc-arm.c:31249 config/tc-arm.c:31250 +#: config/tc-arm.c:31251 msgid "use -mcpu=arm7tdmi" msgstr "" -#: config/tc-arm.c:31174 config/tc-arm.c:31175 +#: config/tc-arm.c:31252 config/tc-arm.c:31253 msgid "use -mcpu=arm710t" msgstr "" -#: config/tc-arm.c:31176 config/tc-arm.c:31177 +#: config/tc-arm.c:31254 config/tc-arm.c:31255 msgid "use -mcpu=arm720t" msgstr "" -#: config/tc-arm.c:31178 config/tc-arm.c:31179 +#: config/tc-arm.c:31256 config/tc-arm.c:31257 msgid "use -mcpu=arm740t" msgstr "" -#: config/tc-arm.c:31180 config/tc-arm.c:31181 +#: config/tc-arm.c:31258 config/tc-arm.c:31259 msgid "use -mcpu=arm8" msgstr "" -#: config/tc-arm.c:31182 config/tc-arm.c:31183 +#: config/tc-arm.c:31260 config/tc-arm.c:31261 msgid "use -mcpu=arm810" msgstr "" -#: config/tc-arm.c:31184 config/tc-arm.c:31185 +#: config/tc-arm.c:31262 config/tc-arm.c:31263 msgid "use -mcpu=arm9" msgstr "" -#: config/tc-arm.c:31186 config/tc-arm.c:31187 +#: config/tc-arm.c:31264 config/tc-arm.c:31265 msgid "use -mcpu=arm9tdmi" msgstr "" -#: config/tc-arm.c:31188 config/tc-arm.c:31189 +#: config/tc-arm.c:31266 config/tc-arm.c:31267 msgid "use -mcpu=arm920" msgstr "" -#: config/tc-arm.c:31190 config/tc-arm.c:31191 +#: config/tc-arm.c:31268 config/tc-arm.c:31269 msgid "use -mcpu=arm940" msgstr "" -#: config/tc-arm.c:31192 +#: config/tc-arm.c:31270 msgid "use -mcpu=strongarm" msgstr "" -#: config/tc-arm.c:31194 +#: config/tc-arm.c:31272 msgid "use -mcpu=strongarm110" msgstr "" -#: config/tc-arm.c:31196 +#: config/tc-arm.c:31274 msgid "use -mcpu=strongarm1100" msgstr "" -#: config/tc-arm.c:31198 +#: config/tc-arm.c:31276 msgid "use -mcpu=strongarm1110" msgstr "" -#: config/tc-arm.c:31199 +#: config/tc-arm.c:31277 msgid "use -mcpu=xscale" msgstr "" -#: config/tc-arm.c:31200 +#: config/tc-arm.c:31278 msgid "use -mcpu=iwmmxt" msgstr "" -#: config/tc-arm.c:31201 +#: config/tc-arm.c:31279 msgid "use -mcpu=all" msgstr "" #. Architecture variants -- don't add any more to this list either. -#: config/tc-arm.c:31204 config/tc-arm.c:31205 +#: config/tc-arm.c:31282 config/tc-arm.c:31283 msgid "use -march=armv2" msgstr "" -#: config/tc-arm.c:31206 config/tc-arm.c:31207 +#: config/tc-arm.c:31284 config/tc-arm.c:31285 msgid "use -march=armv2a" msgstr "" -#: config/tc-arm.c:31208 config/tc-arm.c:31209 +#: config/tc-arm.c:31286 config/tc-arm.c:31287 msgid "use -march=armv3" msgstr "" -#: config/tc-arm.c:31210 config/tc-arm.c:31211 +#: config/tc-arm.c:31288 config/tc-arm.c:31289 msgid "use -march=armv3m" msgstr "" -#: config/tc-arm.c:31212 config/tc-arm.c:31213 +#: config/tc-arm.c:31290 config/tc-arm.c:31291 msgid "use -march=armv4" msgstr "" -#: config/tc-arm.c:31214 config/tc-arm.c:31215 +#: config/tc-arm.c:31292 config/tc-arm.c:31293 msgid "use -march=armv4t" msgstr "" -#: config/tc-arm.c:31216 config/tc-arm.c:31217 +#: config/tc-arm.c:31294 config/tc-arm.c:31295 msgid "use -march=armv5" msgstr "" -#: config/tc-arm.c:31218 config/tc-arm.c:31219 +#: config/tc-arm.c:31296 config/tc-arm.c:31297 msgid "use -march=armv5t" msgstr "" -#: config/tc-arm.c:31220 config/tc-arm.c:31221 +#: config/tc-arm.c:31298 config/tc-arm.c:31299 msgid "use -march=armv5te" msgstr "" #. Floating point variants -- don't add any more to this list either. -#: config/tc-arm.c:31224 +#: config/tc-arm.c:31302 msgid "use -mfpu=fpe" msgstr "" -#: config/tc-arm.c:31225 +#: config/tc-arm.c:31303 msgid "use -mfpu=fpa10" msgstr "" -#: config/tc-arm.c:31226 +#: config/tc-arm.c:31304 msgid "use -mfpu=fpa11" msgstr "" -#: config/tc-arm.c:31228 +#: config/tc-arm.c:31306 msgid "use either -mfpu=softfpa or -mfpu=softvfp" msgstr "" -#: config/tc-arm.c:32312 +#: config/tc-arm.c:32427 msgid "extension does not apply to the base architecture" msgstr "" -#: config/tc-arm.c:32341 +#: config/tc-arm.c:32456 msgid "architectural extensions must be specified in alphabetical order" msgstr "" -#: config/tc-arm.c:32480 config/tc-arm.c:33423 +#: config/tc-arm.c:32595 config/tc-arm.c:33544 #, c-format msgid "unknown floating point format `%s'\n" msgstr "" -#: config/tc-arm.c:32496 config/tc-csky.c:1264 +#: config/tc-arm.c:32611 config/tc-csky.c:1264 #, c-format msgid "unknown floating point abi `%s'\n" msgstr "" -#: config/tc-arm.c:32512 +#: config/tc-arm.c:32627 #, c-format msgid "unknown EABI `%s'\n" msgstr "" -#: config/tc-arm.c:32532 +#: config/tc-arm.c:32647 #, c-format msgid "" "unknown implicit IT mode `%s', should be arm, thumb, always, or never." msgstr "" -#: config/tc-arm.c:32555 config/tc-metag.c:5911 +#: config/tc-arm.c:32670 config/tc-metag.c:5911 msgid "\t assemble for FPU architecture " msgstr "" -#: config/tc-arm.c:32557 +#: config/tc-arm.c:32672 msgid "\t assemble for floating point ABI " msgstr "" -#: config/tc-arm.c:32560 +#: config/tc-arm.c:32675 msgid "\t\t assemble for eabi version " msgstr "" -#: config/tc-arm.c:32563 +#: config/tc-arm.c:32678 msgid "\t controls implicit insertion of IT instructions" msgstr "" -#: config/tc-arm.c:32565 +#: config/tc-arm.c:32680 msgid "\t\t\t TI CodeComposer Studio syntax compatibility mode" msgstr "" -#: config/tc-arm.c:32568 +#: config/tc-arm.c:32683 msgid "" "[ieee|alternative]\n" " set the encoding for half precision floating point " @@ -5345,42 +5338,42 @@ " or Arm alternative format." msgstr "" -#: config/tc-arm.c:32679 +#: config/tc-arm.c:32794 #, c-format msgid " ARM-specific assembler options:\n" msgstr "" -#: config/tc-arm.c:32699 +#: config/tc-arm.c:32814 #, c-format msgid " --fix-v4bx Allow BX in ARMv4 code\n" msgstr "" -#: config/tc-arm.c:32703 +#: config/tc-arm.c:32818 #, c-format msgid " --fdpic generate an FDPIC object file\n" msgstr "" -#: config/tc-arm.c:33011 +#: config/tc-arm.c:33132 msgid "no architecture contains all the instructions used\n" msgstr "" -#: config/tc-arm.c:33363 +#: config/tc-arm.c:33484 #, c-format msgid "" "architectural extension `%s' is not allowed for the current base architecture" msgstr "" -#: config/tc-arm.c:33386 +#: config/tc-arm.c:33507 #, c-format msgid "unknown architecture extension `%s'\n" msgstr "" -#: config/tc-avr.c:593 +#: config/tc-avr.c:597 #, c-format msgid "Known MCU names:" msgstr "" -#: config/tc-avr.c:658 +#: config/tc-avr.c:662 #, c-format msgid "" "AVR Assembler options:\n" @@ -5422,203 +5415,203 @@ " -mgcc-isr accept the __gcc_isr pseudo-instruction.\n" msgstr "" -#: config/tc-avr.c:720 +#: config/tc-avr.c:726 #, c-format msgid "unknown MCU: %s\n" msgstr "" -#: config/tc-avr.c:734 +#: config/tc-avr.c:740 #, c-format msgid "redefinition of mcu type `%s' to `%s'" msgstr "" -#: config/tc-avr.c:859 +#: config/tc-avr.c:869 msgid "constant value required" msgstr "" -#: config/tc-avr.c:862 +#: config/tc-avr.c:872 #, c-format msgid "number must be positive and less than %d" msgstr "" -#: config/tc-avr.c:888 config/tc-avr.c:1025 +#: config/tc-avr.c:898 config/tc-avr.c:1035 #, c-format msgid "constant out of 8-bit range: %d" msgstr "" -#: config/tc-avr.c:956 config/tc-score.c:1198 read.c:3938 +#: config/tc-avr.c:966 config/tc-score.c:1198 read.c:4026 msgid "illegal expression" msgstr "" -#: config/tc-avr.c:985 config/tc-avr.c:1995 config/tc-pru.c:1862 +#: config/tc-avr.c:995 config/tc-avr.c:2005 config/tc-pru.c:1861 msgid "`)' required" msgstr "" -#: config/tc-avr.c:1095 +#: config/tc-avr.c:1105 msgid "register name or number from 16 to 31 required" msgstr "" -#: config/tc-avr.c:1101 +#: config/tc-avr.c:1111 msgid "register name or number from 0 to 31 required" msgstr "" -#: config/tc-avr.c:1109 +#: config/tc-avr.c:1119 msgid "register r16-r23 required" msgstr "" -#: config/tc-avr.c:1115 +#: config/tc-avr.c:1125 msgid "register number above 15 required" msgstr "" -#: config/tc-avr.c:1121 config/tc-csky.c:6394 config/tc-csky.c:6423 +#: config/tc-avr.c:1131 config/tc-csky.c:6395 config/tc-csky.c:6424 msgid "even register number required" msgstr "" -#: config/tc-avr.c:1127 +#: config/tc-avr.c:1137 msgid "register r24, r26, r28 or r30 required" msgstr "" -#: config/tc-avr.c:1148 +#: config/tc-avr.c:1158 msgid "pointer register (X, Y or Z) required" msgstr "" -#: config/tc-avr.c:1155 +#: config/tc-avr.c:1165 msgid "cannot both predecrement and postincrement" msgstr "" -#: config/tc-avr.c:1163 +#: config/tc-avr.c:1173 msgid "addressing mode not supported" msgstr "" -#: config/tc-avr.c:1169 +#: config/tc-avr.c:1179 msgid "can't predecrement" msgstr "" -#: config/tc-avr.c:1172 +#: config/tc-avr.c:1182 msgid "pointer register Z required" msgstr "" -#: config/tc-avr.c:1191 +#: config/tc-avr.c:1201 msgid "postincrement not supported" msgstr "" -#: config/tc-avr.c:1201 +#: config/tc-avr.c:1211 msgid "pointer register (Y or Z) required" msgstr "" -#: config/tc-avr.c:1323 config/tc-xgate.c:1352 +#: config/tc-avr.c:1333 config/tc-xgate.c:1352 #, c-format msgid "unknown constraint `%c'" msgstr "" -#: config/tc-avr.c:1386 config/tc-avr.c:2677 +#: config/tc-avr.c:1396 config/tc-avr.c:2687 msgid "`,' required" msgstr "" -#: config/tc-avr.c:1407 +#: config/tc-avr.c:1417 msgid "undefined combination of operands" msgstr "" -#: config/tc-avr.c:1416 +#: config/tc-avr.c:1426 msgid "skipping two-word instruction" msgstr "" -#: config/tc-avr.c:1604 config/tc-avr.c:1620 config/tc-avr.c:1751 +#: config/tc-avr.c:1614 config/tc-avr.c:1630 config/tc-avr.c:1761 #: config/tc-msp430.c:4498 config/tc-msp430.c:4517 #, c-format msgid "odd address operand: %ld" msgstr "" -#: config/tc-avr.c:1612 config/tc-avr.c:1631 config/tc-avr.c:1649 -#: config/tc-avr.c:1660 config/tc-avr.c:1676 config/tc-avr.c:1684 -#: config/tc-avr.c:1779 config/tc-avr.c:1786 config/tc-d10v.c:503 +#: config/tc-avr.c:1622 config/tc-avr.c:1641 config/tc-avr.c:1659 +#: config/tc-avr.c:1670 config/tc-avr.c:1686 config/tc-avr.c:1694 +#: config/tc-avr.c:1789 config/tc-avr.c:1796 config/tc-d10v.c:503 #: config/tc-d30v.c:550 config/tc-msp430.c:4506 config/tc-msp430.c:4524 #, c-format msgid "operand out of range: %ld" msgstr "" -#: config/tc-avr.c:1667 +#: config/tc-avr.c:1677 #, c-format msgid "operand out of range: 0x%lx" msgstr "" -#: config/tc-avr.c:1772 config/tc-d10v.c:1592 config/tc-d30v.c:2011 +#: config/tc-avr.c:1782 config/tc-d10v.c:1592 config/tc-d30v.c:2011 #: config/tc-msp430.c:4595 #, c-format msgid "line %d: unknown relocation type: 0x%x" msgstr "" -#: config/tc-avr.c:1800 +#: config/tc-avr.c:1810 msgid "only constant expression allowed" msgstr "" #. xgettext:c-format. -#: config/tc-avr.c:1855 config/tc-bfin.c:824 config/tc-d10v.c:1461 -#: config/tc-d30v.c:1768 config/tc-metag.c:7016 config/tc-mn10200.c:779 -#: config/tc-mn10300.c:2177 config/tc-msp430.c:4643 config/tc-ppc.c:7473 -#: config/tc-ppc.c:7494 config/tc-spu.c:882 config/tc-spu.c:1093 -#: config/tc-v850.c:3367 config/tc-z80.c:3869 +#: config/tc-avr.c:1865 config/tc-bfin.c:824 config/tc-d10v.c:1461 +#: config/tc-d30v.c:1768 config/tc-metag.c:7016 config/tc-mn10200.c:772 +#: config/tc-mn10300.c:2177 config/tc-msp430.c:4643 config/tc-ppc.c:7746 +#: config/tc-spu.c:877 config/tc-spu.c:1090 config/tc-v850.c:3364 +#: config/tc-z80.c:3869 #, c-format msgid "reloc %d not supported by object file format" msgstr "" -#: config/tc-avr.c:1877 config/tc-ft32.c:232 config/tc-h8300.c:1929 +#: config/tc-avr.c:1887 config/tc-ft32.c:232 config/tc-h8300.c:1929 #: config/tc-mcore.c:881 config/tc-microblaze.c:941 config/tc-moxie.c:180 #: config/tc-pj.c:253 config/tc-sh.c:2197 config/tc-wasm32.c:747 #: config/tc-z8k.c:1233 msgid "can't find opcode " msgstr "" -#: config/tc-avr.c:1896 +#: config/tc-avr.c:1906 #, c-format msgid "illegal opcode %s for mcu %s" msgstr "" -#: config/tc-avr.c:1912 +#: config/tc-avr.c:1922 #, c-format msgid "pseudo instruction `%s' not supported" msgstr "" -#: config/tc-avr.c:1934 +#: config/tc-avr.c:1944 msgid "garbage at end of line" msgstr "" -#: config/tc-avr.c:2044 config/tc-pru.c:1894 +#: config/tc-avr.c:2054 config/tc-pru.c:1893 #, c-format msgid "illegal %s relocation size: %d" msgstr "" -#: config/tc-avr.c:2157 config/tc-avr.c:2212 +#: config/tc-avr.c:2167 config/tc-avr.c:2222 #, c-format msgid "unknown record type %d (in %s)" msgstr "" -#: config/tc-avr.c:2233 +#: config/tc-avr.c:2243 #, c-format msgid "Failed to create property section `%s'\n" msgstr "" -#: config/tc-avr.c:2669 +#: config/tc-avr.c:2679 #, c-format msgid "%s requires value 0-2 as operand 1" msgstr "" -#: config/tc-avr.c:2694 +#: config/tc-avr.c:2704 #, c-format msgid "`%s %d' after `%s %d' from %s:%u" msgstr "" -#: config/tc-avr.c:2697 +#: config/tc-avr.c:2707 #, c-format msgid "`%s %d' but no chunk open yet" msgstr "" -#: config/tc-avr.c:2785 +#: config/tc-avr.c:2795 #, c-format msgid "dangling `__gcc_isr %d'" msgstr "" -#: config/tc-avr.c:2787 +#: config/tc-avr.c:2797 msgid "dangling `__gcc_isr'" msgstr "" @@ -5731,17 +5724,17 @@ msgid "Unknown register pair - index relative mode: `%d'" msgstr "" -#: config/tc-cr16.c:607 config/tc-crx.c:337 +#: config/tc-cr16.c:603 config/tc-crx.c:333 #, c-format msgid "internal error: reloc %d (`%s') not supported by object file format" msgstr "" -#: config/tc-cr16.c:700 config/tc-i386.c:14007 config/tc-s390.c:2113 +#: config/tc-cr16.c:696 config/tc-i386.c:14126 config/tc-s390.c:2113 msgid "GOT already in symbol table" msgstr "GOT はすでにシンボル表内にあります" -#: config/tc-cr16.c:813 config/tc-m68k.c:4657 config/tc-tilegx.c:319 -#: config/tc-tilepro.c:256 +#: config/tc-cr16.c:813 config/tc-m68k.c:4574 config/tc-tilegx.c:318 +#: config/tc-tilepro.c:255 #, c-format msgid "Internal Error: Can't hash %s: %s" msgstr "" @@ -5756,179 +5749,179 @@ msgstr "" #. Missing or bad expr becomes absolute 0. -#: config/tc-cr16.c:884 config/tc-crx.c:574 +#: config/tc-cr16.c:880 config/tc-crx.c:570 #, c-format msgid "missing or invalid displacement expression `%s' taken as 0" msgstr "" -#: config/tc-cr16.c:934 +#: config/tc-cr16.c:930 #, c-format msgid "GOT bad expression with %s." msgstr "" -#: config/tc-cr16.c:1045 +#: config/tc-cr16.c:1041 #, c-format msgid "operand %d: illegal use expression: `%s`" msgstr "" -#: config/tc-cr16.c:1110 config/tc-crx.c:1084 +#: config/tc-cr16.c:1106 config/tc-crx.c:1080 #, c-format msgid "Unknown register: `%d'" msgstr "" #. Issue a error message when register is illegal. -#: config/tc-cr16.c:1118 +#: config/tc-cr16.c:1114 #, c-format msgid "Illegal register (`%s') in Instruction: `%s'" msgstr "" -#: config/tc-cr16.c:1192 config/tc-cr16.c:1267 +#: config/tc-cr16.c:1188 config/tc-cr16.c:1263 #, c-format msgid "Illegal register `%s' in Instruction `%s'" msgstr "" -#: config/tc-cr16.c:1220 config/tc-cr16.c:1231 +#: config/tc-cr16.c:1216 config/tc-cr16.c:1227 #, c-format msgid "Illegal register pair `%s' in Instruction `%s'" msgstr "" -#: config/tc-cr16.c:1256 +#: config/tc-cr16.c:1252 msgid "unmatched '['" msgstr "" -#: config/tc-cr16.c:1262 +#: config/tc-cr16.c:1258 msgid "garbage after index spec ignored" msgstr "" -#: config/tc-cr16.c:1410 config/tc-crx.c:893 +#: config/tc-cr16.c:1406 config/tc-crx.c:889 #, c-format msgid "Illegal operands (whitespace): `%s'" msgstr "" -#: config/tc-cr16.c:1422 config/tc-cr16.c:1429 config/tc-cr16.c:1446 -#: config/tc-crx.c:905 config/tc-crx.c:912 config/tc-crx.c:929 -#: config/tc-crx.c:1720 +#: config/tc-cr16.c:1418 config/tc-cr16.c:1425 config/tc-cr16.c:1442 +#: config/tc-crx.c:901 config/tc-crx.c:908 config/tc-crx.c:925 +#: config/tc-crx.c:1716 #, c-format msgid "Missing matching brackets : `%s'" msgstr "" -#: config/tc-cr16.c:1478 config/tc-crx.c:955 +#: config/tc-cr16.c:1474 config/tc-crx.c:951 #, c-format msgid "Unknown exception: `%s'" msgstr "" -#: config/tc-cr16.c:1560 config/tc-crx.c:1051 +#: config/tc-cr16.c:1556 config/tc-crx.c:1047 #, c-format msgid "Illegal `cinv' parameter: `%c'" msgstr "" -#: config/tc-cr16.c:1581 config/tc-cr16.c:1620 +#: config/tc-cr16.c:1577 config/tc-cr16.c:1616 #, c-format msgid "Unknown register pair: `%d'" msgstr "" #. Issue a error message when register pair is illegal. -#: config/tc-cr16.c:1589 +#: config/tc-cr16.c:1585 #, c-format msgid "Illegal register pair (`%s') in Instruction: `%s'" msgstr "" #. Issue a error message when register pair is illegal. -#: config/tc-cr16.c:1628 +#: config/tc-cr16.c:1624 #, c-format msgid "Illegal index register pair (`%s') in Instruction: `%s'" msgstr "" -#: config/tc-cr16.c:1667 +#: config/tc-cr16.c:1663 #, c-format msgid "Unknown processor register : `%d'" msgstr "" #. Issue a error message when register pair is illegal. -#: config/tc-cr16.c:1675 +#: config/tc-cr16.c:1671 #, c-format msgid "Illegal processor register (`%s') in Instruction: `%s'" msgstr "" -#: config/tc-cr16.c:1723 +#: config/tc-cr16.c:1719 #, c-format msgid "Unknown processor register (32 bit) : `%d'" msgstr "" #. Issue a error message when register pair is illegal. -#: config/tc-cr16.c:1731 +#: config/tc-cr16.c:1727 #, c-format msgid "Illegal 32 bit - processor register (`%s') in Instruction: `%s'" msgstr "" -#: config/tc-cr16.c:2076 config/tc-crx.c:1618 config/tc-crx.c:1635 +#: config/tc-cr16.c:2072 config/tc-crx.c:1614 config/tc-crx.c:1631 #, c-format msgid "Same src/dest register is used (`r%d'), result is undefined" msgstr "" -#: config/tc-cr16.c:2098 +#: config/tc-cr16.c:2094 msgid "RA register is saved twice." msgstr "" -#: config/tc-cr16.c:2102 +#: config/tc-cr16.c:2098 #, c-format msgid "`%s' Illegal use of registers." msgstr "" -#: config/tc-cr16.c:2116 +#: config/tc-cr16.c:2112 #, c-format msgid "`%s' Illegal count-register combination." msgstr "" -#: config/tc-cr16.c:2122 +#: config/tc-cr16.c:2118 #, c-format msgid "`%s' Illegal use of register." msgstr "" -#: config/tc-cr16.c:2131 config/tc-crx.c:1627 +#: config/tc-cr16.c:2127 config/tc-crx.c:1623 #, c-format msgid "`%s' has undefined result" msgstr "" -#: config/tc-cr16.c:2139 +#: config/tc-cr16.c:2135 #, c-format msgid "Same src/dest register is used (`r%d'),result is undefined" msgstr "" -#: config/tc-cr16.c:2310 config/tc-crx.c:1533 +#: config/tc-cr16.c:2306 config/tc-crx.c:1529 msgid "Incorrect number of operands" msgstr "" -#: config/tc-cr16.c:2312 config/tc-crx.c:1535 +#: config/tc-cr16.c:2308 config/tc-crx.c:1531 #, c-format msgid "Illegal type of operand (arg %d)" msgstr "" -#: config/tc-cr16.c:2318 config/tc-crx.c:1541 +#: config/tc-cr16.c:2314 config/tc-crx.c:1537 #, c-format msgid "Operand out of range (arg %d)" msgstr "" -#: config/tc-cr16.c:2321 config/tc-crx.c:1544 +#: config/tc-cr16.c:2317 config/tc-crx.c:1540 #, c-format msgid "Operand has odd displacement (arg %d)" msgstr "" -#: config/tc-cr16.c:2324 config/tc-cr16.c:2355 config/tc-crx.c:1559 -#: config/tc-crx.c:1587 +#: config/tc-cr16.c:2320 config/tc-cr16.c:2351 config/tc-crx.c:1555 +#: config/tc-crx.c:1583 #, c-format msgid "Illegal operand (arg %d)" msgstr "" #. Give an error if a frag containing code is not aligned to a 2-byte #. boundary. -#: config/tc-cr16.c:2457 config/tc-cr16.h:74 config/tc-crx.c:1909 +#: config/tc-cr16.c:2453 config/tc-cr16.h:74 config/tc-crx.c:1905 #: config/tc-crx.h:77 msgid "instruction address is not a multiple of 2" msgstr "" -#: config/tc-cr16.c:2480 config/tc-cris.c:1550 config/tc-cris.c:1558 -#: config/tc-crx.c:1945 config/tc-dlx.c:680 config/tc-hppa.c:3212 +#: config/tc-cr16.c:2476 config/tc-cris.c:1550 config/tc-cris.c:1558 +#: config/tc-crx.c:1941 config/tc-dlx.c:680 config/tc-hppa.c:3212 #: config/tc-hppa.c:3219 config/tc-sparc.c:1749 config/tc-sparc.c:1757 #, c-format msgid "Unknown opcode: `%s'" @@ -6149,13 +6142,13 @@ msgid "invalid in --march=: %s" msgstr "" -#: config/tc-cris.c:3952 config/tc-ft32.c:689 config/tc-moxie.c:776 +#: config/tc-cris.c:3952 config/tc-ft32.c:688 config/tc-moxie.c:776 msgid "" "Semantics error. This type of operand can not be relocated, it must be an " "assembly-time constant" msgstr "" -#: config/tc-cris.c:4001 config/tc-ft32.c:710 config/tc-moxie.c:824 +#: config/tc-cris.c:4001 config/tc-ft32.c:709 config/tc-moxie.c:824 #, c-format msgid "Cannot generate relocation type for symbol %s, code %s" msgstr "" @@ -6203,47 +6196,47 @@ "\t\t\t\tare v0_v10, v10, v32 and common_v10_v32.\n" msgstr "" -#: config/tc-cris.c:4082 +#: config/tc-cris.c:4081 msgid "Invalid pc-relative relocation" msgstr "" -#: config/tc-cris.c:4127 +#: config/tc-cris.c:4126 #, c-format msgid "Adjusted signed .word (%ld) overflows: `switch'-statement too large." msgstr "" -#: config/tc-cris.c:4157 +#: config/tc-cris.c:4156 #, c-format msgid ".syntax %s requires command-line option `--underscore'" msgstr "" -#: config/tc-cris.c:4166 +#: config/tc-cris.c:4165 #, c-format msgid ".syntax %s requires command-line option `--no-underscore'" msgstr "" -#: config/tc-cris.c:4203 +#: config/tc-cris.c:4202 msgid "Unknown .syntax operand" msgstr "" -#: config/tc-cris.c:4213 +#: config/tc-cris.c:4212 msgid "Pseudodirective .file is only valid when generating ELF" msgstr "" -#: config/tc-cris.c:4225 +#: config/tc-cris.c:4224 msgid "Pseudodirective .loc is only valid when generating ELF" msgstr "" -#: config/tc-cris.c:4240 +#: config/tc-cris.c:4239 #, c-format msgid "internal inconsistency problem: %s called for %d bytes" msgstr "" -#: config/tc-cris.c:4392 +#: config/tc-cris.c:4391 msgid "unknown operand to .arch" msgstr "" -#: config/tc-cris.c:4401 +#: config/tc-cris.c:4400 msgid ".arch requires a matching --march=... option" msgstr "" @@ -6252,98 +6245,98 @@ msgid "Internal error: Can't hash %s: %s" msgstr "" -#: config/tc-crx.c:714 config/tc-crx.c:734 config/tc-crx.c:749 +#: config/tc-crx.c:710 config/tc-crx.c:730 config/tc-crx.c:745 #, c-format msgid "Illegal register `%s' in instruction `%s'" msgstr "" -#: config/tc-crx.c:777 +#: config/tc-crx.c:773 #, c-format msgid "Illegal Scale - `%d'" msgstr "" #. Issue a error message when register is illegal. -#: config/tc-crx.c:1092 +#: config/tc-crx.c:1088 #, c-format msgid "Illegal register (`%s') in instruction: `%s'" msgstr "" -#: config/tc-crx.c:1221 +#: config/tc-crx.c:1217 #, c-format msgid "Illegal co-processor register in instruction `%s'" msgstr "" -#: config/tc-crx.c:1228 +#: config/tc-crx.c:1224 #, c-format msgid "Illegal co-processor special register in instruction `%s'" msgstr "" -#: config/tc-crx.c:1548 +#: config/tc-crx.c:1544 #, c-format msgid "Invalid DISPU4 operand value (arg %d)" msgstr "" -#: config/tc-crx.c:1552 +#: config/tc-crx.c:1548 #, c-format msgid "Invalid CST4 operand value (arg %d)" msgstr "" -#: config/tc-crx.c:1555 +#: config/tc-crx.c:1551 #, c-format msgid "Operand value is not within upper 64 KB (arg %d)" msgstr "" -#: config/tc-crx.c:1689 +#: config/tc-crx.c:1685 msgid "Invalid register in register list" msgstr "" -#: config/tc-crx.c:1743 +#: config/tc-crx.c:1739 #, c-format msgid "Illegal register `%s' in cop-register list" msgstr "" -#: config/tc-crx.c:1751 +#: config/tc-crx.c:1747 #, c-format msgid "Illegal register `%s' in cop-special-register list" msgstr "" -#: config/tc-crx.c:1770 +#: config/tc-crx.c:1766 #, c-format msgid "Illegal register `%s' in user register list" msgstr "" -#: config/tc-crx.c:1789 +#: config/tc-crx.c:1785 #, c-format msgid "Illegal register `%s' in register list" msgstr "" -#: config/tc-crx.c:1795 +#: config/tc-crx.c:1791 #, c-format msgid "Maximum %d bits may be set in `mask16' operand" msgstr "" -#: config/tc-crx.c:1804 +#: config/tc-crx.c:1800 #, c-format msgid "rest of line ignored; first ignored character is `%c'" msgstr "" -#: config/tc-crx.c:1812 +#: config/tc-crx.c:1808 #, c-format msgid "Illegal `mask16' operand, operation is undefined - `%s'" msgstr "" #. HI can't be specified without LO (and vise-versa). -#: config/tc-crx.c:1818 +#: config/tc-crx.c:1814 msgid "HI/LO registers should be specified together" msgstr "" -#: config/tc-crx.c:1824 +#: config/tc-crx.c:1820 msgid "HI/LO registers should be specified without additional registers" msgstr "" #. Variable not in small data read only segment accessed #. using small data read only anchor. -#: config/tc-csky.c:1149 config/tc-mcore.c:1924 config/tc-microblaze.c:1999 +#: config/tc-csky.c:1149 config/tc-mcore.c:1927 config/tc-microblaze.c:1999 #: config/tc-microblaze.c:2301 config/tc-microblaze.c:2324 msgid "unknown" msgstr "" @@ -6555,7 +6548,7 @@ msgid "more than 65K literal pools" msgstr "" -#: config/tc-csky.c:2320 read.c:3655 +#: config/tc-csky.c:2320 read.c:3740 #, c-format msgid "bad floating literal: %s" msgstr "" @@ -6578,35 +6571,35 @@ msgid "unsupported BFD relocation size %d" msgstr "" -#: config/tc-csky.c:5901 +#: config/tc-csky.c:5902 msgid "second operand must be 4" msgstr "" -#: config/tc-csky.c:5925 config/tc-mcore.c:1527 +#: config/tc-csky.c:5926 config/tc-mcore.c:1527 msgid "second operand must be 1" msgstr "" -#: config/tc-csky.c:5998 config/tc-xtensa.c:2002 +#: config/tc-csky.c:5999 config/tc-xtensa.c:2002 msgid "register number out of range" msgstr "" -#: config/tc-csky.c:6008 +#: config/tc-csky.c:6009 msgid "64-bit operator src/dst register must be less than 15" msgstr "" -#: config/tc-csky.c:7835 +#: config/tc-csky.c:7836 msgid "the first operand must be a symbol" msgstr "" -#: config/tc-csky.c:7844 +#: config/tc-csky.c:7845 msgid "missing stack size" msgstr "" -#: config/tc-csky.c:7857 config/tc-score.c:4244 +#: config/tc-csky.c:7858 config/tc-score.c:4244 msgid "value not in range [0, 0xffffffff]" msgstr "" -#: config/tc-csky.c:7867 config/tc-mcore.c:782 +#: config/tc-csky.c:7868 config/tc-mcore.c:782 msgid "operand must be a constant" msgstr "" @@ -6879,9 +6872,9 @@ msgid ".endfunc missing for previous .proc" msgstr "" -#: config/tc-dlx.c:295 config/tc-i860.c:226 config/tc-mips.c:3600 -#: config/tc-nios2.c:3639 config/tc-nios2.c:3653 config/tc-nios2.c:3668 -#: config/tc-pru.c:1565 config/tc-pru.c:1579 config/tc-riscv.c:621 +#: config/tc-dlx.c:295 config/tc-mips.c:3703 config/tc-nios2.c:3637 +#: config/tc-nios2.c:3651 config/tc-nios2.c:3666 config/tc-pru.c:1574 +#: config/tc-pru.c:1588 config/tc-riscv.c:726 #, c-format msgid "internal error: can't hash `%s': %s\n" msgstr "" @@ -6910,7 +6903,7 @@ msgid "Invalid expression after %%%%\n" msgstr "" -#: config/tc-dlx.c:691 config/tc-tic4x.c:2452 +#: config/tc-dlx.c:691 config/tc-tic4x.c:2454 #, c-format msgid "Unknown opcode `%s'." msgstr "" @@ -6956,7 +6949,7 @@ msgid "Invalid expression after # number\n" msgstr "" -#: config/tc-dlx.c:1177 config/tc-m32r.c:2275 config/tc-nds32.c:7881 +#: config/tc-dlx.c:1177 config/tc-m32r.c:2275 config/tc-nds32.c:7841 #: config/tc-sparc.c:4011 #, c-format msgid "internal error: can't export reloc type %d (`%s')" @@ -7393,7 +7386,7 @@ msgid "call to tc_aout_fix_to_chars \n" msgstr "" -#: config/tc-h8300.c:2220 config/tc-xc16x.c:349 +#: config/tc-h8300.c:2220 config/tc-xc16x.c:348 #, c-format msgid "call to md_convert_frag \n" msgstr "" @@ -7411,9 +7404,9 @@ msgid "Difference of symbols in different sections is not supported" msgstr "" -#: config/tc-h8300.c:2324 config/tc-mcore.c:2205 config/tc-microblaze.c:2494 +#: config/tc-h8300.c:2323 config/tc-mcore.c:2208 config/tc-microblaze.c:2494 #: config/tc-pj.c:488 config/tc-sh.c:3901 config/tc-tic6x.c:4514 -#: config/tc-xc16x.c:315 +#: config/tc-xc16x.c:314 #, c-format msgid "Cannot represent relocation type %s" msgstr "" @@ -7824,7 +7817,7 @@ msgid "-R option not supported on this target." msgstr "" -#: config/tc-hppa.c:8251 config/tc-sparc.c:1019 config/tc-sparc.c:1056 +#: config/tc-hppa.c:8250 config/tc-sparc.c:963 config/tc-sparc.c:1000 #, c-format msgid "Internal error: can't hash `%s': %s\n" msgstr "" @@ -7834,812 +7827,812 @@ msgid "internal error: losing opcode: `%s' \"%s\"\n" msgstr "" -#: config/tc-i386.c:1476 +#: config/tc-i386.c:1486 #, c-format msgid "i386_output_nops called to generate nops of at most %d bytes!" msgstr "" -#: config/tc-i386.c:1685 +#: config/tc-i386.c:1695 #, c-format msgid "invalid single nop size: %d (expect within [0, %d])" msgstr "" -#: config/tc-i386.c:1726 +#: config/tc-i386.c:1736 msgid "jump over nop padding out of range" msgstr "" -#: config/tc-i386.c:2570 +#: config/tc-i386.c:2472 #, c-format msgid "%s shortened to %s" msgstr "" -#: config/tc-i386.c:2656 config/tc-i386.c:7983 +#: config/tc-i386.c:2673 config/tc-i386.c:8079 msgid "same type of prefix used twice" msgstr "" -#: config/tc-i386.c:2683 +#: config/tc-i386.c:2700 #, c-format msgid "64bit mode not supported on `%s'." msgstr "64 ビットモードは `%s' ではサポートされていません。" -#: config/tc-i386.c:2692 +#: config/tc-i386.c:2709 #, c-format msgid "32bit mode not supported on `%s'." msgstr "32 ビットモードは `%s' ではサポートされていません。" -#: config/tc-i386.c:2732 +#: config/tc-i386.c:2749 msgid "bad argument to syntax directive." msgstr "syntax 指示への間違った引数です。" -#: config/tc-i386.c:2795 +#: config/tc-i386.c:2812 #, c-format msgid "bad argument to %s_check directive." msgstr "" -#: config/tc-i386.c:2799 +#: config/tc-i386.c:2816 #, c-format msgid "missing argument for %s_check directive" msgstr "" -#: config/tc-i386.c:2839 +#: config/tc-i386.c:2856 #, c-format msgid "`%s' is not supported on `%s'" msgstr "`%s' は `%s' ではサポートされていません" -#: config/tc-i386.c:2945 +#: config/tc-i386.c:2962 #, c-format msgid "no such architecture: `%s'" msgstr "そのようなアーキテクチャはありません: `%s'" -#: config/tc-i386.c:2950 +#: config/tc-i386.c:2967 msgid "missing cpu architecture" msgstr "CPU アーキテクチャがありません" -#: config/tc-i386.c:2967 +#: config/tc-i386.c:2984 #, c-format msgid "no such architecture modifier: `%s'" msgstr "" -#: config/tc-i386.c:2982 config/tc-i386.c:3012 +#: config/tc-i386.c:2999 config/tc-i386.c:3029 msgid "Intel L1OM is 64bit ELF only" msgstr "Intel L1OM は 64 ビット ELF のみです" -#: config/tc-i386.c:2989 config/tc-i386.c:3019 +#: config/tc-i386.c:3006 config/tc-i386.c:3036 msgid "Intel K1OM is 64bit ELF only" msgstr "" -#: config/tc-i386.c:2996 config/tc-i386.c:3033 +#: config/tc-i386.c:3013 config/tc-i386.c:3050 msgid "Intel MCU is 32bit ELF only" msgstr "" -#: config/tc-i386.c:3040 config/tc-i386.c:13894 +#: config/tc-i386.c:3057 config/tc-i386.c:14013 msgid "unknown architecture" msgstr "不明なアーキテクチャ" -#: config/tc-i386.c:2708 config/tc-i386.c:2730 +#: config/tc-i386.c:2984 config/tc-i386.c:3006 #, c-format msgid "can't hash %s: %s" msgstr "" -#: config/tc-i386.c:3427 +#: config/tc-i386.c:3444 msgid "there are no pc-relative size relocations" msgstr "" -#: config/tc-i386.c:3439 +#: config/tc-i386.c:3456 #, c-format msgid "unknown relocation (%u)" msgstr "不明な再配置 (%u)" -#: config/tc-i386.c:3441 +#: config/tc-i386.c:3458 #, c-format msgid "%u-byte relocation cannot be applied to %u-byte field" msgstr "" -#: config/tc-i386.c:3445 +#: config/tc-i386.c:3462 msgid "non-pc-relative relocation for pc-relative field" msgstr "" -#: config/tc-i386.c:3450 +#: config/tc-i386.c:3467 msgid "relocated field and relocation type differ in signedness" msgstr "" -#: config/tc-i386.c:3459 +#: config/tc-i386.c:3476 msgid "there are no unsigned pc-relative relocations" msgstr "" -#: config/tc-i386.c:3467 +#: config/tc-i386.c:3484 #, c-format msgid "cannot do %u byte pc-relative relocation" msgstr "" -#: config/tc-i386.c:3484 +#: config/tc-i386.c:3501 #, c-format msgid "cannot do %s %u byte relocation" msgstr "" -#: config/tc-i386.c:4035 config/tc-i386.c:4968 +#: config/tc-i386.c:4052 config/tc-i386.c:5019 #, c-format msgid "invalid instruction `%s' after `%s'" msgstr "" -#: config/tc-i386.c:4041 +#: config/tc-i386.c:4058 #, c-format msgid "missing `lock' with `%s'" msgstr "" -#: config/tc-i386.c:4048 +#: config/tc-i386.c:4065 #, c-format msgid "instruction `%s' after `xacquire' not allowed" msgstr "" -#: config/tc-i386.c:4054 +#: config/tc-i386.c:4071 #, c-format msgid "memory destination needed for instruction `%s' after `xrelease'" msgstr "" -#: config/tc-i386.c:4958 +#: config/tc-i386.c:5009 #, c-format msgid "SSE instruction `%s' is used" msgstr "" -#: config/tc-i386.c:7211 +#: config/tc-i386.c:7299 #, c-format msgid "ambiguous operand size for `%s'" msgstr "" -#: config/tc-i386.c:4981 +#: config/tc-i386.c:5032 msgid "expecting lockable instruction after `lock'" msgstr "" -#: config/tc-i386.c:4991 +#: config/tc-i386.c:5042 #, c-format msgid "data size prefix invalid with `%s'" msgstr "" -#: config/tc-i386.c:5001 +#: config/tc-i386.c:5052 msgid "expecting valid branch instruction after `bnd'" msgstr "" -#: config/tc-i386.c:5005 +#: config/tc-i386.c:5056 msgid "expecting indirect branch instruction after `notrack'" msgstr "" -#: config/tc-i386.c:5010 +#: config/tc-i386.c:5061 msgid "32-bit address isn't allowed in 64-bit MPX instructions." msgstr "" -#: config/tc-i386.c:5014 +#: config/tc-i386.c:5065 msgid "16-bit address isn't allowed in MPX instructions" msgstr "" -#: config/tc-i386.c:5024 +#: config/tc-i386.c:5075 msgid "replacing `rep'/`repe' prefix by `bnd'" msgstr "" #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc. -#: config/tc-i386.c:5096 +#: config/tc-i386.c:5150 #, c-format msgid "translating to `%sp'" msgstr "" -#: config/tc-i386.c:5103 +#: config/tc-i386.c:5157 #, c-format msgid "instruction `%s' isn't supported outside of protected mode." msgstr "" -#: config/tc-i386.c:5172 +#: config/tc-i386.c:5226 #, c-format msgid "can't encode register '%s%s' in an instruction requiring REX prefix." msgstr "" -#: config/tc-i386.c:5248 config/tc-i386.c:5452 +#: config/tc-i386.c:5302 config/tc-i386.c:5506 #, c-format msgid "no such instruction: `%s'" msgstr "" -#: config/tc-i386.c:5259 config/tc-i386.c:5485 +#: config/tc-i386.c:5313 config/tc-i386.c:5539 #, c-format msgid "invalid character %s in mnemonic" msgstr "" -#: config/tc-i386.c:5266 +#: config/tc-i386.c:5320 msgid "expecting prefix; got nothing" msgstr "" -#: config/tc-i386.c:5268 +#: config/tc-i386.c:5322 msgid "expecting mnemonic; got nothing" msgstr "" -#: config/tc-i386.c:5283 config/tc-i386.c:5507 +#: config/tc-i386.c:5337 config/tc-i386.c:5561 #, c-format msgid "`%s' is only supported in 64-bit mode" msgstr "`%s' は 64 ビットモードでのみサポートされています" -#: config/tc-i386.c:5284 config/tc-i386.c:5506 +#: config/tc-i386.c:5338 config/tc-i386.c:5560 #, c-format msgid "`%s' is not supported in 64-bit mode" msgstr "`%s' は 64 ビットモードではサポートされていません" -#: config/tc-i386.c:5296 +#: config/tc-i386.c:5350 #, c-format msgid "redundant %s prefix" msgstr "冗長な %s 接頭辞です" -#: config/tc-i386.c:5498 +#: config/tc-i386.c:5552 msgid "use .code16 to ensure correct addressing mode" msgstr "" -#: config/tc-i386.c:5510 +#: config/tc-i386.c:5564 #, c-format msgid "`%s' is not supported on `%s%s'" msgstr "`%s' は `%s%s' ではサポートされていません" -#: config/tc-i386.c:5538 +#: config/tc-i386.c:5592 #, c-format msgid "invalid character %s before operand %d" msgstr "" -#: config/tc-i386.c:5557 +#: config/tc-i386.c:5611 #, c-format msgid "unbalanced parenthesis in operand %d." msgstr "" -#: config/tc-i386.c:5380 +#: config/tc-i386.c:4951 #, c-format msgid "unbalanced brackets in operand %d." msgstr "" -#: config/tc-i386.c:5570 +#: config/tc-i386.c:5624 #, c-format msgid "invalid character %s in operand %d" msgstr "" -#: config/tc-i386.c:5590 +#: config/tc-i386.c:5644 #, c-format msgid "spurious operands; (%d operands/instruction max)" msgstr "" -#: config/tc-i386.c:5600 config/tc-i386.c:11480 +#: config/tc-i386.c:5654 config/tc-i386.c:11589 #, c-format msgid "too many memory references for `%s'" msgstr "" -#: config/tc-i386.c:5621 +#: config/tc-i386.c:5675 msgid "expecting operand after ','; got nothing" msgstr "" -#: config/tc-i386.c:5626 +#: config/tc-i386.c:5680 msgid "expecting operand before ','; got nothing" msgstr "" -#: config/tc-i386.c:6046 +#: config/tc-i386.c:6100 msgid "mask, index, and destination registers should be distinct" msgstr "" -#: config/tc-i386.c:6063 +#: config/tc-i386.c:6117 msgid "index and destination registers should be distinct" msgstr "" -#: config/tc-i386.c:6806 +#: config/tc-i386.c:6891 msgid "operand size mismatch" msgstr "" -#: config/tc-i386.c:6809 +#: config/tc-i386.c:6894 msgid "operand type mismatch" msgstr "" -#: config/tc-i386.c:6812 +#: config/tc-i386.c:6897 msgid "register type mismatch" msgstr "" -#: config/tc-i386.c:6815 +#: config/tc-i386.c:6900 msgid "number of operands mismatch" msgstr "" -#: config/tc-i386.c:6818 +#: config/tc-i386.c:6903 msgid "invalid instruction suffix" msgstr "" -#: config/tc-i386.c:6821 +#: config/tc-i386.c:6906 msgid "constant doesn't fit in 4 bits" msgstr "" -#: config/tc-i386.c:6824 +#: config/tc-i386.c:6909 msgid "unsupported with Intel mnemonic" msgstr "" -#: config/tc-i386.c:6827 +#: config/tc-i386.c:6912 msgid "unsupported syntax" msgstr "" -#: config/tc-i386.c:6830 +#: config/tc-i386.c:6915 #, c-format msgid "unsupported instruction `%s'" msgstr "" -#: config/tc-i386.c:6837 +#: config/tc-i386.c:6922 msgid "invalid VSIB address" msgstr "" -#: config/tc-i386.c:6840 +#: config/tc-i386.c:6925 msgid "mask, index, and destination registers must be distinct" msgstr "" -#: config/tc-i386.c:6846 +#: config/tc-i386.c:6934 msgid "unsupported vector index register" msgstr "" -#: config/tc-i386.c:6849 +#: config/tc-i386.c:6937 msgid "unsupported broadcast" msgstr "" -#: config/tc-i386.c:6852 +#: config/tc-i386.c:6940 msgid "broadcast is needed for operand of such type" msgstr "" -#: config/tc-i386.c:6855 +#: config/tc-i386.c:6943 msgid "unsupported masking" msgstr "" -#: config/tc-i386.c:6858 +#: config/tc-i386.c:6946 msgid "mask not on destination operand" msgstr "" -#: config/tc-i386.c:6861 +#: config/tc-i386.c:6949 msgid "default mask isn't allowed" msgstr "" -#: config/tc-i386.c:6864 +#: config/tc-i386.c:6952 msgid "unsupported static rounding/sae" msgstr "" -#: config/tc-i386.c:6868 +#: config/tc-i386.c:6956 msgid "RC/SAE operand must precede immediate operands" msgstr "" -#: config/tc-i386.c:6870 +#: config/tc-i386.c:6958 msgid "RC/SAE operand must follow immediate operands" msgstr "" -#: config/tc-i386.c:6873 config/tc-metag.c:4787 config/tc-metag.c:5528 +#: config/tc-i386.c:6961 config/tc-metag.c:4787 config/tc-metag.c:5528 #: config/tc-metag.c:5550 msgid "invalid register operand" msgstr "" -#: config/tc-i386.c:6876 +#: config/tc-i386.c:6964 #, c-format msgid "%s for `%s'" msgstr "" -#: config/tc-i386.c:6885 +#: config/tc-i386.c:6973 #, c-format msgid "indirect %s without `*'" msgstr "" #. Warn them that a data or address size prefix doesn't #. affect assembly of the next line of code. -#: config/tc-i386.c:6892 +#: config/tc-i386.c:6980 #, c-format msgid "stand-alone `%s' prefix" msgstr "" -#: config/tc-i386.c:6934 +#: config/tc-i386.c:7022 #, c-format msgid "`%s' operand %u must use `%ses' segment" msgstr "" #. We have to know the operand size for crc32. -#: config/tc-i386.c:5432 +#: config/tc-i386.c:6324 #, c-format msgid "ambiguous memory operand size for `%s`" msgstr "" -#: config/tc-i386.c:7089 +#: config/tc-i386.c:7177 msgid "generating 16-bit `iret' for .code16gcc directive" msgstr "" -#: config/tc-i386.c:7093 +#: config/tc-i386.c:7181 #, c-format msgid "generating 32-bit `%s', unlike earlier gas versions" msgstr "" -#: config/tc-i386.c:5554 +#: config/tc-i386.c:6455 msgid "" "no instruction mnemonic suffix given and no register operands; can't size " "instruction" msgstr "" -#: config/tc-i386.c:7432 +#: config/tc-i386.c:7520 #, c-format msgid "invalid register operand size for `%s'" msgstr "" -#: config/tc-i386.c:5700 config/tc-i386.c:5773 config/tc-i386.c:5895 +#: config/tc-i386.c:6638 config/tc-i386.c:6710 config/tc-i386.c:6832 #, c-format msgid "using `%s%s' instead of `%s%s' due to `%c' suffix" msgstr "" #. Any other register is bad. -#: config/tc-i386.c:7472 config/tc-i386.c:7497 config/tc-i386.c:7556 -#: config/tc-i386.c:7606 +#: config/tc-i386.c:7560 config/tc-i386.c:7585 config/tc-i386.c:7644 +#: config/tc-i386.c:7694 #, c-format msgid "`%s%s' not allowed with `%s%c'" msgstr "" -#: config/tc-i386.c:7510 config/tc-i386.c:7530 config/tc-i386.c:7581 -#: config/tc-i386.c:7620 +#: config/tc-i386.c:7598 config/tc-i386.c:7618 config/tc-i386.c:7669 +#: config/tc-i386.c:7708 #, c-format msgid "incorrect register `%s%s' used with `%c' suffix" msgstr "" -#: config/tc-i386.c:7687 +#: config/tc-i386.c:7783 msgid "no instruction mnemonic suffix given; can't determine immediate size" msgstr "" -#: config/tc-i386.c:7851 +#: config/tc-i386.c:7947 #, c-format msgid "" "source register `%s%s' implicitly denotes `%s%.3s%u' to `%s%.3s%u' source " "group in `%s'" msgstr "" -#: config/tc-i386.c:7895 +#: config/tc-i386.c:7991 #, c-format msgid "you can't `%s %s%s'" msgstr "" #. Reversed arguments on faddp, fsubp, etc. -#: config/tc-i386.c:7935 +#: config/tc-i386.c:8031 #, c-format msgid "translating to `%s %s%s,%s%s'" msgstr "" #. Extraneous `l' suffix on fp insn. -#: config/tc-i386.c:7942 +#: config/tc-i386.c:8038 #, c-format msgid "translating to `%s %s%s'" msgstr "" -#: config/tc-i386.c:7954 +#: config/tc-i386.c:8050 #, c-format msgid "segment override on `%s' is ineffectual" msgstr "" -#: config/tc-i386.c:8728 config/tc-i386.c:8874 config/tc-i386.c:8956 +#: config/tc-i386.c:8824 config/tc-i386.c:8972 config/tc-i386.c:9054 #, c-format msgid "skipping prefixes on `%s'" msgstr "" -#: config/tc-i386.c:8982 +#: config/tc-i386.c:9080 msgid "16-bit jump out of range" msgstr "" -#: config/tc-i386.c:7160 +#: config/tc-i386.c:8145 #, c-format msgid "can't handle non absolute segment in `%s'" msgstr "" -#: config/tc-i386.c:9236 config/tc-i386.c:9268 config/tc-i386.c:9357 +#: config/tc-i386.c:9334 config/tc-i386.c:9366 config/tc-i386.c:9455 #, c-format msgid "`%s` skips -malign-branch-boundary on `%s`" msgstr "" -#: config/tc-i386.c:9633 +#: config/tc-i386.c:9736 msgid "pseudo prefix without instruction" msgstr "" -#: config/tc-i386.c:9779 +#: config/tc-i386.c:9882 #, c-format msgid "instruction length of %u bytes exceeds the limit of 15" msgstr "" -#: config/tc-i386.c:10365 +#: config/tc-i386.c:10468 #, c-format msgid "@%s reloc is not supported with %d-bit output format" msgstr "" -#: config/tc-i386.c:10418 +#: config/tc-i386.c:10521 #, c-format msgid "missing or invalid expression `%s'" msgstr "" -#: config/tc-i386.c:10427 +#: config/tc-i386.c:10530 #, c-format msgid "invalid PLT expression `%s'" msgstr "" -#: config/tc-i386.c:10519 +#: config/tc-i386.c:10628 #, c-format msgid "Unsupported broadcast: `%s'" msgstr "" -#: config/tc-i386.c:10536 +#: config/tc-i386.c:10645 #, c-format msgid "`%s%s' can't be used for write mask" msgstr "" -#: config/tc-i386.c:10556 +#: config/tc-i386.c:10665 #, c-format msgid "invalid write mask `%s'" msgstr "" -#: config/tc-i386.c:10577 config/tc-i386.c:11271 +#: config/tc-i386.c:10686 config/tc-i386.c:11380 #, c-format msgid "duplicated `%s'" msgstr "" -#: config/tc-i386.c:10587 +#: config/tc-i386.c:10696 #, c-format msgid "invalid zeroing-masking `%s'" msgstr "" -#: config/tc-i386.c:10600 +#: config/tc-i386.c:10709 #, c-format msgid "missing `}' in `%s'" msgstr "" #. We don't know this one. -#: config/tc-i386.c:10614 +#: config/tc-i386.c:10723 #, c-format msgid "unknown vector operation: `%s'" msgstr "" -#: config/tc-i386.c:10620 +#: config/tc-i386.c:10729 msgid "zeroing-masking only allowed with write mask" msgstr "" -#: config/tc-i386.c:10640 +#: config/tc-i386.c:10749 #, c-format msgid "at most %d immediate operands are allowed" msgstr "" -#: config/tc-i386.c:10662 config/tc-i386.c:10930 +#: config/tc-i386.c:10771 config/tc-i386.c:11039 #, c-format msgid "junk `%s' after expression" msgstr "" -#: config/tc-i386.c:10689 +#: config/tc-i386.c:10798 #, c-format msgid "missing or invalid immediate expression `%s'" msgstr "" -#: config/tc-i386.c:10712 config/tc-i386.c:11010 +#: config/tc-i386.c:10821 config/tc-i386.c:11119 #, c-format msgid "unimplemented segment %s in operand" msgstr "" -#: config/tc-i386.c:10675 +#: config/tc-i386.c:10784 #, c-format msgid "illegal immediate register operand %s" msgstr "" -#: config/tc-i386.c:10761 +#: config/tc-i386.c:10870 #, c-format msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'" msgstr "" -#: config/tc-i386.c:10770 +#: config/tc-i386.c:10879 #, c-format msgid "scale factor of %d without an index register" msgstr "" -#: config/tc-i386.c:10792 +#: config/tc-i386.c:10901 #, c-format msgid "at most %d displacement operands are allowed" msgstr "" -#: config/tc-i386.c:10986 +#: config/tc-i386.c:11095 #, c-format msgid "missing or invalid displacement expression `%s'" msgstr "" -#: config/tc-i386.c:10895 +#: config/tc-i386.c:10149 #, c-format msgid "0x%lx out range of signed 32bit displacement" msgstr "" -#: config/tc-i386.c:11160 +#: config/tc-i386.c:11269 #, c-format msgid "`%s' is not valid here (expected `%c%s%s%c')" msgstr "" -#: config/tc-i386.c:11172 +#: config/tc-i386.c:11281 #, c-format msgid "`%s' is not a valid %s expression" msgstr "" -#: config/tc-i386.c:11217 +#: config/tc-i386.c:11326 #, c-format msgid "`%s' cannot be used here" msgstr "" -#: config/tc-i386.c:11226 +#: config/tc-i386.c:11335 msgid "register scaling is being ignored here" msgstr "" -#: config/tc-i386.c:11288 +#: config/tc-i386.c:11397 #, c-format msgid "Missing '}': '%s'" msgstr "" -#: config/tc-i386.c:11294 +#: config/tc-i386.c:11403 #, c-format msgid "Junk after '}': '%s'" msgstr "" -#: config/tc-i386.c:11416 +#: config/tc-i386.c:11525 #, c-format msgid "bad memory operand `%s'" msgstr "" -#: config/tc-i386.c:11432 +#: config/tc-i386.c:11541 #, c-format msgid "junk `%s' after register" msgstr "" -#: config/tc-i386.c:11445 config/tc-i386.c:11609 config/tc-i386.c:11653 +#: config/tc-i386.c:11554 config/tc-i386.c:11718 config/tc-i386.c:11762 #, c-format msgid "bad register name `%s'" msgstr "" -#: config/tc-i386.c:11453 +#: config/tc-i386.c:11562 msgid "immediate operand illegal with absolute jump" msgstr "" -#: config/tc-i386.c:11598 +#: config/tc-i386.c:11707 #, c-format msgid "expecting `,' or `)' after index register in `%s'" msgstr "" -#: config/tc-i386.c:11626 +#: config/tc-i386.c:11735 #, c-format msgid "expecting `)' after scale factor in `%s'" msgstr "" -#: config/tc-i386.c:11634 +#: config/tc-i386.c:11743 #, c-format msgid "expecting index register or scale factor after `,'; got '%c'" msgstr "" -#: config/tc-i386.c:11642 +#: config/tc-i386.c:11751 #, c-format msgid "expecting `,' or `)' after base register in `%s'" msgstr "" #. It's not a memory operand; argh! -#: config/tc-i386.c:11691 +#: config/tc-i386.c:11800 #, c-format msgid "invalid char %s beginning operand %d `%s'" msgstr "" -#: config/tc-i386.c:12350 +#: config/tc-i386.c:12460 #, c-format msgid "%s:%u: add %d%s at 0x%llx to align %s within %d-byte boundary\n" msgstr "" -#: config/tc-i386.c:12353 +#: config/tc-i386.c:12463 #, c-format msgid "" "%s:%u: add additional %d%s at 0x%llx to align %s within %d-byte boundary\n" msgstr "" -#: config/tc-i386.c:12359 +#: config/tc-i386.c:12469 #, c-format msgid "" "%s:%u: add %d%s-byte nop at 0x%llx to align %s within %d-byte boundary\n" msgstr "" -#: config/tc-i386.c:12426 +#: config/tc-i386.c:12536 msgid "long jump required" msgstr "" -#: config/tc-i386.c:12481 +#: config/tc-i386.c:12591 msgid "jump target out of range" msgstr "jump 先が範囲外です" -#: config/tc-i386.c:13112 +#: config/tc-i386.c:13224 #, c-format msgid "invalid -mx86-used-note= option: `%s'" msgstr "" -#: config/tc-i386.c:13135 +#: config/tc-i386.c:13247 msgid "no compiled in support for x86_64" msgstr "x86_64 用のサポートがコンパイル時に組み込まれていません" -#: config/tc-i386.c:13155 +#: config/tc-i386.c:13267 msgid "no compiled in support for 32bit x86_64" msgstr "32ビ ット x86_64 用のサポートがコンパイル時に組み込まれていません" -#: config/tc-i386.c:13159 +#: config/tc-i386.c:13271 msgid "32bit x86_64 is only supported for ELF" msgstr "" -#: config/tc-i386.c:13193 config/tc-i386.c:13281 +#: config/tc-i386.c:13305 config/tc-i386.c:13393 #, c-format msgid "invalid -march= option: `%s'" msgstr "無効な -march= オプションです: `%s'" -#: config/tc-i386.c:13291 config/tc-i386.c:13303 +#: config/tc-i386.c:13403 config/tc-i386.c:13415 #, c-format msgid "invalid -mtune= option: `%s'" msgstr "無効な -mtune= オプションです: `%s'" -#: config/tc-i386.c:13312 +#: config/tc-i386.c:13424 #, c-format msgid "invalid -mmnemonic= option: `%s'" msgstr "無効な -mmnemonic= オプションです: `%s'" -#: config/tc-i386.c:13321 +#: config/tc-i386.c:13433 #, c-format msgid "invalid -msyntax= option: `%s'" msgstr "無効な -msyntax= オプションです: `%s'" -#: config/tc-i386.c:13344 +#: config/tc-i386.c:13460 #, c-format msgid "invalid -msse-check= option: `%s'" msgstr "無効な -msse-check= オプションです: `%s'" -#: config/tc-i386.c:13355 +#: config/tc-i386.c:13471 #, c-format msgid "invalid -moperand-check= option: `%s'" msgstr "" -#: config/tc-i386.c:13364 +#: config/tc-i386.c:13480 #, c-format msgid "invalid -mavxscalar= option: `%s'" msgstr "無効な -mavxscalar= オプションです: `%s'" -#: config/tc-i386.c:13373 +#: config/tc-i386.c:13489 #, c-format msgid "invalid -mvexwig= option: `%s'" msgstr "" -#: config/tc-i386.c:13388 +#: config/tc-i386.c:13504 #, c-format msgid "invalid -mevexlig= option: `%s'" msgstr "" -#: config/tc-i386.c:13401 +#: config/tc-i386.c:13517 #, c-format msgid "invalid -mevexrcig= option: `%s'" msgstr "" -#: config/tc-i386.c:13410 +#: config/tc-i386.c:13526 #, c-format msgid "invalid -mevexwig= option: `%s'" msgstr "" -#: config/tc-i386.c:13425 +#: config/tc-i386.c:13541 #, c-format msgid "invalid -momit-lock-prefix= option: `%s'" msgstr "" -#: config/tc-i386.c:13434 +#: config/tc-i386.c:13550 #, c-format msgid "invalid -mfence-as-lock-add= option: `%s'" msgstr "" -#: config/tc-i386.c:13484 +#: config/tc-i386.c:13600 #, c-format msgid "invalid -mrelax-relocations= option: `%s'" msgstr "" -#: config/tc-i386.c:13513 +#: config/tc-i386.c:13629 #, c-format msgid "invalid -malign-branch-boundary= value: %s" msgstr "" -#: config/tc-i386.c:13527 +#: config/tc-i386.c:13643 #, c-format msgid "invalid -malign-branch-prefix-size= value: %s" msgstr "" -#: config/tc-i386.c:13554 +#: config/tc-i386.c:13670 #, c-format msgid "invalid -malign-branch= option: `%s'" msgstr "" -#: config/tc-i386.c:13710 +#: config/tc-i386.c:13826 #, c-format msgid "" " -Qy, -Qn ignored\n" @@ -8647,7 +8640,7 @@ " -k ignored\n" msgstr "" -#: config/tc-i386.c:13715 +#: config/tc-i386.c:13831 #, c-format msgid "" " -n Do not optimize code alignment\n" @@ -8656,27 +8649,27 @@ " -n コード整列最適化を行わない\n" " -q いくつかの警告を抑止する\n" -#: config/tc-i386.c:13719 +#: config/tc-i386.c:13835 #, c-format msgid " -s ignored\n" msgstr " -s 無視される\n" -#: config/tc-i386.c:13599 +#: config/tc-i386.c:12698 #, c-format msgid " --32/--64/--x32 generate 32bit/64bit/x32 code\n" msgstr " --32/--64/--x32 32ビット/64ビット/x32 コードを生成する\n" -#: config/tc-i386.c:13732 +#: config/tc-i386.c:13848 #, c-format msgid " --divide do not treat `/' as a comment character\n" msgstr " --divide `/' をコメント文字として扱わない\n" -#: config/tc-i386.c:13735 +#: config/tc-i386.c:13851 #, c-format msgid " --divide ignored\n" msgstr " --divide 無視される\n" -#: config/tc-i386.c:13738 +#: config/tc-i386.c:13854 #, c-format msgid "" " -march=CPU[,+EXTENSION...]\n" @@ -8684,36 +8677,36 @@ "of:\n" msgstr "" -#: config/tc-i386.c:13742 +#: config/tc-i386.c:13858 #, c-format msgid " EXTENSION is combination of:\n" msgstr "" -#: config/tc-i386.c:13745 +#: config/tc-i386.c:13861 #, c-format msgid " -mtune=CPU optimize for CPU, CPU is one of:\n" msgstr "" -#: config/tc-i386.c:13748 +#: config/tc-i386.c:13864 #, c-format msgid " -msse2avx encode SSE instructions with VEX prefix\n" msgstr "" -#: config/tc-i386.c:13750 +#: config/tc-i386.c:13869 #, c-format msgid "" " -msse-check=[none|error|warning] (default: warning)\n" " check SSE instructions\n" msgstr "" -#: config/tc-i386.c:13753 +#: config/tc-i386.c:13872 #, c-format msgid "" " -moperand-check=[none|error|warning] (default: warning)\n" " check operand combinations for validity\n" msgstr "" -#: config/tc-i386.c:13756 +#: config/tc-i386.c:13875 #, c-format msgid "" " -mavxscalar=[128|256] (default: 128)\n" @@ -8722,7 +8715,7 @@ " length\n" msgstr "" -#: config/tc-i386.c:13760 +#: config/tc-i386.c:13879 #, c-format msgid "" " -mvexwig=[0|1] (default: 0)\n" @@ -8730,7 +8723,7 @@ " for VEX.W bit ignored instructions\n" msgstr "" -#: config/tc-i386.c:13764 +#: config/tc-i386.c:13883 #, c-format msgid "" " -mevexlig=[128|256|512] (default: 128)\n" @@ -8739,7 +8732,7 @@ " length\n" msgstr "" -#: config/tc-i386.c:13768 +#: config/tc-i386.c:13887 #, c-format msgid "" " -mevexwig=[0|1] (default: 0)\n" @@ -8748,7 +8741,7 @@ " for EVEX.W bit ignored instructions\n" msgstr "" -#: config/tc-i386.c:13772 +#: config/tc-i386.c:13891 #, c-format msgid "" " -mevexrcig=[rne|rd|ru|rz] (default: rne)\n" @@ -8757,78 +8750,78 @@ " for SAE-only ignored instructions\n" msgstr "" -#: config/tc-i386.c:13776 +#: config/tc-i386.c:13895 #, c-format msgid " -mmnemonic=[att|intel] " msgstr "" -#: config/tc-i386.c:13779 +#: config/tc-i386.c:13898 #, c-format msgid "(default: att)\n" msgstr "" -#: config/tc-i386.c:13781 +#: config/tc-i386.c:13900 #, c-format msgid "(default: intel)\n" msgstr "" -#: config/tc-i386.c:13782 +#: config/tc-i386.c:13901 #, c-format msgid " use AT&T/Intel mnemonic\n" msgstr "" -#: config/tc-i386.c:13784 +#: config/tc-i386.c:13903 #, c-format msgid "" " -msyntax=[att|intel] (default: att)\n" " use AT&T/Intel syntax\n" msgstr "" -#: config/tc-i386.c:13787 +#: config/tc-i386.c:13906 #, c-format msgid " -mindex-reg support pseudo index registers\n" msgstr "" -#: config/tc-i386.c:13789 +#: config/tc-i386.c:13908 #, c-format msgid " -mnaked-reg don't require `%%' prefix for registers\n" msgstr " -mnaked-reg レジスタ用に `%%' 接頭辞を要求しない\n" -#: config/tc-i386.c:13791 +#: config/tc-i386.c:13910 #, c-format msgid " -madd-bnd-prefix add BND prefix for all valid branches\n" msgstr "" -#: config/tc-i386.c:13794 +#: config/tc-i386.c:13913 #, c-format msgid "" " -mshared disable branch optimization for shared code\n" msgstr "" -#: config/tc-i386.c:13796 +#: config/tc-i386.c:13915 #, c-format msgid " -mx86-used-note=[no|yes] " msgstr "" -#: config/tc-i386.c:13802 +#: config/tc-i386.c:13921 #, c-format msgid "" " generate x86 used ISA and feature properties\n" msgstr "" -#: config/tc-i386.c:13806 +#: config/tc-i386.c:13925 #, c-format msgid " -mbig-obj generate big object files\n" msgstr "" -#: config/tc-i386.c:13809 +#: config/tc-i386.c:13928 #, c-format msgid "" " -momit-lock-prefix=[no|yes] (default: no)\n" " strip all lock prefixes\n" msgstr "" -#: config/tc-i386.c:13812 +#: config/tc-i386.c:13931 #, c-format msgid "" " -mfence-as-lock-add=[no|yes] (default: no)\n" @@ -8836,24 +8829,24 @@ " lock addl $0x0, (%%{re}sp)\n" msgstr "" -#: config/tc-i386.c:13816 +#: config/tc-i386.c:13935 #, c-format msgid " -mrelax-relocations=[no|yes] " msgstr "" -#: config/tc-i386.c:13822 +#: config/tc-i386.c:13941 #, c-format msgid " generate relax relocations\n" msgstr "" -#: config/tc-i386.c:13824 +#: config/tc-i386.c:13943 #, c-format msgid "" " -malign-branch-boundary=NUM (default: 0)\n" " align branches within NUM byte boundary\n" msgstr "" -#: config/tc-i386.c:13827 +#: config/tc-i386.c:13946 #, c-format msgid "" " -malign-branch=TYPE[+TYPE...] (default: jcc+fused+jmp)\n" @@ -8863,474 +8856,474 @@ " specify types of branches to align\n" msgstr "" -#: config/tc-i386.c:13832 +#: config/tc-i386.c:13951 #, c-format msgid "" " -malign-branch-prefix-size=NUM (default: 5)\n" " align branches with NUM prefixes per instruction\n" msgstr "" -#: config/tc-i386.c:13835 +#: config/tc-i386.c:13954 #, c-format msgid "" " -mbranches-within-32B-boundaries\n" " align branches within 32 byte boundary\n" msgstr "" -#: config/tc-i386.c:13847 +#: config/tc-i386.c:13966 #, c-format msgid " -mamd64 accept only AMD64 ISA [default]\n" msgstr "" -#: config/tc-i386.c:13849 +#: config/tc-i386.c:13968 #, c-format msgid " -mintel64 accept only Intel64 ISA\n" msgstr "" -#: config/tc-i386.c:13890 +#: config/tc-i386.c:14009 #, c-format msgid "Intel MCU doesn't support `%s' architecture" msgstr "" -#: config/tc-i386.c:13958 +#: config/tc-i386.c:14077 msgid "Intel L1OM is 64bit only" msgstr "Intel L1OM は 64 ビットのみです" -#: config/tc-i386.c:13964 +#: config/tc-i386.c:14083 msgid "Intel K1OM is 64bit only" msgstr "" -#: config/tc-i386.c:13970 +#: config/tc-i386.c:14089 msgid "Intel MCU is 32bit only" msgstr "" -#: config/tc-i386.c:14199 +#: config/tc-i386.c:14318 msgid "symbol size computation overflow" msgstr "" -#: config/tc-i386.c:14273 config/tc-sparc.c:3852 +#: config/tc-i386.c:14392 config/tc-sparc.c:3852 #, c-format msgid "can not do %d byte pc-relative relocation" msgstr "" -#: config/tc-i386.c:14291 +#: config/tc-i386.c:14410 #, c-format msgid "can not do %d byte relocation" msgstr "%d バイトの再配置は行えません" -#: config/tc-i386.c:14359 +#: config/tc-i386.c:14478 #, c-format msgid "cannot represent relocation type %s in x32 mode" msgstr "" -#: config/tc-i386.c:14396 config/tc-s390.c:2605 +#: config/tc-i386.c:14515 config/tc-s390.c:2602 #, c-format msgid "cannot represent relocation type %s" msgstr "再配置型 %s を表現できません" -#: config/tc-i386.c:14513 +#: config/tc-i386.c:14632 msgid "bad .section directive: want a,l,w,x,M,S,G,T in string" msgstr "" -#: config/tc-i386.c:14516 +#: config/tc-i386.c:14635 msgid "bad .section directive: want a,w,x,M,S,G,T in string" msgstr "" -#: config/tc-i386.c:14535 +#: config/tc-i386.c:14654 msgid ".largecomm supported only in 64bit mode, producing .comm" msgstr "" -#: config/tc-ia64.c:869 +#: config/tc-ia64.c:870 msgid "bad .section directive: want a,o,s,w,x,M,S,G,T in string" msgstr "" -#: config/tc-ia64.c:921 +#: config/tc-ia64.c:922 msgid "Size of frame exceeds maximum of 96 registers" msgstr "" -#: config/tc-ia64.c:926 +#: config/tc-ia64.c:927 msgid "Size of rotating registers exceeds frame size" msgstr "" -#: config/tc-ia64.c:1013 +#: config/tc-ia64.c:1014 msgid "Unwind directive not followed by an instruction." msgstr "" -#: config/tc-ia64.c:1022 config/tc-ia64.c:7604 +#: config/tc-ia64.c:1023 config/tc-ia64.c:7597 msgid "qualifying predicate not followed by instruction" msgstr "" -#: config/tc-ia64.c:1070 +#: config/tc-ia64.c:1071 msgid "expected ',' after section name" msgstr "" -#: config/tc-ia64.c:1105 +#: config/tc-ia64.c:1106 msgid "expected ',' after symbol name" msgstr "" -#: config/tc-ia64.c:1129 +#: config/tc-ia64.c:1130 msgid "expected ',' after symbol size" msgstr "" -#: config/tc-ia64.c:1212 config/tc-ia64.c:1246 +#: config/tc-ia64.c:1213 config/tc-ia64.c:1247 msgid "record type is not valid" msgstr "" -#: config/tc-ia64.c:1315 +#: config/tc-ia64.c:1316 msgid "Invalid record type for P3 format." msgstr "" -#: config/tc-ia64.c:1351 +#: config/tc-ia64.c:1352 msgid "Invalid record type for format P6" msgstr "" -#: config/tc-ia64.c:1531 config/tc-ia64.c:1583 +#: config/tc-ia64.c:1532 config/tc-ia64.c:1584 msgid "Invalid record type for format B1" msgstr "" -#: config/tc-ia64.c:1616 +#: config/tc-ia64.c:1617 msgid "Invalid record type for format X1" msgstr "" -#: config/tc-ia64.c:1658 +#: config/tc-ia64.c:1659 msgid "Invalid record type for format X3" msgstr "" -#: config/tc-ia64.c:1696 +#: config/tc-ia64.c:1697 msgid "Previous .save incomplete" msgstr "" -#: config/tc-ia64.c:2521 +#: config/tc-ia64.c:2522 msgid "spill_mask record unimplemented." msgstr "" -#: config/tc-ia64.c:2578 +#: config/tc-ia64.c:2579 msgid "record_type_not_valid" msgstr "" -#: config/tc-ia64.c:2662 +#: config/tc-ia64.c:2663 msgid "Ignoring attempt to spill beyond end of region" msgstr "" -#: config/tc-ia64.c:2721 +#: config/tc-ia64.c:2722 msgid "Only constant space allocation is supported" msgstr "" -#: config/tc-ia64.c:2735 +#: config/tc-ia64.c:2736 msgid "Only constant offsets are supported" msgstr "" -#: config/tc-ia64.c:2759 +#: config/tc-ia64.c:2760 msgid "Section switching in code is not supported." msgstr "" -#: config/tc-ia64.c:2801 +#: config/tc-ia64.c:2802 msgid "Insn slot not set in unwind record." msgstr "" -#: config/tc-ia64.c:2875 +#: config/tc-ia64.c:2876 msgid "frgr_mem record before region record!" msgstr "" -#: config/tc-ia64.c:2886 +#: config/tc-ia64.c:2887 msgid "fr_mem record before region record!" msgstr "" -#: config/tc-ia64.c:2895 +#: config/tc-ia64.c:2896 msgid "gr_mem record before region record!" msgstr "" -#: config/tc-ia64.c:2904 +#: config/tc-ia64.c:2905 msgid "br_mem record before region record!" msgstr "" -#: config/tc-ia64.c:2914 +#: config/tc-ia64.c:2915 msgid "gr_gr record before region record!" msgstr "" -#: config/tc-ia64.c:2922 +#: config/tc-ia64.c:2923 msgid "br_gr record before region record!" msgstr "" -#: config/tc-ia64.c:3040 +#: config/tc-ia64.c:3041 #, c-format msgid "First operand to .%s must be a predicate" msgstr "" -#: config/tc-ia64.c:3044 +#: config/tc-ia64.c:3045 #, c-format msgid "Pointless use of p0 as first operand to .%s" msgstr "" -#: config/tc-ia64.c:3100 +#: config/tc-ia64.c:3101 #, c-format msgid "Operand %d to .%s must be a preserved register" msgstr "" -#: config/tc-ia64.c:3136 +#: config/tc-ia64.c:3137 #, c-format msgid "Operand %d to .%s must be a writable register" msgstr "" -#: config/tc-ia64.c:3160 +#: config/tc-ia64.c:3161 #, c-format msgid "Radix `%s' unsupported or invalid" msgstr "" -#: config/tc-ia64.c:3190 config/tc-ia64.c:3195 +#: config/tc-ia64.c:3191 config/tc-ia64.c:3196 #, c-format msgid ".%s outside of %s" msgstr "" -#: config/tc-ia64.c:3281 +#: config/tc-ia64.c:3282 msgid "Tags on unwind pseudo-ops aren't supported, yet" msgstr "" -#: config/tc-ia64.c:3303 +#: config/tc-ia64.c:3304 msgid "First operand to .fframe must be a constant" msgstr "" -#: config/tc-ia64.c:3323 +#: config/tc-ia64.c:3324 msgid "First operand to .vframe must be a general register" msgstr "" -#: config/tc-ia64.c:3331 +#: config/tc-ia64.c:3332 msgid "Operand of .vframe contradicts .prologue" msgstr "" -#: config/tc-ia64.c:3341 +#: config/tc-ia64.c:3342 msgid ".vframepsp is meaningless, assuming .vframesp was meant" msgstr "" -#: config/tc-ia64.c:3349 +#: config/tc-ia64.c:3350 msgid "Operand to .vframesp must be a constant (sp-relative offset)" msgstr "" -#: config/tc-ia64.c:3376 +#: config/tc-ia64.c:3377 msgid "First operand to .save not a register" msgstr "" -#: config/tc-ia64.c:3382 +#: config/tc-ia64.c:3383 msgid "Second operand to .save not a valid register" msgstr "" -#: config/tc-ia64.c:3413 config/tc-ia64.c:3424 config/tc-ia64.c:3432 +#: config/tc-ia64.c:3414 config/tc-ia64.c:3425 config/tc-ia64.c:3433 msgid "Second operand of .save contradicts .prologue" msgstr "" -#: config/tc-ia64.c:3439 +#: config/tc-ia64.c:3440 msgid "First operand to .save not a valid register" msgstr "" -#: config/tc-ia64.c:3457 +#: config/tc-ia64.c:3458 msgid "First operand to .restore must be stack pointer (sp)" msgstr "" -#: config/tc-ia64.c:3466 +#: config/tc-ia64.c:3467 msgid "Second operand to .restore must be a constant >= 0" msgstr "" -#: config/tc-ia64.c:3476 +#: config/tc-ia64.c:3477 #, c-format msgid "Epilogue count of %lu exceeds number of nested prologues (%u)" msgstr "" -#: config/tc-ia64.c:3562 +#: config/tc-ia64.c:3563 #, c-format msgid "Illegal section name `%s' (causes unwind section name clash)" msgstr "" -#: config/tc-ia64.c:3737 +#: config/tc-ia64.c:3738 msgid "First operand to .altrp not a valid branch register" msgstr "" -#: config/tc-ia64.c:3766 +#: config/tc-ia64.c:3767 #, c-format msgid "First operand to .%s not a register" msgstr "" -#: config/tc-ia64.c:3771 +#: config/tc-ia64.c:3772 #, c-format msgid "Second operand to .%s not a constant" msgstr "" -#: config/tc-ia64.c:3838 +#: config/tc-ia64.c:3839 #, c-format msgid "First operand to .%s not a valid register" msgstr "" -#: config/tc-ia64.c:3861 +#: config/tc-ia64.c:3862 msgid "First operand to .save.g must be a positive 4-bit constant" msgstr "" -#: config/tc-ia64.c:3874 +#: config/tc-ia64.c:3875 msgid "Second operand to .save.g must be a general register" msgstr "" -#: config/tc-ia64.c:3879 +#: config/tc-ia64.c:3880 #, c-format msgid "Second operand to .save.g must be the first of %d general registers" msgstr "" -#: config/tc-ia64.c:3902 +#: config/tc-ia64.c:3903 msgid "Operand to .save.f must be a positive 20-bit constant" msgstr "" -#: config/tc-ia64.c:3925 +#: config/tc-ia64.c:3926 msgid "First operand to .save.b must be a positive 5-bit constant" msgstr "" -#: config/tc-ia64.c:3938 +#: config/tc-ia64.c:3939 msgid "Second operand to .save.b must be a general register" msgstr "" -#: config/tc-ia64.c:3943 +#: config/tc-ia64.c:3944 #, c-format msgid "Second operand to .save.b must be the first of %d general registers" msgstr "" -#: config/tc-ia64.c:3969 +#: config/tc-ia64.c:3970 msgid "First operand to .save.gf must be a non-negative 4-bit constant" msgstr "" -#: config/tc-ia64.c:3977 +#: config/tc-ia64.c:3978 msgid "Second operand to .save.gf must be a non-negative 20-bit constant" msgstr "" -#: config/tc-ia64.c:3985 +#: config/tc-ia64.c:3986 msgid "Operands to .save.gf may not be both zero" msgstr "" -#: config/tc-ia64.c:4002 +#: config/tc-ia64.c:4003 msgid "Operand to .spill must be a constant" msgstr "" -#: config/tc-ia64.c:4071 +#: config/tc-ia64.c:4072 #, c-format msgid "Operand %d to .%s must be a constant" msgstr "" -#: config/tc-ia64.c:4092 +#: config/tc-ia64.c:4093 #, c-format msgid "Missing .label_state %ld" msgstr "" -#: config/tc-ia64.c:4146 +#: config/tc-ia64.c:4147 msgid "Operand to .label_state must be a constant" msgstr "" -#: config/tc-ia64.c:4165 +#: config/tc-ia64.c:4166 msgid "Operand to .copy_state must be a constant" msgstr "" -#: config/tc-ia64.c:4188 +#: config/tc-ia64.c:4189 msgid "First operand to .unwabi must be a constant" msgstr "" -#: config/tc-ia64.c:4194 +#: config/tc-ia64.c:4195 msgid "Second operand to .unwabi must be a constant" msgstr "" -#: config/tc-ia64.c:4229 +#: config/tc-ia64.c:4230 msgid "Missing .endp after previous .proc" msgstr "" -#: config/tc-ia64.c:4247 +#: config/tc-ia64.c:4248 msgid "Empty argument of .proc" msgstr "" -#: config/tc-ia64.c:4252 +#: config/tc-ia64.c:4253 #, c-format msgid "`%s' was already defined" msgstr "" -#: config/tc-ia64.c:4295 +#: config/tc-ia64.c:4296 msgid "Initial .body should precede any instructions" msgstr "" -#: config/tc-ia64.c:4314 +#: config/tc-ia64.c:4315 msgid ".prologue within prologue" msgstr "" -#: config/tc-ia64.c:4319 +#: config/tc-ia64.c:4320 msgid "Initial .prologue should precede any instructions" msgstr "" -#: config/tc-ia64.c:4329 +#: config/tc-ia64.c:4330 msgid "First operand to .prologue must be a positive 4-bit constant" msgstr "" -#: config/tc-ia64.c:4331 +#: config/tc-ia64.c:4332 msgid "Pointless use of zero first operand to .prologue" msgstr "" -#: config/tc-ia64.c:4347 +#: config/tc-ia64.c:4348 msgid "Using a constant as second operand to .prologue is deprecated" msgstr "" -#: config/tc-ia64.c:4353 +#: config/tc-ia64.c:4354 msgid "Second operand to .prologue must be a general register" msgstr "" -#: config/tc-ia64.c:4358 +#: config/tc-ia64.c:4359 #, c-format msgid "Second operand to .prologue must be the first of %d general registers" msgstr "" -#: config/tc-ia64.c:4471 +#: config/tc-ia64.c:4472 #, c-format msgid "`%s' was not defined within procedure" msgstr "" -#: config/tc-ia64.c:4507 +#: config/tc-ia64.c:4508 msgid "Empty argument of .endp" msgstr "" -#: config/tc-ia64.c:4521 +#: config/tc-ia64.c:4522 #, c-format msgid "`%s' was not specified with previous .proc" msgstr "" -#: config/tc-ia64.c:4536 +#: config/tc-ia64.c:4537 #, c-format msgid "`%s' should be an operand to this .endp" msgstr "" -#: config/tc-ia64.c:4577 config/tc-ia64.c:4898 config/tc-ia64.c:5204 +#: config/tc-ia64.c:4578 config/tc-ia64.c:4891 config/tc-ia64.c:5197 msgid "Comma expected" msgstr "" -#: config/tc-ia64.c:4617 +#: config/tc-ia64.c:4618 msgid "Expected '['" msgstr "" -#: config/tc-ia64.c:4626 config/tc-ia64.c:7738 +#: config/tc-ia64.c:4627 config/tc-ia64.c:7731 msgid "Expected ']'" msgstr "" -#: config/tc-ia64.c:4631 +#: config/tc-ia64.c:4632 msgid "Number of elements must be positive" msgstr "" -#: config/tc-ia64.c:4642 +#: config/tc-ia64.c:4643 #, c-format msgid "Used more than the declared %d rotating registers" msgstr "" -#: config/tc-ia64.c:4650 +#: config/tc-ia64.c:4651 msgid "Used more than the available 96 rotating registers" msgstr "" -#: config/tc-ia64.c:4657 +#: config/tc-ia64.c:4658 msgid "Used more than the available 48 rotating registers" msgstr "" -#: config/tc-ia64.c:4685 +#: config/tc-ia64.c:4686 #, c-format msgid "Attempt to redefine register set `%s'" msgstr "" -#: config/tc-ia64.c:4750 +#: config/tc-ia64.c:4751 #, c-format msgid "Unknown psr option `%s'" msgstr "" @@ -9339,210 +9332,210 @@ msgid "Missing section name" msgstr "" -#: config/tc-ia64.c:4793 +#: config/tc-ia64.c:4786 msgid "Comma expected after section name" msgstr "" -#: config/tc-ia64.c:4804 +#: config/tc-ia64.c:4797 msgid "Creating sections with .xdataN/.xrealN/.xstringZ is deprecated." msgstr "" -#: config/tc-ia64.c:4893 +#: config/tc-ia64.c:4886 msgid "Register name expected" msgstr "" -#: config/tc-ia64.c:4906 +#: config/tc-ia64.c:4899 msgid "Register value annotation ignored" msgstr "" -#: config/tc-ia64.c:4945 +#: config/tc-ia64.c:4938 msgid "Directive invalid within a bundle" msgstr "" -#: config/tc-ia64.c:5039 +#: config/tc-ia64.c:5032 msgid "Missing predicate relation type" msgstr "" -#: config/tc-ia64.c:5045 +#: config/tc-ia64.c:5038 msgid "Unrecognized predicate relation type" msgstr "" -#: config/tc-ia64.c:5091 +#: config/tc-ia64.c:5084 msgid "Bad register range" msgstr "" -#: config/tc-ia64.c:5100 config/tc-ia64.c:7684 +#: config/tc-ia64.c:5093 config/tc-ia64.c:7677 msgid "Predicate register expected" msgstr "" -#: config/tc-ia64.c:5105 +#: config/tc-ia64.c:5098 msgid "Duplicate predicate register ignored" msgstr "" -#: config/tc-ia64.c:5121 +#: config/tc-ia64.c:5114 msgid "Predicate source and target required" msgstr "" -#: config/tc-ia64.c:5123 config/tc-ia64.c:5135 +#: config/tc-ia64.c:5116 config/tc-ia64.c:5128 msgid "Use of p0 is not valid in this context" msgstr "" -#: config/tc-ia64.c:5130 +#: config/tc-ia64.c:5123 msgid "At least two PR arguments expected" msgstr "" -#: config/tc-ia64.c:5144 +#: config/tc-ia64.c:5137 msgid "At least one PR argument expected" msgstr "" -#: config/tc-ia64.c:5182 +#: config/tc-ia64.c:5181 #, c-format msgid "Inserting \"%s\" into entry hint table failed: %s" msgstr "" #. FIXME -- need 62-bit relocation type -#: config/tc-ia64.c:5652 +#: config/tc-ia64.c:5645 msgid "62-bit relocation not yet implemented" msgstr "" #. XXX technically, this is wrong: we should not be issuing warning #. messages until we're sure this instruction pattern is going to #. be used! -#: config/tc-ia64.c:5738 +#: config/tc-ia64.c:5731 msgid "lower 16 bits of mask ignored" msgstr "" -#: config/tc-ia64.c:5967 +#: config/tc-ia64.c:5960 msgid "stride must be a multiple of 64; lower 6 bits ignored" msgstr "" -#: config/tc-ia64.c:6085 +#: config/tc-ia64.c:6078 msgid "Expected separator `='" msgstr "" -#: config/tc-ia64.c:6121 +#: config/tc-ia64.c:6114 msgid "Duplicate equal sign (=) in instruction" msgstr "" -#: config/tc-ia64.c:6128 +#: config/tc-ia64.c:6121 #, c-format msgid "Illegal operand separator `%c'" msgstr "" -#: config/tc-ia64.c:6243 +#: config/tc-ia64.c:6236 #, c-format msgid "Operand %u of `%s' should be %s" msgstr "" -#: config/tc-ia64.c:6247 +#: config/tc-ia64.c:6240 msgid "Wrong number of output operands" msgstr "" -#: config/tc-ia64.c:6249 +#: config/tc-ia64.c:6242 msgid "Wrong number of input operands" msgstr "" -#: config/tc-ia64.c:6251 +#: config/tc-ia64.c:6244 msgid "Operand mismatch" msgstr "" -#: config/tc-ia64.c:6333 +#: config/tc-ia64.c:6326 #, c-format msgid "Invalid use of `%c%d' as output operand" msgstr "" -#: config/tc-ia64.c:6336 +#: config/tc-ia64.c:6329 #, c-format msgid "Invalid use of `r%d' as base update address operand" msgstr "" -#: config/tc-ia64.c:6360 +#: config/tc-ia64.c:6353 #, c-format msgid "Invalid duplicate use of `%c%d'" msgstr "" -#: config/tc-ia64.c:6367 +#: config/tc-ia64.c:6360 #, c-format msgid "Invalid simultaneous use of `f%d' and `f%d'" msgstr "" -#: config/tc-ia64.c:6373 +#: config/tc-ia64.c:6366 #, c-format msgid "Dangerous simultaneous use of `f%d' and `f%d'" msgstr "" -#: config/tc-ia64.c:6417 +#: config/tc-ia64.c:6410 msgid "Value truncated to 62 bits" msgstr "" -#: config/tc-ia64.c:6485 +#: config/tc-ia64.c:6478 #, c-format msgid "Bad operand value: %s" msgstr "" #. Give an error if a frag containing code is not aligned to a 16 byte #. boundary. -#: config/tc-ia64.c:6560 config/tc-ia64.h:177 +#: config/tc-ia64.c:6553 config/tc-ia64.h:177 msgid "instruction address is not a multiple of 16" msgstr "" -#: config/tc-ia64.c:6628 +#: config/tc-ia64.c:6621 #, c-format msgid "`%s' must be last in bundle" msgstr "" -#: config/tc-ia64.c:6660 +#: config/tc-ia64.c:6653 #, c-format msgid "" "Internal error: don't know how to force %s to end of instruction group" msgstr "" -#: config/tc-ia64.c:6673 +#: config/tc-ia64.c:6666 #, c-format msgid "`%s' must be last in instruction group" msgstr "" -#: config/tc-ia64.c:6703 +#: config/tc-ia64.c:6696 msgid "Label must be first in a bundle" msgstr "" -#: config/tc-ia64.c:6780 +#: config/tc-ia64.c:6773 msgid "hint in B unit may be treated as nop" msgstr "" -#: config/tc-ia64.c:6791 +#: config/tc-ia64.c:6784 msgid "hint in B unit can't be used" msgstr "" -#: config/tc-ia64.c:6805 +#: config/tc-ia64.c:6798 msgid "emit_one_bundle: unexpected dynamic op" msgstr "" -#: config/tc-ia64.c:6945 +#: config/tc-ia64.c:6938 #, c-format msgid "`%s' does not fit into %s template" msgstr "" -#: config/tc-ia64.c:6960 +#: config/tc-ia64.c:6953 #, c-format msgid "`%s' does not fit into bundle" msgstr "" -#: config/tc-ia64.c:6972 +#: config/tc-ia64.c:6965 #, c-format msgid "`%s' can't go in %s of %s template" msgstr "" -#: config/tc-ia64.c:6978 +#: config/tc-ia64.c:6971 msgid "Missing '}' at end of file" msgstr "" -#: config/tc-ia64.c:7125 +#: config/tc-ia64.c:7118 #, c-format msgid "Unrecognized option '-x%s'" msgstr "" -#: config/tc-ia64.c:7152 +#: config/tc-ia64.c:7145 msgid "" "IA-64 options:\n" " --mconstant-gp\t mark output file as using the constant-GP model\n" @@ -9562,7 +9555,7 @@ msgstr "" #. Note for translators: "automagically" can be translated as "automatically" here. -#: config/tc-ia64.c:7169 +#: config/tc-ia64.c:7162 msgid "" " -xauto\t\t automagically remove dependency violations (default)\n" " -xnone\t\t turn off dependency violation checking\n" @@ -9573,230 +9566,230 @@ "\t\t\t dependency violation checking\n" msgstr "" -#: config/tc-ia64.c:7184 +#: config/tc-ia64.c:7177 msgid "--gstabs is not supported for ia64" msgstr "" -#: config/tc-ia64.c:7417 +#: config/tc-ia64.c:7414 #, c-format msgid "ia64.md_begin: can't hash `%s': %s" msgstr "" -#: config/tc-ia64.c:7481 +#: config/tc-ia64.c:7478 #, c-format msgid "Inserting \"%s\" into constant hash table failed: %s" msgstr "" -#: config/tc-ia64.c:7619 +#: config/tc-ia64.c:7612 msgid "Explicit stops are ignored in auto mode" msgstr "" -#: config/tc-ia64.c:7628 +#: config/tc-ia64.c:7621 msgid "Found '{' when manual bundling is already turned on" msgstr "" -#: config/tc-ia64.c:7641 +#: config/tc-ia64.c:7634 msgid "Found '{' after explicit switch to automatic mode" msgstr "" -#: config/tc-ia64.c:7647 +#: config/tc-ia64.c:7640 msgid "Found '}' when manual bundling is off" msgstr "" -#: config/tc-ia64.c:7674 +#: config/tc-ia64.c:7667 msgid "Expected ')'" msgstr "" -#: config/tc-ia64.c:7679 +#: config/tc-ia64.c:7672 msgid "Qualifying predicate expected" msgstr "" -#: config/tc-ia64.c:7698 +#: config/tc-ia64.c:7691 msgid "Tag must come before qualifying predicate." msgstr "" -#: config/tc-ia64.c:7727 +#: config/tc-ia64.c:7720 msgid "Expected ':'" msgstr "" -#: config/tc-ia64.c:7743 +#: config/tc-ia64.c:7736 msgid "Tag name expected" msgstr "" -#: config/tc-ia64.c:7844 +#: config/tc-ia64.c:7838 msgid "Rotating register index must be a non-negative constant" msgstr "" -#: config/tc-ia64.c:7849 +#: config/tc-ia64.c:7843 #, c-format msgid "Index out of range 0..%u" msgstr "" -#: config/tc-ia64.c:7861 +#: config/tc-ia64.c:7855 msgid "Indirect register index must be a general register" msgstr "" -#: config/tc-ia64.c:7870 +#: config/tc-ia64.c:7864 msgid "Index can only be applied to rotating or indirect registers" msgstr "" -#: config/tc-ia64.c:7906 config/tc-xstormy16.c:145 +#: config/tc-ia64.c:7900 config/tc-xstormy16.c:145 msgid "Expected '('" msgstr "" -#: config/tc-ia64.c:7914 config/tc-pdp11.c:466 config/tc-pdp11.c:530 +#: config/tc-ia64.c:7908 config/tc-pdp11.c:466 config/tc-pdp11.c:530 #: config/tc-pdp11.c:564 config/tc-tilegx.c:1044 config/tc-tilepro.c:932 #: config/tc-xstormy16.c:154 msgid "Missing ')'" msgstr "" -#: config/tc-ia64.c:7932 config/tc-xstormy16.c:161 +#: config/tc-ia64.c:7926 config/tc-xstormy16.c:161 msgid "Not a symbolic expression" msgstr "" -#: config/tc-ia64.c:7937 config/tc-ia64.c:7951 +#: config/tc-ia64.c:7931 config/tc-ia64.c:7945 msgid "Illegal combination of relocation functions" msgstr "" -#: config/tc-ia64.c:8040 +#: config/tc-ia64.c:8034 msgid "No current frame" msgstr "" -#: config/tc-ia64.c:8042 +#: config/tc-ia64.c:8036 #, c-format msgid "Register number out of range 0..%u" msgstr "" -#: config/tc-ia64.c:8081 +#: config/tc-ia64.c:8075 msgid "Standalone `#' is illegal" msgstr "" -#: config/tc-ia64.c:8084 +#: config/tc-ia64.c:8078 msgid "Redundant `#' suffix operators" msgstr "" -#: config/tc-ia64.c:8242 +#: config/tc-ia64.c:8236 #, c-format msgid "Unhandled dependency %s for %s (%s), note %d" msgstr "" -#: config/tc-ia64.c:9555 +#: config/tc-ia64.c:9549 #, c-format msgid "Unrecognized dependency specifier %d\n" msgstr "" -#: config/tc-ia64.c:10425 +#: config/tc-ia64.c:10419 msgid "Only the first path encountering the conflict is reported" msgstr "" -#: config/tc-ia64.c:10427 +#: config/tc-ia64.c:10421 msgid "This is the location of the conflicting usage" msgstr "" -#: config/tc-ia64.c:10689 +#: config/tc-ia64.c:10683 #, c-format msgid "Unknown opcode `%s'" msgstr "" -#: config/tc-ia64.c:10767 +#: config/tc-ia64.c:10761 #, c-format msgid "AR %d can only be accessed by %c-unit" msgstr "" -#: config/tc-ia64.c:10779 +#: config/tc-ia64.c:10773 msgid "hint.b may be treated as nop" msgstr "" -#: config/tc-ia64.c:10782 +#: config/tc-ia64.c:10776 msgid "hint.b shouldn't be used" msgstr "" -#: config/tc-ia64.c:10821 +#: config/tc-ia64.c:10815 #, c-format msgid "`%s' cannot be predicated" msgstr "" -#: config/tc-ia64.c:10893 +#: config/tc-ia64.c:10888 msgid "Closing bracket missing" msgstr "" -#: config/tc-ia64.c:10902 +#: config/tc-ia64.c:10897 msgid "Index must be a general register" msgstr "" -#: config/tc-ia64.c:11067 +#: config/tc-ia64.c:11062 #, c-format msgid "Unsupported fixup size %d" msgstr "" #. This should be an error, but since previously there wasn't any #. diagnostic here, don't make it fail because of this for now. -#: config/tc-ia64.c:11339 +#: config/tc-ia64.c:11334 #, c-format msgid "Cannot express %s%d%s relocation" msgstr "" -#: config/tc-ia64.c:11358 +#: config/tc-ia64.c:11353 msgid "No addend allowed in @fptr() relocation" msgstr "" -#: config/tc-ia64.c:11397 +#: config/tc-ia64.c:11392 msgid "integer operand out of range" msgstr "" -#: config/tc-ia64.c:11464 +#: config/tc-ia64.c:11459 #, c-format msgid "%s must have a constant value" msgstr "" -#: config/tc-ia64.c:11484 +#: config/tc-ia64.c:11479 msgid "cannot resolve @slotcount parameter" msgstr "" -#: config/tc-ia64.c:11517 +#: config/tc-ia64.c:11512 msgid "invalid @slotcount value" msgstr "" -#: config/tc-ia64.c:11554 config/tc-z8k.c:1388 +#: config/tc-ia64.c:11549 config/tc-z8k.c:1388 #, c-format msgid "Cannot represent %s relocation in object file" msgstr "" -#: config/tc-ia64.c:11663 +#: config/tc-ia64.c:11658 msgid "Can't add stop bit to mark end of instruction group" msgstr "" -#: config/tc-ia64.c:11771 read.c:2665 read.c:3304 read.c:3783 stabs.c:468 +#: config/tc-ia64.c:11766 read.c:2665 read.c:3304 read.c:3871 stabs.c:468 #, c-format msgid "expected comma after \"%s\"" msgstr "" -#: config/tc-ia64.c:11814 +#: config/tc-ia64.c:11809 #, c-format msgid "`%s' is already the alias of %s `%s'" msgstr "" -#: config/tc-ia64.c:11826 +#: config/tc-ia64.c:11821 #, c-format msgid "%s `%s' already has an alias `%s'" msgstr "" -#: config/tc-ia64.c:11843 +#: config/tc-ia64.c:11838 #, c-format msgid "inserting \"%s\" into %s alias hash table failed: %s" msgstr "" -#: config/tc-ia64.c:11851 +#: config/tc-ia64.c:11846 #, c-format msgid "inserting \"%s\" into %s name hash table failed: %s" msgstr "" -#: config/tc-ia64.c:11860 +#: config/tc-ia64.c:11855 #, c-format msgid "symbol `%s' aliased to `%s' is not used" msgstr "" -#: config/tc-ia64.c:11886 +#: config/tc-ia64.c:11881 #, c-format msgid "section `%s' aliased to `%s' is not used" msgstr "" @@ -9844,7 +9837,7 @@ msgid "Unmatched high relocation" msgstr "" -#: config/tc-iq2000.c:831 config/tc-mips.c:19783 config/tc-score.c:5804 +#: config/tc-iq2000.c:831 config/tc-mips.c:19776 config/tc-score.c:5804 msgid ".end not in text section" msgstr "" @@ -9856,7 +9849,7 @@ msgid ".end symbol does not match .ent symbol." msgstr "" -#: config/tc-iq2000.c:847 config/tc-mips.c:19803 config/tc-score.c:5820 +#: config/tc-iq2000.c:847 config/tc-mips.c:19796 config/tc-score.c:5820 msgid ".end directive missing or unknown symbol" msgstr "" @@ -9864,7 +9857,7 @@ msgid "Expected simple number." msgstr "" -#: config/tc-iq2000.c:894 config/tc-mips.c:19708 config/tc-score.c:5670 +#: config/tc-iq2000.c:894 config/tc-mips.c:19701 config/tc-score.c:5670 #, c-format msgid " *input_line_pointer == '%c' 0x%02x\n" msgstr "" @@ -10113,8 +10106,8 @@ msgid ".SCOMMon length (%ld.) <0! Ignored." msgstr "" -#: config/tc-m32r.c:1514 config/tc-microblaze.c:218 config/tc-ppc.c:2366 -#: config/tc-ppc.c:4332 config/tc-ppc.c:4374 +#: config/tc-m32r.c:1514 config/tc-microblaze.c:218 config/tc-ppc.c:2379 +#: config/tc-ppc.c:4417 config/tc-ppc.c:4472 msgid "ignoring bad alignment" msgstr "" @@ -10698,7 +10691,7 @@ msgid "Internal Error: Can't find %s in hash table" msgstr "" -#: config/tc-m68k.c:4670 config/tc-m68k.c:4709 +#: config/tc-m68k.c:4587 config/tc-m68k.c:4626 #, c-format msgid "Internal Error: Can't hash %s: %s" msgstr "" @@ -10963,7 +10956,7 @@ msgid "Not a defined coldfire architecture" msgstr "" -#: config/tc-m68k.c:7923 read.c:4673 +#: config/tc-m68k.c:7923 read.c:4766 #, c-format msgid "%s relocations do not fit in %u byte" msgid_plural "%s relocations do not fit in %u bytes" @@ -11103,12 +11096,12 @@ msgid "ignoring operands: %s " msgstr "" -#: config/tc-mcore.c:1670 +#: config/tc-mcore.c:1673 #, c-format msgid "unrecognised cpu type '%s'" msgstr "" -#: config/tc-mcore.c:1688 +#: config/tc-mcore.c:1691 #, c-format msgid "" "MCORE specific options:\n" @@ -11119,47 +11112,47 @@ " -EL assemble for a little endian system\n" msgstr "" -#: config/tc-mcore.c:1706 config/tc-microblaze.c:1871 +#: config/tc-mcore.c:1709 config/tc-microblaze.c:1871 msgid "failed sanity check: short_jump" msgstr "" -#: config/tc-mcore.c:1716 config/tc-microblaze.c:1881 +#: config/tc-mcore.c:1719 config/tc-microblaze.c:1881 msgid "failed sanity check: long_jump" msgstr "" -#: config/tc-mcore.c:1742 +#: config/tc-mcore.c:1745 #, c-format msgid "odd displacement at %x" msgstr "" -#: config/tc-mcore.c:1951 +#: config/tc-mcore.c:1954 #, c-format msgid "odd distance branch (0x%lx byte)" msgid_plural "odd distance branch (0x%lx bytes)" msgstr[0] "" msgstr[1] "" -#: config/tc-mcore.c:1958 +#: config/tc-mcore.c:1961 #, c-format msgid "pcrel for branch to %s too far (0x%lx)" msgstr "" -#: config/tc-mcore.c:1978 +#: config/tc-mcore.c:1981 #, c-format msgid "pcrel for lrw/jmpi/jsri to %s too far (0x%lx)" msgstr "" -#: config/tc-mcore.c:1990 +#: config/tc-mcore.c:1993 #, c-format msgid "pcrel for loopt too far (0x%lx)" msgstr "" -#: config/tc-mcore.c:2186 config/tc-microblaze.c:2471 config/tc-tic30.c:1364 +#: config/tc-mcore.c:2189 config/tc-microblaze.c:2471 config/tc-tic30.c:1364 #, c-format msgid "Can not do %d byte %srelocation" msgstr "" -#: config/tc-mcore.c:2188 config/tc-microblaze.c:2473 config/tc-tic30.c:1365 +#: config/tc-mcore.c:2191 config/tc-microblaze.c:2473 config/tc-tic30.c:1365 msgid "pc-relative " msgstr "" @@ -11814,7 +11807,7 @@ msgid "the `%s' extension requires 64-bit FPRs" msgstr "" -#: config/tc-mips.c:3048 config/tc-mips.c:16640 +#: config/tc-mips.c:3048 config/tc-mips.c:16633 #, c-format msgid "unrecognized register name `%s'" msgstr "" @@ -11878,7 +11871,7 @@ msgid "broken assembler, no assembly attempted" msgstr "" -#: config/tc-mips.c:3633 config/tc-mips.c:3662 +#: config/tc-mips.c:3741 config/tc-mips.c:3770 #, c-format msgid "internal: can't hash `%s': %s" msgstr "" @@ -11961,7 +11954,7 @@ msgid "trap exception not supported at ISA 1" msgstr "" -#: config/tc-mips.c:4167 config/tc-mips.c:17523 +#: config/tc-mips.c:4167 config/tc-mips.c:17516 #, c-format msgid "`%s' does not support legacy NaN" msgstr "" @@ -11981,7 +11974,7 @@ msgid "operand %d must be constant" msgstr "" -#: config/tc-mips.c:4970 read.c:4458 read.c:5254 write.c:263 write.c:1031 +#: config/tc-mips.c:4970 read.c:4546 read.c:5321 write.c:254 write.c:1031 msgid "register value used as expression" msgstr "" @@ -12069,7 +12062,7 @@ #: config/tc-mips.c:7553 config/tc-mips.c:7573 config/tc-mips.c:7590 #: config/tc-mips.c:9140 config/tc-mips.c:15792 config/tc-mips.c:15799 -#: config/tc-mips.c:16192 config/tc-mips.c:19038 +#: config/tc-mips.c:16192 config/tc-mips.c:19031 #, c-format msgid "branch to misaligned address (0x%lx)" msgstr "" @@ -12096,7 +12089,7 @@ msgid "the source register must not be $31" msgstr "" -#: config/tc-mips.c:8559 config/tc-mips.c:14532 config/tc-mips.c:19185 +#: config/tc-mips.c:8559 config/tc-mips.c:14532 config/tc-mips.c:19178 msgid "invalid unextended operand value" msgstr "" @@ -12122,12 +12115,12 @@ msgid "unrecognized extended version of MIPS16 opcode" msgstr "" -#: config/tc-mips.c:8868 config/tc-mips.c:19056 +#: config/tc-mips.c:8868 config/tc-mips.c:19049 msgid "" "macro instruction expanded into multiple instructions in a branch delay slot" msgstr "" -#: config/tc-mips.c:8871 config/tc-mips.c:19064 +#: config/tc-mips.c:8871 config/tc-mips.c:19057 msgid "macro instruction expanded into multiple instructions" msgstr "" @@ -12189,7 +12182,7 @@ msgid "la used to load 64-bit address; recommend using dla instead" msgstr "" -#: config/tc-mips.c:11105 config/tc-riscv.c:1601 +#: config/tc-mips.c:11105 config/tc-riscv.c:1768 msgid "offset too large" msgstr "" @@ -12299,7 +12292,7 @@ msgid "-march=%s is not compatible with the selected ABI" msgstr "" -#: config/tc-mips.c:15796 config/tc-mips.c:16186 config/tc-mips.c:19035 +#: config/tc-mips.c:15796 config/tc-mips.c:16186 config/tc-mips.c:19028 msgid "branch to a symbol in another ISA mode" msgstr "" @@ -12312,7 +12305,7 @@ msgid "PC-relative reference to a different section" msgstr "" -#: config/tc-mips.c:15912 config/tc-riscv.c:3023 +#: config/tc-mips.c:15912 config/tc-riscv.c:3498 msgid "TLS relocation against a constant" msgstr "" @@ -12356,161 +12349,161 @@ msgid "alignment negative, 0 assumed" msgstr "" -#: config/tc-mips.c:16520 +#: config/tc-mips.c:16513 #, c-format msgid "%s: no such section" msgstr "" -#: config/tc-mips.c:16576 +#: config/tc-mips.c:16569 #, c-format msgid ".option pic%d not supported" msgstr "" -#: config/tc-mips.c:16578 +#: config/tc-mips.c:16571 #, c-format msgid ".option pic%d not supported in VxWorks PIC mode" msgstr "" -#: config/tc-mips.c:16590 config/tc-mips.c:16930 +#: config/tc-mips.c:16583 config/tc-mips.c:16923 msgid "-G may not be used with SVR4 PIC code" msgstr "" -#: config/tc-mips.c:16596 +#: config/tc-mips.c:16589 #, c-format msgid "unrecognized option \"%s\"" msgstr "" -#: config/tc-mips.c:16702 +#: config/tc-mips.c:16695 #, c-format msgid "unknown architecture %s" msgstr "" -#: config/tc-mips.c:16717 config/tc-mips.c:16881 +#: config/tc-mips.c:16710 config/tc-mips.c:16874 #, c-format msgid "unknown ISA level %s" msgstr "" -#: config/tc-mips.c:16727 +#: config/tc-mips.c:16720 #, c-format msgid "unknown ISA or architecture %s" msgstr "" -#: config/tc-mips.c:16786 +#: config/tc-mips.c:16779 msgid "`noreorder' must be set before `nomacro'" msgstr "" -#: config/tc-mips.c:16816 +#: config/tc-mips.c:16809 msgid ".set pop with no .set push" msgstr "" -#: config/tc-mips.c:16835 +#: config/tc-mips.c:16828 #, c-format msgid "tried to set unrecognized symbol: %s\n" msgstr "" -#: config/tc-mips.c:16908 +#: config/tc-mips.c:16901 #, c-format msgid ".module used with unrecognized symbol: %s\n" msgstr "" -#: config/tc-mips.c:16914 +#: config/tc-mips.c:16907 msgid ".module is not permitted after generating code" msgstr "" -#: config/tc-mips.c:16974 config/tc-mips.c:17053 config/tc-mips.c:17157 -#: config/tc-mips.c:17187 config/tc-mips.c:17236 +#: config/tc-mips.c:16967 config/tc-mips.c:17046 config/tc-mips.c:17150 +#: config/tc-mips.c:17180 config/tc-mips.c:17229 #, c-format msgid "%s not supported in MIPS16 mode" msgstr "" -#: config/tc-mips.c:16981 +#: config/tc-mips.c:16974 msgid ".cpload not in noreorder section" msgstr "" -#: config/tc-mips.c:17062 config/tc-mips.c:17081 +#: config/tc-mips.c:17055 config/tc-mips.c:17074 msgid "missing argument separator ',' for .cpsetup" msgstr "" -#: config/tc-mips.c:17279 config/tc-riscv.c:3344 +#: config/tc-mips.c:17272 config/tc-riscv.c:3833 #, c-format msgid "unsupported use of %s" msgstr "" -#: config/tc-mips.c:17370 +#: config/tc-mips.c:17363 msgid "unsupported use of .gpword" msgstr "" -#: config/tc-mips.c:17408 +#: config/tc-mips.c:17401 msgid "unsupported use of .gpdword" msgstr "" -#: config/tc-mips.c:17440 +#: config/tc-mips.c:17433 msgid "unsupported use of .ehword" msgstr "" -#: config/tc-mips.c:17527 +#: config/tc-mips.c:17520 msgid "bad .nan directive" msgstr "" -#: config/tc-mips.c:17576 +#: config/tc-mips.c:17569 #, c-format msgid "ignoring attempt to redefine symbol %s" msgstr "" -#: config/tc-mips.c:17591 ecoff.c:3359 +#: config/tc-mips.c:17584 ecoff.c:3359 msgid "bad .weakext directive" msgstr "" -#: config/tc-mips.c:18560 config/tc-mips.c:18837 +#: config/tc-mips.c:18553 config/tc-mips.c:18830 msgid "relaxed out-of-range branch into a jump" msgstr "" -#: config/tc-mips.c:19060 +#: config/tc-mips.c:19053 msgid "extended instruction in a branch delay slot" msgstr "" -#: config/tc-mips.c:19174 config/tc-xtensa.c:1704 config/tc-xtensa.c:1982 +#: config/tc-mips.c:19167 config/tc-xtensa.c:1704 config/tc-xtensa.c:1982 msgid "unsupported relocation" msgstr "" -#: config/tc-mips.c:19682 config/tc-score.c:5644 +#: config/tc-mips.c:19675 config/tc-score.c:5644 msgid "expected simple number" msgstr "" -#: config/tc-mips.c:19710 config/tc-score.c:5671 +#: config/tc-mips.c:19703 config/tc-score.c:5671 msgid "invalid number" msgstr "" -#: config/tc-mips.c:19787 ecoff.c:2988 +#: config/tc-mips.c:19780 ecoff.c:2988 msgid ".end directive without a preceding .ent directive" msgstr "" -#: config/tc-mips.c:19796 +#: config/tc-mips.c:19789 msgid ".end symbol does not match .ent symbol" msgstr "" -#: config/tc-mips.c:19873 +#: config/tc-mips.c:19866 msgid ".ent or .aent not in text section" msgstr "" -#: config/tc-mips.c:19876 config/tc-score.c:5703 +#: config/tc-mips.c:19869 config/tc-score.c:5703 msgid "missing .end" msgstr "" -#: config/tc-mips.c:19959 +#: config/tc-mips.c:19952 msgid ".mask/.fmask outside of .ent" msgstr "" -#: config/tc-mips.c:19966 +#: config/tc-mips.c:19959 msgid "bad .mask/.fmask directive" msgstr "" -#: config/tc-mips.c:20269 +#: config/tc-mips.c:20262 #, c-format msgid "bad value (%s) for %s" msgstr "" -#: config/tc-mips.c:20333 +#: config/tc-mips.c:20326 #, c-format msgid "" "MIPS options:\n" @@ -12521,7 +12514,7 @@ "\t\t\timplicitly with the gp register [default 8]\n" msgstr "" -#: config/tc-mips.c:20340 +#: config/tc-mips.c:20333 #, c-format msgid "" "-mips1\t\t\tgenerate MIPS ISA I instructions\n" @@ -12542,7 +12535,7 @@ "-march=CPU/-mtune=CPU\tgenerate code/schedule for CPU, where CPU is one of:\n" msgstr "" -#: config/tc-mips.c:20365 +#: config/tc-mips.c:20358 #, c-format msgid "" "-mCPU\t\t\tequivalent to -march=CPU -mtune=CPU. Deprecated.\n" @@ -12550,105 +12543,105 @@ "\t\t\tFor -mCPU and -no-mCPU, CPU must be one of:\n" msgstr "" -#: config/tc-mips.c:20378 +#: config/tc-mips.c:20371 #, c-format msgid "" "-mips16\t\t\tgenerate mips16 instructions\n" "-no-mips16\t\tdo not generate mips16 instructions\n" msgstr "" -#: config/tc-mips.c:20381 +#: config/tc-mips.c:20374 #, c-format msgid "" "-mmips16e2\t\tgenerate MIPS16e2 instructions\n" "-mno-mips16e2\t\tdo not generate MIPS16e2 instructions\n" msgstr "" -#: config/tc-mips.c:20384 +#: config/tc-mips.c:20377 #, c-format msgid "" "-mmicromips\t\tgenerate microMIPS instructions\n" "-mno-micromips\t\tdo not generate microMIPS instructions\n" msgstr "" -#: config/tc-mips.c:20387 +#: config/tc-mips.c:20380 #, c-format msgid "" "-msmartmips\t\tgenerate smartmips instructions\n" "-mno-smartmips\t\tdo not generate smartmips instructions\n" msgstr "" -#: config/tc-mips.c:20390 +#: config/tc-mips.c:20383 #, c-format msgid "" "-mdsp\t\t\tgenerate DSP instructions\n" "-mno-dsp\t\tdo not generate DSP instructions\n" msgstr "" -#: config/tc-mips.c:20393 +#: config/tc-mips.c:20386 #, c-format msgid "" "-mdspr2\t\t\tgenerate DSP R2 instructions\n" "-mno-dspr2\t\tdo not generate DSP R2 instructions\n" msgstr "" -#: config/tc-mips.c:20396 +#: config/tc-mips.c:20389 #, c-format msgid "" "-mdspr3\t\t\tgenerate DSP R3 instructions\n" "-mno-dspr3\t\tdo not generate DSP R3 instructions\n" msgstr "" -#: config/tc-mips.c:20399 +#: config/tc-mips.c:20392 #, c-format msgid "" "-mmt\t\t\tgenerate MT instructions\n" "-mno-mt\t\t\tdo not generate MT instructions\n" msgstr "" -#: config/tc-mips.c:20402 +#: config/tc-mips.c:20395 #, c-format msgid "" "-mmcu\t\t\tgenerate MCU instructions\n" "-mno-mcu\t\tdo not generate MCU instructions\n" msgstr "" -#: config/tc-mips.c:20405 +#: config/tc-mips.c:20398 #, c-format msgid "" "-mmsa\t\t\tgenerate MSA instructions\n" "-mno-msa\t\tdo not generate MSA instructions\n" msgstr "" -#: config/tc-mips.c:20408 +#: config/tc-mips.c:20401 #, c-format msgid "" "-mxpa\t\t\tgenerate eXtended Physical Address (XPA) instructions\n" "-mno-xpa\t\tdo not generate eXtended Physical Address (XPA) instructions\n" msgstr "" -#: config/tc-mips.c:20411 +#: config/tc-mips.c:20404 #, c-format msgid "" "-mvirt\t\t\tgenerate Virtualization instructions\n" "-mno-virt\t\tdo not generate Virtualization instructions\n" msgstr "" -#: config/tc-mips.c:20414 +#: config/tc-mips.c:20407 #, c-format msgid "" "-mcrc\t\t\tgenerate CRC instructions\n" "-mno-crc\t\tdo not generate CRC instructions\n" msgstr "" -#: config/tc-mips.c:20417 +#: config/tc-mips.c:20410 #, c-format msgid "" "-mginv\t\t\tgenerate Global INValidate (GINV) instructions\n" "-mno-ginv\t\tdo not generate Global INValidate instructions\n" msgstr "" -#: config/tc-mips.c:20420 +#: config/tc-mips.c:20413 #, c-format msgid "" "-mloongson-mmi\t\tgenerate Loongson MultiMedia extensions Instructions (MMI) " @@ -12657,7 +12650,7 @@ "Instructions\n" msgstr "" -#: config/tc-mips.c:20423 +#: config/tc-mips.c:20416 #, c-format msgid "" "-mloongson-cam\t\tgenerate Loongson Content Address Memory (CAM) " @@ -12666,35 +12659,35 @@ "Instructions\n" msgstr "" -#: config/tc-mips.c:20426 +#: config/tc-mips.c:20419 #, c-format msgid "" "-mloongson-ext\t\tgenerate Loongson EXTensions (EXT) instructions\n" "-mno-loongson-ext\tdo not generate Loongson EXTensions Instructions\n" msgstr "" -#: config/tc-mips.c:20429 +#: config/tc-mips.c:20422 #, c-format msgid "" "-mloongson-ext2\t\tgenerate Loongson EXTensions R2 (EXT2) instructions\n" "-mno-loongson-ext2\tdo not generate Loongson EXTensions R2 Instructions\n" msgstr "" -#: config/tc-mips.c:20432 +#: config/tc-mips.c:20425 #, c-format msgid "" "-minsn32\t\tonly generate 32-bit microMIPS instructions\n" "-mno-insn32\t\tgenerate all microMIPS instructions\n" msgstr "" -#: config/tc-mips.c:20436 +#: config/tc-mips.c:20429 #, c-format msgid "" "-mfix-loongson3-llsc\twork around Loongson3 LL/SC errata, default\n" "-mno-fix-loongson3-llsc\tdisable work around Loongson3 LL/SC errata\n" msgstr "" -#: config/tc-mips.c:20440 +#: config/tc-mips.c:20433 #, c-format msgid "" "-mfix-loongson3-llsc\twork around Loongson3 LL/SC errata\n" @@ -12702,7 +12695,7 @@ "default\n" msgstr "" -#: config/tc-mips.c:20444 +#: config/tc-mips.c:20437 #, c-format msgid "" "-mfix-loongson2f-jump\twork around Loongson2F JUMP instructions\n" @@ -12724,7 +12717,7 @@ "--break, --no-trap\tbreak exception on div by 0 and mult overflow\n" msgstr "" -#: config/tc-mips.c:20462 +#: config/tc-mips.c:20455 #, c-format msgid "" "-mhard-float\t\tallow floating-point instructions\n" @@ -12739,7 +12732,7 @@ "-mnan=ENCODING\t\tselect an IEEE 754 NaN encoding convention, either of:\n" msgstr "" -#: config/tc-mips.c:20480 +#: config/tc-mips.c:20473 #, c-format msgid "" "-KPIC, -call_shared\tgenerate SVR4 position independent code\n" @@ -12753,26 +12746,26 @@ "-mabi=ABI\t\tcreate ABI conformant object file for:\n" msgstr "" -#: config/tc-mips.c:20501 +#: config/tc-mips.c:20494 #, c-format msgid "-32\t\t\tcreate o32 ABI object file%s\n" msgstr "" -#: config/tc-mips.c:20503 config/tc-mips.c:20506 config/tc-mips.c:20509 +#: config/tc-mips.c:20496 config/tc-mips.c:20499 config/tc-mips.c:20502 msgid " (default)" msgstr "" -#: config/tc-mips.c:20504 +#: config/tc-mips.c:20497 #, c-format msgid "-n32\t\t\tcreate n32 ABI object file%s\n" msgstr "" -#: config/tc-mips.c:20507 +#: config/tc-mips.c:20500 #, c-format msgid "-64\t\t\tcreate 64 ABI object file%s\n" msgstr "" -#: config/tc-mips.c:20589 +#: config/tc-mips.c:20582 msgid "missing .end at end of assembly" msgstr "" @@ -12848,8 +12841,8 @@ msgid "specified location wasn't TETRA-aligned" msgstr "" -#: config/tc-mmix.c:973 config/tc-mmix.c:988 config/tc-mmix.c:4225 -#: config/tc-mmix.c:4241 +#: config/tc-mmix.c:973 config/tc-mmix.c:988 config/tc-mmix.c:4224 +#: config/tc-mmix.c:4240 msgid "unaligned data at an absolute location is not supported" msgstr "" @@ -12975,48 +12968,48 @@ msgid "GREG expression too complicated" msgstr "" -#: config/tc-mmix.c:3761 +#: config/tc-mmix.c:3760 msgid "internal: GREG expression not resolved to section" msgstr "" -#: config/tc-mmix.c:3810 +#: config/tc-mmix.c:3809 msgid "register section has contents\n" msgstr "" -#: config/tc-mmix.c:3936 +#: config/tc-mmix.c:3935 msgid "section change from within a BSPEC/ESPEC pair is not supported" msgstr "" -#: config/tc-mmix.c:3957 +#: config/tc-mmix.c:3956 msgid "directive LOC from within a BSPEC/ESPEC pair is not supported" msgstr "" -#: config/tc-mmix.c:3967 +#: config/tc-mmix.c:3966 msgid "invalid LOC expression" msgstr "" -#: config/tc-mmix.c:4012 config/tc-mmix.c:4039 +#: config/tc-mmix.c:4011 config/tc-mmix.c:4038 msgid "LOC expression stepping backwards is not supported" msgstr "" #. We will only get here in rare cases involving #NO_APP, #. where the unterminated string is not recognized by the #. preformatting pass. -#: config/tc-mmix.c:4148 config/tc-mmix.c:4306 config/tc-z80.c:3190 +#: config/tc-mmix.c:4147 config/tc-mmix.c:4305 config/tc-z80.c:3190 msgid "unterminated string" msgstr "" -#: config/tc-mmix.c:4165 +#: config/tc-mmix.c:4164 msgid "BYTE expression not a pure number" msgstr "" #. Note that mmixal does not allow negative numbers in #. BYTE sequences, so neither should we. -#: config/tc-mmix.c:4174 +#: config/tc-mmix.c:4173 msgid "BYTE expression not in the range 0..255" msgstr "" -#: config/tc-mmix.c:4223 config/tc-mmix.c:4239 +#: config/tc-mmix.c:4222 config/tc-mmix.c:4238 msgid "data item with alignment larger than location" msgstr "" @@ -13033,15 +13026,15 @@ "none yet\n" msgstr "" -#: config/tc-mn10200.c:896 config/tc-mn10300.c:1253 config/tc-s390.c:1691 -#: config/tc-v850.c:2328 +#: config/tc-mn10200.c:889 config/tc-mn10300.c:1253 config/tc-s390.c:1691 +#: config/tc-v850.c:2325 #, c-format msgid "Unrecognized opcode: `%s'" msgstr "" #. xgettext:c-format. -#: config/tc-mn10200.c:1139 config/tc-mn10300.c:1821 config/tc-ppc.c:3969 -#: config/tc-s390.c:1604 config/tc-v850.c:3043 +#: config/tc-mn10200.c:1132 config/tc-mn10300.c:1821 config/tc-ppc.c:3988 +#: config/tc-s390.c:1604 config/tc-v850.c:3040 #, c-format msgid "junk at end of line: `%s'" msgstr "行末にゴミがあります: `%s'" @@ -13275,7 +13268,7 @@ " -mn and/or -my are required for this to have any effect\n" msgstr "" -#: config/tc-msp430.c:1624 +#: config/tc-msp430.c:1798 #, c-format msgid " -md - Force copying of data from ROM to RAM at startup\n" msgstr "" @@ -13826,7 +13819,7 @@ msgid "needs @GOT or @GOTOFF. %s" msgstr "" -#: config/tc-nds32.c:3001 +#: config/tc-nds32.c:3445 #, c-format msgid "Duplicated pseudo-opcode %s." msgstr "" @@ -14022,11 +14015,11 @@ msgstr "" #. Should never here. -#: config/tc-nds32.c:7656 +#: config/tc-nds32.c:7617 msgid "Used FPU instructions requires enabling FPU extension" msgstr "" -#: config/tc-nds32.c:7853 +#: config/tc-nds32.c:7813 #, c-format msgid "Internal error: Unknown fixup type %d (`%s')" msgstr "" @@ -14111,12 +14104,12 @@ msgid "internal error: broken opcode descriptor for `%s %s'\n" msgstr "" -#: config/tc-nios2.c:1480 config/tc-pru.c:863 +#: config/tc-nios2.c:1480 config/tc-pru.c:862 msgid "can't create relocation" msgstr "" -#: config/tc-nios2.c:1511 config/tc-pru.c:997 config/tc-pru.c:1017 -#: config/tc-pru.c:1044 config/tc-pru.c:1063 config/tc-pru.c:1077 +#: config/tc-nios2.c:1511 config/tc-pru.c:996 config/tc-pru.c:1016 +#: config/tc-pru.c:1043 config/tc-pru.c:1062 config/tc-pru.c:1076 #, c-format msgid "unknown register %s" msgstr "" @@ -14174,18 +14167,18 @@ msgid "Invalid constant operand %s" msgstr "" -#: config/tc-nios2.c:2990 config/tc-nios2.c:3014 config/tc-pru.c:1319 -#: config/tc-pru.c:1344 config/tc-pru.c:1364 +#: config/tc-nios2.c:2990 config/tc-nios2.c:3014 config/tc-pru.c:1318 +#: config/tc-pru.c:1343 config/tc-pru.c:1363 #, c-format msgid "badly formed expression near %s" msgstr "" #: config/tc-arc.c:2083 config/tc-nios2.c:3103 config/tc-nios2.c:3130 -#: config/tc-pru.c:1413 config/tc-pru.c:1438 config/tc-xtensa.c:2156 +#: config/tc-pru.c:1412 config/tc-pru.c:1437 config/tc-xtensa.c:2156 msgid "too many arguments" msgstr "" -#: config/tc-nios2.c:3119 config/tc-pru.c:1390 +#: config/tc-nios2.c:3119 config/tc-pru.c:1389 #, c-format msgid "expecting %c near %s" msgstr "" @@ -14206,12 +14199,12 @@ msgstr "" #. Unrecognised instruction - error. -#: config/tc-nios2.c:3747 config/tc-pru.c:1717 +#: config/tc-nios2.c:3747 config/tc-pru.c:1716 #, c-format msgid "unrecognised instruction %s" msgstr "" -#: config/tc-nios2.c:3867 config/tc-pru.c:1773 +#: config/tc-nios2.c:3867 config/tc-pru.c:1772 #, c-format msgid "can't represent relocation type %s" msgstr "" @@ -14225,12 +14218,12 @@ msgid "Illegal operands: %%tls_ldo in %d-byte data field" msgstr "" -#: config/tc-nios2.c:4040 config/tc-nios2.c:4058 config/tc-nios2.c:4065 +#: config/tc-nios2.c:4038 config/tc-nios2.c:4056 config/tc-nios2.c:4063 #, c-format msgid "Illegal operands: %%tls_ldo requires arguments in ()" msgstr "" -#: config/tc-nios2.c:4072 +#: config/tc-nios2.c:4070 #, c-format msgid "Illegal operands: garbage after %%tls_ldo()" msgstr "" @@ -14517,701 +14510,702 @@ msgid "pcrel too far" msgstr "" -#: config/tc-ppc.c:949 config/tc-ppc.c:957 config/tc-ppc.c:3456 +#: config/tc-ppc.c:961 config/tc-ppc.c:969 config/tc-ppc.c:3475 msgid "invalid register expression" msgstr "" -#: config/tc-ppc.c:1122 config/tc-ppc.c:1180 config/tc-ppc.c:1228 +#: config/tc-ppc.c:1131 config/tc-ppc.c:1189 config/tc-ppc.c:1237 msgid "the use of -mvle requires big endian." msgstr "" -#: config/tc-ppc.c:1160 config/tc-ppc.c:1182 +#: config/tc-ppc.c:1169 config/tc-ppc.c:1191 msgid "the use of -mvle requires -a32." msgstr "" -#: config/tc-ppc.c:1162 +#: config/tc-ppc.c:1171 #, c-format msgid "%s unsupported" msgstr "" -#: config/tc-ppc.c:1255 config/tc-s390.c:435 config/tc-s390.c:442 +#: config/tc-ppc.c:1264 config/tc-s390.c:435 config/tc-s390.c:442 #, c-format msgid "invalid switch -m%s" msgstr "" -#: config/tc-ppc.c:1286 +#: config/tc-ppc.c:1295 msgid "--nops needs a numeric argument" msgstr "" -#: config/tc-ppc.c:1322 +#: config/tc-ppc.c:1331 #, c-format msgid "PowerPC options:\n" msgstr "" -#: config/tc-ppc.c:1324 +#: config/tc-ppc.c:1333 #, c-format msgid "-a32 generate ELF32/XCOFF32\n" msgstr "" -#: config/tc-ppc.c:1327 +#: config/tc-ppc.c:1336 #, c-format msgid "-a64 generate ELF64/XCOFF64\n" msgstr "" -#: config/tc-ppc.c:1329 +#: config/tc-ppc.c:1338 #, c-format msgid "-u ignored\n" msgstr "" -#: config/tc-ppc.c:1331 +#: config/tc-ppc.c:1340 #, c-format msgid "-mpwrx, -mpwr2 generate code for POWER/2 (RIOS2)\n" msgstr "" -#: config/tc-ppc.c:1333 +#: config/tc-ppc.c:1342 #, c-format msgid "-mpwr generate code for POWER (RIOS1)\n" msgstr "" -#: config/tc-ppc.c:1335 +#: config/tc-ppc.c:1344 #, c-format msgid "-m601 generate code for PowerPC 601\n" msgstr "" -#: config/tc-ppc.c:1337 +#: config/tc-ppc.c:1346 #, c-format msgid "" "-mppc, -mppc32, -m603, -m604\n" " generate code for PowerPC 603/604\n" msgstr "" -#: config/tc-ppc.c:1340 +#: config/tc-ppc.c:1349 #, c-format msgid "-m403 generate code for PowerPC 403\n" msgstr "" -#: config/tc-ppc.c:1342 +#: config/tc-ppc.c:1351 #, c-format msgid "-m405 generate code for PowerPC 405\n" msgstr "" -#: config/tc-ppc.c:1344 +#: config/tc-ppc.c:1353 #, c-format msgid "-m440 generate code for PowerPC 440\n" msgstr "" -#: config/tc-ppc.c:1346 +#: config/tc-ppc.c:1355 #, c-format msgid "-m464 generate code for PowerPC 464\n" msgstr "" -#: config/tc-ppc.c:1348 +#: config/tc-ppc.c:1357 #, c-format msgid "-m476 generate code for PowerPC 476\n" msgstr "" -#: config/tc-ppc.c:1350 +#: config/tc-ppc.c:1359 #, c-format msgid "" "-m7400, -m7410, -m7450, -m7455\n" " generate code for PowerPC 7400/7410/7450/7455\n" msgstr "" -#: config/tc-ppc.c:1353 +#: config/tc-ppc.c:1362 #, c-format msgid "" "-m750cl, -mgekko, -mbroadway\n" " generate code for PowerPC 750cl/Gekko/Broadway\n" msgstr "" -#: config/tc-ppc.c:1356 +#: config/tc-ppc.c:1365 #, c-format msgid "-m821, -m850, -m860 generate code for PowerPC 821/850/860\n" msgstr "" -#: config/tc-ppc.c:1358 +#: config/tc-ppc.c:1367 #, c-format msgid "-mppc64, -m620 generate code for PowerPC 620/625/630\n" msgstr "" -#: config/tc-ppc.c:1360 +#: config/tc-ppc.c:1369 #, c-format msgid "" "-mppc64bridge generate code for PowerPC 64, including bridge " "insns\n" msgstr "" -#: config/tc-ppc.c:1362 +#: config/tc-ppc.c:1371 #, c-format msgid "-mbooke generate code for 32-bit PowerPC BookE\n" msgstr "" -#: config/tc-ppc.c:1364 +#: config/tc-ppc.c:1373 #, c-format msgid "-ma2 generate code for A2 architecture\n" msgstr "" -#: config/tc-ppc.c:1366 +#: config/tc-ppc.c:1375 #, c-format msgid "-mpower4, -mpwr4 generate code for Power4 architecture\n" msgstr "" -#: config/tc-ppc.c:1368 +#: config/tc-ppc.c:1377 #, c-format msgid "" "-mpower5, -mpwr5, -mpwr5x\n" " generate code for Power5 architecture\n" msgstr "" -#: config/tc-ppc.c:1371 +#: config/tc-ppc.c:1380 #, c-format msgid "-mpower6, -mpwr6 generate code for Power6 architecture\n" msgstr "" -#: config/tc-ppc.c:1373 +#: config/tc-ppc.c:1382 #, c-format msgid "-mpower7, -mpwr7 generate code for Power7 architecture\n" msgstr "" -#: config/tc-ppc.c:1375 +#: config/tc-ppc.c:1384 #, c-format msgid "-mpower8, -mpwr8 generate code for Power8 architecture\n" msgstr "" -#: config/tc-ppc.c:1377 +#: config/tc-ppc.c:1386 #, c-format msgid "-mpower9, -mpwr9 generate code for Power9 architecture\n" msgstr "" -#: config/tc-ppc.c:1381 +#: config/tc-ppc.c:1390 #, c-format msgid "" "-mcell generate code for Cell Broadband Engine " "architecture\n" msgstr "" -#: config/tc-ppc.c:1383 +#: config/tc-ppc.c:1392 #, c-format msgid "" "-mcom generate code for Power/PowerPC common instructions\n" msgstr "" -#: config/tc-ppc.c:1385 +#: config/tc-ppc.c:1394 #, c-format msgid "" "-many generate code for any architecture (PWR/PWRX/PPC)\n" msgstr "" -#: config/tc-ppc.c:1387 +#: config/tc-ppc.c:1396 #, c-format msgid "-maltivec generate code for AltiVec\n" msgstr "" -#: config/tc-ppc.c:1389 +#: config/tc-ppc.c:1398 #, c-format msgid "" "-mvsx generate code for Vector-Scalar (VSX) instructions\n" msgstr "" -#: config/tc-ppc.c:1391 +#: config/tc-ppc.c:1400 #, c-format msgid "-me300 generate code for PowerPC e300 family\n" msgstr "" -#: config/tc-ppc.c:1393 +#: config/tc-ppc.c:1402 #, c-format msgid "" "-me500, -me500x2 generate code for Motorola e500 core complex\n" msgstr "" -#: config/tc-ppc.c:1395 +#: config/tc-ppc.c:1404 #, c-format msgid "" "-me500mc, generate code for Freescale e500mc core complex\n" msgstr "" -#: config/tc-ppc.c:1397 +#: config/tc-ppc.c:1406 #, c-format msgid "" "-me500mc64, generate code for Freescale e500mc64 core complex\n" msgstr "" -#: config/tc-ppc.c:1399 +#: config/tc-ppc.c:1408 #, c-format msgid "" "-me5500, generate code for Freescale e5500 core complex\n" msgstr "" -#: config/tc-ppc.c:1401 +#: config/tc-ppc.c:1410 #, c-format msgid "" "-me6500, generate code for Freescale e6500 core complex\n" msgstr "" -#: config/tc-ppc.c:1403 +#: config/tc-ppc.c:1412 #, c-format msgid "-mspe generate code for Motorola SPE instructions\n" msgstr "" -#: config/tc-ppc.c:1405 +#: config/tc-ppc.c:1414 #, c-format msgid "" "-mspe2 generate code for Freescale SPE2 instructions\n" msgstr "" -#: config/tc-ppc.c:1407 +#: config/tc-ppc.c:1416 #, c-format msgid "" "-mvle generate code for Freescale VLE instructions\n" msgstr "" -#: config/tc-ppc.c:1409 +#: config/tc-ppc.c:1418 #, c-format msgid "" "-mtitan generate code for AppliedMicro Titan core complex\n" msgstr "" -#: config/tc-ppc.c:1411 +#: config/tc-ppc.c:1420 #, c-format msgid "-mregnames Allow symbolic names for registers\n" msgstr "" -#: config/tc-ppc.c:1413 +#: config/tc-ppc.c:1422 #, c-format msgid "-mno-regnames Do not allow symbolic names for registers\n" msgstr "" -#: config/tc-ppc.c:1416 +#: config/tc-ppc.c:1425 #, c-format msgid "-mrelocatable support for GCC's -mrelocatble option\n" msgstr "" -#: config/tc-ppc.c:1418 +#: config/tc-ppc.c:1427 #, c-format msgid "-mrelocatable-lib support for GCC's -mrelocatble-lib option\n" msgstr "" -#: config/tc-ppc.c:1420 +#: config/tc-ppc.c:1429 #, c-format msgid "-memb set PPC_EMB bit in ELF flags\n" msgstr "" -#: config/tc-ppc.c:1422 +#: config/tc-ppc.c:1431 #, c-format msgid "" "-mlittle, -mlittle-endian, -le\n" " generate code for a little endian machine\n" msgstr "" -#: config/tc-ppc.c:1425 +#: config/tc-ppc.c:1434 #, c-format msgid "" "-mbig, -mbig-endian, -be\n" " generate code for a big endian machine\n" msgstr "" -#: config/tc-ppc.c:1428 +#: config/tc-ppc.c:1437 #, c-format msgid "-msolaris generate code for Solaris\n" msgstr "" -#: config/tc-ppc.c:1430 +#: config/tc-ppc.c:1439 #, c-format msgid "-mno-solaris do not generate code for Solaris\n" msgstr "" -#: config/tc-ppc.c:1432 +#: config/tc-ppc.c:1441 #, c-format msgid "-K PIC set EF_PPC_RELOCATABLE_LIB in ELF flags\n" msgstr "" -#: config/tc-ppc.c:1434 +#: config/tc-ppc.c:1443 #, c-format msgid "-V print assembler version number\n" msgstr "" -#: config/tc-ppc.c:1436 +#: config/tc-ppc.c:1445 #, c-format msgid "-Qy, -Qn ignored\n" msgstr "" -#: config/tc-ppc.c:1439 +#: config/tc-ppc.c:1448 #, c-format msgid "" "-nops=count when aligning, more than COUNT nops uses a branch\n" msgstr "" -#: config/tc-ppc.c:1441 +#: config/tc-ppc.c:1450 #, c-format msgid "-ppc476-workaround warn if emitting data to code sections\n" msgstr "" -#: config/tc-ppc.c:1471 +#: config/tc-ppc.c:1480 #, c-format msgid "unknown default cpu = %s, os = %s" msgstr "" -#: config/tc-ppc.c:1499 +#: config/tc-ppc.c:1508 msgid "neither Power nor PowerPC opcodes were selected." msgstr "" -#: config/tc-ppc.c:1557 +#: config/tc-ppc.c:1566 #, c-format msgid "mask trims opcode bits for %s" msgstr "" -#: config/tc-ppc.c:1567 +#: config/tc-ppc.c:1576 #, c-format msgid "operand index error for %s" msgstr "" -#: config/tc-ppc.c:1593 +#: config/tc-ppc.c:1602 #, c-format msgid "operand %d overlap in %s" msgstr "" -#: config/tc-ppc.c:1602 +#: config/tc-ppc.c:1611 #, c-format msgid "non-optional operand %d follows optional operand in %s" msgstr "" -#: config/tc-ppc.c:1652 +#: config/tc-ppc.c:1661 #, c-format msgid "powerpc_operands[%d].bitm invalid" msgstr "" -#: config/tc-ppc.c:1659 +#: config/tc-ppc.c:1668 #, c-format msgid "powerpc_operands[%d] duplicates powerpc_operands[%d]" msgstr "" -#: config/tc-ppc.c:1685 config/tc-ppc.c:1736 config/tc-ppc.c:1774 -#: config/tc-ppc.c:1812 +#: config/tc-ppc.c:1694 config/tc-ppc.c:1745 config/tc-ppc.c:1783 +#: config/tc-ppc.c:1821 #, c-format msgid "major opcode is not sorted for %s" msgstr "" -#: config/tc-ppc.c:1691 +#: config/tc-ppc.c:1700 #, c-format msgid "%s is enabled by vle flag" msgstr "" -#: config/tc-ppc.c:1698 +#: config/tc-ppc.c:1707 #, c-format msgid "%s not disabled by vle flag" msgstr "" -#: config/tc-ppc.c:1646 config/tc-ppc.c:1699 config/tc-ppc.c:1743 +#: config/tc-ppc.c:1735 config/tc-ppc.c:1779 config/tc-ppc.c:1824 +#: config/tc-ppc.c:1868 #, c-format msgid "duplicate instruction %s" msgstr "" -#: config/tc-ppc.c:1767 +#: config/tc-ppc.c:1892 #, c-format msgid "duplicate macro %s" msgstr "" -#: config/tc-ppc.c:2208 +#: config/tc-ppc.c:2217 #, c-format msgid "symbol+offset@%s means symbol@%s+offset" msgstr "" -#: config/tc-ppc.c:2228 +#: config/tc-ppc.c:2237 #, c-format msgid "symbol+offset@%s not supported" msgstr "" -#: config/tc-ppc.c:2303 config/tc-ppc.c:4267 config/tc-ppc.c:7399 +#: config/tc-ppc.c:2316 config/tc-ppc.c:4286 config/tc-ppc.c:7669 msgid "data in executable section" msgstr "" -#: config/tc-ppc.c:2344 +#: config/tc-ppc.c:2357 msgid "expected comma after symbol-name: rest of line ignored." msgstr "" -#: config/tc-ppc.c:2377 +#: config/tc-ppc.c:2390 #, c-format msgid "ignoring attempt to re-define symbol `%s'." msgstr "" -#: config/tc-ppc.c:2385 +#: config/tc-ppc.c:2398 #, c-format msgid "length of .lcomm \"%s\" is already %ld. Not changed to %ld." msgstr "" -#: config/tc-ppc.c:2403 +#: config/tc-ppc.c:2416 msgid "common alignment not a power of 2" msgstr "" -#: config/tc-ppc.c:2445 +#: config/tc-ppc.c:2458 #, c-format msgid "expected comma after name `%s' in .localentry directive" msgstr "" -#: config/tc-ppc.c:2455 +#: config/tc-ppc.c:2468 msgid "missing expression in .localentry directive" msgstr "" -#: config/tc-ppc.c:2476 +#: config/tc-ppc.c:2489 #, c-format msgid ".localentry expression for `%s' is not a valid power of 2" msgstr "" -#: config/tc-ppc.c:2493 +#: config/tc-ppc.c:2506 #, c-format msgid ".localentry expression for `%s' does not evaluate to a constant" msgstr "" -#: config/tc-ppc.c:2508 +#: config/tc-ppc.c:2521 msgid "missing expression in .abiversion directive" msgstr "" -#: config/tc-ppc.c:2517 +#: config/tc-ppc.c:2530 msgid ".abiversion expression does not evaluate to a constant" msgstr "" -#: config/tc-m68k.c:7965 config/tc-ppc.c:2539 +#: config/tc-m68k.c:7965 config/tc-ppc.c:2552 msgid "unknown .gnu_attribute value" msgstr "" -#: config/tc-ppc.c:2597 +#: config/tc-ppc.c:2610 msgid "relocation cannot be done when using -mrelocatable" msgstr "" -#: config/tc-ppc.c:2643 +#: config/tc-ppc.c:2656 msgid "TOC section size exceeds 64k" msgstr "" -#: config/tc-ppc.c:2645 +#: config/tc-ppc.c:2800 #, c-format msgid "syntax error: invalid toc specifier `%s'" msgstr "" -#: config/tc-ppc.c:2659 +#: config/tc-ppc.c:2814 #, c-format msgid "syntax error: expected `]', found `%c'" msgstr "" -#: config/tc-ppc.c:3197 +#: config/tc-ppc.c:3216 #, c-format msgid "%s howto doesn't match size/pcrel in gas" msgstr "" -#: config/tc-ppc.c:3281 +#: config/tc-ppc.c:3300 #, c-format msgid "unrecognized opcode: `%s'" msgstr "" -#: config/tc-ppc.c:2959 +#: config/tc-ppc.c:3490 msgid "[tocv] symbol is not a toc symbol" msgstr "" -#: config/tc-ppc.c:2970 +#: config/tc-ppc.c:3501 msgid "unimplemented toc32 expression modifier" msgstr "" -#: config/tc-ppc.c:2975 +#: config/tc-ppc.c:3506 msgid "unimplemented toc64 expression modifier" msgstr "" -#: config/tc-ppc.c:2979 +#: config/tc-ppc.c:3510 #, c-format msgid "Unexpected return value [%d] from parse_toc_entry!\n" msgstr "" -#: config/tc-ppc.c:3656 +#: config/tc-ppc.c:3675 #, c-format msgid "@tls may not be used with \"%s\" operands" msgstr "" -#: config/tc-ppc.c:3659 +#: config/tc-ppc.c:3678 msgid "@tls may only be used in last operand" msgstr "" -#: config/tc-ppc.c:3697 config/tc-ppc.c:3707 config/tc-ppc.c:3717 -#: config/tc-ppc.c:3732 +#: config/tc-ppc.c:3716 config/tc-ppc.c:3726 config/tc-ppc.c:3736 +#: config/tc-ppc.c:3751 #, c-format msgid "%s unsupported on this instruction" msgstr "" -#: config/tc-ppc.c:3779 +#: config/tc-ppc.c:3798 #, c-format msgid "assuming %s on symbol" msgstr "" -#: config/tc-ppc.c:3902 +#: config/tc-ppc.c:3921 msgid "unsupported relocation for DS offset field" msgstr "" -#: config/tc-ppc.c:3955 +#: config/tc-ppc.c:3974 #, c-format msgid "syntax error; found `%c', expected `%c'" msgstr "" -#: config/tc-ppc.c:3960 +#: config/tc-ppc.c:3979 #, c-format msgid "syntax error; end of line, expected `%c'" msgstr "" -#: config/tc-ppc.c:4025 config/tc-ppc.c:6576 +#: config/tc-ppc.c:4044 config/tc-ppc.c:6843 #, c-format msgid "instruction address is not a multiple of %d" msgstr "" -#: config/tc-ppc.c:4151 +#: config/tc-ppc.c:4170 msgid "wrong number of operands" msgstr "" -#: config/tc-ppc.c:4224 +#: config/tc-ppc.c:4243 msgid "bad .section directive: want a,e,v,w,x,M,S,G,T in string" msgstr "" -#: config/tc-ppc.c:4307 +#: config/tc-ppc.c:4392 msgid "missing size" msgstr "" -#: config/tc-ppc.c:4316 +#: config/tc-ppc.c:4401 msgid "negative size" msgstr "" -#: config/tc-ppc.c:4348 +#: config/tc-ppc.c:4446 msgid "missing real symbol name" msgstr "" -#: config/tc-ppc.c:4387 +#: config/tc-ppc.c:4485 msgid "attempt to redefine symbol" msgstr "" -#: config/tc-ppc.c:4691 +#: config/tc-ppc.c:4794 #, c-format msgid "no known dwarf XCOFF section for flag 0x%08x\n" msgstr "" -#: config/tc-ppc.c:4704 +#: config/tc-ppc.c:4807 #, c-format msgid "label %s was not defined in this dwarf section" msgstr "" -#: config/tc-ppc.c:4818 +#: config/tc-ppc.c:4921 msgid "the XCOFF file format does not support arbitrary sections" msgstr "" -#: config/tc-ppc.c:4889 +#: config/tc-ppc.c:5081 msgid ".ref outside .csect" msgstr "" -#: config/tc-ppc.c:4910 config/tc-ppc.c:5110 +#: config/tc-ppc.c:5102 config/tc-ppc.c:5362 msgid "missing symbol name" msgstr "" -#: config/tc-ppc.c:4940 +#: config/tc-ppc.c:5132 msgid "missing rename string" msgstr "" -#: config/tc-ppc.c:4970 config/tc-ppc.c:5512 read.c:3689 +#: config/tc-ppc.c:5162 config/tc-ppc.c:5764 msgid "missing value" msgstr "" -#: config/tc-ppc.c:4988 +#: config/tc-ppc.c:5180 msgid "illegal .stabx expression; zero assumed" msgstr "" -#: config/tc-ppc.c:5020 +#: config/tc-ppc.c:5212 msgid "missing class" msgstr "" -#: config/tc-ppc.c:5029 +#: config/tc-ppc.c:5221 msgid "missing type" msgstr "" -#: config/tc-ppc.c:5056 +#: config/tc-ppc.c:5248 msgid ".stabx of storage class stsym must be within .bs/.es" msgstr "" -#: config/tc-ppc.c:5300 +#: config/tc-ppc.c:5552 msgid "nested .bs blocks" msgstr "" -#: config/tc-ppc.c:5331 +#: config/tc-ppc.c:5583 msgid ".es without preceding .bs" msgstr "" -#: config/tc-ppc.c:5504 +#: config/tc-ppc.c:5756 msgid "non-constant byte count" msgstr "" -#: config/tc-ppc.c:5579 +#: config/tc-ppc.c:5831 msgid ".tc not in .toc section" msgstr "" -#: config/tc-ppc.c:5597 +#: config/tc-ppc.c:5849 msgid ".tc with no label" msgstr "" -#: config/tc-ppc.c:5695 config/tc-s390.c:1960 +#: config/tc-ppc.c:5946 config/tc-s390.c:1960 msgid ".machine stack overflow" msgstr "" -#: config/tc-ppc.c:5702 config/tc-s390.c:1971 +#: config/tc-ppc.c:5953 config/tc-s390.c:1971 msgid ".machine stack underflow" msgstr "" -#: config/tc-ppc.c:5709 config/tc-s390.c:1983 +#: config/tc-ppc.c:5972 config/tc-s390.c:1983 #, c-format msgid "invalid machine `%s'" msgstr "" -#: config/tc-ppc.c:5158 +#: config/tc-ppc.c:5774 msgid "no previous section to return to, ignored." msgstr "" -#: config/tc-ppc.c:5431 +#: config/tc-ppc.c:6043 #, c-format msgid "length of .comm \"%s\" is already %ld. Not changed to %ld." msgstr "" #. Section Contents #. unknown -#: config/tc-ppc.c:5559 +#: config/tc-ppc.c:6171 msgid "unsupported section attribute -- 'a'" msgstr "" -#: config/tc-ppc.c:5752 +#: config/tc-ppc.c:6016 msgid "bad symbol suffix" msgstr "" -#: config/tc-ppc.c:5851 +#: config/tc-ppc.c:6115 msgid "unrecognized symbol suffix" msgstr "" -#: config/tc-ppc.c:5665 +#: config/tc-ppc.c:6509 msgid "two .function pseudo-ops with no intervening .ef" msgstr "" -#: config/tc-ppc.c:5939 +#: config/tc-ppc.c:6203 msgid ".ef with no preceding .function" msgstr "" -#: config/tc-ppc.c:6074 +#: config/tc-ppc.c:6339 #, c-format msgid "warning: symbol %s has no csect" msgstr "" -#: config/tc-ppc.c:6406 +#: config/tc-ppc.c:6671 msgid "symbol in .toc does not match any .tc" msgstr "" -#: config/tc-ppc.c:7104 +#: config/tc-ppc.c:7371 #, c-format msgid "%s unsupported as instruction fixup" msgstr "" -#: config/tc-ppc.c:7203 +#: config/tc-ppc.c:7470 #, c-format msgid "unsupported relocation against %s" msgstr "" -#: config/tc-ppc.c:7382 +#: config/tc-ppc.c:7652 #, c-format msgid "Gas failure, reloc value %d\n" msgstr "" @@ -15234,73 +15228,73 @@ msgid "residual low bits in pmem diff relocation" msgstr "" -#: config/tc-pru.c:939 config/tc-pru.c:972 +#: config/tc-pru.c:938 config/tc-pru.c:971 #, c-format msgid "trailing garbage after expression: %s" msgstr "" -#: config/tc-pru.c:944 +#: config/tc-pru.c:943 #, c-format msgid "expected expression, got %s" msgstr "" -#: config/tc-pru.c:977 +#: config/tc-pru.c:976 #, c-format msgid "expected constant expression, got %s" msgstr "" -#: config/tc-pru.c:1030 +#: config/tc-pru.c:1029 msgid "data transfer register cannot be halfword" msgstr "" -#: config/tc-pru.c:1049 +#: config/tc-pru.c:1048 msgid "destination register must be full-word" msgstr "" -#: config/tc-pru.c:1081 +#: config/tc-pru.c:1080 #, c-format msgid "cannot use partial register %s for addressing" msgstr "" -#: config/tc-pru.c:1094 +#: config/tc-pru.c:1093 #, c-format msgid "value %lu is too large for a byte operand" msgstr "" -#: config/tc-pru.c:1116 +#: config/tc-pru.c:1115 #, c-format msgid "loop count constant %ld is out of range [1..%d]" msgstr "" -#: config/tc-pru.c:1216 config/tc-pru.c:1242 +#: config/tc-pru.c:1215 config/tc-pru.c:1241 #, c-format msgid "byte count constant %ld is out of range [1..%d]" msgstr "" -#: config/tc-pru.c:1223 config/tc-pru.c:1249 +#: config/tc-pru.c:1222 config/tc-pru.c:1248 msgid "only r0 can be used as byte count register" msgstr "" -#: config/tc-pru.c:1225 config/tc-pru.c:1251 +#: config/tc-pru.c:1224 config/tc-pru.c:1250 msgid "only r0.bX byte fields of r0 can be used as byte count" msgstr "" -#: config/tc-pru.c:1264 +#: config/tc-pru.c:1263 #, c-format msgid "invalid constant table offset %ld" msgstr "" -#: config/tc-pru.c:1275 +#: config/tc-pru.c:1274 #, c-format msgid "invalid WakeOnStatus %ld" msgstr "" -#: config/tc-pru.c:1286 +#: config/tc-pru.c:1285 #, c-format msgid "invalid XFR WideBus Address %ld" msgstr "" -#: config/tc-pru.c:1546 +#: config/tc-pru.c:1545 #, c-format msgid "" "PRU options:\n" @@ -15308,17 +15302,17 @@ " -mno-link-relax don't generate relocations for linker relaxation.\n" msgstr "" -#: config/tc-pru.c:1819 +#: config/tc-pru.c:1818 #, c-format msgid "Label \"%s\" matches a CPU register name" msgstr "" -#: config/tc-riscv.c:422 +#: config/tc-riscv.c:412 config/tc-riscv.c:471 #, c-format msgid "internal error: can't hash `%s': %s" msgstr "" -#: config/tc-riscv.c:1027 +#: config/tc-riscv.c:1050 #, c-format msgid "internal: bad RISC-V opcode (mask error): %s %s" msgstr "" @@ -15343,127 +15337,128 @@ msgid "internal: bad RISC-V opcode (unknown operand type `%c'): %s %s" msgstr "" -#: config/tc-riscv.c:1159 +#: config/tc-riscv.c:1199 #, c-format msgid "internal: bad RISC-V opcode (bits 0x%lx undefined): %s %s" msgstr "" -#: config/tc-riscv.c:1199 +#: config/tc-riscv.c:841 #, c-format msgid "Unsupported RISC-V relocation number %d" msgstr "" -#: config/tc-riscv.c:1284 +#: config/tc-riscv.c:928 msgid "internal error: invalid macro" msgstr "" -#: config/tc-riscv.c:1309 +#: config/tc-riscv.c:953 msgid "internal error: vasprintf failed" msgstr "" -#: config/tc-riscv.c:1447 config/tc-riscv.c:1525 +#: config/tc-riscv.c:1525 config/tc-riscv.c:1603 msgid "unsupported large constant" msgstr "" -#: config/tc-riscv.c:1449 +#: config/tc-riscv.c:1527 #, c-format msgid "unknown CSR `%s'" msgstr "" -#: config/tc-riscv.c:1343 +#: config/tc-riscv.c:987 #, c-format msgid "Instruction %s requires absolute expression" msgstr "" -#: config/tc-riscv.c:1608 +#: config/tc-riscv.c:1213 #, c-format msgid "Macro %s not implemented" msgstr "" -#: config/tc-riscv.c:2195 +#: config/tc-riscv.c:1700 msgid "bad value for funct6 field, value must be 0...64" msgstr "" -#: config/tc-riscv.c:2210 +#: config/tc-riscv.c:1715 msgid "bad value for funct4 field, value must be 0...15" msgstr "" -#: config/tc-riscv.c:2695 +#: config/tc-riscv.c:3106 msgid "bad value for funct3 field, value must be 0...7" msgstr "" -#: config/tc-riscv.c:2710 +#: config/tc-riscv.c:3121 msgid "bad value for funct2 field, value must be 0...3" msgstr "" -#: config/tc-riscv.c:2248 +#: config/tc-riscv.c:1753 #, c-format msgid "bad compressed FUNCT field specifier 'CF%c'\n" msgstr "" -#: config/tc-riscv.c:2255 +#: config/tc-riscv.c:1760 #, c-format msgid "bad RVC field specifier 'C%c'\n" msgstr "" -#: config/tc-riscv.c:2278 config/tc-riscv.c:2289 +#: config/tc-riscv.c:1783 config/tc-riscv.c:1794 #, c-format msgid "Improper shift amount (%lu)" msgstr "" -#: config/tc-riscv.c:2300 +#: config/tc-riscv.c:1805 #, c-format msgid "Improper CSRxI immediate (%lu)" msgstr "" -#: config/tc-riscv.c:2317 +#: config/tc-riscv.c:1820 #, c-format msgid "Improper CSR address (%lu)" msgstr "" -#: config/tc-riscv.c:2603 +#: config/tc-riscv.c:3015 msgid "lui expression not in range 0..1048575" msgstr "" -#: config/tc-riscv.c:2640 +#: config/tc-riscv.c:3052 msgid "" "bad value for opcode field, value must be 0...127 and lower 2 bits must be " "0x3" msgstr "" -#: config/tc-riscv.c:2656 +#: config/tc-riscv.c:3068 msgid "bad value for opcode field, value must be 0...2" msgstr "" -#: config/tc-riscv.c:2556 +#: config/tc-riscv.c:2059 #, c-format msgid "bad Opcode field specifier 'O%c'\n" msgstr "" -#: config/tc-riscv.c:2680 +#: config/tc-riscv.c:3091 msgid "bad value for funct7 field, value must be 0...127" msgstr "" -#: config/tc-riscv.c:2610 +#: config/tc-riscv.c:2113 #, c-format msgid "bad FUNCT field specifier 'F%c'\n" msgstr "" -#: config/tc-riscv.c:2624 +#: config/tc-riscv.c:2127 #, c-format msgid "internal error: bad argument type %c" msgstr "" -#: config/tc-riscv.c:2740 +#. Reset error message of the previous round. +#: config/tc-riscv.c:2257 msgid "illegal operands" msgstr "" -#: config/tc-riscv.c:3027 +#: config/tc-riscv.c:2508 #, c-format msgid "internal error: bad CFA value #%d" msgstr "" -#: config/tc-riscv.c:3108 +#: config/tc-riscv.c:2589 #, c-format msgid "internal error: bad relocation #%d" msgstr "" @@ -15472,21 +15467,21 @@ msgid "unsupported symbol subtraction" msgstr "" -#: config/tc-riscv.c:3314 +#: config/tc-riscv.c:3799 msgid ".option pop with no .option push" msgstr "" -#: config/tc-riscv.c:3234 +#: config/tc-riscv.c:2699 #, c-format msgid "Unrecognized .option directive: %s\n" msgstr "" -#: config/tc-riscv.c:3254 +#: config/tc-loongarch.c:402 #, c-format msgid "Unsupported use of %s" msgstr "" -#: config/tc-riscv.c:3499 +#: config/tc-loongarch.c:1301 config/tc-riscv.c:4029 #, c-format msgid "cannot represent %s relocation in object file" msgstr "" @@ -15505,17 +15500,17 @@ " -mno-arch-attr don't generate RISC-V arch attribute\n" msgstr "" -#: config/tc-riscv.c:3678 +#: config/tc-riscv.c:4212 #, c-format msgid "unknown register `%s'" msgstr "" -#: config/tc-riscv.c:3700 +#: config/tc-riscv.c:4234 #, c-format msgid "non-constant .%cleb128 is not supported" msgstr "" -#: config/tc-riscv.c:3784 +#: config/tc-riscv.c:3196 msgid ".attribute arch must set before any instructions" msgstr "" @@ -15916,7 +15911,7 @@ " -Qy, -Qn ignored\n" msgstr "" -#: config/tc-i370.c:515 config/tc-s390.c:538 +#: config/tc-s390.c:539 #, c-format msgid "Internal assembler error for instruction %s" msgstr "" @@ -15925,7 +15920,7 @@ msgid "The 64 bit file format is used without esame instructions." msgstr "" -#: config/tc-s390.c:581 +#: config/tc-s390.c:582 #, c-format msgid "Internal assembler error for instruction format %s" msgstr "" @@ -16038,21 +16033,21 @@ msgid "cannot emit relocation %s against subsy symbol %s" msgstr "" -#: config/tc-s390.c:2375 +#: config/tc-s390.c:2372 msgid "unsupported relocation type" msgstr "" -#: config/tc-s390.c:2430 +#: config/tc-s390.c:2427 #, c-format msgid "cannot emit PC relative %s relocation%s%s" msgstr "" -#: config/tc-s390.c:2569 +#: config/tc-s390.c:2566 #, c-format msgid "Gas failure, reloc type %s\n" msgstr "" -#: config/tc-s390.c:2571 +#: config/tc-s390.c:2568 #, c-format msgid "Gas failure, reloc type #%i\n" msgstr "" @@ -16994,7 +16989,7 @@ #: config/tc-sparc.c:3646 config/tc-sparc.c:3653 config/tc-sparc.c:3660 #: config/tc-sparc.c:3667 config/tc-sparc.c:3674 config/tc-sparc.c:3683 #: config/tc-sparc.c:3695 config/tc-sparc.c:3706 config/tc-sparc.c:3728 -#: config/tc-sparc.c:3752 write.c:1189 +#: config/tc-sparc.c:3752 write.c:1184 msgid "relocation overflow" msgstr "" @@ -17162,7 +17157,7 @@ msgid "Relaxation should never occur" msgstr "" -#: config/tc-spu.c:1008 +#: config/tc-spu.c:1005 #, c-format msgid "Relocation doesn't fit. (relocation value = 0x%lx)" msgstr "" @@ -17345,231 +17340,231 @@ msgid "first operand is too large for a 24-bit displacement" msgstr "" -#: config/tc-tic4x.c:389 +#: config/tc-tic4x.c:391 msgid "Nan, using zero." msgstr "" -#: config/tc-tic4x.c:507 +#: config/tc-tic4x.c:509 #, c-format msgid "Cannot represent exponent in %d bits" msgstr "" -#: config/tc-tic4x.c:590 config/tc-tic4x.c:600 +#: config/tc-tic4x.c:592 config/tc-tic4x.c:602 msgid "Invalid floating point number" msgstr "" -#: config/tc-tic4x.c:719 +#: config/tc-tic4x.c:721 msgid "Comma expected\n" msgstr "" -#: config/tc-tic4x.c:752 config/tc-tic54x.c:470 +#: config/tc-tic4x.c:754 config/tc-tic54x.c:470 msgid ".bss size argument missing\n" msgstr "" -#: config/tc-tic4x.c:760 +#: config/tc-tic4x.c:762 #, c-format msgid ".bss size %ld < 0!" msgstr "" -#: config/tc-tic4x.c:893 +#: config/tc-tic4x.c:895 msgid "Non-constant symbols not allowed\n" msgstr "" -#: config/tc-tic4x.c:924 +#: config/tc-tic4x.c:926 msgid "Symbol missing\n" msgstr "" #. Skip null symbol terminator. -#: config/tc-tic4x.c:972 +#: config/tc-tic4x.c:974 msgid ".sect: subsection name ignored" msgstr "" -#: config/tc-tic4x.c:1000 config/tc-tic4x.c:1101 config/tc-tic54x.c:1427 +#: config/tc-tic4x.c:1002 config/tc-tic4x.c:1103 config/tc-tic54x.c:1427 #, c-format msgid "Error setting flags for \"%s\": %s" msgstr "" -#: config/tc-tic4x.c:1032 +#: config/tc-tic4x.c:1034 msgid ".set syntax invalid\n" msgstr "" -#: config/tc-tic4x.c:1090 +#: config/tc-tic4x.c:1092 msgid ".usect: non-zero alignment flag ignored" msgstr "" -#: config/tc-tic4x.c:1121 +#: config/tc-tic4x.c:1123 #, c-format msgid "This assembler does not support processor generation %ld" msgstr "" -#: config/tc-tic4x.c:1125 +#: config/tc-tic4x.c:1127 msgid "Changing processor generation on fly not supported..." msgstr "" -#: config/tc-tic4x.c:1412 +#: config/tc-tic4x.c:1414 msgid "Auxiliary register AR0--AR7 required for indirect" msgstr "" -#: config/tc-tic4x.c:1426 +#: config/tc-tic4x.c:1428 #, c-format msgid "Bad displacement %d (require 0--255)\n" msgstr "" -#: config/tc-tic4x.c:1444 +#: config/tc-tic4x.c:1446 msgid "Index register IR0,IR1 required for displacement" msgstr "" -#: config/tc-tic4x.c:1512 +#: config/tc-tic4x.c:1514 msgid "Expecting a register name" msgstr "" -#: config/tc-tic4x.c:1524 config/tc-tic4x.c:1547 config/tc-tic4x.c:1613 +#: config/tc-tic4x.c:1526 config/tc-tic4x.c:1549 config/tc-tic4x.c:1615 msgid "Number too large" msgstr "" -#: config/tc-tic4x.c:1537 config/tc-tic4x.c:1560 +#: config/tc-tic4x.c:1539 config/tc-tic4x.c:1562 msgid "Expecting a constant value" msgstr "" -#: config/tc-tic4x.c:1568 +#: config/tc-tic4x.c:1570 #, c-format msgid "Bad direct addressing construct %s" msgstr "" -#: config/tc-tic4x.c:1572 +#: config/tc-tic4x.c:1574 #, c-format msgid "Direct value of %ld is not suitable" msgstr "" -#: config/tc-tic4x.c:1596 +#: config/tc-tic4x.c:1598 msgid "Unknown indirect addressing mode" msgstr "" -#: config/tc-tic4x.c:1693 +#: config/tc-tic4x.c:1695 #, c-format msgid "Immediate value of %ld is too large for ldf" msgstr "" -#: config/tc-tic4x.c:1733 +#: config/tc-tic4x.c:1735 msgid "Destination register must be ARn" msgstr "" -#: config/tc-tic4x.c:1752 config/tc-tic4x.c:2125 config/tc-tic4x.c:2184 +#: config/tc-tic4x.c:1754 config/tc-tic4x.c:2127 config/tc-tic4x.c:2186 #, c-format msgid "Immediate value of %ld is too large" msgstr "" -#: config/tc-tic4x.c:1781 config/tc-tic4x.c:1986 +#: config/tc-tic4x.c:1783 config/tc-tic4x.c:1988 msgid "Invalid indirect addressing mode" msgstr "" -#: config/tc-tic4x.c:1805 config/tc-tic4x.c:1845 config/tc-tic4x.c:2036 -#: config/tc-tic4x.c:2058 +#: config/tc-tic4x.c:1807 config/tc-tic4x.c:1847 config/tc-tic4x.c:2038 +#: config/tc-tic4x.c:2060 msgid "Register must be Rn" msgstr "" -#: config/tc-tic4x.c:1859 config/tc-tic4x.c:1929 config/tc-tic4x.c:1943 +#: config/tc-tic4x.c:1861 config/tc-tic4x.c:1931 config/tc-tic4x.c:1945 msgid "Register must be R0--R7" msgstr "" -#: config/tc-tic4x.c:1883 config/tc-tic4x.c:1911 +#: config/tc-tic4x.c:1885 config/tc-tic4x.c:1913 #, c-format msgid "Invalid indirect addressing mode displacement %d" msgstr "" -#: config/tc-tic4x.c:1957 +#: config/tc-tic4x.c:1959 msgid "Destination register must be R2 or R3" msgstr "" -#: config/tc-tic4x.c:1971 +#: config/tc-tic4x.c:1973 msgid "Destination register must be R0 or R1" msgstr "" -#: config/tc-tic4x.c:2008 +#: config/tc-tic4x.c:2010 #, c-format msgid "Displacement value of %ld is too large" msgstr "" -#: config/tc-tic4x.c:2069 config/tc-tic4x.c:2200 +#: config/tc-tic4x.c:2071 config/tc-tic4x.c:2202 msgid "Floating point number not valid in expression" msgstr "" -#: config/tc-tic4x.c:2083 +#: config/tc-tic4x.c:2085 #, c-format msgid "Signed immediate value %ld too large" msgstr "" -#: config/tc-tic4x.c:2146 +#: config/tc-tic4x.c:2148 #, c-format msgid "Unsigned immediate value %ld too large" msgstr "" -#: config/tc-tic4x.c:2214 +#: config/tc-tic4x.c:2216 #, c-format msgid "Immediate value %ld too large" msgstr "" -#: config/tc-tic4x.c:2233 config/tc-tic4x.c:2261 +#: config/tc-tic4x.c:2235 config/tc-tic4x.c:2263 msgid "Register must be ivtp or tvtp" msgstr "" -#: config/tc-tic4x.c:2247 +#: config/tc-tic4x.c:2249 msgid "Register must be address register" msgstr "" -#: config/tc-tic4x.c:2320 +#: config/tc-tic4x.c:2322 msgid "Source and destination register should not be equal" msgstr "" -#: config/tc-tic4x.c:2335 +#: config/tc-tic4x.c:2337 msgid "Equal parallel destination registers, one result will be discarded" msgstr "" -#: config/tc-tic4x.c:2376 +#: config/tc-tic4x.c:2378 msgid "Too many operands scanned" msgstr "" -#: config/tc-tic4x.c:2407 +#: config/tc-tic4x.c:2409 msgid "Parallel opcode cannot contain more than two instructions" msgstr "" -#: config/tc-tic4x.c:2481 +#: config/tc-tic4x.c:2483 #, c-format msgid "Invalid operands for %s" msgstr "" -#: config/tc-tic4x.c:2484 +#: config/tc-tic4x.c:2486 #, c-format msgid "Invalid instruction %s" msgstr "" -#: config/tc-tic4x.c:2636 +#: config/tc-tic4x.c:2638 #, c-format msgid "Bad relocation type: 0x%02x" msgstr "" -#: config/tc-tic4x.c:2694 +#: config/tc-tic4x.c:2696 #, c-format msgid "Unsupported processor generation %d" msgstr "" -#: config/tc-tic4x.c:2702 +#: config/tc-tic4x.c:2704 msgid "Option -b is depreciated, please use -mbig" msgstr "" -#: config/tc-tic4x.c:2709 +#: config/tc-tic4x.c:2711 msgid "Option -p is depreciated, please use -mmemparm" msgstr "" -#: config/tc-tic4x.c:2716 +#: config/tc-tic4x.c:2718 msgid "Option -r is depreciated, please use -mregparm" msgstr "" -#: config/tc-tic4x.c:2723 +#: config/tc-tic4x.c:2725 msgid "Option -s is depreciated, please use -msmall" msgstr "" -#: config/tc-tic4x.c:2752 +#: config/tc-tic4x.c:2754 #, c-format msgid "" "\n" @@ -17595,12 +17590,12 @@ " -menhanced enable enhanced opcode support\n" msgstr "" -#: config/tc-tic4x.c:2797 +#: config/tc-tic4x.c:2799 #, c-format msgid "Label \"$%d\" redefined" msgstr "" -#: config/tc-tic4x.c:3007 +#: config/tc-tic4x.c:3009 #, c-format msgid "Reloc %d not supported by object file format" msgstr "" @@ -18878,140 +18873,140 @@ msgid "hi() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2036 +#: config/tc-v850.c:2032 msgid "lo() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2046 +#: config/tc-v850.c:2043 msgid "ctoff() is not supported by the rh850 ABI. Use -mgcc-abi instead" msgstr "" -#: config/tc-v850.c:2062 +#: config/tc-v850.c:2059 msgid "ctoff() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2081 +#: config/tc-v850.c:2078 msgid "sdaoff() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2100 +#: config/tc-v850.c:2097 msgid "zdaoff() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2132 +#: config/tc-v850.c:2129 msgid "tdaoff() relocation used on an instruction which does not support it" msgstr "" -#: config/tc-v850.c:2273 +#: config/tc-v850.c:2270 #, c-format msgid "operand out of range (%d is not between %d and %d)" msgstr "" -#: config/tc-v850.c:2356 +#: config/tc-v850.c:2353 msgid "st/ld offset 23 instruction was disabled ." msgstr "" -#: config/tc-v850.c:2365 +#: config/tc-v850.c:2362 msgid "Target processor does not support this instruction." msgstr "" -#: config/tc-v850.c:2477 config/tc-v850.c:2487 config/tc-v850.c:2508 -#: config/tc-v850.c:2522 config/tc-v850.c:2528 config/tc-v850.c:2552 -#: config/tc-v850.c:2558 config/tc-v850.c:2565 config/tc-v850.c:2579 -#: config/tc-v850.c:2593 config/tc-v850.c:2599 config/tc-v850.c:2936 +#: config/tc-v850.c:2474 config/tc-v850.c:2484 config/tc-v850.c:2505 +#: config/tc-v850.c:2519 config/tc-v850.c:2525 config/tc-v850.c:2549 +#: config/tc-v850.c:2555 config/tc-v850.c:2562 config/tc-v850.c:2576 +#: config/tc-v850.c:2590 config/tc-v850.c:2596 config/tc-v850.c:2933 msgid "immediate operand is too large" msgstr "" -#: config/tc-v850.c:2494 +#: config/tc-v850.c:2491 #, c-format msgid "AAARG -> unhandled constant reloc: %d" msgstr "" -#: config/tc-v850.c:2629 config/tc-v850.c:2640 +#: config/tc-v850.c:2626 config/tc-v850.c:2637 msgid "constant too big to fit into instruction" msgstr "" -#: config/tc-v850.c:2715 +#: config/tc-v850.c:2712 msgid "odd number cannot be used here" msgstr "" -#: config/tc-v850.c:2760 +#: config/tc-v850.c:2757 msgid "invalid register name" msgstr "" -#: config/tc-v850.c:2766 +#: config/tc-v850.c:2763 msgid "register r0 cannot be used here" msgstr "" -#: config/tc-v850.c:2772 +#: config/tc-v850.c:2769 msgid "odd register cannot be used here" msgstr "" -#: config/tc-v850.c:2781 +#: config/tc-v850.c:2778 msgid "invalid system register name" msgstr "" -#: config/tc-v850.c:2795 +#: config/tc-v850.c:2792 msgid "expected EP register" msgstr "" -#: config/tc-v850.c:2812 config/tc-v850.c:2825 +#: config/tc-v850.c:2809 config/tc-v850.c:2822 msgid "invalid condition code name" msgstr "" -#: config/tc-v850.c:2818 +#: config/tc-v850.c:2815 msgid "condition sa cannot be used here" msgstr "" -#: config/tc-v850.c:2831 +#: config/tc-v850.c:2828 msgid "invalid cache operation name" msgstr "" -#: config/tc-v850.c:2836 +#: config/tc-v850.c:2833 msgid "invalid pref operation name" msgstr "" -#: config/tc-v850.c:2841 +#: config/tc-v850.c:2838 msgid "invalid vector register name" msgstr "" -#: config/tc-v850.c:2879 +#: config/tc-v850.c:2876 msgid "syntax error: value is missing before the register name" msgstr "" -#: config/tc-v850.c:2881 +#: config/tc-v850.c:2878 msgid "syntax error: register not expected" msgstr "" -#: config/tc-v850.c:2895 +#: config/tc-v850.c:2892 msgid "syntax error: system register not expected" msgstr "" -#: config/tc-v850.c:2900 config/tc-v850.c:2905 +#: config/tc-v850.c:2897 config/tc-v850.c:2902 msgid "syntax error: condition code not expected" msgstr "" -#: config/tc-v850.c:2910 +#: config/tc-v850.c:2907 msgid "syntax error: vector register not expected" msgstr "" -#: config/tc-v850.c:2920 +#: config/tc-v850.c:2917 msgid "immediate 0 cannot be used here" msgstr "" -#: config/tc-v850.c:2944 +#: config/tc-v850.c:2941 msgid "immediate operand is not match" msgstr "" -#: config/tc-v850.c:2957 +#: config/tc-v850.c:2954 msgid "displacement is too large" msgstr "" -#: config/tc-v850.c:2975 config/tc-xtensa.c:13078 +#: config/tc-v850.c:2972 config/tc-xtensa.c:13078 msgid "invalid operand" msgstr "" -#: config/tc-v850.c:3087 +#: config/tc-v850.c:3084 msgid "loop: 32-bit displacement not supported" msgstr "" @@ -19326,7 +19321,7 @@ msgid "missing table index" msgstr "" -#: config/tc-wasm32.c:726 config/tc-z80.c:3695 read.c:3878 +#: config/tc-wasm32.c:726 config/tc-z80.c:3695 read.c:3966 #, c-format msgid "junk at end of line, first unrecognized character is `%c'" msgstr "" @@ -20114,7 +20109,7 @@ msgid "relative jump out of range" msgstr "" -#: config/tc-z80.c:1994 +#: config/tc-aarch64.c:4463 msgid "index offset out of range" msgstr "" @@ -20462,16 +20457,16 @@ msgid "CFI is not supported for this target" msgstr "" -#: dwarf2dbg.c:379 dwarf2dbg.c:2944 +#: dwarf2dbg.c:378 dwarf2dbg.c:3048 msgid "view number mismatch" msgstr "" -#: dwarf2dbg.c:655 dwarf2dbg.c:1112 +#: dwarf2dbg.c:683 dwarf2dbg.c:1204 #, c-format msgid "file number %lu is too big" msgstr "" -#: dwarf2dbg.c:1062 dwarf2dbg.c:1164 +#: dwarf2dbg.c:1152 dwarf2dbg.c:1244 msgid "file number less than one" msgstr "" @@ -20480,33 +20475,33 @@ msgid "file number %u already allocated" msgstr "" -#: dwarf2dbg.c:1171 dwarf2dbg.c:2194 +#: dwarf2dbg.c:1251 dwarf2dbg.c:2289 #, c-format msgid "unassigned file number %ld" msgstr "" -#: dwarf2dbg.c:1240 +#: dwarf2dbg.c:1325 msgid "is_stmt value not 0 or 1" msgstr "" -#: dwarf2dbg.c:1252 +#: dwarf2dbg.c:1337 msgid "isa number less than zero" msgstr "" -#: dwarf2dbg.c:1264 +#: dwarf2dbg.c:1349 msgid "discriminator less than zero" msgstr "" -#: dwarf2dbg.c:1283 +#: dwarf2dbg.c:1368 msgid "numeric view can only be asserted to zero" msgstr "" -#: dwarf2dbg.c:1321 +#: dwarf2dbg.c:1406 #, c-format msgid "unknown .loc sub-directive `%s'" msgstr "" -#: dwarf2dbg.c:2307 +#: dwarf2dbg.c:2402 msgid "internal error: unknown dwarf2 format" msgstr "" @@ -20697,11 +20692,11 @@ msgid "GP prologue size exceeds field size, using 0 instead" msgstr "" -#: expr.c:73 read.c:3944 +#: expr.c:73 read.c:4032 msgid "bignum invalid" msgstr "" -#: expr.c:75 read.c:3946 read.c:4452 read.c:5248 +#: expr.c:75 read.c:4034 read.c:4540 read.c:5315 msgid "floating point number invalid" msgstr "" @@ -20745,7 +20740,7 @@ msgid "missing '%c'" msgstr "" -#: expr.c:1007 read.c:4732 +#: expr.c:1007 read.c:4825 msgid "EBCDIC constants are not supported" msgstr "" @@ -20783,19 +20778,19 @@ msgid "right operand is a float; integer 0 assumed" msgstr "" -#: expr.c:1948 symbols.c:1560 +#: expr.c:1948 symbols.c:1590 msgid "division by zero" msgstr "" -#: expr.c:1954 symbols.c:1571 +#: expr.c:1954 symbols.c:1601 msgid "shift count" msgstr "" -#: expr.c:2084 +#: expr.c:2089 msgid "operation combines symbols in different segments" msgstr "" -#: expr.c:2409 +#: expr.c:2412 msgid "missing closing '\"'" msgstr "" @@ -20807,7 +20802,7 @@ msgid "attempt to allocate data in common section" msgstr "" -#: frags.c:115 write.c:1480 +#: frags.c:115 write.c:1509 #, c-format msgid "can't extend frag %lu char" msgid_plural "can't extend frag %lu chars" @@ -21079,7 +21074,7 @@ msgstr "" #. xgettext:c-format. -#: messages.c:423 +#: messages.c:426 #, c-format msgid "%s out of range (0x%s is not between 0x%s and 0x%s)" msgstr "" @@ -21099,7 +21094,7 @@ msgid "can't create %s: %s" msgstr "" -#: read.c:520 +#: read.c:521 #, c-format msgid "error constructing %s pseudo-op table: %s" msgstr "" @@ -21120,11 +21115,11 @@ "single instruction is %u bytes long, but .bundle_align_mode limit is %u bytes" msgstr "" -#: read.c:823 read.c:2877 read.c:3448 +#: read.c:823 read.c:2877 read.c:3471 msgid "ignoring fill value in absolute section" msgstr "" -#: read.c:825 read.c:2892 read.c:3487 +#: read.c:825 read.c:2892 read.c:3510 #, c-format msgid "ignoring fill value in section `%s'" msgstr "" @@ -21138,7 +21133,7 @@ msgid "unable to continue with assembly." msgstr "" -#: read.c:1225 +#: read.c:1226 #, c-format msgid "label \"%d$\" redefined" msgstr "" @@ -21295,113 +21290,113 @@ msgid "%s without %s" msgstr "" -#: read.c:3401 +#: read.c:3424 msgid "unsupported variable size or fill value" msgstr "" -#: read.c:3409 +#: read.c:3432 #, c-format msgid "size value for space directive too large: %lx" msgstr "" -#: read.c:3438 +#: read.c:3461 msgid ".space repeat count is zero, ignored" msgstr "" -#: read.c:3440 +#: read.c:3463 msgid ".space repeat count is negative, ignored" msgstr "" -#: read.c:3471 +#: read.c:3494 msgid "space allocation too complex in absolute section" msgstr "" -#: read.c:3477 +#: read.c:3500 msgid "space allocation too complex in common section" msgstr "" -#: read.c:3601 +#: read.c:3624 msgid "negative nop control byte, ignored" msgstr "" -#: read.c:3595 +#: read.c:3618 msgid "unsupported variable nop control in .nops directive" msgstr "" -#: read.c:3831 +#: read.c:3919 #, c-format msgid "%s: would close weakref loop: %s" msgstr "" -#: read.c:3881 +#: read.c:3969 #, c-format msgid "junk at end of line, first unrecognized character valued 0x%x" msgstr "" -#: read.c:4010 write.c:2391 +#: read.c:4098 write.c:2422 #, c-format msgid "`%s' can't be equated to common symbol `%s'" msgstr "" -#: read.c:4138 +#: read.c:4226 msgid "unexpected `\"' in expression" msgstr "" -#: read.c:4151 +#: read.c:4239 msgid "rva without symbol" msgstr "" -#: read.c:4220 +#: read.c:4308 msgid "missing or bad offset expression" msgstr "" -#: read.c:4244 +#: read.c:4332 msgid "missing reloc type" msgstr "" -#: read.c:4268 +#: read.c:4356 msgid "unrecognized reloc type" msgstr "" -#: read.c:4284 +#: read.c:4372 msgid "bad reloc expression" msgstr "" -#: read.c:4446 read.c:5242 +#: read.c:4534 read.c:5309 msgid "zero assumed for missing expression" msgstr "" -#: read.c:4466 read.c:5271 +#: read.c:4554 read.c:5338 msgid "attempt to store value in absolute section" msgstr "" -#: read.c:4473 read.c:5277 +#: read.c:4561 read.c:5344 #, c-format msgid "attempt to store non-zero value in section `%s'" msgstr "" -#: read.c:4545 +#: read.c:4418 #, c-format msgid "value 0x%llx truncated to 0x%llx" msgstr "" -#: read.c:4548 +#: read.c:4421 msgid "value 0x%I64x truncated to 0x%I64x" msgstr "" -#: read.c:4552 +#: read.c:4425 #, c-format msgid "value 0x%lx truncated to 0x%lx" msgstr "" -#: read.c:4594 +#: read.c:4687 #, c-format msgid "bignum truncated to %d byte" msgid_plural "bignum truncated to %d bytes" msgstr[0] "" msgstr[1] "" -#: read.c:4803 read.c:4980 +#: read.c:4896 read.c:5047 msgid "unresolvable or nonpositive repeat count; using 1" msgstr "" @@ -21410,128 +21405,128 @@ msgid "unknown floating type type '%c'" msgstr "" -#: read.c:4874 +#: read.c:4939 msgid "floating point constant too large" msgstr "" -#: read.c:4937 +#: read.c:5004 msgid "attempt to store float in absolute section" msgstr "" -#: read.c:4944 +#: read.c:5011 #, c-format msgid "attempt to store float in section `%s'" msgstr "" -#: read.c:5360 +#: read.c:5427 #, c-format msgid "attempt to store non-empty string in section `%s'" msgstr "" -#: read.c:5422 +#: read.c:5489 msgid "strings must be placed into a section" msgstr "" -#: read.c:5489 +#: read.c:5556 msgid "expected " msgstr "" #. To be compatible with BSD 4.2 as: give the luser a linefeed!! -#: read.c:5530 read.c:5617 +#: read.c:5597 read.c:5684 msgid "unterminated string; newline inserted" msgstr "" -#: read.c:5631 +#: read.c:5698 msgid "bad escaped character in string" msgstr "" -#: read.c:5655 +#: read.c:5722 msgid "expected address expression" msgstr "" -#: read.c:5674 +#: read.c:5741 #, c-format msgid "symbol \"%s\" undefined; zero assumed" msgstr "" -#: read.c:5677 +#: read.c:5744 msgid "some symbol undefined; zero assumed" msgstr "" -#: read.c:5711 +#: read.c:5778 msgid "this string may not contain '\\0'" msgstr "" -#: read.c:5748 +#: read.c:5815 msgid "missing string" msgstr "" -#: read.c:5839 +#: read.c:5906 #, c-format msgid ".incbin count zero, ignoring `%s'" msgstr "" -#: read.c:5865 +#: read.c:5932 #, c-format msgid "file not found: %s" msgstr "" -#: read.c:5888 +#: read.c:5955 #, c-format msgid "seek to end of .incbin file failed `%s'" msgstr "" -#: read.c:5899 +#: read.c:5966 #, c-format msgid "skip (%ld) or count (%ld) invalid for file size (%ld)" msgstr "" -#: read.c:5906 +#: read.c:5973 #, c-format msgid "could not skip to %ld in file `%s'" msgstr "" -#: read.c:5915 +#: read.c:5982 #, c-format msgid "truncated file `%s', %ld of %ld bytes read" msgstr "" -#: read.c:6072 +#: read.c:6139 msgid "missing .func" msgstr "" -#: read.c:6089 +#: read.c:6156 msgid ".endfunc missing for previous .func" msgstr "" -#: read.c:6148 +#: read.c:6215 #, c-format msgid ".bundle_align_mode alignment too large (maximum %u)" msgstr "" -#: read.c:6153 +#: read.c:6220 msgid "cannot change .bundle_align_mode inside .bundle_lock" msgstr "" -#: read.c:6167 +#: read.c:6234 msgid ".bundle_lock is meaningless without .bundle_align_mode" msgstr "" -#: read.c:6188 +#: read.c:6255 msgid ".bundle_unlock without preceding .bundle_lock" msgstr "" -#: read.c:6201 +#: read.c:6268 #, c-format msgid ".bundle_lock sequence is %u bytes, but bundle size is only %u bytes" msgstr "" -#: read.c:6300 +#: read.c:6367 #, c-format msgid "missing closing `%c'" msgstr "" -#: read.c:6302 +#: read.c:6369 msgid "stray `\\'" msgstr "" @@ -21562,221 +21557,221 @@ msgid "comma missing in .xstabs" msgstr "" -#: symbols.c:442 +#: symbols.c:462 #, c-format msgid "cannot define symbol `%s' in absolute section" msgstr "" -#: symbols.c:575 +#: symbols.c:595 #, c-format msgid "symbol `%s' is already defined as \"%s\"/%s%ld" msgstr "" -#: symbols.c:496 symbols.c:503 +#: symbols.c:629 symbols.c:636 #, c-format msgid "inserting \"%s\" into symbol table failed: %s" msgstr "" -#: symbols.c:1169 +#: symbols.c:1189 #, c-format msgid "invalid operands (%s and %s sections) for `%s'" msgstr "" -#: symbols.c:1173 +#: symbols.c:1193 #, c-format msgid "invalid operand (%s section) for `%s'" msgstr "" -#: symbols.c:1181 +#: symbols.c:1201 #, c-format msgid "invalid operands (%s and %s sections) for `%s' when setting `%s'" msgstr "" -#: symbols.c:1184 +#: symbols.c:1204 #, c-format msgid "invalid operand (%s section) for `%s' when setting `%s'" msgstr "" -#: symbols.c:1253 +#: symbols.c:1273 #, c-format msgid "symbol definition loop encountered at `%s'" msgstr "" -#: symbols.c:1280 +#: symbols.c:1300 #, c-format msgid "cannot convert expression symbol %s to complex relocation" msgstr "" -#: symbols.c:1562 +#: symbols.c:1592 #, c-format msgid "division by zero when setting `%s'" msgstr "" #. See PR 20895 for a reproducer. -#: symbols.c:1612 +#: symbols.c:1642 msgid "Invalid operation on symbol" msgstr "" -#: symbols.c:1662 write.c:2440 +#: symbols.c:1692 write.c:2471 #, c-format msgid "can't resolve value for symbol `%s'" msgstr "" -#: symbols.c:2123 +#: symbols.c:2153 #, c-format msgid "\"%d\" (instance number %d of a %s label)" msgstr "" -#: symbols.c:2152 +#: symbols.c:2182 #, c-format msgid "attempt to get value of unresolved symbol `%s'" msgstr "" #. Do not reassign section symbols. -#: symbols.c:2264 +#: symbols.c:2429 msgid "section symbols are already global" msgstr "" -#: symbols.c:2544 +#: symbols.c:2588 #, c-format msgid "Accessing function `%s' as thread-local object" msgstr "" -#: symbols.c:2548 +#: symbols.c:2592 #, c-format msgid "Accessing `%s' as thread-local object" msgstr "" -#: write.c:167 +#: write.c:158 #, c-format msgid "field fx_size too small to hold %lu" msgstr "" -#: write.c:454 +#: write.c:445 #, c-format msgid "attempt to .org/.space/.nops backwards? (%ld)" msgstr "" -#: write.c:476 +#: write.c:467 #, c-format msgid "leb128 operand is an undefined symbol: %s" msgstr "" -#: write.c:707 +#: write.c:698 msgid "invalid offset expression" msgstr "" -#: write.c:729 +#: write.c:720 msgid "invalid reloc expression" msgstr "" -#: write.c:1122 +#: write.c:1117 #, c-format msgid "value of %s too large for field of %d byte at %s" msgid_plural "value of %s too large for field of %d bytes at %s" msgstr[0] "" msgstr[1] "" -#: write.c:1138 +#: write.c:1133 #, c-format msgid "signed .word overflow; switch may be too large; %ld at 0x%lx" msgstr "" -#: write.c:1179 +#: write.c:1174 msgid "redefined symbol cannot be used on reloc" msgstr "" -#: write.c:1192 +#: write.c:1187 msgid "relocation out of range" msgstr "" -#: write.c:1195 +#: write.c:1190 #, c-format msgid "%s:%u: bad return from bfd_install_relocation: %x" msgstr "" -#: write.c:1223 +#: write.c:1218 msgid "reloc not within (fixed part of) section" msgstr "" -#: write.c:1295 +#: write.c:1290 msgid "internal error: fixup not contained within frag" msgstr "" -#: write.c:1413 write.c:1550 +#: write.c:1442 write.c:1579 msgid "can't extend frag" msgstr "" -#: write.c:1598 +#: write.c:1627 msgid "unimplemented .nops directive" msgstr "" -#: write.c:1632 +#: write.c:1661 #, c-format msgid "can't write %ld byte to section %s of %s: '%s'" msgid_plural "can't write %ld bytes to section %s of %s: '%s'" msgstr[0] "" msgstr[1] "" -#: write.c:1658 write.c:1687 write.c:1724 +#: write.c:1687 write.c:1716 write.c:1753 #, c-format msgid "can't fill %ld byte in section %s of %s: '%s'" msgid_plural "can't fill %ld bytes in section %s of %s: '%s'" msgstr[0] "" msgstr[1] "" -#: write.c:1939 +#: write.c:1970 msgid "unable to create reloc for build note" msgstr "" -#: write.c:1943 +#: write.c:1974 msgid "" msgstr "" -#: write.c:2356 +#: write.c:2387 #, c-format msgid "%s: global symbols not supported in common sections" msgstr "" -#: write.c:2370 +#: write.c:2401 #, c-format msgid "local label `%s' is not defined" msgstr "" -#: write.c:2398 +#: write.c:2429 #, c-format msgid "can't make global register symbol `%s'" msgstr "" -#: write.c:2707 +#: write.c:2738 #, c-format msgid "alignment padding (%lu byte) not a multiple of %ld" msgid_plural "alignment padding (%lu bytes) not a multiple of %ld" msgstr[0] "" msgstr[1] "" -#: write.c:2876 +#: write.c:2907 #, c-format msgid ".word %s-%s+%s didn't fit" msgstr "" -#: write.c:2970 +#: write.c:3001 msgid "padding added" msgstr "" -#: write.c:3021 +#: write.c:3052 msgid "attempt to move .org backwards" msgstr "" -#: write.c:2779 +#: write.c:3007 msgid ".space specifies non-absolute value" msgstr "" -#: write.c:3061 +#: write.c:3092 msgid ".space, .nops or .fill with negative value, ignored" msgstr "" -#: write.c:3133 +#: write.c:3164 #, c-format msgid "" "Infinite loop encountered whilst attempting to compute the addresses of " diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gawk.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gawk.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gawk.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gawk.po 2022-02-11 23:04:23.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: 2021-08-02 16:22+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:14+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: array.c:248 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gcc.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gcc.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gcc.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gcc.po 2022-02-11 23:04:20.000000000 +0000 @@ -29,10 +29,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 18:51+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 17:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: cfgrtl.c:2748 msgid "flow control insn inside a basic block" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gdbm.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gdbm.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gdbm.po 2021-08-03 08:53:37.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gdbm.po 2022-02-11 23:04:20.000000000 +0000 @@ -16,221 +16,220 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:39+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: ja\n" +"X-Launchpad-Export-Date: 2022-02-11 15:32+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: ja\n" #: src/bucket.c:90 src/bucket.c:249 msgid "couldn't init cache" msgstr "キャッシュを初期化できませんでした" -#: src/bucket.c:119 src/bucket.c:445 src/falloc.c:197 src/falloc.c:333 -#: src/findkey.c:112 src/gdbmstore.c:169 src/update.c:37 src/update.c:101 +#: src/bucket.c:399 src/bucket.c:684 src/falloc.c:211 src/falloc.c:337 +#: src/findkey.c:124 src/gdbmstore.c:168 src/update.c:36 src/update.c:76 msgid "lseek error" msgstr "lseek エラーです" -#: src/bucket.c:299 +#: src/bucket.c:534 msgid "directory overflow" msgstr "" -#: src/bucket.c:310 src/falloc.c:297 src/findkey.c:85 src/findkey.c:101 +#: src/bucket.c:545 src/falloc.c:302 src/findkey.c:97 src/findkey.c:113 msgid "malloc error" msgstr "malloc エラーです" -#: src/falloc.c:187 +#: src/falloc.c:201 msgid "malloc failed" msgstr "malloc に失敗しました" -#: src/gdbm_dump.c:25 +#: tools/gdbm_dump.c:25 msgid "select dump format" msgstr "" -#: src/gdbm_dump.c:67 +#: tools/gdbm_dump.c:67 msgid "unknown dump format" msgstr "" -#: src/gdbm_dump.c:74 src/gdbm_load.c:215 +#: tools/gdbm_dump.c:74 tools/gdbm_load.c:215 msgid "unknown option" msgstr "" -#: src/gdbm_dump.c:90 src/gdbm_load.c:231 +#: tools/gdbm_dump.c:90 tools/gdbm_load.c:231 #, c-format msgid "too many arguments; try `%s -h' for more info" msgstr "" -#: src/gdbm_dump.c:110 src/gdbm_load.c:251 +#: tools/gdbm_dump.c:110 tools/gdbm_load.c:251 #, c-format msgid "cannot open %s" msgstr "" -#: src/gdbm_dump.c:118 src/gdbm_load.c:261 +#: tools/gdbm_dump.c:118 tools/gdbm_load.c:261 msgid "gdbm_open failed" msgstr "" -#: src/gdbm_dump.c:125 +#: tools/gdbm_dump.c:125 msgid "dump error" msgstr "" -#: src/gdbm_load.c:35 +#: tools/gdbm_load.c:35 msgid "replace records in the existing database" msgstr "" -#: src/gdbm_load.c:36 +#: tools/gdbm_load.c:36 msgid "MODE" msgstr "" -#: src/gdbm_load.c:36 +#: tools/gdbm_load.c:36 msgid "set file mode" msgstr "" -#: src/gdbm_load.c:37 +#: tools/gdbm_load.c:37 msgid "NAME|UID[:NAME|GID]" msgstr "" -#: src/gdbm_load.c:37 +#: tools/gdbm_load.c:37 msgid "set file owner" msgstr "" -#: src/gdbm_load.c:38 +#: tools/gdbm_load.c:38 msgid "do not attempt to set file meta-data" msgstr "" -#: src/gdbm_load.c:39 +#: tools/gdbm_load.c:39 msgid "use memory mapping" msgstr "" -#: src/gdbm_load.c:40 src/gdbm_load.c:41 +#: tools/gdbm_load.c:40 tools/gdbm_load.c:41 msgid "NUM" msgstr "" -#: src/gdbm_load.c:40 +#: tools/gdbm_load.c:40 msgid "set the cache size" msgstr "" -#: src/gdbm_load.c:41 +#: tools/gdbm_load.c:41 msgid "set the block size" msgstr "" -#: src/gdbm_load.c:79 +#: tools/gdbm_load.c:79 #, c-format msgid "invalid number: %s" msgstr "" -#: src/gdbm_load.c:84 +#: tools/gdbm_load.c:84 #, c-format msgid "invalid number: %s: %s" msgstr "" -#: src/gdbm_load.c:136 +#: tools/gdbm_load.c:136 #, c-format msgid "invalid octal number" msgstr "" -#: src/gdbm_load.c:161 +#: tools/gdbm_load.c:161 #, c-format msgid "invalid user name: %s" msgstr "" -#: src/gdbm_load.c:180 +#: tools/gdbm_load.c:180 #, c-format msgid "invalid group name: %s" msgstr "" -#: src/gdbm_load.c:192 +#: tools/gdbm_load.c:192 #, c-format msgid "no such UID: %lu" msgstr "" -#: src/gdbm_load.c:267 src/gdbmtool.c:111 src/gdbmtool.c:117 src/gdbmtool.c:123 -#: src/gdbmtool.c:1055 +#: tools/gdbm_load.c:267 #, c-format msgid "gdbm_setopt failed: %s" msgstr "gdbm_setopt に失敗しました: %s" -#: src/gdbm_load.c:281 src/gdbm_load.c:299 src/gdbmtool.c:1038 +#: tools/gdbm_load.c:281 tools/gdbm_load.c:299 #, c-format msgid "error restoring metadata: %s (%s)" msgstr "" -#: src/gdbm_load.c:290 +#: tools/gdbm_load.c:290 tools/gdbmshell.c:1635 #, c-format msgid "cannot load from %s" msgstr "" -#: src/gdbm_load.c:307 +#: tools/gdbm_load.c:307 msgid "gdbm_setopt failed" msgstr "" -#: src/gdbmerrno.c:103 +#: src/gdbmerrno.c:102 msgid "No error" msgstr "エラー無し" -#: src/gdbmerrno.c:104 +#: src/gdbmerrno.c:103 msgid "Malloc error" msgstr "malloc エラー" -#: src/gdbmerrno.c:105 +#: src/gdbmerrno.c:104 msgid "Block size error" msgstr "ブロックサイズ・エラー" -#: src/gdbmerrno.c:106 +#: src/gdbmerrno.c:105 msgid "File open error" msgstr "ファイルを開く時のエラー" -#: src/gdbmerrno.c:107 +#: src/gdbmerrno.c:106 msgid "File write error" msgstr "ファイル書き込みエラー" -#: src/gdbmerrno.c:108 +#: src/gdbmerrno.c:107 msgid "File seek error" msgstr "ファイル探索 (seek) エラー" -#: src/gdbmerrno.c:109 +#: src/gdbmerrno.c:108 msgid "File read error" msgstr "ファイル読み込みエラー" -#: src/gdbmerrno.c:110 +#: src/gdbmerrno.c:109 msgid "Bad magic number" msgstr "間違ったマジック番号" -#: src/gdbmerrno.c:111 +#: src/gdbmerrno.c:110 msgid "Empty database" msgstr "空データベース" -#: src/gdbmerrno.c:112 +#: src/gdbmerrno.c:111 msgid "Can't be reader" msgstr "読取器になれない" -#: src/gdbmerrno.c:113 +#: src/gdbmerrno.c:112 msgid "Can't be writer" msgstr "書込器になれない" -#: src/gdbmerrno.c:114 +#: src/gdbmerrno.c:113 msgid "Reader can't delete" msgstr "読取器は削除できない" -#: src/gdbmerrno.c:115 +#: src/gdbmerrno.c:114 msgid "Reader can't store" msgstr "読取器は保存できない" -#: src/gdbmerrno.c:116 +#: src/gdbmerrno.c:115 msgid "Reader can't reorganize" msgstr "読取器が認識できない" -#: src/gdbmerrno.c:117 +#: src/gdbmerrno.c:116 msgid "Should not happen: unused error code" msgstr "" -#: src/gdbmerrno.c:118 src/gdbmtool.c:457 +#: src/gdbmerrno.c:117 msgid "Item not found" msgstr "項目が見つからない" -#: src/gdbmerrno.c:119 +#: src/gdbmerrno.c:118 msgid "Reorganize failed" msgstr "認識失敗" -#: src/gdbmerrno.c:120 +#: src/gdbmerrno.c:119 msgid "Cannot replace" msgstr "置換できない" @@ -238,7 +237,7 @@ msgid "Illegal data" msgstr "不正なデータ" -#: src/gdbmerrno.c:122 +#: src/gdbmerrno.c:121 msgid "Option already set" msgstr "オプションはすでに定義されている" @@ -246,58 +245,59 @@ msgid "Illegal option" msgstr "不正なオプション" -#: src/gdbmerrno.c:124 +#: src/gdbmerrno.c:123 msgid "Byte-swapped file" msgstr "バイト順が入れ替わっているファイル" -#: src/gdbmerrno.c:125 +#: src/gdbmerrno.c:124 msgid "File header assumes wrong off_t size" msgstr "" -#: src/gdbmerrno.c:126 +#: src/gdbmerrno.c:125 msgid "Bad file flags" msgstr "間違ったファイルフラグ" -#: src/gdbmerrno.c:127 +#: src/gdbmerrno.c:126 msgid "Cannot stat file" msgstr "ファイルの状態取得 (stat) ができない" -#: src/gdbmerrno.c:128 +#: src/gdbmerrno.c:127 msgid "Unexpected end of file" msgstr "ファイルが途中で切れています" -#: src/gdbmerrno.c:129 +#: src/gdbmerrno.c:128 msgid "Database name not given" msgstr "" -#: src/gdbmerrno.c:130 +#: src/gdbmerrno.c:129 msgid "Failed to restore file owner" msgstr "" -#: src/gdbmerrno.c:131 +#: src/gdbmerrno.c:130 msgid "Failed to restore file mode" msgstr "" -#: src/gdbmerrno.c:132 +#: src/gdbmerrno.c:131 msgid "Database needs recovery" msgstr "" -#: src/gdbmerrno.c:133 +#: src/gdbmerrno.c:132 msgid "Failed to create backup copy" msgstr "" -#: src/gdbmerrno.c:134 +#: src/gdbmerrno.c:133 msgid "Bucket directory overflow" msgstr "" -#: src/gdbmerrno.c:135 +#: src/gdbmerrno.c:134 msgid "Malformed bucket header" msgstr "" -#: src/gdbmerrno.c:136 +#: src/gdbmerrno.c:135 msgid "Malformed database file header" msgstr "" +#. TRANSLATORS: avail_block is a field name. Don't translate it. #: src/gdbmerrno.c:137 msgid "Malformed avail_block" msgstr "" @@ -322,27 +322,27 @@ msgid "Error truncating file" msgstr "" -#: src/parseopt.c:49 +#: tools/parseopt.c:49 msgid "give this help list" msgstr "" -#: src/parseopt.c:50 +#: tools/parseopt.c:50 msgid "print program version" msgstr "" -#: src/parseopt.c:51 +#: tools/parseopt.c:51 msgid "give a short usage message" msgstr "" -#: src/parseopt.c:346 src/parseopt.c:429 +#: tools/parseopt.c:487 tools/parseopt.c:565 msgid "Usage:" msgstr "" -#: src/parseopt.c:348 +#: tools/parseopt.c:489 msgid "OPTION" msgstr "" -#: src/parseopt.c:362 +#: tools/parseopt.c:510 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -352,12 +352,12 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). -#: src/parseopt.c:373 +#: tools/parseopt.c:523 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: src/parseopt.c:376 +#: tools/parseopt.c:526 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -365,11 +365,11 @@ #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. -#: src/parseopt.c:539 +#: tools/parseopt.c:667 msgid "(C)" msgstr "" -#: src/gdbmtool.c:92 +#: tools/gdbmshell.c:120 #, c-format msgid "database %s already exists; overwrite" msgstr "" @@ -384,7 +384,7 @@ msgid "warning: using default database file %s" msgstr "" -#: src/gdbmtool.c:190 +#: src/gdbmshell.c:231 #, c-format msgid "" "bits = %d\n" @@ -392,13 +392,13 @@ "Hash Table:\n" msgstr "" -#: src/gdbmtool.c:193 +#: tools/gdbmshell.c:277 #, c-format msgid "" " # hash value key size data size data adr home key start\n" msgstr "" -#: src/gdbmtool.c:211 +#: src/gdbmshell.c:252 #, c-format msgid "" "\n" @@ -407,7 +407,7 @@ "\n" "利用可能数 = %1d\n" -#: src/gdbmtool.c:212 +#: tools/gdbmshell.c:296 #, c-format msgid "Address size\n" msgstr "" @@ -449,11 +449,11 @@ " Index: Address Changed Data_Hash \n" msgstr "" -#: src/gdbmtool.c:338 +#: tools/gdbmshell.c:381 msgid "True" msgstr "真" -#: src/gdbmtool.c:338 +#: tools/gdbmshell.c:381 msgid "False" msgstr "偽" @@ -462,15 +462,15 @@ msgid "Bucket cache has not been initialized.\n" msgstr "バケットキャッシュが初期化されていません。\n" -#: src/gdbmtool.c:401 +#: tools/gdbmshell.c:463 msgid "nothing to close" msgstr "" -#: src/gdbmtool.c:440 +#: tools/gdbmshell.c:506 msgid "count buffer overflow" msgstr "" -#: src/gdbmtool.c:443 +#: tools/gdbmshell.c:509 #, c-format msgid "There is %s item in the database.\n" msgid_plural "There are %s items in the database.\n" @@ -496,7 +496,7 @@ msgid "Item not inserted: %s." msgstr "" -#: src/gdbmtool.c:510 +#: tools/gdbmshell.c:594 #, c-format msgid "No such item found.\n" msgstr "そのような項目はありません。\n" @@ -510,7 +510,7 @@ msgid "Reorganization failed." msgstr "" -#: src/gdbmtool.c:557 +#: tools/gdbmshell.c:649 msgid "Reorganization succeeded." msgstr "" @@ -520,27 +520,27 @@ msgid "not a number (stopped near %s)\n" msgstr "数値ではありません (%s あたりで停止しました)\n" -#: src/gdbmtool.c:634 src/gdbmtool.c:978 src/gdbmtool.c:1010 +#: tools/gdbmshell.c:727 tools/gdbmshell.c:1561 tools/gdbmshell.c:1596 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: src/gdbmtool.c:643 +#: tools/gdbmshell.c:736 #, c-format msgid "Recovery succeeded.\n" msgstr "" -#: src/gdbmtool.c:647 +#: tools/gdbmshell.c:740 #, c-format msgid "Keys recovered: %lu, failed: %lu, duplicate: %lu\n" msgstr "" -#: src/gdbmtool.c:652 +#: tools/gdbmshell.c:745 #, c-format msgid "Buckets recovered: %lu, failed: %lu\n" msgstr "" -#: src/gdbmtool.c:660 +#: tools/gdbmshell.c:753 #, c-format msgid "Original database preserved in file %s" msgstr "" @@ -550,21 +550,21 @@ msgid "Recovery failed: %s" msgstr "" -#: src/gdbmtool.c:712 +#: tools/gdbmshell.c:812 tools/gdbmshell.c:894 #, c-format msgid "no current bucket\n" msgstr "" -#: src/gdbmtool.c:716 +#: src/gdbmshell.c:773 #, c-format msgid "Bucket #%s" msgstr "" -#: src/gdbmtool.c:719 +#: src/gdbmshell.c:776 msgid "Current bucket" msgstr "現在のバケット" -#: src/gdbmtool.c:720 +#: src/gdbmshell.c:777 #, c-format msgid "" "\n" @@ -573,7 +573,7 @@ "\n" " 現在のディレクトリー項目 = %d。\n" -#: src/gdbmtool.c:722 +#: src/gdbmshell.c:779 #, c-format msgid " current bucket address = %lu.\n" msgstr " 現在のバケットアドレス = %lu。\n" @@ -582,19 +582,19 @@ msgid "Not a bucket." msgstr "" -#: src/gdbmtool.c:812 +#: tools/gdbmshell.c:964 #, c-format msgid "Hash table directory.\n" msgstr "ハッシュ表ディレクトリーです。\n" -#: src/gdbmtool.c:813 +#: src/gdbmshell.c:875 #, c-format msgid "" " Size = %d. Bits = %d, Buckets = %zu.\n" "\n" msgstr "" -#: src/gdbmtool.c:838 +#: tools/gdbmshell.c:1040 #, c-format msgid "" "\n" @@ -605,67 +605,67 @@ "ファイルヘッダ: \n" "\n" -#: src/gdbmtool.c:839 +#: src/gdbmshell.c:946 #, c-format msgid " table = %lu\n" msgstr " 表 = %lu\n" -#: src/gdbmtool.c:841 +#: src/gdbmshell.c:948 #, c-format msgid " table size = %d\n" msgstr " 表サイズ = %d\n" -#: src/gdbmtool.c:842 +#: src/gdbmshell.c:949 #, c-format msgid " table bits = %d\n" msgstr " 表ビット = %d\n" -#: src/gdbmtool.c:843 +#: src/gdbmshell.c:950 #, c-format msgid " block size = %d\n" msgstr " ブロックサイズ = %d\n" -#: src/gdbmtool.c:844 +#: src/gdbmshell.c:951 #, c-format msgid " bucket elems = %d\n" msgstr " バケット要素数 = %d\n" -#: src/gdbmtool.c:845 +#: src/gdbmshell.c:952 #, c-format msgid " bucket size = %d\n" msgstr " バケットサイズ = %d\n" -#: src/gdbmtool.c:846 +#: src/gdbmshell.c:953 #, c-format msgid " header magic = %x\n" msgstr " ヘッダマジック番号 = %x\n" -#: src/gdbmtool.c:847 +#: src/gdbmshell.c:954 #, c-format msgid " next block = %lu\n" msgstr " 次ブロック = %lu\n" -#: src/gdbmtool.c:849 +#: src/gdbmshell.c:957 #, c-format msgid " avail size = %d\n" msgstr " 使用可能サイズ = %d\n" -#: src/gdbmtool.c:850 +#: src/gdbmshell.c:958 #, c-format msgid " avail count = %d\n" msgstr " 使用可能数 = %d\n" -#: src/gdbmtool.c:851 +#: src/gdbmshell.c:959 #, c-format msgid " avail nx blk = %lu\n" msgstr " 使用可能な次ブロック = %lu\n" -#: src/gdbmtool.c:864 +#: tools/gdbmshell.c:1331 #, c-format msgid "hash value = %x, bucket #%u, slot %u" msgstr "" -#: src/gdbmtool.c:870 +#: tools/gdbmshell.c:1337 #, c-format msgid "hash value = %x" msgstr "" @@ -685,7 +685,7 @@ msgid "cannot load from %s: %s" msgstr "" -#: src/gdbmtool.c:1063 +#: tools/gdbmshell.c:1661 #, c-format msgid "Database file: %s\n" msgstr "データベースファイル: %s\n" @@ -694,71 +694,71 @@ msgid "No database name" msgstr "" -#: src/gdbmtool.c:1067 +#: tools/gdbmshell.c:1663 msgid "Database is open" msgstr "" -#: src/gdbmtool.c:1069 +#: tools/gdbmshell.c:1665 msgid "Database is not open" msgstr "" -#: src/gdbmtool.c:1123 +#: tools/gdbmshell.c:1720 #, c-format msgid "unknown debug flag: %s" msgstr "" -#: src/gdbmtool.c:1126 +#: tools/gdbmshell.c:1723 #, c-format msgid "invalid type of argument %d" msgstr "" -#: src/gdbmtool.c:1131 +#: tools/gdbmshell.c:1728 #, c-format msgid "Debug flags:" msgstr "" -#: src/gdbmtool.c:1137 +#: tools/gdbmshell.c:1734 msgid "none" msgstr "" -#: src/gdbmtool.c:1141 +#: tools/gdbmshell.c:1738 msgid "compiled without debug support" msgstr "" -#: src/gdbmtool.c:1196 +#: tools/gdbmshell.c:1954 msgid "count (number of entries)" msgstr "数 (項目数)" -#: src/gdbmtool.c:1199 src/gdbmtool.c:1214 src/gdbmtool.c:1242 -#: src/gdbmtool.c:1306 +#: tools/gdbmshell.c:1964 tools/gdbmshell.c:1992 tools/gdbmshell.c:2045 +#: tools/gdbmshell.c:2154 msgid "KEY" msgstr "" -#: src/gdbmtool.c:1202 +#: tools/gdbmshell.c:1967 msgid "delete a record" msgstr "" -#: src/gdbmtool.c:1205 src/gdbmtool.c:1220 src/gdbmtool.c:1545 +#: tools/gdbmshell.c:1977 tools/gdbmshell.c:2005 tools/gdbmtool.c:93 msgid "FILE" msgstr "" -#: src/gdbmtool.c:1211 +#: tools/gdbmshell.c:1982 msgid "export" msgstr "export" -#: src/gdbmtool.c:1217 +#: tools/gdbmshell.c:1995 msgid "fetch record" msgstr "" -#: src/gdbmtool.c:1226 +#: tools/gdbmshell.c:2010 msgid "import" msgstr "import" -#: src/gdbmtool.c:1232 +#: tools/gdbmshell.c:2022 msgid "list" msgstr "list" -#: src/gdbmtool.c:1235 +#: tools/gdbmshell.c:2032 msgid "[KEY]" msgstr "" @@ -766,11 +766,11 @@ msgid "nextkey" msgstr "nextkey" -#: src/gdbmtool.c:1243 +#: tools/gdbmshell.c:2046 msgid "DATA" msgstr "" -#: src/gdbmtool.c:1247 +#: tools/gdbmshell.c:2049 msgid "store" msgstr "store" @@ -778,195 +778,195 @@ msgid "firstkey" msgstr "firstkey" -#: src/gdbmtool.c:1259 +#: tools/gdbmshell.c:2067 msgid "reorganize" msgstr "reorganize" -#: src/gdbmtool.c:1272 +#: tools/gdbmshell.c:2086 msgid "recover the database" msgstr "" -#: src/gdbmtool.c:1278 +#: tools/gdbmshell.c:2095 msgid "print avail list" msgstr "使用可能なリストを表示する" -#: src/gdbmtool.c:1281 +#: src/gdbmshell.c:1924 msgid "NUMBER" msgstr "" -#: src/gdbmtool.c:1285 +#: tools/gdbmshell.c:2108 msgid "print a bucket" msgstr "バケットを表示する" -#: src/gdbmtool.c:1291 +#: tools/gdbmshell.c:2117 msgid "print current bucket" msgstr "現在のバケットを表示する" -#: src/gdbmtool.c:1297 +#: tools/gdbmshell.c:2135 msgid "print hash directory" msgstr "ハッシュディレクトリーを表示する" -#: src/gdbmtool.c:1303 +#: tools/gdbmshell.c:2144 msgid "print database file header" msgstr "" -#: src/gdbmtool.c:1310 +#: tools/gdbmshell.c:2157 msgid "hash value of key" msgstr "キーのハッシュ値" -#: src/gdbmtool.c:1316 +#: tools/gdbmshell.c:2165 msgid "print the bucket cache" msgstr "バケットキャッシュを表示する" -#: src/gdbmtool.c:1322 +#: tools/gdbmshell.c:2174 msgid "print current program status" msgstr "プログラムの現在の状態を表示する" -#: src/gdbmtool.c:1328 +#: tools/gdbmshell.c:2222 msgid "print version of gdbm" msgstr "gdbm のバージョンを表示する" -#: src/gdbmtool.c:1334 +#: tools/gdbmshell.c:2230 msgid "print this help list" msgstr "このヘルプリストを表示する" -#: src/gdbmtool.c:1340 +#: tools/gdbmshell.c:2239 msgid "quit the program" msgstr "プログラムを終了する" -#: src/gdbmtool.c:1346 +#: tools/gdbmshell.c:2251 msgid "set or list variables" msgstr "" -#: src/gdbmtool.c:1352 +#: tools/gdbmshell.c:2262 msgid "unset variables" msgstr "" -#: src/gdbmtool.c:1360 +#: tools/gdbmshell.c:2274 msgid "define datum structure" msgstr "" -#: src/gdbmtool.c:1367 +#: tools/gdbmshell.c:2285 msgid "source command script" msgstr "" -#: src/gdbmtool.c:1373 +#: tools/gdbmshell.c:2293 msgid "close the database" msgstr "" -#: src/gdbmtool.c:1379 +#: tools/gdbmshell.c:2305 msgid "open new database" msgstr "" -#: src/gdbmtool.c:1383 +#: tools/gdbmshell.c:2314 msgid "[FROM]" msgstr "" -#: src/gdbmtool.c:1384 +#: tools/gdbmshell.c:2315 msgid "[COUNT]" msgstr "" -#: src/gdbmtool.c:1388 +#: tools/gdbmshell.c:2318 msgid "show input history" msgstr "" -#: src/gdbmtool.c:1395 +#: tools/gdbmshell.c:2327 msgid "query/set debug level" msgstr "" -#: src/gdbmtool.c:1525 +#: tools/gdbmshell.c:2492 msgid "Invalid command. Try ? for help." msgstr "無効なコマンドです。ヘルプを見る場合は ? を試してみてください。" -#: src/gdbmtool.c:1526 +#: tools/gdbmshell.c:2493 msgid "Unknown command" msgstr "不明なコマンドです" -#: src/gdbmtool.c:1534 +#: tools/gdbmtool.c:82 msgid "examine and/or modify a GDBM database" msgstr "" -#: src/gdbmtool.c:1535 +#: tools/gdbmtool.c:83 msgid "DBFILE [COMMAND [ARG ...]]" msgstr "" -#: src/gdbmtool.c:1543 src/gdbmtool.c:1544 +#: tools/gdbmtool.c:91 tools/gdbmtool.c:92 msgid "SIZE" msgstr "" -#: src/gdbmtool.c:1543 +#: tools/gdbmtool.c:91 msgid "set block size" msgstr "" -#: src/gdbmtool.c:1544 +#: tools/gdbmtool.c:92 msgid "set cache size" msgstr "" -#: src/gdbmtool.c:1545 +#: tools/gdbmtool.c:93 msgid "read commands from FILE" msgstr "" -#: src/gdbmtool.c:1547 +#: tools/gdbmtool.c:95 msgid "disable file locking" msgstr "" -#: src/gdbmtool.c:1548 +#: tools/gdbmtool.c:96 msgid "do not use mmap" msgstr "" -#: src/gdbmtool.c:1549 +#: tools/gdbmtool.c:97 msgid "create database" msgstr "" -#: src/gdbmtool.c:1550 +#: tools/gdbmtool.c:98 msgid "do not read .gdbmtoolrc file" msgstr "" -#: src/gdbmtool.c:1551 +#: tools/gdbmtool.c:99 msgid "open database in read-only mode" msgstr "" -#: src/gdbmtool.c:1552 +#: tools/gdbmtool.c:100 msgid "synchronize to disk after each write" msgstr "" -#: src/gdbmtool.c:1553 +#: tools/gdbmtool.c:101 msgid "don't print initial banner" msgstr "" -#: src/gdbmtool.c:1555 +#: tools/gdbmtool.c:111 msgid "enable lexical analyzer traces" msgstr "" -#: src/gdbmtool.c:1556 +#: tools/gdbmtool.c:112 msgid "enable grammar traces" msgstr "" -#: src/gdbmtool.c:1836 +#: tools/gdbmshell.c:2808 #, c-format msgid "cannot coerce %s to %s" msgstr "" -#: src/gdbmtool.c:1911 +#: tools/gdbmshell.c:2957 #, c-format msgid "%s: not enough arguments" msgstr "%s: 十分な引数がありません" -#: src/gdbmtool.c:1918 +#: tools/gdbmshell.c:2964 msgid "unexpected eof" msgstr "予期しないファイル終端 (EOF) です" -#: src/gdbmtool.c:1941 +#: tools/gdbmshell.c:2980 #, c-format msgid "%s: too many arguments" msgstr "" -#: src/gdbmtool.c:1969 +#: tools/gdbmshell.c:3041 #, c-format msgid "cannot run pager `%s': %s" msgstr "ページャー `%s' を実行できません: %s" -#: src/gdbmtool.c:2018 +#: tools/gdbmtool.c:48 msgid "cannot find home directory" msgstr "" @@ -975,11 +975,11 @@ msgid "unknown option; try `%s -h' for more info" msgstr "" -#: src/gdbmtool.c:2170 +#: tools/gdbmtool.c:253 msgid "--file and command cannot be used together" msgstr "" -#: src/gdbmtool.c:2192 +#: tools/gdbmshell.c:3146 #, c-format msgid "" "\n" @@ -987,68 +987,68 @@ "\n" msgstr "" -#: src/gram.y:228 +#: tools/gram.y:253 #, c-format msgid "expected \"key\" or \"content\", but found \"%s\"" msgstr "" -#: src/gram.y:299 src/gram.y:320 src/gram.y:352 +#: tools/gram.y:325 tools/gram.y:354 tools/gram.y:386 #, c-format msgid "no such variable: %s" msgstr "" -#: src/gram.y:303 +#: tools/gram.y:329 #, c-format msgid "%s is not a boolean variable" msgstr "" -#: src/gram.y:307 src/gram.y:332 +#: tools/gram.y:341 tools/gram.y:366 #, c-format msgid "unexpected error setting %s: %d" msgstr "" -#: src/gram.y:324 +#: tools/gram.y:358 #, c-format msgid "%s: bad variable type" msgstr "" -#: src/gram.y:328 +#: tools/gram.y:362 #, c-format msgid "%s: value %s is not allowed" msgstr "" -#: src/gram.y:356 +#: tools/gram.y:390 #, c-format msgid "%s: variable cannot be unset" msgstr "" -#: src/lex.l:96 +#: tools/lex.l:144 msgid "recursive sourcing" msgstr "" -#: src/lex.l:98 +#: tools/lex.l:146 #, c-format msgid "%s already sourced here" msgstr "" -#: src/lex.l:204 src/lex.l:214 +#: tools/lex.l:257 tools/lex.l:267 msgid "invalid #line statement" msgstr "" -#: src/datconv.c:264 +#: tools/datconv.c:291 #, c-format msgid "(not enough data)" msgstr "" -#: src/datconv.c:391 src/datconv.c:440 +#: tools/datconv.c:418 tools/datconv.c:467 msgid "mixing tagged and untagged values is not allowed" msgstr "" -#: src/datconv.c:356 +#: tools/datconv.c:383 msgid "cannot convert" msgstr "" -#: src/datconv.c:365 +#: tools/datconv.c:392 #, c-format msgid "cannot convert value #%d: %s" msgstr "" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gettext-runtime.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gettext-runtime.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gettext-runtime.po 2021-08-03 08:53:32.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gettext-runtime.po 2022-02-11 23:04:15.000000000 +0000 @@ -14,15 +14,15 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:26+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:17+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: gnulib-lib/closeout.c:66 msgid "write error" msgstr "書き込みエラー" -#: gnulib-lib/error.c:195 +#: gnulib-lib/error.c:188 msgid "Unknown system error" msgstr "未知のシステムエラー" @@ -36,57 +36,58 @@ msgid "%s: option '%s' is ambiguous\n" msgstr "%s: オプション '%s' は曖昧です\n" -#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580 +#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション '--%s' に引数はありません\n" -#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594 +#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' に引数はありません\n" -#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 +#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: オプション '--%s' には引数が必要です\n" -#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697 +#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: オプション '--%s' は不可\n" -#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708 +#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: オプション '%c%s' は不可\n" -#: gnulib-lib/getopt.c:621 +#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効なオプション -- '%c'\n" -#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682 +#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088 +#: gnulib-lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 引数が必要なオプション -- '%c'\n" -#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899 +#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション '-W %s' は曖昧です\n" -#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941 +#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション '-W %s' に引数はありません\n" -#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980 +#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: オプション '-W %s' には引数が必要です\n" -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -111,22 +112,22 @@ "これはフリー・ソフトウェアです. 改変と再配布は自由です.\n" "法で許された範囲内で無保証です.\n" -#: src/envsubst.c:116 src/gettext.c:141 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "作者 %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:116 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:125 src/gettext.c:159 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "引数が多すぎます" -#: src/envsubst.c:136 src/gettext.c:169 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" msgstr "引数がありません" @@ -136,44 +137,44 @@ msgid "Try '%s --help' for more information.\n" msgstr "より多くの情報を得るためには '%s --help' と入力してください.\n" -#: src/envsubst.c:179 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "使用法: %s [オプション] [シェル形式]\n" -#: src/envsubst.c:184 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "環境変数の値を代入.\n" -#: src/envsubst.c:188 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "オペレーションモード:\n" -#: src/envsubst.c:191 +#: src/envsubst.c:188 #, c-format, no-wrap msgid "" " -v, --variables output the variables occurring in SHELL-" "FORMAT\n" msgstr " -v, --variables シェル形式に現れる変数を出力\n" -#: src/envsubst.c:195 src/gettext.c:275 src/ngettext.c:241 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" msgstr "有益な出力:\n" -#: src/envsubst.c:198 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help このヘルプを表示して終了\n" -#: src/envsubst.c:201 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version バージョン情報を出力して終了\n" -#: src/envsubst.c:205 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -189,7 +190,7 @@ "シェル形式が指定されると, シェル形式で参照される, そのような環境変数だけが\n" "代入されますが, そうでない場合は標準入力に現れる全ての環境変数が代入されます.\n" -#: src/envsubst.c:214 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output " @@ -208,21 +209,21 @@ msgid "Report bugs to .\n" msgstr "バグレポートは まで.\n" -#: src/envsubst.c:451 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\" 読み込み中のエラー" -#: src/envsubst.c:451 +#: src/envsubst.c:443 msgid "standard input" msgstr "標準入力" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:141 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -#: src/gettext.c:251 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -231,7 +232,7 @@ "使用法: %s [オプション] [[TEXTDOMAIN] MSGID]\n" "または: %s [オプション] -s [MSGID]...\n" -#: src/gettext.c:257 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "原文のメッセージの自国語翻訳を表示.\n" @@ -280,12 +281,12 @@ "翻訳されたものを表示します.\n" "標準の検索ディレクトリ: %s\n" -#: src/ngettext.c:216 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "使用法: %s [オプション] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:221 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -314,7 +315,7 @@ " MSGID MSGID-PLURAL MSGID (単数形) / MSGID-PLURAL (複数形) を翻訳\n" " COUNT この値を基本にして単数/複数形を選択\n" -#: src/ngettext.c:249 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gettext-tools.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gettext-tools.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/gettext-tools.po 2021-08-03 08:53:31.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/gettext-tools.po 2022-02-11 23:04:14.000000000 +0000 @@ -15,40 +15,40 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:26+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:18+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" -#: gnulib-lib/argmatch.c:132 +#: gnulib-lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" msgstr "%2$s に対する引数 %1$s が間違っています" -#: gnulib-lib/argmatch.c:133 +#: gnulib-lib/argmatch.c:134 #, c-format msgid "ambiguous argument %s for %s" msgstr "%2$s に対する引数 %1$s が曖昧です" -#: gnulib-lib/argmatch.c:152 +#: gnulib-lib/argmatch.c:153 msgid "Valid arguments are:" msgstr "正しい引数:" -#: gnulib-lib/clean-temp.c:579 +#: gnulib-lib/clean-temp.c:332 #, c-format msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "一時ディレクトリを見付けられません. $TMPDIR を設定してみてください" -#: gnulib-lib/clean-temp.c:594 +#: gnulib-lib/clean-temp.c:346 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "テンプレート \"%s\" を使って一時ディレクトリを作ることができません" -#: gnulib-lib/clean-temp.c:460 +#: gnulib-lib/clean-temp.c:442 #, c-format msgid "cannot remove temporary file %s" msgstr "一時ファイル \"%s\" を削除できません" -#: gnulib-lib/clean-temp.c:711 +#: gnulib-lib/clean-temp.c:457 #, c-format msgid "cannot remove temporary directory %s" msgstr "一時ディレクトリ %s を削除できません" @@ -87,10 +87,10 @@ msgid "error after reading %s" msgstr "%s を読み込んだ後にエラーが発生しました" -#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:955 -#: src/msginit.c:1038 src/msginit.c:1207 src/msginit.c:1313 src/msginit.c:1483 -#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73 -#: src/read-tcl.c:111 src/write-resources.c:79 src/x-ruby.c:134 +#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897 +#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 +#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73 +#: src/read-tcl.c:110 src/write-resources.c:77 #, c-format msgid "fdopen() failed" msgstr "fdopen() 失敗" @@ -105,13 +105,13 @@ msgid "C# virtual machine not found, try installing pnet" msgstr "C# 仮想マシンが見つかりません. pnet をインストールしてみてください" -#: gnulib-lib/error.c:195 libgettextpo/error.c:195 +#: gnulib-lib/error.c:188 msgid "Unknown system error" msgstr "未知のシステムエラー" -#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258 -#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349 -#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364 +#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 +#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348 +#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s サブプロセスが失敗しました" @@ -126,82 +126,82 @@ msgid "%s: option '%s' is ambiguous\n" msgstr "%s: オプション '%s' は曖昧です\n" -#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580 +#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション '--%s' に引数はありません\n" -#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594 +#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' に引数はありません\n" -#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 +#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: オプション '--%s' には引数が必要です\n" -#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697 +#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: オプション `--%s' は不可\n" -#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708 +#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: オプション '%c%s' は不可\n" -#: gnulib-lib/getopt.c:621 +#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効なオプション -- '%c'\n" -#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682 +#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088 +#: gnulib-lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 引数が必要なオプション -- '%c'\n" -#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899 +#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション '-W %s' は曖昧です\n" -#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941 +#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション '-W %s' に引数はありません\n" -#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980 +#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: オプション '-W %s' には引数が必要です\n" -#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174 -#: gnulib-lib/javacomp.c:200 +#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140 +#: gnulib-lib/javacomp.c:156 #, c-format msgid "invalid source_version argument to compile_java_class" msgstr "compile_java_class に対する無効な source_version 引数" -#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252 +#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192 #, c-format msgid "invalid target_version argument to compile_java_class" msgstr "compile_java_class に対する無効な target_version 引数" -#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145 -#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193 +#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131 +#: src/write-java.c:1143 #, c-format msgid "failed to create \"%s\"" msgstr "\"%s\" の生成に失敗しました" -#: gnulib-lib/javacomp.c:586 src/write-catalog.c:256 src/write-catalog.c:329 -#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161 -#: src/write-java.c:1202 src/write-mo.c:802 src/write-mo.c:824 -#: src/write-qt.c:751 src/write-tcl.c:228 src/write-xml.c:76 +#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319 +#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811 +#: src/write-qt.c:748 src/write-tcl.c:222 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" ファイルを書き込み中にエラーが発生しました" -#: gnulib-lib/javacomp.c:2436 +#: gnulib-lib/javacomp.c:2343 #, c-format msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Java コンパイラが見つかりません. gcj をインストールするか $JAVAC を設定してみてください" @@ -211,16 +211,15 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "Java 仮想マシンが見つかりません. gij をインストールするか $JAVA を設定してください" -#: gnulib-lib/javaversion.c:86 src/msginit.c:963 src/msginit.c:1046 -#: src/msginit.c:1215 src/msginit.c:1491 +#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980 +#: src/msginit.c:1140 #, c-format msgid "%s subprocess I/O error" msgstr "%s サブプロセス入出力エラー" -#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38 -#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83 -#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326 libgettextpo/obstack.c:338 -#: libgettextpo/obstack.c:340 libgettextpo/xmalloc.c:38 +#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37 +#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83 +#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328 #, c-format msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -230,8 +229,8 @@ msgid "creation of threads failed" msgstr "スレッドの生成に失敗" -#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502 -#: src/msgexec.c:428 +#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374 +#: src/msgexec.c:389 #, c-format msgid "write to %s subprocess failed" msgstr "%s へ書き出すサブプロセスが失敗しました" @@ -275,13 +274,13 @@ #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: gnulib-lib/quotearg.c:355 +#: gnulib-lib/quotearg.c:312 msgid "`" msgstr "`" -#: gnulib-lib/quotearg.c:356 +#: gnulib-lib/quotearg.c:313 msgid "'" msgstr "'" @@ -290,29 +289,29 @@ msgid "setting permissions for %s" msgstr "%s に対するアクセス権を設定" -#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144 -#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268 +#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143 +#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267 #, c-format msgid "cannot create pipe" msgstr "パイプを作ることができません" -#: gnulib-lib/w32spawn.h:49 +#: gnulib-lib/w32spawn.h:43 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle 失敗" -#: gnulib-lib/w32spawn.h:90 +#: gnulib-lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "fd %d を復元できません: dup2 失敗" -#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263 -#: gnulib-lib/wait-process.c:325 +#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255 +#: gnulib-lib/wait-process.c:317 #, c-format msgid "%s subprocess" msgstr "%s サブプロセス" -#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354 +#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s サブプロセスが致命的なシグナル %d を受け取りました" @@ -363,7 +362,7 @@ "CLDR 複数形ルールを読み込み, gettext が使えるような形で表示します.\n" "引数がない場合, 標準入力から CLDR 複数形ルールを読み込みます.\n" -#: src/cldr-plurals.c:206 src/msgfmt.c:913 src/xgettext.c:1060 +#: src/msgfmt.c:663 src/xgettext.c:826 #, c-format, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -377,22 +376,20 @@ msgid " -c, --cldr print plural rules in the CLDR format\n" msgstr " -c, --cldr CLDR 形式で複数形ルールを表示\n" -#: src/cldr-plurals.c:213 src/hostname.c:229 src/msgattrib.c:534 -#: src/msgcat.c:468 src/msgcmp.c:257 src/msgcomm.c:454 src/msgconv.c:385 -#: src/msgen.c:381 src/msgexec.c:305 src/msgfilter.c:507 src/msgfmt.c:1066 -#: src/msggrep.c:624 src/msginit.c:469 src/msgmerge.c:664 src/msgunfmt.c:527 -#: src/msguniq.c:417 src/recode-sr-latin.c:161 src/urlget.c:185 -#: src/xgettext.c:1235 +#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260 +#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297 +#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422 +#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418 +#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:983 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help このヘルプを表示して終了\n" -#: src/cldr-plurals.c:215 src/hostname.c:231 src/msgattrib.c:536 -#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387 -#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068 -#: src/msggrep.c:626 src/msginit.c:471 src/msgmerge.c:666 src/msgunfmt.c:529 -#: src/msguniq.c:419 src/recode-sr-latin.c:164 src/urlget.c:187 -#: src/xgettext.c:1237 +#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262 +#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299 +#: src/msgfilter.c:480 src/msgfmt.c:779 src/msggrep.c:627 src/msginit.c:424 +#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420 +#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:985 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version バージョン情報を表示して終了\n" @@ -403,9 +400,9 @@ #. bugs (typically your translation team's web or email address). #: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269 #: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306 -#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431 +#: src/msgfilter.c:487 src/msgfmt.c:790 src/msggrep.c:634 src/msginit.c:431 #: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427 -#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991 +#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:992 msgid "Report bugs to .\n" msgstr "バグレポートは まで.\n" @@ -432,11 +429,11 @@ "これはフリー・ソフトウェアですので変更と再配布は自由です.\n" "ただし法律が許す範囲で無保証です.\n" -#: src/cldr-plurals.c:298 src/hostname.c:183 src/msgattrib.c:359 -#: src/msgcat.c:297 src/msgcmp.c:175 src/msgcomm.c:288 src/msgconv.c:248 -#: src/msgen.c:245 src/msgexec.c:189 src/msgfilter.c:292 src/msgfmt.c:448 -#: src/msggrep.c:419 src/msginit.c:275 src/msgmerge.c:376 src/msgunfmt.c:266 -#: src/msguniq.c:268 src/urlget.c:146 src/xgettext.c:692 +#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178 +#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186 +#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274 +#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149 +#: src/xgettext.c:590 #, c-format msgid "Written by %s.\n" msgstr "作者 %s.\n" @@ -466,42 +463,35 @@ msgid "extra operand %s" msgstr "余分なオペランド %s" -#: src/file-list.c:53 src/msggrep.c:241 src/open-catalog.c:124 -#: src/read-mo.c:270 src/read-tcl.c:126 src/urlget.c:217 -#: src/write-desktop.c:173 src/xgettext.c:1755 src/xgettext.c:1764 -#: src/xgettext.c:1780 src/xgettext.c:1812 src/xgettext.c:1822 -#: src/xgettext.c:1839 +#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122 +#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1891 +#: src/xgettext.c:1904 src/xgettext.c:1914 #, c-format msgid "error while opening \"%s\" for reading" msgstr "\"%s\" を読み込もうとしてエラーが発生しました" #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348 -#: src/format-gcc-internal.c:627 src/format-java-printf.c:580 -#: src/format-javascript.c:355 src/format-kde.c:223 src/format-librep.c:312 -#: src/format-lua.c:228 src/format-pascal.c:396 src/format-perl.c:582 -#: src/format-php.c:348 src/format-qt.c:173 src/format-smalltalk.c:147 -#: src/format-tcl.c:390 +#: src/format-gcc-internal.c:627 src/format-librep.c:312 +#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350 +#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in '%s'" msgstr "引数 %u に対する形式の指定が '%s' のように '%s' に存在しません" #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359 -#: src/format-gcc-internal.c:638 src/format-java-printf.c:591 -#: src/format-javascript.c:366 src/format-kde.c:234 src/format-librep.c:323 -#: src/format-lua.c:235 src/format-pascal.c:407 src/format-perl.c:593 -#: src/format-php.c:359 src/format-qt.c:170 src/format-smalltalk.c:144 -#: src/format-tcl.c:401 +#: src/format-gcc-internal.c:638 src/format-librep.c:323 +#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361 +#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "引数 %u に対する形式の指定が '%s' に存在しません" #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146 #: src/format-elisp.c:379 src/format-gcc-internal.c:658 -#: src/format-gfc-internal.c:372 src/format-java-printf.c:611 -#: src/format-javascript.c:389 src/format-librep.c:343 src/format-lua.c:242 -#: src/format-pascal.c:427 src/format-perl.c:613 src/format-php.c:379 -#: src/format-python.c:527 src/format-ruby.c:959 src/format-tcl.c:421 +#: src/format-gfc-internal.c:372 src/format-librep.c:343 +#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381 +#: src/format-python.c:527 src/format-tcl.c:421 #, c-format msgid "" "format specifications in '%s' and '%s' for argument %u are not the same" @@ -512,7 +502,7 @@ msgid "The directive number %u starts with | but does not end with |." msgstr "命令番号 %u が, | で始まっていますが | で終わっていません." -#: src/format.c:154 +#: src/format.c:148 #, c-format msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s" msgstr "'%s' は正しい %s 形式の文字列ではなく, '%s' とは違います. 理由: %s" @@ -538,47 +528,47 @@ "The string refers to argument number %u but ignores argument number %u." msgstr "文字列は引数番号 %u を参照していますが引数番号 %u を無視しています." -#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363 -#: src/format-python.c:515 src/format-qt-plural.c:110 src/format-ruby.c:950 +#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363 +#: src/format-python.c:515 src/format-qt-plural.c:110 #, c-format msgid "number of format specifications in '%s' and '%s' does not match" msgstr "'%s' と '%s' で指定した形式の数が合っていません" -#: src/format-csharp.c:85 src/format-java.c:206 +#: src/format-csharp.c:88 src/format-java.c:205 #, c-format msgid "" "In the directive number %u, '{' is not followed by an argument number." msgstr "命令番号 %u では, '{' の後に引数の数が来ることはありません." -#: src/format-csharp.c:106 +#: src/format-csharp.c:109 #, c-format msgid "In the directive number %u, ',' is not followed by a number." msgstr "命令番号 %u では, ',' の後に数字が来ることはありません." -#: src/format-csharp.c:127 src/format-java.c:192 +#: src/format-csharp.c:130 src/format-java.c:191 msgid "" "The string ends in the middle of a directive: found '{' without matching '}'." msgstr "文字列は命令の途中で終わっています: '{' と '}' が一致していません." -#: src/format-csharp.c:136 +#: src/format-csharp.c:139 #, c-format msgid "" "The directive number %u ends with an invalid character '%c' instead of '}'." msgstr "命令番号 %u が, '}' の代わりに不正な文字 '%c' で終わっています." -#: src/format-csharp.c:137 +#: src/format-csharp.c:140 #, c-format msgid "" "The directive number %u ends with an invalid character instead of '}'." msgstr "命令番号 %u が, '}' の代わりに不正な文字で終わっています." -#: src/format-csharp.c:158 src/format-java.c:347 +#: src/format-csharp.c:161 src/format-java.c:346 msgid "" "The string starts in the middle of a directive: found '}' without matching " "'{'." msgstr "文字列は命令の途中から始まっています: '}' と '{' が一致していません." -#: src/format-csharp.c:159 +#: src/format-csharp.c:162 #, c-format msgid "The string contains a lone '}' after directive number %u." msgstr "文字列が命令番号 %u のあとに閉じていない '}' を含んでいます." @@ -686,25 +676,25 @@ msgid "The string refers to argument number %u in incompatible ways." msgstr "文字列は非互換な方法で引数番号 %u を参照しています." -#: src/format-java.c:241 +#: src/format-java.c:240 #, c-format msgid "" "In the directive number %u, the substring \"%s\" is not a valid date/time " "style." msgstr "命令番号 %u では, \"%s\" は正しい日付や時刻の形式ではありません." -#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315 +#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314 #, c-format msgid "In the directive number %u, \"%s\" is not followed by a comma." msgstr "命令番号 %u では, \"%s\" の後にカンマが来ることはありません." -#: src/format-java.c:275 +#: src/format-java.c:274 #, c-format msgid "" "In the directive number %u, the substring \"%s\" is not a valid number style." msgstr "命令番号 %u では, \"%s\" は正しい数値の形式ではありません." -#: src/format-java.c:324 +#: src/format-java.c:323 #, c-format msgid "" "In the directive number %u, the argument number is not followed by a comma " @@ -712,30 +702,30 @@ msgstr "" "命令番号 %u では, 引数の数の後にカンマや \"%s\", \"%s\", \"%s\", \"%s\" の中の 1つが来ることはありません." -#: src/format-java.c:573 +#: src/format-java.c:572 #, c-format msgid "In the directive number %u, a choice contains no number." msgstr "命令番号 %u では, 選択肢に数値がありません." -#: src/format-java.c:584 +#: src/format-java.c:583 #, c-format msgid "" "In the directive number %u, a choice contains a number that is not followed " "by '<', '#' or '%s'." msgstr "命令番号 %u では, 選択肢に数値があり, '<', '#' や '%s' がその後にくることはありません." -#: src/format-java.c:746 +#: src/format-java.c:745 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'" msgstr "引数 {%u} に対する形式の指定が '%s' のように '%s' に存在しません" -#: src/format-java.c:757 +#: src/format-java.c:756 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "引数 {%u} に対する形式の指定が '%s' に存在しません" -#: src/format-java.c:777 +#: src/format-java.c:776 #, c-format msgid "" "format specifications in '%s' and '%s' for argument {%u} are not the same" @@ -760,15 +750,15 @@ msgid "error while parsing: %s" msgstr "構文解析中のエラー: %s" -#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365 -#: src/format-scheme.c:2377 +#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363 +#: src/format-scheme.c:2375 #, c-format msgid "" "In the directive number %u, parameter %u is of type '%s' but a parameter of " "type '%s' is expected." msgstr "命令番号 %u では, パラメータ %u は '%s' 型ですが '%s' 型のパラメータは想定されていません." -#: src/format-lisp.c:2375 src/format-scheme.c:2400 +#: src/format-lisp.c:2372 src/format-scheme.c:2398 #, c-format msgid "" "In the directive number %u, too many parameters are given; expected at most " @@ -778,66 +768,64 @@ "%u parameters." msgstr[0] "命令番号 %u では, 指定されたパラメータが多すぎます: パラメータは最大でも %u 個です." -#: src/format-lisp.c:2499 src/format-scheme.c:2501 +#: src/format-lisp.c:2496 src/format-scheme.c:2499 #, c-format msgid "In the directive number %u, '%c' is not followed by a digit." msgstr "命令番号 %u では, '%c' の後に数値が来ることはありません." -#: src/format-lisp.c:2739 src/format-scheme.c:2756 +#: src/format-lisp.c:2736 src/format-scheme.c:2754 #, c-format msgid "In the directive number %u, the argument %d is negative." msgstr "命令番号 %u では, 引数 %d は負です." -#: src/format-lisp.c:2808 +#: src/format-lisp.c:2805 msgid "The string ends in the middle of a ~/.../ directive." msgstr "文字列は ~/.../ 命令の途中で終わっています." -#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228 -#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842 -#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322 +#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225 +#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840 +#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320 #, c-format msgid "Found '~%c' without matching '~%c'." msgstr "'~%c' が '~%c' に一致していません." -#: src/format-lisp.c:2866 src/format-scheme.c:2862 +#: src/format-lisp.c:2863 src/format-scheme.c:2860 #, c-format msgid "In the directive number %u, both the @ and the : modifiers are given." msgstr "命令番号 %u では, @ と : の両方の修飾子が指定されています." -#: src/format-lisp.c:2979 src/format-scheme.c:2975 +#: src/format-lisp.c:2976 src/format-scheme.c:2973 #, c-format msgid "" "In the directive number %u, '~:[' is not followed by two clauses, separated " "by '~;'." msgstr "命令番号 %u では, '~:[' の後に '~;' で分けられた 2つの節がありません." -#: src/format-lisp.c:3329 src/format-scheme.c:3265 +#: src/format-lisp.c:3326 src/format-scheme.c:3263 #, c-format msgid "In the directive number %u, '~;' is used in an invalid position." msgstr "命令番号 %u では, '~;' は不正な場所で使われています." -#: src/format-lisp.c:3435 src/format-scheme.c:3357 +#: src/format-lisp.c:3432 src/format-scheme.c:3355 msgid "The string refers to some argument in incompatible ways." msgstr "文字列は非互換な方法で引数を参照しています." -#: src/format-lisp.c:3477 src/format-scheme.c:3399 +#: src/format-lisp.c:3474 src/format-scheme.c:3397 #, c-format msgid "format specifications in '%s' and '%s' are not equivalent" msgstr "'%s' と '%s' での形式の指定が等しくありません" -#: src/format-lisp.c:3493 src/format-scheme.c:3415 +#: src/format-lisp.c:3490 src/format-scheme.c:3413 #, c-format msgid "format specifications in '%s' are not a subset of those in '%s'" msgstr "'%s' での形式の指定が '%s' でのサブセットではありません" -#: src/format-perl-brace.c:199 src/format-python-brace.c:442 -#: src/format-python-brace.c:455 src/format-python.c:471 src/format-ruby.c:909 -#: src/format-sh.c:308 +#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "引数 '%s' に対する形式指定が '%s' に存在しません" -#: src/format-perl.c:432 +#: src/format-perl.c:433 #, c-format msgid "" "In the directive number %u, the size specifier is incompatible with the " @@ -871,13 +859,13 @@ "In the directive number %u, there is an unterminated format directive." msgstr "命令番号 %u で, 終端文字のないフォーマット命令があります." -#: src/format-python.c:114 src/format-ruby.c:131 +#: src/format-python.c:115 msgid "" "The string refers to arguments both through argument names and through " "unnamed argument specifications." msgstr "文字列は, 名前のある引数も, 名前なしの引数も, どちらの引数も参照しています." -#: src/format-python.c:354 src/format-ruby.c:792 +#: src/format-python.c:354 #, c-format msgid "The string refers to the argument named '%s' in incompatible ways." msgstr "文字列は非互換な方法で引数名 '%s' を参照しています." @@ -894,13 +882,13 @@ "format specifications in '%s' expect a tuple, those in '%s' expect a mapping" msgstr "'%s' での形式指定はタプル (tuple) ですが, '%s' ではマッピングです" -#: src/format-python.c:460 src/format-ruby.c:898 src/format-sh.c:297 +#: src/format-python.c:460 src/format-sh.c:297 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in '%s'" msgstr "引数 '%s' に対する形式指定が '%s' のように '%s' に存在しません" -#: src/format-python.c:494 src/format-ruby.c:929 +#: src/format-python.c:494 #, c-format msgid "" "format specifications in '%s' and '%s' for argument '%s' are not the same" @@ -913,34 +901,34 @@ "a double-digit argument number" msgstr "'%s' は単純なフォーマット文字列ですが, '%s' は違います. 'L' フラグか 2桁の数値引数を含みます" -#: src/format-sh.c:78 +#: src/format-sh.c:79 msgid "The string refers to a shell variable with a non-ASCII name." msgstr "文字列は名前がアスキーでないシェル変数を参照しています." -#: src/format-sh.c:80 +#: src/format-sh.c:81 msgid "" "The string refers to a shell variable with complex shell brace syntax. This " "syntax is unsupported here due to security reasons." msgstr "文字列は複雑なシェル括弧の文法を使ったシェル変数を参照しています. この文法はここではセキュリティ上の理由で実装されていません." -#: src/format-sh.c:82 +#: src/format-sh.c:83 msgid "" "The string refers to a shell variable whose value may be different inside " "shell functions." msgstr "文字列はシェル関数内で異なる可能性のある値を持ったシェル変数を参照しています." -#: src/format-sh.c:84 +#: src/format-sh.c:85 msgid "The string refers to a shell variable with an empty name." msgstr "文字列は名前が空のシェル変数を参照しています." -#: src/format-smalltalk.c:90 +#: src/format-ycp.c:90 #, c-format msgid "" "In the directive number %u, the character '%c' is not a digit between 1 and " "9." msgstr "命令番号 %u では, 文字 '%c' は 1 から 9 の間の数字ではありません." -#: src/format-smalltalk.c:91 +#: src/format-ycp.c:91 #, c-format msgid "" "The character that terminates the directive number %u is not a digit between " @@ -948,39 +936,39 @@ msgstr "命令番号 %u の終端文字は 1 から 9 の間の数字ではありません." #. This is a proper name. See the gettext manual, section Names. -#: src/hostname.c:183 src/msgattrib.c:359 src/msgcat.c:297 src/msgconv.c:248 -#: src/msgen.c:245 src/msgexec.c:189 src/msgfilter.c:292 src/msggrep.c:419 -#: src/msginit.c:275 src/msguniq.c:268 src/recode-sr-latin.c:118 -#: src/urlget.c:146 +#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241 +#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416 +#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121 +#: src/urlget.c:149 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/hostname.c:193 src/msginit.c:285 src/recode-sr-latin.c:127 +#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130 #, c-format msgid "too many arguments" msgstr "引数が多すぎます" -#: src/hostname.c:210 src/msginit.c:409 src/recode-sr-latin.c:145 +#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "使用法: %s [オプション]\n" -#: src/hostname.c:214 +#: src/hostname.c:215 #, c-format msgid "Print the machine's hostname.\n" msgstr "マシンのホスト名を表示.\n" -#: src/hostname.c:217 +#: src/hostname.c:218 #, c-format msgid "Output format:\n" msgstr "出力形式:\n" -#: src/hostname.c:219 +#: src/hostname.c:220 #, c-format msgid " -s, --short short host name\n" msgstr " -s, --short 短いホスト名\n" -#: src/hostname.c:221 +#: src/hostname.c:222 #, c-format msgid "" " -f, --fqdn, --long long host name, includes fully qualified " @@ -990,21 +978,21 @@ " -f, --fqdn, --long 長いホスト名, FQDN (Fully Qualified Domain Name)\n" " と別名 (エイリアス) を含む\n" -#: src/hostname.c:224 +#: src/hostname.c:225 #, c-format msgid " -i, --ip-address addresses for the hostname\n" msgstr " -i, --ip-address ホスト名に対するアドレス\n" -#: src/hostname.c:227 src/msgattrib.c:532 src/msgcat.c:466 src/msgcmp.c:255 -#: src/msgcomm.c:452 src/msgconv.c:383 src/msgen.c:379 src/msgexec.c:303 -#: src/msgfilter.c:505 src/msgfmt.c:1064 src/msggrep.c:622 src/msginit.c:467 -#: src/msgmerge.c:662 src/msgunfmt.c:525 src/msguniq.c:415 -#: src/recode-sr-latin.c:158 src/urlget.c:183 src/xgettext.c:1233 +#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258 +#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295 +#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420 +#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416 +#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:981 #, c-format, no-wrap msgid "Informative output:\n" msgstr "情報出力:\n" -#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271 +#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268 #, c-format msgid "could not get host name" msgstr "ホスト名を取得できませんでした" @@ -1065,28 +1053,30 @@ msgid "the root element is not \"locatingRules\"" msgstr "そのルート要素は \"locatingRules\" ではありません" -#: src/msgattrib.c:374 src/msgconv.c:263 src/msgexec.c:150 src/msgfilter.c:193 -#: src/msggrep.c:434 src/msginit.c:197 src/msguniq.c:283 +#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194 +#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280 #, c-format msgid "at most one input file allowed" msgstr "最大 1つの入力ファイルが許されます" -#: src/msgattrib.c:380 src/msgcat.c:313 src/msgcomm.c:298 src/msgconv.c:269 -#: src/msgen.c:267 src/msgfilter.c:307 src/msgfmt.c:501 src/msgfmt.c:509 -#: src/msgfmt.c:524 src/msgfmt.c:546 src/msggrep.c:440 src/msgmerge.c:401 -#: src/msgmerge.c:406 src/msgmerge.c:411 src/msgmerge.c:416 src/msgmerge.c:437 -#: src/msgunfmt.c:297 src/msguniq.c:289 src/xgettext.c:702 src/xgettext.c:709 -#: src/xgettext.c:712 src/xgettext.c:715 src/xgettext.c:739 +#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315 +#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266 +#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298 +#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456 +#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396 +#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290 +#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614 +#: src/xgettext.c:617 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s と %s は背反です" -#: src/msgattrib.c:419 src/msgconv.c:305 src/msggrep.c:510 src/msguniq.c:324 +#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "使用法: %s [オプション] [入力ファイル]\n" -#: src/msgattrib.c:424 +#: src/msgattrib.c:412 #, c-format, no-wrap msgid "" "Filters the messages of a translation catalog according to their " @@ -1094,126 +1084,125 @@ "and manipulates the attributes.\n" msgstr "属性に従って翻訳カタログのメッセージを選別し, 属性をうまく操作します.\n" -#: src/msgattrib.c:428 src/msgcat.c:381 src/msgcmp.c:224 src/msgcomm.c:372 -#: src/msgconv.c:313 src/msgen.c:314 src/msgexec.c:284 src/msgfilter.c:419 -#: src/msggrep.c:520 src/msginit.c:419 src/msgmerge.c:555 src/msgunfmt.c:433 -#: src/msguniq.c:340 +#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374 +#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396 +#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435 +#: src/msguniq.c:341 #, c-format msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長いオプションに必須の引数は短いオプションにも必須です.\n" -#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375 -#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:287 src/msgfilter.c:422 -#: src/msgfmt.c:918 src/msggrep.c:523 src/msginit.c:422 src/msgmerge.c:558 -#: src/msgunfmt.c:447 src/msguniq.c:343 src/xgettext.c:1065 +#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377 +#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399 +#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500 +#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:831 #, c-format msgid "Input file location:\n" msgstr "入力ファイルの指定:\n" -#: src/msgattrib.c:433 src/msgconv.c:318 src/msggrep.c:525 src/msguniq.c:345 +#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346 #, c-format msgid " INPUTFILE input PO file\n" msgstr " INPUTFILE 入力 PO ファイル\n" -#: src/msgattrib.c:435 src/msgcat.c:390 src/msgcmp.c:233 src/msgcomm.c:381 -#: src/msgconv.c:320 src/msgen.c:321 src/msgexec.c:291 src/msgfilter.c:426 -#: src/msgfmt.c:922 src/msggrep.c:527 src/msgmerge.c:564 src/msguniq.c:347 -#: src/xgettext.c:1071 +#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383 +#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403 +#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348 +#: src/xgettext.c:837 #, c-format msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr " -D, --directory=DIRECTORY 入力ファイルの検索リストに DIRECTORY を追加\n" -#: src/msgattrib.c:437 src/msgconv.c:322 src/msgexec.c:293 src/msgfilter.c:428 -#: src/msggrep.c:529 src/msgunfmt.c:451 src/msguniq.c:349 +#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405 +#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350 #, c-format msgid "If no input file is given or if it is -, standard input is read.\n" msgstr "入力ファイルが指定されない, もしくは - の場合は標準入力が読み込まれます.\n" -#: src/msgattrib.c:440 src/msgcat.c:395 src/msgcomm.c:386 src/msgconv.c:325 -#: src/msgen.c:326 src/msgfilter.c:431 src/msgfmt.c:946 src/msggrep.c:532 -#: src/msginit.c:430 src/msgmerge.c:576 src/msgunfmt.c:487 src/msguniq.c:352 -#: src/xgettext.c:1076 +#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322 +#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533 +#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353 +#: src/xgettext.c:842 #, c-format msgid "Output file location:\n" msgstr "出力ファイルの指定:\n" -#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327 -#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msgfmt.c:997 -#: src/msgfmt.c:1016 src/msggrep.c:534 src/msgmerge.c:578 src/msgunfmt.c:489 -#: src/msguniq.c:354 +#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324 +#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535 +#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355 #, c-format msgid " -o, --output-file=FILE write output to specified file\n" msgstr " -o, --output-file=FILE 指定したファイルに出力\n" -#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329 -#: src/msgen.c:330 src/msgfilter.c:435 src/msggrep.c:536 src/msgmerge.c:580 -#: src/msgunfmt.c:491 src/msguniq.c:356 +#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326 +#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522 +#: src/msgunfmt.c:493 src/msguniq.c:357 #, c-format msgid "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" msgstr "出力ファイルが指定されない, もしくは - の場合は標準出力に結果が書き出されます.\n" -#: src/msgattrib.c:448 src/msgcat.c:403 src/msgcomm.c:394 src/msguniq.c:360 +#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361 #, c-format msgid "Message selection:\n" msgstr "メッセージ選択:\n" -#: src/msgattrib.c:450 +#: src/msgattrib.c:438 #, c-format msgid "" " --translated keep translated, remove untranslated messages\n" msgstr " --translated 翻訳されたメッセージを残し, 未翻訳を削除\n" -#: src/msgattrib.c:452 +#: src/msgattrib.c:440 #, c-format msgid "" " --untranslated keep untranslated, remove translated messages\n" msgstr " --untranslated 未翻訳のメッセージを残し, 翻訳されたものを削除\n" -#: src/msgattrib.c:454 +#: src/msgattrib.c:442 #, c-format msgid " --no-fuzzy remove 'fuzzy' marked messages\n" msgstr " --no-fuzzy 'fuzzy' マーク付きのメッセージを削除\n" -#: src/msgattrib.c:456 +#: src/msgattrib.c:444 #, c-format msgid " --only-fuzzy keep 'fuzzy' marked messages\n" msgstr " --only-fuzzy 'fuzzy' マーク付きのメッセージを残す\n" -#: src/msgattrib.c:458 +#: src/msgattrib.c:446 #, c-format msgid " --no-obsolete remove obsolete #~ messages\n" msgstr " --no-obsolete 廃れた #~ メッセージを削除\n" -#: src/msgattrib.c:460 +#: src/msgattrib.c:448 #, c-format msgid " --only-obsolete keep obsolete #~ messages\n" msgstr " --only-obsolete 廃れた #~ メッセージを残す\n" -#: src/msgattrib.c:463 +#: src/msgattrib.c:451 #, c-format msgid "Attribute manipulation:\n" msgstr "属性操作:\n" -#: src/msgattrib.c:465 +#: src/msgattrib.c:453 #, c-format msgid " --set-fuzzy set all messages 'fuzzy'\n" msgstr " --set-fuzzy 全てのメッセージを 'fuzzy' に設定\n" -#: src/msgattrib.c:467 +#: src/msgattrib.c:455 #, c-format msgid " --clear-fuzzy set all messages non-'fuzzy'\n" msgstr " --clear-fuzzy 全てのメッセージを '非 fuzzy' に設定\n" -#: src/msgattrib.c:469 +#: src/msgattrib.c:457 #, c-format msgid " --set-obsolete set all messages obsolete\n" msgstr " --set-obsolete 全てのメッセージを '廃れた' 状態に設定\n" -#: src/msgattrib.c:471 +#: src/msgattrib.c:459 #, c-format msgid " --clear-obsolete set all messages non-obsolete\n" msgstr " --clear-obsolete 全てのメッセージを非 '廃れた' 状態に設定\n" @@ -1227,7 +1216,7 @@ " --previous 'fuzzy'を設定する時, 翻訳されたメッセージの\n" " 前の msgid を残す\n" -#: src/msgattrib.c:476 +#: src/msgattrib.c:461 #, c-format msgid "" " --clear-previous remove the \"previous msgid\" from all " @@ -1240,47 +1229,47 @@ " --empty when removing 'fuzzy', also set msgstr empty\n" msgstr " --empty 'fuzzy' の削除時に msgstr も空に設定\n" -#: src/msgattrib.c:480 +#: src/msgattrib.c:463 #, c-format msgid "" " --only-file=FILE.po manipulate only entries listed in FILE.po\n" msgstr " --only-file=FILE.po FILE.po にあるエントリのみ処理\n" -#: src/msgattrib.c:482 +#: src/msgattrib.c:465 #, c-format msgid "" " --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n" msgstr " --ignore-file=FILE.po FILE.po にないエントリのみ処理\n" -#: src/msgattrib.c:484 +#: src/msgattrib.c:467 #, c-format msgid "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" msgstr " --fuzzy --only-fuzzy --clear-fuzzy と同じ\n" -#: src/msgattrib.c:486 +#: src/msgattrib.c:469 #, c-format msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr " --obsolete --only-obsolete --clear-obsolete と同じ\n" -#: src/msgattrib.c:489 src/msgcat.c:415 src/msgcmp.c:247 src/msgcomm.c:406 -#: src/msgconv.c:340 src/msgen.c:334 src/msgexec.c:296 src/msgfilter.c:460 -#: src/msgfmt.c:1026 src/msggrep.c:579 src/msginit.c:438 src/msgmerge.c:616 -#: src/msguniq.c:367 +#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408 +#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431 +#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555 +#: src/msguniq.c:368 #, c-format msgid "Input file syntax:\n" msgstr "入力ファイルの文法:\n" -#: src/msgattrib.c:491 src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 -#: src/msgfilter.c:462 src/msggrep.c:581 src/msginit.c:440 src/msguniq.c:369 +#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290 +#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370 #, c-format msgid "" " -P, --properties-input input file is in Java .properties syntax\n" msgstr " -P, --properties-input 入力ファイルは Java .properties の文法\n" -#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300 -#: src/msgfilter.c:464 src/msggrep.c:583 src/msginit.c:442 src/msguniq.c:371 +#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292 +#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372 #, c-format msgid "" " --stringtable-input input file is in NeXTstep/GNUstep .strings " @@ -1288,17 +1277,17 @@ msgstr "" " --stringtable-input 入力ファイルは NeXTstep/GNUstep .strings の文法\n" -#: src/msgattrib.c:496 src/msgcat.c:423 src/msgcomm.c:414 src/msgconv.c:347 -#: src/msgen.c:341 src/msgfilter.c:467 src/msgfmt.c:1054 src/msggrep.c:586 -#: src/msginit.c:445 src/msgmerge.c:624 src/msgunfmt.c:495 src/msguniq.c:374 -#: src/xgettext.c:1177 +#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344 +#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587 +#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375 +#: src/xgettext.c:927 #, c-format msgid "Output details:\n" msgstr "出力の詳細:\n" -#: src/msgattrib.c:498 src/msgcat.c:432 src/msgcomm.c:416 src/msgconv.c:349 -#: src/msgen.c:345 src/msgfilter.c:469 src/msggrep.c:588 src/msginit.c:451 -#: src/msgmerge.c:628 src/msgunfmt.c:497 src/msguniq.c:381 src/xgettext.c:1179 +#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346 +#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404 +#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:929 #, c-format msgid "" " --color use colors and other text attributes always\n" @@ -1310,25 +1299,25 @@ " --color=WHEN WHEN ならばカラーと他のテキスト属性を使う.\n" " WHEN は 'always', 'never', 'auto', または 'html'.\n" -#: src/msgattrib.c:502 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:353 -#: src/msgen.c:349 src/msgfilter.c:473 src/msggrep.c:592 src/msginit.c:455 -#: src/msgmerge.c:632 src/msgunfmt.c:501 src/msguniq.c:385 src/xgettext.c:1183 +#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350 +#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408 +#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:933 #, c-format msgid "" " --style=STYLEFILE specify CSS style rule file for --color\n" msgstr " --style=STYLEFILE --color に対する CSS スタイルルールを指定\n" -#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355 -#: src/msgen.c:351 src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 -#: src/xgettext.c:1185 +#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352 +#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388 +#: src/xgettext.c:935 #, c-format msgid "" " -e, --no-escape do not use C escapes in output (default)\n" msgstr " -e, --no-escape 出力に C 言語のエスケープを使わない (標準)\n" -#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357 -#: src/msgen.c:353 src/msgfilter.c:477 src/msgmerge.c:636 src/msgunfmt.c:505 -#: src/msguniq.c:389 src/xgettext.c:1187 +#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354 +#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507 +#: src/msguniq.c:390 src/xgettext.c:937 #, c-format msgid "" " -E, --escape use C escapes in output, no extended chars\n" @@ -1336,91 +1325,91 @@ " -E, --escape 出力に C 言語のエスケープを使い,\n" " 拡張文字を含めない\n" -#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359 -#: src/msgen.c:355 src/msgfilter.c:479 src/msggrep.c:598 src/msgmerge.c:638 -#: src/msgunfmt.c:507 src/msguniq.c:391 src/xgettext.c:1189 +#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356 +#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577 +#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:939 #, c-format msgid " --force-po write PO file even if empty\n" msgstr " --force-po 空であっても PO ファイルを書き出す\n" -#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msguniq.c:393 -#: src/xgettext.c:1191 +#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394 +#: src/xgettext.c:941 #, c-format msgid "" " -i, --indent write the .po file using indented style\n" msgstr " -i, --indent 字下げ形式で .po ファイルを出力\n" -#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395 -#: src/xgettext.c:1193 +#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396 +#: src/xgettext.c:943 #, c-format msgid " --no-location do not write '#: filename:line' lines\n" msgstr " --no-location '#: ファイル名:行番号' の行を書き出さない\n" -#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397 -#: src/xgettext.c:1195 +#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398 +#: src/xgettext.c:945 #, c-format msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" msgstr " -n, --add-location '#: ファイル名:行番号' の行を生成 (標準)\n" -#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399 -#: src/xgettext.c:1197 +#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400 +#: src/xgettext.c:947 #, c-format msgid "" " --strict write out strict Uniforum conforming .po file\n" msgstr " --strict 厳密な Uniforum 形式の .po ファイルを出力\n" -#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msgconv.c:369 -#: src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:608 src/msginit.c:457 -#: src/msgmerge.c:648 src/msgunfmt.c:513 src/msguniq.c:401 +#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366 +#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410 +#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402 #, c-format msgid " -p, --properties-output write out a Java .properties file\n" msgstr " -p, --properties-output Java .properties ファイルを出力\n" -#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371 -#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:610 src/msginit.c:459 -#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403 src/xgettext.c:1201 +#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368 +#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412 +#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:951 #, c-format msgid "" " --stringtable-output write out a NeXTstep/GNUstep .strings file\n" msgstr " --stringtable-output NeXTstep/GNUstep .strings ファイルを出力\n" -#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373 -#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:612 src/msginit.c:461 -#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1205 +#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370 +#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414 +#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:953 #, c-format msgid " -w, --width=NUMBER set output page width\n" msgstr " -w, --width=NUMBER 出力ページの幅を設定\n" -#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375 -#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:614 src/msginit.c:463 -#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1207 +#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372 +#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416 +#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:955 #, c-format msgid "" " --no-wrap do not break long message lines, longer than\n" " the output page width, into several lines\n" msgstr " --no-wrap 出力ページの幅より長いメッセージ行を改行しない\n" -#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378 -#: src/msgen.c:374 src/msgfilter.c:500 src/msgmerge.c:657 src/msgunfmt.c:522 -#: src/msguniq.c:410 src/xgettext.c:1210 +#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375 +#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524 +#: src/msguniq.c:411 src/xgettext.c:958 #, c-format msgid " -s, --sort-output generate sorted output\n" msgstr " -s, --sort-output ソートされた出力を生成\n" -#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380 -#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msguniq.c:412 -#: src/xgettext.c:1212 +#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377 +#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413 +#: src/xgettext.c:960 #, c-format msgid " -F, --sort-by-file sort output by file location\n" msgstr " -F, --sort-by-file ファイルで出力をソート\n" -#: src/msgcat.c:319 src/msgcomm.c:324 +#: src/msgcat.c:321 src/msgcomm.c:326 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "指定された選択基準 (%d < n < %d) は不可能です" -#: src/msgcat.c:364 src/msgcomm.c:356 src/xgettext.c:1051 +#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "使用法: %s [オプション] [入力ファイル]...\n" @@ -1447,23 +1436,23 @@ "コメント, ファイルの位置はそのまま残されます. ただし --use-first が指定された\n" "場合には, それらが定義された最初の PO ファイルのものがそのまま残されます.\n" -#: src/msgcat.c:386 src/msgcomm.c:377 src/xgettext.c:1067 +#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833 #, c-format msgid " INPUTFILE ... input files\n" msgstr " INPUTFILE ... 入力ファイル\n" -#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1069 +#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835 #, c-format msgid " -f, --files-from=FILE get list of input files from FILE\n" msgstr " -f, --files-from=FILE 入力ファイルのリストを FILE から取得\n" -#: src/msgcat.c:392 src/msgcomm.c:383 src/msgen.c:323 src/msgfmt.c:924 -#: src/xgettext.c:1073 +#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674 +#: src/xgettext.c:839 #, c-format msgid "If input file is -, standard input is read.\n" msgstr "入力ファイルが - の場合は標準入力が読み込まれます.\n" -#: src/msgcat.c:405 src/msgcomm.c:396 +#: src/msgcat.c:407 src/msgcomm.c:398 #, c-format msgid "" " -<, --less-than=NUMBER print messages with less than this many\n" @@ -1472,7 +1461,7 @@ " -<, --less-than=NUMBER NUMBER より少ない回数だけ定義されたメッセージ\n" " を出力. 設定されない場合は標準で無限個\n" -#: src/msgcat.c:408 +#: src/msgcat.c:410 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" @@ -1481,7 +1470,7 @@ " ->, --more-than=NUMBER NUMBER より多く定義されたメッセージを出力\n" " 設定されない場合は標準で 0\n" -#: src/msgcat.c:411 src/msgcomm.c:402 +#: src/msgcat.c:413 src/msgcomm.c:404 #, c-format msgid "" " -u, --unique shorthand for --less-than=2, requests\n" @@ -1490,15 +1479,15 @@ " -u, --unique --less-than=2 の短縮形. 1つしかないメッセージ\n" " のみを表示\n" -#: src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408 src/msgfmt.c:1028 -#: src/msgmerge.c:618 +#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739 +#: src/msgmerge.c:557 #, c-format msgid "" " -P, --properties-input input files are in Java .properties syntax\n" msgstr " -P, --properties-input 入力ファイルは Java .properties の文法\n" -#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030 -#: src/msgmerge.c:620 +#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741 +#: src/msgmerge.c:559 #, c-format msgid "" " --stringtable-input input files are in NeXTstep/GNUstep .strings\n" @@ -1506,12 +1495,12 @@ msgstr "" " --stringtable-input 入力ファイルは NeXTstep/GNUstep .strings の文法\n" -#: src/msgcat.c:425 src/msgconv.c:335 src/msguniq.c:376 +#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377 #, c-format msgid " -t, --to-code=NAME encoding for output\n" msgstr " -t, --to-code=NAME 出力のエンコーディング\n" -#: src/msgcat.c:427 src/msguniq.c:378 +#: src/msgcat.c:429 src/msguniq.c:379 #, c-format msgid "" " --use-first use first available translation for each\n" @@ -1520,33 +1509,33 @@ " --use-first 各々のメッセージの最初に有効な翻訳を使う\n" " 複数の翻訳をマージしない\n" -#: src/msgcat.c:430 src/msgen.c:343 src/msgmerge.c:626 +#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565 #, c-format msgid "" " --lang=CATALOGNAME set 'Language' field in the header entry\n" msgstr " --lang=CATALOGNAME ヘッダ項目の 'Language' 欄を指定\n" #. This is a proper name. See the gettext manual, section Names. -#: src/msgcmp.c:175 src/msgcomm.c:288 src/msgmerge.c:376 +#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350 msgid "Peter Miller" msgstr "Peter Miller" -#: src/msgcmp.c:186 src/msgmerge.c:387 +#: src/msgcmp.c:189 src/msgmerge.c:361 #, c-format msgid "no input files given" msgstr "入力ファイルが指定されていません" -#: src/msgcmp.c:191 src/msgmerge.c:392 +#: src/msgcmp.c:194 src/msgmerge.c:366 #, c-format msgid "exactly 2 input files required" msgstr "正確に 2つの入力ファイルが必要です" -#: src/msgcmp.c:210 src/msgmerge.c:538 +#: src/msgcmp.c:213 src/msgmerge.c:480 #, c-format msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "使用法: %s [オプション] def.po ref.pot\n" -#: src/msgcmp.c:215 +#: src/msgcmp.c:218 #, c-format, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -1566,80 +1555,80 @@ "正確に一致している個所が見つからない場合は, あいまい (fuzzy) 検索を使うと\n" "より良い診断メッセージが得られます.\n" -#: src/msgcmp.c:229 +#: src/msgcmp.c:232 #, c-format msgid " def.po translations\n" msgstr " def.po 翻訳\n" -#: src/msgcmp.c:231 +#: src/msgcmp.c:234 #, c-format msgid " ref.pot references to the sources\n" msgstr " ref.pot ソースへの参照\n" -#: src/msgcmp.c:236 src/msgmerge.c:604 +#: src/msgcmp.c:239 src/msgmerge.c:546 #, c-format msgid "Operation modifiers:\n" msgstr "操作指定:\n" -#: src/msgcmp.c:238 src/msgmerge.c:606 +#: src/msgcmp.c:241 src/msgmerge.c:548 #, c-format msgid "" " -m, --multi-domain apply ref.pot to each of the domains in " "def.po\n" msgstr " -m, --multi-domain ref.pot を def.po 内のドメインの各々に適用\n" -#: src/msgcmp.c:240 src/msgmerge.c:611 +#: src/msgcmp.c:243 src/msgmerge.c:550 #, c-format msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n" msgstr " -N, --no-fuzzy-matching あいまい検索を行わない\n" -#: src/msgcmp.c:242 +#: src/msgcmp.c:245 #, c-format msgid " --use-fuzzy consider fuzzy entries\n" msgstr " --use-fuzzy fuzzy (あいまい) 項目を考慮\n" -#: src/msgcmp.c:244 +#: src/msgcmp.c:247 #, c-format msgid " --use-untranslated consider untranslated entries\n" msgstr " --use-untranslated 未翻訳のメッセージを考慮\n" -#: src/msgcmp.c:327 +#: src/msgcmp.c:324 #, c-format msgid "this message is untranslated" msgstr "このメッセージは未翻訳です" -#: src/msgcmp.c:333 +#: src/msgcmp.c:330 #, c-format msgid "this message needs to be reviewed by the translator" msgstr "このメッセージは翻訳者によるレビューが必要です" -#: src/msgcmp.c:372 src/msgmerge.c:1578 +#: src/msgcmp.c:369 src/msgmerge.c:1500 #, c-format msgid "this message is used but not defined..." msgstr "このメッセージは使われますが定義されていません..." -#: src/msgcmp.c:375 src/msgmerge.c:1581 +#: src/msgcmp.c:372 src/msgmerge.c:1503 #, c-format msgid "...but this definition is similar" msgstr "...しかしこの定義が似ています" -#: src/msgcmp.c:380 src/msgmerge.c:1610 +#: src/msgcmp.c:377 src/msgmerge.c:1531 #, c-format msgid "this message is used but not defined in %s" msgstr "このメッセージは使われますが %s では定義されていません" -#: src/msgcmp.c:549 +#: src/msgcmp.c:546 #, c-format msgid "warning: this message is not used" msgstr "警告: このメッセージは使われません" -#: src/msgcmp.c:556 src/msgfmt.c:773 src/msgfmt.c:1606 src/xgettext.c:1020 +#: src/msgcmp.c:553 src/msgfmt.c:545 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d 個の致命的エラーが見つかりました" -#: src/msgcomm.c:313 +#: src/msgcomm.c:315 #, c-format msgid "at least two files must be specified" msgstr "少なくとも 2つのファイルを指定しなければいけません" @@ -1664,7 +1653,7 @@ "コメントは, それらが定義された最初の PO ファイルのもののみそのまま残されます.\n" "またファイルの位置は全ての PO ファイルからそのまま残されます.\n" -#: src/msgcomm.c:399 +#: src/msgcomm.c:401 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" @@ -1679,28 +1668,28 @@ " --omit-header don't write header with 'msgid \"\"' entry\n" msgstr " --omit-header 'msgid \"\"' を含んだヘッダを出力しない\n" -#: src/msgconv.c:309 +#: src/msgconv.c:306 #, c-format msgid "Converts a translation catalog to a different character encoding.\n" msgstr "翻訳カタログを異なった文字エンコーディングに変換.\n" -#: src/msgconv.c:333 +#: src/msgconv.c:330 #, c-format msgid "Conversion target:\n" msgstr "変換対象:\n" -#: src/msgconv.c:337 +#: src/msgconv.c:334 #, c-format msgid "The default encoding is the current locale's encoding.\n" msgstr "標準のエンコーディングは現在のローカルのエンコーディングです.\n" -#: src/msgconv.c:361 src/msgen.c:357 src/msgmerge.c:640 +#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579 #, c-format msgid " -i, --indent indented output style\n" msgstr " -i, --indent 字下げ形式の出力\n" -#: src/msgconv.c:363 src/msgen.c:359 src/msgfilter.c:485 src/msggrep.c:602 -#: src/msgmerge.c:642 +#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603 +#: src/msgmerge.c:581 #, c-format msgid " --no-location suppress '#: filename:line' lines\n" msgstr " --no-location '#: filename:line' の行を出力しない\n" @@ -1712,28 +1701,28 @@ " -n, --add-location preserve '#: filename:line' lines (default)\n" msgstr " -n, --add-location '#: filename:line' の行を保持 (標準)\n" -#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:606 -#: src/msgmerge.c:646 +#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607 +#: src/msgmerge.c:585 #, c-format msgid " --strict strict Uniforum output style\n" msgstr " --strict 厳密な Uniforum 出力形式\n" -#: src/msgen.c:256 src/msgfmt.c:461 src/xgettext.c:732 +#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634 #, c-format msgid "no input file given" msgstr "入力ファイルが指定されていません" -#: src/msgen.c:261 +#: src/msgen.c:253 #, c-format msgid "exactly one input file required" msgstr "正確に 1つの入力ファイルが必要です" -#: src/msgen.c:302 +#: src/msgen.c:298 #, c-format msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "使用法: %s [オプション] INPUTFILE\n" -#: src/msgen.c:307 +#: src/msgen.c:303 #, c-format, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -1745,22 +1734,22 @@ "PO テンプレートファイル (一般に xgettext によって生成) です. 未翻訳のエントリ\n" "は msgid と同じ翻訳に割り当てられます.\n" -#: src/msgen.c:319 +#: src/msgen.c:315 #, c-format msgid " INPUTFILE input PO or POT file\n" msgstr " INPUTFILE 入力する PO または POT ファイル\n" -#: src/msgexec.c:199 +#: src/msgexec.c:196 #, c-format msgid "missing command name" msgstr "コマンド名がありません" -#: src/msgexec.c:260 +#: src/msgexec.c:257 #, c-format msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "使用法: %s [オプション] コマンド [コマンドオプション]\n" -#: src/msgexec.c:265 +#: src/msgexec.c:262 #, c-format, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -1775,7 +1764,7 @@ "その出力が msgexec の出力になります. msgexec の終了コードは内部から呼び\n" "出されたプログラムの終了コードの最大値になります.\n" -#: src/msgexec.c:274 +#: src/msgexec.c:271 #, c-format, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -1795,37 +1784,37 @@ msgid " --newline add newline at the end of input\n" msgstr " --newline 入力の最後に改行を追加\n" -#: src/msgexec.c:289 src/msgfilter.c:424 +#: src/msgexec.c:281 src/msgfilter.c:401 #, c-format msgid " -i, --input=INPUTFILE input PO file\n" msgstr " -i, --input=INPUTFILE 入力する PO ファイル\n" -#: src/msgexec.c:358 +#: src/msgexec.c:345 #, c-format msgid "write to stdout failed" msgstr "標準出力への書き出しが失敗しました" -#: src/msgfilter.c:302 +#: src/msgfilter.c:289 #, c-format msgid "missing filter name" msgstr "フィルタ名がありません" -#: src/msgfilter.c:322 +#: src/msgfilter.c:313 #, c-format msgid "at least one sed script must be specified" msgstr "少なくとも 1つの sed スクリプトを指定しなければいけません" -#: src/msgfilter.c:411 +#: src/msgfilter.c:388 #, c-format msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "使用法: %s [オプション] フィルタ [フィルタオプション]\n" -#: src/msgfilter.c:415 +#: src/msgfilter.c:392 #, c-format msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "翻訳カタログの全ての翻訳にフィルタを適用.\n" -#: src/msgfilter.c:439 +#: src/msgfilter.c:416 #, c-format msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1848,18 +1837,18 @@ " --newline 入力の最後に改行を追加し\n" " 出力の最後から改行を削除" -#: src/msgfilter.c:450 +#: src/msgfilter.c:421 #, c-format msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" msgstr "FILTER が 'sed' の場合に便利な FILTER-OPTION:\n" -#: src/msgfilter.c:452 +#: src/msgfilter.c:423 #, c-format msgid "" " -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n" msgstr " -e, --expression=SCRIPT 実行されるコマンドに SCRIPT を追加\n" -#: src/msgfilter.c:454 +#: src/msgfilter.c:425 #, c-format msgid "" " -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the " @@ -1867,24 +1856,24 @@ " to be executed\n" msgstr " -f, --file=SCRIPTFILE SCRIPTFILE の内容を実行されるコマンドに追加\n" -#: src/msgfilter.c:457 +#: src/msgfilter.c:428 #, c-format msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr " -n, --quiet, --silent パターンスペースの自動的な表示を抑制\n" -#: src/msgfilter.c:475 src/msggrep.c:594 +#: src/msgfilter.c:446 src/msggrep.c:595 #, c-format msgid "" " --no-escape do not use C escapes in output (default)\n" msgstr " --no-escape 出力に C 言語のエスケープを使わない (標準)\n" -#: src/msgfilter.c:481 src/msggrep.c:600 +#: src/msgfilter.c:452 src/msggrep.c:601 #, c-format msgid " --indent indented output style\n" msgstr " --indent 字下げ形式の出力\n" -#: src/msgfilter.c:483 +#: src/msgfilter.c:454 #, c-format msgid "" " --keep-header keep header entry unmodified, don't filter it\n" @@ -1895,18 +1884,18 @@ msgid "filter output is not terminated with a newline" msgstr "フィルタの出力は改行で終端されていません" -#: src/msgfmt.c:369 +#: src/msgfmt.c:304 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "%s への引数は単一の区切り文字であるべきです" -#: src/msgfmt.c:416 +#: src/msgfmt.c:351 #, c-format msgid "invalid endianness: %s" msgstr "無効なエンディアン: %s" #. This is a proper name. See the gettext manual, section Names. -#: src/msgfmt.c:448 src/msgunfmt.c:266 src/xgettext.c:692 +#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" @@ -1915,14 +1904,13 @@ msgid "no input file should be given if %s and %s are specified" msgstr "%s と %s を指定する場合は入力ファイルを指定していはいけません" -#: src/msgfmt.c:515 src/msgfmt.c:537 src/msgfmt.c:559 src/msgunfmt.c:328 -#: src/msgunfmt.c:351 +#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330 +#: src/msgunfmt.c:353 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s には \"-d ディレクトリ\" の指定が必要です" -#: src/msgfmt.c:530 src/msgfmt.c:552 src/msgfmt.c:587 src/msgfmt.c:615 -#: src/msgunfmt.c:321 src/msgunfmt.c:344 +#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s には \"-l ロカール\" の指定が必要です" @@ -1942,12 +1930,12 @@ msgid "%s and %s are mutually exclusive in %s" msgstr "%s と %s は %s において背反です" -#: src/msgfmt.c:624 src/msgunfmt.c:360 src/msgunfmt.c:366 +#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s は %s または %s がある場合にのみ有効です" -#: src/msgfmt.c:630 src/msgfmt.c:636 +#: src/msgfmt.c:484 src/msgfmt.c:490 #, c-format msgid "%s is only valid with %s, %s or %s" msgstr "%s は %s, %s または %s がある場合にのみ有効です" @@ -1959,70 +1947,70 @@ #. TRANSLATORS: The prefix before a statistics message. The argument #. is a file name or a comma separated list of file names. -#: src/msgfmt.c:870 +#: src/msgfmt.c:620 #, c-format msgid "%s: " msgstr "%s: " -#: src/msgfmt.c:874 +#: src/msgfmt.c:624 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d 個の翻訳メッセージ" -#: src/msgfmt.c:879 +#: src/msgfmt.c:629 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d 個のあいまいな翻訳" -#: src/msgfmt.c:884 +#: src/msgfmt.c:634 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d 個の未訳のメッセージ" -#: src/msgfmt.c:904 +#: src/msgfmt.c:654 #, c-format msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "使用法: %s [オプション] filename.po ...\n" -#: src/msgfmt.c:908 +#: src/msgfmt.c:658 #, c-format msgid "" "Generate binary message catalog from textual translation description.\n" msgstr "バイナリメッセージカタログを原文の翻訳の記述から生成.\n" -#: src/msgfmt.c:920 +#: src/msgfmt.c:670 #, c-format msgid " filename.po ... input files\n" msgstr " filename.po ... 入力ファイル\n" -#: src/msgfmt.c:927 src/msgmerge.c:570 src/msgunfmt.c:436 src/xgettext.c:1109 +#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874 #, c-format msgid "Operation mode:\n" msgstr "操作モード:\n" -#: src/msgfmt.c:929 +#: src/msgfmt.c:679 #, c-format msgid "" " -j, --java Java mode: generate a Java ResourceBundle " "class\n" msgstr " -j, --java Java モード: Java ResourceBundle クラスの生成\n" -#: src/msgfmt.c:931 +#: src/msgfmt.c:681 #, c-format msgid "" " --java2 like --java, and assume Java2 (JDK 1.2 or " "higher)\n" msgstr " --java2 --java と同じで Java2 (JDK 1.2 以降) を仮定\n" -#: src/msgfmt.c:933 +#: src/msgfmt.c:683 #, c-format msgid " --csharp C# mode: generate a .NET .dll file\n" msgstr " --csharp C# モード: .NET .dll ファイルの生成\n" -#: src/msgfmt.c:935 +#: src/msgfmt.c:685 #, c-format msgid "" " --csharp-resources C# resources mode: generate a .NET .resources " @@ -2030,13 +2018,13 @@ msgstr "" " --csharp-resources C# resources モード: .NET .resources ファイルの生成\n" -#: src/msgfmt.c:937 +#: src/msgfmt.c:687 #, c-format msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr " --tcl Tcl モード: tcl/msgcat .msg ファイルの生成\n" -#: src/msgfmt.c:939 +#: src/msgfmt.c:689 #, c-format msgid " --qt Qt mode: generate a Qt .qm file\n" msgstr " --qt Qt モード: Qt .qm ファイルの生成\n" @@ -2052,28 +2040,28 @@ msgid " --xml XML mode: generate XML file\n" msgstr " --xml XML モード: XML ファイルの生成\n" -#: src/msgfmt.c:950 +#: src/msgfmt.c:696 #, c-format msgid " --strict enable strict Uniforum mode\n" msgstr " --strict 厳密な Uniforum モードを有効に\n" -#: src/msgfmt.c:952 src/xgettext.c:1084 +#: src/msgfmt.c:698 src/xgettext.c:850 #, c-format msgid "If output file is -, output is written to standard output.\n" msgstr "出力ファイルが - の場合は標準出力に結果が書き出されます.\n" -#: src/msgfmt.c:955 +#: src/msgfmt.c:701 #, c-format msgid "Output file location in Java mode:\n" msgstr "Java モードにおける出力ファイルの場所:\n" -#: src/msgfmt.c:957 src/msgfmt.c:973 src/msgunfmt.c:456 src/msgunfmt.c:467 +#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469 #, c-format msgid " -r, --resource=RESOURCE resource name\n" msgstr " -r, --resource=RESOURCE リソース名\n" -#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgfmt.c:985 src/msgfmt.c:995 -#: src/msgfmt.c:1012 src/msgunfmt.c:458 src/msgunfmt.c:469 src/msgunfmt.c:479 +#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460 +#: src/msgunfmt.c:471 src/msgunfmt.c:481 #, c-format msgid "" " -l, --locale=LOCALE locale name, either language or " @@ -2087,13 +2075,13 @@ "file\n" msgstr " --source .class ファイルの代わりに .java ファイルを作成\n" -#: src/msgfmt.c:963 +#: src/msgfmt.c:707 #, c-format msgid "" " -d DIRECTORY base directory of classes directory hierarchy\n" msgstr " -d DIRECTORY クラスディレクトリの階層の基本ディレクトリ\n" -#: src/msgfmt.c:965 +#: src/msgfmt.c:709 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -2105,19 +2093,19 @@ "で決められます. -d オプションは必須です. クラスは指定されたディレクトリ以下に\n" "書き出されます.\n" -#: src/msgfmt.c:971 +#: src/msgfmt.c:715 #, c-format msgid "Output file location in C# mode:\n" msgstr "C# モードにおける出力ファイルの場所:\n" -#: src/msgfmt.c:977 src/msgunfmt.c:471 +#: src/msgfmt.c:721 src/msgunfmt.c:473 #, c-format msgid "" " -d DIRECTORY base directory for locale dependent .dll " "files\n" msgstr " -d DIRECTORY ロカール依存の .dll ファイルの基本ディレクトリ\n" -#: src/msgfmt.c:979 +#: src/msgfmt.c:723 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is written in a\n" @@ -2126,18 +2114,18 @@ "-l と -d オプションは必須です. .dll ファイルはロカールに依存した名前を持つ\n" "指定されたディレクトリのサブディレクトリに書き出されます.\n" -#: src/msgfmt.c:983 +#: src/msgfmt.c:727 #, c-format msgid "Output file location in Tcl mode:\n" msgstr "Tcl モードにおける出力ファイルの場所:\n" -#: src/msgfmt.c:987 src/msgunfmt.c:481 +#: src/msgfmt.c:731 src/msgunfmt.c:483 #, c-format msgid "" " -d DIRECTORY base directory of .msg message catalogs\n" msgstr " -d DIRECTORY .msg メッセージカタログの基本ディレクトリ\n" -#: src/msgfmt.c:989 +#: src/msgfmt.c:733 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is written in the\n" @@ -2161,7 +2149,7 @@ msgid " -d DIRECTORY base directory of .po files\n" msgstr " -d DIRECTORY .po ファイルの基本ディレクトリ\n" -#: src/msgfmt.c:1003 src/xgettext.c:1138 +#: src/xgettext.c:894 #, c-format msgid "" " -kWORD, --keyword=WORD look for WORD as an additional keyword\n" @@ -2195,12 +2183,12 @@ msgid " --template=TEMPLATE an XML file used as a template\n" msgstr " --template=TEMPLATE XML ファイルをテンプレートに使用\n" -#: src/msgfmt.c:1034 src/xgettext.c:1101 +#: src/msgfmt.c:745 src/xgettext.c:866 #, c-format msgid "Input file interpretation:\n" msgstr "入力ファイルの解釈:\n" -#: src/msgfmt.c:1036 +#: src/msgfmt.c:747 #, c-format msgid "" " -c, --check perform all the checks implied by\n" @@ -2211,20 +2199,20 @@ "domain\n" " で指定される全てのチェックを行なう\n" -#: src/msgfmt.c:1039 +#: src/msgfmt.c:750 #, c-format msgid "" " --check-format check language dependent format strings\n" msgstr " --check-format 言語に依存したフォーマット文字列をチェック\n" -#: src/msgfmt.c:1041 +#: src/msgfmt.c:752 #, c-format msgid "" " --check-header verify presence and contents of the header " "entry\n" msgstr " --check-header ヘッダ項目の存在と内容を確認\n" -#: src/msgfmt.c:1043 +#: src/msgfmt.c:754 #, c-format msgid "" " --check-domain check for conflicts between domain directives\n" @@ -2233,14 +2221,14 @@ " --check-domain ドメイン命令と --output-file オプションの間に\n" " 矛盾がないかチェック\n" -#: src/msgfmt.c:1046 +#: src/msgfmt.c:757 #, c-format msgid "" " -C, --check-compatibility check that GNU msgfmt behaves like X/Open " "msgfmt\n" msgstr " -C, --check-compatibility GNU msgfmt の X/Open msgfmt との互換性を確認\n" -#: src/msgfmt.c:1048 +#: src/msgfmt.c:759 #, c-format msgid "" " --check-accelerators[=CHAR] check presence of keyboard accelerators " @@ -2248,12 +2236,12 @@ " menu items\n" msgstr " --check-accelerators[=文字] メニュー項目へのキー割り当てをチェック\n" -#: src/msgfmt.c:1051 +#: src/msgfmt.c:762 #, c-format msgid " -f, --use-fuzzy use fuzzy entries in output\n" msgstr " -f, --use-fuzzy fuzzy (あいまい) 項目を出力に使う\n" -#: src/msgfmt.c:1056 +#: src/msgfmt.c:767 #, c-format msgid "" " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n" @@ -2270,48 +2258,48 @@ " --endianness=BYTEORDER 指定されたバイトオーダで32ビットの数値を書き出す\n" " (標準はプラットフォームにより big か little)\n" -#: src/msgfmt.c:1061 +#: src/msgfmt.c:772 #, c-format msgid "" " --no-hash binary file will not include the hash table\n" msgstr " --no-hash バイナリファイルはハッシュテーブルを含まない\n" -#: src/msgfmt.c:1070 +#: src/msgfmt.c:781 #, c-format msgid " --statistics print statistics about translations\n" msgstr " --statistics 翻訳に関する統計情報を表示\n" -#: src/msgfmt.c:1072 src/msgmerge.c:668 src/msgunfmt.c:531 src/xgettext.c:1239 +#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533 #, c-format msgid " -v, --verbose increase verbosity level\n" msgstr " -v, --verbose 診断レベルを上げる\n" -#: src/msgfmt.c:1188 +#: src/msgfmt.c:897 #, c-format msgid "warning: PO file header missing or invalid\n" msgstr "警告: PO ファイルのヘッダがない, もしくは不正です\n" -#: src/msgfmt.c:1190 +#: src/msgfmt.c:900 #, c-format msgid "warning: charset conversion will not work\n" msgstr "警告: 文字セットの変換が機能しません\n" -#: src/msgfmt.c:903 +#: src/msgfmt.c:910 #, c-format msgid "warning: PO file header fuzzy\n" msgstr "警告: PO ファイルヘッダがあいまいです\n" -#: src/msgfmt.c:905 +#: src/msgfmt.c:912 #, c-format msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "警告: msgfmt の以前のバージョンではここでエラーになります\n" -#: src/msgfmt.c:1214 +#: src/msgfmt.c:936 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "ドメイン名 \"%s\" はファイル名として適切ではありません" -#: src/msgfmt.c:1219 +#: src/msgfmt.c:941 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "ドメイン名 \"%s\" はファイル名として適切ではありません. 接頭辞を使います" @@ -2331,7 +2319,7 @@ msgid "fuzzy 'msgstr' entry ignored" msgstr "あいまい (fuzzy) な 'msgstr' エントリは無視されます" -#: src/msgfmt.c:1342 +#: src/msgfmt.c:1065 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: 警告: ソースファイルにあいまい (fuzzy) な翻訳があります" @@ -2346,26 +2334,25 @@ msgid "%s exists but cannot read" msgstr "%s は存在しますが読み込めません" -#: src/msggrep.c:252 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:88 -#: src/read-properties.c:609 src/read-stringtable.c:98 src/x-awk.c:138 -#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:200 -#: src/x-javascript.c:180 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:174 -#: src/x-perl.c:256 src/x-perl.c:331 src/x-perl.c:424 src/x-php.c:162 -#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171 -#: src/x-sh.c:164 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177 -#: src/x-ycp.c:89 +#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86 +#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139 +#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616 +#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227 +#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174 +#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91 +#: src/x-tcl.c:150 src/x-ycp.c:91 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\" を読み込み中にエラーが発生しました" -#: src/msggrep.c:495 +#: src/msggrep.c:496 #, c-format msgid "" "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been " "specified" msgstr "オプション '%c' は 'J' や 'K' や 'T' や 'C' や 'X' が指定される前に使うことはできません" -#: src/msggrep.c:515 +#: src/msggrep.c:516 #, c-format, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -2374,7 +2361,7 @@ "翻訳カタログの中から, 指定されたパターンに一致する, もしくは指定されたいくつ\n" "かのソースファイルに含まれる全てのメッセージを取り出します.\n" -#: src/msggrep.c:541 +#: src/msggrep.c:542 #, c-format, no-wrap msgid "" "Message selection:\n" @@ -2454,7 +2441,7 @@ " -i, --ignore-case 大文字小文字を区別しない\n" " -v, --invert-match どの選択基準にも一致しないメッセージのみを出力\n" -#: src/msggrep.c:596 +#: src/msggrep.c:597 #, c-format msgid "" " --escape use C escapes in output, no extended chars\n" @@ -2462,12 +2449,12 @@ " --escape 出力に C 言語のエスケープを使い,\n" " 拡張文字を含めない\n" -#: src/msggrep.c:617 +#: src/msggrep.c:618 #, c-format msgid " --sort-output generate sorted output\n" msgstr " --sort-output ソートされた出力を生成\n" -#: src/msggrep.c:619 +#: src/msggrep.c:620 #, c-format msgid " --sort-by-file sort output by file location\n" msgstr " --sort-by-file ファイルで出力をソート\n" @@ -2481,7 +2468,7 @@ "あなたは言語に関わりのない環境にいます. ABOUT-NLS に記述されたように\n" "環境変数 LANG を指定してください. これで翻訳をテストすることができます.\n" -#: src/msginit.c:326 +#: src/msginit.c:321 #, c-format msgid "" "Output file %s already exists.\n" @@ -2492,12 +2479,12 @@ "--locale オプションでロカールを指定するか, --output-file オプションで\n" "出力する .po ファイルを指定してください.\n" -#: src/msginit.c:394 +#: src/msginit.c:347 #, c-format msgid "Created %s.\n" msgstr "%s を生成.\n" -#: src/msginit.c:414 +#: src/msginit.c:367 #, c-format, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from " @@ -2505,12 +2492,12 @@ "user's environment.\n" msgstr "新しい PO ファイルを作成. ユーザ環境からの値でメタ情報を初期化します.\n" -#: src/msginit.c:424 +#: src/msginit.c:377 #, c-format msgid " -i, --input=INPUTFILE input POT file\n" msgstr " -i, --input=INPUTFILE 入力する POT ファイル\n" -#: src/msginit.c:426 +#: src/msginit.c:379 #, c-format msgid "" "If no input file is given, the current directory is searched for the POT " @@ -2520,12 +2507,12 @@ "入力ファイルが指定されない場合はカレントディレクトリで POT ファイルが検索\n" "されます. もし入力ファイルが - ならば標準入力が読み込まれます.\n" -#: src/msginit.c:432 +#: src/msginit.c:385 #, c-format msgid " -o, --output-file=FILE write output to specified PO file\n" msgstr " -o, --output-file=FILE 指定された PO ファイルに出力\n" -#: src/msginit.c:434 +#: src/msginit.c:387 #, c-format msgid "" "If no output file is given, it depends on the --locale option or the user's\n" @@ -2539,13 +2526,13 @@ msgid " -l, --locale=LL_CC set target locale\n" msgstr " -l, --locale=LL_CC 対象となるロカールを設定\n" -#: src/msginit.c:449 +#: src/msginit.c:402 #, c-format msgid "" " --no-translator assume the PO file is automatically generated\n" msgstr " --no-translator PO ファイルが自動生成されると仮定\n" -#: src/msginit.c:519 +#: src/msginit.c:468 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -2553,12 +2540,12 @@ "1つ以上の .pot ファイルを見つけました.\n" "--input オプションで入力する .pot ファイルを指定してください.\n" -#: src/msginit.c:527 src/msginit.c:532 +#: src/msginit.c:476 src/msginit.c:481 #, c-format msgid "error reading current directory" msgstr "カレントディレクトリの読み込みエラー" -#: src/msginit.c:540 +#: src/msginit.c:489 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -2566,15 +2553,14 @@ "カレントディレクトリに .pot ファイルが見つかりませんでした.\n" "--input オプションで入力する .pot ファイルを指定してください.\n" -#: src/msginit.c:976 src/msginit.c:1059 src/msginit.c:1228 src/msginit.c:1330 -#: src/msginit.c:1511 src/read-csharp.c:83 src/read-java.c:82 -#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106 -#: src/x-ruby.c:146 +#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248 +#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84 +#: src/read-tcl.c:127 src/write-resources.c:104 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s サブプロセス失敗, 終了コード %d" -#: src/msginit.c:1193 +#: src/msginit.c:1118 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -2590,17 +2576,17 @@ #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1706 +#: src/msginit.c:1534 #, c-format msgid "English translations for %s package" msgstr "%s パッケージに対する英訳" -#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:244 +#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "現在の文字セット \"%s\" は可搬性のあるエンコーディング名ではありません" -#: src/msgl-cat.c:188 src/msgl-iconv.c:255 +#: src/msgl-cat.c:188 src/msgl-iconv.c:259 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "2つの異なった文字セット \"%s\" と \"%s\" が入力ファイルにあります" @@ -2618,19 +2604,19 @@ "charset specification" msgstr "入力ファイル '%2$s' 内のドメイン \"%1$s\" には文字セットを指定するヘッダ項目がありません" -#: src/msgl-cat.c:403 src/msgl-iconv.c:363 +#: src/msgl-cat.c:391 src/msgl-iconv.c:375 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "対象となる文字セット \"%s\" は可搬性のあるエンコーディング名ではありません" -#: src/msgl-cat.c:454 src/msgl-cat.c:460 src/msgl-charset.c:91 -#: src/msgl-charset.c:126 src/po-xerror.c:127 src/po-xerror.c:152 -#: src/xgettext.c:584 src/xgettext.c:1988 src/xg-message.c:335 +#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92 +#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146 +#: src/xgettext.c:3016 #, c-format msgid "warning: " msgstr "警告: " -#: src/msgl-cat.c:455 +#: src/msgl-cat.c:443 #, c-format msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" @@ -2639,7 +2625,7 @@ "入力ファイルには異なったエンコーディングのメッセージが含まれています.\n" "出力を UTF-8 に変換します.\n" -#: src/msgl-cat.c:461 +#: src/msgl-cat.c:449 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -2651,7 +2637,7 @@ "出力を UTF-8 に変換します.\n" "別の出力エンコーディングを選択する場合は --to-code オプションを使ってください.\n" -#: src/msgl-cat.c:500 +#: src/msgl-cat.c:488 #, c-format msgid "" "Conversion of file %s from %s encoding to %s encoding\n" @@ -2665,7 +2651,7 @@ "ソースコードファイルの中で, UTF-8 でエンコードされていることを保証するか\n" "どちらかです.\n" -#: src/msgl-charset.c:92 +#: src/msgl-charset.c:93 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -2678,12 +2664,12 @@ "'%s' の出力は不正確である可能性があります.\n" "可能な回避策:\n" -#: src/msgl-charset.c:99 +#: src/msgl-charset.c:100 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- LC_ALL をエンコーディング %s のロカールに設定.\n" -#: src/msgl-charset.c:104 +#: src/msgl-charset.c:105 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -2694,7 +2680,7 @@ " その後 '%s' を適用.\n" " 更に 'msgconv' を使って %s に戻す.\n" -#: src/msgl-charset.c:113 +#: src/msgl-charset.c:114 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -2707,7 +2693,7 @@ " その後 '%s' を適用.\n" " 更に 'msgconv' を使って %s に戻す.\n" -#: src/msgl-charset.c:127 +#: src/msgl-charset.c:128 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -2718,73 +2704,73 @@ "'%s' の出力は不正確である可能性があります.\n" "可能な回避策としては LC_ALL=C と設定します.\n" -#: src/msgl-check.c:134 +#: src/msgl-check.c:130 msgid "plural expression can produce negative values" msgstr "複数表現が負の値を生成する可能性があります" -#: src/msgl-check.c:145 +#: src/msgl-check.c:141 #, c-format msgid "" "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu ですが複数表現が %lu と同じ程度の値を生成する可能性があります" -#: src/msgl-check.c:191 +#: src/msgl-check.c:187 msgid "plural expression can produce division by zero" msgstr "複数表現がゼロ割りを起こす可能性があります" -#: src/msgl-check.c:196 +#: src/msgl-check.c:192 msgid "plural expression can produce integer overflow" msgstr "複数表現が整数あふれを起こす可能性があります" -#: src/msgl-check.c:201 +#: src/msgl-check.c:197 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "複数表現が演算例外, おそらくゼロ割りを起こす可能性があります" -#: src/msgl-check.c:270 +#: src/msgl-check.c:266 #, c-format msgid "Try using the following, valid for %s:" msgstr "%s にとって有効な, 次を使ってみてください:" -#: src/msgl-check.c:362 src/msgl-check.c:386 +#: src/msgl-check.c:358 src/msgl-check.c:382 msgid "message catalog has plural form translations" msgstr "メッセージカタログに複数形の翻訳があります" -#: src/msgl-check.c:364 +#: src/msgl-check.c:360 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "しかしヘッダエントリに \"plural=EXPRESSION\" 属性がありません" -#: src/msgl-check.c:388 +#: src/msgl-check.c:384 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "しかしヘッダエントリに \"nplurals=INTEGER\" 属性がありません" -#: src/msgl-check.c:424 +#: src/msgl-check.c:420 msgid "invalid nplurals value" msgstr "不正な nplurals の値" -#: src/msgl-check.c:446 +#: src/msgl-check.c:442 msgid "invalid plural expression" msgstr "不正な複数 (plural) 表現" -#: src/msgl-check.c:476 src/msgl-check.c:492 +#: src/msgl-check.c:472 src/msgl-check.c:488 #, c-format msgid "nplurals = %lu" msgstr "nplurals = %lu" -#: src/msgl-check.c:478 +#: src/msgl-check.c:474 #, c-format msgid "but some messages have only one plural form" msgid_plural "but some messages have only %lu plural forms" msgstr[0] "しかしいくつかのメッセージには %lu 個だけ複数形があります" -#: src/msgl-check.c:494 +#: src/msgl-check.c:490 #, c-format msgid "but some messages have one plural form" msgid_plural "but some messages have %lu plural forms" msgstr[0] "しかしいくつかのメッセージには %lu 個の複数形があります" -#: src/msgl-check.c:518 +#: src/msgl-check.c:514 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -2818,16 +2804,16 @@ msgid "'msgid' and 'msgstr' entries do not both end with '\\n'" msgstr "'msgid' と 'msgstr' のエントリがどちらも '\\n' で終わっていません" -#: src/msgl-check.c:692 +#: src/msgl-check.c:687 msgid "plural handling is a GNU gettext extension" msgstr "複数形の制御は GNU gettext の拡張です" -#: src/msgl-check.c:733 +#: src/msgl-check.c:729 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr にはキーボードアクセレレータの記号 '%c' がありません" -#: src/msgl-check.c:744 +#: src/msgl-check.c:739 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr にはあまりに多くのキーボードアクセレレータの記号 '%c' があります" @@ -2863,23 +2849,23 @@ msgid "ASCII bullet ('%c') instead of Unicode" msgstr "Unicode の代わりに ASCII の黒丸記号 ('%c')" -#: src/msgl-iconv.c:62 +#: src/msgl-iconv.c:65 #, c-format msgid "%s: input is not valid in \"%s\" encoding" msgstr "%s: 入力は \"%s\" エンコーディングにおいて有効ではありません" -#: src/msgl-iconv.c:66 +#: src/msgl-iconv.c:69 #, c-format msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding" msgstr "%s: \"%s\" エンコーディングから \"%s\" エンコーディングに変換する際にエラーが発生しました" -#: src/msgl-iconv.c:285 +#: src/msgl-iconv.c:290 msgid "" "input file doesn't contain a header entry with a charset specification" msgstr "入力ファイルに文字セットを指定するヘッダ項目がありません" -#: src/msgl-iconv.c:299 src/recode-sr-latin.c:291 src/recode-sr-latin.c:295 -#: src/xgettext.c:807 src/x-python.c:624 +#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293 +#: src/x-python.c:623 src/xgettext.c:693 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -2887,15 +2873,15 @@ msgstr "" "\"%s\" から \"%s\" に変換できません. %s は iconv() に依存していますが,iconv() はこの変換を実装していません." -#: src/msgl-iconv.c:327 +#: src/msgl-iconv.c:335 #, c-format msgid "" "Conversion from \"%s\" to \"%s\" introduces duplicates: some different " "msgids become equal." msgstr "\"%s\" から \"%s\" への変換が重複, いくつかの異なった msgid が等しくなっています." -#: src/msgl-iconv.c:331 src/recode-sr-latin.c:303 src/xgettext.c:813 -#: src/x-python.c:630 +#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630 +#: src/xgettext.c:700 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -2903,16 +2889,16 @@ msgstr "" "\"%s\" から \"%s\" に変換できません. %s は iconv() に依存しています.このバージョンは iconv() なしで作られています." -#: src/msgmerge.c:424 src/msgmerge.c:430 +#: src/msgmerge.c:383 src/msgmerge.c:389 #, c-format msgid "%s is only valid with %s" msgstr "%s は %s がある場合にのみ有効です" -#: src/msgmerge.c:506 +#: src/msgmerge.c:448 msgid "backup type" msgstr "バックアップタイプ" -#: src/msgmerge.c:543 +#: src/msgmerge.c:485 #, c-format, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -2934,17 +2920,17 @@ "残されます. 正確に一致している個所が見つからない場合は, あいまい (fuzzy)\n" "検索を使うとより良い結果を生むでしょう.\n" -#: src/msgmerge.c:560 +#: src/msgmerge.c:502 #, c-format msgid " def.po translations referring to old sources\n" msgstr " def.po 古いソースに対する参照翻訳\n" -#: src/msgmerge.c:562 +#: src/msgmerge.c:504 #, c-format msgid " ref.pot references to new sources\n" msgstr " ref.pot 新しいソースに対する参照\n" -#: src/msgmerge.c:566 +#: src/msgmerge.c:508 #, c-format msgid "" " -C, --compendium=FILE additional library of message translations,\n" @@ -2953,7 +2939,7 @@ " -C, --compendium=FILE メッセージ翻訳の追加文献\n" " 1回以上指定される可能性あり\n" -#: src/msgmerge.c:572 +#: src/msgmerge.c:514 #, c-format msgid "" " -U, --update update def.po,\n" @@ -2962,27 +2948,27 @@ " -U, --update def.po を更新\n" " def.po が既に最新版であれば何もしない\n" -#: src/msgmerge.c:584 +#: src/msgmerge.c:526 #, c-format msgid "Output file location in update mode:\n" msgstr "更新モードでの出力ファイルの場所:\n" -#: src/msgmerge.c:586 +#: src/msgmerge.c:528 #, c-format msgid "The result is written back to def.po.\n" msgstr "結果は def.po に書き戻されます.\n" -#: src/msgmerge.c:588 +#: src/msgmerge.c:530 #, c-format msgid " --backup=CONTROL make a backup of def.po\n" msgstr " --backup=CONTROL def.po のバックアップを作成\n" -#: src/msgmerge.c:590 +#: src/msgmerge.c:532 #, c-format msgid " --suffix=SUFFIX override the usual backup suffix\n" msgstr " --suffix=SUFFIX 通常のバックアップ接尾辞を上書き\n" -#: src/msgmerge.c:592 +#: src/msgmerge.c:534 #, c-format msgid "" "The version control method may be selected via the --backup option or " @@ -3010,56 +2996,56 @@ "--suffix や環境変数 SIMPLE_BACKUP_SUFFIX が設定されていなければ,\n" "バックアップ接尾辞は '~' です.\n" -#: src/msgmerge.c:613 +#: src/msgmerge.c:552 #, c-format msgid "" " --previous keep previous msgids of translated messages\n" msgstr " --previous 翻訳されたメッセージの前の msgid を残す\n" -#: src/msgmerge.c:670 src/urlget.c:189 +#: src/msgmerge.c:609 src/urlget.c:192 #, c-format msgid " -q, --quiet, --silent suppress progress indicators\n" msgstr " -q, --quiet, --silent 進行状況を表示しない\n" -#: src/msgmerge.c:1687 +#: src/msgmerge.c:1604 #, c-format msgid "this message should define plural forms" msgstr "このメッセージは複数形を定義すべきです" -#: src/msgmerge.c:1708 +#: src/msgmerge.c:1627 #, c-format msgid "this message should not define plural forms" msgstr "このメッセージは複数形を定義すべきではありません" -#: src/msgmerge.c:2112 +#: src/msgmerge.c:2030 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" msgstr "%s %ld(前の版) + %ld(新版) を読み込み (マージ %ld, あいまい %ld, 欠落 %ld, 破棄 %ld).\n" -#: src/msgmerge.c:2120 src/urlget.c:300 src/urlget.c:348 src/urlget.c:391 -#: src/urlget.c:434 +#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395 +#: src/urlget.c:437 #, c-format msgid " done.\n" msgstr " 完了.\n" -#: src/msgunfmt.c:306 src/msgunfmt.c:315 src/msgunfmt.c:338 +#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s と明示的に指定されたファイル名は背反です" -#: src/msgunfmt.c:425 +#: src/msgunfmt.c:427 #, c-format msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "使用法: %s [オプション] [ファイル]...\n" -#: src/msgunfmt.c:429 +#: src/msgunfmt.c:431 #, c-format msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "バイナリメッセージカタログを Uniforum 形式の .po ファイルに変換.\n" -#: src/msgunfmt.c:438 +#: src/msgunfmt.c:440 #, c-format msgid "" " -j, --java Java mode: input is a Java ResourceBundle " @@ -3067,12 +3053,12 @@ msgstr "" " -j, --java Java モード: 入力は Java ResourceBundle クラス\n" -#: src/msgunfmt.c:440 +#: src/msgunfmt.c:442 #, c-format msgid " --csharp C# mode: input is a .NET .dll file\n" msgstr " --csharp C# モード: 入力は .NET .dll ファイル\n" -#: src/msgunfmt.c:442 +#: src/msgunfmt.c:444 #, c-format msgid "" " --csharp-resources C# resources mode: input is a .NET .resources " @@ -3080,23 +3066,23 @@ msgstr "" " --csharp-resources C# resources モード: 入力は .NET .resources ファイル\n" -#: src/msgunfmt.c:444 +#: src/msgunfmt.c:446 #, c-format msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr " --tcl Tcl モード: 入力は tcl/msgcat .msg ファイル\n" -#: src/msgunfmt.c:449 +#: src/msgunfmt.c:451 #, c-format msgid " FILE ... input .mo files\n" msgstr " FILE ... 入力する .mo ファイル\n" -#: src/msgunfmt.c:454 +#: src/msgunfmt.c:456 #, c-format msgid "Input file location in Java mode:\n" msgstr "Java モードにおける入力ファイルの場所:\n" -#: src/msgunfmt.c:460 +#: src/msgunfmt.c:462 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -3106,12 +3092,12 @@ "クラス名は, リソース名の末尾に下付きバー \"_\" を挟んでロカール名を加えること\n" "で決められます. クラスの場所は CLASSPATH で指定されます.\n" -#: src/msgunfmt.c:465 +#: src/msgunfmt.c:467 #, c-format msgid "Input file location in C# mode:\n" msgstr "C# モードにおける入力ファイルの場所:\n" -#: src/msgunfmt.c:473 +#: src/msgunfmt.c:475 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is located in a\n" @@ -3120,29 +3106,29 @@ "-l と -d オプションは必須. .dll ファイルはロカールに依存した名前を持つ\n" "指定されたディレクトリのサブディレクトリに置かれます.\n" -#: src/msgunfmt.c:477 +#: src/msgunfmt.c:479 #, c-format msgid "Input file location in Tcl mode:\n" msgstr "Tcl モードにおける入力ファイルの場所:\n" -#: src/msgunfmt.c:483 +#: src/msgunfmt.c:485 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is located in the\n" "specified directory.\n" msgstr "-l と -d オプションは必須. .msg ファイルは指定されたディレクトリに置かれます.\n" -#: src/msgunfmt.c:509 +#: src/msgunfmt.c:511 #, c-format msgid " -i, --indent write indented output style\n" msgstr " -i, --indent 字下げ形式の出力\n" -#: src/msgunfmt.c:511 +#: src/msgunfmt.c:513 #, c-format msgid " --strict write strict uniforum style\n" msgstr " --strict 厳密な Uniforum 形式で出力\n" -#: src/msguniq.c:329 +#: src/msguniq.c:330 #, c-format, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -3164,12 +3150,12 @@ "最初の翻訳から取り出されます. ファイルの位置はそのまま残ります. --unique\n" "オプションを使うと重複は無視されます.\n" -#: src/msguniq.c:362 +#: src/msguniq.c:363 #, c-format msgid " -d, --repeated print only duplicates\n" msgstr " -d, --repeated 重複しているもののみを表示\n" -#: src/msguniq.c:364 +#: src/msguniq.c:365 #, c-format msgid "" " -u, --unique print only unique messages, discard " @@ -3181,7 +3167,7 @@ msgid "" msgstr "<標準入力>" -#: src/po-charset.c:491 +#: src/po-charset.c:489 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -3190,7 +3176,7 @@ "文字セット \"%s\" は汎用のエンコーディグ名ではありません.\n" "ユーザの文字セットへのメッセージの変換はうまく働かないかも知れません.\n" -#: src/po-charset.c:566 +#: src/po-charset.c:557 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -3199,7 +3185,7 @@ "文字セット \"%s\" は実装されていません. %s は iconv() に依存しますが,\n" "iconv() は \"%s\" を実装していません.\n" -#: src/po-charset.c:572 src/po-charset.c:627 +#: src/po-charset.c:564 src/po-charset.c:612 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -3207,15 +3193,15 @@ "GNU libiconv をインストールしてから GNU gettext を再インストールすれば\n" "この問題は解決するでしょう.\n" -#: src/po-charset.c:586 src/po-charset.c:631 +#: src/po-charset.c:578 src/po-charset.c:616 msgid "Continuing anyway, expect parse errors." msgstr "とにかく続けますが, 文法エラーを起こすでしょう." -#: src/po-charset.c:588 +#: src/po-charset.c:580 msgid "Continuing anyway." msgstr "とにかく続けます." -#: src/po-charset.c:622 +#: src/po-charset.c:607 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -3224,7 +3210,7 @@ "文字セット \"%s\" は実装されていません. %s は iconv() に依存します.\n" "このバージョンは iconv() 無しで作られました.\n" -#: src/po-charset.c:659 +#: src/po-charset.c:644 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -3232,7 +3218,7 @@ "文字セットがヘッダにありません.\n" "ユーザの文字セットへのメッセージ変換が機能しません.\n" -#: src/po-gram-gen.y:47 +#: src/po-gram-gen.y:93 #, c-format msgid "inconsistent use of #~" msgstr "一貫していない #~ の使用" @@ -3252,12 +3238,12 @@ msgid "missing 'msgstr' section" msgstr "'msgstr' の項がありません" -#: src/po-gram-gen.y:356 +#: src/po-gram-gen.y:396 #, c-format msgid "first plural form has nonzero index" msgstr "最初の複数形に非ゼロの索引があります" -#: src/po-gram-gen.y:358 +#: src/po-gram-gen.y:398 #, c-format msgid "plural form has wrong index" msgstr "複数形に間違った索引があります" @@ -3267,7 +3253,7 @@ msgid "too many errors, aborting" msgstr "エラーが多過ぎるので, 処理を打ち切ります" -#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949 +#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869 #, c-format msgid "invalid multibyte sequence" msgstr "不正な複数バイトのシーケンス" @@ -3277,50 +3263,50 @@ msgid "incomplete multibyte sequence at end of file" msgstr "ファイル終端に不完全な複数バイトのシーケンス" -#: src/po-lex.c:474 +#: src/po-lex.c:475 #, c-format msgid "incomplete multibyte sequence at end of line" msgstr "行末に不完全な複数バイトのシーケンス" -#: src/po-lex.c:485 +#: src/po-lex.c:487 msgid "iconv failure" msgstr "iconv の失敗" -#: src/po-lex.c:742 +#: src/po-lex.c:744 #, c-format msgid "keyword \"%s\" unknown" msgstr "キーワード \"%s\" は知りません" -#: src/po-lex.c:852 +#: src/po-lex.c:854 #, c-format msgid "invalid control sequence" msgstr "不正な制御シーケンス" -#: src/po-lex.c:979 +#: src/po-lex.c:981 #, c-format msgid "end-of-file within string" msgstr "文字列中の end-of-file" -#: src/po-lex.c:985 +#: src/po-lex.c:987 #, c-format msgid "end-of-line within string" msgstr "文字列中の end-of-line" -#: src/po-lex.c:1006 +#: src/po-lex.c:1008 #, c-format msgid "context separator within string" msgstr "文字列中の文脈セパレータ " -#: src/read-catalog.c:325 src/xgettext.c:1262 +#: src/read-catalog.c:332 src/xgettext.c:1004 #, c-format msgid "this file may not contain domain directives" msgstr "このファイルはドメイン命令を含んでいないようです" -#: src/read-catalog.c:370 +#: src/read-catalog.c:377 msgid "duplicate message definition" msgstr "メッセージが二重に定義されています" -#: src/read-catalog.c:372 +#: src/read-catalog.c:379 msgid "this is the location of the first definition" msgstr "これは最初の定義の場所です" @@ -3341,27 +3327,27 @@ msgid "invalid non-blank line" msgstr "不正な非ブランク行" -#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:192 +#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199 #, c-format msgid "file \"%s\" is truncated" msgstr "ファイル \"%s\" が短く切り捨てられています" -#: src/read-mo.c:133 +#: src/read-mo.c:129 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "ファイル \"%s\" は終端が NUL でない文字列を含んでいます" -#: src/read-mo.c:184 src/read-mo.c:292 +#: src/read-mo.c:165 src/read-mo.c:274 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "ファイル \"%s\" は GNU の .mo 形式ではありません" -#: src/read-mo.c:198 +#: src/read-mo.c:178 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "ファイル \"%s\" は %s に終端が NUL でない文字列を含んでいます" -#: src/read-properties.c:357 +#: src/read-properties.c:227 msgid "warning: invalid \\uxxxx syntax for Unicode character" msgstr "警告: Unicode 文字に対する不正な \\uxxxx 文法" @@ -3377,7 +3363,7 @@ msgid "warning: unterminated key/value pair" msgstr "警告: キー/値の組に終端がありません" -#: src/read-stringtable.c:940 +#: src/read-stringtable.c:939 msgid "warning: syntax error, expected ';' after string" msgstr "警告: 文法エラー, 文字列の後には ';'" @@ -3385,7 +3371,7 @@ msgid "warning: syntax error, expected '=' or ';' after string" msgstr "警告: 文法エラー, 文字列の後には '=' または ';'" -#: src/recode-sr-latin.c:113 +#: src/recode-sr-latin.c:116 #, c-format msgid "Written by %s and %s.\n" msgstr "作者 %s と %s.\n" @@ -3394,16 +3380,16 @@ #. (with Unicode escapes) "\u0160egan" or (with HTML entities) #. "Šegan". #. This is a proper name. See the gettext manual, section Names. -#: src/recode-sr-latin.c:117 +#: src/recode-sr-latin.c:120 msgid "Danilo Segan" msgstr "Danilo Segan" -#: src/recode-sr-latin.c:150 +#: src/recode-sr-latin.c:153 #, c-format, no-wrap msgid "Recode Serbian text from Cyrillic to Latin script.\n" msgstr "Recode Serbian テキスト キリル文字からラテン文字.\n" -#: src/recode-sr-latin.c:153 +#: src/recode-sr-latin.c:156 #, c-format, no-wrap msgid "" "The input text is read from standard input. The converted text is output " @@ -3413,27 +3399,27 @@ "入力テキストは標準入力から読み込まれます. 変換されたテキストは標準出力へ出力\n" "されます.\n" -#: src/recode-sr-latin.c:338 +#: src/recode-sr-latin.c:339 #, c-format msgid "input is not valid in \"%s\" encoding" msgstr "入力は \"%s\" エンコーディングにおいて有効ではありません" -#: src/recode-sr-latin.c:366 +#: src/recode-sr-latin.c:367 #, c-format msgid "error while converting from \"%s\" encoding to \"%s\" encoding" msgstr "\"%s\" エンコーディングから \"%s\" エンコーディングに変換する際にエラーが発生しました" -#: src/urlget.c:156 +#: src/urlget.c:159 #, c-format msgid "expected two arguments" msgstr "引数は 2つです" -#: src/urlget.c:173 +#: src/urlget.c:176 #, c-format msgid "Usage: %s [OPTION] URL FILE\n" msgstr "使用法: %s [オプション] URL ファイル\n" -#: src/urlget.c:178 +#: src/urlget.c:181 #, c-format, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -3442,55 +3428,55 @@ "URL の内容を取得し出力します. もしその URL にアクセスできなければ,\n" "ローカルにアクセス可能な FILE が代わりに使われます.\n" -#: src/urlget.c:229 +#: src/urlget.c:228 #, c-format msgid "error reading \"%s\"" msgstr "\"%s\" を読み込み中にエラーが発生しました" -#: src/urlget.c:235 +#: src/urlget.c:234 #, c-format msgid "error writing stdout" msgstr "標準出力に書き込み中にエラーが発生しました" -#: src/urlget.c:239 +#: src/urlget.c:238 #, c-format msgid "error after reading \"%s\"" msgstr "\"%s\" を読み込んだ後にエラーが発生しました" -#: src/urlget.c:269 +#: src/urlget.c:264 #, c-format msgid "Retrieving %s..." msgstr "%s を検索中..." -#: src/urlget.c:302 +#: src/urlget.c:308 #, c-format msgid " timed out.\n" msgstr " タイムアウト.\n" -#: src/urlget.c:442 +#: src/urlget.c:445 #, c-format msgid " failed.\n" msgstr " 失敗.\n" -#: src/write-catalog.c:125 +#: src/write-catalog.c:126 msgid "" "Cannot output multiple translation domains into a single file with the " "specified output format. Try using PO file syntax instead." msgstr "複数の翻訳ドメインを指定された出力形式で単一のファイルに出力することはできません. 代わりに PO ファイルの文法を使ってみてください." -#: src/write-catalog.c:128 +#: src/write-catalog.c:129 msgid "" "Cannot output multiple translation domains into a single file with the " "specified output format." msgstr "複数の翻訳ドメインを指定された出力形式で単一のファイルに出力することはできません." -#: src/write-catalog.c:161 +#: src/write-catalog.c:162 msgid "" "message catalog has context dependent translations, but the output format " "does not support them." msgstr "メッセージカタログには文脈依存の翻訳がありますが, 出力形式はそれらを実装していません." -#: src/write-catalog.c:196 +#: src/write-catalog.c:197 msgid "" "message catalog has plural form translations, but the output format does not " "support them. Try generating a Java class using \"msgfmt --java\", instead " @@ -3499,53 +3485,52 @@ "メッセージカタログには複数形の翻訳があります. しかし出力形式はそれを実装していません. 属性ファイルの代わりに \"msgfmt --java\" " "を使って Java クラスを生成してみてください." -#: src/write-catalog.c:201 +#: src/write-catalog.c:202 msgid "" "message catalog has plural form translations, but the output format does not " "support them." msgstr "メッセージカタログには複数形の翻訳がありますが, 出力形式はそれらを実装していません." -#: src/write-catalog.c:231 src/write-catalog.c:276 src/write-xml.c:59 +#: src/write-catalog.c:231 src/write-catalog.c:275 #, c-format msgid "cannot create output file \"%s\"" msgstr "出力ファイル \"%s\" を作ることができません" -#: src/write-catalog.c:239 src/write-catalog.c:284 +#: src/write-catalog.c:239 src/write-catalog.c:283 msgid "standard output" msgstr "標準出力" -#: src/write-csharp.c:708 +#: src/write-csharp.c:703 #, c-format msgid "failed to create directory \"%s\"" msgstr "ディレクトリ \"%s\" の作成に失敗しました" -#: src/write-csharp.c:771 +#: src/write-csharp.c:766 #, c-format msgid "compilation of C# class failed, please try --verbose" msgstr "C# クラスのコンパイルに失敗. --verbose を試してください" -#: src/write-csharp.c:773 +#: src/write-csharp.c:768 #, c-format msgid "compilation of C# class failed" msgstr "C# クラスのコンパイルに失敗" -#: src/write-desktop.c:163 src/write-mo.c:815 src/write-qt.c:741 -#: src/write-tcl.c:218 +#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212 #, c-format msgid "error while opening \"%s\" for writing" msgstr "\"%s\" に書き込もうとしてエラーが発生しました" -#: src/write-java.c:1096 +#: src/write-java.c:1080 #, c-format msgid "not a valid Java class name: %s" msgstr "正しい Java クラス名ではありません: %s" -#: src/write-java.c:1216 +#: src/write-java.c:1165 #, c-format msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "Java クラスのコンパイルに失敗. --verbose を試すか $JAVAC を設定してください" -#: src/write-java.c:1219 +#: src/write-java.c:1168 #, c-format msgid "compilation of Java class failed, please try to set $JAVAC" msgstr "Java クラスのコンパイルに失敗. $JAVAC を設定してみてください" @@ -3560,7 +3545,7 @@ "internationalized messages should not contain the '\\%c' escape sequence" msgstr "国際化されたメッセージは '\\%c' というエスケープシーケンスを含んではいけません" -#: src/write-po.c:1334 src/write-po.c:1502 +#: src/write-po.c:1254 src/write-po.c:1383 #, c-format msgid "" "The following msgctxt contains non-ASCII characters.\n" @@ -3574,7 +3559,7 @@ "検討してください.\n" "%s\n" -#: src/write-po.c:1346 src/write-po.c:1514 +#: src/write-po.c:1266 src/write-po.c:1395 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -3588,7 +3573,7 @@ "検討してください.\n" "%s\n" -#: src/write-qt.c:668 +#: src/write-qt.c:667 msgid "" "message catalog has plural form translations\n" "but the Qt message catalog format doesn't support plural handling\n" @@ -3596,7 +3581,7 @@ "メッセージカタログには複数形の翻訳があります.\n" "しかし Qt メッセージカタログ形式は複数形の処理を実装していません\n" -#: src/write-qt.c:694 +#: src/write-qt.c:693 msgid "" "message catalog has msgctxt strings containing characters outside ISO-8859-" "1\n" @@ -3607,7 +3592,7 @@ "Qt メッセージカタログ形式は翻訳文字列でのみ Unicode を実装し, 元の文字列\n" "では実装していません.\n" -#: src/write-qt.c:718 +#: src/write-qt.c:717 msgid "" "message catalog has msgid strings containing characters outside ISO-8859-1\n" "but the Qt message catalog format supports Unicode only in the translated\n" @@ -3617,12 +3602,12 @@ "Qt メッセージカタログ形式は翻訳文字列でのみ Unicode を実装し, 翻訳前の文字列\n" "では実装していません.\n" -#: src/write-resources.c:96 +#: src/write-resources.c:94 #, c-format msgid "error while writing to %s subprocess" msgstr "%s サブプロセスへの書き込み中にエラーが発生しました" -#: src/write-resources.c:133 +#: src/write-resources.c:131 msgid "" "message catalog has context dependent translations\n" "but the C# .resources format doesn't support contexts\n" @@ -3630,7 +3615,7 @@ "メッセージカタログには文脈依存の翻訳があります.\n" "しかし C# .resources 形式は文脈を実装していません\n" -#: src/write-resources.c:152 +#: src/write-resources.c:150 msgid "" "message catalog has plural form translations\n" "but the C# .resources format doesn't support plural handling\n" @@ -3638,7 +3623,7 @@ "メッセージカタログには複数形の翻訳があります.\n" "しかし C# .resources 形式は複数形の処理を実装していません\n" -#: src/write-tcl.c:159 +#: src/write-tcl.c:157 msgid "" "message catalog has context dependent translations\n" "but the Tcl message catalog format doesn't support contexts\n" @@ -3646,7 +3631,7 @@ "メッセージカタログには文脈依存の翻訳があります.\n" "しかし Tcl メッセージカタログ形式は文脈を実装していません\n" -#: src/write-tcl.c:178 +#: src/write-tcl.c:176 msgid "" "message catalog has plural form translations\n" "but the Tcl message catalog format doesn't support plural handling\n" @@ -3654,12 +3639,12 @@ "メッセージカタログには複数形の翻訳があります.\n" "しかし Tcl メッセージカタログ形式は複数形の処理を実装していません\n" -#: src/x-awk.c:340 src/x-javascript.c:764 src/x-python.c:891 +#: src/x-awk.c:341 src/x-python.c:1075 #, c-format msgid "%s:%d: warning: unterminated string" msgstr "%s:%d: 警告: 文字列に終端がありません" -#: src/x-awk.c:591 +#: src/x-awk.c:592 #, c-format msgid "%s:%d: warning: unterminated regular expression" msgstr "%s:%d: 警告: 正規表現に終端がありません" @@ -3668,17 +3653,17 @@ msgid "warning: invalid Unicode character" msgstr "警告: 不正な Unicode 文字" -#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:681 src/x-vala.c:808 +#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: 警告: 文字定数に終端がありません" -#: src/x-c.c:1654 src/x-vala.c:907 +#: src/x-c.c:1247 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: 警告: 文字列に終端がありません" -#: src/x-csharp.c:225 src/xg-encoding.c:111 +#: src/x-csharp.c:224 src/xgettext.c:2021 msgid "Please specify the source encoding through --from-code." msgstr "--from-code で入力エンコーディングを指定してください." @@ -3718,7 +3703,7 @@ "%s:%d: 行末に不正なマルチバイトシーケンス.\n" "--from-code で正しい入力エンコーディングを指定してください.\n" -#: src/x-csharp.c:315 src/x-javascript.c:329 src/x-python.c:353 +#: src/x-csharp.c:315 src/x-python.c:332 #, c-format msgid "%s:%d: iconv failure" msgstr "%s:%d: iconv の失敗" @@ -3732,22 +3717,22 @@ "%s:%d: 不正なマルチバイトシーケンス.\n" "--from-code で入力エンコーディングを指定してください.\n" -#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1098 src/x-vala.c:566 +#: src/x-csharp.c:1390 src/x-python.c:1282 #, c-format msgid "%s:%d: warning: invalid Unicode character" msgstr "%s:%d: 警告: 不正な Unicode 文字" -#: src/x-csharp.c:1451 src/x-java.c:684 +#: src/x-csharp.c:1512 src/x-java.c:875 #, c-format msgid "%s:%d: warning: unterminated string constant" msgstr "%s:%d: 警告: 文字列定数に終端がありません" -#: src/x-csharp.c:1953 src/x-java.c:1591 +#: src/x-csharp.c:2020 src/x-java.c:1369 #, c-format msgid "%s:%d: warning: ')' found where '}' was expected" msgstr "%s:%d: 警告: '}' があるべきところに ')' があります" -#: src/x-csharp.c:1983 src/x-java.c:1621 +#: src/x-csharp.c:2054 src/x-java.c:1403 #, c-format msgid "%s:%d: warning: '}' found where ')' was expected" msgstr "%s:%d: 警告: ')' があるべきところに '}' があります" @@ -3767,12 +3752,12 @@ msgid "sentence end type '%s' unknown" msgstr "文末のタイプ '%s' は知りません" -#: src/xgettext.c:720 +#: src/xgettext.c:621 #, c-format msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing は出力先が標準出力の場合には使えません" -#: src/xgettext.c:724 +#: src/xgettext.c:626 #, c-format msgid "xgettext cannot work without keywords to look for" msgstr "xgettext は検索するキーワードがなければ動きません" @@ -3793,30 +3778,30 @@ msgid "warning: file '%s' extension '%s' is unknown; will try C" msgstr "警告: ファイル '%s' (拡張子 '%s') は未知の形式なので C 言語を試します" -#: src/xgettext.c:1055 +#: src/xgettext.c:821 #, c-format msgid "Extract translatable strings from given input files.\n" msgstr "与えられた入力ファイルから翻訳可能な文字列を取り出します.\n" -#: src/xgettext.c:1078 +#: src/xgettext.c:844 #, c-format msgid "" " -d, --default-domain=NAME use NAME.po for output (instead of " "messages.po)\n" msgstr " -d, --default-domain=NAME 出力に NAME.po を使用 (message.po の代わり)\n" -#: src/xgettext.c:1080 +#: src/xgettext.c:846 #, c-format msgid " -o, --output=FILE write output to specified file\n" msgstr " -o, --output=FILE 指定されたファイルに出力\n" -#: src/xgettext.c:1082 +#: src/xgettext.c:848 #, c-format msgid "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" msgstr " -p, --output-dir=DIR ディレクトリ DIR にファイルを出力\n" -#: src/xgettext.c:1087 +#: src/xgettext.c:853 #, c-format msgid "Choice of input file language:\n" msgstr "入力ファイル言語の選択:\n" @@ -3842,19 +3827,19 @@ " GCC-source, NXStringTable, RST, Glade, Lua,\n" " JavaScript, Vala, Desktop)\n" -#: src/xgettext.c:1096 +#: src/xgettext.c:861 #, c-format msgid " -C, --c++ shorthand for --language=C++\n" msgstr " -C, --c++ --language=C++ の短縮形\n" -#: src/xgettext.c:1098 +#: src/xgettext.c:863 #, c-format msgid "" "By default the language is guessed depending on the input file name " "extension.\n" msgstr "標準で言語は入力ファイルの拡張子で識別されます.\n" -#: src/xgettext.c:1103 +#: src/xgettext.c:868 #, c-format msgid "" " --from-code=NAME encoding of input files\n" @@ -3863,23 +3848,23 @@ " --from-code=NAME 入力ファイルのエンコーディング\n" " (Python, Tcl, Glade 以外)\n" -#: src/xgettext.c:1106 +#: src/xgettext.c:871 #, c-format msgid "By default the input files are assumed to be in ASCII.\n" msgstr "標準では, 入力ファイルは ASCII と仮定されます.\n" -#: src/xgettext.c:1111 +#: src/xgettext.c:876 #, c-format msgid " -j, --join-existing join messages with existing file\n" msgstr " -j, --join-existing 存在するファイルとメッセージを結合\n" -#: src/xgettext.c:1113 +#: src/xgettext.c:878 #, c-format msgid "" " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n" msgstr " -x, --exclude-file=FILE.po FILE.po からの項目は抽出されない\n" -#: src/xgettext.c:1115 +#: src/xgettext.c:880 #, c-format msgid "" " -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n" @@ -3915,12 +3900,12 @@ " (single-space または double-space, \n" " 標準は single-space)\n" -#: src/xgettext.c:1129 +#: src/xgettext.c:886 #, c-format msgid "Language specific options:\n" msgstr "言語指定オプション:\n" -#: src/xgettext.c:1131 +#: src/xgettext.c:888 #, c-format msgid " -a, --extract-all extract all strings\n" msgstr " -a, --extract-all 全ての文字列を抽出\n" @@ -3955,7 +3940,7 @@ " C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n" " Lua, JavaScript, Vala, Desktop)\n" -#: src/xgettext.c:1146 +#: src/xgettext.c:901 #, c-format msgid "" " --flag=WORD:ARG:FLAG additional flag for strings inside the " @@ -3980,12 +3965,12 @@ " C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n" " Lua, JavaScript, Vala 言語のみ)\n" -#: src/xgettext.c:1154 +#: src/xgettext.c:908 #, c-format msgid " -T, --trigraphs understand ANSI C trigraphs for input\n" msgstr " -T, --trigraphs 入力された ANSI C トライグラフを認識\n" -#: src/xgettext.c:1156 +#: src/xgettext.c:910 #, c-format msgid " (only languages C, C++, ObjectiveC)\n" msgstr " (C, C++, ObjectiveC 言語のみ)\n" @@ -4000,33 +3985,33 @@ msgid " (only XML based languages)\n" msgstr " (XMLベースの言語のみ)\n" -#: src/xgettext.c:1162 +#: src/xgettext.c:912 #, c-format msgid " --qt recognize Qt format strings\n" msgstr " --qt Qt 形式の文字列を認識\n" -#: src/xgettext.c:1164 src/xgettext.c:1168 src/xgettext.c:1172 +#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922 #, c-format msgid " (only language C++)\n" msgstr " (C++ 言語のみ)\n" -#: src/xgettext.c:1166 +#: src/xgettext.c:916 #, c-format msgid " --kde recognize KDE 4 format strings\n" msgstr " --kde KDE 4 形式の文字列を認識\n" -#: src/xgettext.c:1170 +#: src/xgettext.c:920 #, c-format msgid " --boost recognize Boost format strings\n" msgstr " --boost Boost 形式の文字列を認識\n" -#: src/xgettext.c:1174 +#: src/xgettext.c:924 #, c-format msgid "" " --debug more detailed formatstring recognition result\n" msgstr " --debug より詳細なフォーマット文字列の認識結果\n" -#: src/xgettext.c:1199 +#: src/xgettext.c:949 #, c-format msgid " --properties-output write out a Java .properties file\n" msgstr " --properties-output Java .properties ファイルを出力\n" @@ -4036,34 +4021,34 @@ msgid " --itstool write out itstool comments\n" msgstr " --itstool itstool コメントを書き出し\n" -#: src/xgettext.c:1216 +#: src/xgettext.c:964 #, c-format msgid " --copyright-holder=STRING set copyright holder in output\n" msgstr " --copyright-holder=STRING 著作権保有者を出力で設定\n" -#: src/xgettext.c:1218 +#: src/xgettext.c:966 #, c-format msgid "" " --foreign-user omit FSF copyright in output for foreign user\n" msgstr " --foreign-user GNU プロジェクト以外のユーザ向けに出力中の FSF 著作権を省略\n" -#: src/xgettext.c:1220 +#: src/xgettext.c:968 #, c-format msgid " --package-name=PACKAGE set package name in output\n" msgstr " --package-name=PACKAGE パッケージ名を出力で設定\n" -#: src/xgettext.c:1222 +#: src/xgettext.c:970 #, c-format msgid " --package-version=VERSION set package version in output\n" msgstr " --package-version=VERSION パッケージバージョンを出力で設定\n" -#: src/xgettext.c:1224 +#: src/xgettext.c:972 #, c-format msgid "" " --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n" msgstr " --msgid-bugs-address=EMAIL@ADDRESS msgid のバグ報告用アドレスを設定\n" -#: src/xgettext.c:1226 +#: src/xgettext.c:974 #, c-format msgid "" " -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for " @@ -4073,7 +4058,7 @@ " -m[STRING], --msgstr-prefix[=STRING] msgstr 項目の接頭辞に STRING か \"\"\n" " を使用\n" -#: src/xgettext.c:1229 +#: src/xgettext.c:977 #, c-format msgid "" " -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for " @@ -4083,52 +4068,52 @@ " -M[STRING], --msgstr-suffix[=STRING] msgstr 項目の接尾辞に STRING か \"\"\n" " を使用\n" -#: src/xgettext.c:1641 +#: src/xgettext.c:1783 #, c-format msgid "" "A --flag argument doesn't have the ::[pass-] syntax: " "%s" msgstr "--flag 引数は ::[pass-] 文法を持っていません: %s" -#: src/xgettext.c:1798 +#: src/xgettext.c:1882 msgid "standard input" msgstr "標準入力" -#: src/xg-encoding.c:76 +#: src/xgettext.c:1986 #, c-format msgid "Non-ASCII character at %s%s." msgstr "%s%s に非ASCII文字." -#: src/xg-encoding.c:80 +#: src/xgettext.c:1990 #, c-format msgid "Non-ASCII comment at or before %s%s." msgstr "%s%s またはその前に非ASCIIコメント." -#: src/xg-encoding.c:85 +#: src/xgettext.c:1995 #, c-format msgid "Non-ASCII string at %s%s." msgstr "%s%s に非ASCII文字列." -#: src/xg-message.c:91 src/xg-message.c:227 src/xg-message.c:296 +#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196 #, c-format msgid "%s%s: warning: " msgstr "%s%s: 警告: " -#: src/xg-message.c:94 +#: src/xgettext.c:2104 #, c-format msgid "" "Although being used in a format string position, the %s is not a valid %s " "format string. Reason: %s\n" msgstr "フォーマット文字列の位置で使われていますが, %s は正しい %s フォーマット文字列ではありません. 理由: %s\n" -#: src/xg-message.c:95 +#: src/xgettext.c:2105 #, c-format msgid "" "Although declared as such, the %s is not a valid %s format string. Reason: " "%s\n" msgstr "そのように宣言されていますが, '%s' は正しい %s 形式の文字列ではありません. 理由: %s\n" -#: src/xg-message.c:229 +#: src/xgettext.c:2136 #, c-format msgid "" "'%s' format string with unnamed arguments cannot be properly localized:\n" @@ -4137,36 +4122,36 @@ "and a mapping instead of a tuple for the arguments.\n" msgstr "" "名無し引数のある '%s' フォーマット文字列を適切に特定することができません:\n" -"翻訳者は引数を整理し直すことができません.\n" +"翻訳者は引数の順序を変えることができません.\n" "名前付き引数のあるフォーマット文字列を使うこと, 且つ引数に対して組 (tuple)\n" "の代わりにマッピングを使うことを検討してください.\n" -#: src/xg-message.c:298 +#: src/xgettext.c:2198 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" "空の msgid. GNU gettext で予約されています:\n" -"gettxt(\"\") はメタ情報の付いたヘッダエントリを返しますが\n" +"gettext(\"\") はメタ情報の付いたヘッダエントリを返しますが\n" "空の文字列は返しません.\n" -#: src/xg-arglist-parser.c:388 +#: src/xgettext.c:2835 #, c-format msgid "ambiguous argument specification for keyword '%.*s'" msgstr "キーワード '%.*s' に対する引数指定が曖昧です" -#: src/xg-arglist-parser.c:450 +#: src/xgettext.c:2862 #, c-format msgid "warning: missing context for keyword '%.*s'" msgstr "警告: キーワード '%.*s' に対する文脈がありません" -#: src/xg-arglist-parser.c:475 +#: src/xgettext.c:2887 #, c-format msgid "warning: missing context for plural argument of keyword '%.*s'" msgstr "警告: キーワード '%.*s' の複数形引数に文脈がありません" -#: src/xg-arglist-parser.c:496 +#: src/xgettext.c:2908 #, c-format msgid "context mismatch between singular and plural form" msgstr "文脈が単数系と複数形で一致しません" @@ -4187,7 +4172,7 @@ msgid "language '%s' unknown" msgstr "言語 '%s' は知りません" -#: src/xg-mixed-string.c:496 +#: src/x-java.c:494 #, c-format msgid "%s:%d: warning: lone surrogate U+%04X" msgstr "%s:%d: 警告: 長いサロゲート U+%04X" @@ -4256,37 +4241,37 @@ msgid "%s:%d: warning: unterminated XML markup" msgstr "%s:%d: 警告: 終端のない XML マークアップ" -#: src/x-perl.c:338 +#: src/x-perl.c:308 #, c-format msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF" msgstr "%s:%d: EOF の前のどこにも文字列終端 \"%s\" が見つかりません" -#: src/x-perl.c:1073 +#: src/x-perl.c:1043 #, c-format msgid "%s:%d: missing right brace on \\x{HEXNUMBER}" msgstr "%s:%d: \\x{HEXNUMBER} に右括弧がありません" -#: src/x-perl.c:1194 +#: src/x-perl.c:1163 #, c-format msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\"" msgstr "%s:%d: 不正な補間 (\"\\l\") 8bit 文字 \"%c\"" -#: src/x-perl.c:1214 +#: src/x-perl.c:1183 #, c-format msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\"" msgstr "%s:%d: 不正な補間 (\"\\u\") 8bit 文字 \"%c\"" -#: src/x-perl.c:1248 +#: src/x-perl.c:1217 #, c-format msgid "%s:%d: invalid variable interpolation at \"%c\"" msgstr "%s:%d: \"%c\" に不正な変数補間" -#: src/x-perl.c:1261 +#: src/x-perl.c:1230 #, c-format msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\"" msgstr "%s:%d: 不正な補間 (\"\\L\") 8bit 文字 \"%c\"" -#: src/x-perl.c:1278 +#: src/x-perl.c:1247 #, c-format msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\"" msgstr "%s:%d: 不正な補間 (\"\\U\") 8bit 文字 \"%c\"" @@ -4350,31 +4335,31 @@ "Please specify the source encoding through --from-code or through a comment\n" "as specified in http://www.python.org/peps/pep-0263.html.\n" msgstr "" -"%s:%d: 無効ななマルチバイトシーケンス.\n" +"%s:%d: 無効なマルチバイトシーケンス.\n" "--from-code または http://www.python.org/peps/pep-0263.html にあるコメントを\n" "使って正しい入力エンコーディングを指定してください.\n" -#: src/x-python.c:679 +#: src/x-python.c:680 #, c-format msgid "Unknown encoding \"%s\". Proceeding with ASCII instead." msgstr "未知のエンコーディング \"%s\". 代わりに ASCII として進めます." -#: src/x-rst.c:116 +#: src/x-rst.c:108 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: 不正な文字列定義" -#: src/x-rst.c:180 +#: src/x-rst.c:172 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: # の後に数字がありません" -#: src/x-rst.c:215 +#: src/x-rst.c:207 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: 不正な文字列表現" -#: src/x-sh.c:1141 +#: src/x-sh.c:1074 #, c-format msgid "" "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; " diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/git-gui.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/git-gui.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/git-gui.po 2021-08-03 08:53:39.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/git-gui.po 2022-02-11 23:04:22.000000000 +0000 @@ -11,14 +11,14 @@ "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2021-03-09 23:23+0000\n" +"PO-Revision-Date: 2021-09-20 14:51+0000\n" "Last-Translator: KIDANI Akito \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: 2021-08-02 17:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: ja\n" #: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 diff -Nru language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/git.po language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/git.po --- language-pack-ja-base-20.04+20210802/data/ja/LC_MESSAGES/git.po 2021-08-03 08:53:40.000000000 +0000 +++ language-pack-ja-base-20.04+20220211/data/ja/LC_MESSAGES/git.po 2022-02-11 23:04:23.000000000 +0000 @@ -15,215 +15,216 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2021-08-02 17:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:57+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: add-interactive.c:376 +#: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: builtin/rebase.c:1642 msgid "could not read index" msgstr "" -#: add-interactive.c:584 git-add--interactive.perl:269 +#: add-interactive.c:588 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "" -#: add-interactive.c:642 git-add--interactive.perl:278 +#: add-interactive.c:646 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "" -#: add-interactive.c:643 git-add--interactive.perl:314 +#: add-interactive.c:647 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "" -#: add-interactive.c:680 git-add--interactive.perl:641 +#: add-interactive.c:684 git-add--interactive.perl:641 msgid "Update" msgstr "" -#: add-interactive.c:697 add-interactive.c:885 +#: add-interactive.c:701 add-interactive.c:889 #, c-format msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 msgid "could not write index" msgstr "" -#: add-interactive.c:706 git-add--interactive.perl:626 +#: add-interactive.c:710 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:724 git-add--interactive.perl:676 +#: add-interactive.c:728 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 -#: builtin/reset.c:145 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 +#: builtin/reset.c:151 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: add-interactive.c:759 git-add--interactive.perl:653 +#: add-interactive.c:763 git-add--interactive.perl:653 msgid "Revert" msgstr "" -#: add-interactive.c:775 +#: add-interactive.c:779 msgid "Could not parse HEAD^{tree}" msgstr "" -#: add-interactive.c:813 git-add--interactive.perl:629 +#: add-interactive.c:817 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:864 git-add--interactive.perl:693 +#: add-interactive.c:868 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "" -#: add-interactive.c:868 git-add--interactive.perl:687 +#: add-interactive.c:872 git-add--interactive.perl:687 msgid "Add untracked" msgstr "" -#: add-interactive.c:895 git-add--interactive.perl:623 +#: add-interactive.c:899 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:925 +#: add-interactive.c:929 #, c-format msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "" -#: add-interactive.c:943 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1379 msgid "Patch update" msgstr "" -#: add-interactive.c:982 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1792 msgid "Review diff" msgstr "" -#: add-interactive.c:1010 +#: add-interactive.c:1014 msgid "show paths with changes" msgstr "" -#: add-interactive.c:1012 +#: add-interactive.c:1016 msgid "add working tree state to the staged set of changes" msgstr "" -#: add-interactive.c:1014 +#: add-interactive.c:1018 msgid "revert staged set of changes back to the HEAD version" msgstr "" -#: add-interactive.c:1016 +#: add-interactive.c:1020 msgid "pick hunks and update selectively" msgstr "" -#: add-interactive.c:1018 +#: add-interactive.c:1022 msgid "view diff between HEAD and index" msgstr "" -#: add-interactive.c:1020 +#: add-interactive.c:1024 msgid "add contents of untracked files to the staged set of changes" msgstr "" -#: add-interactive.c:1028 add-interactive.c:1077 +#: add-interactive.c:1032 add-interactive.c:1081 msgid "Prompt help:" msgstr "" -#: add-interactive.c:1030 +#: add-interactive.c:1034 msgid "select a single item" msgstr "" -#: add-interactive.c:1032 +#: add-interactive.c:1036 msgid "select a range of items" msgstr "" -#: add-interactive.c:1034 +#: add-interactive.c:1038 msgid "select multiple ranges" msgstr "" -#: add-interactive.c:1036 add-interactive.c:1081 +#: add-interactive.c:1040 add-interactive.c:1085 msgid "select item based on unique prefix" msgstr "" -#: add-interactive.c:1038 +#: add-interactive.c:1042 msgid "unselect specified items" msgstr "" -#: add-interactive.c:1040 +#: add-interactive.c:1044 msgid "choose all items" msgstr "" -#: add-interactive.c:1042 +#: add-interactive.c:1046 msgid "(empty) finish selecting" msgstr "" -#: add-interactive.c:1079 +#: add-interactive.c:1083 msgid "select a numbered item" msgstr "" -#: add-interactive.c:1083 +#: add-interactive.c:1087 msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "staged" msgstr "" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "unstaged" msgstr "" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 #: git-add--interactive.perl:213 msgid "path" msgstr "" -#: add-interactive.c:1151 +#: add-interactive.c:1155 msgid "could not refresh index" msgstr "" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "" @@ -243,32 +244,32 @@ msgid "Stage this hunk [y,n,a,q,d%s,?]? " msgstr "" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -277,11 +278,11 @@ "%.*s" msgstr "" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -297,18 +298,18 @@ msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "" @@ -324,7 +325,7 @@ #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -338,7 +339,7 @@ "d - do not stage this hunk nor any of the remaining hunks\n" msgstr "" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -351,121 +352,121 @@ "? - print help\n" msgstr "" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "" -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "" msgstr[1] "" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "" -#: advice.c:159 +#: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:250 +#: advice.c:178 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:252 +#: advice.c:180 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:254 +#: advice.c:182 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:256 +#: advice.c:184 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:258 +#: advice.c:186 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:260 +#: advice.c:188 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:268 +#: advice.c:196 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:276 +#: advice.c:204 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:209 builtin/merge.c:1379 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:283 +#: advice.c:211 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:284 +#: advice.c:212 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:290 +#: advice.c:242 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -496,82 +497,82 @@ msgid "unclosed quote" msgstr "" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:137 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -582,45 +583,45 @@ msgstr[0] "" msgstr[1] "" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" @@ -725,7 +726,7 @@ msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" @@ -736,370 +737,372 @@ msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3442 apply.c:3685 +#: apply.c:3442 apply.c:3709 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3528 apply.c:3700 +#: apply.c:3549 apply.c:3724 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3558 apply.c:3732 apply.c:3976 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3572 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3575 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3591 apply.c:3595 +#: apply.c:3612 apply.c:3616 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3607 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3621 +#: apply.c:3642 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3626 +#: apply.c:3647 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3652 +#: apply.c:3676 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3725 +#: apply.c:3749 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3727 +#: apply.c:3751 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 +#: read-cache.c:1368 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3950 +#: apply.c:3974 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3954 +#: apply.c:3978 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3974 +#: apply.c:3998 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3979 +#: apply.c:4003 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3999 +#: apply.c:4023 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:4003 +#: apply.c:4027 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4018 +#: apply.c:4042 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4110 +#: apply.c:4134 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4117 +#: apply.c:4141 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4120 +#: apply.c:4144 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4129 +#: apply.c:4153 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4139 +#: apply.c:4163 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4277 +#: apply.c:4301 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4311 +#: apply.c:4335 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4317 +#: apply.c:4341 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4325 +#: apply.c:4349 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4331 apply.c:4476 +#: apply.c:4355 apply.c:4500 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 +#: builtin/gc.c:2276 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4378 +#: apply.c:4402 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4448 +#: apply.c:4472 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4546 +#: apply.c:4570 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4554 +#: apply.c:4578 msgid "internal error" msgstr "" -#: apply.c:4557 +#: apply.c:4581 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4568 +#: apply.c:4592 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4590 +#: apply.c:4614 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4594 +#: apply.c:4618 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4718 +#: apply.c:4747 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4726 +#: apply.c:4755 msgid "unrecognized input" msgstr "" -#: apply.c:4746 +#: apply.c:4775 msgid "unable to read index file" msgstr "" -#: apply.c:4903 +#: apply.c:4932 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4930 +#: apply.c:4959 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4936 apply.c:4951 +#: apply.c:4965 apply.c:4980 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4944 +#: apply.c:4973 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 msgid "Unable to write new index file" msgstr "" -#: apply.c:4988 +#: apply.c:5017 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4991 +#: apply.c:5020 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5022 builtin/am.c:2320 msgid "num" msgstr "" -#: apply.c:4994 +#: apply.c:5023 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4997 +#: apply.c:5026 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4999 +#: apply.c:5028 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5003 +#: apply.c:5032 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5005 +#: apply.c:5034 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5007 +#: apply.c:5036 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5009 +#: apply.c:5038 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5011 +#: apply.c:5040 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5013 +#: apply.c:5042 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5015 +#: apply.c:5044 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5018 +#: apply.c:5047 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5020 +#: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5022 +#: apply.c:5051 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5054 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5027 +#: apply.c:5056 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 +#: builtin/rebase.c:1051 msgid "action" msgstr "" -#: apply.c:5029 +#: apply.c:5058 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5032 apply.c:5035 +#: apply.c:5061 apply.c:5064 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5038 +#: apply.c:5067 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5040 +#: apply.c:5069 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5042 +#: apply.c:5071 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5044 +#: apply.c:5073 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 msgid "be verbose" msgstr "" -#: apply.c:5047 +#: apply.c:5076 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5050 +#: apply.c:5079 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5081 builtin/am.c:2308 msgid "root" msgstr "" -#: apply.c:5053 +#: apply.c:5082 msgid "prepend to all filenames" msgstr "" @@ -1120,119 +1123,119 @@ msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <リポジトリ> [--exec <コマンド>] --list" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:454 +#: archive.c:450 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:460 +#: archive.c:456 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:473 +#: archive.c:469 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:485 +#: archive.c:481 msgid "current working directory is untracked" msgstr "" -#: archive.c:555 +#: archive.c:551 msgid "fmt" msgstr "fmt" -#: archive.c:555 +#: archive.c:551 msgid "archive format" msgstr "アーカイブフォーマット" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:552 builtin/log.c:1775 msgid "prefix" msgstr "" -#: archive.c:557 +#: archive.c:553 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:558 builtin/archive.c:88 msgid "write the archive to this file" msgstr "このファイルにアーカイブを書き込む" -#: archive.c:564 +#: archive.c:560 msgid "read .gitattributes in working directory" msgstr "ワーキングディレクトリの.gitattributesを読み込む" -#: archive.c:565 +#: archive.c:561 msgid "report archived files on stderr" msgstr "stderrに圧縮ファイルを報告" -#: archive.c:465 +#: archive.c:444 msgid "store only" msgstr "保存のみ" -#: archive.c:466 +#: archive.c:445 msgid "compress faster" msgstr "高速で圧縮" -#: archive.c:474 +#: archive.c:453 msgid "compress better" msgstr "圧縮率を高める" -#: archive.c:570 +#: archive.c:566 msgid "list supported archive formats" msgstr "" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 msgid "repo" msgstr "リポジトリ" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:569 builtin/archive.c:90 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 -#: builtin/notes.c:498 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:571 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:582 +#: archive.c:578 msgid "Unexpected option --remote" msgstr "" -#: archive.c:584 +#: archive.c:580 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:586 +#: archive.c:582 msgid "Unexpected option --output" msgstr "" -#: archive.c:610 +#: archive.c:606 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:619 +#: archive.c:615 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" @@ -1247,7 +1250,7 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "" @@ -1276,7 +1279,7 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "" @@ -1286,59 +1289,59 @@ msgid "timestamp too large for this system: %" msgstr "" -#: attr.c:202 +#: attr.c:203 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:359 +#: attr.c:364 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:399 +#: attr.c:404 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:489 +#: bisect.c:488 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:699 +#: bisect.c:698 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:766 +#: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:791 +#: bisect.c:789 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:796 +#: bisect.c:794 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:801 +#: bisect.c:799 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:809 +#: bisect.c:807 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1346,7 +1349,7 @@ "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:822 +#: bisect.c:820 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1354,43 +1357,43 @@ "We continue anyway." msgstr "" -#: bisect.c:861 +#: bisect.c:859 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:911 +#: bisect.c:909 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:939 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:987 builtin/merge.c:153 +#: bisect.c:985 builtin/merge.c:154 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:1027 +#: bisect.c:1025 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1057 +#: bisect.c:1055 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1066 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1095 +#: bisect.c:1093 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1400,44 +1403,45 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1101 +#: bisect.c:1099 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1557,94 +1561,94 @@ msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:36 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: builtin/commit.c:862 #, c-format msgid "could not open '%s'" msgstr "'%s'を開けません" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "" -#: bundle.c:379 +#: bundle.c:311 msgid "rev-list died" msgstr "" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "参照 '%s'はrev-listのオプションから除外されています。" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "" @@ -1653,18 +1657,18 @@ msgid "invalid color value: %.*s" msgstr "" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "%s をパースできませんでした" -#: commit.c:54 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s はコミットではありません!" -#: commit.c:194 +#: commit.c:196 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1676,48 +1680,48 @@ "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1223 +#: commit.c:1239 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1227 +#: commit.c:1243 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1230 +#: commit.c:1246 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1233 +#: commit.c:1249 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1487 +#: commit.c:1503 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" @@ -1726,81 +1730,81 @@ msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:361 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:433 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:746 commit-graph.c:783 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:756 +#: commit-graph.c:767 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1105 builtin/am.c:1342 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1367 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1358 +#: commit-graph.c:1398 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1375 +#: commit-graph.c:1415 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1395 +#: commit-graph.c:1435 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1467 +#: commit-graph.c:1507 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1650 +#: commit-graph.c:1690 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1663 +#: commit-graph.c:1703 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1667 +#: commit-graph.c:1707 #, c-format msgid "error opening index for %s" msgstr "" @@ -1817,7 +1821,7 @@ msgid "invalid commit object id: %s" msgstr "" -#: commit-graph.c:1704 +#: commit-graph.c:1744 msgid "Finding commits for commit graph among packed objects" msgstr "" @@ -1825,44 +1829,44 @@ msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1722 +#: commit-graph.c:1762 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1771 +#: commit-graph.c:1811 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1842 midx.c:1146 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: builtin/index-pack.c:342 +#: wrapper.c:203 #, c-format msgid "unable to create '%s'" msgstr "" -#: commit-graph.c:1879 +#: commit-graph.c:1917 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1915 +#: commit-graph.c:1953 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1931 +#: commit-graph.c:1969 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1951 +#: commit-graph.c:1989 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2084 +#: commit-graph.c:2122 msgid "Scanning merged commits" msgstr "" @@ -1871,7 +1875,7 @@ msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:2128 +#: commit-graph.c:2166 msgid "Merging commit-graph" msgstr "" @@ -1880,76 +1884,76 @@ msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:2342 +#: commit-graph.c:2381 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2479 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2450 +#: commit-graph.c:2489 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2499 commit-graph.c:2514 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2467 +#: commit-graph.c:2506 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2485 +#: commit-graph.c:2524 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2500 +#: commit-graph.c:2539 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2507 +#: commit-graph.c:2546 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2517 +#: commit-graph.c:2556 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2526 +#: commit-graph.c:2565 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2540 +#: commit-graph.c:2579 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2545 +#: commit-graph.c:2584 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2549 +#: commit-graph.c:2588 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2432 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2572 +#: commit-graph.c:2611 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" @@ -1958,7 +1962,7 @@ msgid "memory exhausted" msgstr "" -#: config.c:126 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1968,20 +1972,20 @@ "This might be due to circular includes." msgstr "" -#: config.c:142 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:153 +#: config.c:152 msgid "relative config includes must come from files" msgstr "" -#: config.c:199 +#: config.c:201 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:442 +#: config.c:443 #, c-format msgid "key does not contain a section: %s" msgstr "" @@ -1991,266 +1995,266 @@ msgid "key does not contain variable name: %s" msgstr "" -#: config.c:472 sequencer.c:2588 +#: config.c:470 sequencer.c:2804 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:478 +#: config.c:475 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:529 config.c:541 +#: config.c:513 config.c:525 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:555 config.c:572 config.c:579 config.c:588 +#: config.c:539 config.c:556 config.c:563 config.c:572 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:995 +#: config.c:979 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:999 +#: config.c:983 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:1003 +#: config.c:987 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:1007 +#: config.c:991 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:1011 +#: config.c:995 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:1015 +#: config.c:999 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:1152 +#: config.c:1136 msgid "out of range" msgstr "" -#: config.c:1152 +#: config.c:1136 msgid "invalid unit" msgstr "" -#: config.c:1153 +#: config.c:1137 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:1163 +#: config.c:1147 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1166 +#: config.c:1150 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1169 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1172 +#: config.c:1156 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1175 +#: config.c:1159 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1178 +#: config.c:1162 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1289 +#: config.c:1259 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1298 +#: config.c:1268 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1391 +#: config.c:1361 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1405 config.c:1416 +#: config.c:1375 config.c:1386 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1508 +#: config.c:1476 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1541 +#: config.c:1509 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1613 +#: config.c:1581 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1639 +#: config.c:1607 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1640 +#: config.c:1608 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1669 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1823 +#: config.c:1792 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1826 +#: config.c:1795 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1843 +#: config.c:1813 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1873 +#: config.c:1858 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1927 +#: config.c:1914 msgid "unable to parse command-line config" msgstr "" -#: config.c:2290 +#: config.c:2282 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2464 +#: config.c:2456 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2509 +#: config.c:2501 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2555 +#: config.c:2547 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2557 +#: config.c:2549 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2641 +#: config.c:2633 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2673 +#: config.c:2665 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2702 +#: config.c:2694 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2954 config.c:3280 +#: config.c:2946 config.c:3273 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2965 +#: config.c:2957 #, c-format msgid "opening %s" msgstr "" -#: config.c:3002 builtin/config.c:361 +#: config.c:2994 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:3027 +#: config.c:3019 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:3040 config.c:3293 +#: config.c:3032 config.c:3286 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:3051 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:3060 config.c:3298 +#: config.c:3053 config.c:3291 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:3145 config.c:3395 +#: config.c:3138 config.c:3388 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3179 +#: config.c:3172 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3271 +#: config.c:3264 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3438 +#: config.c:3431 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2281,70 +2285,70 @@ msgid "expected flush after capabilities" msgstr "" -#: connect.c:263 +#: connect.c:265 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:284 +#: connect.c:286 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:306 +#: connect.c:308 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:308 +#: connect.c:310 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:347 +#: connect.c:349 msgid "invalid packet" msgstr "" -#: connect.c:367 +#: connect.c:369 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:526 +#: connect.c:528 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:530 +#: connect.c:532 msgid "expected flush after ref listing" msgstr "" -#: connect.c:666 +#: connect.c:670 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:717 +#: connect.c:721 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:757 connect.c:820 +#: connect.c:761 connect.c:824 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:761 +#: connect.c:765 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:765 connect.c:836 +#: connect.c:769 connect.c:840 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:787 connect.c:864 +#: connect.c:791 connect.c:868 #, c-format msgid "" "unable to connect to %s:\n" @@ -2352,189 +2356,189 @@ msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:793 connect.c:870 +#: connect.c:797 connect.c:874 msgid "done." msgstr "" -#: connect.c:824 +#: connect.c:828 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:830 +#: connect.c:834 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:967 connect.c:1299 +#: connect.c:971 connect.c:1303 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:969 +#: connect.c:973 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:979 +#: connect.c:983 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:1050 +#: connect.c:1054 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1247 +#: connect.c:1251 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1259 +#: connect.c:1263 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1276 +#: connect.c:1280 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1388 +#: connect.c:1392 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1436 +#: connect.c:1440 msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:120 +#: connected.c:122 msgid "Could not run 'git rev-list'" msgstr "'git rev-list'を実行できませんでした" -#: connected.c:144 +#: connected.c:146 msgid "failed write to rev-list" msgstr "" -#: connected.c:149 +#: connected.c:151 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "" -#: convert.c:940 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1240 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1428 convert.c:1462 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1508 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -2636,55 +2640,55 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1564 msgid "Performing inexact rename detection" msgstr "" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [] " msgstr "" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" -#: diff.c:156 +#: diff.c:157 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:161 +#: diff.c:162 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:297 +#: diff.c:298 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:325 +#: diff.c:326 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:333 +#: diff.c:334 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:410 +#: diff.c:411 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:470 +#: diff.c:471 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2693,35 +2697,35 @@ "'diff.dirstat' の設定変数にエラーが見つかりました:\n" "%s" -#: diff.c:4276 +#: diff.c:4290 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4628 +#: diff.c:4642 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4631 +#: diff.c:4645 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4710 +#: diff.c:4730 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4758 +#: diff.c:4778 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4795 +#: diff.c:4815 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2730,551 +2734,551 @@ "--dirstat/-X オプションパラメーターのパースに失敗しました:\n" "%s" -#: diff.c:4880 +#: diff.c:4900 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4904 +#: diff.c:4924 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4918 +#: diff.c:4938 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4968 diff.c:4974 +#: diff.c:4988 diff.c:4994 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:4986 +#: diff.c:5006 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5007 +#: diff.c:5027 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5026 +#: diff.c:5046 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5066 +#: diff.c:5086 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5102 diff.c:5122 +#: diff.c:5122 diff.c:5142 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5275 +#: diff.c:5295 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5331 +#: diff.c:5351 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5367 +#: diff.c:5387 msgid "Diff output format options" msgstr "" -#: diff.c:5369 diff.c:5375 +#: diff.c:5389 diff.c:5395 msgid "generate patch" msgstr "" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5392 builtin/log.c:179 msgid "suppress diff output" msgstr "" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5397 diff.c:5511 diff.c:5518 msgid "" msgstr "" -#: diff.c:5378 diff.c:5381 +#: diff.c:5398 diff.c:5401 msgid "generate diffs with lines context" msgstr "" -#: diff.c:5383 +#: diff.c:5403 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5386 +#: diff.c:5406 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5390 +#: diff.c:5410 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5394 +#: diff.c:5414 msgid "machine friendly --stat" msgstr "" -#: diff.c:5397 +#: diff.c:5417 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5399 diff.c:5407 +#: diff.c:5419 diff.c:5427 msgid "..." msgstr "" -#: diff.c:5400 +#: diff.c:5420 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5404 +#: diff.c:5424 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5408 +#: diff.c:5428 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5412 +#: diff.c:5432 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5415 +#: diff.c:5435 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5418 +#: diff.c:5438 msgid "show only names of changed files" msgstr "" -#: diff.c:5421 +#: diff.c:5441 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5423 +#: diff.c:5443 msgid "[,[,]]" msgstr "" -#: diff.c:5424 +#: diff.c:5444 msgid "generate diffstat" msgstr "" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5446 diff.c:5449 diff.c:5452 msgid "" msgstr "" -#: diff.c:5427 +#: diff.c:5447 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5430 +#: diff.c:5450 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5433 +#: diff.c:5453 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5435 +#: diff.c:5455 msgid "" msgstr "" -#: diff.c:5436 +#: diff.c:5456 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5439 +#: diff.c:5459 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5442 +#: diff.c:5462 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5445 +#: diff.c:5465 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5447 +#: diff.c:5467 msgid "show colored diff" msgstr "" -#: diff.c:5448 +#: diff.c:5468 msgid "" msgstr "" -#: diff.c:5449 +#: diff.c:5469 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5452 +#: diff.c:5472 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or -" "-numstat" msgstr "" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 msgid "" msgstr "" -#: diff.c:5456 +#: diff.c:5476 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5459 +#: diff.c:5479 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5462 +#: diff.c:5482 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5465 +#: diff.c:5485 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5468 +#: diff.c:5488 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5492 diff.c:5497 diff.c:5502 msgid "" msgstr "" -#: diff.c:5473 +#: diff.c:5493 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5478 +#: diff.c:5498 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5483 +#: diff.c:5503 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5486 +#: diff.c:5506 msgid "Diff rename options" msgstr "" -#: diff.c:5487 +#: diff.c:5507 msgid "[/]" msgstr "" -#: diff.c:5488 +#: diff.c:5508 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5492 +#: diff.c:5512 msgid "detect renames" msgstr "" -#: diff.c:5496 +#: diff.c:5516 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5499 +#: diff.c:5519 msgid "detect copies" msgstr "" -#: diff.c:5503 +#: diff.c:5523 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5505 +#: diff.c:5525 msgid "disable rename detection" msgstr "" -#: diff.c:5508 +#: diff.c:5528 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5510 +#: diff.c:5530 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5513 +#: diff.c:5533 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5515 +#: diff.c:5535 msgid "Diff algorithm options" msgstr "" -#: diff.c:5517 +#: diff.c:5537 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5520 +#: diff.c:5540 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5523 +#: diff.c:5543 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5526 +#: diff.c:5546 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5529 +#: diff.c:5549 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5532 +#: diff.c:5552 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5538 +#: diff.c:5558 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5541 +#: diff.c:5561 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5545 +#: diff.c:5565 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5547 +#: diff.c:5567 msgid "" msgstr "" -#: diff.c:5548 +#: diff.c:5568 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5550 +#: diff.c:5570 msgid "" msgstr "" -#: diff.c:5551 +#: diff.c:5571 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5573 diff.c:5582 diff.c:5585 msgid "" msgstr "" -#: diff.c:5554 +#: diff.c:5574 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 msgid "" msgstr "" -#: diff.c:5557 +#: diff.c:5577 msgid "use to decide what a word is" msgstr "" -#: diff.c:5560 +#: diff.c:5580 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" -#: diff.c:5563 +#: diff.c:5583 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5566 +#: diff.c:5586 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5569 +#: diff.c:5589 msgid "Other diff options" msgstr "" -#: diff.c:5571 +#: diff.c:5591 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5575 +#: diff.c:5595 msgid "treat all files as text" msgstr "" -#: diff.c:5577 +#: diff.c:5597 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5579 +#: diff.c:5599 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5581 +#: diff.c:5601 msgid "disable all output of the program" msgstr "" -#: diff.c:5583 +#: diff.c:5603 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5585 +#: diff.c:5605 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5587 +#: diff.c:5607 msgid "" msgstr "" -#: diff.c:5588 +#: diff.c:5608 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5591 +#: diff.c:5611 msgid "" msgstr "" -#: diff.c:5592 +#: diff.c:5612 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5596 +#: diff.c:5616 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5599 +#: diff.c:5619 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5601 +#: diff.c:5621 msgid "" msgstr "" -#: diff.c:5602 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5605 +#: diff.c:5625 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5608 +#: diff.c:5628 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5611 +#: diff.c:5631 msgid "treat in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5614 +#: diff.c:5634 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5621 +#: diff.c:5641 msgid "" msgstr "" -#: diff.c:5622 +#: diff.c:5642 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5624 +#: diff.c:5644 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5625 +#: diff.c:5645 msgid "select files by diff type" msgstr "" -#: diff.c:5627 +#: diff.c:5647 msgid "" msgstr "" -#: diff.c:5628 +#: diff.c:5648 msgid "Output to a specific file" msgstr "" -#: diff.c:6285 +#: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6288 +#: diff.c:6309 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6291 +#: diff.c:6312 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1198 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2305 +#: dir.c:2464 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2605 +#: dir.c:2766 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2729 +#: dir.c:2890 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3534 +#: dir.c:3837 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3579 dir.c:3584 +#: dir.c:3884 dir.c:3889 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3613 +#: dir.c:3918 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:74 +#: editor.c:77 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -3283,17 +3287,17 @@ msgid "Filtering content" msgstr "" -#: entry.c:478 +#: entry.c:498 #, c-format msgid "could not stat file '%s'" msgstr "" -#: environment.c:152 +#: environment.c:143 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -3303,337 +3307,338 @@ msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:177 +#: fetch-pack.c:193 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:180 +#: fetch-pack.c:196 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:191 +#: fetch-pack.c:207 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:211 +#: fetch-pack.c:227 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:222 +#: fetch-pack.c:238 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:283 +#: fetch-pack.c:299 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:400 fetch-pack.c:1440 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:402 fetch-pack.c:1442 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:405 fetch-pack.c:1445 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:407 fetch-pack.c:1447 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:410 fetch-pack.c:1451 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:450 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:451 +#: fetch-pack.c:467 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:482 +#: fetch-pack.c:498 msgid "giving up" msgstr "" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:511 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:507 +#: fetch-pack.c:523 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:543 +#: fetch-pack.c:559 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:758 +#: fetch-pack.c:774 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:844 +#: fetch-pack.c:860 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:852 +#: fetch-pack.c:868 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:946 +#: fetch-pack.c:962 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:985 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:971 +#: fetch-pack.c:987 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:1031 +#: fetch-pack.c:1030 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:1041 +#: fetch-pack.c:1040 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1101 +#: fetch-pack.c:1100 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1106 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1110 +#: fetch-pack.c:1109 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1125 +#: fetch-pack.c:1124 msgid "no common commits" msgstr "" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1139 fetch-pack.c:1671 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1289 +#: fetch-pack.c:1290 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1296 +#: fetch-pack.c:1297 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1335 +#: fetch-pack.c:1340 fetch-pack.c:2053 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1358 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1359 +#: fetch-pack.c:1364 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1420 +#: fetch-pack.c:1398 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1425 +#: fetch-pack.c:1403 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1435 +#: fetch-pack.c:1413 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1437 +#: fetch-pack.c:1415 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1479 +#: fetch-pack.c:1456 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1526 +#: fetch-pack.c:1505 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1531 +#: fetch-pack.c:1510 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1536 +#: fetch-pack.c:1515 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1960 +#: fetch-pack.c:1949 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1972 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:2010 +#: fetch-pack.c:2098 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:2013 +#: fetch-pack.c:2101 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:273 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 +#: gpg-interface.c:918 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:276 +#: gpg-interface.c:332 gpg-interface.c:454 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: gpg-interface.c:470 +#: gpg-interface.c:874 msgid "gpg failed to sign the data" msgstr "gpg はデータを署名するのに失敗しました" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:543 +#: grep.c:533 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:1906 +#: grep.c:1928 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s を読み取れません" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1934 +#: grep.c:1956 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:23 +#: help.c:24 msgid "start a working area (see also: git help tutorial)" msgstr "" -#: help.c:24 +#: help.c:25 msgid "work on the current change (see also: git help everyday)" msgstr "" -#: help.c:25 +#: help.c:26 msgid "examine the history and state (see also: git help revisions)" msgstr "" -#: help.c:26 +#: help.c:27 msgid "grow, mark and tweak your common history" msgstr "" -#: help.c:27 +#: help.c:28 msgid "collaborate (see also: git help workflows)" msgstr "" -#: help.c:31 +#: help.c:32 msgid "Main Porcelain Commands" msgstr "" -#: help.c:32 +#: help.c:33 msgid "Ancillary Commands / Manipulators" msgstr "" -#: help.c:33 +#: help.c:34 msgid "Ancillary Commands / Interrogators" msgstr "" -#: help.c:34 +#: help.c:35 msgid "Interacting with Others" msgstr "" -#: help.c:35 +#: help.c:36 msgid "Low-level Commands / Manipulators" msgstr "" -#: help.c:36 +#: help.c:37 msgid "Low-level Commands / Interrogators" msgstr "" -#: help.c:37 +#: help.c:38 msgid "Low-level Commands / Syncing Repositories" msgstr "" -#: help.c:38 +#: help.c:39 msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:300 +#: help.c:313 #, c-format msgid "available git commands in '%s'" msgstr "利用可能なgitコマンド: '%s'" -#: help.c:307 +#: help.c:320 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:316 +#: help.c:329 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:365 git.c:100 +#: help.c:378 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "" @@ -3642,50 +3647,50 @@ msgid "The common Git guides are:" msgstr "" -#: help.c:429 +#: help.c:442 msgid "See 'git help ' to read about a specific subcommand" msgstr "" -#: help.c:434 +#: help.c:447 msgid "External commands" msgstr "" -#: help.c:449 +#: help.c:462 msgid "Command aliases" msgstr "" -#: help.c:527 +#: help.c:543 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:591 +#: help.c:613 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:613 +#: help.c:635 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:618 +#: help.c:640 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:623 +#: help.c:654 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:543 help.c:631 +#: help.c:565 help.c:662 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' はgitコマンドではありません。 'git --help'を参照してください。" -#: help.c:635 +#: help.c:666 msgid "" "\n" "The most similar command is" @@ -3695,16 +3700,16 @@ msgstr[0] "" msgstr[1] "" -#: help.c:675 +#: help.c:706 msgid "git version []" msgstr "" -#: help.c:730 +#: help.c:761 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:734 +#: help.c:765 msgid "" "\n" "Did you mean this?" @@ -3758,7 +3763,7 @@ msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:648 #, c-format msgid "invalid date format: %s" msgstr "" @@ -3773,44 +3778,44 @@ msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:'" msgstr "" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "" @@ -3835,110 +3840,110 @@ msgid "failed to read the cache" msgstr "" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: builtin/stash.c:269 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:356 +#: merge-recursive.c:353 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:379 +#: merge-recursive.c:381 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:388 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:908 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:956 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:954 +#: merge-recursive.c:961 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:979 +#: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:995 +#: merge-recursive.c:1002 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-ort.c:888 merge-recursive.c:1191 +#: merge-ort.c:1584 merge-recursive.c:1211 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1593 merge-recursive.c:1218 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1602 merge-recursive.c:1225 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1233 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1251 +#: merge-recursive.c:1273 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1277 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1256 +#: merge-recursive.c:1278 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1653 merge-recursive.c:1281 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3949,108 +3954,108 @@ "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1268 +#: merge-recursive.c:1290 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1887 merge-recursive.c:1372 msgid "Failed to execute internal merge" msgstr "" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1892 merge-recursive.c:1377 #, c-format msgid "Unable to add %s to database" msgstr "データベースに%sを追加できません" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1899 merge-recursive.c:1410 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1402 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1479 +#: merge-recursive.c:1511 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1486 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1491 +#: merge-recursive.c:1523 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1558 msgid "rename" msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1558 msgid "renamed" msgstr "" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1587 +#: merge-recursive.c:1619 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1677 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1676 +#: merge-recursive.c:1708 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1681 +#: merge-recursive.c:1713 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1708 +#: merge-recursive.c:1740 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1745 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:1837 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2068 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4058,189 +4063,188 @@ "getting a majority of the files." msgstr "" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:2038 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:2048 merge-recursive.c:2142 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2202 +#: merge-recursive.c:2234 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:2260 merge-recursive.c:2478 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2973 +#: merge-ort.c:3212 merge-recursive.c:3022 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2976 +#: merge-ort.c:3215 merge-recursive.c:3025 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3089 msgid "modify" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3089 msgid "modified" msgstr "" -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3819 merge-recursive.c:3101 msgid "content" msgstr "" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3821 merge-recursive.c:3105 msgid "add/add" msgstr "" -#: merge-recursive.c:3079 +#: merge-recursive.c:3128 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3823 merge-recursive.c:3150 msgid "submodule" msgstr "" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3825 merge-recursive.c:3151 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3132 +#: merge-recursive.c:3181 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:2400 merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:2420 merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:2407 merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:2428 merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3339 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "" -#: merge-recursive.c:3367 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "" -#: merge-recursive.c:3374 +#: merge-recursive.c:3420 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3383 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3392 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format +#: merge-recursive.c:1991 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3445 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3539 +#: merge-recursive.c:3585 msgid "Merging:" msgstr "" -#: merge-recursive.c:3552 +#: merge-recursive.c:3598 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3602 +#: merge-recursive.c:3648 msgid "merge returned no commit" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-recursive.c:3758 +#: merge-recursive.c:3816 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: builtin/stash.c:489 msgid "Unable to write index." msgstr "" -#: midx.c:93 +#: midx.c:109 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:109 +#: midx.c:125 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:114 +#: midx.c:130 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" @@ -4250,41 +4254,41 @@ msgid "hash version %u does not match" msgstr "" -#: midx.c:123 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:147 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:136 +#: midx.c:152 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:138 +#: midx.c:154 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:140 +#: midx.c:156 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:142 +#: midx.c:158 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:158 +#: midx.c:174 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:202 +#: midx.c:221 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:252 +#: midx.c:271 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" @@ -4292,108 +4296,108 @@ msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:467 +#: midx.c:502 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:473 +#: midx.c:508 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:533 +#: midx.c:576 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:821 +#: midx.c:1201 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:855 +#: midx.c:1321 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:982 +#: midx.c:973 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:965 +#: midx.c:1517 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1029 +#: midx.c:1588 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1044 +#: midx.c:1603 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" -#: midx.c:1058 +#: midx.c:1617 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1067 +#: midx.c:1626 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1087 +#: midx.c:1646 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1094 +#: midx.c:1653 msgid "Verifying object offsets" msgstr "" -#: midx.c:1110 +#: midx.c:1669 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1116 +#: midx.c:1675 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1125 +#: midx.c:1684 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" -#: midx.c:1150 +#: midx.c:1709 msgid "Counting referenced objects" msgstr "" -#: midx.c:1160 +#: midx.c:1719 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1351 +#: midx.c:1911 msgid "could not start pack-objects" msgstr "" -#: midx.c:1371 +#: midx.c:1931 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -4444,66 +4448,66 @@ msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:233 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:246 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:266 object.c:278 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:625 +#: packfile.c:626 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1934 +#: packfile.c:1923 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1938 +#: packfile.c:1927 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:38 +#: parse-options.c:58 #, c-format msgid "%s requires a value" msgstr "" -#: parse-options.c:73 +#: parse-options.c:93 #, c-format msgid "%s is incompatible with %s" msgstr "" -#: parse-options.c:78 +#: parse-options.c:98 #, c-format msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:112 parse-options.c:116 #, c-format msgid "%s takes no value" msgstr "" -#: parse-options.c:94 +#: parse-options.c:114 #, c-format msgid "%s isn't available" msgstr "" -#: parse-options.c:217 +#: parse-options.c:237 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:386 +#: parse-options.c:393 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" @@ -4513,26 +4517,26 @@ msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:862 +#: parse-options.c:891 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:864 +#: parse-options.c:893 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:866 +#: parse-options.c:895 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:890 +#: parse-options.c:919 msgid "..." msgstr "" -#: parse-options.c:909 +#: parse-options.c:933 #, c-format msgid "usage: %s" msgstr "" @@ -4540,26 +4544,26 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:948 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:918 +#: parse-options.c:992 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:1039 msgid "-NUM" msgstr "" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:677 parse-options.c:1053 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options-cb.c:20 parse-options-cb.c:24 +#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "" @@ -4579,83 +4583,83 @@ msgid "malformed object name '%s'" msgstr "" -#: path.c:915 +#: path.c:922 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:130 +#: pathspec.c:150 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:148 +#: pathspec.c:168 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:151 +#: pathspec.c:171 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:194 +#: pathspec.c:214 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:259 +#: pathspec.c:279 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:266 +#: pathspec.c:286 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:306 +#: pathspec.c:326 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:327 +#: pathspec.c:347 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:332 +#: pathspec.c:352 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:370 +#: pathspec.c:390 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:429 +#: pathspec.c:449 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:442 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:521 +#: pathspec.c:541 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:531 +#: pathspec.c:551 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:598 +#: pathspec.c:618 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:643 +#: pathspec.c:663 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -4672,7 +4676,7 @@ msgid "flush packet write failed" msgstr "" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 msgid "protocol error: impossibly long line" msgstr "" @@ -4680,33 +4684,33 @@ msgid "packet write with format failed" msgstr "" -#: pkt-line.c:203 +#: pkt-line.c:204 pkt-line.c:252 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:210 pkt-line.c:217 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "" -#: pkt-line.c:302 +#: pkt-line.c:349 pkt-line.c:350 msgid "read error" msgstr "" -#: pkt-line.c:310 +#: pkt-line.c:360 pkt-line.c:361 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:338 +#: pkt-line.c:390 pkt-line.c:392 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:434 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "リモートエラー: %s" @@ -4720,236 +4724,236 @@ msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:984 +#: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:23 +#: fetch-object.c:17 msgid "Remote with no URL" msgstr "" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" -#: range-diff.c:78 +#: range-diff.c:67 msgid "could not start `log`" msgstr "" -#: range-diff.c:80 +#: range-diff.c:69 msgid "could not read `log` output" msgstr "" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:97 sequencer.c:5605 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:140 +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:306 +#: range-diff.c:304 msgid "failed to generate diff" msgstr "" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:682 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:698 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:720 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:725 +#: read-cache.c:753 builtin/submodule--helper.c:3241 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:777 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:796 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:807 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1318 +#: read-cache.c:1373 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1532 +#: read-cache.c:1588 msgid "Refresh index" msgstr "" -#: read-cache.c:1657 +#: read-cache.c:1720 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1667 +#: read-cache.c:1730 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1786 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1726 +#: read-cache.c:1789 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1735 +#: read-cache.c:1798 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1765 +#: read-cache.c:1832 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1767 +#: read-cache.c:1834 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1804 +#: read-cache.c:1871 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1820 +#: read-cache.c:1887 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1877 +#: read-cache.c:1944 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1880 +#: read-cache.c:1947 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1883 +#: read-cache.c:1950 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 +#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 msgid "index file corrupt" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2209 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2146 +#: read-cache.c:2222 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2179 +#: read-cache.c:2255 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2183 +#: read-cache.c:2259 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2263 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2191 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2233 +#: read-cache.c:2310 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2260 +#: read-cache.c:2337 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2292 +#: read-cache.c:2375 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2339 +#: read-cache.c:2434 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3179 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3151 +#: read-cache.c:3192 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3163 +#: read-cache.c:3204 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3188 +#: read-cache.c:3233 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3337 +#: read-cache.c:3390 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -4960,7 +4964,7 @@ "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4982,26 +4986,26 @@ "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5010,7 +5014,7 @@ "\n" msgstr "" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5021,8 +5025,9 @@ msgid "Note that empty commits are commented out" msgstr "" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 +#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" msgstr "" @@ -5032,14 +5037,14 @@ msgid "could not copy '%s' to '%s'." msgstr "" -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5050,17 +5055,17 @@ "\n" msgstr "" -#: refs.c:264 +#: refs.c:261 #, c-format msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:674 +#: refs.c:671 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2250 refs.c:673 #, c-format msgid "ignoring broken ref %s" msgstr "" @@ -5085,14 +5090,14 @@ msgid "unexpected object ID when writing '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 +#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:866 +#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -5102,62 +5107,62 @@ msgid "unexpected object ID when deleting '%s'" msgstr "" -#: refs.c:922 +#: refs.c:920 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:929 +#: refs.c:927 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:994 +#: refs.c:992 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1086 +#: refs.c:1084 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1157 +#: refs.c:1155 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2051 +#: refs.c:2062 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2131 +#: refs.c:2142 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2242 refs.c:2272 +#: refs.c:2253 refs.c:2283 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2248 refs.c:2283 +#: refs.c:2259 refs.c:2294 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1271 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1242 refs/packed-backend.c:1542 -#: refs/packed-backend.c:1552 +#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#: refs/files-backend.c:1288 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "" @@ -5167,7 +5172,7 @@ msgid "invalid refspec '%s'" msgstr "" -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "" @@ -5186,212 +5191,212 @@ msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:175 +#: ref-filter.c:235 #, c-format msgid "expected format: %%(color:)" msgstr "" -#: ref-filter.c:177 +#: ref-filter.c:237 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:199 +#: ref-filter.c:259 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:203 +#: ref-filter.c:263 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:205 +#: ref-filter.c:265 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:260 +#: ref-filter.c:320 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:282 +#: ref-filter.c:344 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:290 +#: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:302 +#: ref-filter.c:364 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:301 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:336 +#: ref-filter.c:398 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:367 +#: ref-filter.c:429 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:373 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:432 +#: ref-filter.c:506 #, c-format msgid "expected format: %%(align:,)" msgstr "" -#: ref-filter.c:444 +#: ref-filter.c:518 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:451 +#: ref-filter.c:525 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:460 +#: ref-filter.c:534 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:468 +#: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:486 +#: ref-filter.c:560 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:588 +#: ref-filter.c:680 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:615 +#: ref-filter.c:707 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:619 +#: ref-filter.c:711 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:743 +#: ref-filter.c:844 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:806 +#: ref-filter.c:910 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:808 +#: ref-filter.c:912 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:810 +#: ref-filter.c:914 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:838 +#: ref-filter.c:946 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:840 +#: ref-filter.c:948 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:842 +#: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:857 +#: ref-filter.c:965 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:914 +#: ref-filter.c:1027 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1549 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1552 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1555 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1565 +#: ref-filter.c:1504 msgid "no branch" msgstr "" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1754 ref-filter.c:1972 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1613 +#: ref-filter.c:1764 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1996 +#: ref-filter.c:2155 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2085 +#: ref-filter.c:2245 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2430 +#: ref-filter.c:2623 #, c-format msgid "format: %%(end) atom missing" msgstr "" @@ -5406,12 +5411,12 @@ msgid "option `%s' is incompatible with --no-merged" msgstr "" -#: ref-filter.c:2529 +#: ref-filter.c:2726 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2534 +#: ref-filter.c:2731 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -5679,7 +5684,7 @@ msgid "there were errors while writing '%s' (%s)" msgstr "" -#: rerere.c:482 +#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 #, c-format msgid "failed to flush '%s'" msgstr "" @@ -5724,8 +5729,8 @@ msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 +#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5759,158 +5764,159 @@ msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2668 +#: revision.c:2690 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2671 +#: revision.c:2693 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2708 +#: revision.c:2477 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2877 +#: revision.c:2895 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1274 +#: run-command.c:1278 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1338 +#: hook.c:27 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:476 +#: send-pack.c:537 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:478 +#: send-pack.c:539 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:490 +#: send-pack.c:546 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:495 +#: send-pack.c:551 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:195 +#: sequencer.c:197 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:323 +#: sequencer.c:325 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:408 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:353 +#: sequencer.c:355 msgid "revert" msgstr "" -#: sequencer.c:355 +#: sequencer.c:357 msgid "cherry-pick" msgstr "" -#: sequencer.c:327 +#: sequencer.c:271 msgid "rebase -i" msgstr "" -#: sequencer.c:359 +#: sequencer.c:361 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:418 +#: sequencer.c:420 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:448 sequencer.c:3290 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:441 +#: sequencer.c:455 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3574 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 +#: builtin/merge.c:1145 #, c-format msgid "could not read '%s'" msgstr "'%s'を読み込めません" -#: sequencer.c:485 +#: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:489 +#: sequencer.c:503 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:521 +#: sequencer.c:535 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:574 builtin/tag.c:610 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -5918,61 +5924,61 @@ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:685 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:684 +#: sequencer.c:699 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:698 +#: sequencer.c:713 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:778 +#: sequencer.c:793 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:789 +#: sequencer.c:804 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 +#: builtin/am.c:822 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:836 +#: sequencer.c:851 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:841 +#: sequencer.c:856 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:846 +#: sequencer.c:861 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:850 +#: sequencer.c:865 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:855 +#: sequencer.c:870 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:857 +#: sequencer.c:872 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:859 +#: sequencer.c:874 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" @@ -5980,7 +5986,7 @@ msgid "malformed ident line" msgstr "" -#: sequencer.c:924 +#: sequencer.c:939 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5997,11 +6003,11 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:1211 +#: sequencer.c:1229 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1217 +#: sequencer.c:1235 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6016,7 +6022,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1230 +#: sequencer.c:1248 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6030,40 +6036,40 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1272 +#: sequencer.c:1290 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1274 +#: sequencer.c:1292 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1320 +#: sequencer.c:1338 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1322 +#: sequencer.c:1340 msgid "detached HEAD" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1344 msgid " (root-commit)" msgstr "" -#: sequencer.c:1347 +#: sequencer.c:1365 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1349 +#: sequencer.c:1367 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1427 sequencer.c:2312 msgid "unable to parse commit author" msgstr "" @@ -6071,137 +6077,137 @@ msgid "corrupted author without date information" msgstr "" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1471 sequencer.c:1591 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 +#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1605 +#: sequencer.c:1623 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1610 +#: sequencer.c:1628 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1711 sequencer.c:1992 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1757 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1761 +#: sequencer.c:1951 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1953 sequencer.c:3601 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1765 +#: sequencer.c:1955 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1771 +#: sequencer.c:1904 sequencer.c:1961 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1753 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1786 +#: sequencer.c:1979 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1793 +#: sequencer.c:1754 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1799 +#: sequencer.c:1756 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1887 +#: sequencer.c:2089 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1894 +#: sequencer.c:2096 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1913 +#: sequencer.c:2115 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2123 sequencer.c:2131 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1935 +#: sequencer.c:2137 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2156 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:2019 +#: sequencer.c:2222 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2079 +#: sequencer.c:2282 #, c-format msgid "could not revert %s... %s" msgstr "%sをrevertできませんでした... %s" -#: sequencer.c:2080 +#: sequencer.c:2283 #, c-format msgid "could not apply %s... %s" msgstr "%sを適用できませんでした... %s" -#: sequencer.c:2158 +#: sequencer.c:2362 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2165 +#: sequencer.c:2370 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2242 +#: sequencer.c:2450 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2251 +#: sequencer.c:2459 #, c-format msgid "missing arguments for %s" msgstr "" @@ -6211,170 +6217,169 @@ msgid "could not parse '%.*s'" msgstr "" -#: sequencer.c:2343 +#: sequencer.c:2563 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2354 +#: sequencer.c:2574 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: sequencer.c:2622 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2440 +#: sequencer.c:2660 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2449 +#: sequencer.c:2669 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2493 +#: sequencer.c:2709 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2495 +#: sequencer.c:2711 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2500 +#: sequencer.c:2716 msgid "no commits parsed." msgstr "" -#: sequencer.c:2511 +#: sequencer.c:2727 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2513 +#: sequencer.c:2729 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2591 +#: sequencer.c:2807 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2698 +#: sequencer.c:2916 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2718 +#: sequencer.c:2936 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3031 sequencer.c:4905 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2828 +#: sequencer.c:3048 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2830 +#: sequencer.c:3050 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2833 +#: sequencer.c:3053 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2835 +#: sequencer.c:3055 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2849 +#: sequencer.c:3069 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2864 +#: sequencer.c:3084 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3144 sequencer.c:4615 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3146 sequencer.c:3157 msgid "cannot resolve HEAD" msgstr "HEADを解決できません" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3148 sequencer.c:3192 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3178 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2960 +#: sequencer.c:3180 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2961 +#: sequencer.c:3181 msgid "unexpected end of file" msgstr "予期せぬファイル終端(OEF)です" -#: sequencer.c:2967 +#: sequencer.c:3187 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2978 +#: sequencer.c:3198 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:3019 +#: sequencer.c:3239 msgid "no revert in progress" msgstr "" -#: sequencer.c:3028 +#: sequencer.c:3248 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:3038 +#: sequencer.c:3258 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3045 +#: sequencer.c:3265 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3048 +#: sequencer.c:3268 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3430 sequencer.c:4506 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3227 +#: sequencer.c:3447 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3235 +#: sequencer.c:3455 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6386,22 +6391,22 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:3245 +#: sequencer.c:3465 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3252 +#: sequencer.c:3472 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3297 +#: sequencer.c:3517 #, c-format msgid "" "execution failed: %s\n" @@ -6411,11 +6416,11 @@ "\n" msgstr "" -#: sequencer.c:3303 +#: sequencer.c:3523 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3309 +#: sequencer.c:3529 #, c-format msgid "" "execution succeeded: %s\n" @@ -6426,67 +6431,67 @@ "\n" msgstr "" -#: sequencer.c:3370 +#: sequencer.c:3591 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3424 +#: sequencer.c:3664 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3429 +#: sequencer.c:3669 msgid "writing squash-onto" msgstr "" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3705 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:3513 +#: sequencer.c:3748 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3546 +#: sequencer.c:3780 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3568 +#: sequencer.c:3802 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3577 +#: sequencer.c:3811 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3589 +#: sequencer.c:3823 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3605 +#: sequencer.c:3878 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3788 +#: sequencer.c:4024 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3804 +#: sequencer.c:4040 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3919 +#: sequencer.c:4162 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3931 +#: sequencer.c:4174 #, c-format msgid "cannot store %s" msgstr "" @@ -6508,21 +6513,21 @@ msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4255 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:4048 +#: sequencer.c:4270 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4272 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4058 +#: sequencer.c:4304 #, c-format msgid "" "Could not execute the todo command\n" @@ -6535,86 +6540,86 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:4149 +#: sequencer.c:4396 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4466 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4279 +#: sequencer.c:4514 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4284 +#: sequencer.c:4519 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4298 +#: sequencer.c:4533 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4391 +#: sequencer.c:4645 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4400 +#: sequencer.c:4654 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4402 +#: sequencer.c:4656 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4404 +#: sequencer.c:4658 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4407 +#: sequencer.c:4661 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4697 sequencer.c:4736 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4498 +#: sequencer.c:4752 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4505 +#: sequencer.c:4762 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4621 +#: sequencer.c:4882 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4886 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4660 +#: sequencer.c:4921 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5137 +#: sequencer.c:5408 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5140 +#: sequencer.c:5411 msgid "make_script: error preparing revisions" msgstr "" @@ -6625,19 +6630,19 @@ "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5669 sequencer.c:5686 msgid "nothing to do" msgstr "" -#: sequencer.c:5418 +#: sequencer.c:5705 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5512 +#: sequencer.c:5805 msgid "the script was already rearranged." msgstr "" -#: setup.c:124 +#: setup.c:122 #, c-format msgid "'%s' is outside repository" msgstr "" @@ -6674,379 +6679,379 @@ msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:669 +#: setup.c:514 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1362 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1409 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1424 +#: setup.c:1443 msgid "fork failed" msgstr "" -#: setup.c:1429 +#: setup.c:1448 msgid "setsid failed" msgstr "" -#: object-file.c:480 +#: object-file.c:459 #, c-format msgid "" "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:531 +#: object-file.c:517 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:603 +#: object-file.c:591 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:610 +#: object-file.c:598 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:653 +#: object-file.c:641 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:671 +#: object-file.c:659 msgid "unable to read alternates file" msgstr "" -#: object-file.c:678 +#: object-file.c:666 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:713 +#: object-file.c:701 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:734 +#: object-file.c:722 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:740 +#: object-file.c:728 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:746 +#: object-file.c:734 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:754 +#: object-file.c:742 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:814 +#: object-file.c:823 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:964 +#: object-file.c:973 #, c-format msgid "attempting to mmap % over limit %" msgstr "" -#: object-file.c:985 +#: sha1-file.c:964 msgid "mmap failed" msgstr "" -#: object-file.c:1149 +#: object-file.c:1174 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1293 object-file.c:2499 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1295 object-file.c:2503 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1328 +#: object-file.c:1419 msgid "invalid object type" msgstr "" -#: object-file.c:1412 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1415 +#: object-file.c:1430 #, c-format msgid "unable to unpack %s header" msgstr "" -#: object-file.c:1421 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1424 +#: object-file.c:1417 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1651 +#: object-file.c:1664 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1655 +#: object-file.c:1668 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1659 +#: object-file.c:1672 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1663 +#: object-file.c:1676 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1768 +#: object-file.c:1781 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1775 +#: object-file.c:1788 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1782 +#: object-file.c:1795 msgid "file write error" msgstr "" -#: object-file.c:1802 +#: object-file.c:1815 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1867 +#: object-file.c:1882 #, c-format msgid "" "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1869 +#: object-file.c:1884 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1893 +#: object-file.c:1908 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1899 +#: object-file.c:1914 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1903 +#: object-file.c:1918 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1907 +#: object-file.c:1922 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1933 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:1994 +#: object-file.c:2011 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2045 +#: object-file.c:2062 msgid "corrupt commit" msgstr "" -#: object-file.c:2053 +#: object-file.c:2070 msgid "corrupt tag" msgstr "" -#: object-file.c:2153 +#: object-file.c:2170 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2156 +#: object-file.c:2173 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2246 object-file.c:2256 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2245 +#: object-file.c:2262 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2269 +#: object-file.c:2286 builtin/fetch.c:1445 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2271 +#: object-file.c:2288 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2315 #, c-format msgid "unable to open %s" msgstr "" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2510 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2512 +#: object-file.c:2533 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2517 +#: object-file.c:2539 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2523 +#: object-file.c:2544 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2534 +#: object-file.c:2555 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:486 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7060,43 +7065,43 @@ msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7104,14 +7109,14 @@ msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1175 +#: strbuf.c:1183 #, c-format msgid "could not edit '%s'" msgstr "" @@ -7134,22 +7139,22 @@ msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:327 +#: submodule.c:358 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:358 +#: submodule.c:389 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:920 +#: submodule.c:954 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 msgid "Failed to resolve HEAD as a valid ref." msgstr "" @@ -7158,58 +7163,58 @@ msgid "Could not access submodule '%s'" msgstr "" -#: submodule.c:1677 +#: submodule.c:1705 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1810 +#: submodule.c:1838 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1823 +#: submodule.c:1851 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1838 +#: submodule.c:1868 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1928 +#: submodule.c:1959 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1980 +#: submodule.c:2013 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2048 +#: submodule.c:2081 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2069 +#: submodule.c:2102 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2114 submodule.c:2174 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2085 +#: submodule.c:2118 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2092 +#: submodule.c:2124 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7217,16 +7222,16 @@ "'%s'\n" msgstr "" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1895 submodule.c:2210 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:2220 +#: submodule.c:2255 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2260 +#: submodule.c:2295 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -7250,61 +7255,62 @@ msgid "invalid value for %s" msgstr "" -#: submodule-config.c:766 +#: submodule-config.c:767 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: trailer.c:236 +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:327 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 msgid "could not read from stdin" msgstr "" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:684 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -7319,49 +7325,49 @@ msgid "could not read bundle '%s'" msgstr "" -#: transport.c:220 +#: transport.c:227 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:269 +#: transport.c:279 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:270 +#: transport.c:280 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:727 +#: transport.c:759 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:802 +#: transport.c:834 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:936 +#: transport.c:967 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:1002 +#: transport.c:1033 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1055 +#: transport.c:1082 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1157 +#: transport.c:1185 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1161 +#: transport.c:1189 #, c-format msgid "" "\n" @@ -7377,15 +7383,15 @@ "\n" msgstr "" -#: transport.c:1169 +#: transport.c:1197 msgid "Aborting." msgstr "" -#: transport.c:1316 +#: transport.c:1344 msgid "failed to push all needed submodules" msgstr "" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1475 msgid "operation not supported by protocol" msgstr "" @@ -7431,7 +7437,7 @@ msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1251 #, c-format msgid "could not read ref %s" msgstr "" @@ -7454,55 +7460,55 @@ msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:845 +#: transport-helper.c:859 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:928 +#: transport-helper.c:942 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:931 +#: transport-helper.c:945 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:934 +#: transport-helper.c:948 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:939 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:1050 +#: transport-helper.c:1064 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1055 +#: transport-helper.c:1069 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1102 +#: transport-helper.c:1116 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1107 +#: transport-helper.c:1121 msgid "error while running fast-export" msgstr "" @@ -7513,47 +7519,47 @@ "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1223 +#: transport-helper.c:1237 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1375 +#: transport-helper.c:1389 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1402 +#: transport-helper.c:1416 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1451 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1455 +#: transport-helper.c:1469 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1488 transport-helper.c:1492 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1515 +#: transport-helper.c:1529 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1519 +#: transport-helper.c:1533 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1551 transport-helper.c:1560 msgid "can't start thread for copying data" msgstr "" @@ -7578,98 +7584,98 @@ msgid "too-short tree file" msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7677,7 +7683,7 @@ "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7685,47 +7691,47 @@ "%%s" msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:168 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7733,7 +7739,7 @@ "%s" msgstr "" -#: unpack-trees.c:176 +#: unpack-trees.c:172 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7741,30 +7747,30 @@ "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1498 +#: unpack-trees.c:1620 msgid "Updating index flags" msgstr "" @@ -7797,47 +7803,47 @@ msgid "invalid '..' path segment" msgstr "" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:197 wrapper.c:367 +#: wrapper.c:205 wrapper.c:375 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:398 wrapper.c:599 +#: wrapper.c:406 wrapper.c:607 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:607 +#: wrapper.c:615 msgid "unable to get current working directory" msgstr "" @@ -7870,11 +7876,11 @@ msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "コミット予定の変更点:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "" @@ -7972,28 +7978,28 @@ msgid "untracked content, " msgstr "" -#: wt-status.c:905 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:936 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:938 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1020 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1112 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -8001,245 +8007,245 @@ "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1142 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1145 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1151 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1154 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1163 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1166 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "現在のパスは空です。" -#: wt-status.c:1170 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (このパッチをスキップするには\"git am --skip\"を使用してください)" -#: wt-status.c:1174 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1307 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1362 msgid "No commands done." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1323 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "" -#: wt-status.c:1331 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1339 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1356 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (このパッチをスキップするには\"git rebase --skip\"を使用してください)" -#: wt-status.c:1373 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1380 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (全てのコンフリクトが修正されました: \"git rebase --continue\"を実行してください)" -#: wt-status.c:1384 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1389 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1445 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1449 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1401 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1417 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1420 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1427 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1430 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1490 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1466 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1476 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1480 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1483 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1733 +#: wt-status.c:1794 msgid "On branch " msgstr "ブランチ " -#: wt-status.c:1740 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1742 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1752 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "現在どのブランチ上でもありません。" -#: wt-status.c:1769 +#: wt-status.c:1830 msgid "Initial commit" msgstr "最初のコミット" -#: wt-status.c:1770 +#: wt-status.c:1831 msgid "No commits yet" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1845 msgid "Untracked files" msgstr "追跡されていないファイル" -#: wt-status.c:1786 +#: wt-status.c:1847 msgid "Ignored files" msgstr "無視されるファイル" -#: wt-status.c:1790 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8247,98 +8253,98 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1796 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1798 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1804 +#: wt-status.c:1865 msgid "No changes" msgstr "変更なし" -#: wt-status.c:1809 +#: wt-status.c:1870 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1817 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1821 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1825 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1832 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1837 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1942 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "" -#: wt-status.c:1946 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1977 +#: wt-status.c:2038 msgid "different" msgstr "" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "" -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2513 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2515 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/precompose_utf8.c:58 builtin/clone.c:347 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -8347,122 +8353,122 @@ msgid "git add [] [--] ..." msgstr "" -#: builtin/add.c:96 +#: builtin/add.c:106 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:111 builtin/commit.c:298 msgid "updating files failed" msgstr "" -#: builtin/add.c:111 +#: builtin/add.c:121 #, c-format msgid "remove '%s'\n" msgstr "'%s'を削除する\n" -#: builtin/add.c:186 +#: builtin/add.c:205 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:317 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "indexが読み込めせんでした" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:330 msgid "Could not write patch" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:333 msgid "editing patch failed" msgstr "" -#: builtin/add.c:301 +#: builtin/add.c:336 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:338 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:308 +#: builtin/add.c:343 #, c-format msgid "Could not apply '%s'" msgstr "'%s'を適用できません" -#: builtin/add.c:316 +#: builtin/add.c:351 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 +#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "" -#: builtin/add.c:339 +#: builtin/add.c:374 msgid "interactive picking" msgstr "" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:341 +#: builtin/add.c:376 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:342 +#: builtin/add.c:377 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:378 msgid "update tracked files" msgstr "追跡しているファイルを更新する" -#: builtin/add.c:344 +#: builtin/add.c:379 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:345 +#: builtin/add.c:380 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:346 +#: builtin/add.c:381 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:384 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:386 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:352 +#: builtin/add.c:387 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:388 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:391 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:393 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:377 +#: builtin/add.c:413 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8480,184 +8486,184 @@ "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:405 +#: builtin/add.c:442 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:433 +#: builtin/add.c:477 msgid "adding files failed" msgstr "" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:515 builtin/commit.c:358 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:478 +#: builtin/add.c:532 msgid "--pathspec-from-file is incompatible with --edit" msgstr "" -#: builtin/add.c:490 +#: builtin/add.c:544 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:493 +#: builtin/add.c:547 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:497 +#: builtin/add.c:551 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 +#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 +#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:526 +#: builtin/add.c:583 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:483 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/am.c:352 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "" -#: builtin/am.c:436 +#: builtin/am.c:456 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:478 +#: builtin/am.c:498 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:516 +#: builtin/am.c:536 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:542 +#: builtin/am.c:562 msgid "fseek failed" msgstr "" -#: builtin/am.c:730 +#: builtin/am.c:750 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:795 +#: builtin/am.c:815 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:843 +#: builtin/am.c:863 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:868 builtin/am.c:880 msgid "invalid Date line" msgstr "" -#: builtin/am.c:855 +#: builtin/am.c:875 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:948 +#: builtin/am.c:968 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:973 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:958 +#: builtin/am.c:978 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1089 +#: builtin/am.c:1127 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1090 +#: builtin/am.c:1128 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1091 +#: builtin/am.c:1129 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1174 +#: builtin/am.c:1224 msgid "" "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1252 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1267 +#: builtin/am.c:1317 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1270 +#: builtin/am.c:1320 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1489 +#: builtin/am.c:1539 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1491 +#: builtin/am.c:1541 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1510 +#: builtin/am.c:1560 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1516 +#: builtin/am.c:1566 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1542 +#: builtin/am.c:1592 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1574 +#: builtin/am.c:1624 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1676 builtin/am.c:1680 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1648 +#: builtin/am.c:1698 msgid "Commit Body is:" msgstr "" @@ -8665,46 +8671,46 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1708 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1754 builtin/commit.c:409 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1708 +#: builtin/am.c:1758 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1798 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1765 +#: builtin/am.c:1815 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1771 +#: builtin/am.c:1821 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1766 +#: builtin/am.c:1838 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1819 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1826 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8712,187 +8718,187 @@ "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 -#: builtin/reset.c:355 +#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 +#: builtin/reset.c:361 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1985 +#: builtin/am.c:2035 builtin/am.c:2111 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2029 +#: builtin/am.c:2079 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2136 +#: builtin/am.c:2187 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2264 msgid "git am [] [( | )...]" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2265 msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2220 +#: builtin/am.c:2271 msgid "run interactively" msgstr "" -#: builtin/am.c:2222 +#: builtin/am.c:2273 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2275 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:640 builtin/stash.c:961 msgid "be quiet" msgstr "" -#: builtin/am.c:2167 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2281 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2283 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2285 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2236 +#: builtin/am.c:2287 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2289 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2292 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2295 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 +#: builtin/am.c:2327 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 +#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 +#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 +#: parse-options.h:315 msgid "n" msgstr "" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2324 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2276 +#: builtin/am.c:2330 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2332 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2335 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2338 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2287 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2290 msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2299 +#: builtin/am.c:2353 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2355 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2358 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2361 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2379 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2332 +#: builtin/am.c:2386 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2347 +#: builtin/am.c:2401 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2371 +#: builtin/am.c:2425 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2377 +#: builtin/am.c:2431 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2387 +#: builtin/am.c:2441 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8905,54 +8911,54 @@ msgid "could not create archive file '%s'" msgstr "" -#: builtin/archive.c:20 +#: builtin/archive.c:18 msgid "could not redirect output" msgstr "" -#: builtin/archive.c:37 +#: builtin/archive.c:35 msgid "git archive: Remote with no URL" msgstr "" -#: builtin/archive.c:61 +#: builtin/archive.c:59 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "" -#: builtin/archive.c:64 +#: builtin/archive.c:62 #, c-format msgid "git archive: NACK %s" msgstr "" -#: builtin/archive.c:65 +#: builtin/archive.c:63 msgid "git archive: protocol error" msgstr "git archive: プロトコルエラー" -#: builtin/archive.c:69 +#: builtin/archive.c:67 msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:22 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:13 msgid "git bisect--helper --write-terms " msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:14 msgid "git bisect--helper --bisect-clean-state" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-reset []" msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-write [--no-log] " "" msgstr "" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-check-and-set-terms " "" @@ -8975,73 +8981,73 @@ "{new,bad}=][--no-checkout] [ [...]] [--] [...]" msgstr "" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:170 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:174 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:184 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:194 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:118 +#: builtin/bisect--helper.c:78 msgid "could not open the file BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:210 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:218 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:227 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:271 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:276 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:288 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:314 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:341 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:345 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9049,7 +9055,7 @@ "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:365 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9058,133 +9064,133 @@ #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:373 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:434 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:437 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:447 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:678 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:682 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:713 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:728 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:749 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:752 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:772 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:122 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:124 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:126 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1192 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:926 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:928 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1194 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1196 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1198 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1214 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:143 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:147 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1229 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:961 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:967 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1234 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" @@ -9196,146 +9202,146 @@ msgid " are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:410 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:417 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "" -#: builtin/blame.c:728 +#: builtin/blame.c:724 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:746 +#: builtin/blame.c:742 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:841 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:677 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:871 +#: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:680 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:681 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:682 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:683 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:684 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:685 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:686 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:879 +#: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:880 +#: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:881 +#: builtin/blame.c:689 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:882 +#: builtin/blame.c:690 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:883 +#: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:884 +#: builtin/blame.c:692 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:879 builtin/log.c:1823 msgid "rev" msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:860 msgid "Ignore when blaming" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:861 msgid "Ignore revisions from " msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:881 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:882 msgid "color lines by age" msgstr "" -#: builtin/blame.c:889 +#: builtin/blame.c:701 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:890 +#: builtin/blame.c:702 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:891 +#: builtin/blame.c:703 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:886 builtin/blame.c:887 msgid "score" msgstr "" -#: builtin/blame.c:892 +#: builtin/blame.c:704 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:893 +#: builtin/blame.c:705 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:706 msgid "n,m" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:706 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:945 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -9347,22 +9353,22 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:996 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1112 +#: builtin/blame.c:1111 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1157 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:27 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "" @@ -9443,12 +9449,12 @@ msgid "branch '%s' not found." msgstr "ブランチ '%s' は見つかりません。" -#: builtin/branch.c:271 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:272 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "" @@ -9463,74 +9469,74 @@ msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:441 builtin/tag.c:63 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:472 msgid "could not resolve HEAD" msgstr "" -#: builtin/branch.c:475 +#: builtin/branch.c:478 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "" -#: builtin/branch.c:490 +#: builtin/branch.c:493 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:494 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:511 +#: builtin/branch.c:514 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:516 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:524 +#: builtin/branch.c:527 #, c-format msgid "Invalid branch name: '%s'" msgstr "無効なブランチ名: '%s'" -#: builtin/branch.c:553 +#: builtin/branch.c:556 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:555 +#: builtin/branch.c:558 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:559 +#: builtin/branch.c:562 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:562 +#: builtin/branch.c:565 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:568 +#: builtin/branch.c:571 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:577 +#: builtin/branch.c:580 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:582 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:598 #, c-format msgid "" "Please edit the description for the branch\n" @@ -9538,216 +9544,216 @@ "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:629 +#: builtin/branch.c:632 msgid "Generic options" msgstr "" -#: builtin/branch.c:631 +#: builtin/branch.c:634 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:635 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:633 +#: builtin/branch.c:636 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:638 msgid "do not use" msgstr "" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:640 msgid "upstream" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:640 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:641 msgid "unset the upstream info" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:642 msgid "use colored output" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:643 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:646 builtin/branch.c:648 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:651 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:649 +#: builtin/branch.c:652 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:654 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:655 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:656 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:657 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:658 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:656 +#: builtin/branch.c:659 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:660 msgid "list branch names" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:661 msgid "show current branch name" msgstr "" -#: builtin/branch.c:659 +#: builtin/branch.c:662 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:661 +#: builtin/branch.c:664 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:662 +#: builtin/branch.c:665 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:663 +#: builtin/branch.c:666 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:664 +#: builtin/branch.c:667 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:665 +#: builtin/branch.c:668 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 +#: builtin/tag.c:475 msgid "object" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:671 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:696 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:717 +#: builtin/branch.c:720 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 msgid "branch name required" msgstr "" -#: builtin/branch.c:764 +#: builtin/branch.c:768 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:769 +#: builtin/branch.c:773 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:776 +#: builtin/branch.c:780 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:783 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:794 +#: builtin/branch.c:798 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:803 +#: builtin/branch.c:807 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:812 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:812 +#: builtin/branch.c:816 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:819 builtin/branch.c:842 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:823 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:832 +#: builtin/branch.c:836 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:840 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:842 +#: builtin/branch.c:846 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:852 +#: builtin/branch.c:856 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" -#: builtin/branch.c:856 +#: builtin/branch.c:860 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9769,23 +9775,23 @@ msgid "git bundle unbundle [...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:65 builtin/pack-objects.c:3876 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:69 builtin/pack-objects.c:3880 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:72 builtin/pack-objects.c:3883 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/bundle.c:96 +#: builtin/bundle.c:94 msgid "Need a repository to create a bundle." msgstr "" @@ -9793,101 +9799,101 @@ msgid "do not show bundle details" msgstr "" -#: builtin/bundle.c:122 +#: builtin/bundle.c:126 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:163 +#: builtin/bundle.c:182 msgid "Need a repository to unbundle." msgstr "" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/remote.c:1702 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:219 builtin/remote.c:1733 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:622 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " msgstr "" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:524 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:644 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:662 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:663 msgid "show object type" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:664 msgid "show object size" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:666 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:667 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:669 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:671 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:672 msgid "blob" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:673 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:675 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:676 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:678 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:682 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:686 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:688 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:690 msgid "do not order --batch-all-objects output" msgstr "" @@ -9907,7 +9913,7 @@ msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "" @@ -9915,8 +9921,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 +#: builtin/worktree.c:494 msgid "suppress progress reporting" msgstr "" @@ -9928,27 +9934,27 @@ msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -9977,207 +9983,208 @@ msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "string" msgstr "" -#: builtin/checkout-index.c:201 +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 msgid "when creating files, prepend " msgstr "" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [] " msgstr "" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [] [] -- ..." msgstr "" -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [] []" msgstr "" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [] [--source=] ..." msgstr "" -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:396 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:401 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:408 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:451 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:455 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:459 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:718 +#: builtin/checkout.c:736 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:772 +#: builtin/checkout.c:786 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:865 +#: builtin/checkout.c:879 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:907 +#: builtin/checkout.c:921 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:915 +#: builtin/checkout.c:929 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:918 +#: builtin/checkout.c:932 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:922 +#: builtin/checkout.c:936 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:938 builtin/checkout.c:1369 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:926 +#: builtin/checkout.c:940 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:977 +#: builtin/checkout.c:991 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:983 +#: builtin/checkout.c:997 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10192,7 +10199,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1016 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10209,195 +10216,197 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1051 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1055 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1095 builtin/checkout.c:1364 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1260 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1277 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1177 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1336 builtin/checkout.c:1705 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1383 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1386 builtin/checkout.c:1394 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1389 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1405 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1409 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1413 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1417 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1421 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1425 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1432 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 +#: builtin/checkout.c:1458 builtin/checkout.c:1463 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1460 #, c-format msgid "'%s' cannot take " msgstr "" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1468 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1475 msgid "missing branch or commit argument" msgstr "" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 +#: builtin/merge.c:298 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1518 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 msgid "style" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1520 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1532 builtin/worktree.c:489 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1533 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1535 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1537 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1537 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1539 builtin/merge.c:302 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1542 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1555 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1558 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1562 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1168 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1624 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1661 msgid "--track needs a branch name" msgstr "" @@ -10405,40 +10414,40 @@ msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1698 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1714 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1721 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1725 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1734 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1750 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1755 msgid "you must specify path(s) to restore" msgstr "" @@ -10459,66 +10468,67 @@ "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 +#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2958 +#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "branch" msgstr "ブランチ" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1782 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1784 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1785 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1787 msgid "second guess 'git checkout ' (default)" msgstr "" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1788 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1833 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1835 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1837 msgid "second guess 'git switch '" msgstr "" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1839 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1873 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1875 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1877 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1879 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1880 msgid "use overlay mode" msgstr "" @@ -10547,7 +10557,7 @@ msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:37 +#: midx.c:1486 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" @@ -10557,7 +10567,7 @@ msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10566,7 +10576,7 @@ " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10579,33 +10589,33 @@ " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10616,62 +10626,62 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10681,337 +10691,339 @@ msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 msgid "reference repository" msgstr "" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:2515 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 +#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 -#: builtin/pull.c:208 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/pull.c:212 msgid "depth" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 -#: builtin/pull.c:211 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/pull.c:215 msgid "time" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1882 +#: builtin/submodule--helper.c:2529 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:288 +#: dir.c:3158 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:341 +#: builtin/clone.c:231 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:414 +#: builtin/clone.c:304 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:432 +#: builtin/clone.c:322 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:463 +#: builtin/clone.c:353 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:467 +#: builtin/clone.c:357 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:472 +#: builtin/clone.c:362 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:499 +#: builtin/clone.c:389 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:513 +#: builtin/clone.c:403 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:590 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:709 +#: builtin/clone.c:597 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:757 +#: builtin/clone.c:645 msgid "failed to initialize sparse-checkout" msgstr "" -#: builtin/clone.c:780 +#: builtin/clone.c:668 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:812 +#: builtin/clone.c:701 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:887 +#: builtin/clone.c:779 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:950 +#: builtin/clone.c:842 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:952 +#: builtin/clone.c:844 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:890 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:1010 +#: builtin/clone.c:903 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:1013 +#: builtin/clone.c:906 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:1026 +#: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "リポジトリ '%s' は存在しません" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:924 builtin/fetch.c:2029 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1040 +#: builtin/clone.c:934 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1060 +#: builtin/clone.c:954 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 +#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1080 +#: builtin/clone.c:974 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1100 +#: builtin/clone.c:994 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1102 +#: builtin/clone.c:996 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1126 +#: builtin/clone.c:1025 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1211 +#: builtin/clone.c:1121 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1213 +#: builtin/clone.c:1123 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1215 +#: builtin/clone.c:1125 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1217 +#: builtin/clone.c:1127 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1220 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1225 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1228 builtin/clone.c:1239 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1326 +#: builtin/clone.c:1242 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11058,7 +11070,7 @@ msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11068,67 +11080,67 @@ msgid "git commit-tree: failed to open '%s'" msgstr "" -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c:94 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "" -#: builtin/commit-tree.c:98 +#: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "" -#: builtin/commit-tree.c:111 +#: builtin/commit-tree.c:109 msgid "parent" msgstr "" -#: builtin/commit-tree.c:112 +#: builtin/commit-tree.c:110 msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/tag.c:454 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:113 builtin/commit.c:1626 msgid "commit message" msgstr "コミットメッセージ" -#: builtin/commit-tree.c:118 +#: builtin/commit-tree.c:116 msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 -#: builtin/pull.c:176 builtin/revert.c:118 +#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" -#: builtin/commit-tree.c:133 +#: builtin/commit-tree.c:131 msgid "must give exactly one tree" msgstr "" -#: builtin/commit-tree.c:140 +#: builtin/commit-tree.c:138 msgid "git commit-tree: failed to read" msgstr "" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git commit [] [--] ..." msgstr "" -#: builtin/commit.c:46 +#: builtin/commit.c:47 msgid "git status [] [--] ..." msgstr "" -#: builtin/commit.c:51 +#: builtin/commit.c:52 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -11137,11 +11149,11 @@ "\n" msgstr "" -#: builtin/commit.c:66 +#: builtin/commit.c:67 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "" -#: builtin/commit.c:69 +#: builtin/commit.c:70 msgid "" "and then use:\n" "\n" @@ -11154,106 +11166,106 @@ "\n" msgstr "" -#: builtin/commit.c:312 +#: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:348 +#: builtin/commit.c:361 msgid "--pathspec-from-file with -a does not make sense" msgstr "" -#: builtin/commit.c:361 +#: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:373 +#: builtin/commit.c:387 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:382 +#: builtin/commit.c:396 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:397 +#: builtin/commit.c:411 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:399 +#: builtin/commit.c:413 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:476 +#: builtin/commit.c:490 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:478 +#: builtin/commit.c:492 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:488 +#: builtin/commit.c:502 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:507 +#: builtin/commit.c:521 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:605 +#: builtin/commit.c:619 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:607 +#: builtin/commit.c:621 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:626 +#: builtin/commit.c:640 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:679 +#: builtin/commit.c:693 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:759 builtin/shortlog.c:416 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:731 +#: builtin/commit.c:761 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:735 +#: builtin/commit.c:765 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:773 +#: builtin/commit.c:821 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:833 +#: builtin/commit.c:881 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:849 +#: builtin/commit.c:787 #, c-format msgid "" "\n" @@ -11263,7 +11275,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:854 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -11273,14 +11285,14 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:868 +#: builtin/commit.c:896 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:876 +#: builtin/commit.c:904 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11288,323 +11300,323 @@ "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:893 +#: builtin/commit.c:948 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:901 +#: builtin/commit.c:956 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:908 +#: builtin/commit.c:963 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:926 +#: builtin/commit.c:981 msgid "Cannot read index" msgstr "indexを読み込めません" -#: builtin/commit.c:997 +#: builtin/commit.c:1066 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1080 builtin/tag.c:317 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1124 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1069 +#: builtin/commit.c:1138 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1156 builtin/commit.c:1450 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1127 +#: builtin/commit.c:1196 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1253 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1260 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1263 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1265 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1190 +#: builtin/commit.c:1270 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1280 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1202 +#: builtin/commit.c:1282 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1211 +#: builtin/commit.c:1291 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1229 +#: builtin/commit.c:1309 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1235 +#: builtin/commit.c:1354 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1487 builtin/commit.c:1656 msgid "show branch information" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1489 msgid "show stash information" msgstr "" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1491 builtin/commit.c:1658 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1493 msgid "version" msgstr "" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 +#: builtin/worktree.c:691 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1496 builtin/commit.c:1662 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1499 builtin/commit.c:1665 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 -#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 msgid "mode" msgstr "" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1502 builtin/commit.c:1668 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1387 +#: builtin/commit.c:1506 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1508 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1390 +#: builtin/commit.c:1509 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1511 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1393 +#: builtin/commit.c:1512 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1395 +#: builtin/commit.c:1514 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1415 +#: builtin/commit.c:1537 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1497 +#: builtin/commit.c:1619 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1620 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1622 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 msgid "read message from file" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1624 msgid "author" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1624 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1625 builtin/gc.c:550 msgid "date" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1625 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 +#: parse-options.h:327 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1627 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1506 +#: builtin/commit.c:1628 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1634 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1635 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1638 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1512 +#: builtin/commit.c:1639 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1514 +#: builtin/commit.c:1641 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1646 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1647 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1648 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1649 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1523 +#: builtin/commit.c:1650 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1524 +#: builtin/commit.c:1651 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1525 +#: builtin/commit.c:1652 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1526 +#: builtin/commit.c:1653 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1539 +#: builtin/commit.c:1666 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1540 +#: builtin/commit.c:1667 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1547 +#: builtin/commit.c:1674 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1549 +#: builtin/commit.c:1676 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1752 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1629 +#: builtin/commit.c:1759 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1650 +#: builtin/commit.c:1780 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1657 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1662 +#: builtin/commit.c:1792 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1696 +#: builtin/commit.c:1839 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" @@ -11615,54 +11627,53 @@ "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] " msgstr "" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "" -#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 -#: builtin/commit-graph.c:317 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:83 +#: builtin/commit-graph.c:73 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:100 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c:205 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:207 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:217 +#: builtin/commit-graph.c:209 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c:211 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:224 +#: builtin/commit-graph.c:215 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:228 +#: builtin/commit-graph.c:219 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:230 +#: builtin/commit-graph.c:221 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:255 +#: builtin/commit-graph.c:251 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -11715,15 +11726,15 @@ msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "" @@ -11731,7 +11742,7 @@ msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" @@ -11739,11 +11750,11 @@ msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "" @@ -11990,12 +12001,12 @@ msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:281 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" @@ -12142,7 +12153,7 @@ msgid "Not a git repository" msgstr "gitリポジトリではありません" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "" @@ -12157,51 +12168,51 @@ msgid "unhandled object '%s' given." msgstr "" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [] [ []] [--] [...]" msgstr "" -#: builtin/difftool.c:260 +#: builtin/difftool.c:651 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:302 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:304 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:312 +#: builtin/difftool.c:303 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "" @@ -12233,7 +12244,7 @@ msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:712 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12247,23 +12258,23 @@ msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:738 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:741 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:750 msgid "no given for --tool=" msgstr "" -#: builtin/difftool.c:756 +#: builtin/difftool.c:757 msgid "no given for --extcmd=" msgstr "" @@ -12271,7 +12282,7 @@ msgid "git env--helper --type=[bool|ulong] " msgstr "" -#: builtin/env--helper.c:42 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:96 msgid "type" msgstr "" @@ -12300,79 +12311,79 @@ msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:868 +#: builtin/fast-export.c:869 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1197 +#: builtin/fast-export.c:1198 msgid "show progress after objects" msgstr "" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1202 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1205 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1208 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1210 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1214 +#: builtin/fast-export.c:1169 msgid "Import marks from this file if it exists" msgstr "" -#: builtin/fast-export.c:1216 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1218 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1223 builtin/log.c:1826 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1223 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1229 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1231 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1233 +#: builtin/fast-export.c:1185 msgid "Label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1271 +#: builtin/fast-export.c:1272 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" @@ -12392,106 +12403,106 @@ msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:166 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 msgid "on-demand" msgstr "" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 -#: builtin/pull.c:218 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:230 msgid "refmap" msgstr "" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "" @@ -12499,81 +12510,81 @@ msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:697 +#: builtin/fetch.c:760 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:796 +#: builtin/fetch.c:862 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:800 +#: builtin/fetch.c:866 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:814 +#: builtin/fetch.c:880 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:824 +#: builtin/fetch.c:890 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 +#: builtin/fetch.c:962 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:829 +#: builtin/fetch.c:895 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:851 +#: builtin/fetch.c:917 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:920 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:857 +#: builtin/fetch.c:923 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:896 +#: builtin/fetch.c:962 msgid "forced update" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:967 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1070 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1074 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12582,142 +12593,142 @@ " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1105 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:804 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1223 builtin/fetch.c:1371 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1244 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1341 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1342 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1374 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1375 builtin/remote.c:1128 msgid "(none)" msgstr "" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1398 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1417 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1420 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1633 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1648 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1650 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1652 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1654 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1783 builtin/fetch.c:1846 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1805 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1909 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1945 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1935 +#: builtin/fetch.c:2013 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:2015 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2020 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2022 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2039 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2041 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2050 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2097 msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -12764,287 +12775,287 @@ msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:481 msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:138 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:154 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:265 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:292 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:312 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:322 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:333 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:350 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:388 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:407 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:412 +#: builtin/fsck.c:411 msgid "broken links" msgstr "" -#: builtin/fsck.c:421 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:429 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:458 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:483 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:497 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:531 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:538 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:592 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:607 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:644 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:640 +#: builtin/fsck.c:664 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:655 +#: builtin/fsck.c:685 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:688 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:704 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:709 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:716 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:691 +#: builtin/fsck.c:722 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:695 +#: builtin/fsck.c:726 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:707 +#: builtin/fsck.c:738 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:743 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:721 +#: builtin/fsck.c:752 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:752 +#: builtin/fsck.c:783 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:758 +#: builtin/fsck.c:789 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:759 +#: builtin/fsck.c:790 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:760 +#: builtin/fsck.c:791 msgid "report tags" msgstr "" -#: builtin/fsck.c:761 +#: builtin/fsck.c:792 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:762 +#: builtin/fsck.c:793 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:763 +#: builtin/fsck.c:794 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:764 +#: builtin/fsck.c:795 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:765 +#: builtin/fsck.c:796 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:797 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:768 +#: builtin/fsck.c:799 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:800 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:770 +#: builtin/fsck.c:801 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:861 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:857 +#: builtin/fsck.c:889 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:868 +#: builtin/fsck.c:900 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -13063,12 +13074,12 @@ msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 #, c-format msgid "cannot read '%s'" msgstr "" @@ -13143,12 +13154,12 @@ msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" -#: builtin/grep.c:223 +#: builtin/grep.c:239 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:277 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -13157,242 +13168,242 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 +#: builtin/pack-objects.c:3142 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:672 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:752 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:851 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:853 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:840 +#: builtin/grep.c:855 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:857 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:859 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:862 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:864 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:866 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:853 +#: builtin/grep.c:868 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:870 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:873 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:875 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:877 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:881 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:884 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:887 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:890 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:893 msgid "show line numbers" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:894 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:895 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:896 msgid "show filenames" msgstr "ファイル名を表示する" -#: builtin/grep.c:883 +#: builtin/grep.c:898 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:900 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:902 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:905 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:907 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:910 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:912 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:913 msgid "highlight matches" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:915 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:917 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:920 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:923 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:925 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:927 msgid "use worker threads" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:928 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:931 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:933 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:921 +#: builtin/grep.c:936 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:923 +#: builtin/grep.c:938 msgid "match " msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:940 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:937 +#: builtin/grep.c:952 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:939 +#: builtin/grep.c:954 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:940 +#: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:957 msgid "pager" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:957 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:946 +#: builtin/grep.c:961 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1012 +#: builtin/grep.c:1027 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:1063 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1056 +#: builtin/grep.c:1071 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1090 +#: builtin/grep.c:1105 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1108 builtin/pack-objects.c:4059 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1130 +#: builtin/grep.c:1145 msgid "--open-files-in-pager only works on the worktree" msgstr "" @@ -13400,82 +13411,82 @@ msgid "option not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1156 +#: builtin/grep.c:1171 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1165 +#: builtin/grep.c:1180 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1173 +#: builtin/grep.c:1188 msgid "both --cached and trees are given" msgstr "" -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] [--" "] ..." msgstr "" -#: builtin/hash-object.c:86 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:96 msgid "object type" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:105 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:55 msgid "print all available commands" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:57 msgid "exclude guides" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:65 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:50 +#: builtin/help.c:67 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:58 msgid "show man page" msgstr "" -#: builtin/help.c:53 +#: builtin/help.c:59 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:55 +#: builtin/help.c:61 msgid "show info page" msgstr "" -#: builtin/help.c:57 +#: builtin/help.c:63 msgid "print command description" msgstr "" @@ -13483,72 +13494,72 @@ msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" -#: builtin/help.c:163 +#: builtin/help.c:196 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:190 +#: builtin/help.c:223 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:203 +#: builtin/help.c:236 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:211 +#: builtin/help.c:244 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:307 +#: builtin/help.c:340 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:319 +#: builtin/help.c:352 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:436 +#: builtin/help.c:467 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:453 +#: builtin/help.c:483 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:461 +#: builtin/help.c:490 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:551 builtin/help.c:562 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:565 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:602 builtin/help.c:629 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:577 +#: builtin/help.c:624 msgid "'git help config' for more information" msgstr "" @@ -13586,7 +13597,7 @@ msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:324 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "" @@ -13594,353 +13605,353 @@ msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:358 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:360 #, c-format msgid "pack version % unsupported" msgstr "" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:376 #, c-format msgid "pack has bad object at offset %: %s" msgstr "" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 +#: builtin/index-pack.c:820 builtin/index-pack.c:829 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:754 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:818 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:826 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:840 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:843 builtin/index-pack.c:862 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:864 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:925 builtin/index-pack.c:972 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1156 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1156 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1190 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1195 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1198 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1210 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1233 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1277 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1283 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1295 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1299 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1323 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1419 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1397 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1464 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1472 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1514 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1643 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1645 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1693 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1700 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1742 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1848 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:367 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:370 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:476 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:477 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:531 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:557 +#: builtin/init-db.c:544 msgid "permissions" msgstr "" -#: builtin/init-db.c:558 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:638 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:690 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -13991,7 +14002,7 @@ msgid "do not treat --- specially" msgstr "" -#: builtin/interpret-trailers.c:111 +#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "" @@ -14024,7 +14035,7 @@ msgid "show source" msgstr "" -#: builtin/log.c:180 +#: builtin/log.c:155 msgid "Use mail map file" msgstr "" @@ -14040,112 +14051,112 @@ msgid "decorate options" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:163 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:566 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:696 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:841 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:848 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "" -#: builtin/log.c:936 +#: builtin/log.c:865 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:977 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:994 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1004 +#: builtin/log.c:1009 msgid "not a range" msgstr "" -#: builtin/log.c:1168 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1174 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1288 +#: builtin/log.c:1293 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1346 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1517 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1527 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually" msgstr "" -#: builtin/log.c:1550 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1635 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "" @@ -14153,361 +14164,361 @@ msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1738 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1741 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1745 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1747 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1749 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1750 +#: builtin/log.c:1761 msgid "sfx" msgstr "" -#: builtin/log.c:1751 +#: builtin/log.c:1762 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1753 +#: builtin/log.c:1764 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1755 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1760 +#: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1762 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1763 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1766 +#: builtin/log.c:1463 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1768 +#: builtin/log.c:1779 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1771 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1774 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1776 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1778 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1780 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1782 +#: builtin/log.c:1793 msgid "Messaging" msgstr "" -#: builtin/log.c:1783 +#: builtin/log.c:1794 msgid "header" msgstr "" -#: builtin/log.c:1784 +#: builtin/log.c:1795 msgid "add email header" msgstr "" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "" -#: builtin/log.c:1785 +#: builtin/log.c:1796 msgid "add To: header" msgstr "" -#: builtin/log.c:1786 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1787 +#: builtin/log.c:1798 msgid "ident" msgstr "" -#: builtin/log.c:1788 +#: builtin/log.c:1799 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1790 +#: builtin/log.c:1801 msgid "message-id" msgstr "" -#: builtin/log.c:1791 +#: builtin/log.c:1802 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "" -#: builtin/log.c:1793 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "" -#: builtin/log.c:1796 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "" -#: builtin/log.c:1800 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1802 +#: builtin/log.c:1813 msgid "signature" msgstr "" -#: builtin/log.c:1803 +#: builtin/log.c:1814 msgid "add a signature" msgstr "" -#: builtin/log.c:1804 +#: builtin/log.c:1815 msgid "base-commit" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1808 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1811 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1813 +#: builtin/log.c:1824 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1816 +#: builtin/log.c:1827 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1818 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1904 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1919 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1929 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1933 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1854 +#: builtin/log.c:1646 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:2078 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2082 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2083 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2089 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2093 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2101 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2102 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2113 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2149 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "" -#: builtin/log.c:2193 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2252 +#: builtin/log.c:2263 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:2306 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:561 msgid "git ls-files [] [...]" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:617 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:619 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:623 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:625 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:627 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:629 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:631 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:634 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:636 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:638 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:640 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:642 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:645 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:647 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:649 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:655 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:657 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:661 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:664 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:666 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:667 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:668 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:670 msgid "show debugging data" msgstr "" @@ -14522,7 +14533,7 @@ msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 msgid "exec" msgstr "" @@ -14590,378 +14601,378 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -#: builtin/mailsplit.c:241 +#: builtin/mailsplit.c:239 #, c-format msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:59 +#: builtin/merge.c:50 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:60 +#: builtin/merge.c:51 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:123 +#: builtin/merge.c:124 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:206 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:256 builtin/pull.c:133 +#: builtin/merge.c:257 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:259 builtin/pull.c:136 +#: builtin/merge.c:260 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:260 builtin/pull.c:139 +#: builtin/merge.c:261 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:262 builtin/pull.c:142 +#: builtin/merge.c:263 builtin/pull.c:143 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:148 +#: builtin/merge.c:266 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:151 +#: builtin/merge.c:268 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:154 +#: builtin/merge.c:270 builtin/pull.c:155 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:273 builtin/pull.c:161 +#: builtin/merge.c:274 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:277 builtin/pull.c:164 +#: builtin/merge.c:278 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:279 builtin/pull.c:169 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:280 builtin/pull.c:172 +#: builtin/merge.c:281 builtin/pull.c:176 msgid "option=value" msgstr "" -#: builtin/merge.c:281 builtin/pull.c:173 +#: builtin/merge.c:282 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:283 +#: builtin/merge.c:284 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:292 +#: builtin/merge.c:293 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:294 +#: builtin/merge.c:295 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:296 builtin/pull.c:180 +#: builtin/merge.c:297 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:303 +#: builtin/merge.c:304 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:320 +#: builtin/merge.c:321 msgid "could not run stash." msgstr "" -#: builtin/merge.c:325 +#: builtin/merge.c:326 msgid "stash failed" msgstr "" -#: builtin/merge.c:330 +#: builtin/merge.c:331 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:352 builtin/merge.c:369 +#: builtin/merge.c:353 builtin/merge.c:370 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:399 +#: builtin/merge.c:345 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:410 +#: builtin/merge.c:415 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:460 +#: builtin/merge.c:465 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:598 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:724 +#: builtin/merge.c:730 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:808 +#: builtin/merge.c:814 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:817 +#: builtin/merge.c:823 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:823 +#: builtin/merge.c:829 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:828 +#: builtin/merge.c:834 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:831 +#: builtin/merge.c:837 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:884 +#: builtin/merge.c:892 msgid "Empty commit message." msgstr "コミットメッセージが空です。" -#: builtin/merge.c:899 +#: builtin/merge.c:907 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:960 +#: builtin/merge.c:968 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:999 +#: builtin/merge.c:1007 msgid "No current branch." msgstr "" -#: builtin/merge.c:1001 +#: builtin/merge.c:1009 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1003 +#: builtin/merge.c:1011 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1008 +#: builtin/merge.c:1016 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1065 +#: builtin/merge.c:1073 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1168 +#: builtin/merge.c:1174 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1202 +#: builtin/merge.c:1208 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1312 +#: builtin/merge.c:1321 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1316 +#: builtin/merge.c:1325 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1343 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1347 +#: builtin/merge.c:1356 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1351 +#: builtin/merge.c:1360 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1367 +#: builtin/merge.c:1376 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1374 +#: builtin/merge.c:1383 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1377 +#: builtin/merge.c:1386 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1391 +#: builtin/merge.c:1400 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1393 +#: builtin/merge.c:1402 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1418 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1435 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1428 +#: builtin/merge.c:1437 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1433 +#: builtin/merge.c:1442 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1435 +#: builtin/merge.c:1444 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1516 +#: builtin/merge.c:1531 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1525 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1535 +#: builtin/merge.c:1550 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1581 +#: builtin/merge.c:1598 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1588 +#: builtin/merge.c:1605 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1613 +#: builtin/merge.c:1495 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1619 +#: advice.c:217 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1664 builtin/merge.c:1730 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1651 +#: builtin/merge.c:1668 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1703 +#: builtin/merge.c:1720 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1705 +#: builtin/merge.c:1722 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1714 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1728 +#: builtin/merge.c:1746 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15097,20 +15108,20 @@ "size=)" msgstr "" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:57 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:202 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 +#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 +#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 +#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 +#: builtin/prune-packed.c:25 builtin/tag.c:587 msgid "too many arguments" msgstr "" @@ -15118,7 +15129,7 @@ msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:69 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -15149,68 +15160,68 @@ msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:170 +#: builtin/mv.c:172 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:181 +#: builtin/mv.c:184 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:185 +#: builtin/mv.c:190 msgid "bad source" msgstr "" -#: builtin/mv.c:188 +#: builtin/mv.c:193 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:191 +#: builtin/mv.c:196 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:225 +#: builtin/mv.c:231 msgid "not under version control" msgstr "" -#: builtin/mv.c:230 +#: builtin/mv.c:236 msgid "destination exists" msgstr "" -#: builtin/mv.c:238 +#: builtin/mv.c:244 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:247 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:244 +#: builtin/mv.c:250 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:246 +#: builtin/mv.c:252 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:253 +#: builtin/mv.c:280 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:274 +#: builtin/mv.c:308 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -15227,7 +15238,7 @@ msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "" @@ -15382,47 +15393,47 @@ msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:197 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:206 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:208 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:240 builtin/tag.c:577 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 +#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 +#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 +#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:265 +#: builtin/notes.c:263 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:268 +#: builtin/notes.c:266 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:309 +#: builtin/notes.c:307 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:324 +#: builtin/notes.c:322 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" @@ -15430,185 +15441,185 @@ #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:356 +#: builtin/notes.c:354 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "" -#: builtin/notes.c:389 builtin/notes.c:678 +#: builtin/notes.c:387 builtin/notes.c:676 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:410 builtin/notes.c:576 +#: builtin/notes.c:408 builtin/notes.c:574 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:413 builtin/notes.c:579 +#: builtin/notes.c:411 builtin/notes.c:577 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:582 +#: builtin/notes.c:414 builtin/notes.c:580 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:419 builtin/notes.c:585 +#: builtin/notes.c:417 builtin/notes.c:583 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:422 builtin/notes.c:588 +#: builtin/notes.c:420 builtin/notes.c:586 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:423 builtin/notes.c:496 +#: builtin/notes.c:421 builtin/notes.c:494 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:448 +#: builtin/notes.c:446 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:463 builtin/notes.c:544 +#: builtin/notes.c:461 builtin/notes.c:542 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:497 +#: builtin/notes.c:495 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:499 +#: builtin/notes.c:497 msgid "load rewriting config for (implies --stdin)" msgstr "" -#: builtin/notes.c:517 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "" -#: builtin/notes.c:538 +#: builtin/notes.c:536 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:550 +#: builtin/notes.c:548 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:603 +#: builtin/notes.c:601 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:698 +#: builtin/notes.c:696 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:700 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:702 +#: builtin/notes.c:700 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:722 +#: builtin/notes.c:720 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:724 +#: builtin/notes.c:722 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:726 +#: builtin/notes.c:724 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:739 +#: builtin/notes.c:737 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:742 +#: builtin/notes.c:740 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:768 +#: builtin/notes.c:766 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:782 msgid "General options" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:784 msgid "Merge options" msgstr "" -#: builtin/notes.c:788 +#: builtin/notes.c:786 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -#: builtin/notes.c:790 +#: builtin/notes.c:788 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:792 +#: builtin/notes.c:790 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:794 +#: builtin/notes.c:792 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:796 +#: builtin/notes.c:794 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:807 +#: builtin/notes.c:805 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:812 +#: builtin/notes.c:810 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:836 +#: builtin/notes.c:834 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:871 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:876 +#: builtin/notes.c:874 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:878 +#: builtin/notes.c:876 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -15616,71 +15627,71 @@ "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:895 builtin/tag.c:590 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:900 +#: builtin/notes.c:898 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:912 +#: builtin/notes.c:910 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:915 +#: builtin/notes.c:913 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:955 +#: builtin/notes.c:953 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:998 +#: builtin/notes.c:996 msgid "notes-ref" msgstr "" -#: builtin/notes.c:999 +#: builtin/notes.c:997 msgid "use notes from " msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1032 builtin/stash.c:1752 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %" msgstr "" @@ -15703,315 +15714,315 @@ msgid "unable to read from reused packfile" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1160 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1173 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1235 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1294 #, c-format msgid "wrote % objects while expecting %" msgstr "" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1536 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1984 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1993 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2274 msgid "Counting objects" msgstr "" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2439 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 +#: builtin/pack-objects.c:2535 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2549 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2864 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:3003 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:3089 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:3095 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3408 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3414 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3507 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3541 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3627 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3757 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3788 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3841 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3845 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3884 msgid "[,]" msgstr "" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3885 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3888 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3890 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3892 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3894 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3896 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3898 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3900 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3902 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3904 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3906 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3908 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3910 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3912 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3915 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3918 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3921 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3926 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3928 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3930 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3932 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3934 msgid "unpack unreachable objects newer than