diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apparmor-parser.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apparmor-parser.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apparmor-parser.po 2020-01-23 16:51:31.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apparmor-parser.po 2020-07-08 13:53:27.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: 2020-01-23 11:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apport.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apport.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apport.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apport.po 2020-07-08 13:53:30.000000000 +0000 @@ -7,681 +7,509 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-19 19:02+0000\n" +"POT-Creation-Date: 2020-05-21 13:29+0000\n" "PO-Revision-Date: 2018-02-24 03:54+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: 2020-01-23 11:30+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:144 -#: ../apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 -msgid "This package does not seem to be installed correctly" -msgstr "このパッケージは恐らく正常にインストールされていません" +#: ../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 "問題を報告する..." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:149 -#: ../apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:149 -#, python-format +#: ../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/kernel_oops.py:29 ../data/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "クラッシュファイルを Apport する" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 msgid "" -"This is not an official %s package. Please remove any third party package " -"and try again." -msgstr "これは %s の公式パッケージではありません。すべてのサードパーティーのパッケージを削除して再度試してください。" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." +msgstr "このことは前のサスペンド中に発生しており、システムが正常に復帰できませんでした。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166 -#: ../apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:166 -#, python-format +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 msgid "" -"You have some obsolete package versions installed. Please upgrade the " -"following packages and check if the problem still occurs:\n" -"\n" -"%s" -msgstr "" -"古いバージョンのパッケージが利用されています。以下のパッケージをアップグレードした上で、それでも問題が発生するかを確認してください:\n" -"\n" -"%s" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." +msgstr "このことは前のハイバネーション中に発生しており、システムが正常に復帰できませんでした。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303 -#: ../apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 -msgid "unknown program" -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/lib/python3.7/dist-packages/apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304 -#: ../apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 -#, python-format -msgid "Sorry, the program \"%s\" closed unexpectedly" -msgstr "残念ながら、プログラム \"%s\" が不意に終了しました" +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "これ以上レポートに新しいトレースを書き込みませんが、標準出力には表示します。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427 -#: ../apport/ui.py:306 ../apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427 -#, python-format -msgid "Problem in %s" -msgstr "%s に問題があります" +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../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/lib/python3.7/dist-packages/apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307 -#: ../apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 msgid "" -"Your computer does not have enough free memory to automatically analyze the " -"problem and send a report to the developers." -msgstr "コンピューターに、問題を自動的に解析して開発者にレポートを送るための十分な空きメモリーがありません。" +"Write modified report to given file instead of changing the original report" +msgstr "オリジナルのレポートを変更せずに、指定されたファイルに変更後のレポートを書き込みます" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1403 -#: ../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:513 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1403 -#: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:513 -#: ../apport/ui.py:516 ../apport/ui.py:721 ../apport/ui.py:1233 -#: ../apport/ui.py:1399 ../apport/ui.py:1403 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1403 -msgid "Invalid problem report" -msgstr "無効な問題のレポートです" +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "スタックトレースを再生成した後にコアダンプをレポートから取り除きます" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363 -#: ../apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 -msgid "You are not allowed to access this problem report." -msgstr "この問題を報告するための権限がありません。" +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "レポートのコアファイルを上書きします" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366 -#: ../apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:366 -msgid "Error" -msgstr "エラー" +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "レポートの ExecutablePath を上書きします" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367 -#: ../apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 -msgid "There is not enough disk space available to process this report." -msgstr "このレポートを作成するための空きスペースがディスクにありません。" +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "レポートの ProcMaps を上書きします" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461 -#: ../apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:461 -msgid "No package specified" -msgstr "パッケージが特定できません" +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "レポートに含まれるパッケージ情報を再生成します" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:462 -#: ../apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:462 +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 msgid "" -"You need to specify a package or a PID. See --help for more information." -msgstr "パッケージまたはプロセスIDを特定する必要があります。詳しくは--helpを見てください。" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:491 -#: ../apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 -msgid "Permission denied" -msgstr "許可がありません" +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." +msgstr "" +"一時的なサンドボックスを作成し、必要なパッケージとデバッグシンボルをそこにダウンロードおよびインストールします。このオプションが指定されなかった場合には、" +"必要なパッケージやデバッグシンボルはすでにお使いのシステムにインストールされているものとして処理を続行します。引数はパッケージングシステムの設定のベースデ" +"ィレクトリを指定します。「system」を指定した場合にはシステムの設定ファイルを利用しますが、その場合には現在実行中のリリースで発生したクラッシュしかリ" +"トレースできません。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:492 -#: ../apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 msgid "" -"The specified process does not belong to you. Please run this program as the " -"process owner or as root." -msgstr "このプロセスを操作する権限がありません。プロセスの所有者もしくはrootユーザーとして実行してください。" +"Build another temporary sandbox for installing gdb and its dependencies " +"using the same release as the report rather than whatever version of gdb you " +"have installed." +msgstr "" +"gdbとその依存関係をインストールする一時的なサンドボックスをビルドし、インストールされているgdbのバージョンとは関係なく、レポートにあるのと同じリリー" +"スを利用します" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:494 -#: ../apport/ui.py:405 ../apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494 -msgid "Invalid PID" -msgstr "無効なプロセスID" +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "サンドボックスにパッケージをインストールする際に、ダウンロードおよびインストールの進捗状況を表示します" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:495 -#: ../apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495 -msgid "The specified process ID does not belong to a program." -msgstr "指定されたプロセスIDはプログラムに属していません。" +#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "ログメッセージの先頭にタイムスタンプを挿入します（バッチ処理用）" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:514 -#: ../apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 -#, python-format -msgid "Symptom script %s did not determine an affected package" -msgstr "Synaptic のスクリプト %s は、影響を受けたパッケージを特定していません" +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +msgid "" +"Create and use third-party repositories from origins specified in reports" +msgstr "レポートで指定された提供元から、サードパーティーのリポジトリを作成して使用します。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:517 -#: ../apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517 -#, python-format -msgid "Package %s does not exist" -msgstr "パッケージ %s は存在しません" +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "サンドボックスにダウンロードされたパッケージのためのキャッシュディレクトリ" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:738 -#: ../apport/ui.py:546 ../apport/ui.py:733 ../apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:738 -msgid "Cannot create report" -msgstr "レポートを作成できませんでした" +#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../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/lib/python3.7/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:623 -#: ../apport/ui.py:561 ../apport/ui.py:607 ../apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:623 -msgid "Updating problem report" -msgstr "問題点のレポートを更新中" +#: ../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 "サンドボックスに追加のパッケージをインストールします（複数回指定可）" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:562 -#: ../apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:562 +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 msgid "" -"You are not the reporter or subscriber of this problem report, or the report " -"is a duplicate or already closed.\n" -"\n" -"Please create a new report using \"apport-bug\"." +"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 " +"neither -g, -o, nor -s are specified)" msgstr "" -"あなたはこの問題の報告者または登録者でないか、報告が重複しているかすでに終了しています。\n" -"\n" -"\"apport-bug\" を使って新規にレポートを作成してください。" +"クラッシュデータベース認証情報のファイルへのパス。これはリトレースしたスタックトレースをアップロードする際にクラッシュIDを指定するために使われます（-" +"g, -o, または -s が指定されていない場合）。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:571 -#: ../apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:571 +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 msgid "" -"You are not the reporter of this problem report. It is much easier to mark a " -"bug as a duplicate of another than to move your comments and attachments to " -"a new bug.\n" -"\n" -"Subsequently, we recommend that you file a new bug report using \"apport-" -"bug\" and make a comment in this bug about the one you file.\n" -"\n" -"Do you really want to proceed?" -msgstr "" -"あなたはこの問題の報告者または登録者ではありません。新しいバグとしてコメントと添付ファイルを提出するより、他のバグと重複したバグとしてマークするほうがより" -"簡単です。\n" -"\n" -"その後、\"apport-bug\"を利用して新たにバグ報告を行い、このバグの中で提出するものについてのコメントを行うことをお勧めします。\n" -"\n" -"本当に進めますか?" +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." +msgstr "スタックトレースのリトレースを表示し、クラッシュデータベースに送る前に確認します。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:624 -#: ../apport/ui.py:608 ../apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:624 -msgid "No additional information collected." -msgstr "収集する追加情報はありません。" +#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 +msgid "" +"Path to the duplicate sqlite database (default: no duplicate checking)" +msgstr "sqliteデータベースの複製へのパス（デフォルトは複製のチェックをしない）" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:675 -#: ../apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:675 -msgid "What kind of problem do you want to report?" -msgstr "どのような種類の問題を報告しますか?" +#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 +msgid "Do not add StacktraceSource to the report." +msgstr "レポートにスタックトレースソースを追加しないでください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:692 -#: ../apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:692 -msgid "Unknown symptom" -msgstr "未知の現象" +#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 +msgid "You cannot use -C without -S. Stopping." +msgstr "-S を指定せずに -C を使用することはできません。中止します。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:693 -#: ../apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:693 -#, python-format -msgid "The symptom \"%s\" is not known." -msgstr "現象 \"%s\" は知られていません。" +#. 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 +msgid "OK to send these as attachments? [y/n]" +msgstr "これらを添付ファイルとして送ってよろしいですか？ [y/n]" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:724 -#: ../apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724 -msgid "" -"After closing this message please click on an application window to report a " -"problem about it." -msgstr "このメッセージを閉じた後でアプリケーションウィンドウ上でクリックして、その問題について報告してください。" +#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "詳細はmanページをご覧ください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 -#: ../apport/ui.py:734 ../apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:739 -msgid "xprop failed to determine process ID of the window" -msgstr "xprop はウィンドウのプロセス ID を特定できませんでした" +#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "valgrindによって生成されたログファイルの名前を指定" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753 -#: ../apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:753 -msgid "%prog " -msgstr "%prog " +#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +msgid "" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" +msgstr "以前作成されたサンドボックスディレクトリ (SDIR) を再利用するか、もし存在しない場合には作成する" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755 -#: ../apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:755 -msgid "Specify package name." -msgstr "パッケージ名を指定" +#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 +msgid "" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." +msgstr "追加のデバッグシンボル用にサンドボックスディレクトリを作成または再利用せず、インストールされたデバッグシンボルのみを利用する。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:808 -#: ../apport/ui.py:757 ../apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808 -msgid "Add an extra tag to the report. Can be specified multiple times." -msgstr "レポートに追加タグを追加します。複数回指定できます。" +#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 +msgid "" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" +msgstr "以前作成されたキャッシュディレクトリ (CDIR) を再利用するか、もし存在しない場合には作成する" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:787 -#: ../apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 +#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 msgid "" -"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" -msgstr "" -"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" +"report download/install progress when installing packages into sandbox" +msgstr "サンドボックス内にパッケージをインストールする際、ダウンロードおよびインストールの進捗状況を報告する" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:790 -#: ../apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:790 +#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 msgid "" -"Start in bug filing mode. Requires --package and an optional --pid, or just " -"a --pid. If neither is given, display a list of known symptoms. (Implied if " -"a single argument is given.)" -msgstr "" -"バグファイリングモードを開始します。実行には --package と追加の --pid を用いるか、あるいはただ --pid " -"だけとするオプションが必要です。どちらも与えられていないときには、既知の現象のリストを表示します（暗黙の一つの引数が与えられた場合）。" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" +msgstr "メモリリーク検出のためvalgrindのメモリチェックツールにより実行されているプログラム" + +#: ../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/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "使用法 : %s <レポート> <対象ディレクトリ>" + +#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "目的のディレクトリは存在しますが、空ではありません。" + +#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80 +msgid "Press any key to continue..." +msgstr "続けるには何かキーを押してください..." + +#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87 +msgid "What would you like to do? Your options are:" +msgstr "対処方法を選択してください:" + +#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100 +#, python-format +msgid "Please choose (%s):" +msgstr "選択してください (%s):" + +#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164 +#, python-format +msgid "(%i bytes)" +msgstr "(%i バイト)" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:363 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../kde/apport-kde.py:363 +#: ../gtk/apport-gtk.py:146 ../bin/apport-cli.py:166 +msgid "(binary data)" +msgstr "(バイナリデータ)" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../kde/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../gtk/apport-gtk.py:181 ../bin/apport-cli.py:194 +msgid "Send problem report to the developers?" +msgstr "問題のレポートを開発者に送信しますか？" + +#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195 +msgid "" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." +msgstr "問題のレポートが送信された後で、フォームに入力してください（入力用ページをウェブブラウザーで自動的に開きます）。" + +#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198 +#, python-format +msgid "&Send report (%s)" +msgstr "レポートの送信(&S) (%s)" + +#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202 +msgid "&Examine locally" +msgstr "ローカルで解析する(&E)" + +#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206 +msgid "&View report" +msgstr "レポートの表示(&V)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:792 -#: ../apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:792 -msgid "Click a window as a target for filing a problem report." -msgstr "問題レポートを埋めるには、ターゲットとなるウィンドウをクリックしてください。" +#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207 +msgid "&Keep report file for sending later or copying to somewhere else" +msgstr "後で送信もしくは他の場所にコピーするためにレポートファイルを保持する(&K)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794 -#: ../apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794 -msgid "Start in bug updating mode. Can take an optional --package." -msgstr "バグ更新モードを開始します。オプション --package が使用できます。" +#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "中止し、このプログラムバージョンでは今後クラッシュしても無視する(&I)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:796 -#: ../apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796 -msgid "" -"File a bug report about a symptom. (Implied if symptom name is given as only " -"argument.)" -msgstr "SYMPTOM（症状）についてのバグを報告します（唯一の引数は症状の名前を意味します）。" +#: ../debian/tmp/usr/bin/apport-cli.py:210 +#: ../debian/tmp/usr/bin/apport-cli.py:287 +#: ../debian/tmp/usr/bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210 +#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340 +msgid "&Cancel" +msgstr "キャンセル(&C)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:798 -#: ../apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798 -msgid "" -"Specify package name in --file-bug mode. This is optional if a --pid is " -"specified. (Implied if package name is given as only argument.)" -msgstr "" -"--file-bugモードで使用するパッケージ名を指定します。--" -"pidが指定されている場合はオプション扱いになります（唯一の引数はパッケージ名を意味します）。" +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 +msgid "Problem report file:" +msgstr "問題報告ファイル:" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:800 -#: ../apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800 -msgid "" -"Specify a running program in --file-bug mode. If this is specified, the bug " -"report will contain more information. (Implied if pid is given as only " -"argument.)" -msgstr "" -"--file-" -"bugモードの対象になる実行中のプログラムを指定します。このオプションを指定した場合、バグ報告にはより多くの情報が含まれます（唯一の引数はプロセスIDを意" -"味します）。" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:802 -#: ../apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802 -msgid "The provided pid is a hanging application." -msgstr "指定されたpidはハングアップしたアプリケーションのものです。" +#: ../debian/tmp/usr/bin/apport-cli.py:244 +#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244 +#: ../bin/apport-cli.py:249 +msgid "&Confirm" +msgstr "確認(&C)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:804 -#: ../apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804 +#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248 #, python-format -msgid "" -"Report the crash from given .apport or .crash file instead of the pending " -"ones in %s. (Implied if file is given as only argument.)" -msgstr "" -"クラッシュの報告を %s で保留中のプログラムのかわりに .apport または .crash ファイルで行う（ファイル名が引数のみで与えられた場合）。" +msgid "Error: %s" +msgstr "エラー: %s" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:407 +#: ../debian/tmp/usr/bin/apport-cli.py:254 ../kde/apport-kde.py:407 +#: ../bin/apport-cli.py:254 +msgid "Collecting problem information" +msgstr "問題の情報を集めています" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:806 -#: ../apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806 +#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255 msgid "" -"In bug filing mode, save the collected information into a file instead of " -"reporting it. This file can then be reported later on from a different " -"machine." +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." msgstr "" -"バグファイリングモードでは、収集した情報は報告する代わりにファイルに保存されます。このファイルは、後で別のコンピューターから報告することができます。" +"収集された情報はアプリケーションを改善するために開発者へ送られます。\n" +"しばらくお待ちください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:810 -#: ../apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810 -msgid "Print the Apport version number." -msgstr "Apport のバージョン番号を表示します。" +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 +#: ../debian/tmp/usr/bin/apport-cli.py:267 ../kde/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../bin/apport-cli.py:267 +msgid "Uploading problem information" +msgstr "問題の情報をアップロードしています" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:961 -#: ../apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:961 +#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268 msgid "" -"This will launch apport-retrace in a terminal window to examine the crash." -msgstr "クラッシュの解析を行うため端末ウィンドウで apport-retrace を起動します。" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." +msgstr "" +"収集された情報はバグトラッキングシステムに送信されます。\n" +"しばらくお待ちください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:962 -#: ../apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 -msgid "Run gdb session" -msgstr "gdb セッションを実行" +#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318 +msgid "&Done" +msgstr "完了(&D)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:963 -#: ../apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:963 -msgid "Run gdb session without downloading debug symbols" -msgstr "デバッグシンボルをダウンロードせず gdb セッションを実行" +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324 +msgid "none" +msgstr "なし" -#. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:965 -#: ../apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965 +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 #, python-format -msgid "Update %s with fully symbolic stack trace" -msgstr "%s を完全なシンボリックスタックトレースに更新する" +msgid "Selected: %s. Multiple choices:" +msgstr "現在の設定: %s。複数選択:" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001 -#: ../apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1001 -msgid "Can't remember send report status settings" -msgstr "" +#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341 +msgid "Choices:" +msgstr "選択肢:" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1002 -#: ../apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1002 -msgid "" -"Saving crash reporting state failed. Can't set auto or never reporting mode." -msgstr "" +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +msgid "Path to file (Enter to cancel):" +msgstr "ファイルへのパス (Enterでキャンセル):" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1071 -#: ../apport/ui.py:1061 ../apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1071 -msgid "" -"This problem report applies to a program which is not installed any more." -msgstr "この問題レポートは、もうインストールされていないプログラムに対するものです。" +#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "ファイルが存在しません。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1086 -#: ../apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1086 -#, python-format +#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "これはディレクトリです。" + +#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "続行するには、以下のURLを開いてください:" + +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 msgid "" -"The problem happened with the program %s which changed since the crash " -"occurred." -msgstr "この問題はプログラム%sに発生したものですが、このプログラムはクラッシュしてから変更されています。" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." +msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1405 -#: ../apport/ui.py:1133 ../apport/ui.py:1190 ../apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1405 -msgid "This problem report is damaged and cannot be processed." -msgstr "この問題の報告は破損しており、処理することができません。" +#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "今すぐブラウザーを起動する" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1141 -#: ../apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "未解決のクラッシュレポートはありません。詳しくは --help を試してみてください。" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 #, python-format -msgid "" -"This report is about a snap published by %s. Contact them via %s for help." -msgstr "" +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "残念ながら、アプリケーション %s が予期せず停止しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1144 -#: ../apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 #, python-format -msgid "" -"This report is about a snap published by %s. No contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help." -msgstr "" +msgid "Sorry, %s has closed unexpectedly." +msgstr "残念ながら、%s が予期せず終了しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1148 -#: ../apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1148 -msgid "This report is about a package that is not installed." -msgstr "" +#: ../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 ../kde/apport-kde.py:200 +#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "残念ながら、%s で内部エラーが発生しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1152 -#: ../apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1152 -msgid "An error occurred while attempting to process this problem report:" -msgstr "この問題の報告の処理中にエラーが発生しました:" +#: ../debian/tmp/usr/share/apport/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.py:188 +msgid "Send" +msgstr "送信" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159 -#: ../apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../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 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 +msgid "Show Details" +msgstr "詳細を表示" + +#: ../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 ../kde/apport-kde.py:231 +#: ../kde/apport-kde.py:244 ../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 "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. You can contact them via %s for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" +msgid "The application %s has stopped responding." +msgstr "アプリケーション %s は応答していません。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161 -#: ../apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 #, python-format -msgid "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. For the snap, no contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" +msgid "The program \"%s\" has stopped responding." +msgstr "プログラム \"%s\" は応答していません。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1234 -#: ../apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1234 -msgid "Could not determine the package or source package name." -msgstr "パッケージまたはソースパッケージ名を特定できませんでした。" +#: ../debian/tmp/usr/share/apport/apport-kde.py:208 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:208 +#: ../gtk/apport-gtk.py:259 +#, python-format +msgid "Package: %s" +msgstr "パッケージ: %s" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1252 -#: ../apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1252 -msgid "Unable to start web browser" -msgstr "ウェブブラウザーを起動できません" +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:214 +#: ../gtk/apport-gtk.py:265 +msgid "Sorry, a problem occurred while installing software." +msgstr "残念ながら、ソフトウェアのインストール中に問題が発生しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1253 -#: ../apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1253 +#: ../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 ../kde/apport-kde.py:220 +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 #, python-format -msgid "Unable to start web browser to open %s." -msgstr "%s を開くためのウェブブラウザーを起動できません" +msgid "The application %s has experienced an internal error." +msgstr "アプリケーション %s で内部エラーが発生しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353 -#: ../apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1353 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:223 +#: ../gtk/apport-gtk.py:277 #, python-format -msgid "Please enter your account information for the %s bug tracking system" -msgstr "バグ追跡システム %s にあなたのアカウント情報を入力してください" +msgid "The application %s has closed unexpectedly." +msgstr "アプリケーション %s が予期せず終了しました。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365 -#: ../apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1365 -msgid "Network problem" -msgstr "ネットワークの問題" +#: ../debian/tmp/usr/share/apport/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.py:297 +msgid "If you notice further problems, try restarting the computer." +msgstr "さらに問題が発生する場合は、コンピューターを再起動してみてください。" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1367 -#: ../apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1367 -msgid "" -"Cannot connect to crash database, please check your Internet connection." -msgstr "クラッシュデータベースに接続できませんでした。インターネット接続を確認してください。" +#: ../debian/tmp/usr/share/apport/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:245 +#: ../gtk/apport-gtk.py:299 +msgid "Ignore future problems of this type" +msgstr "今後、この種類の問題は無視する" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1394 -#: ../apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394 -msgid "Memory exhaustion" -msgstr "メモリー不足" +#: ../debian/tmp/usr/share/apport/apport-kde.py:289 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:289 +#: ../gtk/apport-gtk.py:579 +msgid "Hide Details" +msgstr "詳細を隠す" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1395 -#: ../apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1395 -msgid "Your system does not have enough memory to process this crash report." -msgstr "コンピューターには、このクラッシュレポートを処理するのに十分なメモリーがありません。" +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "システム情報を収集" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1430 -#: ../apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1430 -#, python-format +#: ../apport/com.ubuntu.apport.policy.in.h:2 msgid "" -"The problem cannot be reported:\n" -"\n" -"%s" -msgstr "" -"問題を報告することができません:\n" -"\n" -"%s" +"Authentication is required to collect system information for this problem " +"report" +msgstr "この問題を報告するには、システム情報を収集するための認証が必要です" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1493 -#: ../apport/ui.py:1486 ../apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1493 -msgid "Problem already known" -msgstr "問題は既知のものです" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "システムの問題の報告" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1487 -#: ../apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1487 +#: ../apport/com.ubuntu.apport.policy.in.h:4 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 " -"helpful for the developers." -msgstr "" -"この問題は、ブラウザーに表示されたバグレポートですでに報告されています。開発者にとって役立つような、より詳しい情報を追加できるかどうか確認してください。" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1494 -#: ../apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1494 -msgid "This problem was already reported to developers. Thank you!" -msgstr "この問題はすでに開発者にレポートされています。ありがとうございます!" +"Please enter your password to access problem reports of system programs" +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 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469 +#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 msgid "Apport" msgstr "Apport" @@ -701,20 +529,6 @@ msgid "Sorry, an internal error happened." msgstr "残念ながら、内部エラーが発生しました。" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 -#: ../bin/apport-cli.py:194 ../kde/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 -#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181 -msgid "Send problem report to the developers?" -msgstr "問題のレポートを開発者に送信しますか?" - -#: ../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 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "さらに問題が発生する場合は、コンピューターを再起動してみてください。" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 msgid "Remember this in future" msgstr "この選択を記憶する" @@ -727,14 +541,6 @@ msgid "Relaunch this application" msgstr "このアプリケーションを再起動する" -#: ../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 -#: ../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 -msgid "Show Details" -msgstr "詳細を表示" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 msgid "_Examine locally" msgstr "ローカルで解析する(_E)" @@ -743,519 +549,559 @@ msgid "Don't send" msgstr "送信しない" -#: ../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 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 -msgid "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:17 ../gtk/apport-gtk.ui.h:17 -#: ../bin/apport-cli.py:267 ../kde/apport-kde.py:435 -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 -#: ../debian/tmp/usr/bin/apport-cli.py:267 -msgid "Uploading problem information" -msgstr "問題の情報をアップロードしています" +"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/apport-kde.py:436 ../kde/apport-kde.py:436 #: ../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 "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "収集された情報はバグトラッキングシステムに送信されます。しばらくお待ちください。" -#: ../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 で内部エラーが発生しました。" - -#: ../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 が突然終了しました。" - -#: ../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 "続行" - -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 +#: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/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 +#: ../debian/tmp/usr/share/apport/apport-kde.py:381 ../kde/apport-kde.py:235 +#: ../kde/apport-kde.py:381 msgid "Relaunch" 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:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +#: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315 msgid "Username:" msgstr "ユーザー名:" -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 +#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316 msgid "Password:" msgstr "パスワード:" -#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 -#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(バイナリデータ)" - -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 +#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 msgid "Collecting Problem Information" msgstr "問題の情報を集めています" -#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -msgid "Collecting problem information" -msgstr "問題の情報を集めています" - -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 +#: ../debian/tmp/usr/share/apport/apport-kde.py:408 ../kde/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 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../kde/apport-kde.py:434 msgid "Uploading Problem Information" msgstr "問題の情報をアップロードしています" -#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "システムが不安定になる可能性があるので、再起動する必要があるかもしれません。" - -#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 -msgid "Press any key to continue..." -msgstr "続けるには何かキーを押してください..." - -#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87 -msgid "What would you like to do? Your options are:" -msgstr "対処方法を選択してください:" - -#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100 -#, python-format -msgid "Please choose (%s):" -msgstr "選択してください(%s):" +#: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139 +msgid "This package does not seem to be installed correctly" +msgstr "このパッケージは恐らく正常にインストールされていません" -#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164 +#: ../apport/ui.py:144 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 #, python-format -msgid "(%i bytes)" -msgstr "(%i バイト)" - -#: ../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" -"automatically opened web browser." -msgstr "問題のレポートが送信された後で、フォームに入力してください（入力用ページをウェブブラウザーで自動的に開きます）。" +"This is not an official %s package. Please remove any third party package " +"and try again." +msgstr "これは %s の公式パッケージではありません。すべてのサードパーティーのパッケージを削除して再度試してください。" -#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198 +#: ../apport/ui.py:163 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163 #, python-format -msgid "&Send report (%s)" -msgstr "レポートの送信(&S) (%s)" - -#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202 -msgid "&Examine locally" -msgstr "ローカルで解析する(&E)" - -#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206 -msgid "&View report" -msgstr "レポートの表示(&V)" - -#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207 -msgid "&Keep report file for sending later or copying to somewhere else" -msgstr "後で送信もしくは他の場所にコピーするためにレポートファイルを保持する(&K)" - -#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "中止し、このプログラムバージョンでは今後クラッシュしても無視する(&I)" - -#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 -#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210 -#: ../debian/tmp/usr/bin/apport-cli.py:287 -#: ../debian/tmp/usr/bin/apport-cli.py:319 -#: ../debian/tmp/usr/bin/apport-cli.py:340 -msgid "&Cancel" -msgstr "キャンセル(&C)" - -#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 -msgid "Problem report file:" -msgstr "問題報告ファイル:" +msgid "" +"You have some obsolete package versions installed. Please upgrade the " +"following packages and check if the problem still occurs:\n" +"\n" +"%s" +msgstr "" +"古いバージョンのパッケージが利用されています。以下のパッケージをアップグレードした上で、それでも問題が発生するかを確認してください:\n" +"\n" +"%s" -#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249 -#: ../debian/tmp/usr/bin/apport-cli.py:244 -#: ../debian/tmp/usr/bin/apport-cli.py:249 -msgid "&Confirm" -msgstr "確認(&C)" +#: ../apport/ui.py:300 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300 +msgid "unknown program" +msgstr "不明なプログラム" -#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248 +#: ../apport/ui.py:301 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301 #, python-format -msgid "Error: %s" -msgstr "エラー: %s" +msgid "Sorry, the program \"%s\" closed unexpectedly" +msgstr "残念ながら、プログラム \"%s\" が予期せず終了しました" -#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255 -msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." -msgstr "" -"収集された情報はアプリケーションを改善するために開発者へ送られます。\n" -"しばらくお待ちください。" +#: ../apport/ui.py:303 ../apport/ui.py:1448 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1448 +#, python-format +msgid "Problem in %s" +msgstr "%s に問題があります" -#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268 +#: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." -msgstr "" -"収集された情報はバグトラッキングシステムに送信されます。\n" -"しばらくお待ちください。" - -#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318 -msgid "&Done" -msgstr "完了(&D)" +"Your computer does not have enough free memory to automatically analyze the " +"problem and send a report to the developers." +msgstr "コンピューターに、問題を自動的に解析して開発者にレポートを送るための十分な空きメモリーがありません。" -#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324 -msgid "none" -msgstr "なし" +#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510 +#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1254 +#: ../apport/ui.py:1420 ../apport/ui.py:1424 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1254 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1420 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424 +msgid "Invalid problem report" +msgstr "無効な問題のレポートです" -#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 -#, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "現在の設定: %s。複数選択:" +#: ../apport/ui.py:360 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360 +msgid "You are not allowed to access this problem report." +msgstr "この問題を報告するための権限がありません。" -#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341 -msgid "Choices:" -msgstr "選択肢：" +#: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 +msgid "Error" +msgstr "エラー" -#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 -msgid "Path to file (Enter to cancel):" -msgstr "ファイルへのパス（Enterでキャンセル）：" +#: ../apport/ui.py:364 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364 +msgid "There is not enough disk space available to process this report." +msgstr "このレポートを作成するための空きスペースがディスクにありません。" -#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "ファイルが存在しません。" +#: ../apport/ui.py:458 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458 +msgid "No package specified" +msgstr "パッケージが指定されていません" -#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "これはディレクトリです。" +#: ../apport/ui.py:459 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459 +msgid "" +"You need to specify a package or a PID. See --help for more information." +msgstr "パッケージまたはプロセスIDを指定する必要があります。詳しくは --help を参照してください。" -#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "続行するには、以下のURLを開いてください:" +#: ../apport/ui.py:488 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488 +msgid "Permission denied" +msgstr "許可がありません" -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 +#: ../apport/ui.py:489 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489 msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "ブラウザーを今すぐ起動するか、または他のコンピューターのブラウザーにURLをコピーしてください。" +"The specified process does not belong to you. Please run this program as the " +"process owner or as root." +msgstr "このプロセスを操作する権限がありません。プロセスの所有者もしくはrootユーザーとして実行してください。" -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "今すぐブラウザーを起動する" +#: ../apport/ui.py:402 ../apport/ui.py:491 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 +msgid "Invalid PID" +msgstr "無効なプロセスID" -#: ../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 を試してみてください。" +#: ../apport/ui.py:492 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +msgid "The specified process ID does not belong to a program." +msgstr "指定されたプロセスIDはプログラムに属していません。" -#: ../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 "問題を報告する..." +#: ../apport/ui.py:511 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511 +#, python-format +msgid "Symptom script %s did not determine an affected package" +msgstr "Symptomスクリプト %s は、影響を受けたパッケージを特定していません" -#: ../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 "開発者に異常動作を報告してください" +#: ../apport/ui.py:514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 +#, python-format +msgid "Package %s does not exist" +msgstr "パッケージ %s は存在しません" -#: ../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 "このことは前のサスペンド中に発生しており、システムが正常に復帰できませんでした。" +#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735 +msgid "Cannot create report" +msgstr "レポートを作成できません" -#: ../data/apportcheckresume.py:69 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620 +msgid "Updating problem report" +msgstr "問題点のレポートを更新中" + +#: ../apport/ui.py:559 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559 msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "このことは前のハイバネーション中に発生しており、システムが正常に復帰できませんでした。" +"You are not the reporter or subscriber of this problem report, or the report " +"is a duplicate or already closed.\n" +"\n" +"Please create a new report using \"apport-bug\"." +msgstr "" +"あなたはこの問題の報告者または登録者でないか、報告が重複しているかすでに終了しています。\n" +"\n" +"\"apport-bug\"を使って新規にレポートを作成してください。" -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "リジューム処理が終わる寸前でハングしましたが、通常通り完了していると思われます。" +"You are not the reporter of this problem report. It is much easier to mark a " +"bug as a duplicate of another than to move your comments and attachments to " +"a new bug.\n" +"\n" +"Subsequently, we recommend that you file a new bug report using \"apport-" +"bug\" and make a comment in this bug about the one you file.\n" +"\n" +"Do you really want to proceed?" +msgstr "" +"あなたはこの問題の報告者または登録者ではありません。新しいバグとしてコメントと添付ファイルを提出するより、他のバグと重複したバグとしてマークするほうがより" +"簡単です。\n" +"\n" +"その後、\"apport-bug\"を利用して新たにバグ報告を行い、このバグの中で提出するものについてのコメントを行うことをお勧めします。\n" +"\n" +"本当に進めますか?" -#: ../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が予期せず停止しました。" +#: ../apport/ui.py:605 ../apport/ui.py:621 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621 +msgid "No additional information collected." +msgstr "収集する追加情報はありません。" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "残念ながら、%s は予期せず終了しました。" +#: ../apport/ui.py:672 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672 +msgid "What kind of problem do you want to report?" +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 は応答していません。" +#: ../apport/ui.py:689 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689 +msgid "Unknown symptom" +msgstr "未知の現象" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 +#: ../apport/ui.py:690 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690 #, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "プログラム \"%s\" は応答していません。" - -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "システム情報を収集" +msgid "The symptom \"%s\" is not known." +msgstr "現象 \"%s\" は知られていません。" -#: ../apport/com.ubuntu.apport.policy.in.h:2 +#: ../apport/ui.py:721 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 msgid "" -"Authentication is required to collect system information for this problem " -"report" -msgstr "この問題を報告するには、システム情報を収集するための認証が必要です" +"After closing this message please click on an application window to report a " +"problem about it." +msgstr "このメッセージを閉じた後でアプリケーションウィンドウ上でクリックして、その問題について報告してください。" -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "システムの問題の報告" +#: ../apport/ui.py:731 ../apport/ui.py:736 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736 +msgid "xprop failed to determine process ID of the window" +msgstr "xpropはウィンドウのプロセスIDを特定できませんでした" -#: ../apport/com.ubuntu.apport.policy.in.h:4 -msgid "" -"Please enter your password to access problem reports of system programs" -msgstr "システムプログラムの問題レポートにアクセスするにはパスワードを入力してください" +#: ../apport/ui.py:750 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750 +msgid "%prog " +msgstr "%prog " -#: ../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 "これ以上レポートに新しいトレースを書き込みませんが、標準出力には表示します。" +#: ../apport/ui.py:752 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752 +msgid "Specify package name." +msgstr "パッケージ名を指定" -#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 +#: ../apport/ui.py:754 ../apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805 +msgid "Add an extra tag to the report. Can be specified multiple times." +msgstr "レポートに追加タグを追加します。複数回指定できます。" + +#: ../apport/ui.py:784 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784 msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" -msgstr "レポートのコアダンプに対してインタラクティブなgdbセッションを開始します（-o 無視；レポートを上書きしません）" +"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" +msgstr "" +"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" -#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 +#: ../apport/ui.py:787 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 msgid "" -"Write modified report to given file instead of changing the original report" -msgstr "オリジナルのレポートを変更せずに、指定されたファイルに変更後のレポートを書き込みます" +"Start in bug filing mode. Requires --package and an optional --pid, or just " +"a --pid. If neither is given, display a list of known symptoms. (Implied if " +"a single argument is given.)" +msgstr "" +"バグファイリングモードを開始します。実行には --package と追加の --pid を用いるか、あるいはただ --pid " +"だけとするオプションが必要です。どちらも与えられていないときには、既知の現象のリストを表示します（暗黙の一つの引数が与えられた場合）。" -#: ../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 "スタックトレースを再生成した後にコアダンプをレポートから取り除きます" +#: ../apport/ui.py:789 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789 +msgid "Click a window as a target for filing a problem report." +msgstr "問題レポートを埋めるには、ターゲットとなるウィンドウをクリックしてください。" -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 -msgid "Override report's CoreFile" -msgstr "レポートのコアファイルを上書きします" +#: ../apport/ui.py:791 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791 +msgid "Start in bug updating mode. Can take an optional --package." +msgstr "バグ更新モードを開始します。オプション --package が使用できます。" -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 -msgid "Override report's ExecutablePath" -msgstr "レポートの ExecutablePath を上書きします" +#: ../apport/ui.py:793 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793 +msgid "" +"File a bug report about a symptom. (Implied if symptom name is given as only " +"argument.)" +msgstr "SYMPTOM（症状）についてのバグを報告します（唯一の引数は症状の名前を意味します）。" -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 -msgid "Override report's ProcMaps" -msgstr "レポートの ProcMaps を上書きします" +#: ../apport/ui.py:795 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795 +msgid "" +"Specify package name in --file-bug mode. This is optional if a --pid is " +"specified. (Implied if package name is given as only argument.)" +msgstr "" +"--file-bug モードで使用するパッケージ名を指定します。--pid " +"が指定されている場合はオプション扱いになります（唯一の引数はパッケージ名を意味します）。" -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 -msgid "Rebuild report's Package information" -msgstr "レポートに含まれるパッケージ情報を再生成します" +#: ../apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797 +msgid "" +"Specify a running program in --file-bug mode. If this is specified, the bug " +"report will contain more information. (Implied if pid is given as only " +"argument.)" +msgstr "" +"--file-bug " +"モードの対象になる実行中のプログラムを指定します。このオプションを指定した場合、バグ報告にはより多くの情報が含まれます（唯一の引数はプロセスIDを意味しま" +"す）。" + +#: ../apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799 +msgid "The provided pid is a hanging application." +msgstr "指定されたpidはハングアップしたアプリケーションのものです。" -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 +#: ../apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801 +#, python-format msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." +"Report the crash from given .apport or .crash file instead of the pending " +"ones in %s. (Implied if file is given as only argument.)" msgstr "" -"一時的なサンドボックスを作成し、必要なパッケージとデバッグシンボルをそこにダウンロードおよびインストールします。このオプションが指定されなかった場合には、" -"必要なパッケージやデバッグシンボルはすでにお使いのシステムにインストールされているものとして処理を続行します。引数はパッケージングシステムの設定のベースデ" -"ィレクトリを指定します。「system」を指定した場合にはシステムの設定ファイルを利用しますが、その場合には現在実行中のリリースで発生したクラッシュしかリ" -"トレースできません。" +"クラッシュの報告を %s で保留中のプログラムのかわりに .apport または .crash ファイルで行う（ファイル名が引数のみで与えられた場合）。" -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +#: ../apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803 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 " -"have installed." +"In bug filing mode, save the collected information into a file instead of " +"reporting it. This file can then be reported later on from a different " +"machine." msgstr "" -"gdbとその依存関係をインストールする一時的なサンドボックスをビルドし、インストールされているgdbのバージョンとは関係なく、レポートにあるのと同じリリー" -"スを利用します" +"バグファイリングモードでは、収集した情報は報告する代わりにファイルに保存されます。このファイルは、後で別のコンピューターから報告することができます。" -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +#: ../apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807 +msgid "Print the Apport version number." +msgstr "Apportのバージョン番号を表示します。" + +#: ../apport/ui.py:958 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958 msgid "" -"Report download/install progress when installing packages into sandbox" -msgstr "サンドボックスにパッケージをインストールする際に、ダウンロードおよびインストールの進捗状況を表示します" +"This will launch apport-retrace in a terminal window to examine the crash." +msgstr "クラッシュの解析を行うため端末ウィンドウでapport-retraceを起動します。" -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 -msgid "Prepend timestamps to log messages, for batch operation" -msgstr "ログメッセージの先頭にタイムスタンプを挿入します(バッチ処理用)" +#: ../apport/ui.py:959 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959 +msgid "Run gdb session" +msgstr "gdbセッションを実行" + +#: ../apport/ui.py:960 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960 +msgid "Run gdb session without downloading debug symbols" +msgstr "デバッグシンボルをダウンロードせずgdbセッションを実行" + +#. TRANSLATORS: %s contains the crash report file name +#: ../apport/ui.py:962 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 +#, python-format +msgid "Update %s with fully symbolic stack trace" +msgstr "%s を完全なシンボリックスタックトレースに更新する" -#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +#: ../apport/ui.py:998 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998 +msgid "Can't remember send report status settings" +msgstr "レポートの送信のステータス設定を記憶できません" + +#: ../apport/ui.py:999 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999 msgid "" -"Create and use third-party repositories from origins specified in reports" -msgstr "レポートで指定された提供元から、サードパーティーのリポジトリを作成して使用します。" +"Saving crash reporting state failed. Can't set auto or never reporting mode." +msgstr "クラッシュレポートの状態の保存に失敗しました。報告モードを「自動」または「しない」に設定できません。" -#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 -msgid "Cache directory for packages downloaded in the sandbox" -msgstr "サンドボックスにダウンロードされたパッケージのためのキャッシュディレクトリ" +#: ../apport/ui.py:1058 ../apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068 +msgid "" +"This problem report applies to a program which is not installed any more." +msgstr "この問題レポートは、もうインストールされていないプログラムに対するものです。" -#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../apport/ui.py:1083 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083 +#, python-format msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." -msgstr "" -"展開したパッケージのためのディレクトリ。これ以降はダウンロード済みのパッケージはすべてこのサンドボックスに展開されているものと仮定します。" +"The problem happened with the program %s which changed since the crash " +"occurred." +msgstr "この問題はプログラム %s に発生したものですが、このプログラムはクラッシュしてから変更されています。" + +#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1426 +msgid "This problem report is damaged and cannot be processed." +msgstr "この問題の報告は破損しており、処理することができません。" -#: ../bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66 -#: ../debian/tmp/usr/bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../apport/ui.py:1141 +#, python-format msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" -msgstr "サンドボックスに追加のパッケージをインストールします (複数回指定可)" +"This report is about a snap published by %s. Contact them via %s for help." +msgstr "このレポートは、%s が公開しているsnapに対するものです。提供されている連絡先 %s に連絡してください。" -#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 +#: ../apport/ui.py:1144 +#, python-format 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 " -"neither -g, -o, nor -s are specified)" +"This report is about a snap published by %s. No contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help." msgstr "" -"クラッシュデータベース認証情報のファイルへのパス。これはリトレースしたスタックトレースをアップロードする際にクラッシュIDを指定するために使われます（-" -"g, -o, または -s が指定されていない場合）。" +"このレポートは、%s が公開しているsnapに対するものです。連絡先は提供されていないため、バグ報告や質問等については " +"https://forum.snapcraft.io/ にアクセスしてみてください。" + +#: ../apport/ui.py:1135 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135 +msgid "This report is about a package that is not installed." +msgstr "このレポートは、インストールされていないパッケージに対するものです。" + +#: ../apport/ui.py:1139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139 +msgid "An error occurred while attempting to process this problem report:" +msgstr "この問題の報告の処理中にエラーが発生しました:" -#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../apport/ui.py:1159 +#, python-format msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." -msgstr "スタックトレースのリトレースを表示し、クラッシュデータベースに送る前に確認します。" +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. You can contact them via %s for help. Do you " +"want to continue with the bug report against the deb?" +msgstr "" +"debパッケージに対するバグ報告をしようとしていますが、%s が公開しているsnapもインストール済みです。snapのバグ報告や質問等は %s " +"で受け付けています。debパッケージに対するバグ報告を続行しますか？" -#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../apport/ui.py:1161 +#, python-format msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" -msgstr "sqliteデータベースの複製へのパス（デフォルトは複製のチェックをしない）" +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. For the snap, no contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " +"want to continue with the bug report against the deb?" +msgstr "" +"debパッケージに対するバグ報告をしようとしていますが、%s " +"が公開しているsnapもインストール済みです。snapの連絡先は提供されていませんが、https://forum.snapcraft.io/ " +"でバグ報告や質問等を行うことができます。debパッケージに対するバグ報告を続行しますか？" -#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 -msgid "Do not add StacktraceSource to the report." -msgstr "レポートにスタックトレースソースを追加しないでください。" +#: ../apport/ui.py:1255 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255 +msgid "Could not determine the package or source package name." +msgstr "パッケージまたはソースパッケージ名を特定できませんでした。" -#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 -msgid "You cannot use -C without -S. Stopping." -msgstr "-S を指定せずに -C を使用することはできません。中止します。" +#: ../apport/ui.py:1273 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1273 +msgid "Unable to start web browser" +msgstr "ウェブブラウザーを起動できません" -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../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]" +#: ../apport/ui.py:1274 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274 +#, python-format +msgid "Unable to start web browser to open %s." +msgstr "%s を開くためのウェブブラウザーを起動できません" -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "詳細はmanページをご覧ください。" +#: ../apport/ui.py:1374 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1374 +#, python-format +msgid "Please enter your account information for the %s bug tracking system" +msgstr "バグ追跡システム %s にあなたのアカウント情報を入力してください" -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "valgrind によって生成されたログファイルの名前を指定" +#: ../apport/ui.py:1386 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1386 +msgid "Network problem" +msgstr "ネットワークの問題" -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +#: ../apport/ui.py:1388 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1388 msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" -msgstr "以前作成されたサンドボックスディレクトリ (SDIR) を再利用するか、もし存在しない場合には作成する" +"Cannot connect to crash database, please check your Internet connection." +msgstr "クラッシュデータベースに接続できませんでした。インターネット接続を確認してください。" -#: ../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 "追加のデバッグシンボル用にサンドボックスディレクトリを作成または再利用せず、インストールされたデバッグシンボルのみを利用する。" +#: ../apport/ui.py:1415 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1415 +msgid "Memory exhaustion" +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) を再利用するか、もし存在しない場合には作成する" +#: ../apport/ui.py:1416 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416 +msgid "Your system does not have enough memory to process this crash report." +msgstr "コンピューターには、このクラッシュレポートを処理するのに十分なメモリーがありません。" -#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 +#: ../apport/ui.py:1451 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1451 +#, python-format msgid "" -"report download/install progress when installing packages into sandbox" -msgstr "サンドボックス内にパッケージをインストールする際、ダウンロードおよびインストールの進捗状況を報告する" +"The problem cannot be reported:\n" +"\n" +"%s" +msgstr "" +"問題を報告することができません:\n" +"\n" +"%s" -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 +#: ../apport/ui.py:1507 ../apport/ui.py:1514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1507 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1514 +msgid "Problem already known" +msgstr "問題は既知のものです" + +#: ../apport/ui.py:1508 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508 msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" -msgstr "メモリリーク検出のためvalgrindのメモリチェックツールにより実行されているプログラム" +"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 " +"helpful for the developers." +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 は実行ファイルではありません。中止します。" +#: ../apport/ui.py:1515 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515 +msgid "This problem was already reported to developers. Thank you!" +msgstr "この問題はすでに開発者に報告されています。ありがとうございます！" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:186 -#: ../data/general-hooks/ubuntu.py:186 +#: ../data/general-hooks/ubuntu.py:195 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195 msgid "" "An Ubuntu package has a file conflict with a package that is not a genuine " "Ubuntu package." msgstr "あるUbuntuのパッケージがUbuntu純正ではないパッケージと対立するファイルを含んでいます。" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:194 -#: ../data/general-hooks/ubuntu.py:194 +#: ../data/general-hooks/ubuntu.py:203 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203 msgid "You have already encountered this package installation failure." msgstr "以前にもこのパッケージのインストールに失敗しています。" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210 -#: ../data/general-hooks/ubuntu.py:210 +#: ../data/general-hooks/ubuntu.py:219 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219 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 " @@ -1269,16 +1115,3 @@ "マンドを実行してください:\n" "\n" " sudo apt-get install grub-pc\n" - -#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "使用法 : %s <レポート> <対象ディレクトリ>" - -#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "目的のディレクトリは存在しますが、空ではありません。" - -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "クラッシュしたファイルをApportする" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/appstream.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/appstream.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/appstream.po 2020-01-23 16:51:29.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/appstream.po 2020-07-08 13:53:25.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 12:11+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: tools/appstream-cli.c:157 @@ -122,7 +122,7 @@ #: src/as-category.c:129 msgctxt "Category of Games" msgid "Arcade" -msgstr "" +msgstr "アーケード" #: src/as-category.c:234 msgctxt "Category of Science" @@ -165,7 +165,7 @@ #: tools/ascli-utils.c:299 msgid "Bundle" -msgstr "" +msgstr "バンドル" #: src/as-pool.c:1828 #, c-format @@ -230,12 +230,12 @@ #: tools/ascli-utils.c:377 msgid "Compulsory for" -msgstr "" +msgstr "必須的に" #. TRANSLATORS: "convert" command in ascli. "Collection XML" is a term describing a specific type of AppStream XML data. #: tools/appstream-cli.c:865 msgid "Convert collection XML to YAML or vice versa." -msgstr "" +msgstr "コレクションXMLをYAMLに、またはその逆に変換する。" #. TRANSLATORS: Search for provided items (e.g. mimetypes, modaliases, ..) yielded no results #: tools/ascli-actions-mdata.c:228 @@ -247,7 +247,7 @@ msgid "" "Create a template for a metainfo file (to be filled out by the upstream " "project)." -msgstr "" +msgstr "メタインフォファイルのテンプレートを作成します（アップストリームプロジェクトが記入します）。" #: src/as-provided.c:160 msgid "DBus Session Services" @@ -311,7 +311,7 @@ #: tools/appstream-cli.c:853 msgid "Dump raw XML metadata for a component matching the ID." -msgstr "" +msgstr "IDに一致するコンポーネントの生のXMLメタデータをダンプします。" #. TRANSLATORS: this is the menu spec main category for Education #: src/as-category.c:308 @@ -399,7 +399,7 @@ #: src/as-provided.c:164 msgid "Flashed Firmware" -msgstr "" +msgstr "フラッシュされたファームウェア" #: src/as-provided.c:150 msgid "Fonts" @@ -414,7 +414,7 @@ #: tools/ascli-actions-misc.c:138 #, c-format msgid "Found %i components in legacy paths." -msgstr "" +msgstr "レガシーパスに%iコンポーネントが見つかりました。" #: tools/ascli-actions-misc.c:123 #, c-format @@ -428,11 +428,11 @@ #: tools/appstream-cli.c:849 msgid "Get components which provide the given item." -msgstr "" +msgstr "指定されたアイテムを提供するコンポーネントを取得します。" #: tools/appstream-cli.c:848 msgid "Get information about a component by its ID." -msgstr "" +msgstr "IDでコンポーネントに関する情報を取得します。" #. TRANSLATORS: this is the menu spec main category for Graphics #: src/as-category.c:314 @@ -475,7 +475,7 @@ #: tools/ascli-actions-mdata.c:213 msgid "Invalid type for provided item selected. Valid values are:" -msgstr "" +msgstr "選択した提供アイテムのタイプが無効です。有効な値は：" #: src/as-category.c:144 msgctxt "Category of Games" @@ -518,17 +518,17 @@ #. TRANSLATORS: ascli flag description for: --no-cache #: tools/appstream-cli.c:67 msgid "Make request without any caching." -msgstr "" +msgstr "キャッシュせずにリクエストを行います。" #. TRANSLATORS: ascli flag description for: --cachepath #: tools/appstream-cli.c:57 msgid "Manually selected location of AppStream cache." -msgstr "" +msgstr "手動で選択したAppStreamキャッシュの場所。" #. TRANSLATORS: ascli flag description for: --datapath #: tools/appstream-cli.c:62 msgid "Manually selected location of AppStream metadata to scan." -msgstr "" +msgstr "スキャンするAppStreamメタデータの場所を手動で選択します。" #: src/as-category.c:111 msgctxt "Category of Education" @@ -556,7 +556,7 @@ #: src/as-provided.c:152 msgid "Modaliases" -msgstr "" +msgstr "モダリア" #: src/as-category.c:74 msgctxt "Category of AudioVideo" @@ -585,11 +585,11 @@ msgid "" "No suitable package manager CLI found. Please make sure that e.g. \"pkcon\" " "(part of PackageKit) is available." -msgstr "" +msgstr "適切なパッケージマネージャーCLIが見つかりません。ご確認してください。 「pkcon」（PackageKitの一部）が利用可能です。" #: tools/ascli-actions-mdata.c:206 msgid "No value for the item to search for was defined." -msgstr "" +msgstr "検索するアイテムの値が定義されていません。" #. TRANSLATORS: this is the menu spec main category for Office #: src/as-category.c:317 @@ -662,6 +662,8 @@ "Run '%s --help' to see a list of available commands and options, and '%s %s -" "-help' to see a list of options specific for this subcommand." msgstr "" +"'%s --help'を実行して使用可能なコマンドとオプションのリストを表示し、 '%s%s --" +"help'を実行してこのサブコマンドに固有のオプションのリストを表示します。" #: src/as-provided.c:162 msgid "Runtime Firmware" @@ -751,7 +753,7 @@ #: tools/appstream-cli.c:683 #, c-format msgid "The TYPE must be a valid component-type, such as: %s" -msgstr "" +msgstr "TYPEは次のような有効なコンポーネントタイプである必要があります：%s" #: tools/ascli-actions-mdata.c:449 #, c-format diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apt.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apt.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apt.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apt.po 2020-07-08 13:53:29.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 1.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" "PO-Revision-Date: 2019-09-12 14:29+0000\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -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: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -211,7 +211,7 @@ msgid "This APT helper has Super Meep Powers." msgstr "この APT helper は Super Meep Powers 化されています。" -#: apt-private/private-cmndline.cc:549 +#: apt-private/private-cmndline.cc:554 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -220,7 +220,7 @@ #: apt-private/private-depends.cc:35 apt-private/private-download.cc:251 #: 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:102 cmdline/apt-mark.cc:298 +#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 msgid "No packages found" msgstr "パッケージが見つかりません" @@ -387,7 +387,7 @@ msgid "Abort." msgstr "中断しました。" -#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:239 +#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:251 msgid "Do you want to continue?" msgstr "続行しますか?" @@ -497,7 +497,7 @@ msgstr "%s はすでに最新バージョン (%s) です。\n" #: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121 -#: cmdline/apt-mark.cc:78 +#: cmdline/apt-mark.cc:94 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" @@ -512,11 +512,11 @@ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択しました\n" -#: apt-private/private-list.cc:129 +#: apt-private/private-list.cc:130 msgid "Listing" msgstr "一覧表示" -#: apt-private/private-list.cc:159 +#: apt-private/private-list.cc:160 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" @@ -919,19 +919,19 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n" -#: apt-private/private-update.cc:33 +#: apt-private/private-update.cc:34 msgid "The update command takes no arguments" msgstr "update コマンドは引数を取りません" #. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list -#: apt-private/private-update.cc:116 +#: apt-private/private-update.cc:117 #, c-format msgid "" "Usage of %s should be preferred over embedding login information directly in " "the %s entry for '%s'" msgstr "" -#: apt-private/private-update.cc:134 +#: apt-private/private-update.cc:135 #, c-format msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" @@ -939,7 +939,7 @@ msgstr[0] "" "アップグレードできるパッケージが %i 個あります。表示するには 'apt list --upgradable' を実行してください。\n" -#: apt-private/private-update.cc:138 +#: apt-private/private-update.cc:139 msgid "All packages are up to date." msgstr "パッケージはすべて最新です。" @@ -1137,12 +1137,12 @@ msgid "Couldn't find package %s" msgstr "パッケージ %s が見付かりません" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:80 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:123 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -1235,24 +1235,24 @@ msgid "Download and display the changelog for the given package" msgstr "指定のパッケージの変更履歴をダウンロードして表示する" -#: cmdline/apt-helper.cc:43 +#: cmdline/apt-helper.cc:44 msgid "Need one URL as argument" msgstr "引数として URL が 1 つ必要です" -#: cmdline/apt-helper.cc:57 +#: cmdline/apt-helper.cc:58 msgid "Must specify at least one pair url/filename" msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります" -#: cmdline/apt-helper.cc:100 cmdline/apt-helper.cc:104 +#: cmdline/apt-helper.cc:101 cmdline/apt-helper.cc:105 msgid "Download Failed" msgstr "ダウンロード失敗" -#: cmdline/apt-helper.cc:125 cmdline/apt-helper.cc:128 +#: cmdline/apt-helper.cc:126 cmdline/apt-helper.cc:129 #, c-format msgid "GetSrvRec failed for %s" msgstr "GetSrvRec は %s のため失敗しました" -#: cmdline/apt-helper.cc:263 +#: cmdline/apt-helper.cc:293 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -1268,85 +1268,85 @@ "apt-helper はシェルスクリプトが使用するさまざまなコマンドをバンドル\n" "しています。例えば、同じプロキシ設定や APT と同様のシステム取得。\n" -#: cmdline/apt-helper.cc:275 +#: cmdline/apt-helper.cc:305 msgid "download the given uri to the target-path" msgstr "指定した uri を目標パスにダウンロードする" -#: cmdline/apt-helper.cc:276 +#: cmdline/apt-helper.cc:306 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" msgstr "SRV レコードを検索 (例えば _http._tcp.ftp.debian.org)" -#: cmdline/apt-helper.cc:277 +#: cmdline/apt-helper.cc:307 msgid "concatenate files, with automatic decompression" msgstr "自動解凍とファイル結合" -#: cmdline/apt-helper.cc:278 +#: cmdline/apt-helper.cc:308 msgid "detect proxy using apt.conf" msgstr "apt.conf を使ってプロキシを検出する" -#: cmdline/apt-helper.cc:279 +#: cmdline/apt-helper.cc:309 msgid "wait for system to be online" msgstr "" -#: cmdline/apt-helper.cc:280 +#: cmdline/apt-helper.cc:310 msgid "drop privileges before running given command" msgstr "" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:66 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s をインストールされていないものとしてマークできません\n" -#: cmdline/apt-mark.cc:71 +#: cmdline/apt-mark.cc:72 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s は手動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:73 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s は自動でインストールしたとすでに設定されています。\n" -#: cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:323 #, c-format msgid "%s was already set on hold.\n" msgstr "%s はすでに保留に設定されています。\n" -#: cmdline/apt-mark.cc:313 +#: cmdline/apt-mark.cc:325 #, c-format msgid "%s was already not hold.\n" msgstr "%s はすでに保留されていません。\n" -#: cmdline/apt-mark.cc:340 +#: cmdline/apt-mark.cc:352 msgid "Executing dpkg failed. Are you root?" msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?" -#: cmdline/apt-mark.cc:343 +#: cmdline/apt-mark.cc:355 #, c-format msgid "%s set on hold.\n" msgstr "%s は保留に設定されました。\n" -#: cmdline/apt-mark.cc:345 +#: cmdline/apt-mark.cc:357 #, c-format msgid "Canceled hold on %s.\n" msgstr "%s の保留を解除しました。\n" -#: cmdline/apt-mark.cc:347 +#: cmdline/apt-mark.cc:359 #, c-format msgid "Selected %s for purge.\n" msgstr "%s は完全削除で選択されました。\n" -#: cmdline/apt-mark.cc:349 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Selected %s for removal.\n" msgstr "%s は削除で選択されました。\n" -#: cmdline/apt-mark.cc:351 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for installation.\n" msgstr "%s はインストールで選択されました。\n" -#: cmdline/apt-mark.cc:403 +#: cmdline/apt-mark.cc:415 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1362,27 +1362,27 @@ "パッケージ選択状態を操作したり、マークを特定せずにすべてのパッケージの\n" "一覧表示したりもできます。\n" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:427 msgid "Mark the given packages as automatically installed" msgstr "指定のパッケージを自動でインストールされたものとしてマークする" -#: cmdline/apt-mark.cc:416 +#: cmdline/apt-mark.cc:428 msgid "Mark the given packages as manually installed" msgstr "指定のパッケージを手動でインストールしたものとしてマークする" -#: cmdline/apt-mark.cc:418 +#: cmdline/apt-mark.cc:430 msgid "Mark a package as held back" msgstr "パッケージを保留としてマークする" -#: cmdline/apt-mark.cc:419 +#: cmdline/apt-mark.cc:431 msgid "Unset a package set as held back" msgstr "パッケージの保留を解除する" -#: cmdline/apt-mark.cc:424 +#: cmdline/apt-mark.cc:436 msgid "Print the list of automatically installed packages" msgstr "自動的にインストールされたパッケージの一覧を表示する" -#: cmdline/apt-mark.cc:425 +#: cmdline/apt-mark.cc:437 msgid "Print the list of manually installed packages" msgstr "手作業でインストールしたパッケージの一覧を表示する" @@ -1517,8 +1517,8 @@ msgid "Connection failed" msgstr "接続失敗" -#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:615 -#: methods/http.cc:874 +#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:619 +#: methods/http.cc:878 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" @@ -1534,12 +1534,12 @@ msgid "Internal error" msgstr "内部エラー" -#: methods/cdrom.cc:204 +#: methods/cdrom.cc:203 #, c-format msgid "Unable to read the cdrom database %s" msgstr "CD-ROM データベース %s を読み込むことができません" -#: methods/cdrom.cc:213 +#: methods/cdrom.cc:212 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1547,20 +1547,20 @@ "この CD-ROM を APT に認識させるには apt-cdrom を使用してください。新しい CD-ROM を追加するために apt-get " "update は使用できません。" -#: methods/cdrom.cc:223 +#: methods/cdrom.cc:222 msgid "Wrong CD-ROM" msgstr "CD が違います" -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。" -#: methods/cdrom.cc:255 +#: methods/cdrom.cc:254 msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:263 methods/file.cc:123 methods/rsh.cc:296 +#: methods/cdrom.cc:262 methods/file.cc:123 methods/rsh.cc:296 msgid "File not found" msgstr "ファイルが見つかりません" @@ -1585,7 +1585,7 @@ msgid "Connected to %s (%s)" msgstr "" -#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:317 +#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:321 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" @@ -1772,7 +1772,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:1033 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1847,31 +1847,31 @@ "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/http.cc:711 +#: methods/http.cc:715 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:728 +#: methods/http.cc:732 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:732 +#: methods/http.cc:736 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:769 +#: methods/http.cc:773 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:836 +#: methods/http.cc:840 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:842 +#: methods/http.cc:846 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:866 +#: methods/http.cc:870 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apturl.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apturl.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apturl.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apturl.po 2020-07-08 13:53:29.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: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apt-utils.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apt-utils.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/apt-utils.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/apt-utils.po 2020-07-08 13:53:29.000000000 +0000 @@ -10,15 +10,15 @@ msgstr "" "Project-Id-Version: apt 1.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" "PO-Revision-Date: 2019-09-12 14:34+0000\n" "Last-Translator: Takuma Yamada \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: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: cmdline/apt-dump-solver.cc:37 @@ -110,31 +110,31 @@ "デフォルトではバイナリパッケージ情報でソートしますが、-s オプションを使って\n" "ソースパッケージの順序に切り替えることができます。\n" -#: ftparchive/apt-ftparchive.cc:199 ftparchive/apt-ftparchive.cc:376 +#: ftparchive/apt-ftparchive.cc:208 ftparchive/apt-ftparchive.cc:375 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:201 ftparchive/apt-ftparchive.cc:213 -#: ftparchive/apt-ftparchive.cc:236 ftparchive/apt-ftparchive.cc:290 -#: ftparchive/apt-ftparchive.cc:300 ftparchive/apt-ftparchive.cc:322 +#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:222 +#: ftparchive/apt-ftparchive.cc:245 ftparchive/apt-ftparchive.cc:294 +#: ftparchive/apt-ftparchive.cc:304 ftparchive/apt-ftparchive.cc:326 #, c-format msgid "Error processing directory %s" msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:288 +#: ftparchive/apt-ftparchive.cc:292 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:402 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:432 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:627 +#: ftparchive/apt-ftparchive.cc:621 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -215,11 +215,11 @@ " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:823 +#: ftparchive/apt-ftparchive.cc:817 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:903 +#: ftparchive/apt-ftparchive.cc:897 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/aspell.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/aspell.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/aspell.po 2020-01-23 16:51:31.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/aspell.po 2020-07-08 13:53:27.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: 2020-01-23 10:32+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "X-Poedit-Country: JAPAN\n" "Language: ja\n" "X-Poedit-Language: Japanese\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/bash.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/bash.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/bash.po 2020-01-23 16:51:31.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/bash.po 2020-07-08 13:53:27.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: 2020-01-23 10:32+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: Japanese\n" #: arrayfunc.c:58 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/bfd.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/bfd.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/bfd.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/bfd.po 2020-07-08 13:53:29.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: 2020-01-23 10:53+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:47+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/binutils.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/binutils.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/binutils.po 2020-01-23 16:51:28.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/binutils.po 2020-07-08 13:53:24.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: binutils 2.21.53\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2018-01-13 13:44+0000\n" -"PO-Revision-Date: 2019-06-13 15:46+0000\n" +"PO-Revision-Date: 2020-04-22 13:17+0000\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:34+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:32+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: addr2line.c:87 @@ -418,7 +418,7 @@ msgid "Cannot convert existing thin library %s to normal format" msgstr "" -#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3549 +#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3551 #, c-format msgid "internal stat error on %s" msgstr "内部状態エラーが %s で発生しました" @@ -428,7 +428,7 @@ msgid "%s is not a valid archive" msgstr "%s は有効な書庫ではありません" -#: objcopy.c:3511 +#: objcopy.c:3513 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "" @@ -1796,7 +1796,7 @@ msgid "Encoded size of 0 is too small to read\n" msgstr "" -#: dwarf.c:387 dwarf.c:401 +#: dwarf.c:369 dwarf.c:383 #, c-format msgid "" "Internal error: %s:%d: LEB value (%s) too large for containing variable\n" @@ -1832,7 +1832,7 @@ "列の終り\n" "\n" -#: dwarf.c:563 +#: dwarf.c:539 #, c-format msgid "Length (%d) of DW_LNE_set_address op is too long\n" msgstr "" @@ -2023,15 +2023,15 @@ msgid "(Unknown location op 0x%x)" msgstr "(不明な位置命令 0x%x)" -#: dwarf.c:1721 +#: dwarf.c:1696 msgid "" msgstr "" -#: dwarf.c:1724 +#: dwarf.c:1699 msgid "" msgstr "" -#: dwarf.c:1732 +#: dwarf.c:1707 #, c-format msgid "DW_FORM_GNU_strp_alt offset too big: %s\n" msgstr "DW_FORM_GNU_strp_alt オフセットが大きすぎます: %s\n" @@ -2238,12 +2238,12 @@ msgid "(out of class)" msgstr "" -#: dwarf.c:2582 +#: dwarf.c:2538 #, c-format msgid "(label)" msgstr "(ラベル)" -#: dwarf.c:2583 +#: dwarf.c:2539 #, c-format msgid "(range)" msgstr "(範囲)" @@ -2484,17 +2484,17 @@ msgid "Line length %s extends beyond end of section\n" msgstr "" -#: dwarf.c:3443 +#: dwarf.c:3418 #, c-format msgid "Corrupt %s format table entry\n" msgstr "" -#: dwarf.c:3452 +#: dwarf.c:3427 #, c-format msgid "Corrupt %s list\n" msgstr "破損 %s リスト\n" -#: dwarf.c:3458 +#: dwarf.c:3433 #, c-format msgid "" "\n" @@ -2503,7 +2503,7 @@ "\n" " %s表は空です。\n" -#: dwarf.c:3462 +#: dwarf.c:3437 #, c-format msgid "" "\n" @@ -2545,7 +2545,7 @@ msgid "\t(Unknown format content type %s)" msgstr "" -#: dwarf.c:3531 +#: dwarf.c:3506 #, c-format msgid "Corrupt %s entries list\n" msgstr "" @@ -2629,11 +2629,11 @@ msgid_plural " Opcode %d has %d args\n" msgstr[0] " オペコード %d は %d 個の引数を持ちます\n" -#: dwarf.c:3639 +#: dwarf.c:3614 msgid "Directory" msgstr "ディレクトリ" -#: dwarf.c:3641 +#: dwarf.c:3616 msgid "File name" msgstr "ファイル名" @@ -2832,14 +2832,14 @@ msgid "CU: %s/%s:\n" msgstr "CU: %s/%s:\n" -#: dwarf.c:4325 +#: dwarf.c:4300 #, c-format msgid "" "File name Line number Starting address " "View\n" msgstr "" -#: dwarf.c:4900 +#: dwarf.c:4416 #, c-format msgid "UNKNOWN (%u): length %d\n" msgstr "" @@ -3493,7 +3493,7 @@ msgid "Probably corrupt segment size: %d - using 4 instead\n" msgstr "" -#: dwarf.c:7751 +#: dwarf.c:7642 #, c-format msgid "Corrupt augmentation data length: 0x%s\n" msgstr "" @@ -3809,36 +3809,36 @@ msgid "Section %s is too small to contain a CU/TU header\n" msgstr "" -#: dwarf.c:9224 +#: dwarf.c:9085 #, c-format msgid "Section %s is too small for %d slot\n" msgid_plural "Section %s is too small for %d slots\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:9235 +#: dwarf.c:9096 #, c-format msgid " Version: %d\n" msgstr "" -#: dwarf.c:9237 +#: dwarf.c:9098 #, c-format msgid " Number of columns: %d\n" msgstr "" -#: dwarf.c:9238 +#: dwarf.c:9099 #, c-format msgid " Number of used entries: %d\n" msgstr "" -#: dwarf.c:9239 +#: dwarf.c:9100 #, c-format msgid "" " Number of slots: %d\n" "\n" msgstr "" -#: dwarf.c:9244 +#: dwarf.c:9105 #, c-format msgid "Section %s too small for %d hash table entries\n" msgstr "" @@ -3857,7 +3857,7 @@ msgid "Section %s too small for shndx pool\n" msgstr "" -#: dwarf.c:9320 +#: dwarf.c:9181 #, c-format msgid "Overlarge number of columns: %x\n" msgstr "" @@ -3997,7 +3997,7 @@ "\n" msgstr "" -#: dwarf.c:10024 +#: dwarf.c:9869 #, c-format msgid "The %s section contains a link to a dwo file:\n" msgstr "" @@ -5055,7 +5055,7 @@ " Disable -D behavior (default)\n" msgstr "" -#: objcopy.c:559 +#: objcopy.c:551 #, c-format msgid "" " -j --only-section Only copy section into the output\n" @@ -5220,7 +5220,7 @@ "output\n" msgstr "" -#: objcopy.c:708 +#: objcopy.c:686 #, c-format msgid "" " -R --remove-section= Also remove section from the " @@ -5286,7 +5286,7 @@ msgid "cannot open '%s': %s" msgstr "'%s' を開けません: %s" -#: objcopy.c:1093 objcopy.c:4971 +#: objcopy.c:1093 objcopy.c:4973 #, c-format msgid "%s: fread failed" msgstr "%s: fread(3) が失敗しました" @@ -5361,390 +5361,390 @@ msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "`%s' [不明] から `%s' [不明] へコピーします\n" -#: objcopy.c:2178 +#: objcopy.c:2180 msgid "corrupt GNU build attribute note: wrong note type" msgstr "" -#: objcopy.c:2184 +#: objcopy.c:2186 msgid "corrupt GNU build attribute note: note too big" msgstr "" -#: objcopy.c:2190 +#: objcopy.c:2192 msgid "corrupt GNU build attribute note: name too small" msgstr "" -#: objcopy.c:2213 +#: objcopy.c:2215 msgid "corrupt GNU build attribute note: unsupported version" msgstr "" -#: objcopy.c:2262 +#: objcopy.c:2264 msgid "corrupt GNU build attribute note: bad description size" msgstr "" -#: objcopy.c:2293 +#: objcopy.c:2295 msgid "corrupt GNU build attribute note: name not NUL terminated" msgstr "" -#: objcopy.c:2305 +#: objcopy.c:2307 msgid "corrupt GNU build attribute notes: excess data at end" msgstr "" -#: objcopy.c:2312 +#: objcopy.c:2314 msgid "bad GNU build attribute notes: no known versions detected" msgstr "" -#: objcopy.c:2326 +#: objcopy.c:2328 msgid "bad GNU build attribute notes: multiple different versions" msgstr "" -#: objcopy.c:2180 +#: objcopy.c:2167 msgid "bad GNU build attribute notes: first note not version note" msgstr "" #. PR 17636: Call non-fatal so that we return to our parent who #. may need to tidy temporary files. -#: objcopy.c:2581 +#: objcopy.c:2583 msgid "Unable to change endianness of input file(s)" msgstr "入力ファイルのエンディアンを変更できません" -#: objcopy.c:2593 +#: objcopy.c:2595 #, c-format msgid "error: the input file '%s' has no sections" msgstr "" -#: objcopy.c:2603 +#: objcopy.c:2605 #, c-format msgid "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'" msgstr "" -#: objcopy.c:2610 +#: objcopy.c:2612 #, c-format msgid "--elf-stt-common=[yes|no] is unsupported on `%s'" msgstr "" -#: objcopy.c:2617 +#: objcopy.c:2619 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "`%s' [%s] から `%s' [%s] へコピーします\n" -#: objcopy.c:2665 +#: objcopy.c:2667 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "入力ファイル `%s' はバイナリアーキテクチャパラメータを無視します。" -#: objcopy.c:2681 +#: objcopy.c:2683 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "入力ファイル `%s' の形式を認識できません" -#: objcopy.c:2684 +#: objcopy.c:2686 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "出力ファイルはアーキテクチャ `%s' を表すことができません" -#: objcopy.c:2747 +#: objcopy.c:2749 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "警告: ファイル引数 (0x%s) > セクション引数 (0x%s)" -#: objcopy.c:2813 +#: objcopy.c:2815 #, c-format msgid "can't add section '%s'" msgstr "セクション '%s' を追加できません" -#: objcopy.c:2827 +#: objcopy.c:2829 #, c-format msgid "can't create section `%s'" msgstr "セクション `%s' を作成できません" -#: objcopy.c:2875 +#: objcopy.c:2877 #, c-format msgid "error: %s not found, can't be updated" msgstr "" -#: objcopy.c:2908 +#: objcopy.c:2910 msgid "warning: note section is empty" msgstr "" -#: objcopy.c:2917 +#: objcopy.c:2919 msgid "warning: could not load note section" msgstr "" -#: objcopy.c:2933 +#: objcopy.c:2935 msgid "warning: failed to set merged notes size" msgstr "" -#: objcopy.c:2956 +#: objcopy.c:2958 #, c-format msgid "can't dump section '%s' - it does not exist" msgstr "" -#: objcopy.c:2964 +#: objcopy.c:2966 msgid "can't dump section - it has no contents" msgstr "" -#: objcopy.c:2972 +#: objcopy.c:2974 msgid "can't dump section - it is empty" msgstr "" -#: objcopy.c:2981 +#: objcopy.c:2983 msgid "could not open section dump file" msgstr "" -#: objcopy.c:2990 +#: objcopy.c:2992 #, c-format msgid "error writing section contents to %s (error: %s)" msgstr "" -#: objcopy.c:3000 +#: objcopy.c:3002 msgid "could not retrieve section contents" msgstr "" -#: objcopy.c:3014 +#: objcopy.c:3016 #, c-format msgid "%s: debuglink section already exists" msgstr "" -#: objcopy.c:3026 +#: objcopy.c:3028 #, c-format msgid "cannot create debug link section `%s'" msgstr "デバッグリンクセクション `%s' を作成できません" -#: objcopy.c:3118 +#: objcopy.c:3120 msgid "Can't fill gap after section" msgstr "セクション後の隙間を埋められません" -#: objcopy.c:3141 +#: objcopy.c:3143 msgid "can't add padding" msgstr "隙間詰めを追加できません" -#: objcopy.c:3314 +#: objcopy.c:3316 msgid "error: failed to copy merged notes into output" msgstr "" -#: objcopy.c:3170 +#: objcopy.c:3095 msgid "could not find any mergeable note sections" msgstr "" -#: objcopy.c:3340 +#: objcopy.c:3342 #, c-format msgid "cannot fill debug link section `%s'" msgstr "デバッグリンクセクション `%s' を埋められません" -#: objcopy.c:3402 +#: objcopy.c:3404 msgid "error copying private BFD data" msgstr "プライベート BFD データをコピー中にエラーが発生しましたdata" -#: objcopy.c:3413 +#: objcopy.c:3415 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "このターゲットは %lu 代替マシンコードをサポートしません" -#: objcopy.c:3417 +#: objcopy.c:3419 msgid "treating that number as an absolute e_machine value instead" msgstr "その番号を代わりに絶対的な e_machine 値として扱います" -#: objcopy.c:3421 +#: objcopy.c:3423 msgid "ignoring the alternative value" msgstr "代替の値を無視しています" -#: objcopy.c:3474 objcopy.c:3529 +#: objcopy.c:3476 objcopy.c:3531 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "書庫コピーのための一時ディレクトリを作成できません (エラー: %s)" -#: objcopy.c:3562 +#: objcopy.c:3564 msgid "Unable to recognise the format of file" msgstr "ファイルの形式を認識できません" -#: objcopy.c:3695 +#: objcopy.c:3697 #, c-format msgid "error: the input file '%s' is empty" msgstr "エラー: 入力ファイル '%s' が空です" -#: objcopy.c:3871 +#: objcopy.c:3873 #, c-format msgid "Multiple renames of section %s" msgstr "セクション %s の名前変更が複数回行われています" -#: objcopy.c:3917 +#: objcopy.c:3919 msgid "error in private header data" msgstr "プライベートヘッダデータにエラーがあります" -#: objcopy.c:4001 +#: objcopy.c:4003 msgid "failed to create output section" msgstr "出力セクションの作成に失敗しました" -#: objcopy.c:4016 +#: objcopy.c:4018 msgid "failed to set size" msgstr "サイズの設定に失敗しました" -#: objcopy.c:4035 +#: objcopy.c:4037 msgid "failed to set vma" msgstr "vma の設定に失敗しました" -#: objcopy.c:4065 +#: objcopy.c:4067 msgid "failed to set alignment" msgstr "整列の設定に失敗しました" -#: objcopy.c:4097 +#: objcopy.c:4099 msgid "failed to copy private data" msgstr "プライベートデータのコピーに失敗しました" -#: objcopy.c:4254 +#: objcopy.c:4256 msgid "relocation count is negative" msgstr "再配置数が負の値です" #. User must pad the section up in order to do this. -#: objcopy.c:4351 +#: objcopy.c:4353 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" msgstr "バイト順を逆にできません: セクション %s の長さは %d で割り切れなければいけません" -#: objcopy.c:4560 +#: objcopy.c:4562 msgid "can't create debugging section" msgstr "デバッグセクションを作成できません" -#: objcopy.c:4574 +#: objcopy.c:4576 msgid "can't set debugging section contents" msgstr "デバッグセクションの内容を設定できません" -#: objcopy.c:4583 +#: objcopy.c:4585 #, c-format msgid "don't know how to write debugging information for %s" msgstr "%s に対してデバッグ情報を書き込む方法が分かりません" -#: objcopy.c:4768 +#: objcopy.c:4770 msgid "could not create temporary file to hold stripped copy" msgstr "取り除かれたコピーを保持する一時ファイルの作成に失敗しました" -#: objcopy.c:4840 +#: objcopy.c:4842 #, c-format msgid "%s: bad version in PE subsystem" msgstr "%s: PE 子システム内に誤ったバージョンがあります" -#: objcopy.c:4870 +#: objcopy.c:4872 #, c-format msgid "unknown PE subsystem: %s" msgstr "不明な PE 子システム: %s" -#: objcopy.c:4924 objcopy.c:5194 objcopy.c:5274 objcopy.c:5415 objcopy.c:5447 -#: objcopy.c:5510 objcopy.c:5514 objcopy.c:5534 +#: objcopy.c:4926 objcopy.c:5196 objcopy.c:5276 objcopy.c:5417 objcopy.c:5449 +#: objcopy.c:5512 objcopy.c:5516 objcopy.c:5536 #, c-format msgid "bad format for %s" msgstr "%s 用としては不正な形式です" -#: objcopy.c:4953 +#: objcopy.c:4955 #, c-format msgid "cannot open: %s: %s" msgstr "開くことができません: %s: %s" -#: objcopy.c:5006 +#: objcopy.c:5008 msgid "byte number must be non-negative" msgstr "バイト数は非負でなければなりません" -#: objcopy.c:5012 +#: objcopy.c:5014 #, c-format msgid "architecture %s unknown" msgstr "アーキテクチャ %s は不明です" -#: objcopy.c:5020 +#: objcopy.c:5022 msgid "interleave must be positive" msgstr "interleave は正の数値でなければいけません" -#: objcopy.c:5029 +#: objcopy.c:5031 msgid "interleave width must be positive" msgstr "interleave 幅は正の数値でなければいけません" -#: objcopy.c:5347 +#: objcopy.c:5349 #, c-format msgid "unrecognized --compress-debug-sections type `%s'" msgstr "" -#: objcopy.c:5368 +#: objcopy.c:5370 #, c-format msgid "unrecognized --elf-stt-common= option `%s'" msgstr "" -#: objcopy.c:5384 +#: objcopy.c:5386 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "警告: 0x%s から 0x%x までの隙間の埋め込みを切り詰めます" -#: objcopy.c:5589 +#: objcopy.c:5591 #, c-format msgid "unknown long section names option '%s'" msgstr "長いセクション名の扱いに対する不明なオプション '%s' です" -#: objcopy.c:5612 +#: objcopy.c:5614 msgid "unable to parse alternative machine code" msgstr "代替マシンコードを解析できません" -#: objcopy.c:5661 +#: objcopy.c:5663 msgid "number of bytes to reverse must be positive and even" msgstr "逆にするバイト数は正の偶数でなければいけません" -#: objcopy.c:5664 +#: objcopy.c:5666 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "警告: 前にある --reverse-bytes の値 %d は無視しています" -#: objcopy.c:5679 +#: objcopy.c:5681 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "%s: --heap に対する無効な予約値です" -#: objcopy.c:5685 +#: objcopy.c:5687 #, c-format msgid "%s: invalid commit value for --heap" msgstr "%s: --heap に対する無効な確定値です" -#: objcopy.c:5710 +#: objcopy.c:5712 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "%s: --stack に対する無効な予約値です" -#: objcopy.c:5716 +#: objcopy.c:5718 #, c-format msgid "%s: invalid commit value for --stack" msgstr "%s: --stack に対する無効な確定値です" -#: objcopy.c:5754 +#: objcopy.c:5756 msgid "interleave start byte must be set with --byte" msgstr "interleave の開始バイトを --byte で設定しなければいけません" -#: objcopy.c:5757 +#: objcopy.c:5759 msgid "byte number must be less than interleave" msgstr "バイト数は interleave 未満でなければなりません" -#: objcopy.c:5760 +#: objcopy.c:5762 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "" -#: objcopy.c:5789 +#: objcopy.c:5791 #, c-format msgid "unknown input EFI target: %s" msgstr "不明な入力 EFI ターゲットです: %s" -#: objcopy.c:5820 +#: objcopy.c:5822 #, c-format msgid "unknown output EFI target: %s" msgstr "不明な出力 EFI ターゲットです: %s" -#: objcopy.c:5833 +#: objcopy.c:5835 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "警告: '%s' を配置できません。システムエラーメッセージ: %s" -#: objcopy.c:5845 +#: objcopy.c:5847 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" msgstr "警告: '%s' をコピー中に一時ファイルを作成できませんでした (エラー: %s)" -#: objcopy.c:5878 objcopy.c:5892 +#: objcopy.c:5880 objcopy.c:5894 #, c-format msgid "%s %s%c0x%s never used" msgstr "%s %s%c0x%s は使われることがありません" @@ -5855,7 +5855,7 @@ " --prefix-strip=LEVEL Strip initial directory names for -S\n" msgstr "" -#: objdump.c:271 +#: objdump.c:264 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -7243,12 +7243,12 @@ msgid " Data: %s\n" msgstr " データ: %s\n" -#: readelf.c:4761 +#: readelf.c:4697 #, c-format msgid " Version: %d %s\n" msgstr " バージョン: %d %s\n" -#: readelf.c:4766 +#: readelf.c:4702 #, c-format msgid "" msgstr "<不明: %lx>" @@ -7311,32 +7311,32 @@ msgid " Flags: 0x%lx%s\n" msgstr " フラグ: 0x%lx%s\n" -#: readelf.c:4790 +#: readelf.c:4726 #, c-format msgid " Size of this header: %ld (bytes)\n" msgstr " このヘッダのサイズ: %ld (バイト)\n" -#: readelf.c:4792 +#: readelf.c:4728 #, c-format msgid " Size of program headers: %ld (bytes)\n" msgstr " プログラムヘッダサイズ: %ld (バイト)\n" -#: readelf.c:4794 +#: readelf.c:4730 #, c-format msgid " Number of program headers: %ld" msgstr " プログラムヘッダ数: %ld" -#: readelf.c:4801 +#: readelf.c:4737 #, c-format msgid " Size of section headers: %ld (bytes)\n" msgstr " セクションヘッダ: %ld (バイト)\n" -#: readelf.c:4803 +#: readelf.c:4739 #, c-format msgid " Number of section headers: %ld" msgstr " セクションヘッダサイズ: %ld" -#: readelf.c:4808 +#: readelf.c:4744 #, c-format msgid " Section header string table index: %ld" msgstr " セクションヘッダ文字列表索引: %ld" @@ -7573,7 +7573,7 @@ msgid "symbols" msgstr "シンボル" -#: readelf.c:5488 readelf.c:5601 +#: readelf.c:5424 readelf.c:5537 msgid "symbol table section indicies" msgstr "" @@ -7885,7 +7885,7 @@ msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n" msgstr "グループセクション [%2$5u] のセクション [%1$5u] > 最大セクション [%3$5u] です\n" -#: readelf.c:6846 +#: readelf.c:6782 msgid "" "Further error messages about overlarge group section indicies suppressed\n" msgstr "" @@ -8075,7 +8075,7 @@ msgid " at offset 0x%lx contains %lu entries:\n" msgstr " (オフセット 0x%lx) は %lu 個のエントリから構成されています:\n" -#: readelf.c:8030 +#: readelf.c:7966 #, c-format msgid "Skipping unexpected relocation type %s\n" msgstr "所期しない再配置型 %s をスキップしています\n" @@ -8453,7 +8453,7 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:10449 +#: readelf.c:10277 #, c-format msgid " Addr: 0x" msgstr " アドレス: 0x" @@ -8605,7 +8605,7 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:10741 +#: readelf.c:10569 #, c-format msgid " Addr: " msgstr " アドレス: " @@ -8772,7 +8772,7 @@ msgid "histogram chain is corrupt\n" msgstr "" -#: readelf.c:11743 +#: readelf.c:11552 #, c-format msgid "" "\n" @@ -8849,7 +8849,7 @@ msgid "Out of memory allocating space for histogram counts\n" msgstr "" -#: readelf.c:11980 +#: readelf.c:11789 #, c-format msgid "" "\n" @@ -9002,7 +9002,7 @@ msgid "section '%s' has unsupported compress type: %d\n" msgstr "" -#: readelf.c:13341 readelf.c:13488 readelf.c:13663 +#: readelf.c:13183 readelf.c:13330 readelf.c:13505 #, c-format msgid "compressed section '%s' is corrupted\n" msgstr "" @@ -9845,7 +9845,7 @@ msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)" msgstr "" -#: readelf.c:16683 +#: readelf.c:16521 msgid "NT_PPC_TM_VSX (ppc checkpointed VSX registers)" msgstr "" @@ -10364,12 +10364,12 @@ msgid " Module version : %s\n" msgstr " モジュールバージョン : %s\n" -#: readelf.c:17946 +#: readelf.c:17363 #, c-format msgid " Invalid size\n" msgstr " 無効なサイズです\n" -#: readelf.c:17949 +#: readelf.c:17366 #, c-format msgid " Language: %s\n" msgstr " 言語: %s\n" @@ -10411,27 +10411,27 @@ msgid " Header flags: 0x%08x\n" msgstr " ヘッダフラグ: 0x%08x\n" -#: readelf.c:17981 +#: readelf.c:17398 #, c-format msgid " Image id : %s\n" msgstr " イメージID : %s\n" -#: readelf.c:17985 +#: readelf.c:17402 #, c-format msgid " Image name: %s\n" msgstr " イメージ名: %s\n" -#: readelf.c:17988 +#: readelf.c:17405 #, c-format msgid " Global symbol table name: %s\n" msgstr " 大域シンボル表名: %s\n" -#: readelf.c:17991 +#: readelf.c:17408 #, c-format msgid " Image id: %s\n" msgstr " イメージID: %s\n" -#: readelf.c:17994 +#: readelf.c:17411 #, c-format msgid " Linker id: %s\n" msgstr " リンカID : %s\n" @@ -10579,7 +10579,7 @@ msgid "Corrupt note: alignment %ld, expecting 4 or 8\n" msgstr "" -#: readelf.c:18656 +#: readelf.c:18040 #, c-format msgid " %-20s %10s\tDescription\n" msgstr " %-20s %10s\t説明\n" @@ -11349,7 +11349,7 @@ msgid "const/volatile indicator missing" msgstr "const/volatile 指示子を欠いています" -#: stabs.c:3043 +#: stabs.c:2938 #, c-format msgid "No mangling for \"%s\"\n" msgstr "\"%s\" の名前の変形(mangling) がありません\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cinder.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cinder.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cinder.po 2020-01-23 16:51:34.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cinder.po 2020-07-08 13:53:30.000000000 +0000 @@ -20,8 +20,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 12:10+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:49+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" "Generated-By: Babel 2.0\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cpio.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cpio.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cpio.po 2020-01-23 16:51:29.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cpio.po 2020-07-08 13:53:25.000000000 +0000 @@ -19,8 +19,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: gnu/argmatch.c:134 #, c-format diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cpplib.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cpplib.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cpplib.po 2020-01-23 16:51:36.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cpplib.po 2020-07-08 13:53:33.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: 2020-01-23 12:16+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:53+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cryptsetup.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cryptsetup.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cryptsetup.po 2020-01-23 16:51:32.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cryptsetup.po 2020-07-08 13:53:28.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: 2020-01-23 11:14+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: lib/libdevmapper.c:331 msgid "Cannot initialize device-mapper, running as non-root user.\n" @@ -55,14 +55,14 @@ msgid "Requested sector_size option is not supported.\n" msgstr "" -#: lib/random.c:80 +#: lib/random.c:75 msgid "" "System is out of entropy while generating volume key.\n" "Please move mouse or type some text in another window to gather some random " "events.\n" msgstr "" -#: lib/random.c:84 +#: lib/random.c:79 #, c-format msgid "Generating key (%d%% done).\n" msgstr "" @@ -158,7 +158,7 @@ msgid "UUID is not supported for this crypt type.\n" msgstr "" -#: src/cryptsetup.c:3787 +#: src/cryptsetup.c:3866 msgid "Unsupported encryption sector size.\n" msgstr "" @@ -259,7 +259,7 @@ msgid "Device %s size is not aligned to requested sector size (%u bytes).\n" msgstr "" -#: lib/setup.c:2817 +#: lib/setup.c:2882 msgid "Do you really want to change UUID of device?" msgstr "" @@ -410,7 +410,7 @@ msgid "Kernel keyring is not supported by the kernel.\n" msgstr "" -#: lib/setup.c:5767 lib/luks2/luks2_reencrypt.c:2933 +#: lib/setup.c:5992 lib/luks2/luks2_reencrypt.c:2952 #, c-format msgid "Failed to read passphrase from keyring (error %d)." msgstr "" @@ -557,7 +557,7 @@ "missing).\n" msgstr "" -#: lib/utils_device_locking.c:110 +#: lib/utils_device_locking.c:109 #, c-format msgid "WARNING: Locking directory %s/%s is missing!\n" msgstr "" @@ -660,24 +660,24 @@ "Data offset or key size differs on device and backup, restore failed.\n" msgstr "" -#: lib/luks1/keymanage.c:326 +#: lib/luks1/keymanage.c:325 #, c-format msgid "Device %s %s%s" msgstr "デバイス %s %s%s" -#: lib/luks1/keymanage.c:327 +#: lib/luks1/keymanage.c:326 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks1/keymanage.c:328 +#: lib/luks1/keymanage.c:327 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks1/keymanage.c:329 lib/luks2/luks2_json_metadata.c:1225 +#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1224 msgid "" "\n" "WARNING: real device header has different UUID than backup!" @@ -866,7 +866,7 @@ msgid "Kernel doesn't support TCRYPT compatible mapping.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:1084 +#: lib/tcrypt/tcrypt.c:1093 msgid "This function is not supported without TCRYPT header load." msgstr "" @@ -1023,31 +1023,31 @@ "failed.\n" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1222 +#: lib/luks2/luks2_json_metadata.c:1221 #, c-format msgid "Device %s %s%s%s%s" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1223 +#: lib/luks2/luks2_json_metadata.c:1222 msgid "" "does not contain LUKS2 header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1224 +#: lib/luks2/luks2_json_metadata.c:1223 msgid "" "already contains LUKS2 header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1226 +#: lib/luks2/luks2_json_metadata.c:1225 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:1228 +#: lib/luks2/luks2_json_metadata.c:1227 msgid "" "\n" "WARNING: Unfinished offline reencryption detected on the device!\n" @@ -1121,13 +1121,13 @@ msgid "No known cipher specification pattern detected.\n" msgstr "" -#: src/cryptsetup.c:253 +#: src/cryptsetup.c:259 msgid "" "WARNING: The --hash parameter is being ignored in plain mode with keyfile " "specified.\n" msgstr "" -#: src/cryptsetup.c:261 +#: src/cryptsetup.c:267 msgid "" "WARNING: The --keyfile-size option is being ignored, the read size is the " "same as the encryption key size.\n" @@ -1137,7 +1137,7 @@ msgid "Option --key-file is required.\n" msgstr "" -#: src/cryptsetup.c:428 +#: src/cryptsetup.c:434 msgid "Enter VeraCrypt PIM: " msgstr "" @@ -1157,14 +1157,14 @@ msgid "No device header detected with this passphrase.\n" msgstr "" -#: src/cryptsetup.c:528 src/cryptsetup.c:1940 +#: src/cryptsetup.c:576 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:607 +#: src/cryptsetup.c:673 #, c-format msgid "Device %s is still active and scheduled for deferred removal.\n" msgstr "" @@ -1179,7 +1179,7 @@ msgid "Result of benchmark is not reliable.\n" msgstr "" -#: src/cryptsetup.c:885 +#: src/cryptsetup.c:951 msgid "# Tests are approximate using memory only (no storage IO).\n" msgstr "" @@ -1192,7 +1192,7 @@ msgid "Cipher %s is not available.\n" msgstr "" -#: src/cryptsetup.c:952 +#: src/cryptsetup.c:1003 msgid "N/A" msgstr "" @@ -1206,17 +1206,17 @@ msgid "Cannot read %d bytes from keyfile %s.\n" msgstr "" -#: src/cryptsetup.c:1089 +#: src/cryptsetup.c:1141 msgid "Really try to repair LUKS device header?" msgstr "" -#: src/cryptsetup.c:307 src/cryptsetup.c:1038 src/cryptsetup.c:1090 -#: src/cryptsetup.c:1189 src/cryptsetup.c:1262 src/cryptsetup.c:1913 -#: src/cryptsetup.c:2545 src/cryptsetup.c:2668 src/integritysetup.c:232 +#: src/cryptsetup.c:313 src/cryptsetup.c:1090 src/cryptsetup.c:1142 +#: src/cryptsetup.c:1246 src/cryptsetup.c:1319 src/cryptsetup.c:1974 +#: src/cryptsetup.c:2682 src/cryptsetup.c:2805 src/integritysetup.c:233 msgid "Operation aborted.\n" msgstr "" -#: src/cryptsetup.c:1108 src/integritysetup.c:145 +#: src/cryptsetup.c:1160 src/integritysetup.c:146 msgid "" "Wiping device to initialize integrity checksum.\n" "You can interrupt this by pressing CTRL+c (rest of not wiped device will " @@ -1233,7 +1233,7 @@ msgid "Cannot create header file %s.\n" msgstr "" -#: src/cryptsetup.c:1256 src/integritysetup.c:226 +#: src/cryptsetup.c:1313 src/integritysetup.c:227 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "" @@ -1279,20 +1279,20 @@ msgid "Keyslot %d is not active.\n" msgstr "" -#: src/cryptsetup.c:1520 src/cryptsetup.c:1581 +#: src/cryptsetup.c:1581 src/cryptsetup.c:1642 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "" -#: src/cryptsetup.c:1521 +#: src/cryptsetup.c:1582 msgid "Enter any remaining passphrase: " msgstr "" -#: src/cryptsetup.c:1522 src/cryptsetup.c:1583 +#: src/cryptsetup.c:1583 src/cryptsetup.c:1644 msgid "Operation aborted, the keyslot was NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:1560 +#: src/cryptsetup.c:1621 msgid "Enter passphrase to be deleted: " msgstr "" @@ -1301,20 +1301,20 @@ msgid "Key slot %d selected for deletion.\n" msgstr "" -#: src/cryptsetup.c:1641 src/cryptsetup.c:1715 src/cryptsetup.c:1749 +#: src/cryptsetup.c:1702 src/cryptsetup.c:1776 src/cryptsetup.c:1810 msgid "Enter new passphrase for key slot: " msgstr "" -#: src/cryptsetup.c:1732 src/cryptsetup_reencrypt.c:1327 +#: src/cryptsetup.c:1793 src/cryptsetup_reencrypt.c:1343 #, c-format msgid "Enter any existing passphrase: " msgstr "" -#: src/cryptsetup.c:1800 +#: src/cryptsetup.c:1861 msgid "Enter passphrase to be changed: " msgstr "" -#: src/cryptsetup.c:1816 src/cryptsetup_reencrypt.c:1313 +#: src/cryptsetup.c:1877 src/cryptsetup_reencrypt.c:1329 msgid "Enter new passphrase: " msgstr "" @@ -1335,14 +1335,14 @@ msgid "Command requires device and mapped name as arguments.\n" msgstr "" -#: src/cryptsetup.c:2199 +#: src/cryptsetup.c:2336 #, c-format msgid "" "This operation will erase all keyslots on device %s.\n" "Device will become unusable after this operation." msgstr "" -#: src/cryptsetup.c:2206 +#: src/cryptsetup.c:2343 msgid "Operation aborted, keyslots were NOT wiped.\n" msgstr "" @@ -1355,12 +1355,12 @@ msgid "Device is already %s type.\n" msgstr "" -#: src/cryptsetup.c:2266 +#: src/cryptsetup.c:2403 #, c-format msgid "This operation will convert %s to %s format.\n" msgstr "" -#: src/cryptsetup.c:2272 +#: src/cryptsetup.c:2409 msgid "Operation aborted, device was NOT converted.\n" msgstr "" @@ -1406,7 +1406,7 @@ msgid "Failed to remove token %d.\n" msgstr "" -#: src/cryptsetup.c:3209 +#: src/cryptsetup.c:3346 msgid " [--type ] []" msgstr "" @@ -1414,101 +1414,101 @@ msgid "open device as mapping " msgstr "" -#: src/cryptsetup.c:3210 src/cryptsetup.c:3211 src/cryptsetup.c:3212 -#: src/veritysetup.c:359 src/veritysetup.c:360 src/integritysetup.c:471 -#: src/integritysetup.c:472 +#: src/cryptsetup.c:3347 src/cryptsetup.c:3348 src/cryptsetup.c:3349 +#: src/veritysetup.c:395 src/veritysetup.c:396 src/integritysetup.c:481 +#: src/integritysetup.c:482 msgid "" msgstr "" -#: src/cryptsetup.c:3210 src/veritysetup.c:359 src/integritysetup.c:471 +#: src/cryptsetup.c:3347 src/veritysetup.c:395 src/integritysetup.c:481 msgid "close device (remove mapping)" msgstr "" -#: src/cryptsetup.c:3211 +#: src/cryptsetup.c:3348 msgid "resize active device" msgstr "" -#: src/cryptsetup.c:3212 +#: src/cryptsetup.c:3349 msgid "show device status" msgstr "" -#: src/cryptsetup.c:3213 +#: src/cryptsetup.c:3350 msgid "[--cipher ]" msgstr "" -#: src/cryptsetup.c:3213 +#: src/cryptsetup.c:3350 msgid "benchmark cipher" msgstr "" -#: src/cryptsetup.c:3214 src/cryptsetup.c:3215 src/cryptsetup.c:3216 -#: src/cryptsetup.c:3217 src/cryptsetup.c:3218 src/cryptsetup.c:3225 -#: src/cryptsetup.c:3226 src/cryptsetup.c:3227 src/cryptsetup.c:3228 -#: src/cryptsetup.c:3229 src/cryptsetup.c:3230 src/cryptsetup.c:3231 -#: src/cryptsetup.c:3232 +#: src/cryptsetup.c:3351 src/cryptsetup.c:3352 src/cryptsetup.c:3353 +#: src/cryptsetup.c:3354 src/cryptsetup.c:3355 src/cryptsetup.c:3362 +#: src/cryptsetup.c:3363 src/cryptsetup.c:3364 src/cryptsetup.c:3365 +#: src/cryptsetup.c:3366 src/cryptsetup.c:3367 src/cryptsetup.c:3368 +#: src/cryptsetup.c:3369 src/cryptsetup.c:3370 msgid "" msgstr "" -#: src/cryptsetup.c:3214 +#: src/cryptsetup.c:3351 msgid "try to repair on-disk metadata" msgstr "" -#: src/cryptsetup.c:3216 +#: src/cryptsetup.c:3353 msgid "erase all keyslots (remove encryption key)" msgstr "" -#: src/cryptsetup.c:3217 +#: src/cryptsetup.c:3354 msgid "convert LUKS from/to LUKS2 format" msgstr "" -#: src/cryptsetup.c:3218 +#: src/cryptsetup.c:3355 msgid "set permanent configuration options for LUKS2" msgstr "" -#: src/cryptsetup.c:3219 src/cryptsetup.c:3220 +#: src/cryptsetup.c:3356 src/cryptsetup.c:3357 msgid " []" msgstr "" -#: src/cryptsetup.c:3219 +#: src/cryptsetup.c:3356 msgid "formats a LUKS device" msgstr "" -#: src/cryptsetup.c:3220 +#: src/cryptsetup.c:3357 msgid "add key to LUKS device" msgstr "" -#: src/cryptsetup.c:3221 src/cryptsetup.c:3222 src/cryptsetup.c:3223 +#: src/cryptsetup.c:3358 src/cryptsetup.c:3359 src/cryptsetup.c:3360 msgid " []" msgstr "" -#: src/cryptsetup.c:3221 +#: src/cryptsetup.c:3358 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:3222 +#: src/cryptsetup.c:3359 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:3224 +#: src/cryptsetup.c:3361 msgid " " msgstr "" -#: src/cryptsetup.c:3224 +#: src/cryptsetup.c:3361 msgid "wipes key with number from LUKS device" msgstr "" -#: src/cryptsetup.c:3225 +#: src/cryptsetup.c:3362 msgid "print UUID of LUKS device" msgstr "" -#: src/cryptsetup.c:3226 +#: src/cryptsetup.c:3363 msgid "tests for LUKS partition header" msgstr "" -#: src/cryptsetup.c:3227 +#: src/cryptsetup.c:3364 msgid "dump LUKS partition information" msgstr "" -#: src/cryptsetup.c:3228 +#: src/cryptsetup.c:3365 msgid "dump TCRYPT device information" msgstr "" @@ -1520,11 +1520,11 @@ msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:3231 +#: src/cryptsetup.c:3369 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:3232 +#: src/cryptsetup.c:3370 msgid "Restore LUKS device header and keyslots" msgstr "" @@ -1536,7 +1536,7 @@ msgid "Add or remove keyring token" msgstr "" -#: src/cryptsetup.c:3251 src/veritysetup.c:376 src/integritysetup.c:488 +#: src/cryptsetup.c:3389 src/veritysetup.c:412 src/integritysetup.c:498 msgid "" "\n" " is one of:\n" @@ -1550,7 +1550,7 @@ "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n" msgstr "" -#: src/cryptsetup.c:3261 +#: src/cryptsetup.c:3399 #, c-format msgid "" "\n" @@ -1582,50 +1582,50 @@ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:3309 src/veritysetup.c:532 src/integritysetup.c:630 +#: src/cryptsetup.c:3447 src/veritysetup.c:569 src/integritysetup.c:642 #, c-format msgid "%s: requires %s as arguments" msgstr "" -#: src/cryptsetup.c:3347 src/veritysetup.c:421 src/integritysetup.c:527 -#: src/cryptsetup_reencrypt.c:1591 +#: src/cryptsetup.c:3480 src/veritysetup.c:457 src/integritysetup.c:536 +#: src/cryptsetup_reencrypt.c:1607 msgid "Show this help message" msgstr "" -#: src/cryptsetup.c:3348 src/veritysetup.c:422 src/integritysetup.c:528 -#: src/cryptsetup_reencrypt.c:1592 +#: src/cryptsetup.c:3481 src/veritysetup.c:458 src/integritysetup.c:537 +#: src/cryptsetup_reencrypt.c:1608 msgid "Display brief usage" msgstr "" -#: src/cryptsetup.c:3353 src/veritysetup.c:427 src/integritysetup.c:533 -#: src/cryptsetup_reencrypt.c:1597 +#: src/cryptsetup.c:3486 src/veritysetup.c:463 src/integritysetup.c:542 +#: src/cryptsetup_reencrypt.c:1613 msgid "Help options:" msgstr "" -#: src/cryptsetup.c:3349 src/veritysetup.c:423 src/integritysetup.c:529 -#: src/cryptsetup_reencrypt.c:1593 +#: src/cryptsetup.c:3482 src/veritysetup.c:459 src/integritysetup.c:538 +#: src/cryptsetup_reencrypt.c:1609 msgid "Print package version" msgstr "" -#: src/cryptsetup.c:3354 src/veritysetup.c:428 src/integritysetup.c:534 -#: src/cryptsetup_reencrypt.c:1598 +#: src/cryptsetup.c:3487 src/veritysetup.c:464 src/integritysetup.c:543 +#: src/cryptsetup_reencrypt.c:1614 msgid "Shows more detailed error messages" msgstr "" -#: src/cryptsetup.c:3355 src/veritysetup.c:429 src/integritysetup.c:535 -#: src/cryptsetup_reencrypt.c:1599 +#: src/cryptsetup.c:3488 src/veritysetup.c:465 src/integritysetup.c:544 +#: src/cryptsetup_reencrypt.c:1615 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:3357 src/cryptsetup_reencrypt.c:1601 +#: src/cryptsetup.c:3490 src/cryptsetup_reencrypt.c:1617 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "" -#: src/cryptsetup.c:3358 src/cryptsetup_reencrypt.c:1603 +#: src/cryptsetup.c:3491 src/cryptsetup_reencrypt.c:1619 msgid "The hash used to create the encryption key from the passphrase" msgstr "" -#: src/cryptsetup.c:3359 +#: src/cryptsetup.c:3492 msgid "Verifies the passphrase by asking for it twice" msgstr "" @@ -1633,7 +1633,7 @@ msgid "Read the key from a file." msgstr "" -#: src/cryptsetup.c:3361 +#: src/cryptsetup.c:3494 msgid "Read the volume (master) key from file." msgstr "" @@ -1641,92 +1641,92 @@ msgid "Dump volume (master) key instead of keyslots info." msgstr "" -#: src/cryptsetup.c:3363 src/cryptsetup_reencrypt.c:1602 +#: src/cryptsetup.c:3496 src/cryptsetup_reencrypt.c:1618 msgid "The size of the encryption key" msgstr "" -#: src/cryptsetup.c:3363 src/cryptsetup.c:3422 src/integritysetup.c:553 -#: src/integritysetup.c:557 src/integritysetup.c:561 -#: src/cryptsetup_reencrypt.c:1602 +#: src/cryptsetup.c:3496 src/cryptsetup.c:3557 src/integritysetup.c:562 +#: src/integritysetup.c:566 src/integritysetup.c:570 +#: src/cryptsetup_reencrypt.c:1618 msgid "BITS" msgstr "" -#: src/cryptsetup.c:3364 src/cryptsetup_reencrypt.c:1618 +#: src/cryptsetup.c:3497 src/cryptsetup_reencrypt.c:1634 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:3364 src/cryptsetup.c:3365 src/cryptsetup.c:3366 -#: src/cryptsetup.c:3367 src/cryptsetup.c:3370 src/cryptsetup.c:3419 -#: src/cryptsetup.c:3420 src/cryptsetup.c:3428 src/cryptsetup.c:3429 -#: src/veritysetup.c:432 src/veritysetup.c:433 src/veritysetup.c:434 -#: src/veritysetup.c:437 src/veritysetup.c:438 src/integritysetup.c:542 -#: src/integritysetup.c:548 src/integritysetup.c:549 -#: src/cryptsetup_reencrypt.c:1617 src/cryptsetup_reencrypt.c:1618 -#: src/cryptsetup_reencrypt.c:1619 src/cryptsetup_reencrypt.c:1620 +#: src/cryptsetup.c:3497 src/cryptsetup.c:3498 src/cryptsetup.c:3499 +#: src/cryptsetup.c:3500 src/cryptsetup.c:3503 src/cryptsetup.c:3554 +#: src/cryptsetup.c:3555 src/cryptsetup.c:3563 src/cryptsetup.c:3564 +#: src/veritysetup.c:468 src/veritysetup.c:469 src/veritysetup.c:470 +#: src/veritysetup.c:473 src/veritysetup.c:474 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 msgid "bytes" msgstr "" -#: src/cryptsetup.c:3365 src/cryptsetup_reencrypt.c:1617 +#: src/cryptsetup.c:3498 src/cryptsetup_reencrypt.c:1633 msgid "Number of bytes to skip in keyfile" msgstr "" -#: src/cryptsetup.c:3366 +#: src/cryptsetup.c:3499 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:3367 +#: src/cryptsetup.c:3500 msgid "Number of bytes to skip in newly added keyfile" msgstr "" -#: src/cryptsetup.c:3368 +#: src/cryptsetup.c:3501 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:3369 +#: src/cryptsetup.c:3502 msgid "The size of the device" msgstr "" -#: src/cryptsetup.c:3369 src/cryptsetup.c:3371 src/cryptsetup.c:3372 -#: src/cryptsetup.c:3378 src/integritysetup.c:543 src/integritysetup.c:550 +#: src/cryptsetup.c:3502 src/cryptsetup.c:3504 src/cryptsetup.c:3505 +#: src/cryptsetup.c:3511 src/integritysetup.c:552 src/integritysetup.c:559 msgid "SECTORS" msgstr "" -#: src/cryptsetup.c:3371 +#: src/cryptsetup.c:3504 msgid "The start offset in the backend device" msgstr "" -#: src/cryptsetup.c:3372 +#: src/cryptsetup.c:3505 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "" -#: src/cryptsetup.c:3373 +#: src/cryptsetup.c:3506 msgid "Create a readonly mapping" msgstr "" -#: src/cryptsetup.c:3374 src/integritysetup.c:536 -#: src/cryptsetup_reencrypt.c:1608 +#: src/cryptsetup.c:3507 src/integritysetup.c:545 +#: src/cryptsetup_reencrypt.c:1624 msgid "Do not ask for confirmation" msgstr "" -#: src/cryptsetup.c:3375 +#: src/cryptsetup.c:3508 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "" -#: src/cryptsetup.c:3375 src/cryptsetup.c:3376 src/integritysetup.c:537 -#: src/cryptsetup_reencrypt.c:1609 +#: src/cryptsetup.c:3508 src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup_reencrypt.c:1625 msgid "secs" msgstr "" -#: src/cryptsetup.c:3376 src/integritysetup.c:537 -#: src/cryptsetup_reencrypt.c:1609 +#: src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup_reencrypt.c:1625 msgid "Progress line update (in seconds)" msgstr "" -#: src/cryptsetup.c:3377 src/cryptsetup_reencrypt.c:1610 +#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1626 msgid "How often the input of the passphrase can be retried" msgstr "" -#: src/cryptsetup.c:3378 +#: src/cryptsetup.c:3511 msgid "Align payload at sector boundaries - for luksFormat" msgstr "" @@ -1806,11 +1806,11 @@ msgid "Device removal is deferred until the last user closes it." msgstr "" -#: src/cryptsetup.c:3399 +#: src/cryptsetup.c:3532 msgid "PBKDF iteration time for LUKS (in ms)" msgstr "" -#: src/cryptsetup.c:3399 src/cryptsetup_reencrypt.c:1607 +#: src/cryptsetup.c:3532 src/cryptsetup_reencrypt.c:1623 msgid "msecs" msgstr "" @@ -1818,11 +1818,11 @@ msgid "PBKDF algorithm (for LUKS2) (argon2i/argon2id/pbkdf2)." msgstr "" -#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 msgid "PBKDF memory cost limit" msgstr "" -#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 msgid "kilobytes" msgstr "" @@ -1830,11 +1830,11 @@ msgid "PBKDF parallel cost " msgstr "" -#: src/cryptsetup.c:3402 src/cryptsetup_reencrypt.c:1627 +#: src/cryptsetup.c:3535 src/cryptsetup_reencrypt.c:1643 msgid "threads" msgstr "" -#: src/cryptsetup.c:3403 src/cryptsetup_reencrypt.c:1628 +#: src/cryptsetup.c:3536 src/cryptsetup_reencrypt.c:1644 msgid "PBKDF iterations cost (forced, disables benchmark)" msgstr "" @@ -1842,15 +1842,15 @@ msgid "Keyslot priority (ignore/normal/prefer)" msgstr "" -#: src/cryptsetup.c:3405 +#: src/cryptsetup.c:3538 msgid "Disable locking of on-disk metadata" msgstr "" -#: src/cryptsetup.c:3406 +#: src/cryptsetup.c:3539 msgid "Disable loading volume keys via kernel keyring" msgstr "" -#: src/cryptsetup.c:3407 +#: src/cryptsetup.c:3540 msgid "Data integrity algorithm (LUKS2 only)" msgstr "" @@ -1858,23 +1858,23 @@ msgid "Disable journal for integrity device." msgstr "" -#: src/cryptsetup.c:3409 src/integritysetup.c:538 +#: src/cryptsetup.c:3542 src/integritysetup.c:547 msgid "Do not wipe device after format" msgstr "" -#: src/cryptsetup.c:3410 +#: src/cryptsetup.c:3544 msgid "Do not ask for passphrase if activation by token fails" msgstr "" -#: src/cryptsetup.c:3411 +#: src/cryptsetup.c:3545 msgid "Token number (default: any)" msgstr "" -#: src/cryptsetup.c:3412 +#: src/cryptsetup.c:3546 msgid "Key description" msgstr "" -#: src/cryptsetup.c:3413 +#: src/cryptsetup.c:3547 msgid "Encryption sector size (default: 512 bytes)" msgstr "" @@ -1890,35 +1890,35 @@ msgid "Set subsystem label for the LUKS2 device." msgstr "" -#: src/cryptsetup.c:3448 src/veritysetup.c:462 src/integritysetup.c:583 +#: src/cryptsetup.c:3583 src/veritysetup.c:499 src/integritysetup.c:595 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup.c:3499 src/veritysetup.c:496 src/integritysetup.c:594 +#: src/cryptsetup.c:3634 src/veritysetup.c:533 src/integritysetup.c:606 msgid "Argument missing." msgstr "" -#: src/cryptsetup.c:3562 src/veritysetup.c:527 src/integritysetup.c:625 +#: src/cryptsetup.c:3703 src/veritysetup.c:564 src/integritysetup.c:637 msgid "Unknown action." msgstr "" -#: src/cryptsetup.c:3582 +#: src/cryptsetup.c:3661 msgid "Option --deferred is allowed only for close command.\n" msgstr "" -#: src/cryptsetup.c:3587 +#: src/cryptsetup.c:3666 msgid "Option --shared is allowed only for open of plain device.\n" msgstr "" -#: src/cryptsetup.c:3592 +#: src/cryptsetup.c:3671 msgid "Option --allow-discards is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3597 +#: src/cryptsetup.c:3676 msgid "Option --persistent is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3607 +#: src/cryptsetup.c:3686 msgid "Option --persistent is not allowed with --test-passphrase.\n" msgstr "" @@ -1928,17 +1928,17 @@ "To limit read from keyfile use --keyfile-size=(bytes)." msgstr "" -#: src/cryptsetup.c:3623 +#: src/cryptsetup.c:3702 msgid "Option --integrity is allowed only for luksFormat (LUKS2).\n" msgstr "" -#: src/cryptsetup.c:3628 +#: src/cryptsetup.c:3707 msgid "" "Option --integrity-no-wipe can be used only for format action with integrity " "extension.\n" msgstr "" -#: src/cryptsetup.c:3634 +#: src/cryptsetup.c:3713 msgid "" "Options --label and --subsystem are allowed only for luksFormat and config " "LUKS2 operations.\n" @@ -1950,12 +1950,12 @@ "devices.\n" msgstr "" -#: src/cryptsetup.c:3645 src/cryptsetup_reencrypt.c:1692 +#: src/cryptsetup.c:3781 src/cryptsetup_reencrypt.c:1708 msgid "Key size must be a multiple of 8 bits" msgstr "" -#: src/cryptsetup.c:3651 src/cryptsetup_reencrypt.c:1378 -#: src/cryptsetup_reencrypt.c:1697 +#: src/cryptsetup.c:3787 src/cryptsetup_reencrypt.c:1394 +#: src/cryptsetup_reencrypt.c:1713 msgid "Key slot is invalid." msgstr "" @@ -1964,33 +1964,33 @@ "Option --key-file takes precedence over specified key file argument.\n" msgstr "" -#: src/cryptsetup.c:3665 src/veritysetup.c:539 src/integritysetup.c:649 -#: src/cryptsetup_reencrypt.c:1671 +#: src/cryptsetup.c:3801 src/veritysetup.c:576 src/integritysetup.c:663 +#: src/cryptsetup_reencrypt.c:1687 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:3669 +#: src/cryptsetup.c:3805 msgid "Only one --key-file argument is allowed." msgstr "" -#: src/cryptsetup.c:3673 src/cryptsetup_reencrypt.c:1663 -#: src/cryptsetup_reencrypt.c:1701 +#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1679 +#: src/cryptsetup_reencrypt.c:1717 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:3677 +#: src/cryptsetup.c:3813 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3681 +#: src/cryptsetup.c:3817 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" -#: src/cryptsetup.c:3685 +#: src/cryptsetup.c:3821 msgid "Option --align-payload is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3708 +#: src/cryptsetup.c:3787 msgid "" "Option --skip is supported only for open of plain and loopaes devices.\n" msgstr "" @@ -2000,65 +2000,65 @@ "Option --offset is supported only for open of plain and loopaes devices.\n" msgstr "" -#: src/cryptsetup.c:3721 +#: src/cryptsetup.c:3800 msgid "" "Option --tcrypt-hidden, --tcrypt-system or --tcrypt-backup is supported only " "for TCRYPT device.\n" msgstr "" -#: src/cryptsetup.c:3726 +#: src/cryptsetup.c:3805 msgid "Option --tcrypt-hidden cannot be combined with --allow-discards.\n" msgstr "" -#: src/cryptsetup.c:3731 +#: src/cryptsetup.c:3810 msgid "Option --veracrypt is supported only for TCRYPT device type.\n" msgstr "" -#: src/cryptsetup.c:3737 +#: src/cryptsetup.c:3816 msgid "Invalid argument for parameter --veracrypt-pim supplied.\n" msgstr "" -#: src/cryptsetup.c:3741 +#: src/cryptsetup.c:3820 msgid "" "Option --veracrypt-pim is supported only for VeraCrypt compatible devices.\n" msgstr "" -#: src/cryptsetup.c:3749 +#: src/cryptsetup.c:3828 msgid "" "Option --veracrypt-query-pim is supported only for VeraCrypt compatible " "devices.\n" msgstr "" -#: src/cryptsetup.c:3753 +#: src/cryptsetup.c:3832 msgid "" "The options --veracrypt-pim and --veracrypt-query-pim are mutually " "exclusive.\n" msgstr "" -#: src/cryptsetup.c:3760 +#: src/cryptsetup.c:3839 msgid "Option --priority can be only ignore/normal/prefer.\n" msgstr "" -#: src/cryptsetup.c:3765 +#: src/cryptsetup.c:3844 msgid "Keyslot specification is required.\n" msgstr "" -#: src/cryptsetup.c:3770 src/cryptsetup_reencrypt.c:1677 +#: src/cryptsetup.c:3849 src/cryptsetup_reencrypt.c:1686 msgid "" "Password-based key derivation function (PBKDF) can be only pbkdf2 or " "argon2i/argon2id.\n" msgstr "" -#: src/cryptsetup.c:3775 src/cryptsetup_reencrypt.c:1682 +#: src/cryptsetup.c:3854 src/cryptsetup_reencrypt.c:1691 msgid "" "PBKDF forced iterations cannot be combined with iteration time option.\n" msgstr "" -#: src/cryptsetup.c:3781 +#: src/cryptsetup.c:3860 msgid "Sector size option is not supported for this command.\n" msgstr "" -#: src/cryptsetup.c:3813 +#: src/cryptsetup.c:3892 msgid "Cannot disable metadata locking.\n" msgstr "" @@ -2080,27 +2080,27 @@ msgid "Invalid root hash string specified.\n" msgstr "" -#: src/veritysetup.c:356 +#: src/veritysetup.c:392 msgid " " msgstr "" -#: src/veritysetup.c:356 src/integritysetup.c:469 +#: src/veritysetup.c:392 src/integritysetup.c:479 msgid "format device" msgstr "" -#: src/veritysetup.c:357 +#: src/veritysetup.c:393 msgid " " msgstr "" -#: src/veritysetup.c:357 +#: src/veritysetup.c:393 msgid "verify device" msgstr "" -#: src/veritysetup.c:358 +#: src/veritysetup.c:394 msgid " " msgstr "" -#: src/cryptsetup.c:3209 src/veritysetup.c:358 src/integritysetup.c:470 +#: src/cryptsetup.c:3346 src/veritysetup.c:394 src/integritysetup.c:480 msgid "open device as " msgstr "" @@ -2108,19 +2108,19 @@ msgid "close device (deactivate and remove mapping)" msgstr "" -#: src/veritysetup.c:360 src/integritysetup.c:472 +#: src/veritysetup.c:396 src/integritysetup.c:482 msgid "show active device status" msgstr "" -#: src/veritysetup.c:361 +#: src/veritysetup.c:397 msgid "" msgstr "" -#: src/veritysetup.c:361 src/integritysetup.c:473 +#: src/veritysetup.c:397 src/integritysetup.c:483 msgid "show on-disk information" msgstr "" -#: src/veritysetup.c:380 +#: src/veritysetup.c:416 #, c-format msgid "" "\n" @@ -2130,7 +2130,7 @@ " hash of the root node on \n" msgstr "" -#: src/veritysetup.c:387 +#: src/veritysetup.c:423 #, c-format msgid "" "\n" @@ -2139,108 +2139,108 @@ "Hash format: %u\n" msgstr "" -#: src/veritysetup.c:430 +#: src/veritysetup.c:466 msgid "Do not use verity superblock" msgstr "" -#: src/veritysetup.c:431 +#: src/veritysetup.c:467 msgid "Format type (1 - normal, 0 - original Chrome OS)" msgstr "" -#: src/veritysetup.c:431 +#: src/veritysetup.c:467 msgid "number" msgstr "" -#: src/veritysetup.c:432 +#: src/veritysetup.c:468 msgid "Block size on the data device" msgstr "" -#: src/veritysetup.c:433 +#: src/veritysetup.c:469 msgid "Block size on the hash device" msgstr "" -#: src/veritysetup.c:434 +#: src/veritysetup.c:470 msgid "FEC parity bytes" msgstr "" -#: src/veritysetup.c:435 +#: src/veritysetup.c:471 msgid "The number of blocks in the data file" msgstr "" -#: src/veritysetup.c:435 +#: src/veritysetup.c:471 msgid "blocks" msgstr "" -#: src/veritysetup.c:436 +#: src/veritysetup.c:472 msgid "Path to device with error correction data" msgstr "" -#: src/veritysetup.c:436 src/integritysetup.c:540 +#: src/veritysetup.c:472 src/integritysetup.c:549 msgid "path" msgstr "" -#: src/veritysetup.c:437 +#: src/veritysetup.c:473 msgid "Starting offset on the hash device" msgstr "" -#: src/veritysetup.c:438 +#: src/veritysetup.c:474 msgid "Starting offset on the FEC device" msgstr "" -#: src/veritysetup.c:439 +#: src/veritysetup.c:475 msgid "Hash algorithm" msgstr "" -#: src/veritysetup.c:439 +#: src/veritysetup.c:475 msgid "string" msgstr "" -#: src/veritysetup.c:440 +#: src/veritysetup.c:476 msgid "Salt" msgstr "" -#: src/veritysetup.c:440 +#: src/veritysetup.c:476 msgid "hex string" msgstr "" -#: src/veritysetup.c:442 +#: src/veritysetup.c:479 msgid "Restart kernel if corruption is detected" msgstr "" -#: src/veritysetup.c:443 +#: src/veritysetup.c:480 msgid "Ignore corruption, log it only" msgstr "" -#: src/veritysetup.c:444 +#: src/veritysetup.c:481 msgid "Do not verify zeroed blocks" msgstr "" -#: src/veritysetup.c:545 +#: src/veritysetup.c:582 msgid "" "Option --ignore-corruption, --restart-on-corruption or --ignore-zero-blocks " "is allowed only for open operation.\n" msgstr "" -#: src/veritysetup.c:550 +#: src/veritysetup.c:592 msgid "" "Option --ignore-corruption and --restart-on-corruption cannot be used " "together.\n" msgstr "" -#: src/integritysetup.c:250 +#: src/integritysetup.c:254 #, c-format msgid "Formatted with tag size %u, internal integrity %s.\n" msgstr "" -#: src/integritysetup.c:469 src/integritysetup.c:473 +#: src/integritysetup.c:479 src/integritysetup.c:483 msgid "" msgstr "" -#: src/integritysetup.c:470 +#: src/integritysetup.c:480 msgid " " msgstr "" -#: src/integritysetup.c:492 +#: src/integritysetup.c:502 #, c-format msgid "" "\n" @@ -2256,27 +2256,27 @@ "\tTag size: %u bytes, Checksum algorithm: %s\n" msgstr "" -#: src/integritysetup.c:542 +#: src/integritysetup.c:551 msgid "Journal size" msgstr "" -#: src/integritysetup.c:543 +#: src/integritysetup.c:552 msgid "Interleave sectors" msgstr "" -#: src/integritysetup.c:544 +#: src/integritysetup.c:553 msgid "Journal watermark" msgstr "" -#: src/integritysetup.c:544 +#: src/integritysetup.c:553 msgid "percent" msgstr "" -#: src/integritysetup.c:545 +#: src/integritysetup.c:554 msgid "Journal commit time" msgstr "" -#: src/integritysetup.c:545 src/integritysetup.c:547 +#: src/integritysetup.c:554 src/integritysetup.c:556 msgid "ms" msgstr "" @@ -2284,11 +2284,11 @@ msgid "Tag size per-sector" msgstr "" -#: src/integritysetup.c:549 +#: src/integritysetup.c:558 msgid "Sector size" msgstr "" -#: src/integritysetup.c:550 +#: src/integritysetup.c:559 msgid "Buffers size" msgstr "" @@ -2296,7 +2296,7 @@ msgid "Data integrity algorithm (default " msgstr "" -#: src/integritysetup.c:553 +#: src/integritysetup.c:562 msgid "The size of the data integrity key" msgstr "" @@ -2304,11 +2304,11 @@ msgid "Read the integrity key from a file." msgstr "" -#: src/integritysetup.c:556 +#: src/integritysetup.c:565 msgid "Journal integrity algorithm" msgstr "" -#: src/integritysetup.c:557 +#: src/integritysetup.c:566 msgid "The size of the journal integrity key" msgstr "" @@ -2316,11 +2316,11 @@ msgid "Read the journal integrity key from a file." msgstr "" -#: src/integritysetup.c:560 +#: src/integritysetup.c:569 msgid "Journal encryption algorithm" msgstr "" -#: src/integritysetup.c:561 +#: src/integritysetup.c:570 msgid "The size of the journal encryption key" msgstr "" @@ -2332,41 +2332,41 @@ msgid "Recovery mode (no journal, no tag checking)." msgstr "" -#: src/integritysetup.c:655 +#: src/integritysetup.c:656 msgid "" "Options --journal-size, --interleave-sectors, --sector-size, --tag-size and -" "-no-wipe can be used only for format action.\n" msgstr "" -#: src/integritysetup.c:661 +#: src/integritysetup.c:675 msgid "Invalid journal size specification." msgstr "" -#: src/integritysetup.c:666 +#: src/integritysetup.c:680 msgid "Both key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:669 +#: src/integritysetup.c:683 msgid "Integrity algorithm must be specified if integrity key is used." msgstr "" -#: src/integritysetup.c:674 +#: src/integritysetup.c:688 msgid "" "Both journal integrity key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:677 +#: src/integritysetup.c:691 msgid "" "Journal integrity algorithm must be specified if journal integrity key is " "used." msgstr "" -#: src/integritysetup.c:682 +#: src/integritysetup.c:696 msgid "" "Both journal encryption key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:685 +#: src/integritysetup.c:699 msgid "" "Journal encryption algorithm must be specified if journal encryption key is " "used." @@ -2417,7 +2417,7 @@ msgid "Cannot read reencryption log file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:396 +#: src/cryptsetup_reencrypt.c:403 #, c-format msgid "Log file %s exists, resuming reencryption.\n" msgstr "" @@ -2516,7 +2516,7 @@ "active.\n" msgstr "" -#: src/cryptsetup.c:2959 +#: src/cryptsetup.c:3096 #, c-format msgid "Enter passphrase for key slot %u: " msgstr "" @@ -2540,11 +2540,11 @@ msgid "Changed pbkdf parameters in keyslot %i.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1600 +#: src/cryptsetup_reencrypt.c:1616 msgid "Reencryption block size" msgstr "" -#: src/cryptsetup_reencrypt.c:1600 +#: src/cryptsetup_reencrypt.c:1616 msgid "MiB" msgstr "" @@ -2552,7 +2552,7 @@ msgid "Do not change key, no data area reencryption." msgstr "" -#: src/cryptsetup_reencrypt.c:1607 +#: src/cryptsetup_reencrypt.c:1623 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "" @@ -2572,11 +2572,11 @@ msgid "Use only this slot (others will be disabled)." msgstr "" -#: src/cryptsetup.c:3428 src/cryptsetup_reencrypt.c:1619 +#: src/cryptsetup.c:3563 src/cryptsetup_reencrypt.c:1635 msgid "Reduce data device size (move data offset). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3370 src/cryptsetup_reencrypt.c:1620 +#: src/cryptsetup.c:3503 src/cryptsetup_reencrypt.c:1636 msgid "Use only specified device size (ignore rest of device). DANGEROUS!" msgstr "" @@ -2596,7 +2596,7 @@ msgid "Type of LUKS metadata (luks1 or luks2)." msgstr "" -#: src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup_reencrypt.c:1659 msgid "[OPTION...] " msgstr "" @@ -2605,37 +2605,37 @@ msgid "Reencryption will change: %s%s%s%s%s%s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1652 +#: src/cryptsetup_reencrypt.c:1668 msgid "volume key" msgstr "" -#: src/cryptsetup_reencrypt.c:1654 +#: src/cryptsetup_reencrypt.c:1670 msgid "set hash to " msgstr "" -#: src/cryptsetup_reencrypt.c:1655 +#: src/cryptsetup_reencrypt.c:1671 msgid ", set cipher to " msgstr "" -#: src/cryptsetup_reencrypt.c:1659 +#: src/cryptsetup_reencrypt.c:1675 msgid "Argument required." msgstr "" -#: src/cryptsetup_reencrypt.c:1687 +#: src/cryptsetup_reencrypt.c:1703 msgid "" "Only values between 1 MiB and 64 MiB allowed for reencryption block size." msgstr "" -#: src/cryptsetup.c:3831 src/cryptsetup_reencrypt.c:1706 -#: src/cryptsetup_reencrypt.c:1711 +#: src/cryptsetup.c:3978 src/cryptsetup_reencrypt.c:1722 +#: src/cryptsetup_reencrypt.c:1727 msgid "Invalid device size specification." msgstr "" -#: src/cryptsetup_reencrypt.c:1714 +#: src/cryptsetup_reencrypt.c:1730 msgid "Maximum device reduce size is 64 MiB." msgstr "" -#: src/cryptsetup.c:3837 src/cryptsetup_reencrypt.c:1717 +#: src/cryptsetup.c:3984 src/cryptsetup_reencrypt.c:1733 msgid "Reduce size must be multiple of 512 bytes sector." msgstr "" @@ -2643,25 +2643,25 @@ msgid "Option --new must be used together with --reduce-device-size." msgstr "" -#: src/cryptsetup_reencrypt.c:1725 +#: src/cryptsetup_reencrypt.c:1741 msgid "" "Option --keep-key can be used only with --hash, --iter-time or --pbkdf-force-" "iterations." msgstr "" -#: src/cryptsetup_reencrypt.c:1729 +#: src/cryptsetup_reencrypt.c:1745 msgid "Option --new cannot be used together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1733 +#: src/cryptsetup_reencrypt.c:1749 msgid "Option --decrypt is incompatible with specified parameters." msgstr "" -#: src/cryptsetup_reencrypt.c:1737 +#: src/cryptsetup_reencrypt.c:1753 msgid "Option --uuid is allowed only together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1741 +#: src/cryptsetup_reencrypt.c:1757 msgid "Invalid luks type. Use one of these: 'luks', 'luks1' or 'luks2'." msgstr "" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cups.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cups.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/cups.po 2020-01-23 16:51:29.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/cups.po 2020-07-08 13:53:25.000000000 +0000 @@ -29,14 +29,14 @@ "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" "POT-Creation-Date: 2018-03-19 18:36-0400\n" -"PO-Revision-Date: 2019-08-21 23:25+0000\n" +"PO-Revision-Date: 2020-04-27 17:27+0000\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:53+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: systemv/lpstat.c:1871 systemv/lpstat.c:1990 @@ -1099,31 +1099,31 @@ msgid " Warning: obsolete DSC version %.1f in file." msgstr " 警告: ファイルは時代遅れの DSC バージョン %.1f です。" -#: test/ippfind.c:2845 +#: test/ippfind.c:2794 msgid " ! expression Unary NOT of expression." msgstr " ! <式> 式を否定する単項演算子。" -#: test/ippfind.c:2844 +#: test/ippfind.c:2793 msgid " ( expressions ) Group expressions." msgstr " ( <複数の式> ) グループ化された複数の式。" -#: systemv/cupsctl.c:244 +#: systemv/cupsctl.c:203 msgid " --[no-]debug-logging Turn debug logging on/off." msgstr " --[no-]debug-logging デバッグログの有効/無効を切り替える。" -#: systemv/cupsctl.c:246 +#: systemv/cupsctl.c:205 msgid " --[no-]remote-admin Turn remote administration on/off." msgstr " --[no-]remote-admin リモート管理の有効/無効を切り替える。" -#: systemv/cupsctl.c:248 +#: systemv/cupsctl.c:207 msgid " --[no-]remote-any Allow/prevent access from the Internet." msgstr " --[no-]remote-any インターネットからのアクセスを許可/禁止する。" -#: systemv/cupsctl.c:250 +#: systemv/cupsctl.c:209 msgid " --[no-]share-printers Turn printer sharing on/off." msgstr " --[no-]share-printers プリンター共有の有効/無効を切り替える。" -#: systemv/cupsctl.c:252 +#: systemv/cupsctl.c:211 msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." msgstr " --[no-]user-cancel-any あらゆるジョブのキャンセルをユーザーに許可/禁止する" @@ -1135,11 +1135,11 @@ msgid " --crlf End lines with CR + LF (Windows)." msgstr " --crlf 行末を CR + LF とする (Windows)。" -#: test/ippfind.c:2826 +#: test/ippfind.c:2775 msgid " --domain regex Match domain to regular expression." msgstr " --domain <正規表現> ドメインが正規表現にマッチするか。" -#: test/ippfind.c:2827 +#: test/ippfind.c:2776 msgid "" " --exec utility [argument ...] ;\n" " Execute program if true." @@ -1147,7 +1147,7 @@ " --exec <実行ファイル名> [引数 ...] ;\n" " 成功した場合、<実行ファイル名>を実行する。" -#: test/ippfind.c:2847 +#: test/ippfind.c:2796 msgid " --false Always false." msgstr " --false 常に失敗。" @@ -1155,11 +1155,11 @@ msgid " --help Show help." msgstr " --help ヘルプを表示する。" -#: test/ippfind.c:2809 +#: test/ippfind.c:2758 msgid " --help Show this help." msgstr " --help このヘルプを表示する。" -#: test/ippfind.c:2829 +#: test/ippfind.c:2778 msgid " --host regex Match hostname to regular expression." msgstr " --host <正規表現> ホスト名が正規表現にマッチするか。" @@ -1171,43 +1171,43 @@ msgid " --list-filters List filters that will be used." msgstr " --list-filters 使用されるフィルターのリストを表示する。" -#: test/ippfind.c:2831 +#: test/ippfind.c:2780 msgid " --local True if service is local." msgstr " --local サービスがローカルなら真。" -#: test/ippfind.c:2830 +#: test/ippfind.c:2779 msgid " --ls List attributes." msgstr " --ls 属性の一覧を表示する。" -#: test/ippfind.c:2832 +#: test/ippfind.c:2781 msgid " --name regex Match service name to regular expression." msgstr " --name <正規表現> サービス名が正規表現とマッチするか。" -#: test/ippfind.c:2846 +#: test/ippfind.c:2795 msgid " --not expression Unary NOT of expression." msgstr " --not <式> 式を否定する単項演算子。" -#: test/ippfind.c:2833 +#: test/ippfind.c:2782 msgid " --path regex Match resource path to regular expression." msgstr " --path <正規表現> リソースのパスが正規表現とマッチするか。" -#: test/ippfind.c:2834 +#: test/ippfind.c:2783 msgid " --port number[-number] Match port to number or range." msgstr " --port 番号[-番号] ポートが指定された番号または範囲とマッチするか。" -#: test/ippfind.c:2835 +#: test/ippfind.c:2784 msgid " --print Print URI if true." msgstr " --print 結果が真なら URI を表示する。" -#: test/ippfind.c:2836 +#: test/ippfind.c:2785 msgid " --print-name Print service name if true." msgstr " --print-name 結果が真ならサービス名を表示する。" -#: test/ippfind.c:2837 +#: test/ippfind.c:2786 msgid " --quiet Quietly report match via exit code." msgstr " --quiet マッチ結果を終了コードで報告し、出力をしない。" -#: test/ippfind.c:2838 +#: test/ippfind.c:2787 msgid " --remote True if service is remote." msgstr " --remote サービスがリモートなら真。" @@ -1219,23 +1219,23 @@ " --stop-after-include-error\n" " INCLUDE が失敗したときテストを停止する。" -#: test/ippfind.c:2848 +#: test/ippfind.c:2797 msgid " --true Always true." msgstr " --true 常に真。" -#: test/ippfind.c:2839 +#: test/ippfind.c:2788 msgid " --txt key True if the TXT record contains the key." msgstr " --txt <キー名> TXT レコードがキー名を含んでいたら真。" -#: test/ippfind.c:2840 +#: test/ippfind.c:2789 msgid " --txt-* regex Match TXT record key to regular expression." msgstr " --txt-* <正規表現> TXT レコードのキーが正規表現とマッチしたら真。" -#: test/ippfind.c:2841 +#: test/ippfind.c:2790 msgid " --uri regex Match URI to regular expression." msgstr " --uri <正規表現> URI が正規表現とマッチするか。" -#: test/ippfind.c:2810 +#: test/ippfind.c:2759 msgid " --version Show program version." msgstr " --version プログラムのバージョンを表示。" @@ -1243,11 +1243,11 @@ msgid " --version Show version." msgstr " --version バージョンを表示する。" -#: test/ippfind.c:2803 test/ipptool.c:5068 +#: test/ippfind.c:2752 test/ipptool.c:5068 msgid " -4 Connect using IPv4." msgstr " -4 IPv4 で接続する。" -#: test/ippfind.c:2804 test/ipptool.c:5069 +#: test/ippfind.c:2753 test/ipptool.c:5069 msgid " -6 Connect using IPv6." msgstr " -6 IPv6 で接続する。" @@ -1263,7 +1263,7 @@ msgid " -D name=value Set named variable to value." msgstr " -D name=value name で指定された変数に値 value をセットする。" -#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:239 +#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:198 msgid " -E Encrypt the connection." msgstr " -E 接続を暗号化する。" @@ -1272,7 +1272,7 @@ " -E Test with encryption using HTTP Upgrade to TLS." msgstr "" -#: scheduler/main.c:2100 +#: scheduler/main.c:2104 msgid "" " -F Run in the foreground but detach from console." msgstr " -F フォアグラウンドで実行するがコンソールからはデタッチする。" @@ -1307,7 +1307,7 @@ msgid " -P filename.ppd Set PPD file." msgstr " -P filename.ppd PPD ファイルを指定する。" -#: test/ippfind.c:2813 +#: test/ippfind.c:2762 msgid " -P number[-number] Match port to number or range." msgstr " -P 番号[-番号] ポートが指定された番号または範囲とマッチするか。" @@ -1319,7 +1319,7 @@ msgid " -S Test with encryption using HTTPS." msgstr "" -#: test/ippfind.c:2805 +#: test/ippfind.c:2754 msgid " -T seconds Set the browse timeout in seconds." msgstr " -T <秒> ブラウズのタイムアウトを秒で指定する。" @@ -1331,7 +1331,7 @@ msgid " -U username Specify username." msgstr " -U username ユーザー名を指定する。" -#: test/ippfind.c:2807 test/ipptool.c:5078 +#: test/ippfind.c:2756 test/ipptool.c:5078 msgid " -V version Set default IPP version." msgstr " -V version デフォルトの IPP バージョンを指定する。" @@ -1363,7 +1363,7 @@ msgid " -c cups-files.conf Set cups-files.conf file to use." msgstr " -c cups-files.conf cups-files.conf を利用するよう設定する。" -#: scheduler/main.c:2098 +#: scheduler/main.c:2102 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf 使用する cupsd.conf ファイルを指定する。" @@ -1379,7 +1379,7 @@ msgid " -d printer Use the named printer." msgstr " -d printer 指定されたプリンターを利用する。" -#: test/ippfind.c:2814 +#: test/ippfind.c:2763 msgid " -d regex Match domain to regular expression." msgstr " -d <正規表現> ドメインが正規表現にマッチするか。" @@ -1387,7 +1387,7 @@ msgid " -e Use every filter from the PPD file." msgstr " -e PPD ファイルからすべてのフィルターを使用する。" -#: scheduler/main.c:2099 +#: scheduler/main.c:2103 msgid " -f Run in the foreground." msgstr " -f フォアグラウンドで実行する。" @@ -1395,7 +1395,7 @@ msgid " -f filename Set default request filename." msgstr " -f filename デフォルトのリクエストファイル名を指定する。" -#: scheduler/main.c:2101 +#: scheduler/main.c:2105 msgid " -h Show this usage message." msgstr " -h このヘルプメッセージを表示する。" @@ -1403,11 +1403,11 @@ msgid " -h Validate HTTP response headers." msgstr "" -#: test/ippfind.c:2815 +#: test/ippfind.c:2764 msgid " -h regex Match hostname to regular expression." msgstr " -h <正規表現> ホスト名が正規表現にマッチするか。" -#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:241 +#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:200 msgid " -h server[:port] Specify server address." msgstr " -h server[:port] サーバーアドレスを指定する。" @@ -1427,7 +1427,7 @@ msgstr "" " -j job-id[,N] フィルターファイル N を指定されたジョブから使用する (デフォルトは ファイル 1)。" -#: test/ippfind.c:2816 +#: test/ippfind.c:2765 msgid " -l List attributes." msgstr " -l 属性の一覧を表示する。" @@ -1435,7 +1435,7 @@ msgid " -l Produce plain text output." msgstr " -l プレーンテキスト出力を行う。" -#: scheduler/main.c:2103 +#: scheduler/main.c:2107 msgid " -l Run cupsd on demand." msgstr " -l cupsd をオンデマンドで実行する。" @@ -1462,7 +1462,7 @@ " -n count Repeat the last file the given number of times." msgstr " -n count 最後のファイルを与えられた回数だけ繰り返す。" -#: test/ippfind.c:2817 +#: test/ippfind.c:2766 msgid " -n regex Match service name to regular expression." msgstr " -n <正規表現> サービス名が正規表現とマッチするか。" @@ -1479,7 +1479,7 @@ msgid " -o name=value Set option(s)." msgstr " -o name=value オプションを指定する。" -#: test/ippfind.c:2818 +#: test/ippfind.c:2767 msgid " -p Print URI if true." msgstr " -p 結果が真なら URI を表示する。" @@ -1487,7 +1487,7 @@ msgid " -p filename.ppd Set PPD file." msgstr " -p filename.ppd PPD ファイルを指定する。" -#: test/ippfind.c:2819 +#: test/ippfind.c:2768 msgid " -q Quietly report match via exit code." msgstr " -q マッチ結果を終了コードで報告し、出力をしない。" @@ -1495,7 +1495,7 @@ msgid " -q Run silently." msgstr " -q 詳細は表示しない。" -#: test/ippfind.c:2820 +#: test/ippfind.c:2769 msgid " -r True if service is remote." msgstr " -r サービスがリモートなら真。" @@ -1503,11 +1503,11 @@ msgid " -r Use 'relaxed' open mode." msgstr " -r 寛容モードを用いる。" -#: test/ippfind.c:2821 +#: test/ippfind.c:2770 msgid " -s Print service name if true." msgstr " -s 結果が真ならサービス名を表示する。" -#: scheduler/main.c:2105 +#: scheduler/main.c:2109 msgid " -s cups-files.conf Set cups-files.conf file to use." msgstr "" @@ -1519,11 +1519,11 @@ msgid " -t Test PPDs instead of generating them." msgstr " -t PPD を出力しないでテストする。" -#: scheduler/main.c:2106 +#: scheduler/main.c:2110 msgid " -t Test the configuration file." msgstr " -t 設定ファイルをテストする。" -#: test/ippfind.c:2822 +#: test/ippfind.c:2771 msgid " -t key True if the TXT record contains the key." msgstr " -t <キー名> TXT レコードがキー名を含んでいたら真。" @@ -1535,7 +1535,7 @@ msgid " -u Remove the PPD file when finished." msgstr " -u 終了したときに PPD ファイルを削除する。" -#: test/ippfind.c:2823 +#: test/ippfind.c:2772 msgid " -u regex Match URI to regular expression." msgstr " -u <正規表現> URI が正規表現とマッチするか。" @@ -1547,7 +1547,7 @@ msgid " -vv Be very verbose." msgstr " -vv より冗長な出力を行う。" -#: test/ippfind.c:2824 +#: test/ippfind.c:2773 msgid "" " -x utility [argument ...] ;\n" " Execute program if true." @@ -1559,11 +1559,11 @@ msgid " -z Compress PPD files using GNU zip." msgstr " -z PPD ファイルを GNU zip を使って圧縮する。" -#: test/ippfind.c:2867 +#: test/ippfind.c:2816 msgid " IPPFIND_SERVICE_DOMAIN Domain name" msgstr " IPPFIND_SERVICE_DOMAIN ドメイン名" -#: test/ippfind.c:2868 +#: test/ippfind.c:2817 msgid "" " IPPFIND_SERVICE_HOSTNAME\n" " Fully-qualified domain name" @@ -1571,79 +1571,79 @@ " IPPFIND_SERVICE_HOSTNAME\n" " 完全修飾ドメイン名 (FQDN)" -#: test/ippfind.c:2870 +#: test/ippfind.c:2819 msgid " IPPFIND_SERVICE_NAME Service instance name" msgstr " IPPFIND_SERVICE_NAME サービスインスタンス名" -#: test/ippfind.c:2871 +#: test/ippfind.c:2820 msgid " IPPFIND_SERVICE_PORT Port number" msgstr " IPPFIND_SERVICE_PORT ポート番号" -#: test/ippfind.c:2872 +#: test/ippfind.c:2821 msgid " IPPFIND_SERVICE_REGTYPE DNS-SD registration type" msgstr " IPPFIND_SERVICE_REGTYPE DNS-SD 登録タイプ" -#: test/ippfind.c:2873 +#: test/ippfind.c:2822 msgid " IPPFIND_SERVICE_SCHEME URI scheme" msgstr " IPPFIND_SERVICE_SCHEME URI スキーム" -#: test/ippfind.c:2874 +#: test/ippfind.c:2823 msgid " IPPFIND_SERVICE_URI URI" msgstr " IPPFIND_SERVICE_URI URI" -#: test/ippfind.c:2875 +#: test/ippfind.c:2824 msgid " IPPFIND_TXT_* Value of TXT record key" msgstr " IPPFIND_TXT_* TXT レコードキーの値" -#: test/ippfind.c:2850 +#: test/ippfind.c:2799 msgid "" " expression --and expression\n" " Logical AND." msgstr " <式> --and <式> 論理 AND。" -#: test/ippfind.c:2852 +#: test/ippfind.c:2801 msgid "" " expression --or expression\n" " Logical OR." msgstr " <式> --or <式> 論理 OR。" -#: test/ippfind.c:2849 +#: test/ippfind.c:2798 msgid " expression expression Logical AND." msgstr " <式> <式> 論理 AND。" -#: test/ippfind.c:2857 +#: test/ippfind.c:2806 msgid " {service_domain} Domain name" msgstr " {service_domain} ドメイン名" -#: test/ippfind.c:2858 +#: test/ippfind.c:2807 msgid " {service_hostname} Fully-qualified domain name" msgstr " {service_hostname} 完全修飾ドメイン名 (FQDN)" -#: test/ippfind.c:2859 +#: test/ippfind.c:2808 msgid " {service_name} Service instance name" msgstr " {service_name} サービスインスタンス名" -#: test/ippfind.c:2860 +#: test/ippfind.c:2809 msgid " {service_port} Port number" msgstr " {service_port} ポート番号" -#: test/ippfind.c:2861 +#: test/ippfind.c:2810 msgid " {service_regtype} DNS-SD registration type" msgstr " {service_regtype} DNS-SD 登録タイプ" -#: test/ippfind.c:2862 +#: test/ippfind.c:2811 msgid " {service_scheme} URI scheme" msgstr " {service_scheme} URI スキーム" -#: test/ippfind.c:2863 +#: test/ippfind.c:2812 msgid " {service_uri} URI" msgstr " {service_uri} URI" -#: test/ippfind.c:2864 +#: test/ippfind.c:2813 msgid " {txt_*} Value of TXT record key" msgstr " {txt_*} TXT レコードキーの値" -#: test/ippfind.c:2856 +#: test/ippfind.c:2805 msgid " {} URI" msgstr " {} URI" @@ -1731,7 +1731,7 @@ "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:4777 +#: cups/ipp.c:4876 #, c-format msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)." msgstr "" @@ -1980,7 +1980,7 @@ msgstr "%s は準備ができており印刷しています" #: filter/rastertoepson.c:999 filter/rastertohp.c:668 -#: filter/rastertolabel.c:1120 +#: filter/rastertolabel.c:1121 #, c-format msgid "%s job-id user title copies options [file]" msgstr "%s ジョブID ユーザー タイトル コピー数 オプション [ファイル]" @@ -2368,12 +2368,12 @@ msgid "%s: Unknown option \"%c\"." msgstr "%s: '%c' は未知のオプションです。" -#: tools/ippeveprinter.c:381 tools/ippeveprinter.c:566 tools/ippfind.c:627 +#: tools/ippeveprinter.c:414 tools/ippeveprinter.c:604 tools/ippfind.c:627 #, c-format msgid "%s: Unknown option \"%s\"." msgstr "%s: \"%s\" は未知のオプションです。" -#: tools/ippeveprinter.c:555 tools/ippfind.c:919 tools/ipptool.c:606 +#: tools/ippeveprinter.c:593 tools/ippfind.c:919 tools/ipptool.c:606 #, c-format msgid "%s: Unknown option \"-%c\"." msgstr "%s: \"-%c\" は未知のオプションです。" @@ -2410,159 +2410,159 @@ msgid "%s: Warning - mode option ignored." msgstr "%s: 警告 - モードオプションは無視されます。" -#: ppdc/sample.c:305 +#: ppdc/sample.c:308 msgid "-1" msgstr "-1" -#: ppdc/sample.c:296 +#: ppdc/sample.c:299 msgid "-10" msgstr "-10" -#: ppdc/sample.c:388 +#: ppdc/sample.c:391 msgid "-100" msgstr "-100" -#: ppdc/sample.c:387 +#: ppdc/sample.c:390 msgid "-105" msgstr "-105" -#: ppdc/sample.c:295 +#: ppdc/sample.c:298 msgid "-11" msgstr "-11" -#: ppdc/sample.c:386 +#: ppdc/sample.c:389 msgid "-110" msgstr "-110" -#: ppdc/sample.c:385 +#: ppdc/sample.c:388 msgid "-115" msgstr "-115" -#: ppdc/sample.c:294 +#: ppdc/sample.c:297 msgid "-12" msgstr "-12" -#: ppdc/sample.c:384 +#: ppdc/sample.c:387 msgid "-120" msgstr "-120" -#: ppdc/sample.c:293 +#: ppdc/sample.c:296 msgid "-13" msgstr "-13" -#: ppdc/sample.c:292 +#: ppdc/sample.c:295 msgid "-14" msgstr "-14" -#: ppdc/sample.c:291 +#: ppdc/sample.c:294 msgid "-15" msgstr "-15" -#: ppdc/sample.c:304 +#: ppdc/sample.c:307 msgid "-2" msgstr "-2" -#: ppdc/sample.c:404 +#: ppdc/sample.c:407 msgid "-20" msgstr "-20" -#: ppdc/sample.c:403 +#: ppdc/sample.c:406 msgid "-25" msgstr "-25" -#: ppdc/sample.c:303 +#: ppdc/sample.c:306 msgid "-3" msgstr "-3" -#: ppdc/sample.c:402 +#: ppdc/sample.c:405 msgid "-30" msgstr "-30" -#: ppdc/sample.c:401 +#: ppdc/sample.c:404 msgid "-35" msgstr "-35" -#: ppdc/sample.c:302 +#: ppdc/sample.c:305 msgid "-4" msgstr "-4" -#: ppdc/sample.c:400 +#: ppdc/sample.c:403 msgid "-40" msgstr "-40" -#: ppdc/sample.c:399 +#: ppdc/sample.c:402 msgid "-45" msgstr "-45" -#: ppdc/sample.c:301 +#: ppdc/sample.c:304 msgid "-5" msgstr "-5" -#: ppdc/sample.c:398 +#: ppdc/sample.c:401 msgid "-50" msgstr "-50" -#: ppdc/sample.c:397 +#: ppdc/sample.c:400 msgid "-55" msgstr "-55" -#: ppdc/sample.c:300 +#: ppdc/sample.c:303 msgid "-6" msgstr "-6" -#: ppdc/sample.c:396 +#: ppdc/sample.c:399 msgid "-60" msgstr "-60" -#: ppdc/sample.c:395 +#: ppdc/sample.c:398 msgid "-65" msgstr "-65" -#: ppdc/sample.c:299 +#: ppdc/sample.c:302 msgid "-7" msgstr "-7" -#: ppdc/sample.c:394 +#: ppdc/sample.c:397 msgid "-70" msgstr "-70" -#: ppdc/sample.c:393 +#: ppdc/sample.c:396 msgid "-75" msgstr "-75" -#: ppdc/sample.c:298 +#: ppdc/sample.c:301 msgid "-8" msgstr "-8" -#: ppdc/sample.c:392 +#: ppdc/sample.c:395 msgid "-80" msgstr "-80" -#: ppdc/sample.c:391 +#: ppdc/sample.c:394 msgid "-85" msgstr "-85" -#: ppdc/sample.c:297 +#: ppdc/sample.c:300 msgid "-9" msgstr "-9" -#: ppdc/sample.c:390 +#: ppdc/sample.c:393 msgid "-90" msgstr "-90" -#: ppdc/sample.c:389 +#: ppdc/sample.c:392 msgid "-95" msgstr "-95" -#: ppdc/sample.c:306 +#: ppdc/sample.c:309 msgid "0" msgstr "0" -#: ppdc/sample.c:307 +#: ppdc/sample.c:310 msgid "1" msgstr "1" -#: ppdc/sample.c:379 +#: ppdc/sample.c:382 msgid "1 inch/sec." msgstr "1 インチ/秒" @@ -2574,7 +2574,7 @@ msgid "1.25x2.25\"" msgstr "1.25x2.25 インチ" -#: ppdc/sample.c:427 +#: ppdc/sample.c:430 msgid "1.5 inch/sec." msgstr "1.5 インチ/秒" @@ -2594,11 +2594,11 @@ msgid "1.50x2.00\"" msgstr "1.50x2.00 インチ" -#: ppdc/sample.c:316 +#: ppdc/sample.c:319 msgid "10" msgstr "10" -#: ppdc/sample.c:438 +#: ppdc/sample.c:441 msgid "10 inches/sec." msgstr "10 インチ/秒" @@ -2614,39 +2614,39 @@ msgid "10 x 14" msgstr "10 x 14 インチ" -#: ppdc/sample.c:418 +#: ppdc/sample.c:421 msgid "100" msgstr "100" -#: ppdc/sample.c:329 +#: ppdc/sample.c:332 msgid "100 mm/sec." msgstr "100 ミリメートル/秒" -#: ppdc/sample.c:419 +#: ppdc/sample.c:422 msgid "105" msgstr "105" -#: ppdc/sample.c:317 +#: ppdc/sample.c:320 msgid "11" msgstr "11" -#: ppdc/sample.c:439 +#: ppdc/sample.c:442 msgid "11 inches/sec." msgstr "11 インチ/秒" -#: ppdc/sample.c:420 +#: ppdc/sample.c:423 msgid "110" msgstr "110" -#: ppdc/sample.c:421 +#: ppdc/sample.c:424 msgid "115" msgstr "115" -#: ppdc/sample.c:318 +#: ppdc/sample.c:321 msgid "12" msgstr "12" -#: ppdc/sample.c:440 +#: ppdc/sample.c:443 msgid "12 inches/sec." msgstr "12 インチ/秒" @@ -2654,39 +2654,39 @@ msgid "12 x 11" msgstr "12 x 11 インチ" -#: ppdc/sample.c:422 +#: ppdc/sample.c:425 msgid "120" msgstr "120" -#: ppdc/sample.c:330 +#: ppdc/sample.c:333 msgid "120 mm/sec." msgstr "120 ミリメートル/秒" -#: ppdc/sample.c:243 +#: ppdc/sample.c:247 msgid "120x60dpi" msgstr "120x60dpi" -#: ppdc/sample.c:249 +#: ppdc/sample.c:253 msgid "120x72dpi" msgstr "120x72dpi" -#: ppdc/sample.c:319 +#: ppdc/sample.c:322 msgid "13" msgstr "13" -#: ppdc/sample.c:232 +#: ppdc/sample.c:233 msgid "136dpi" msgstr "136dpi" -#: ppdc/sample.c:320 +#: ppdc/sample.c:323 msgid "14" msgstr "14" -#: ppdc/sample.c:321 +#: ppdc/sample.c:324 msgid "15" msgstr "15" -#: ppdc/sample.c:323 +#: ppdc/sample.c:326 msgid "15 mm/sec." msgstr "15 ミリメートル/秒" @@ -2694,59 +2694,59 @@ msgid "15 x 11" msgstr "15 x 11 インチ" -#: ppdc/sample.c:331 +#: ppdc/sample.c:334 msgid "150 mm/sec." msgstr "150 ミリメートル/秒" -#: ppdc/sample.c:278 +#: ppdc/sample.c:281 msgid "150dpi" msgstr "150dpi" -#: ppdc/sample.c:363 +#: ppdc/sample.c:366 msgid "16" msgstr "16" -#: ppdc/sample.c:364 +#: ppdc/sample.c:367 msgid "17" msgstr "17" -#: ppdc/sample.c:365 +#: ppdc/sample.c:368 msgid "18" msgstr "18" -#: ppdc/sample.c:244 +#: ppdc/sample.c:248 msgid "180dpi" msgstr "180dpi" -#: ppdc/sample.c:366 +#: ppdc/sample.c:369 msgid "19" msgstr "19" -#: ppdc/sample.c:308 +#: ppdc/sample.c:311 msgid "2" msgstr "2" -#: ppdc/sample.c:380 +#: ppdc/sample.c:383 msgid "2 inches/sec." msgstr "2 インチ/秒" -#: cups/ppd-cache.c:2996 +#: cups/ppd-cache.c:3012 msgid "2-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:2997 +#: cups/ppd-cache.c:3013 msgid "2-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2995 +#: cups/ppd-cache.c:3011 msgid "2-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2994 +#: cups/ppd-cache.c:3010 msgid "2-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3872 ppdc/sample.c:262 +#: cups/ppd-cache.c:3872 ppdc/sample.c:265 msgid "2-Sided Printing" msgstr "両面印刷" @@ -2790,107 +2790,107 @@ msgid "2.25x1.25\"" msgstr "2.25x1.25 インチ" -#: ppdc/sample.c:188 +#: ppdc/sample.c:189 msgid "2.25x4.00\"" msgstr "2.25x4.00 インチ" -#: ppdc/sample.c:189 +#: ppdc/sample.c:190 msgid "2.25x5.50\"" msgstr "2.25x5.50 インチ" -#: ppdc/sample.c:190 +#: ppdc/sample.c:191 msgid "2.38x5.50\"" msgstr "2.38x5.50 インチ" -#: ppdc/sample.c:428 +#: ppdc/sample.c:431 msgid "2.5 inches/sec." msgstr "2.5 インチ/秒" -#: ppdc/sample.c:191 +#: ppdc/sample.c:192 msgid "2.50x1.00\"" msgstr "2.50x1.00 インチ" -#: ppdc/sample.c:192 +#: ppdc/sample.c:193 msgid "2.50x2.00\"" msgstr "2.50x2.00 インチ" -#: ppdc/sample.c:193 +#: ppdc/sample.c:194 msgid "2.75x1.25\"" msgstr "2.75x1.25 インチ" -#: ppdc/sample.c:194 +#: ppdc/sample.c:195 msgid "2.9 x 1\"" msgstr "2.9 x 1 インチ" -#: ppdc/sample.c:367 +#: ppdc/sample.c:370 msgid "20" msgstr "20" -#: ppdc/sample.c:324 +#: ppdc/sample.c:327 msgid "20 mm/sec." msgstr "20 ミリメートル/秒" -#: ppdc/sample.c:332 +#: ppdc/sample.c:335 msgid "200 mm/sec." msgstr "200 ミリメートル/秒" -#: ppdc/sample.c:233 +#: ppdc/sample.c:234 msgid "203dpi" msgstr "203dpi" -#: ppdc/sample.c:368 +#: ppdc/sample.c:371 msgid "21" msgstr "21" -#: ppdc/sample.c:369 +#: ppdc/sample.c:372 msgid "22" msgstr "22" -#: ppdc/sample.c:370 +#: ppdc/sample.c:373 msgid "23" msgstr "23" -#: ppdc/sample.c:371 +#: ppdc/sample.c:374 msgid "24" msgstr "24" -#: ppdc/sample.c:241 +#: ppdc/sample.c:245 msgid "24-Pin Series" msgstr "24 ピンシリーズ" -#: ppdc/sample.c:250 +#: ppdc/sample.c:254 msgid "240x72dpi" msgstr "240x72dpi" -#: ppdc/sample.c:372 +#: ppdc/sample.c:375 msgid "25" msgstr "25" -#: ppdc/sample.c:333 +#: ppdc/sample.c:336 msgid "250 mm/sec." msgstr "250 ミリメートル/秒" -#: ppdc/sample.c:373 +#: ppdc/sample.c:376 msgid "26" msgstr "26" -#: ppdc/sample.c:374 +#: ppdc/sample.c:377 msgid "27" msgstr "27" -#: ppdc/sample.c:375 +#: ppdc/sample.c:378 msgid "28" msgstr "28" -#: ppdc/sample.c:376 +#: ppdc/sample.c:379 msgid "29" msgstr "29" -#: ppdc/sample.c:309 +#: ppdc/sample.c:312 msgid "3" msgstr "3" -#: ppdc/sample.c:381 +#: ppdc/sample.c:384 msgid "3 inches/sec." msgstr "3 インチ/秒" @@ -2898,59 +2898,59 @@ msgid "3 x 5" msgstr "3 x 5" -#: cups/ppd-cache.c:3007 +#: cups/ppd-cache.c:3023 msgid "3-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3005 +#: cups/ppd-cache.c:3021 msgid "3-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3004 +#: cups/ppd-cache.c:3020 msgid "3-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3006 +#: cups/ppd-cache.c:3022 msgid "3-Hole Punch (Reverse Portrait)" msgstr "" -#: ppdc/sample.c:195 +#: ppdc/sample.c:196 msgid "3.00x1.00\"" msgstr "3.00x1.00 インチ" -#: ppdc/sample.c:196 +#: ppdc/sample.c:197 msgid "3.00x1.25\"" msgstr "3.00x1.25 インチ" -#: ppdc/sample.c:197 +#: ppdc/sample.c:198 msgid "3.00x2.00\"" msgstr "3.00x2.00 インチ" -#: ppdc/sample.c:198 +#: ppdc/sample.c:199 msgid "3.00x3.00\"" msgstr "3.00x3.00インチ" -#: ppdc/sample.c:199 +#: ppdc/sample.c:200 msgid "3.00x5.00\"" msgstr "3.00x5.00 インチ" -#: ppdc/sample.c:200 +#: ppdc/sample.c:201 msgid "3.25x2.00\"" msgstr "3.25x2.00 インチ" -#: ppdc/sample.c:201 +#: ppdc/sample.c:202 msgid "3.25x5.00\"" msgstr "3.25x5.00 インチ" -#: ppdc/sample.c:202 +#: ppdc/sample.c:203 msgid "3.25x5.50\"" msgstr "3.25x5.50 インチ" -#: ppdc/sample.c:203 +#: ppdc/sample.c:204 msgid "3.25x5.83\"" msgstr "3.25x5.83 インチ" -#: ppdc/sample.c:204 +#: ppdc/sample.c:205 msgid "3.25x7.83\"" msgstr "3.25x7.83 インチ" @@ -2962,115 +2962,115 @@ msgid "3.5\" Disk" msgstr "3.5 インチディスク" -#: ppdc/sample.c:205 +#: ppdc/sample.c:206 msgid "3.50x1.00\"" msgstr "3.50x1.00 インチ" -#: ppdc/sample.c:377 +#: ppdc/sample.c:380 msgid "30" msgstr "30" -#: ppdc/sample.c:325 +#: ppdc/sample.c:328 msgid "30 mm/sec." msgstr "30 ミリメートル/秒" -#: ppdc/sample.c:334 +#: ppdc/sample.c:337 msgid "300 mm/sec." msgstr "300 ミリメートル/秒" -#: ppdc/sample.c:234 +#: ppdc/sample.c:235 msgid "300dpi" msgstr "300dpi" -#: ppdc/sample.c:405 +#: ppdc/sample.c:408 msgid "35" msgstr "35" -#: ppdc/sample.c:246 +#: ppdc/sample.c:250 msgid "360dpi" msgstr "360dpi" -#: ppdc/sample.c:245 +#: ppdc/sample.c:249 msgid "360x180dpi" msgstr "360x180dpi" -#: ppdc/sample.c:310 +#: ppdc/sample.c:313 msgid "4" msgstr "4" -#: ppdc/sample.c:382 +#: ppdc/sample.c:385 msgid "4 inches/sec." msgstr "4 インチ/秒" -#: cups/ppd-cache.c:3001 +#: cups/ppd-cache.c:3017 msgid "4-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:2999 +#: cups/ppd-cache.c:3015 msgid "4-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2998 +#: cups/ppd-cache.c:3014 msgid "4-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3000 +#: cups/ppd-cache.c:3016 msgid "4-Hole Punch (Reverse Portrait)" msgstr "" -#: ppdc/sample.c:206 +#: ppdc/sample.c:207 msgid "4.00x1.00\"" msgstr "4.00x1.00 インチ" -#: ppdc/sample.c:214 +#: ppdc/sample.c:215 msgid "4.00x13.00\"" msgstr "4.00x13.00 インチ" -#: ppdc/sample.c:207 +#: ppdc/sample.c:208 msgid "4.00x2.00\"" msgstr "4.00x2.00 インチ" -#: ppdc/sample.c:208 +#: ppdc/sample.c:209 msgid "4.00x2.50\"" msgstr "4.00x2.50 インチ" -#: ppdc/sample.c:209 +#: ppdc/sample.c:210 msgid "4.00x3.00\"" msgstr "4.00x3.00 インチ" -#: ppdc/sample.c:210 +#: ppdc/sample.c:211 msgid "4.00x4.00\"" msgstr "4.00x4.00 インチ" -#: ppdc/sample.c:211 +#: ppdc/sample.c:212 msgid "4.00x5.00\"" msgstr "4.00x5.00 インチ" -#: ppdc/sample.c:212 +#: ppdc/sample.c:213 msgid "4.00x6.00\"" msgstr "4.00x6.00 インチ" -#: ppdc/sample.c:213 +#: ppdc/sample.c:214 msgid "4.00x6.50\"" msgstr "4.00x6.50 インチ" -#: ppdc/sample.c:406 +#: ppdc/sample.c:409 msgid "40" msgstr "40" -#: ppdc/sample.c:326 +#: ppdc/sample.c:329 msgid "40 mm/sec." msgstr "40 ミリメートル/秒" -#: ppdc/sample.c:407 +#: ppdc/sample.c:410 msgid "45" msgstr "45" -#: ppdc/sample.c:311 +#: ppdc/sample.c:314 msgid "5" msgstr "5" -#: ppdc/sample.c:432 +#: ppdc/sample.c:435 msgid "5 inches/sec." msgstr "5 インチ/秒" @@ -3078,79 +3078,79 @@ msgid "5 x 7" msgstr "5 x 7 インチ" -#: ppdc/sample.c:408 +#: ppdc/sample.c:411 msgid "50" msgstr "50" -#: ppdc/sample.c:409 +#: ppdc/sample.c:412 msgid "55" msgstr "55" -#: ppdc/sample.c:312 +#: ppdc/sample.c:315 msgid "6" msgstr "6" -#: ppdc/sample.c:433 +#: ppdc/sample.c:436 msgid "6 inches/sec." msgstr "6 インチ/秒" -#: ppdc/sample.c:215 +#: ppdc/sample.c:216 msgid "6.00x1.00\"" msgstr "6.00x1.00 インチ" -#: ppdc/sample.c:216 +#: ppdc/sample.c:217 msgid "6.00x2.00\"" msgstr "6.00x2.00 インチ" -#: ppdc/sample.c:217 +#: ppdc/sample.c:218 msgid "6.00x3.00\"" msgstr "6.00x3.00 インチ" -#: ppdc/sample.c:218 +#: ppdc/sample.c:219 msgid "6.00x4.00\"" msgstr "6.00x4.00 インチ" -#: ppdc/sample.c:219 +#: ppdc/sample.c:220 msgid "6.00x5.00\"" msgstr "6.00x5.00 インチ" -#: ppdc/sample.c:220 +#: ppdc/sample.c:221 msgid "6.00x6.00\"" msgstr "6.00x6.00 インチ" -#: ppdc/sample.c:221 +#: ppdc/sample.c:222 msgid "6.00x6.50\"" msgstr "6.00x6.50 インチ" -#: ppdc/sample.c:410 +#: ppdc/sample.c:413 msgid "60" msgstr "60" -#: ppdc/sample.c:327 +#: ppdc/sample.c:330 msgid "60 mm/sec." msgstr "60 ミリメートル/秒" -#: ppdc/sample.c:253 +#: ppdc/sample.c:257 msgid "600dpi" msgstr "600dpi" -#: ppdc/sample.c:242 +#: ppdc/sample.c:246 msgid "60dpi" msgstr "60dpi" -#: ppdc/sample.c:248 +#: ppdc/sample.c:252 msgid "60x72dpi" msgstr "60x72dpi" -#: ppdc/sample.c:411 +#: ppdc/sample.c:414 msgid "65" msgstr "65" -#: ppdc/sample.c:313 +#: ppdc/sample.c:316 msgid "7" msgstr "7" -#: ppdc/sample.c:435 +#: ppdc/sample.c:438 msgid "7 inches/sec." msgstr "7 インチ/秒" @@ -3158,19 +3158,19 @@ msgid "7 x 9" msgstr "7 x 9 インチ" -#: ppdc/sample.c:412 +#: ppdc/sample.c:415 msgid "70" msgstr "70" -#: ppdc/sample.c:413 +#: ppdc/sample.c:416 msgid "75" msgstr "75" -#: ppdc/sample.c:314 +#: ppdc/sample.c:317 msgid "8" msgstr "8" -#: ppdc/sample.c:436 +#: ppdc/sample.c:439 msgid "8 inches/sec." msgstr "8 インチ/秒" @@ -3178,51 +3178,51 @@ msgid "8 x 10" msgstr "8 x 10 インチ" -#: ppdc/sample.c:222 +#: ppdc/sample.c:223 msgid "8.00x1.00\"" msgstr "8.00x1.00 インチ" -#: ppdc/sample.c:223 +#: ppdc/sample.c:224 msgid "8.00x2.00\"" msgstr "8.00x2.00 インチ" -#: ppdc/sample.c:224 +#: ppdc/sample.c:225 msgid "8.00x3.00\"" msgstr "8.00x3.00 インチ" -#: ppdc/sample.c:225 +#: ppdc/sample.c:226 msgid "8.00x4.00\"" msgstr "8.00x4.00 インチ" -#: ppdc/sample.c:226 +#: ppdc/sample.c:227 msgid "8.00x5.00\"" msgstr "8.00x5.00 インチ" -#: ppdc/sample.c:227 +#: ppdc/sample.c:228 msgid "8.00x6.00\"" msgstr "8.00x6.00 インチ" -#: ppdc/sample.c:228 +#: ppdc/sample.c:229 msgid "8.00x6.50\"" msgstr "8.00x6.50 インチ" -#: ppdc/sample.c:414 +#: ppdc/sample.c:417 msgid "80" msgstr "80" -#: ppdc/sample.c:328 +#: ppdc/sample.c:331 msgid "80 mm/sec." msgstr "80 ミリメートル/秒" -#: ppdc/sample.c:415 +#: ppdc/sample.c:418 msgid "85" msgstr "85" -#: ppdc/sample.c:315 +#: ppdc/sample.c:318 msgid "9" msgstr "9" -#: ppdc/sample.c:437 +#: ppdc/sample.c:440 msgid "9 inches/sec." msgstr "9 インチ/秒" @@ -3234,15 +3234,15 @@ msgid "9 x 12" msgstr "9 x 12 インチ" -#: ppdc/sample.c:247 +#: ppdc/sample.c:251 msgid "9-Pin Series" msgstr "9 ピンシリーズ" -#: ppdc/sample.c:416 +#: ppdc/sample.c:419 msgid "90" msgstr "90" -#: ppdc/sample.c:417 +#: ppdc/sample.c:420 msgid "95" msgstr "95" @@ -3250,11 +3250,11 @@ msgid "?Invalid help command unknown." msgstr "?無効なヘルプコマンドです" -#: cgi-bin/admin.c:2353 +#: cgi-bin/admin.c:2352 msgid "A Samba password is required to export printer drivers" msgstr "プリンタードライバーをエクスポートするには Samba のパスワードが必要です。" -#: cgi-bin/admin.c:2349 +#: cgi-bin/admin.c:2348 msgid "A Samba username is required to export printer drivers" msgstr "プリンタードライバーをエクスポートするには、Samba のユーザー名が必要です。" @@ -3408,11 +3408,11 @@ msgid "Accept Jobs" msgstr "ジョブの受け付け" -#: cups/http-support.c:1494 +#: cups/http-support.c:1499 msgid "Accepted" msgstr "受け付けました" -#: cups/ppd-cache.c:2977 +#: cups/ppd-cache.c:2993 msgid "Accordian Fold" msgstr "" @@ -3437,23 +3437,23 @@ msgid "Administration" msgstr "管理" -#: cups/ppd-cache.c:3485 +#: cups/ppd-cache.c:3472 msgid "Advanced Photo Paper" msgstr "" -#: cups/ppd-cache.c:3398 +#: cups/ppd-cache.c:3386 msgid "Alternate" msgstr "" -#: cups/ppd-cache.c:3406 +#: cups/ppd-cache.c:3394 msgid "Alternate Roll" msgstr "" -#: cups/ppd-cache.c:3479 +#: cups/ppd-cache.c:3466 msgid "Aluminum" msgstr "" -#: ppdc/sample.c:424 +#: ppdc/sample.c:427 msgid "Always" msgstr "常に有効" @@ -3461,23 +3461,23 @@ msgid "AppSocket/HP JetDirect" msgstr "AppSocket/HP JetDirect" -#: ppdc/sample.c:445 +#: ppdc/sample.c:448 msgid "Applicator" msgstr "アプリケーター" -#: cups/ppd-cache.c:3513 +#: cups/ppd-cache.c:3500 msgid "Archival Envelope" msgstr "" -#: cups/ppd-cache.c:3525 +#: cups/ppd-cache.c:3512 msgid "Archival Fabric" msgstr "" -#: cups/ppd-cache.c:3602 +#: cups/ppd-cache.c:3589 msgid "Archival Paper" msgstr "" -#: cups/ppd-cache.c:3574 +#: cups/ppd-cache.c:3561 msgid "Archival Photo Paper" msgstr "" @@ -3501,7 +3501,7 @@ msgid "Attribute groups are out of order (%x < %x)." msgstr "属性グループは範囲外です (%x < %x)。" -#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3480 cups/ppd-cache.c:3803 +#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3467 cups/ppd-cache.c:3771 msgid "Automatic" msgstr "" @@ -3553,7 +3553,7 @@ msgid "B9" msgstr "B9" -#: cups/ppd-cache.c:3481 +#: cups/ppd-cache.c:3468 msgid "Back Print Film" msgstr "" @@ -3595,7 +3595,7 @@ msgid "Bad PPD file." msgstr "" -#: cups/http-support.c:1512 +#: cups/http-support.c:1517 msgid "Bad Request" msgstr "不正なリクエスト" @@ -3607,7 +3607,7 @@ msgid "Bad UIConstraints" msgstr "不正な UIConstraints" -#: cups/hash.c:48 cups/http-support.c:1606 +#: cups/hash.c:49 cups/http-support.c:1611 msgid "Bad arguments to function" msgstr "関数の引数が不正" @@ -3620,7 +3620,7 @@ msgid "Bad custom parameter" msgstr "不正なカスタムパラメーター" -#: cups/http-support.c:1746 scheduler/ipp.c:2365 +#: cups/http-support.c:1751 scheduler/ipp.c:2365 #, c-format msgid "Bad device-uri \"%s\"." msgstr "\"%s\" は無効な device-uri です。" @@ -3644,7 +3644,7 @@ msgid "Bad filename buffer" msgstr "不正なファイル名バッファーです。" -#: cups/http-support.c:1615 +#: cups/http-support.c:1620 msgid "Bad hostname/address in URI" msgstr "URI のホスト名/アドレスが不正" @@ -3707,7 +3707,7 @@ msgid "Bad page-ranges values %d-%d." msgstr "%d-%d は不正な page-ranges 値です。" -#: cups/http-support.c:1612 +#: cups/http-support.c:1617 msgid "Bad port number in URI" msgstr "URI のポート番号が不正" @@ -3740,19 +3740,19 @@ msgid "Bad requesting-user-name value: %s" msgstr "" -#: cups/http-support.c:1609 +#: cups/http-support.c:1614 msgid "Bad resource in URI" msgstr "URI のリソースが不正" -#: cups/http-support.c:1621 +#: cups/http-support.c:1626 msgid "Bad scheme in URI" msgstr "URI のスキームが不正" -#: cgi-bin/admin.c:1469 +#: cgi-bin/admin.c:1468 msgid "Bad subscription ID" msgstr "不正なサブスクリプション ID" -#: cups/http-support.c:1618 +#: cups/http-support.c:1623 msgid "Bad username in URI" msgstr "URI のユーザー名が不正" @@ -3760,11 +3760,11 @@ msgid "Bad value string" msgstr "値文字列がありません" -#: cups/http-support.c:1624 +#: cups/http-support.c:1629 msgid "Bad/empty URI" msgstr "URI が不正か空" -#: cups/ppd-cache.c:2962 +#: cups/ppd-cache.c:2978 msgid "Bale" msgstr "" @@ -3772,39 +3772,39 @@ msgid "Banners" msgstr "バナー" -#: cups/ppd-cache.c:2963 +#: cups/ppd-cache.c:2979 msgid "Bind" msgstr "" -#: cups/ppd-cache.c:2967 +#: cups/ppd-cache.c:2983 msgid "Bind (Landscape)" msgstr "" -#: cups/ppd-cache.c:2965 +#: cups/ppd-cache.c:2981 msgid "Bind (Portrait)" msgstr "" -#: cups/ppd-cache.c:2964 +#: cups/ppd-cache.c:2980 msgid "Bind (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2966 +#: cups/ppd-cache.c:2982 msgid "Bind (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3514 +#: cups/ppd-cache.c:3501 msgid "Bond Envelope" msgstr "" -#: ppdc/sample.c:282 +#: ppdc/sample.c:285 msgid "Bond Paper" msgstr "ボンド紙" -#: cups/ppd-cache.c:4152 +#: cups/ppd-cache.c:4277 msgid "Booklet" msgstr "" -#: cups/ppd-cache.c:2968 +#: cups/ppd-cache.c:2984 msgid "Booklet Maker" msgstr "" @@ -3813,11 +3813,11 @@ msgid "Boolean expected for waiteof option \"%s\"." msgstr "論理値は、waiteof オプション \"%s\" であるべきです" -#: cups/ppd-cache.c:3409 +#: cups/ppd-cache.c:3397 msgid "Bottom" msgstr "" -#: cups/ppd-cache.c:3804 +#: cups/ppd-cache.c:3772 msgid "Bottom Tray" msgstr "" @@ -3825,15 +3825,15 @@ msgid "Buffer overflow detected, aborting." msgstr "オーバーフローが検出され、中断しました。" -#: cups/ppd-cache.c:3484 +#: cups/ppd-cache.c:3471 msgid "CD" msgstr "" -#: ppdc/sample.c:277 +#: ppdc/sample.c:280 msgid "CMYK" msgstr "CMYK" -#: ppdc/sample.c:358 +#: ppdc/sample.c:361 msgid "CPCL Label Printer" msgstr "CPCL ラベルプリンター" @@ -3841,11 +3841,11 @@ msgid "Cancel Jobs" msgstr "ジョブをキャンセル" -#: cgi-bin/admin.c:1470 cgi-bin/admin.c:1509 cgi-bin/admin.c:1519 +#: cgi-bin/admin.c:1469 cgi-bin/admin.c:1508 cgi-bin/admin.c:1518 msgid "Cancel RSS Subscription" msgstr "RSS 購読をキャンセル" -#: backend/ipp.c:2287 +#: backend/ipp.c:2295 msgid "Canceling print job." msgstr "プリントジョブをキャンセルしています。" @@ -3857,23 +3857,23 @@ msgid "Cannot share a remote Kerberized printer." msgstr "リモートの Kerberos 認証のプリンターを共有できません。" -#: cups/ppd-cache.c:3482 +#: cups/ppd-cache.c:3469 msgid "Cardboard" msgstr "" -#: cups/ppd-cache.c:3483 +#: cups/ppd-cache.c:3470 msgid "Cardstock" msgstr "" -#: ppdc/sample.c:271 +#: ppdc/sample.c:274 msgid "Cassette" msgstr "カセット" -#: cups/ppd-cache.c:3413 +#: cups/ppd-cache.c:3401 msgid "Center" msgstr "" -#: cups/ppd-cache.c:3805 +#: cups/ppd-cache.c:3773 msgid "Center Tray" msgstr "" @@ -3899,27 +3899,27 @@ msgid "Close-Job doesn't support the job-uri attribute." msgstr "Close-Job は job-uri 属性をサポートしていません。" -#: cups/ppd-cache.c:2969 +#: cups/ppd-cache.c:2985 msgid "Coat" msgstr "" -#: cups/ppd-cache.c:3515 +#: cups/ppd-cache.c:3502 msgid "Coated Envelope" msgstr "" -#: cups/ppd-cache.c:3603 +#: cups/ppd-cache.c:3590 msgid "Coated Paper" msgstr "" -#: cups/ppd-cache.c:3790 ppdc/sample.c:276 +#: cups/ppd-cache.c:3790 ppdc/sample.c:279 msgid "Color" msgstr "カラー" -#: cups/ppd-cache.c:3751 ppdc/sample.c:274 +#: cups/ppd-cache.c:3751 ppdc/sample.c:277 msgid "Color Mode" msgstr "カラーモード" -#: cups/ppd-cache.c:3550 +#: cups/ppd-cache.c:3537 msgid "Colored Labels" msgstr "" @@ -3937,59 +3937,59 @@ msgid "Community name uses indefinite length" msgstr "コミュニティ名の長さが不定" -#: backend/ipp.c:865 backend/lpd.c:929 backend/socket.c:375 +#: backend/ipp.c:864 backend/lpd.c:933 backend/socket.c:375 msgid "Connected to printer." msgstr "プリンターに接続しました。" -#: backend/ipp.c:701 backend/lpd.c:753 backend/socket.c:295 +#: backend/ipp.c:700 backend/lpd.c:757 backend/socket.c:295 msgid "Connecting to printer." msgstr "プリンターに接続中。" -#: cups/http-support.c:1482 +#: cups/http-support.c:1487 msgid "Continue" msgstr "継続" -#: ppdc/sample.c:360 +#: ppdc/sample.c:363 msgid "Continuous" msgstr "連続" -#: cups/ppd-cache.c:3499 +#: cups/ppd-cache.c:3486 msgid "Continuous Long" msgstr "" -#: cups/ppd-cache.c:3500 +#: cups/ppd-cache.c:3487 msgid "Continuous Short" msgstr "" -#: backend/lpd.c:1078 backend/lpd.c:1210 +#: backend/lpd.c:1082 backend/lpd.c:1214 msgid "Control file sent successfully." msgstr "コントロールファイルが正常に送信されました。" -#: backend/ipp.c:1396 backend/lpd.c:445 +#: backend/ipp.c:1395 backend/lpd.c:449 msgid "Copying print data." msgstr "印刷データをコピーしています。" -#: cups/ppd-cache.c:3516 +#: cups/ppd-cache.c:3503 msgid "Cotton Envelope" msgstr "" -#: cups/ppd-cache.c:3604 +#: cups/ppd-cache.c:3591 msgid "Cotton Paper" msgstr "" -#: cups/ppd-cache.c:2970 +#: cups/ppd-cache.c:2986 msgid "Cover" msgstr "" -#: cups/http-support.c:1491 +#: cups/http-support.c:1496 msgid "Created" msgstr "ジョブ作成" -#: cups/tls-darwin.c:748 cups/tls-gnutls.c:582 +#: cups/tls-darwin.c:723 cups/tls-gnutls.c:582 msgid "Credentials do not validate against site CA certificate." msgstr "" -#: cups/tls-darwin.c:759 cups/tls-gnutls.c:599 +#: cups/tls-darwin.c:734 cups/tls-gnutls.c:599 msgid "Credentials have expired." msgstr "" @@ -3997,39 +3997,39 @@ msgid "Custom" msgstr "カスタム" -#: ppdc/sample.c:354 +#: ppdc/sample.c:357 msgid "CustominCutInterval" msgstr "CustominCutInterval" -#: ppdc/sample.c:352 +#: ppdc/sample.c:355 msgid "CustominTearInterval" msgstr "CustominTearInterval" -#: ppdc/sample.c:338 +#: cups/ppd-cache.c:4312 ppdc/sample.c:341 msgid "Cut" msgstr "カット" -#: cups/ppd-cache.c:3026 +#: cups/ppd-cache.c:3042 msgid "Cut Media" msgstr "" -#: ppdc/sample.c:446 +#: ppdc/sample.c:449 msgid "Cutter" msgstr "カッター" -#: cups/ppd-cache.c:3509 +#: cups/ppd-cache.c:3496 msgid "DVD" msgstr "" -#: ppdc/sample.c:239 +#: ppdc/sample.c:243 msgid "Dark" msgstr "濃い" -#: ppdc/sample.c:235 +#: ppdc/sample.c:239 msgid "Darkness" msgstr "濃さ" -#: backend/lpd.c:1163 +#: backend/lpd.c:1167 msgid "Data file sent successfully." msgstr "データファイルが正常に送信されました。" @@ -4045,7 +4045,7 @@ msgid "Delete Printer" msgstr "プリンターの削除" -#: ppdc/sample.c:273 +#: ppdc/sample.c:276 msgid "DeskJet Series" msgstr "DeskJet シリーズ" @@ -4071,7 +4071,7 @@ " device-id = %s\n" " location = %s" -#: ppdc/sample.c:431 +#: ppdc/sample.c:434 msgid "Direct Thermal Media" msgstr "感熱紙" @@ -4100,11 +4100,11 @@ msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)." msgstr "ディレクトリー \"%s\" のパーミッションは問題ありません (0%o/uid=%d/gid=%d)。" -#: ppdc/sample.c:340 +#: ppdc/sample.c:343 msgid "Disabled" msgstr "無効" -#: cups/ppd-cache.c:3402 +#: cups/ppd-cache.c:3390 msgid "Disc" msgstr "" @@ -4113,40 +4113,40 @@ msgid "Document #%d does not exist in job #%d." msgstr "ドキュメント #%d がジョブ #%d に見つかりません。" -#: cups/ppd-cache.c:2978 +#: cups/ppd-cache.c:2994 msgid "Double Gate Fold" msgstr "" -#: cups/ppd-cache.c:3019 +#: cups/ppd-cache.c:3035 msgid "Double Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3017 +#: cups/ppd-cache.c:3033 msgid "Double Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3016 +#: cups/ppd-cache.c:3032 msgid "Double Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3018 +#: cups/ppd-cache.c:3034 msgid "Double Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3507 +#: cups/ppd-cache.c:3494 msgid "Double Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:4283 cups/ppd-cache.c:4285 cups/ppd-cache.c:4348 -#: cups/ppd-cache.c:4385 +#: cups/ppd-cache.c:4471 cups/ppd-cache.c:4473 cups/ppd-cache.c:4536 +#: cups/ppd-cache.c:4573 msgid "Draft" msgstr "" -#: cups/ppd-cache.c:3508 +#: cups/ppd-cache.c:3495 msgid "Dry Film" msgstr "" -#: ppdc/sample.c:267 +#: ppdc/sample.c:270 msgid "Duplexer" msgstr "両面オプション" @@ -4154,11 +4154,11 @@ msgid "Dymo" msgstr "Dymo" -#: ppdc/sample.c:426 +#: ppdc/sample.c:429 msgid "EPL1 Label Printer" msgstr "EPL1 ラベルプリンター" -#: ppdc/sample.c:429 +#: ppdc/sample.c:432 msgid "EPL2 Label Printer" msgstr "EPL2 ラベルプリンター" @@ -4168,7 +4168,7 @@ msgid "Edit Configuration File" msgstr "設定ファイルの編集" -#: cups/ppd-cache.c:3510 +#: cups/ppd-cache.c:3497 msgid "Embossing Foil" msgstr "" @@ -4180,7 +4180,7 @@ msgid "Encryption is not supported." msgstr "暗号化はサポートされていません。" -#: cups/ppd-cache.c:3511 +#: cups/ppd-cache.c:3498 msgid "End Board" msgstr "" @@ -4189,7 +4189,7 @@ msgid "Ending Banner" msgstr "終了バナー" -#: cups/ppd-cache.c:2979 +#: cups/ppd-cache.c:2995 msgid "Engineering Z Fold" msgstr "" @@ -4206,7 +4206,7 @@ "このページにアクセスするために、あなたのユーザー名とパスワード、あるいは root のユーザー名とパスワードを入力してください。Kerberos " "認証を使用している場合、有効な Kerberos チケットがあることを確認してください。" -#: cups/ppd-cache.c:3401 cups/ppd-cache.c:3512 +#: cups/ppd-cache.c:3389 cups/ppd-cache.c:3499 msgid "Envelope" msgstr "" @@ -4298,7 +4298,7 @@ msgid "Envelope DL" msgstr "封筒 DL" -#: ppdc/sample.c:261 +#: ppdc/sample.c:264 msgid "Envelope Feed" msgstr "封筒フィード" @@ -4426,7 +4426,7 @@ msgid "Environment Variables:" msgstr "環境変数:" -#: ppdc/sample.c:240 +#: ppdc/sample.c:244 msgid "Epson" msgstr "Epson" @@ -4455,51 +4455,51 @@ msgid "European Fanfold Legal" msgstr "" -#: ppdc/sample.c:350 +#: ppdc/sample.c:353 msgid "Every 10 Labels" msgstr "10 ラベルごと" -#: ppdc/sample.c:342 +#: ppdc/sample.c:345 msgid "Every 2 Labels" msgstr "2 ラベルごと" -#: ppdc/sample.c:343 +#: ppdc/sample.c:346 msgid "Every 3 Labels" msgstr "3 ラベルごと" -#: ppdc/sample.c:344 +#: ppdc/sample.c:347 msgid "Every 4 Labels" msgstr "4 ラベルごと" -#: ppdc/sample.c:345 +#: ppdc/sample.c:348 msgid "Every 5 Labels" msgstr "5 ラベルごと" -#: ppdc/sample.c:346 +#: ppdc/sample.c:349 msgid "Every 6 Labels" msgstr "6 ラベルごと" -#: ppdc/sample.c:347 +#: ppdc/sample.c:350 msgid "Every 7 Labels" msgstr "7 ラベルごと" -#: ppdc/sample.c:348 +#: ppdc/sample.c:351 msgid "Every 8 Labels" msgstr "8 ラベルごと" -#: ppdc/sample.c:349 +#: ppdc/sample.c:352 msgid "Every 9 Labels" msgstr "9 ラベルごと" -#: ppdc/sample.c:341 +#: ppdc/sample.c:344 msgid "Every Label" msgstr "すべてのラベル" -#: cups/ppd-cache.c:3490 +#: cups/ppd-cache.c:3477 msgid "Everyday Glossy Photo Paper" msgstr "" -#: cups/ppd-cache.c:3491 +#: cups/ppd-cache.c:3478 msgid "Everyday Matte Paper" msgstr "" @@ -4507,11 +4507,11 @@ msgid "Executive" msgstr "エグゼクティブ" -#: cups/http-support.c:1540 +#: cups/http-support.c:1545 msgid "Expectation Failed" msgstr "予測に失敗しました" -#: cgi-bin/admin.c:2341 cgi-bin/admin.c:2360 +#: cgi-bin/admin.c:2340 cgi-bin/admin.c:2359 msgid "Export Printers to Samba" msgstr "Samba へプリンターをエクスポート" @@ -4519,7 +4519,7 @@ msgid "Expressions:" msgstr "式:" -#: cups/ppd-cache.c:3492 +#: cups/ppd-cache.c:3479 msgid "Extra Heavyweight Paper" msgstr "" @@ -4533,15 +4533,15 @@ msgid "FAIL" msgstr "失敗" -#: cups/ppd-cache.c:3524 +#: cups/ppd-cache.c:3511 msgid "Fabric" msgstr "" -#: cups/ppd-cache.c:3806 +#: cups/ppd-cache.c:3774 msgid "Face Down" msgstr "" -#: cups/ppd-cache.c:3807 +#: cups/ppd-cache.c:3775 msgid "Face Up" msgstr "" @@ -4587,37 +4587,37 @@ "ファイルデバイス URI は無効になっています。有効にするには、\"%s/cups-files.conf\" の FileDevice " "ディレクティブを参照してください。" -#: cups/ppd-cache.c:3531 +#: cups/ppd-cache.c:3518 msgid "Film" msgstr "" -#: cups/ppd-cache.c:3517 +#: cups/ppd-cache.c:3504 msgid "Fine Envelope" msgstr "" #: filter/rastertoepson.c:1131 filter/rastertohp.c:802 -#: filter/rastertolabel.c:1259 +#: filter/rastertolabel.c:1260 #, c-format msgid "Finished page %d." msgstr "ページ %d を終了。" -#: cups/ppd-cache.c:3532 +#: cups/ppd-cache.c:3519 msgid "Flexo Base" msgstr "" -#: cups/ppd-cache.c:3533 +#: cups/ppd-cache.c:3520 msgid "Flexo Photo Polymer" msgstr "" -#: cups/ppd-cache.c:3534 +#: cups/ppd-cache.c:3521 msgid "Flute" msgstr "" -#: cups/ppd-cache.c:3535 +#: cups/ppd-cache.c:3522 msgid "Foil" msgstr "" -#: cups/ppd-cache.c:4061 +#: cups/ppd-cache.c:4134 msgid "Fold" msgstr "" @@ -4625,19 +4625,19 @@ msgid "Folio" msgstr "フォリオ" -#: cups/http-support.c:1519 +#: cups/http-support.c:1524 msgid "Forbidden" msgstr "Forbidden" -#: cups/http-support.c:1503 +#: cups/http-support.c:1508 msgid "Found" msgstr "" -#: cups/ppd-cache.c:3536 +#: cups/ppd-cache.c:3523 msgid "Full Cut Tabs" msgstr "" -#: cups/ppd-cache.c:2980 +#: cups/ppd-cache.c:2996 msgid "Gate Fold" msgstr "" @@ -4645,7 +4645,7 @@ msgid "General" msgstr "一般" -#: ppdc/sample.c:251 +#: ppdc/sample.c:255 msgid "Generic" msgstr "汎用" @@ -4653,47 +4653,47 @@ msgid "Get-Response-PDU uses indefinite length" msgstr "Get-Response-PDU は不確定の長さを使用しています" -#: cups/ppd-cache.c:3537 +#: cups/ppd-cache.c:3524 msgid "Glass" msgstr "" -#: cups/ppd-cache.c:3538 +#: cups/ppd-cache.c:3525 msgid "Glass Colored" msgstr "" -#: cups/ppd-cache.c:3539 +#: cups/ppd-cache.c:3526 msgid "Glass Opaque" msgstr "" -#: cups/ppd-cache.c:3540 +#: cups/ppd-cache.c:3527 msgid "Glass Surfaced" msgstr "" -#: cups/ppd-cache.c:3541 +#: cups/ppd-cache.c:3528 msgid "Glass Textured" msgstr "" -#: cups/ppd-cache.c:3486 +#: cups/ppd-cache.c:3473 msgid "Glossy Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3526 +#: cups/ppd-cache.c:3513 msgid "Glossy Fabric" msgstr "" -#: cups/ppd-cache.c:3551 +#: cups/ppd-cache.c:3538 msgid "Glossy Labels" msgstr "" -#: cups/ppd-cache.c:3502 +#: cups/ppd-cache.c:3489 msgid "Glossy Optical Disc" msgstr "" -#: ppdc/sample.c:285 +#: ppdc/sample.c:288 msgid "Glossy Paper" msgstr "光沢紙" -#: cups/ppd-cache.c:3576 +#: cups/ppd-cache.c:3563 msgid "Glossy Photo Paper" msgstr "" @@ -4704,27 +4704,27 @@ msgid "Got a printer-uri attribute but no job-id." msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした。" -#: cups/ppd-cache.c:3542 +#: cups/ppd-cache.c:3529 msgid "Gravure Cylinder" msgstr "" -#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:275 +#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:278 msgid "Grayscale" msgstr "グレースケール" -#: ppdc/sample.c:272 +#: ppdc/sample.c:275 msgid "HP" msgstr "HP" -#: cups/ppd-cache.c:3404 +#: cups/ppd-cache.c:3392 msgid "Hagaki" msgstr "" -#: cups/ppd-cache.c:2981 +#: cups/ppd-cache.c:2997 msgid "Half Fold" msgstr "" -#: cups/ppd-cache.c:2982 +#: cups/ppd-cache.c:2998 msgid "Half Z Fold" msgstr "" @@ -4732,19 +4732,19 @@ msgid "Hanging Folder" msgstr "Hanging Folder" -#: cups/hash.c:292 +#: cups/hash.c:289 msgid "Hash buffer too small." msgstr "" -#: cups/ppd-cache.c:3607 +#: cups/ppd-cache.c:3594 msgid "Heavyweight Coated Paper" msgstr "" -#: cups/ppd-cache.c:3518 +#: cups/ppd-cache.c:3505 msgid "Heavyweight Envelope" msgstr "" -#: cups/ppd-cache.c:3606 +#: cups/ppd-cache.c:3593 msgid "Heavyweight Paper" msgstr "" @@ -4752,23 +4752,23 @@ msgid "Help file not in index." msgstr "ヘルプファイルが索引に含まれていません。" -#: cups/ppd-cache.c:4290 cups/ppd-cache.c:4359 cups/ppd-cache.c:4390 +#: cups/ppd-cache.c:4478 cups/ppd-cache.c:4547 cups/ppd-cache.c:4578 msgid "High" msgstr "" -#: cups/ppd-cache.c:3527 +#: cups/ppd-cache.c:3514 msgid "High Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3552 +#: cups/ppd-cache.c:3539 msgid "High Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3503 +#: cups/ppd-cache.c:3490 msgid "High Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3577 +#: cups/ppd-cache.c:3564 msgid "High Gloss Photo Paper" msgstr "" @@ -4888,43 +4888,43 @@ msgid "Illegal whitespace character" msgstr "不正な空白文字" -#: cups/ppd-cache.c:3543 +#: cups/ppd-cache.c:3530 msgid "Image Setter Paper" msgstr "" -#: cups/ppd-cache.c:3544 +#: cups/ppd-cache.c:3531 msgid "Imaging Cylinder" msgstr "" -#: cups/ppd-cache.c:3519 +#: cups/ppd-cache.c:3506 msgid "Inkjet Envelope" msgstr "" -#: cups/ppd-cache.c:3553 +#: cups/ppd-cache.c:3540 msgid "Inkjet Labels" msgstr "" -#: cups/ppd-cache.c:3608 +#: cups/ppd-cache.c:3595 msgid "Inkjet Paper" msgstr "" -#: ppdc/sample.c:266 +#: ppdc/sample.c:269 msgid "Installable Options" msgstr "インストール可能オプション" -#: ppdc/sample.c:269 +#: ppdc/sample.c:272 msgid "Installed" msgstr "インストールされています" -#: ppdc/sample.c:288 +#: ppdc/sample.c:291 msgid "IntelliBar Label Printer" msgstr "IntelliBar ラベルプリンター" -#: ppdc/sample.c:287 +#: ppdc/sample.c:290 msgid "Intellitech" msgstr "Intellitech" -#: cups/http-support.c:1546 +#: cups/http-support.c:1551 msgid "Internal Server Error" msgstr "サーバー内部エラー" @@ -4940,7 +4940,7 @@ msgid "Internet Postage 3-Part" msgstr "Internet Postage 3-Part" -#: backend/ipp.c:319 +#: backend/ipp.c:318 msgid "Internet Printing Protocol" msgstr "インターネット印刷プロトコル" @@ -5107,31 +5107,31 @@ msgid "Jobs" msgstr "ジョブ" -#: cups/ppd-cache.c:2989 +#: cups/ppd-cache.c:3005 msgid "Jog" msgstr "" -#: backend/lpd.c:162 +#: backend/lpd.c:166 msgid "LPD/LPR Host or Printer" msgstr "LPD/LPR ホストまたはプリンター" -#: ppdc/sample.c:230 +#: ppdc/sample.c:231 msgid "Label Printer" msgstr "ラベルプリンター" -#: ppdc/sample.c:441 +#: ppdc/sample.c:444 msgid "Label Top" msgstr "ラベルトップ" -#: cups/ppd-cache.c:3549 +#: cups/ppd-cache.c:3536 msgid "Labels" msgstr "" -#: cups/ppd-cache.c:2990 +#: cups/ppd-cache.c:3006 msgid "Laminate" msgstr "" -#: cups/ppd-cache.c:3559 +#: cups/ppd-cache.c:3546 msgid "Laminating Foil" msgstr "" @@ -5144,31 +5144,31 @@ msgid "Large Address" msgstr "ラージアドレス" -#: cups/ppd-cache.c:3399 +#: cups/ppd-cache.c:3387 msgid "Large Capacity" msgstr "" -#: cups/ppd-cache.c:3808 +#: cups/ppd-cache.c:3776 msgid "Large Capacity Tray" msgstr "" -#: ppdc/sample.c:286 +#: ppdc/sample.c:289 msgid "LaserJet Series PCL 4/5" msgstr "LaserJet Series PCL 4/5" -#: cups/ppd-cache.c:3411 +#: cups/ppd-cache.c:3399 msgid "Left" msgstr "" -#: cups/ppd-cache.c:2983 +#: cups/ppd-cache.c:2999 msgid "Left Gate Fold" msgstr "" -#: cups/ppd-cache.c:3809 +#: cups/ppd-cache.c:3777 msgid "Left Tray" msgstr "" -#: cups/ppd-cache.c:2984 +#: cups/ppd-cache.c:3000 msgid "Letter Fold" msgstr "" @@ -5180,19 +5180,19 @@ msgid "Letter Oversize Long Edge" msgstr "US レター (特大) 長辺送り" -#: cups/ppd-cache.c:3560 cups/ppd-cache.c:3609 +#: cups/ppd-cache.c:3547 cups/ppd-cache.c:3596 msgid "Letterhead" msgstr "" -#: ppdc/sample.c:236 +#: ppdc/sample.c:240 msgid "Light" msgstr "薄い" -#: cups/ppd-cache.c:3520 +#: cups/ppd-cache.c:3507 msgid "Lightweight Envelope" msgstr "" -#: cups/ppd-cache.c:3610 +#: cups/ppd-cache.c:3597 msgid "Lightweight Paper" msgstr "" @@ -5212,91 +5212,91 @@ msgid "Local printer created." msgstr "" -#: cups/ppd-cache.c:3872 ppdc/sample.c:264 +#: cups/ppd-cache.c:3872 ppdc/sample.c:267 msgid "Long-Edge (Portrait)" msgstr "長辺給紙 (縦向き)" -#: cups/http-support.c:1870 +#: cups/http-support.c:1875 msgid "Looking for printer." msgstr "プリンターを検索しています。" -#: cups/ppd-cache.c:3810 +#: cups/ppd-cache.c:3778 msgid "Mailbox 1" msgstr "" -#: cups/ppd-cache.c:3819 +#: cups/ppd-cache.c:3787 msgid "Mailbox 10" msgstr "" -#: cups/ppd-cache.c:3811 +#: cups/ppd-cache.c:3779 msgid "Mailbox 2" msgstr "" -#: cups/ppd-cache.c:3812 +#: cups/ppd-cache.c:3780 msgid "Mailbox 3" msgstr "" -#: cups/ppd-cache.c:3813 +#: cups/ppd-cache.c:3781 msgid "Mailbox 4" msgstr "" -#: cups/ppd-cache.c:3814 +#: cups/ppd-cache.c:3782 msgid "Mailbox 5" msgstr "" -#: cups/ppd-cache.c:3815 +#: cups/ppd-cache.c:3783 msgid "Mailbox 6" msgstr "" -#: cups/ppd-cache.c:3816 +#: cups/ppd-cache.c:3784 msgid "Mailbox 7" msgstr "" -#: cups/ppd-cache.c:3817 +#: cups/ppd-cache.c:3785 msgid "Mailbox 8" msgstr "" -#: cups/ppd-cache.c:3818 +#: cups/ppd-cache.c:3786 msgid "Mailbox 9" msgstr "" -#: cups/ppd-cache.c:3397 +#: cups/ppd-cache.c:3385 msgid "Main" msgstr "" -#: cups/ppd-cache.c:3405 +#: ppdc/sample.c:237 msgid "Main Roll" msgstr "" -#: cups/ppd-cache.c:3400 +#: cups/ppd-cache.c:3388 msgid "Manual" msgstr "" -#: ppdc/sample.c:260 +#: ppdc/sample.c:263 msgid "Manual Feed" msgstr "手差し" -#: cups/ppd-cache.c:3487 +#: cups/ppd-cache.c:3474 msgid "Matte Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3488 +#: cups/ppd-cache.c:3475 msgid "Matte Cover Paper" msgstr "" -#: cups/ppd-cache.c:3528 +#: cups/ppd-cache.c:3515 msgid "Matte Fabric" msgstr "" -#: cups/ppd-cache.c:3554 +#: cups/ppd-cache.c:3541 msgid "Matte Labels" msgstr "" -#: cups/ppd-cache.c:3504 +#: cups/ppd-cache.c:3491 msgid "Matte Optical Disc" msgstr "" -#: cups/ppd-cache.c:3578 +#: cups/ppd-cache.c:3565 msgid "Matte Photo Paper" msgstr "" @@ -5304,19 +5304,19 @@ msgid "Media Size" msgstr "用紙サイズ" -#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:254 +#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:236 msgid "Media Source" msgstr "給紙" -#: ppdc/sample.c:359 +#: ppdc/sample.c:362 msgid "Media Tracking" msgstr "用紙の経路" -#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:280 +#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:283 msgid "Media Type" msgstr "用紙種類" -#: ppdc/sample.c:237 +#: ppdc/sample.c:241 msgid "Medium" msgstr "紙質" @@ -5324,35 +5324,35 @@ msgid "Memory allocation error" msgstr "メモリー割り当てエラー" -#: cups/ppd-cache.c:3561 +#: cups/ppd-cache.c:3548 msgid "Metal" msgstr "" -#: cups/ppd-cache.c:3562 +#: cups/ppd-cache.c:3549 msgid "Metal Glossy" msgstr "" -#: cups/ppd-cache.c:3563 +#: cups/ppd-cache.c:3550 msgid "Metal High Gloss" msgstr "" -#: cups/ppd-cache.c:3564 +#: cups/ppd-cache.c:3551 msgid "Metal Matte" msgstr "" -#: cups/ppd-cache.c:3565 +#: cups/ppd-cache.c:3552 msgid "Metal Satin" msgstr "" -#: cups/ppd-cache.c:3566 +#: cups/ppd-cache.c:3553 msgid "Metal Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3494 +#: cups/ppd-cache.c:3481 msgid "Mid-Weight Paper" msgstr "" -#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3820 +#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3788 msgid "Middle" msgstr "" @@ -5416,11 +5416,11 @@ msgid "Missing required attributes." msgstr "必須の属性が設定されていません。" -#: cups/http-support.c:1636 +#: cups/http-support.c:1641 msgid "Missing resource in URI" msgstr "URI のリソースがない" -#: cups/http-support.c:1630 +#: cups/http-support.c:1635 msgid "Missing scheme in URI" msgstr "URI のスキームがない" @@ -5466,7 +5466,7 @@ msgid "Modify Printer" msgstr "プリンターの変更" -#: cups/ppd-cache.c:3567 +#: cups/ppd-cache.c:3554 msgid "Mounting Tape" msgstr "" @@ -5478,43 +5478,43 @@ msgid "Move Job" msgstr "ジョブの移動" -#: cups/http-support.c:1500 +#: cups/http-support.c:1505 msgid "Moved Permanently" msgstr "別の場所へ移動しました" -#: cups/ppd-cache.c:3568 +#: cups/ppd-cache.c:3555 msgid "Multi Layer" msgstr "" -#: cups/ppd-cache.c:3569 +#: cups/ppd-cache.c:3556 msgid "Multi Part Form" msgstr "" -#: cups/ppd-cache.c:3011 +#: cups/ppd-cache.c:3027 msgid "Multi-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3009 +#: cups/ppd-cache.c:3025 msgid "Multi-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3008 +#: cups/ppd-cache.c:3024 msgid "Multi-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3010 +#: cups/ppd-cache.c:3026 msgid "Multi-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3415 +#: cups/ppd-cache.c:3403 msgid "Multipurpose" msgstr "" -#: cups/ppd-cache.c:3493 +#: cups/ppd-cache.c:3480 msgid "Multipurpose Paper" msgstr "" -#: cups/ppd-cache.c:3821 +#: cups/ppd-cache.c:3789 msgid "My Mailbox" msgstr "" @@ -5530,15 +5530,15 @@ msgid "Nested classes are not allowed." msgstr "入れ子になったクラスは許可されていません。" -#: ppdc/sample.c:425 +#: ppdc/sample.c:428 msgid "Never" msgstr "Never" -#: cups/tls-darwin.c:690 cups/tls-gnutls.c:524 +#: cups/tls-darwin.c:665 cups/tls-gnutls.c:524 msgid "New credentials are not valid for name." msgstr "" -#: cups/tls-darwin.c:680 cups/tls-gnutls.c:514 +#: cups/tls-darwin.c:655 cups/tls-gnutls.c:514 msgid "New credentials are older than stored credentials." msgstr "" @@ -5546,7 +5546,7 @@ msgid "No" msgstr "いいえ" -#: cups/http-support.c:1497 +#: cups/http-support.c:1502 msgid "No Content" msgstr "中身がありません" @@ -5587,7 +5587,7 @@ msgid "No authentication information provided." msgstr "認証情報が提供されていません。" -#: cups/tls-darwin.c:630 cups/tls-gnutls.c:461 +#: cups/tls-darwin.c:605 cups/tls-gnutls.c:461 msgid "No common name specified." msgstr "" @@ -5628,7 +5628,7 @@ msgstr "OID 名がありません" #: filter/rastertoepson.c:1161 filter/rastertohp.c:833 -#: filter/rastertolabel.c:1288 +#: filter/rastertolabel.c:1289 msgid "No pages were found." msgstr "ページが見つかりません。" @@ -5664,7 +5664,7 @@ msgid "No request-id" msgstr "リクエストID がありません" -#: cups/tls-darwin.c:710 cups/tls-gnutls.c:544 +#: cups/tls-darwin.c:685 cups/tls-gnutls.c:544 msgid "No stored credentials, not valid for name." msgstr "" @@ -5684,41 +5684,41 @@ msgid "No version number" msgstr "バージョン名がありません" -#: ppdc/sample.c:362 +#: ppdc/sample.c:365 msgid "Non-continuous (Mark sensing)" msgstr "非連続です (Mark sensing)" -#: ppdc/sample.c:361 +#: ppdc/sample.c:364 msgid "Non-continuous (Web sensing)" msgstr "非連続です (Web sensing)" -#: cups/ppd-cache.c:4014 cups/ppd-cache.c:4064 cups/ppd-cache.c:4114 -#: cups/ppd-cache.c:4174 +#: cups/ppd-cache.c:4059 cups/ppd-cache.c:4137 cups/ppd-cache.c:4225 +#: cups/ppd-cache.c:4315 cups/ppd-cache.c:4362 msgid "None" msgstr "なし" -#: cups/ppd-cache.c:4287 cups/ppd-cache.c:4353 cups/ppd-cache.c:4387 -#: ppdc/sample.c:238 +#: cups/ppd-cache.c:4475 cups/ppd-cache.c:4541 cups/ppd-cache.c:4575 +#: ppdc/sample.c:242 msgid "Normal" msgstr "標準" -#: cups/http-support.c:1522 +#: cups/http-support.c:1527 msgid "Not Found" msgstr "見つかりません" -#: cups/http-support.c:1534 +#: cups/http-support.c:1539 msgid "Not Implemented" msgstr "実装されていません" -#: ppdc/sample.c:268 +#: ppdc/sample.c:271 msgid "Not Installed" msgstr "インストールされていません" -#: cups/http-support.c:1509 +#: cups/http-support.c:1514 msgid "Not Modified" msgstr "変更されていません" -#: cups/http-support.c:1537 +#: cups/http-support.c:1542 msgid "Not Supported" msgstr "サポートされていません" @@ -5736,19 +5736,19 @@ "itself." msgstr "注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証するものではありません。" -#: cups/http-support.c:1488 cups/http-support.c:1627 cups/ppd.c:283 +#: cups/http-support.c:1493 cups/http-support.c:1632 cups/ppd.c:283 msgid "OK" msgstr "OK" -#: cups/ppd-cache.c:3872 ppdc/sample.c:263 +#: cups/ppd-cache.c:3872 ppdc/sample.c:266 msgid "Off (1-Sided)" msgstr "Off (片面)" -#: cups/ppd-cache.c:3489 +#: cups/ppd-cache.c:3476 msgid "Office Recycled Paper" msgstr "" -#: ppdc/sample.c:356 +#: ppdc/sample.c:359 msgid "Oki" msgstr "Oki" @@ -5777,7 +5777,7 @@ msgid "Operation Policy" msgstr "操作ポリシー" -#: cups/ppd-cache.c:3501 +#: cups/ppd-cache.c:3488 msgid "Optical Disc" msgstr "" @@ -5791,17 +5791,17 @@ msgstr "インストールされたオプション" #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232 -#: scheduler/cupsfilter.c:1476 scheduler/main.c:2133 systemv/cancel.c:401 +#: scheduler/cupsfilter.c:1476 scheduler/main.c:2135 systemv/cancel.c:401 #: systemv/cupsaccept.c:243 systemv/cupsctl.c:232 systemv/cupstestppd.c:3857 #: systemv/lp.c:750 systemv/lpadmin.c:1620 systemv/lpinfo.c:497 #: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044 -#: tools/ippeveprinter.c:7664 tools/ippfind.c:2765 tools/ipptool.c:4307 +#: tools/ippeveprinter.c:7922 tools/ippfind.c:2765 tools/ipptool.c:4307 #: ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119 #: ppdc/ppdmerge.cxx:356 ppdc/ppdpo.cxx:243 msgid "Options:" msgstr "オプション:" -#: cups/ppd-cache.c:3570 +#: cups/ppd-cache.c:3557 msgid "Other" msgstr "" @@ -5833,7 +5833,7 @@ msgid "PASS" msgstr "合格" -#: ppdc/sample.c:252 +#: ppdc/sample.c:256 msgid "PCL Laser Printer" msgstr "PCL レーザープリンター" @@ -5869,7 +5869,7 @@ msgid "Packet does not start with SEQUENCE" msgstr "パケットが SEQUENCE から始まりません" -#: cups/ppd-cache.c:3571 +#: cups/ppd-cache.c:3558 msgid "Paper" msgstr "" @@ -5889,15 +5889,15 @@ msgid "Paper tray is missing." msgstr "給紙トレイがありません。" -#: cups/ppd-cache.c:2985 +#: cups/ppd-cache.c:3001 msgid "Parallel Fold" msgstr "" -#: ppdc/sample.c:355 +#: ppdc/sample.c:358 msgid "ParamCustominCutInterval" msgstr "ParamCustominCutInterval" -#: ppdc/sample.c:353 +#: ppdc/sample.c:356 msgid "ParamCustominTearInterval" msgstr "ParamCustominTearInterval" @@ -5919,11 +5919,11 @@ msgid "Pause Printer" msgstr "プリンターの休止" -#: ppdc/sample.c:443 +#: ppdc/sample.c:446 msgid "Peel-Off" msgstr "Peel-Off" -#: cups/ppd-cache.c:3555 +#: cups/ppd-cache.c:3542 msgid "Permanent Labels" msgstr "" @@ -5931,7 +5931,7 @@ msgid "Photo" msgstr "写真" -#: cups/ppd-cache.c:3575 +#: cups/ppd-cache.c:3562 msgid "Photo Film" msgstr "" @@ -5939,59 +5939,59 @@ msgid "Photo Labels" msgstr "写真ラベル" -#: cups/ppd-cache.c:3572 cups/ppd-cache.c:3573 +#: cups/ppd-cache.c:3559 cups/ppd-cache.c:3560 msgid "Photo Paper" msgstr "" -#: cups/ppd-cache.c:3545 cups/ppd-cache.c:3547 +#: cups/ppd-cache.c:3532 cups/ppd-cache.c:3534 msgid "Photo Paper Plus Glossy II" msgstr "" -#: cups/ppd-cache.c:3546 cups/ppd-cache.c:3548 +#: cups/ppd-cache.c:3533 cups/ppd-cache.c:3535 msgid "Photo Paper Pro Platinum" msgstr "" -#: cups/ppd-cache.c:3521 +#: cups/ppd-cache.c:3508 msgid "Plain Envelope" msgstr "" -#: ppdc/sample.c:281 +#: ppdc/sample.c:284 msgid "Plain Paper" msgstr "普通紙" -#: cups/ppd-cache.c:3581 +#: cups/ppd-cache.c:3568 msgid "Plastic" msgstr "" -#: cups/ppd-cache.c:3582 +#: cups/ppd-cache.c:3569 msgid "Plastic Archival" msgstr "" -#: cups/ppd-cache.c:3583 +#: cups/ppd-cache.c:3570 msgid "Plastic Colored" msgstr "" -#: cups/ppd-cache.c:3584 +#: cups/ppd-cache.c:3571 msgid "Plastic Glossy" msgstr "" -#: cups/ppd-cache.c:3585 +#: cups/ppd-cache.c:3572 msgid "Plastic High Gloss" msgstr "" -#: cups/ppd-cache.c:3586 +#: cups/ppd-cache.c:3573 msgid "Plastic Matte" msgstr "" -#: cups/ppd-cache.c:3587 +#: cups/ppd-cache.c:3574 msgid "Plastic Satin" msgstr "" -#: cups/ppd-cache.c:3588 +#: cups/ppd-cache.c:3575 msgid "Plastic Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3589 +#: cups/ppd-cache.c:3576 msgid "Plate" msgstr "" @@ -5999,7 +5999,7 @@ msgid "Policies" msgstr "ポリシー" -#: cups/ppd-cache.c:3590 +#: cups/ppd-cache.c:3577 msgid "Polyester" msgstr "" @@ -6007,7 +6007,7 @@ msgid "Port Monitor" msgstr "ポートモニター" -#: ppdc/sample.c:270 +#: ppdc/sample.c:273 msgid "PostScript Printer" msgstr "PostScript プリンター" @@ -6027,39 +6027,39 @@ msgid "Postcard Long Edge" msgstr "ハガキ 長辺送り" -#: cups/ppd-cache.c:2986 +#: cups/ppd-cache.c:3002 msgid "Poster Fold" msgstr "" -#: cups/ppd-cache.c:3591 +#: cups/ppd-cache.c:3578 msgid "Pre Cut Tabs" msgstr "" -#: cups/ppd-cache.c:3495 +#: cups/ppd-cache.c:3482 msgid "Premium Inkjet Paper" msgstr "" -#: cups/ppd-cache.c:3496 +#: cups/ppd-cache.c:3483 msgid "Premium Photo Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3497 +#: cups/ppd-cache.c:3484 msgid "Premium Presentation Matte Paper" msgstr "" -#: backend/ipp.c:973 backend/ipp.c:981 +#: backend/ipp.c:972 backend/ipp.c:980 msgid "Preparing to print." msgstr "印刷準備中です。" -#: cups/ppd-cache.c:3522 +#: cups/ppd-cache.c:3509 msgid "Preprinted Envelope" msgstr "" -#: cups/ppd-cache.c:3611 +#: cups/ppd-cache.c:3598 msgid "Preprinted Paper" msgstr "" -#: ppdc/sample.c:290 +#: ppdc/sample.c:293 msgid "Print Density" msgstr "印刷密度" @@ -6067,15 +6067,15 @@ msgid "Print Job:" msgstr "ジョブの印刷:" -#: ppdc/sample.c:335 +#: ppdc/sample.c:338 msgid "Print Mode" msgstr "印刷モード" -#: cups/ppd-cache.c:4281 cups/ppd-cache.c:4343 cups/ppd-cache.c:4383 +#: cups/ppd-cache.c:4469 cups/ppd-cache.c:4531 cups/ppd-cache.c:4571 msgid "Print Quality" msgstr "" -#: ppdc/sample.c:378 +#: ppdc/sample.c:381 msgid "Print Rate" msgstr "印刷レート" @@ -6083,7 +6083,7 @@ msgid "Print Self-Test Page" msgstr "セルフテストページの印刷" -#: ppdc/sample.c:322 +#: ppdc/sample.c:325 msgid "Print Speed" msgstr "印刷速度" @@ -6091,11 +6091,11 @@ msgid "Print Test Page" msgstr "テストページの印刷" -#: ppdc/sample.c:351 +#: ppdc/sample.c:354 msgid "Print and Cut" msgstr "プリントしてカット" -#: ppdc/sample.c:339 +#: ppdc/sample.c:342 msgid "Print and Tear" msgstr "プリントして切り取る" @@ -6103,15 +6103,15 @@ msgid "Print file sent." msgstr "プリントファイルが送られました。" -#: backend/ipp.c:2261 +#: backend/ipp.c:2269 msgid "Print job canceled at printer." msgstr "印刷ジョブはプリンターでキャンセルされました。" -#: backend/ipp.c:2253 +#: backend/ipp.c:2261 msgid "Print job too large." msgstr "印刷ジョブが大きすぎます。" -#: backend/ipp.c:1721 +#: backend/ipp.c:1722 msgid "Print job was not accepted." msgstr "印刷ジョブが受け付けられませんでした。" @@ -6124,7 +6124,7 @@ msgid "Printer Added" msgstr "追加されたプリンター" -#: ppdc/sample.c:255 +#: ppdc/sample.c:258 msgid "Printer Default" msgstr "デフォルトのプリンター" @@ -6140,19 +6140,19 @@ msgid "Printer Paused" msgstr "プリンターの休止" -#: ppdc/sample.c:289 +#: ppdc/sample.c:292 msgid "Printer Settings" msgstr "プリンター設定" -#: backend/ipp.c:2256 +#: backend/ipp.c:2264 msgid "Printer cannot print supplied content." msgstr "プリンターは受信した内容を印刷できませんでした。" -#: backend/ipp.c:2259 +#: backend/ipp.c:2267 msgid "Printer cannot print with supplied options." msgstr "指定されたオプションではプリンターは印刷できません。" -#: cups/ppd-cache.c:4556 +#: cups/ppd-cache.c:4744 msgid "Printer does not support required IPP attributes or document formats." msgstr "" @@ -6165,16 +6165,16 @@ msgstr "プリンター" #: filter/rastertoepson.c:1107 filter/rastertohp.c:774 -#: filter/rastertolabel.c:1235 +#: filter/rastertolabel.c:1236 #, c-format msgid "Printing page %d, %u%% complete." msgstr "ページ %d, %u%% の印刷が完了しました。" -#: cups/ppd-cache.c:4111 +#: cups/ppd-cache.c:4222 msgid "Punch" msgstr "" -#: cups/ppd-cache.c:3612 +#: cups/ppd-cache.c:3599 msgid "Punched Paper" msgstr "" @@ -6190,11 +6190,11 @@ msgid "Rank Owner Job File(s) Total Size" msgstr "ランク 所有者 ジョブ ファイル 合計サイズ" -#: cups/ppd-cache.c:3414 +#: cups/ppd-cache.c:3402 msgid "Rear" msgstr "" -#: cups/ppd-cache.c:3822 +#: cups/ppd-cache.c:3790 msgid "Rear Tray" msgstr "" @@ -6202,25 +6202,25 @@ msgid "Reject Jobs" msgstr "ジョブの拒否" -#: backend/lpd.c:1074 backend/lpd.c:1206 +#: backend/lpd.c:1078 backend/lpd.c:1210 #, c-format msgid "Remote host did not accept control file (%d)." msgstr "リモートホストがコントロールファイルを受け付けませんでした (%d)。" -#: backend/lpd.c:1159 +#: backend/lpd.c:1163 #, c-format msgid "Remote host did not accept data file (%d)." msgstr "リモートホストがデータファイルを受け付けませんでした (%d)。" -#: ppdc/sample.c:423 +#: ppdc/sample.c:426 msgid "Reprint After Error" msgstr "エラー後の再印刷" -#: cups/http-support.c:1525 +#: cups/http-support.c:1530 msgid "Request Entity Too Large" msgstr "要求するエンティティが大きすぎます" -#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:231 +#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:232 msgid "Resolution" msgstr "解像度" @@ -6236,63 +6236,63 @@ msgid "Return Address" msgstr "返信用ラベル" -#: ppdc/sample.c:444 +#: ppdc/sample.c:447 msgid "Rewind" msgstr "巻き取り" -#: cups/ppd-cache.c:3412 +#: cups/ppd-cache.c:3400 msgid "Right" msgstr "" -#: cups/ppd-cache.c:2987 +#: cups/ppd-cache.c:3003 msgid "Right Gate Fold" msgstr "" -#: cups/ppd-cache.c:3823 +#: cups/ppd-cache.c:3791 msgid "Right Tray" msgstr "" -#: cups/ppd-cache.c:3592 +#: cups/ppd-cache.c:3579 msgid "Roll" msgstr "" -#: cups/ppd-cache.c:3436 +#: cups/ppd-cache.c:3424 msgid "Roll 1" msgstr "" -#: cups/ppd-cache.c:3445 +#: cups/ppd-cache.c:3433 msgid "Roll 10" msgstr "" -#: cups/ppd-cache.c:3437 +#: cups/ppd-cache.c:3425 msgid "Roll 2" msgstr "" -#: cups/ppd-cache.c:3438 +#: cups/ppd-cache.c:3426 msgid "Roll 3" msgstr "" -#: cups/ppd-cache.c:3439 +#: cups/ppd-cache.c:3427 msgid "Roll 4" msgstr "" -#: cups/ppd-cache.c:3440 +#: cups/ppd-cache.c:3428 msgid "Roll 5" msgstr "" -#: cups/ppd-cache.c:3441 +#: cups/ppd-cache.c:3429 msgid "Roll 6" msgstr "" -#: cups/ppd-cache.c:3442 +#: cups/ppd-cache.c:3430 msgid "Roll 7" msgstr "" -#: cups/ppd-cache.c:3443 +#: cups/ppd-cache.c:3431 msgid "Roll 8" msgstr "" -#: cups/ppd-cache.c:3444 +#: cups/ppd-cache.c:3432 msgid "Roll 9" msgstr "" @@ -6305,39 +6305,39 @@ msgid "SEQUENCE uses indefinite length" msgstr "SEQUENCE は不定長を使用しています" -#: cups/http-support.c:1549 +#: cups/http-support.c:1554 msgid "SSL/TLS Negotiation Error" msgstr "SSL/TLS のネゴシエーションエラー" -#: cups/ppd-cache.c:3012 +#: cups/ppd-cache.c:3028 msgid "Saddle Stitch" msgstr "" -#: cups/ppd-cache.c:3556 +#: cups/ppd-cache.c:3543 msgid "Satin Labels" msgstr "" -#: cups/ppd-cache.c:3505 +#: cups/ppd-cache.c:3492 msgid "Satin Optical Disc" msgstr "" -#: cups/ppd-cache.c:3579 +#: cups/ppd-cache.c:3566 msgid "Satin Photo Paper" msgstr "" -#: cups/ppd-cache.c:3593 +#: cups/ppd-cache.c:3580 msgid "Screen" msgstr "" -#: cups/ppd-cache.c:3594 +#: cups/ppd-cache.c:3581 msgid "Screen Paged" msgstr "" -#: cups/ppd-cache.c:3557 +#: cups/ppd-cache.c:3544 msgid "Security Labels" msgstr "" -#: cups/http-support.c:1506 +#: cups/http-support.c:1511 msgid "See Other" msgstr "残りを見てください" @@ -6345,31 +6345,31 @@ msgid "See remote printer." msgstr "" -#: cups/ppd-cache.c:3595 +#: cups/ppd-cache.c:3582 msgid "Self Adhesive" msgstr "" -#: cups/ppd-cache.c:3596 +#: cups/ppd-cache.c:3583 msgid "Self Adhesive Film" msgstr "" -#: cups/tls-darwin.c:765 cups/tls-gnutls.c:606 +#: cups/tls-darwin.c:740 cups/tls-gnutls.c:606 msgid "Self-signed credentials are blocked." msgstr "" -#: cups/ppd-cache.c:3529 +#: cups/ppd-cache.c:3516 msgid "Semi-Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3558 +#: cups/ppd-cache.c:3545 msgid "Semi-Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3506 +#: cups/ppd-cache.c:3493 msgid "Semi-Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3580 +#: cups/ppd-cache.c:3567 msgid "Semi-Gloss Photo Paper" msgstr "" @@ -6393,11 +6393,11 @@ msgid "Server Stopped" msgstr "停止されたサーバー" -#: cups/tls-darwin.c:1275 cups/tls-gnutls.c:1298 +#: cups/tls-darwin.c:1250 cups/tls-gnutls.c:1299 msgid "Server credentials not set." msgstr "サーバー証明書が設定されていません。" -#: cups/http-support.c:1543 +#: cups/http-support.c:1548 msgid "Service Unavailable" msgstr "利用できないサービス" @@ -6426,140 +6426,140 @@ msgid "Shipping Address" msgstr "発送先ラベル" -#: cups/ppd-cache.c:3872 ppdc/sample.c:265 +#: cups/ppd-cache.c:3872 ppdc/sample.c:268 msgid "Short-Edge (Landscape)" msgstr "短辺 (横原稿)" -#: cups/ppd-cache.c:3597 +#: cups/ppd-cache.c:3584 msgid "Shrink Foil" msgstr "" -#: cups/ppd-cache.c:3410 +#: cups/ppd-cache.c:3398 msgid "Side" msgstr "" -#: cups/ppd-cache.c:3824 +#: cups/ppd-cache.c:3792 msgid "Side Tray" msgstr "" -#: cups/ppd-cache.c:3598 +#: cups/ppd-cache.c:3585 msgid "Single Face" msgstr "" -#: cups/ppd-cache.c:3003 +#: cups/ppd-cache.c:3019 msgid "Single Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3002 +#: cups/ppd-cache.c:3018 msgid "Single Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2992 +#: cups/ppd-cache.c:3008 msgid "Single Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2993 +#: cups/ppd-cache.c:3009 msgid "Single Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3021 +#: cups/ppd-cache.c:3037 msgid "Single Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3020 +#: cups/ppd-cache.c:3036 msgid "Single Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3014 +#: cups/ppd-cache.c:3030 msgid "Single Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3015 +#: cups/ppd-cache.c:3031 msgid "Single Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3599 +#: cups/ppd-cache.c:3586 msgid "Single Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:3600 +#: cups/ppd-cache.c:3587 msgid "Sleeve" msgstr "" -#: ppdc/sample.c:283 +#: ppdc/sample.c:286 msgid "Special Paper" msgstr "特殊紙" -#: backend/lpd.c:1115 +#: backend/lpd.c:1119 #, c-format msgid "Spooling job, %.0f%% complete." msgstr "ジョブをスプール中、%.0f%% 完了しました。" -#: cups/ppd-cache.c:3825 +#: cups/ppd-cache.c:3793 msgid "Stacker 1" msgstr "" -#: cups/ppd-cache.c:3834 +#: cups/ppd-cache.c:3802 msgid "Stacker 10" msgstr "" -#: cups/ppd-cache.c:3826 +#: cups/ppd-cache.c:3794 msgid "Stacker 2" msgstr "" -#: cups/ppd-cache.c:3827 +#: cups/ppd-cache.c:3795 msgid "Stacker 3" msgstr "" -#: cups/ppd-cache.c:3828 +#: cups/ppd-cache.c:3796 msgid "Stacker 4" msgstr "" -#: cups/ppd-cache.c:3829 +#: cups/ppd-cache.c:3797 msgid "Stacker 5" msgstr "" -#: cups/ppd-cache.c:3830 +#: cups/ppd-cache.c:3798 msgid "Stacker 6" msgstr "" -#: cups/ppd-cache.c:3831 +#: cups/ppd-cache.c:3799 msgid "Stacker 7" msgstr "" -#: cups/ppd-cache.c:3832 +#: cups/ppd-cache.c:3800 msgid "Stacker 8" msgstr "" -#: cups/ppd-cache.c:3833 +#: cups/ppd-cache.c:3801 msgid "Stacker 9" msgstr "" -#: ppdc/sample.c:336 +#: ppdc/sample.c:339 msgid "Standard" msgstr "標準" -#: cups/ppd-cache.c:4011 +#: cups/ppd-cache.c:4056 msgid "Staple" msgstr "" -#: cups/ppd-cache.c:2971 +#: cups/ppd-cache.c:2987 msgid "Staple Edge" msgstr "" -#: cups/ppd-cache.c:2975 +#: cups/ppd-cache.c:2991 msgid "Staple Edge (Landscape)" msgstr "" -#: cups/ppd-cache.c:2973 +#: cups/ppd-cache.c:2989 msgid "Staple Edge (Portrait)" msgstr "" -#: cups/ppd-cache.c:2972 +#: cups/ppd-cache.c:2988 msgid "Staple Edge (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2974 +#: cups/ppd-cache.c:2990 msgid "Staple Edge (Reverse Portrait)" msgstr "" @@ -6569,7 +6569,7 @@ msgstr "開始バナー" #: filter/rastertoepson.c:1083 filter/rastertohp.c:750 -#: filter/rastertolabel.c:1211 +#: filter/rastertolabel.c:1212 #, c-format msgid "Starting page %d." msgstr "ページ %d を開始しています。" @@ -6600,11 +6600,11 @@ msgid "Super B/A3" msgstr "スーパー B/A3" -#: cups/http-support.c:1485 +#: cups/http-support.c:1490 msgid "Switching Protocols" msgstr "プロトコルの変更" -#: cups/ppd-cache.c:3613 +#: cups/ppd-cache.c:3600 msgid "Tab Stock" msgstr "" @@ -6620,15 +6620,15 @@ msgid "Tabloid Oversize Long Edge" msgstr "タブロイド (特大) 長辺送り" -#: ppdc/sample.c:337 +#: ppdc/sample.c:340 msgid "Tear" msgstr "Tear" -#: ppdc/sample.c:442 +#: ppdc/sample.c:445 msgid "Tear-Off" msgstr "Tear-Off" -#: ppdc/sample.c:383 +#: ppdc/sample.c:386 msgid "Tear-Off Adjust Position" msgstr "Tear-Off 位置調節" @@ -6666,7 +6666,7 @@ msgstr "PPD ファイル \"%s\" を開けませんでした: %s" #: filter/rastertoepson.c:1052 filter/rastertohp.c:721 -#: filter/rastertolabel.c:1175 +#: filter/rastertolabel.c:1176 msgid "The PPD file could not be opened." msgstr "PPD ファイルを開けませんでした。" @@ -6710,17 +6710,17 @@ msgid "The optical photoconductor will need to be replaced soon." msgstr "もうすぐ感光体の交換時期です。" -#: backend/ipp.c:993 +#: backend/ipp.c:992 msgid "" "The printer configuration is incorrect or the printer no longer exists." msgstr "プリンターの設定が正しくないかプリンターはすでに存在しません。" -#: backend/lpd.c:678 backend/lpd.c:1067 backend/lpd.c:1149 backend/lpd.c:1199 +#: backend/lpd.c:682 backend/lpd.c:1071 backend/lpd.c:1153 backend/lpd.c:1203 msgid "The printer did not respond." msgstr "プリンターが応答しません。" -#: backend/ipp.c:766 backend/ipp.c:956 backend/ipp.c:1070 backend/ipp.c:1523 -#: backend/ipp.c:1693 backend/lpd.c:886 backend/socket.c:354 +#: backend/ipp.c:765 backend/ipp.c:955 backend/ipp.c:1069 backend/ipp.c:1524 +#: backend/ipp.c:1694 backend/lpd.c:890 backend/socket.c:354 #: backend/usb-unix.c:117 backend/usb-unix.c:407 backend/usb-unix.c:490 msgid "The printer is in use." msgstr "プリンターは使用中です。" @@ -6737,8 +6737,8 @@ msgid "The printer is not connected." msgstr "プリンターは接続されていません。" -#: backend/ipp.c:744 backend/ipp.c:777 backend/ipp.c:952 backend/lpd.c:865 -#: backend/lpd.c:906 backend/socket.c:333 backend/socket.c:366 +#: backend/ipp.c:743 backend/ipp.c:776 backend/ipp.c:951 backend/lpd.c:869 +#: backend/lpd.c:910 backend/socket.c:333 backend/socket.c:366 msgid "The printer is not responding." msgstr "プリンターが応答していません。" @@ -6754,7 +6754,7 @@ msgid "The printer is offline." msgstr "プリンターはオフラインです。" -#: backend/ipp.c:760 backend/lpd.c:880 backend/socket.c:348 +#: backend/ipp.c:759 backend/lpd.c:884 backend/socket.c:348 msgid "The printer is unreachable at this time." msgstr "プリンターには現在到達できません。" @@ -6766,7 +6766,7 @@ msgid "The printer may be out of toner." msgstr "プリンターのトナーがなくなっているようです。" -#: backend/ipp.c:753 backend/lpd.c:873 backend/socket.c:341 +#: backend/ipp.c:752 backend/lpd.c:877 backend/socket.c:341 msgid "The printer may not exist or is unavailable at this time." msgstr "プリンターは現在存在しないか、使用できないようです。" @@ -6857,7 +6857,7 @@ msgid "There was an unrecoverable USB error." msgstr "回復不可能な USB のエラーが発生しています。" -#: ppdc/sample.c:430 +#: ppdc/sample.c:433 msgid "Thermal Transfer Media" msgstr "熱転写メディア" @@ -6875,140 +6875,140 @@ msgid "Too many printer-state-reasons values (%d > %d)." msgstr "printer-state-reasons 値が多すぎます (%d > %d)。" -#: cups/ppd-cache.c:3407 +#: cups/ppd-cache.c:3395 msgid "Top" msgstr "" -#: cups/ppd-cache.c:3835 +#: cups/ppd-cache.c:3803 msgid "Top Tray" msgstr "" -#: cups/ppd-cache.c:3614 +#: cups/ppd-cache.c:3601 msgid "Tractor" msgstr "" -#: cups/ppd-cache.c:3615 +#: cups/ppd-cache.c:3602 msgid "Transfer" msgstr "" -#: ppdc/sample.c:284 +#: ppdc/sample.c:287 msgid "Transparency" msgstr "OHP シート" -#: ppdc/sample.c:279 +#: ppdc/sample.c:282 msgid "Tray" msgstr "トレイ" -#: ppdc/sample.c:256 +#: ppdc/sample.c:259 msgid "Tray 1" msgstr "トレイ 1" -#: cups/ppd-cache.c:3425 cups/ppd-cache.c:3845 +#: cups/ppd-cache.c:3413 cups/ppd-cache.c:3813 msgid "Tray 10" msgstr "" -#: cups/ppd-cache.c:3426 +#: cups/ppd-cache.c:3414 msgid "Tray 11" msgstr "" -#: cups/ppd-cache.c:3427 +#: cups/ppd-cache.c:3415 msgid "Tray 12" msgstr "" -#: cups/ppd-cache.c:3428 +#: cups/ppd-cache.c:3416 msgid "Tray 13" msgstr "" -#: cups/ppd-cache.c:3429 +#: cups/ppd-cache.c:3417 msgid "Tray 14" msgstr "" -#: cups/ppd-cache.c:3430 +#: cups/ppd-cache.c:3418 msgid "Tray 15" msgstr "" -#: cups/ppd-cache.c:3431 +#: cups/ppd-cache.c:3419 msgid "Tray 16" msgstr "" -#: cups/ppd-cache.c:3432 +#: cups/ppd-cache.c:3420 msgid "Tray 17" msgstr "" -#: cups/ppd-cache.c:3433 +#: cups/ppd-cache.c:3421 msgid "Tray 18" msgstr "" -#: cups/ppd-cache.c:3434 +#: cups/ppd-cache.c:3422 msgid "Tray 19" msgstr "" -#: ppdc/sample.c:257 +#: ppdc/sample.c:260 msgid "Tray 2" msgstr "トレイ 2" -#: cups/ppd-cache.c:3435 +#: cups/ppd-cache.c:3423 msgid "Tray 20" msgstr "" -#: ppdc/sample.c:258 +#: ppdc/sample.c:261 msgid "Tray 3" msgstr "トレイ 3" -#: ppdc/sample.c:259 +#: ppdc/sample.c:262 msgid "Tray 4" msgstr "トレイ 4" -#: cups/ppd-cache.c:3420 cups/ppd-cache.c:3840 +#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3808 msgid "Tray 5" msgstr "" -#: cups/ppd-cache.c:3421 cups/ppd-cache.c:3841 +#: cups/ppd-cache.c:3409 cups/ppd-cache.c:3809 msgid "Tray 6" msgstr "" -#: cups/ppd-cache.c:3422 cups/ppd-cache.c:3842 +#: cups/ppd-cache.c:3410 cups/ppd-cache.c:3810 msgid "Tray 7" msgstr "" -#: cups/ppd-cache.c:3423 cups/ppd-cache.c:3843 +#: cups/ppd-cache.c:3411 cups/ppd-cache.c:3811 msgid "Tray 8" msgstr "" -#: cups/ppd-cache.c:3424 cups/ppd-cache.c:3844 +#: cups/ppd-cache.c:3412 cups/ppd-cache.c:3812 msgid "Tray 9" msgstr "" -#: cups/ppd-cache.c:3025 +#: cups/ppd-cache.c:3041 msgid "Triple Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3023 +#: cups/ppd-cache.c:3039 msgid "Triple Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3022 +#: cups/ppd-cache.c:3038 msgid "Triple Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3024 +#: cups/ppd-cache.c:3040 msgid "Triple Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3617 +#: cups/ppd-cache.c:3604 msgid "Triple Wall Cardboard" msgstr "" -#: cups/tls-darwin.c:670 cups/tls-darwin.c:752 cups/tls-gnutls.c:504 +#: cups/tls-darwin.c:645 cups/tls-darwin.c:727 cups/tls-gnutls.c:504 #: cups/tls-gnutls.c:586 msgid "Trust on first use is disabled." msgstr "" -#: cups/http-support.c:1528 +#: cups/http-support.c:1533 msgid "URI Too Long" msgstr "URI が長すぎます" -#: cups/http-support.c:1603 +#: cups/http-support.c:1608 msgid "URI too large" msgstr "URI が長すぎる" @@ -7064,7 +7064,7 @@ msgid "Unable to add class" msgstr "クラスを追加できません" -#: backend/ipp.c:1880 +#: backend/ipp.c:1887 msgid "Unable to add document to print job." msgstr "ドキュメントを印刷ジョブに追加できません。" @@ -7089,11 +7089,11 @@ msgid "Unable to allocate memory for pages array" msgstr "ページアレイのメモリー割り当てができません" -#: cgi-bin/admin.c:1510 +#: cgi-bin/admin.c:1509 msgid "Unable to cancel RSS subscription" msgstr "RSS 購読をキャンセルできません" -#: backend/ipp.c:2165 backend/ipp.c:2696 +#: backend/ipp.c:2173 backend/ipp.c:2704 msgid "Unable to cancel print job." msgstr "プリンターを変更できません。" @@ -7127,7 +7127,7 @@ msgid "Unable to connect to host." msgstr "ホストに接続できません。" -#: backend/ipp.c:723 backend/ipp.c:1275 backend/lpd.c:846 backend/socket.c:314 +#: backend/ipp.c:722 backend/ipp.c:1274 backend/lpd.c:850 backend/socket.c:314 #: backend/usb-unix.c:103 msgid "Unable to contact printer, queuing on next printer in class." msgstr "プリンターと交信できません。クラス内の次のプリンターにキューします。" @@ -7166,7 +7166,7 @@ msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。" -#: cups/tls-darwin.c:636 cups/tls-gnutls.c:467 +#: cups/tls-darwin.c:611 cups/tls-gnutls.c:467 msgid "Unable to create credentials from array." msgstr "" @@ -7178,7 +7178,7 @@ msgid "Unable to create printer." msgstr "" -#: cups/tls-darwin.c:1566 cups/tls-gnutls.c:1510 +#: cups/tls-darwin.c:1541 cups/tls-gnutls.c:1511 msgid "Unable to create server credentials." msgstr "サーバー証明書を作成できません。" @@ -7202,37 +7202,37 @@ msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "1MB 以上の cupsd.conf ファイルは編集できません" -#: cups/tls-darwin.c:1754 +#: cups/tls-darwin.c:1729 msgid "" "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "ホストへの安全な接続が確立できません (認証パスが無効です)。" -#: cups/tls-darwin.c:1744 +#: cups/tls-darwin.c:1719 msgid "" "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "ホストへの安全な接続が確立できません (認証がまだ有効ではありません)。" -#: cups/tls-darwin.c:1739 +#: cups/tls-darwin.c:1714 msgid "" "Unable to establish a secure connection to host (expired certificate)." msgstr "ホストへの安全な接続が確立できません (認証が期限切れです)。" -#: cups/tls-darwin.c:1749 +#: cups/tls-darwin.c:1724 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "ホストへの安全な接続が確立できません (ホスト名が一致しません)。" -#: cups/tls-darwin.c:1759 +#: cups/tls-darwin.c:1734 msgid "" "Unable to establish a secure connection to host (peer dropped connection " "before responding)." msgstr "ホストへの安全な接続が確立できません (応答がある前に接続が切断されました)。" -#: cups/tls-darwin.c:1734 +#: cups/tls-darwin.c:1709 msgid "" "Unable to establish a secure connection to host (self-signed certificate)." msgstr "ホストへの安全な接続が確立できません (自己署名証明書です)。" -#: cups/tls-darwin.c:1729 +#: cups/tls-darwin.c:1704 msgid "" "Unable to establish a secure connection to host (untrusted certificate)." msgstr "ホストへの安全な接続が確立できません (信用できない証明書です)。" @@ -7245,15 +7245,15 @@ msgid "Unable to find destination for job" msgstr "ジョブの宛先が見つかりません" -#: cups/http-support.c:2094 +#: cups/http-support.c:2099 msgid "Unable to find printer." msgstr "プリンターが見つかりません。" -#: cups/tls-darwin.c:1579 +#: cups/tls-darwin.c:1554 msgid "Unable to find server credentials." msgstr "サーバー証明書を見つけられません。" -#: backend/ipp.c:3359 +#: backend/ipp.c:3367 msgid "Unable to get backend exit status." msgstr "バックエンドの終了ステータスを取得できません。" @@ -7281,7 +7281,7 @@ msgid "Unable to get printer status" msgstr "プリンターの状態を取得できません" -#: backend/ipp.c:1017 +#: backend/ipp.c:1016 msgid "Unable to get printer status." msgstr "プリンターの状態を取得できません。" @@ -7304,7 +7304,7 @@ msgid "Unable to locate printer \"%s\"." msgstr "プリンター \"%s\" が見つかりません。" -#: backend/dnssd.c:752 backend/ipp.c:336 backend/lpd.c:181 +#: backend/dnssd.c:752 backend/ipp.c:335 backend/lpd.c:185 #: backend/socket.c:155 msgid "Unable to locate printer." msgstr "プリンターが見つかりません。" @@ -7346,14 +7346,14 @@ msgid "Unable to open help file." msgstr "ヘルプファイルを読み込むことができません。" -#: backend/ipp.c:377 backend/ipp.c:1620 backend/ipp.c:1833 backend/lpd.c:469 +#: backend/ipp.c:376 backend/ipp.c:1621 backend/ipp.c:1834 backend/lpd.c:473 #: backend/socket.c:142 backend/usb.c:224 filter/gziptoany.c:65 #: filter/pstops.c:262 msgid "Unable to open print file" msgstr "印刷ファイルを開けません" #: filter/rastertoepson.c:1012 filter/rastertohp.c:681 -#: filter/rastertolabel.c:1133 +#: filter/rastertolabel.c:1134 msgid "Unable to open raster file" msgstr "ラスターファイルを開けません" @@ -7370,7 +7370,7 @@ msgid "Unable to rename job document file." msgstr "" -#: cups/dest.c:3265 +#: cups/dest.c:3252 msgid "Unable to resolve printer-uri." msgstr "printer-uri を解決できません。" @@ -7404,7 +7404,7 @@ msgid "Unable to set server default" msgstr "サーバーをデフォルトに設定できません" -#: backend/ipp.c:3218 backend/ipp.c:3295 backend/ipp.c:3303 +#: backend/ipp.c:3226 backend/ipp.c:3303 backend/ipp.c:3311 msgid "Unable to start backend process." msgstr "バックエンドのプロセスを起動できません。" @@ -7425,7 +7425,7 @@ msgid "Unable to write uncompressed print data: %s" msgstr "非圧縮のプリントデータを書き込めません: %s" -#: cups/http-support.c:1516 +#: cups/http-support.c:1521 msgid "Unauthorized" msgstr "未許可" @@ -7433,7 +7433,7 @@ msgid "Units" msgstr "ユニット" -#: cups/http-support.c:1556 cups/http-support.c:1640 cups/ppd.c:313 +#: cups/http-support.c:1561 cups/http-support.c:1645 cups/ppd.c:313 msgid "Unknown" msgstr "未知" @@ -7442,22 +7442,22 @@ msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "\"%s\" (オプション \"%s\" 用) は未知の設定です。" -#: backend/ipp.c:519 +#: backend/ipp.c:518 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "\"%s\" は未知の暗号オプション値です。" -#: backend/lpd.c:327 +#: backend/lpd.c:331 #, c-format msgid "Unknown file order: \"%s\"." msgstr "\"%s\" は未知のファイルオーダーです。" -#: backend/lpd.c:298 +#: backend/lpd.c:302 #, c-format msgid "Unknown format character: \"%c\"." msgstr "\"%c\" は未知の書式文字です。" -#: cups/hash.c:278 +#: cups/hash.c:279 msgid "Unknown hash algorithm." msgstr "" @@ -7465,7 +7465,7 @@ msgid "Unknown media size name." msgstr "未知のメディアサイズ名称です。" -#: backend/ipp.c:583 +#: backend/ipp.c:582 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "\"%s\" (値 \"%s\") は未知のオプションです。" @@ -7475,7 +7475,7 @@ msgid "Unknown option \"%s\"." msgstr "\"%s\" は未知のオプションです。" -#: backend/lpd.c:313 +#: backend/lpd.c:317 #, c-format msgid "Unknown print mode: \"%s\"." msgstr "\"%s\" は未知のプリントモードです。" @@ -7498,7 +7498,7 @@ msgid "Unknown request version." msgstr "未知のリクエストバージョンです。" -#: cups/http-support.c:1633 +#: cups/http-support.c:1638 msgid "Unknown scheme in URI" msgstr "URI に未知のスキーマがあります" @@ -7506,7 +7506,7 @@ msgid "Unknown service name." msgstr "未知のサービス名です。" -#: backend/ipp.c:548 +#: backend/ipp.c:547 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "\"%s\" は未知のバージョンオプション値です。" @@ -7582,11 +7582,11 @@ msgid "Unsupported value type" msgstr "サポートされていない型の値です" -#: cups/http-support.c:1531 +#: cups/http-support.c:1536 msgid "Upgrade Required" msgstr "アップグレードが必要です" -#: systemv/lpadmin.c:664 +#: systemv/lpadmin.c:662 msgid "" "Usage:\n" "\n" @@ -7606,7 +7606,7 @@ " [-D 宛先] [-P PPD ファイル] [-o 名前=値]\n" " [-u allow:ユーザー,ユーザー] [-u deny:ユーザー,ユーザー]" -#: backend/dnssd.c:192 backend/ipp.c:325 backend/lpd.c:168 +#: backend/dnssd.c:192 backend/ipp.c:324 backend/lpd.c:172 #: backend/socket.c:119 backend/usb.c:170 filter/commandtops.c:57 #: filter/gziptoany.c:38 filter/pstops.c:223 monitor/bcp.c:48 #: monitor/tbcp.c:47 @@ -7622,7 +7622,7 @@ msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "Usage: cupsctl [オプション] [パラメータ=値 ... パラメータN=値N]" -#: scheduler/main.c:2132 +#: scheduler/main.c:2134 msgid "Usage: cupsd [options]" msgstr "使い方: cupsd [オプション]" @@ -7659,7 +7659,7 @@ msgid "Usage: lpmove job/src dest" msgstr "使い方: lpmove ジョブ/ソース 宛先" -#: systemv/lpoptions.c:536 +#: systemv/lpoptions.c:523 msgid "" "Usage: lpoptions [-h server] [-E] -d printer\n" " lpoptions [-h server] [-E] [-p printer] -l\n" @@ -7709,7 +7709,7 @@ msgid "VarBind uses indefinite length" msgstr "VarBind は不定長です" -#: cups/ppd-cache.c:3605 +#: cups/ppd-cache.c:3592 msgid "Vellum Paper" msgstr "" @@ -7717,7 +7717,7 @@ msgid "Version uses indefinite length" msgstr "Version は不定長です" -#: backend/ipp.c:2000 +#: backend/ipp.c:2009 msgid "Waiting for job to complete." msgstr "ジョブが完了するのを待っています。" @@ -7733,19 +7733,19 @@ msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "警告、Windows 2000 プリンタードライバーがインストールされていません。" -#: cups/ppd-cache.c:3530 +#: cups/ppd-cache.c:3517 msgid "Waterproof Fabric" msgstr "" -#: cups/http-support.c:1552 +#: cups/http-support.c:1557 msgid "Web Interface is Disabled" msgstr "Web インターフェイスが無効になっています" -#: cups/ppd-cache.c:3618 +#: cups/ppd-cache.c:3605 msgid "Wet Film" msgstr "" -#: cups/ppd-cache.c:3523 +#: cups/ppd-cache.c:3510 msgid "Windowed Envelope" msgstr "" @@ -7753,7 +7753,7 @@ msgid "Yes" msgstr "はい" -#: scheduler/client.c:2248 +#: scheduler/client.c:2236 #, c-format msgid "" "You must access this page using the URL https://%s:%d%s " "を使ってアクセスする必要があります。" -#: cups/ppd-cache.c:2988 +#: cups/ppd-cache.c:3004 msgid "Z Fold" msgstr "" -#: ppdc/sample.c:434 +#: ppdc/sample.c:437 msgid "ZPL Label Printer" msgstr "ZPL ラベルプリンター" -#: ppdc/sample.c:357 +#: ppdc/sample.c:360 msgid "Zebra" msgstr "ゼブラ" @@ -8182,7 +8182,7 @@ msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d." msgstr "" -#: systemv/lpadmin.c:1473 +#: systemv/lpadmin.c:1458 #, c-format msgid "lpadmin: Unable to open PPD file \"%s\" - %s" msgstr "lpadmin: PPD ファイル \"%s\" を開けません - %s" @@ -8861,7 +8861,7 @@ msgid "scheduler is running" msgstr "スケジューラーは動作中です" -#: cups/adminutil.c:1384 +#: cups/adminutil.c:1380 #, c-format msgid "stat of %s failed: %s" msgstr "%s の状態取得に失敗しました: %s" @@ -10277,447 +10277,447 @@ msgstr "Trim After Pages" #. TRANSLATORS: Finishings -#: locale/ipp-strings.c:580 +#: locale/ipp-strings.c:584 msgid "finishings" msgstr "Finishings" #. TRANSLATORS: Finishings -#: locale/ipp-strings.c:582 +#: locale/ipp-strings.c:586 msgid "finishings-col" msgstr "Finishings" #. TRANSLATORS: Fold -#: locale/ipp-strings.c:584 +#: locale/ipp-strings.c:588 msgid "finishings.10" msgstr "Fold" #. TRANSLATORS: Z Fold -#: locale/ipp-strings.c:586 +#: locale/ipp-strings.c:590 msgid "finishings.100" msgstr "Fold Z" #. TRANSLATORS: Engineering Z Fold -#: locale/ipp-strings.c:588 +#: locale/ipp-strings.c:592 msgid "finishings.101" msgstr "Fold Engineering Z" #. TRANSLATORS: Trim -#: locale/ipp-strings.c:590 +#: locale/ipp-strings.c:594 msgid "finishings.11" msgstr "Trim" #. TRANSLATORS: Bale -#: locale/ipp-strings.c:592 +#: locale/ipp-strings.c:596 msgid "finishings.12" msgstr "Bale" #. TRANSLATORS: Booklet Maker -#: locale/ipp-strings.c:594 +#: locale/ipp-strings.c:598 msgid "finishings.13" msgstr "Booklet Maker" #. TRANSLATORS: Jog Offset -#: locale/ipp-strings.c:596 +#: locale/ipp-strings.c:600 msgid "finishings.14" msgstr "Jog Offset" #. TRANSLATORS: Coat -#: locale/ipp-strings.c:598 +#: locale/ipp-strings.c:602 msgid "finishings.15" msgstr "Coat" #. TRANSLATORS: Laminate -#: locale/ipp-strings.c:600 +#: locale/ipp-strings.c:604 msgid "finishings.16" msgstr "Laminate" #. TRANSLATORS: Staple Top Left -#: locale/ipp-strings.c:602 +#: locale/ipp-strings.c:606 msgid "finishings.20" msgstr "Staple Top Left" #. TRANSLATORS: Staple Bottom Left -#: locale/ipp-strings.c:604 +#: locale/ipp-strings.c:608 msgid "finishings.21" msgstr "Staple Bottom Left" #. TRANSLATORS: Staple Top Right -#: locale/ipp-strings.c:606 +#: locale/ipp-strings.c:610 msgid "finishings.22" msgstr "Staple Top Right" #. TRANSLATORS: Staple Bottom Right -#: locale/ipp-strings.c:608 +#: locale/ipp-strings.c:612 msgid "finishings.23" msgstr "Staple Bottom Right" #. TRANSLATORS: Edge Stitch Left -#: locale/ipp-strings.c:610 +#: locale/ipp-strings.c:614 msgid "finishings.24" msgstr "Edge Stitch Left" #. TRANSLATORS: Edge Stitch Top -#: locale/ipp-strings.c:612 +#: locale/ipp-strings.c:616 msgid "finishings.25" msgstr "Edge Stitch Top" #. TRANSLATORS: Edge Stitch Right -#: locale/ipp-strings.c:614 +#: locale/ipp-strings.c:618 msgid "finishings.26" msgstr "Edge Stitch Right" #. TRANSLATORS: Edge Stitch Bottom -#: locale/ipp-strings.c:616 +#: locale/ipp-strings.c:620 msgid "finishings.27" msgstr "Edge Stitch Bottom" #. TRANSLATORS: 2 Staples on Left -#: locale/ipp-strings.c:618 +#: locale/ipp-strings.c:622 msgid "finishings.28" msgstr "Staple Dual Left" #. TRANSLATORS: 2 Staples on Top -#: locale/ipp-strings.c:620 +#: locale/ipp-strings.c:624 msgid "finishings.29" msgstr "Staple Dual Top" #. TRANSLATORS: None -#: locale/ipp-strings.c:622 +#: locale/ipp-strings.c:626 msgid "finishings.3" msgstr "None" #. TRANSLATORS: 2 Staples on Right -#: locale/ipp-strings.c:624 +#: locale/ipp-strings.c:628 msgid "finishings.30" msgstr "Staple Dual Right" #. TRANSLATORS: 2 Staples on Bottom -#: locale/ipp-strings.c:626 +#: locale/ipp-strings.c:630 msgid "finishings.31" msgstr "Staple Dual Bottom" #. TRANSLATORS: 3 Staples on Left -#: locale/ipp-strings.c:628 +#: locale/ipp-strings.c:632 msgid "finishings.32" msgstr "Staple Triple Left" #. TRANSLATORS: 3 Staples on Top -#: locale/ipp-strings.c:630 +#: locale/ipp-strings.c:634 msgid "finishings.33" msgstr "Staple Triple Top" #. TRANSLATORS: 3 Staples on Right -#: locale/ipp-strings.c:632 +#: locale/ipp-strings.c:636 msgid "finishings.34" msgstr "Staple Triple Right" #. TRANSLATORS: 3 Staples on Bottom -#: locale/ipp-strings.c:634 +#: locale/ipp-strings.c:638 msgid "finishings.35" msgstr "Staple Triple Bottom" #. TRANSLATORS: Staple -#: locale/ipp-strings.c:636 +#: locale/ipp-strings.c:640 msgid "finishings.4" msgstr "Staple" #. TRANSLATORS: Punch -#: locale/ipp-strings.c:638 +#: locale/ipp-strings.c:642 msgid "finishings.5" msgstr "Punch" #. TRANSLATORS: Bind Left -#: locale/ipp-strings.c:640 +#: locale/ipp-strings.c:644 msgid "finishings.50" msgstr "Bind Left" #. TRANSLATORS: Bind Top -#: locale/ipp-strings.c:642 +#: locale/ipp-strings.c:646 msgid "finishings.51" msgstr "Bind Top" #. TRANSLATORS: Bind Right -#: locale/ipp-strings.c:644 +#: locale/ipp-strings.c:648 msgid "finishings.52" msgstr "Bind Right" #. TRANSLATORS: Bind Bottom -#: locale/ipp-strings.c:646 +#: locale/ipp-strings.c:650 msgid "finishings.53" msgstr "Bind Bottom" #. TRANSLATORS: Cover -#: locale/ipp-strings.c:648 +#: locale/ipp-strings.c:652 msgid "finishings.6" msgstr "Cover" #. TRANSLATORS: Trim Pages -#: locale/ipp-strings.c:650 +#: locale/ipp-strings.c:654 msgid "finishings.60" msgstr "Trim After Pages" #. TRANSLATORS: Trim Documents -#: locale/ipp-strings.c:652 +#: locale/ipp-strings.c:656 msgid "finishings.61" msgstr "Trim After Documents" #. TRANSLATORS: Trim Copies -#: locale/ipp-strings.c:654 +#: locale/ipp-strings.c:658 msgid "finishings.62" msgstr "Trim After Copies" #. TRANSLATORS: Trim Job -#: locale/ipp-strings.c:656 +#: locale/ipp-strings.c:660 msgid "finishings.63" msgstr "Trim After Job" #. TRANSLATORS: Bind -#: locale/ipp-strings.c:658 +#: locale/ipp-strings.c:662 msgid "finishings.7" msgstr "Bind" #. TRANSLATORS: Punch Top Left -#: locale/ipp-strings.c:660 +#: locale/ipp-strings.c:664 msgid "finishings.70" msgstr "Punch Top Left" #. TRANSLATORS: Punch Bottom Left -#: locale/ipp-strings.c:662 +#: locale/ipp-strings.c:666 msgid "finishings.71" msgstr "Punch Bottom Left" #. TRANSLATORS: Punch Top Right -#: locale/ipp-strings.c:664 +#: locale/ipp-strings.c:668 msgid "finishings.72" msgstr "Punch Top Right" #. TRANSLATORS: Punch Bottom Right -#: locale/ipp-strings.c:666 +#: locale/ipp-strings.c:670 msgid "finishings.73" msgstr "Punch Bottom Right" #. TRANSLATORS: 2-hole Punch Left -#: locale/ipp-strings.c:668 +#: locale/ipp-strings.c:672 msgid "finishings.74" msgstr "Punch Dual Left" #. TRANSLATORS: 2-hole Punch Top -#: locale/ipp-strings.c:670 +#: locale/ipp-strings.c:674 msgid "finishings.75" msgstr "Punch Dual Top" #. TRANSLATORS: 2-hole Punch Right -#: locale/ipp-strings.c:672 +#: locale/ipp-strings.c:676 msgid "finishings.76" msgstr "Punch Dual Right" #. TRANSLATORS: 2-hole Punch Bottom -#: locale/ipp-strings.c:674 +#: locale/ipp-strings.c:678 msgid "finishings.77" msgstr "Punch Dual Bottom" #. TRANSLATORS: 3-hole Punch Left -#: locale/ipp-strings.c:676 +#: locale/ipp-strings.c:680 msgid "finishings.78" msgstr "Punch Triple Left" #. TRANSLATORS: 3-hole Punch Top -#: locale/ipp-strings.c:678 +#: locale/ipp-strings.c:682 msgid "finishings.79" msgstr "Punch Triple Top" #. TRANSLATORS: Saddle Stitch -#: locale/ipp-strings.c:680 +#: locale/ipp-strings.c:684 msgid "finishings.8" msgstr "Saddle Stitch" #. TRANSLATORS: 3-hole Punch Right -#: locale/ipp-strings.c:682 +#: locale/ipp-strings.c:686 msgid "finishings.80" msgstr "Punch Triple Right" #. TRANSLATORS: 3-hole Punch Bottom -#: locale/ipp-strings.c:684 +#: locale/ipp-strings.c:688 msgid "finishings.81" msgstr "Punch Triple Bottom" #. TRANSLATORS: 4-hole Punch Left -#: locale/ipp-strings.c:686 +#: locale/ipp-strings.c:690 msgid "finishings.82" msgstr "Punch Quad Left" #. TRANSLATORS: 4-hole Punch Top -#: locale/ipp-strings.c:688 +#: locale/ipp-strings.c:692 msgid "finishings.83" msgstr "Punch Quad Top" #. TRANSLATORS: 4-hole Punch Right -#: locale/ipp-strings.c:690 +#: locale/ipp-strings.c:694 msgid "finishings.84" msgstr "Punch Quad Right" #. TRANSLATORS: 4-hole Punch Bottom -#: locale/ipp-strings.c:692 +#: locale/ipp-strings.c:696 msgid "finishings.85" msgstr "Punch Quad Bottom" #. TRANSLATORS: Multi-hole Punch Left -#: locale/ipp-strings.c:694 +#: locale/ipp-strings.c:698 msgid "finishings.86" msgstr "Punch Multiple Left" #. TRANSLATORS: Multi-hole Punch Top -#: locale/ipp-strings.c:696 +#: locale/ipp-strings.c:700 msgid "finishings.87" msgstr "Punch Multiple Top" #. TRANSLATORS: Multi-hole Punch Right -#: locale/ipp-strings.c:698 +#: locale/ipp-strings.c:702 msgid "finishings.88" msgstr "Punch Multiple Right" #. TRANSLATORS: Multi-hole Punch Bottom -#: locale/ipp-strings.c:700 +#: locale/ipp-strings.c:704 msgid "finishings.89" msgstr "Punch Multiple Bottom" #. TRANSLATORS: Edge Stitch -#: locale/ipp-strings.c:702 +#: locale/ipp-strings.c:706 msgid "finishings.9" msgstr "Edge Stitch" #. TRANSLATORS: Accordion Fold -#: locale/ipp-strings.c:704 +#: locale/ipp-strings.c:708 msgid "finishings.90" msgstr "Fold Accordion" #. TRANSLATORS: Double Gate Fold -#: locale/ipp-strings.c:706 +#: locale/ipp-strings.c:710 msgid "finishings.91" msgstr "Fold Double Gate" #. TRANSLATORS: Gate Fold -#: locale/ipp-strings.c:708 +#: locale/ipp-strings.c:712 msgid "finishings.92" msgstr "Fold Gate" #. TRANSLATORS: Half Fold -#: locale/ipp-strings.c:710 +#: locale/ipp-strings.c:714 msgid "finishings.93" msgstr "Fold Half" #. TRANSLATORS: Half Z Fold -#: locale/ipp-strings.c:712 +#: locale/ipp-strings.c:716 msgid "finishings.94" msgstr "Fold Half Z" #. TRANSLATORS: Left Gate Fold -#: locale/ipp-strings.c:714 +#: locale/ipp-strings.c:718 msgid "finishings.95" msgstr "Fold Left Gate" #. TRANSLATORS: Letter Fold -#: locale/ipp-strings.c:716 +#: locale/ipp-strings.c:720 msgid "finishings.96" msgstr "Fold Letter" #. TRANSLATORS: Parallel Fold -#: locale/ipp-strings.c:718 +#: locale/ipp-strings.c:722 msgid "finishings.97" msgstr "Fold Parallel" #. TRANSLATORS: Poster Fold -#: locale/ipp-strings.c:720 +#: locale/ipp-strings.c:724 msgid "finishings.98" msgstr "Fold Poster" #. TRANSLATORS: Right Gate Fold -#: locale/ipp-strings.c:722 +#: locale/ipp-strings.c:726 msgid "finishings.99" msgstr "Fold Right Gate" #. TRANSLATORS: Fold -#: locale/ipp-strings.c:724 +#: locale/ipp-strings.c:728 msgid "folding" msgstr "Fold" #. TRANSLATORS: Fold Direction -#: locale/ipp-strings.c:726 +#: locale/ipp-strings.c:730 msgid "folding-direction" msgstr "Folding Direction" #. TRANSLATORS: Inward -#: locale/ipp-strings.c:728 +#: locale/ipp-strings.c:732 msgid "folding-direction.inward" msgstr "Inward" #. TRANSLATORS: Outward -#: locale/ipp-strings.c:730 +#: locale/ipp-strings.c:734 msgid "folding-direction.outward" msgstr "Outward" #. TRANSLATORS: Fold Position -#: locale/ipp-strings.c:732 +#: locale/ipp-strings.c:736 msgid "folding-offset" msgstr "Fold Position" #. TRANSLATORS: Fold Edge -#: locale/ipp-strings.c:734 +#: locale/ipp-strings.c:738 msgid "folding-reference-edge" msgstr "Folding Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:736 +#: locale/ipp-strings.c:740 msgid "folding-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:738 +#: locale/ipp-strings.c:742 msgid "folding-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:740 +#: locale/ipp-strings.c:744 msgid "folding-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:742 +#: locale/ipp-strings.c:746 msgid "folding-reference-edge.top" msgstr "Top" #. TRANSLATORS: Font Name -#: locale/ipp-strings.c:744 +#: locale/ipp-strings.c:748 msgid "font-name-requested" msgstr "Font Name" #. TRANSLATORS: Font Size -#: locale/ipp-strings.c:746 +#: locale/ipp-strings.c:750 msgid "font-size-requested" msgstr "Font Size" #. TRANSLATORS: Force Front Side -#: locale/ipp-strings.c:748 +#: locale/ipp-strings.c:752 msgid "force-front-side" msgstr "Force Front Side" #. TRANSLATORS: From Name -#: locale/ipp-strings.c:750 +#: locale/ipp-strings.c:754 msgid "from-name" msgstr "From Name" #. TRANSLATORS: Imposition Template -#: locale/ipp-strings.c:752 +#: locale/ipp-strings.c:756 msgid "imposition-template" msgstr "Imposition Template" #. TRANSLATORS: None -#: locale/ipp-strings.c:754 +#: locale/ipp-strings.c:758 msgid "imposition-template.none" msgstr "None" #. TRANSLATORS: Signature -#: locale/ipp-strings.c:756 +#: locale/ipp-strings.c:760 msgid "imposition-template.signature" msgstr "Signature" @@ -10863,72 +10863,72 @@ msgstr "Platen" #. TRANSLATORS: Insert Page Number -#: locale/ipp-strings.c:758 +#: locale/ipp-strings.c:762 msgid "insert-after-page-number" msgstr "Insert Page Number" #. TRANSLATORS: Insert Count -#: locale/ipp-strings.c:760 +#: locale/ipp-strings.c:764 msgid "insert-count" msgstr "Insert Count" #. TRANSLATORS: Insert Sheet -#: locale/ipp-strings.c:762 +#: locale/ipp-strings.c:766 msgid "insert-sheet" msgstr "Insert Sheet" #. TRANSLATORS: Job Account ID -#: locale/ipp-strings.c:764 +#: locale/ipp-strings.c:768 msgid "job-account-id" msgstr "Job Account ID" #. TRANSLATORS: Job Account Type -#: locale/ipp-strings.c:766 +#: locale/ipp-strings.c:770 msgid "job-account-type" msgstr "Job Account Type" #. TRANSLATORS: General -#: locale/ipp-strings.c:768 +#: locale/ipp-strings.c:772 msgid "job-account-type.general" msgstr "General" #. TRANSLATORS: Group -#: locale/ipp-strings.c:770 +#: locale/ipp-strings.c:774 msgid "job-account-type.group" msgstr "Group" #. TRANSLATORS: None -#: locale/ipp-strings.c:772 +#: locale/ipp-strings.c:776 msgid "job-account-type.none" msgstr "None" #. TRANSLATORS: Job Accounting Output Bin -#: locale/ipp-strings.c:774 +#: locale/ipp-strings.c:778 msgid "job-accounting-output-bin" msgstr "Job Accounting Output Bin" #. TRANSLATORS: Job Accounting Sheets -#: locale/ipp-strings.c:776 +#: locale/ipp-strings.c:780 msgid "job-accounting-sheets" msgstr "Job Accounting Sheets" #. TRANSLATORS: Type of Job Accounting Sheets -#: locale/ipp-strings.c:778 +#: locale/ipp-strings.c:782 msgid "job-accounting-sheets-type" msgstr "Job Accounting Sheets Type" #. TRANSLATORS: None -#: locale/ipp-strings.c:780 +#: locale/ipp-strings.c:784 msgid "job-accounting-sheets-type.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:782 +#: locale/ipp-strings.c:786 msgid "job-accounting-sheets-type.standard" msgstr "Standard" #. TRANSLATORS: Job Accounting User ID -#: locale/ipp-strings.c:784 +#: locale/ipp-strings.c:788 msgid "job-accounting-user-id" msgstr "Job Accounting User ID" @@ -10945,8258 +10945,8292 @@ msgstr "Uncollated Documents" #. TRANSLATORS: Copies -#: locale/ipp-strings.c:788 +#: locale/ipp-strings.c:792 msgid "job-copies" msgstr "Job Copies" #. TRANSLATORS: Back Cover -#: locale/ipp-strings.c:790 +#: locale/ipp-strings.c:794 msgid "job-cover-back" msgstr "Job Cover Back" #. TRANSLATORS: Front Cover -#: locale/ipp-strings.c:792 +#: locale/ipp-strings.c:796 msgid "job-cover-front" msgstr "Job Cover Front" #. TRANSLATORS: Delay Output Until -#: locale/ipp-strings.c:794 +#: locale/ipp-strings.c:798 msgid "job-delay-output-until" msgstr "Job Delay Output Until" #. TRANSLATORS: Delay Output Until -#: locale/ipp-strings.c:796 +#: locale/ipp-strings.c:800 msgid "job-delay-output-until-time" msgstr "Job Delay Output Until Time" #. TRANSLATORS: Daytime -#: locale/ipp-strings.c:798 +#: locale/ipp-strings.c:802 msgid "job-delay-output-until.day-time" msgstr "Day Time" #. TRANSLATORS: Evening -#: locale/ipp-strings.c:800 +#: locale/ipp-strings.c:804 msgid "job-delay-output-until.evening" msgstr "Evening" #. TRANSLATORS: Released -#: locale/ipp-strings.c:802 +#: locale/ipp-strings.c:806 msgid "job-delay-output-until.indefinite" msgstr "Indefinite" #. TRANSLATORS: Night -#: locale/ipp-strings.c:804 +#: locale/ipp-strings.c:808 msgid "job-delay-output-until.night" msgstr "Night" #. TRANSLATORS: No Delay -#: locale/ipp-strings.c:806 +#: locale/ipp-strings.c:810 msgid "job-delay-output-until.no-delay-output" msgstr "No Delay Output" #. TRANSLATORS: Second Shift -#: locale/ipp-strings.c:808 +#: locale/ipp-strings.c:812 msgid "job-delay-output-until.second-shift" msgstr "Second Shift" #. TRANSLATORS: Third Shift -#: locale/ipp-strings.c:810 +#: locale/ipp-strings.c:814 msgid "job-delay-output-until.third-shift" msgstr "Third Shift" #. TRANSLATORS: Weekend -#: locale/ipp-strings.c:812 +#: locale/ipp-strings.c:816 msgid "job-delay-output-until.weekend" msgstr "Weekend" #. TRANSLATORS: On Error -#: locale/ipp-strings.c:814 +#: locale/ipp-strings.c:818 msgid "job-error-action" msgstr "Job Error Action" #. TRANSLATORS: Abort Job -#: locale/ipp-strings.c:816 +#: locale/ipp-strings.c:820 msgid "job-error-action.abort-job" msgstr "Abort Job" #. TRANSLATORS: Cancel Job -#: locale/ipp-strings.c:818 +#: locale/ipp-strings.c:822 msgid "job-error-action.cancel-job" msgstr "Cancel Job" #. TRANSLATORS: Continue Job -#: locale/ipp-strings.c:820 +#: locale/ipp-strings.c:824 msgid "job-error-action.continue-job" msgstr "Continue Job" #. TRANSLATORS: Suspend Job -#: locale/ipp-strings.c:822 +#: locale/ipp-strings.c:826 msgid "job-error-action.suspend-job" msgstr "Suspend Job" #. TRANSLATORS: Print Error Sheet -#: locale/ipp-strings.c:824 +#: locale/ipp-strings.c:828 msgid "job-error-sheet" msgstr "Job Error Sheet" #. TRANSLATORS: Type of Error Sheet -#: locale/ipp-strings.c:826 +#: locale/ipp-strings.c:830 msgid "job-error-sheet-type" msgstr "Job Error Sheet Type" #. TRANSLATORS: None -#: locale/ipp-strings.c:828 +#: locale/ipp-strings.c:832 msgid "job-error-sheet-type.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:830 +#: locale/ipp-strings.c:834 msgid "job-error-sheet-type.standard" msgstr "Standard" #. TRANSLATORS: Print Error Sheet -#: locale/ipp-strings.c:832 +#: locale/ipp-strings.c:836 msgid "job-error-sheet-when" msgstr "Job Error Sheet When" #. TRANSLATORS: Always -#: locale/ipp-strings.c:834 +#: locale/ipp-strings.c:838 msgid "job-error-sheet-when.always" msgstr "Always" #. TRANSLATORS: On Error -#: locale/ipp-strings.c:836 +#: locale/ipp-strings.c:840 msgid "job-error-sheet-when.on-error" msgstr "On Error" #. TRANSLATORS: Job Finishings -#: locale/ipp-strings.c:838 +#: locale/ipp-strings.c:842 msgid "job-finishings" msgstr "Job Finishings" #. TRANSLATORS: Hold Until -#: locale/ipp-strings.c:840 +#: locale/ipp-strings.c:844 msgid "job-hold-until" msgstr "Hold Until" #. TRANSLATORS: Hold Until -#: locale/ipp-strings.c:842 +#: locale/ipp-strings.c:846 msgid "job-hold-until-time" msgstr "Job Hold Until Time" #. TRANSLATORS: Daytime -#: locale/ipp-strings.c:844 +#: locale/ipp-strings.c:848 msgid "job-hold-until.day-time" msgstr "Day Time" #. TRANSLATORS: Evening -#: locale/ipp-strings.c:846 +#: locale/ipp-strings.c:850 msgid "job-hold-until.evening" msgstr "Evening" #. TRANSLATORS: Released -#: locale/ipp-strings.c:848 +#: locale/ipp-strings.c:852 msgid "job-hold-until.indefinite" msgstr "Released" #. TRANSLATORS: Night -#: locale/ipp-strings.c:850 +#: locale/ipp-strings.c:854 msgid "job-hold-until.night" msgstr "Night" #. TRANSLATORS: No Hold -#: locale/ipp-strings.c:852 +#: locale/ipp-strings.c:856 msgid "job-hold-until.no-hold" msgstr "No Hold" #. TRANSLATORS: Second Shift -#: locale/ipp-strings.c:854 +#: locale/ipp-strings.c:858 msgid "job-hold-until.second-shift" msgstr "Second Shift" #. TRANSLATORS: Third Shift -#: locale/ipp-strings.c:856 +#: locale/ipp-strings.c:860 msgid "job-hold-until.third-shift" msgstr "Third Shift" #. TRANSLATORS: Weekend -#: locale/ipp-strings.c:858 +#: locale/ipp-strings.c:862 msgid "job-hold-until.weekend" msgstr "Weekend" #. TRANSLATORS: Job Mandatory Attributes -#: locale/ipp-strings.c:860 +#: locale/ipp-strings.c:864 msgid "job-mandatory-attributes" msgstr "Job Mandatory Attributes" #. TRANSLATORS: Title -#: locale/ipp-strings.c:862 +#: locale/ipp-strings.c:866 msgid "job-name" msgstr "Job Name" #. TRANSLATORS: Job Phone Number -#: locale/ipp-strings.c:868 +#: locale/ipp-strings.c:872 msgid "job-phone-number" msgstr "Job Phone Number" #. TRANSLATORS: Job Priority -#: locale/ipp-strings.c:870 +#: locale/ipp-strings.c:874 msgid "job-priority" msgstr "Job Priority" #. TRANSLATORS: Job Recipient Name -#: locale/ipp-strings.c:894 +#: locale/ipp-strings.c:898 msgid "job-recipient-name" msgstr "Job Recipient Name" #. TRANSLATORS: Job Save Disposition -#: locale/ipp-strings.c:912 +#: locale/ipp-strings.c:916 msgid "job-save-disposition" msgstr "Job Save Disposition" #. TRANSLATORS: Job Sheet Message -#: locale/ipp-strings.c:914 +#: locale/ipp-strings.c:918 msgid "job-sheet-message" msgstr "Job Sheet Message" #. TRANSLATORS: Banner Page -#: locale/ipp-strings.c:916 +#: locale/ipp-strings.c:920 msgid "job-sheets" msgstr "Banner Page" #. TRANSLATORS: Banner Page -#: locale/ipp-strings.c:918 +#: locale/ipp-strings.c:922 msgid "job-sheets-col" msgstr "Banner Page" #. TRANSLATORS: First Page in Document -#: locale/ipp-strings.c:920 +#: locale/ipp-strings.c:924 msgid "job-sheets.first-print-stream-page" msgstr "First Print Stream Page" #. TRANSLATORS: Start and End Sheets -#: locale/ipp-strings.c:922 +#: locale/ipp-strings.c:926 msgid "job-sheets.job-both-sheet" msgstr "Start and End Sheets" #. TRANSLATORS: End Sheet -#: locale/ipp-strings.c:924 +#: locale/ipp-strings.c:928 msgid "job-sheets.job-end-sheet" msgstr "End Sheet" #. TRANSLATORS: Start Sheet -#: locale/ipp-strings.c:926 +#: locale/ipp-strings.c:930 msgid "job-sheets.job-start-sheet" msgstr "Start Sheet" #. TRANSLATORS: None -#: locale/ipp-strings.c:928 +#: locale/ipp-strings.c:932 msgid "job-sheets.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:930 +#: locale/ipp-strings.c:934 msgid "job-sheets.standard" msgstr "Standard" #. TRANSLATORS: Job State -#: locale/ipp-strings.c:932 +#: locale/ipp-strings.c:936 msgid "job-state" msgstr "Job State" #. TRANSLATORS: Job State Message -#: locale/ipp-strings.c:934 +#: locale/ipp-strings.c:938 msgid "job-state-message" msgstr "Job State Message" #. TRANSLATORS: Detailed Job State -#: locale/ipp-strings.c:936 +#: locale/ipp-strings.c:940 msgid "job-state-reasons" msgstr "Detailed Job State" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:938 +#: locale/ipp-strings.c:942 msgid "job-state-reasons.aborted-by-system" msgstr "Aborted By System" #. TRANSLATORS: Account Authorization Failed -#: locale/ipp-strings.c:940 +#: locale/ipp-strings.c:944 msgid "job-state-reasons.account-authorization-failed" msgstr "Account Authorization Failed" #. TRANSLATORS: Account Closed -#: locale/ipp-strings.c:942 +#: locale/ipp-strings.c:946 msgid "job-state-reasons.account-closed" msgstr "Account Closed" #. TRANSLATORS: Account Info Needed -#: locale/ipp-strings.c:944 +#: locale/ipp-strings.c:948 msgid "job-state-reasons.account-info-needed" msgstr "Account Info Needed" #. TRANSLATORS: Account Limit Reached -#: locale/ipp-strings.c:946 +#: locale/ipp-strings.c:950 msgid "job-state-reasons.account-limit-reached" msgstr "Account Limit Reached" #. TRANSLATORS: Decompression error -#: locale/ipp-strings.c:948 +#: locale/ipp-strings.c:952 msgid "job-state-reasons.compression-error" msgstr "Compression Error" #. TRANSLATORS: Conflicting Attributes -#: locale/ipp-strings.c:950 +#: locale/ipp-strings.c:954 msgid "job-state-reasons.conflicting-attributes" msgstr "Conflicting Attributes" #. TRANSLATORS: Connected To Destination -#: locale/ipp-strings.c:952 +#: locale/ipp-strings.c:956 msgid "job-state-reasons.connected-to-destination" msgstr "Connected To Destination" #. TRANSLATORS: Connecting To Destination -#: locale/ipp-strings.c:954 +#: locale/ipp-strings.c:958 msgid "job-state-reasons.connecting-to-destination" msgstr "Connecting To Destination" #. TRANSLATORS: Destination Uri Failed -#: locale/ipp-strings.c:956 +#: locale/ipp-strings.c:960 msgid "job-state-reasons.destination-uri-failed" msgstr "Destination Uri Failed" #. TRANSLATORS: Digital Signature Did Not Verify -#: locale/ipp-strings.c:958 +#: locale/ipp-strings.c:962 msgid "job-state-reasons.digital-signature-did-not-verify" msgstr "Digital Signature Did Not Verify" #. TRANSLATORS: Digital Signature Type Not Supported -#: locale/ipp-strings.c:960 +#: locale/ipp-strings.c:964 msgid "job-state-reasons.digital-signature-type-not-supported" msgstr "Digital Signature Type Not Supported" #. TRANSLATORS: Document Access Error -#: locale/ipp-strings.c:962 +#: locale/ipp-strings.c:966 msgid "job-state-reasons.document-access-error" msgstr "Document Access Error" #. TRANSLATORS: Document Format Error -#: locale/ipp-strings.c:964 +#: locale/ipp-strings.c:968 msgid "job-state-reasons.document-format-error" msgstr "Document Format Error" #. TRANSLATORS: Document Password Error -#: locale/ipp-strings.c:966 +#: locale/ipp-strings.c:970 msgid "job-state-reasons.document-password-error" msgstr "Document Password Error" #. TRANSLATORS: Document Permission Error -#: locale/ipp-strings.c:968 +#: locale/ipp-strings.c:972 msgid "job-state-reasons.document-permission-error" msgstr "Document Permission Error" #. TRANSLATORS: Document Security Error -#: locale/ipp-strings.c:970 +#: locale/ipp-strings.c:974 msgid "job-state-reasons.document-security-error" msgstr "Document Security Error" #. TRANSLATORS: Document Unprintable Error -#: locale/ipp-strings.c:972 +#: locale/ipp-strings.c:976 msgid "job-state-reasons.document-unprintable-error" msgstr "Document Unprintable Error" #. TRANSLATORS: Errors Detected -#: locale/ipp-strings.c:974 +#: locale/ipp-strings.c:978 msgid "job-state-reasons.errors-detected" msgstr "Errors Detected" #. TRANSLATORS: Canceled at printer -#: locale/ipp-strings.c:976 +#: locale/ipp-strings.c:980 msgid "job-state-reasons.job-canceled-at-device" msgstr "Job Canceled At Device" #. TRANSLATORS: Canceled by operator -#: locale/ipp-strings.c:978 +#: locale/ipp-strings.c:982 msgid "job-state-reasons.job-canceled-by-operator" msgstr "Job Canceled By Operator" #. TRANSLATORS: Canceled by user -#: locale/ipp-strings.c:980 +#: locale/ipp-strings.c:984 msgid "job-state-reasons.job-canceled-by-user" msgstr "Job Canceled By User" #. TRANSLATORS: -#: locale/ipp-strings.c:982 +#: locale/ipp-strings.c:986 msgid "job-state-reasons.job-completed-successfully" msgstr "Job Completed Successfully" #. TRANSLATORS: Completed with errors -#: locale/ipp-strings.c:984 +#: locale/ipp-strings.c:988 msgid "job-state-reasons.job-completed-with-errors" msgstr "Job Completed With Errors" #. TRANSLATORS: Completed with warnings -#: locale/ipp-strings.c:986 +#: locale/ipp-strings.c:990 msgid "job-state-reasons.job-completed-with-warnings" msgstr "Job Completed With Warnings" #. TRANSLATORS: Insufficient data -#: locale/ipp-strings.c:988 +#: locale/ipp-strings.c:992 msgid "job-state-reasons.job-data-insufficient" msgstr "Job Data Insufficient" #. TRANSLATORS: Job Delay Output Until Specified -#: locale/ipp-strings.c:990 +#: locale/ipp-strings.c:994 msgid "job-state-reasons.job-delay-output-until-specified" msgstr "Job Delay Output Until Specified" #. TRANSLATORS: Job Digital Signature Wait -#: locale/ipp-strings.c:992 +#: locale/ipp-strings.c:996 msgid "job-state-reasons.job-digital-signature-wait" msgstr "Job Digital Signature Wait" #. TRANSLATORS: Job Fetchable -#: locale/ipp-strings.c:994 +#: locale/ipp-strings.c:998 msgid "job-state-reasons.job-fetchable" msgstr "Job Fetchable" #. TRANSLATORS: Job Held For Review -#: locale/ipp-strings.c:996 +#: locale/ipp-strings.c:1000 msgid "job-state-reasons.job-held-for-review" msgstr "Job Held For Review" #. TRANSLATORS: Job held -#: locale/ipp-strings.c:998 +#: locale/ipp-strings.c:1002 msgid "job-state-reasons.job-hold-until-specified" msgstr "Job Hold Until Specified" #. TRANSLATORS: Incoming -#: locale/ipp-strings.c:1000 +#: locale/ipp-strings.c:1004 msgid "job-state-reasons.job-incoming" msgstr "Job Incoming" #. TRANSLATORS: Interpreting -#: locale/ipp-strings.c:1002 +#: locale/ipp-strings.c:1006 msgid "job-state-reasons.job-interpreting" msgstr "Job Interpreting" #. TRANSLATORS: Outgoing -#: locale/ipp-strings.c:1004 +#: locale/ipp-strings.c:1008 msgid "job-state-reasons.job-outgoing" msgstr "Job Outgoing" #. TRANSLATORS: Job Password Wait -#: locale/ipp-strings.c:1006 +#: locale/ipp-strings.c:1010 msgid "job-state-reasons.job-password-wait" msgstr "Job Password Wait" #. TRANSLATORS: Job Printed Successfully -#: locale/ipp-strings.c:1008 +#: locale/ipp-strings.c:1012 msgid "job-state-reasons.job-printed-successfully" msgstr "Job Printed Successfully" #. TRANSLATORS: Job Printed With Errors -#: locale/ipp-strings.c:1010 +#: locale/ipp-strings.c:1014 msgid "job-state-reasons.job-printed-with-errors" msgstr "Job Printed With Errors" #. TRANSLATORS: Job Printed With Warnings -#: locale/ipp-strings.c:1012 +#: locale/ipp-strings.c:1016 msgid "job-state-reasons.job-printed-with-warnings" msgstr "Job Printed With Warnings" #. TRANSLATORS: Printing -#: locale/ipp-strings.c:1014 +#: locale/ipp-strings.c:1018 msgid "job-state-reasons.job-printing" msgstr "Job Printing" #. TRANSLATORS: Preparing to print -#: locale/ipp-strings.c:1016 +#: locale/ipp-strings.c:1020 msgid "job-state-reasons.job-queued" msgstr "Job Queued" #. TRANSLATORS: Processing document -#: locale/ipp-strings.c:1018 +#: locale/ipp-strings.c:1022 msgid "job-state-reasons.job-queued-for-marker" msgstr "Job Queued For Marker" #. TRANSLATORS: Job Release Wait -#: locale/ipp-strings.c:1020 +#: locale/ipp-strings.c:1024 msgid "job-state-reasons.job-release-wait" msgstr "Job Release Wait" #. TRANSLATORS: Restartable -#: locale/ipp-strings.c:1022 +#: locale/ipp-strings.c:1026 msgid "job-state-reasons.job-restartable" msgstr "Job Restartable" #. TRANSLATORS: Job Resuming -#: locale/ipp-strings.c:1024 +#: locale/ipp-strings.c:1028 msgid "job-state-reasons.job-resuming" msgstr "Job Resuming" #. TRANSLATORS: Job Saved Successfully -#: locale/ipp-strings.c:1026 +#: locale/ipp-strings.c:1030 msgid "job-state-reasons.job-saved-successfully" msgstr "Job Saved Successfully" #. TRANSLATORS: Job Saved With Errors -#: locale/ipp-strings.c:1028 +#: locale/ipp-strings.c:1032 msgid "job-state-reasons.job-saved-with-errors" msgstr "Job Saved With Errors" #. TRANSLATORS: Job Saved With Warnings -#: locale/ipp-strings.c:1030 +#: locale/ipp-strings.c:1034 msgid "job-state-reasons.job-saved-with-warnings" msgstr "Job Saved With Warnings" #. TRANSLATORS: Job Saving -#: locale/ipp-strings.c:1032 +#: locale/ipp-strings.c:1036 msgid "job-state-reasons.job-saving" msgstr "Job Saving" #. TRANSLATORS: Job Spooling -#: locale/ipp-strings.c:1034 +#: locale/ipp-strings.c:1038 msgid "job-state-reasons.job-spooling" msgstr "Job Spooling" #. TRANSLATORS: Job Streaming -#: locale/ipp-strings.c:1036 +#: locale/ipp-strings.c:1040 msgid "job-state-reasons.job-streaming" msgstr "Job Streaming" #. TRANSLATORS: Suspended -#: locale/ipp-strings.c:1038 +#: locale/ipp-strings.c:1042 msgid "job-state-reasons.job-suspended" msgstr "Job Suspended" #. TRANSLATORS: Job Suspended By Operator -#: locale/ipp-strings.c:1040 +#: locale/ipp-strings.c:1044 msgid "job-state-reasons.job-suspended-by-operator" msgstr "Job Suspended By Operator" #. TRANSLATORS: Job Suspended By System -#: locale/ipp-strings.c:1042 +#: locale/ipp-strings.c:1046 msgid "job-state-reasons.job-suspended-by-system" msgstr "Job Suspended By System" #. TRANSLATORS: Job Suspended By User -#: locale/ipp-strings.c:1044 +#: locale/ipp-strings.c:1048 msgid "job-state-reasons.job-suspended-by-user" msgstr "Job Suspended By User" #. TRANSLATORS: Job Suspending -#: locale/ipp-strings.c:1046 +#: locale/ipp-strings.c:1050 msgid "job-state-reasons.job-suspending" msgstr "Job Suspending" #. TRANSLATORS: Job Transferring -#: locale/ipp-strings.c:1048 +#: locale/ipp-strings.c:1052 msgid "job-state-reasons.job-transferring" msgstr "Job Transferring" #. TRANSLATORS: Transforming -#: locale/ipp-strings.c:1050 +#: locale/ipp-strings.c:1054 msgid "job-state-reasons.job-transforming" msgstr "Job Transforming" #. TRANSLATORS: None -#: locale/ipp-strings.c:1052 +#: locale/ipp-strings.c:1056 msgid "job-state-reasons.none" msgstr "None" #. TRANSLATORS: Printer offline -#: locale/ipp-strings.c:1054 +#: locale/ipp-strings.c:1058 msgid "job-state-reasons.printer-stopped" msgstr "Printer Stopped" #. TRANSLATORS: Printer partially stopped -#: locale/ipp-strings.c:1056 +#: locale/ipp-strings.c:1060 msgid "job-state-reasons.printer-stopped-partly" msgstr "Printer Stopped Partly" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:1058 +#: locale/ipp-strings.c:1062 msgid "job-state-reasons.processing-to-stop-point" msgstr "Processing To Stop Point" #. TRANSLATORS: Ready -#: locale/ipp-strings.c:1060 +#: locale/ipp-strings.c:1064 msgid "job-state-reasons.queued-in-device" msgstr "Queued In Device" #. TRANSLATORS: Resources Are Not Ready -#: locale/ipp-strings.c:1062 +#: locale/ipp-strings.c:1066 msgid "job-state-reasons.resources-are-not-ready" msgstr "Resources Are Not Ready" #. TRANSLATORS: Resources Are Not Supported -#: locale/ipp-strings.c:1064 +#: locale/ipp-strings.c:1068 msgid "job-state-reasons.resources-are-not-supported" msgstr "Resources Are Not Supported" #. TRANSLATORS: Service offline -#: locale/ipp-strings.c:1066 +#: locale/ipp-strings.c:1070 msgid "job-state-reasons.service-off-line" msgstr "Service Off Line" #. TRANSLATORS: Submission Interrupted -#: locale/ipp-strings.c:1068 +#: locale/ipp-strings.c:1072 msgid "job-state-reasons.submission-interrupted" msgstr "Submission Interrupted" #. TRANSLATORS: Unsupported Attributes Or Values -#: locale/ipp-strings.c:1070 +#: locale/ipp-strings.c:1074 msgid "job-state-reasons.unsupported-attributes-or-values" msgstr "Unsupported Attributes Or Values" #. TRANSLATORS: Unsupported Compression -#: locale/ipp-strings.c:1072 +#: locale/ipp-strings.c:1076 msgid "job-state-reasons.unsupported-compression" msgstr "Unsupported Compression" #. TRANSLATORS: Unsupported Document Format -#: locale/ipp-strings.c:1074 +#: locale/ipp-strings.c:1078 msgid "job-state-reasons.unsupported-document-format" msgstr "Unsupported Document Format" #. TRANSLATORS: Waiting For User Action -#: locale/ipp-strings.c:1076 +#: locale/ipp-strings.c:1080 msgid "job-state-reasons.waiting-for-user-action" msgstr "Waiting For User Action" #. TRANSLATORS: Warnings Detected -#: locale/ipp-strings.c:1078 +#: locale/ipp-strings.c:1082 msgid "job-state-reasons.warnings-detected" msgstr "Warnings Detected" #. TRANSLATORS: Pending -#: locale/ipp-strings.c:1080 +#: locale/ipp-strings.c:1084 msgid "job-state.3" msgstr "Pending" #. TRANSLATORS: Held -#: locale/ipp-strings.c:1082 +#: locale/ipp-strings.c:1086 msgid "job-state.4" msgstr "Pending Held" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:1084 +#: locale/ipp-strings.c:1088 msgid "job-state.5" msgstr "Processing" #. TRANSLATORS: Stopped -#: locale/ipp-strings.c:1086 +#: locale/ipp-strings.c:1090 msgid "job-state.6" msgstr "Processing Stopped" #. TRANSLATORS: Canceled -#: locale/ipp-strings.c:1088 +#: locale/ipp-strings.c:1092 msgid "job-state.7" msgstr "Canceled" #. TRANSLATORS: Aborted -#: locale/ipp-strings.c:1090 +#: locale/ipp-strings.c:1094 msgid "job-state.8" msgstr "Aborted" #. TRANSLATORS: Completed -#: locale/ipp-strings.c:1092 +#: locale/ipp-strings.c:1096 msgid "job-state.9" msgstr "Completed" #. TRANSLATORS: Laminate Pages -#: locale/ipp-strings.c:1094 +#: locale/ipp-strings.c:1098 msgid "laminating" msgstr "Laminate Pages" #. TRANSLATORS: Laminate -#: locale/ipp-strings.c:1096 +#: locale/ipp-strings.c:1100 msgid "laminating-sides" msgstr "Laminating Sides" #. TRANSLATORS: Back Only -#: locale/ipp-strings.c:1098 +#: locale/ipp-strings.c:1102 msgid "laminating-sides.back" msgstr "Back" #. TRANSLATORS: Front and Back -#: locale/ipp-strings.c:1100 +#: locale/ipp-strings.c:1104 msgid "laminating-sides.both" msgstr "Both" #. TRANSLATORS: Front Only -#: locale/ipp-strings.c:1102 +#: locale/ipp-strings.c:1106 msgid "laminating-sides.front" msgstr "Front" #. TRANSLATORS: Type of Lamination -#: locale/ipp-strings.c:1104 +#: locale/ipp-strings.c:1108 msgid "laminating-type" msgstr "Laminating Type" #. TRANSLATORS: Archival -#: locale/ipp-strings.c:1106 +#: locale/ipp-strings.c:1110 msgid "laminating-type.archival" msgstr "Archival" #. TRANSLATORS: Glossy -#: locale/ipp-strings.c:1108 +#: locale/ipp-strings.c:1112 msgid "laminating-type.glossy" msgstr "Glossy" #. TRANSLATORS: High Gloss -#: locale/ipp-strings.c:1110 +#: locale/ipp-strings.c:1114 msgid "laminating-type.high-gloss" msgstr "High Gloss" #. TRANSLATORS: Matte -#: locale/ipp-strings.c:1112 +#: locale/ipp-strings.c:1116 msgid "laminating-type.matte" msgstr "Matte" #. TRANSLATORS: Semi-gloss -#: locale/ipp-strings.c:1114 +#: locale/ipp-strings.c:1118 msgid "laminating-type.semi-gloss" msgstr "Semi-Gloss" #. TRANSLATORS: Translucent -#: locale/ipp-strings.c:1116 +#: locale/ipp-strings.c:1120 msgid "laminating-type.translucent" msgstr "Translucent" #. TRANSLATORS: Logo -#: locale/ipp-strings.c:1118 +#: locale/ipp-strings.c:1122 msgid "logo" msgstr "Logo" #. TRANSLATORS: Amount of Material -#: locale/ipp-strings.c:1120 +#: locale/ipp-strings.c:1124 msgid "material-amount" msgstr "Amount of Material" #. TRANSLATORS: Amount Units -#: locale/ipp-strings.c:1122 +#: locale/ipp-strings.c:1126 msgid "material-amount-units" msgstr "Material Amount Units" #. TRANSLATORS: Grams -#: locale/ipp-strings.c:1124 +#: locale/ipp-strings.c:1128 msgid "material-amount-units.g" msgstr "G" #. TRANSLATORS: Kilograms -#: locale/ipp-strings.c:1126 +#: locale/ipp-strings.c:1130 msgid "material-amount-units.kg" msgstr "Kg" #. TRANSLATORS: Liters -#: locale/ipp-strings.c:1128 +#: locale/ipp-strings.c:1132 msgid "material-amount-units.l" msgstr "L" #. TRANSLATORS: Meters -#: locale/ipp-strings.c:1130 +#: locale/ipp-strings.c:1134 msgid "material-amount-units.m" msgstr "M" #. TRANSLATORS: Milliliters -#: locale/ipp-strings.c:1132 +#: locale/ipp-strings.c:1136 msgid "material-amount-units.ml" msgstr "Ml" #. TRANSLATORS: Millimeters -#: locale/ipp-strings.c:1134 +#: locale/ipp-strings.c:1138 msgid "material-amount-units.mm" msgstr "Mm" #. TRANSLATORS: Material Color -#: locale/ipp-strings.c:1136 +#: locale/ipp-strings.c:1140 msgid "material-color" msgstr "Material Color" #. TRANSLATORS: Material Diameter -#: locale/ipp-strings.c:1138 +#: locale/ipp-strings.c:1142 msgid "material-diameter" msgstr "Material Diameter" #. TRANSLATORS: Material Diameter Tolerance -#: locale/ipp-strings.c:1140 +#: locale/ipp-strings.c:1144 msgid "material-diameter-tolerance" msgstr "Material Diameter Tolerance" #. TRANSLATORS: Material Fill Density -#: locale/ipp-strings.c:1142 +#: locale/ipp-strings.c:1146 msgid "material-fill-density" msgstr "Material Fill Density" #. TRANSLATORS: Material Name -#: locale/ipp-strings.c:1144 +#: locale/ipp-strings.c:1148 msgid "material-name" msgstr "Material Name" #. TRANSLATORS: Use Material For -#: locale/ipp-strings.c:1148 +#: locale/ipp-strings.c:1152 msgid "material-purpose" msgstr "Material Purpose" #. TRANSLATORS: Everything -#: locale/ipp-strings.c:1150 +#: locale/ipp-strings.c:1154 msgid "material-purpose.all" msgstr "All" #. TRANSLATORS: Base -#: locale/ipp-strings.c:1152 +#: locale/ipp-strings.c:1156 msgid "material-purpose.base" msgstr "Base" #. TRANSLATORS: In-fill -#: locale/ipp-strings.c:1154 +#: locale/ipp-strings.c:1158 msgid "material-purpose.in-fill" msgstr "In Fill" #. TRANSLATORS: Shell -#: locale/ipp-strings.c:1156 +#: locale/ipp-strings.c:1160 msgid "material-purpose.shell" msgstr "Shell" #. TRANSLATORS: Supports -#: locale/ipp-strings.c:1158 +#: locale/ipp-strings.c:1162 msgid "material-purpose.support" msgstr "Support" #. TRANSLATORS: Feed Rate -#: locale/ipp-strings.c:1160 +#: locale/ipp-strings.c:1164 msgid "material-rate" msgstr "Feed Rate" #. TRANSLATORS: Feed Rate Units -#: locale/ipp-strings.c:1162 +#: locale/ipp-strings.c:1166 msgid "material-rate-units" msgstr "Material Rate Units" #. TRANSLATORS: Milligrams per second -#: locale/ipp-strings.c:1164 +#: locale/ipp-strings.c:1168 msgid "material-rate-units.mg_second" msgstr "Mg Second" #. TRANSLATORS: Milliliters per second -#: locale/ipp-strings.c:1166 +#: locale/ipp-strings.c:1170 msgid "material-rate-units.ml_second" msgstr "Ml Second" #. TRANSLATORS: Millimeters per second -#: locale/ipp-strings.c:1168 +#: locale/ipp-strings.c:1172 msgid "material-rate-units.mm_second" msgstr "Mm Second" #. TRANSLATORS: Material Shell Thickness -#: locale/ipp-strings.c:1172 +#: locale/ipp-strings.c:1176 msgid "material-shell-thickness" msgstr "Material Shell Thickness" #. TRANSLATORS: Material Temperature -#: locale/ipp-strings.c:1174 +#: locale/ipp-strings.c:1178 msgid "material-temperature" msgstr "Material Temperature" #. TRANSLATORS: Material Type -#: locale/ipp-strings.c:1176 +#: locale/ipp-strings.c:1180 msgid "material-type" msgstr "Material Type" #. TRANSLATORS: ABS -#: locale/ipp-strings.c:1178 +#: locale/ipp-strings.c:1182 msgid "material-type.abs" msgstr "Abs" #. TRANSLATORS: Carbon Fiber ABS -#: locale/ipp-strings.c:1180 +#: locale/ipp-strings.c:1184 msgid "material-type.abs-carbon-fiber" msgstr "Abs Carbon Fiber" #. TRANSLATORS: Carbon Nanotube ABS -#: locale/ipp-strings.c:1182 +#: locale/ipp-strings.c:1186 msgid "material-type.abs-carbon-nanotube" msgstr "Abs Carbon Nanotube" #. TRANSLATORS: Chocolate -#: locale/ipp-strings.c:1184 +#: locale/ipp-strings.c:1188 msgid "material-type.chocolate" msgstr "Chocolate" #. TRANSLATORS: Gold -#: locale/ipp-strings.c:1186 +#: locale/ipp-strings.c:1190 msgid "material-type.gold" msgstr "Gold" #. TRANSLATORS: Nylon -#: locale/ipp-strings.c:1188 +#: locale/ipp-strings.c:1192 msgid "material-type.nylon" msgstr "Nylon" #. TRANSLATORS: Pet -#: locale/ipp-strings.c:1190 +#: locale/ipp-strings.c:1194 msgid "material-type.pet" msgstr "Pet" #. TRANSLATORS: Photopolymer -#: locale/ipp-strings.c:1192 +#: locale/ipp-strings.c:1196 msgid "material-type.photopolymer" msgstr "Photopolymer" #. TRANSLATORS: PLA -#: locale/ipp-strings.c:1194 +#: locale/ipp-strings.c:1198 msgid "material-type.pla" msgstr "Pla" #. TRANSLATORS: Conductive PLA -#: locale/ipp-strings.c:1196 +#: locale/ipp-strings.c:1200 msgid "material-type.pla-conductive" msgstr "Pla Conductive" #. TRANSLATORS: Flexible PLA -#: locale/ipp-strings.c:1200 +#: locale/ipp-strings.c:1204 msgid "material-type.pla-flexible" msgstr "Pla Flexible" #. TRANSLATORS: Magnetic PLA -#: locale/ipp-strings.c:1202 +#: locale/ipp-strings.c:1206 msgid "material-type.pla-magnetic" msgstr "Pla Magnetic" #. TRANSLATORS: Steel PLA -#: locale/ipp-strings.c:1204 +#: locale/ipp-strings.c:1208 msgid "material-type.pla-steel" msgstr "Pla Steel" #. TRANSLATORS: Stone PLA -#: locale/ipp-strings.c:1206 +#: locale/ipp-strings.c:1210 msgid "material-type.pla-stone" msgstr "Pla Stone" #. TRANSLATORS: Wood PLA -#: locale/ipp-strings.c:1208 +#: locale/ipp-strings.c:1212 msgid "material-type.pla-wood" msgstr "Pla Wood" #. TRANSLATORS: Polycarbonate -#: locale/ipp-strings.c:1210 +#: locale/ipp-strings.c:1214 msgid "material-type.polycarbonate" msgstr "Polycarbonate" #. TRANSLATORS: Dissolvable PVA -#: locale/ipp-strings.c:1212 +#: locale/ipp-strings.c:1216 msgid "material-type.pva-dissolvable" msgstr "Dissolvable PVA" #. TRANSLATORS: Silver -#: locale/ipp-strings.c:1214 +#: locale/ipp-strings.c:1218 msgid "material-type.silver" msgstr "Silver" #. TRANSLATORS: Titanium -#: locale/ipp-strings.c:1216 +#: locale/ipp-strings.c:1220 msgid "material-type.titanium" msgstr "Titanium" #. TRANSLATORS: Wax -#: locale/ipp-strings.c:1218 +#: locale/ipp-strings.c:1222 msgid "material-type.wax" msgstr "Wax" #. TRANSLATORS: Materials -#: locale/ipp-strings.c:1220 +#: locale/ipp-strings.c:1224 msgid "materials-col" msgstr "Materials" #. TRANSLATORS: Media -#: locale/ipp-strings.c:1222 +#: locale/ipp-strings.c:1226 msgid "media" msgstr "Media" #. TRANSLATORS: Back Coating of Media -#: locale/ipp-strings.c:1224 +#: locale/ipp-strings.c:1228 msgid "media-back-coating" msgstr "Media Back Coating" #. TRANSLATORS: Glossy -#: locale/ipp-strings.c:1226 +#: locale/ipp-strings.c:1230 msgid "media-back-coating.glossy" msgstr "Glossy" #. TRANSLATORS: High Gloss -#: locale/ipp-strings.c:1228 +#: locale/ipp-strings.c:1232 msgid "media-back-coating.high-gloss" msgstr "High Gloss" #. TRANSLATORS: Matte -#: locale/ipp-strings.c:1230 +#: locale/ipp-strings.c:1234 msgid "media-back-coating.matte" msgstr "Matte" #. TRANSLATORS: None -#: locale/ipp-strings.c:1232 +#: locale/ipp-strings.c:1236 msgid "media-back-coating.none" msgstr "None" #. TRANSLATORS: Satin -#: locale/ipp-strings.c:1234 +#: locale/ipp-strings.c:1238 msgid "media-back-coating.satin" msgstr "Satin" #. TRANSLATORS: Semi-gloss -#: locale/ipp-strings.c:1236 +#: locale/ipp-strings.c:1240 msgid "media-back-coating.semi-gloss" msgstr "Semi-Gloss" #. TRANSLATORS: Media Bottom Margin -#: locale/ipp-strings.c:1238 +#: locale/ipp-strings.c:1242 msgid "media-bottom-margin" msgstr "Media Bottom Margin" #. TRANSLATORS: Media -#: locale/ipp-strings.c:1240 +#: locale/ipp-strings.c:1244 msgid "media-col" msgstr "Media" #. TRANSLATORS: Media Color -#: locale/ipp-strings.c:1242 +#: locale/ipp-strings.c:1246 msgid "media-color" msgstr "Media Color" #. TRANSLATORS: Black -#: locale/ipp-strings.c:1244 +#: locale/ipp-strings.c:1248 msgid "media-color.black" msgstr "Black" #. TRANSLATORS: Blue -#: locale/ipp-strings.c:1246 +#: locale/ipp-strings.c:1250 msgid "media-color.blue" msgstr "Blue" #. TRANSLATORS: Brown -#: locale/ipp-strings.c:1248 +#: locale/ipp-strings.c:1252 msgid "media-color.brown" msgstr "Brown" #. TRANSLATORS: Buff -#: locale/ipp-strings.c:1250 +#: locale/ipp-strings.c:1254 msgid "media-color.buff" msgstr "Buff" #. TRANSLATORS: Clear Black -#: locale/ipp-strings.c:1252 +#: locale/ipp-strings.c:1256 msgid "media-color.clear-black" msgstr "Clear Black" #. TRANSLATORS: Clear Blue -#: locale/ipp-strings.c:1254 +#: locale/ipp-strings.c:1258 msgid "media-color.clear-blue" msgstr "Clear Blue" #. TRANSLATORS: Clear Brown -#: locale/ipp-strings.c:1256 +#: locale/ipp-strings.c:1260 msgid "media-color.clear-brown" msgstr "Clear Brown" #. TRANSLATORS: Clear Buff -#: locale/ipp-strings.c:1258 +#: locale/ipp-strings.c:1262 msgid "media-color.clear-buff" msgstr "Clear Buff" #. TRANSLATORS: Clear Cyan -#: locale/ipp-strings.c:1260 +#: locale/ipp-strings.c:1264 msgid "media-color.clear-cyan" msgstr "Clear Cyan" #. TRANSLATORS: Clear Gold -#: locale/ipp-strings.c:1262 +#: locale/ipp-strings.c:1266 msgid "media-color.clear-gold" msgstr "Clear Gold" #. TRANSLATORS: Clear Goldenrod -#: locale/ipp-strings.c:1264 +#: locale/ipp-strings.c:1268 msgid "media-color.clear-goldenrod" msgstr "Clear Goldenrod" #. TRANSLATORS: Clear Gray -#: locale/ipp-strings.c:1266 +#: locale/ipp-strings.c:1270 msgid "media-color.clear-gray" msgstr "Clear Gray" #. TRANSLATORS: Clear Green -#: locale/ipp-strings.c:1268 +#: locale/ipp-strings.c:1272 msgid "media-color.clear-green" msgstr "Clear Green" #. TRANSLATORS: Clear Ivory -#: locale/ipp-strings.c:1270 +#: locale/ipp-strings.c:1274 msgid "media-color.clear-ivory" msgstr "Clear Ivory" #. TRANSLATORS: Clear Magenta -#: locale/ipp-strings.c:1272 +#: locale/ipp-strings.c:1276 msgid "media-color.clear-magenta" msgstr "Clear Magenta" #. TRANSLATORS: Clear Multi Color -#: locale/ipp-strings.c:1274 +#: locale/ipp-strings.c:1278 msgid "media-color.clear-multi-color" msgstr "Clear Multi Color" #. TRANSLATORS: Clear Mustard -#: locale/ipp-strings.c:1276 +#: locale/ipp-strings.c:1280 msgid "media-color.clear-mustard" msgstr "Clear Mustard" #. TRANSLATORS: Clear Orange -#: locale/ipp-strings.c:1278 +#: locale/ipp-strings.c:1282 msgid "media-color.clear-orange" msgstr "Clear Orange" #. TRANSLATORS: Clear Pink -#: locale/ipp-strings.c:1280 +#: locale/ipp-strings.c:1284 msgid "media-color.clear-pink" msgstr "Clear Pink" #. TRANSLATORS: Clear Red -#: locale/ipp-strings.c:1282 +#: locale/ipp-strings.c:1286 msgid "media-color.clear-red" msgstr "Clear Red" #. TRANSLATORS: Clear Silver -#: locale/ipp-strings.c:1284 +#: locale/ipp-strings.c:1288 msgid "media-color.clear-silver" msgstr "Clear Silver" #. TRANSLATORS: Clear Turquoise -#: locale/ipp-strings.c:1286 +#: locale/ipp-strings.c:1290 msgid "media-color.clear-turquoise" msgstr "Clear Turquoise" #. TRANSLATORS: Clear Violet -#: locale/ipp-strings.c:1288 +#: locale/ipp-strings.c:1292 msgid "media-color.clear-violet" msgstr "Clear Violet" #. TRANSLATORS: Clear White -#: locale/ipp-strings.c:1290 +#: locale/ipp-strings.c:1294 msgid "media-color.clear-white" msgstr "Clear White" #. TRANSLATORS: Clear Yellow -#: locale/ipp-strings.c:1292 +#: locale/ipp-strings.c:1296 msgid "media-color.clear-yellow" msgstr "Clear Yellow" #. TRANSLATORS: Cyan -#: locale/ipp-strings.c:1294 +#: locale/ipp-strings.c:1298 msgid "media-color.cyan" msgstr "Cyan" #. TRANSLATORS: Dark Blue -#: locale/ipp-strings.c:1296 +#: locale/ipp-strings.c:1300 msgid "media-color.dark-blue" msgstr "Dark Blue" #. TRANSLATORS: Dark Brown -#: locale/ipp-strings.c:1298 +#: locale/ipp-strings.c:1302 msgid "media-color.dark-brown" msgstr "Dark Brown" #. TRANSLATORS: Dark Buff -#: locale/ipp-strings.c:1300 +#: locale/ipp-strings.c:1304 msgid "media-color.dark-buff" msgstr "Dark Buff" #. TRANSLATORS: Dark Cyan -#: locale/ipp-strings.c:1302 +#: locale/ipp-strings.c:1306 msgid "media-color.dark-cyan" msgstr "Dark Cyan" #. TRANSLATORS: Dark Gold -#: locale/ipp-strings.c:1304 +#: locale/ipp-strings.c:1308 msgid "media-color.dark-gold" msgstr "Dark Gold" #. TRANSLATORS: Dark Goldenrod -#: locale/ipp-strings.c:1306 +#: locale/ipp-strings.c:1310 msgid "media-color.dark-goldenrod" msgstr "Dark Goldenrod" #. TRANSLATORS: Dark Gray -#: locale/ipp-strings.c:1308 +#: locale/ipp-strings.c:1312 msgid "media-color.dark-gray" msgstr "Dark Gray" #. TRANSLATORS: Dark Green -#: locale/ipp-strings.c:1310 +#: locale/ipp-strings.c:1314 msgid "media-color.dark-green" msgstr "Dark Green" #. TRANSLATORS: Dark Ivory -#: locale/ipp-strings.c:1312 +#: locale/ipp-strings.c:1316 msgid "media-color.dark-ivory" msgstr "Dark Ivory" #. TRANSLATORS: Dark Magenta -#: locale/ipp-strings.c:1314 +#: locale/ipp-strings.c:1318 msgid "media-color.dark-magenta" msgstr "Dark Magenta" #. TRANSLATORS: Dark Mustard -#: locale/ipp-strings.c:1316 +#: locale/ipp-strings.c:1320 msgid "media-color.dark-mustard" msgstr "Dark Mustard" #. TRANSLATORS: Dark Orange -#: locale/ipp-strings.c:1318 +#: locale/ipp-strings.c:1322 msgid "media-color.dark-orange" msgstr "Dark Orange" #. TRANSLATORS: Dark Pink -#: locale/ipp-strings.c:1320 +#: locale/ipp-strings.c:1324 msgid "media-color.dark-pink" msgstr "Dark Pink" #. TRANSLATORS: Dark Red -#: locale/ipp-strings.c:1322 +#: locale/ipp-strings.c:1326 msgid "media-color.dark-red" msgstr "Dark Red" #. TRANSLATORS: Dark Silver -#: locale/ipp-strings.c:1324 +#: locale/ipp-strings.c:1328 msgid "media-color.dark-silver" msgstr "Dark Silver" #. TRANSLATORS: Dark Turquoise -#: locale/ipp-strings.c:1326 +#: locale/ipp-strings.c:1330 msgid "media-color.dark-turquoise" msgstr "Dark Turquoise" #. TRANSLATORS: Dark Violet -#: locale/ipp-strings.c:1328 +#: locale/ipp-strings.c:1332 msgid "media-color.dark-violet" msgstr "Dark Violet" #. TRANSLATORS: Dark Yellow -#: locale/ipp-strings.c:1330 +#: locale/ipp-strings.c:1334 msgid "media-color.dark-yellow" msgstr "Dark Yellow" #. TRANSLATORS: Gold -#: locale/ipp-strings.c:1332 +#: locale/ipp-strings.c:1336 msgid "media-color.gold" msgstr "Gold" #. TRANSLATORS: Goldenrod -#: locale/ipp-strings.c:1334 +#: locale/ipp-strings.c:1338 msgid "media-color.goldenrod" msgstr "Goldenrod" #. TRANSLATORS: Gray -#: locale/ipp-strings.c:1336 +#: locale/ipp-strings.c:1340 msgid "media-color.gray" msgstr "Gray" #. TRANSLATORS: Green -#: locale/ipp-strings.c:1338 +#: locale/ipp-strings.c:1342 msgid "media-color.green" msgstr "Green" #. TRANSLATORS: Ivory -#: locale/ipp-strings.c:1340 +#: locale/ipp-strings.c:1344 msgid "media-color.ivory" msgstr "Ivory" #. TRANSLATORS: Light Black -#: locale/ipp-strings.c:1342 +#: locale/ipp-strings.c:1346 msgid "media-color.light-black" msgstr "Light Black" #. TRANSLATORS: Light Blue -#: locale/ipp-strings.c:1344 +#: locale/ipp-strings.c:1348 msgid "media-color.light-blue" msgstr "Light Blue" #. TRANSLATORS: Light Brown -#: locale/ipp-strings.c:1346 +#: locale/ipp-strings.c:1350 msgid "media-color.light-brown" msgstr "Light Brown" #. TRANSLATORS: Light Buff -#: locale/ipp-strings.c:1348 +#: locale/ipp-strings.c:1352 msgid "media-color.light-buff" msgstr "Light Buff" #. TRANSLATORS: Light Cyan -#: locale/ipp-strings.c:1350 +#: locale/ipp-strings.c:1354 msgid "media-color.light-cyan" msgstr "Light Cyan" #. TRANSLATORS: Light Gold -#: locale/ipp-strings.c:1352 +#: locale/ipp-strings.c:1356 msgid "media-color.light-gold" msgstr "Light Gold" #. TRANSLATORS: Light Goldenrod -#: locale/ipp-strings.c:1354 +#: locale/ipp-strings.c:1358 msgid "media-color.light-goldenrod" msgstr "Light Goldenrod" #. TRANSLATORS: Light Gray -#: locale/ipp-strings.c:1356 +#: locale/ipp-strings.c:1360 msgid "media-color.light-gray" msgstr "Light Gray" #. TRANSLATORS: Light Green -#: locale/ipp-strings.c:1358 +#: locale/ipp-strings.c:1362 msgid "media-color.light-green" msgstr "Light Green" #. TRANSLATORS: Light Ivory -#: locale/ipp-strings.c:1360 +#: locale/ipp-strings.c:1364 msgid "media-color.light-ivory" msgstr "Light Ivory" #. TRANSLATORS: Light Magenta -#: locale/ipp-strings.c:1362 +#: locale/ipp-strings.c:1366 msgid "media-color.light-magenta" msgstr "Light Magenta" #. TRANSLATORS: Light Mustard -#: locale/ipp-strings.c:1364 +#: locale/ipp-strings.c:1368 msgid "media-color.light-mustard" msgstr "Light Mustard" #. TRANSLATORS: Light Orange -#: locale/ipp-strings.c:1366 +#: locale/ipp-strings.c:1370 msgid "media-color.light-orange" msgstr "Light Orange" #. TRANSLATORS: Light Pink -#: locale/ipp-strings.c:1368 +#: locale/ipp-strings.c:1372 msgid "media-color.light-pink" msgstr "Light Pink" #. TRANSLATORS: Light Red -#: locale/ipp-strings.c:1370 +#: locale/ipp-strings.c:1374 msgid "media-color.light-red" msgstr "Light Red" #. TRANSLATORS: Light Silver -#: locale/ipp-strings.c:1372 +#: locale/ipp-strings.c:1376 msgid "media-color.light-silver" msgstr "Light Silver" #. TRANSLATORS: Light Turquoise -#: locale/ipp-strings.c:1374 +#: locale/ipp-strings.c:1378 msgid "media-color.light-turquoise" msgstr "Light Turquoise" #. TRANSLATORS: Light Violet -#: locale/ipp-strings.c:1376 +#: locale/ipp-strings.c:1380 msgid "media-color.light-violet" msgstr "Light Violet" #. TRANSLATORS: Light Yellow -#: locale/ipp-strings.c:1378 +#: locale/ipp-strings.c:1382 msgid "media-color.light-yellow" msgstr "Light Yellow" #. TRANSLATORS: Magenta -#: locale/ipp-strings.c:1380 +#: locale/ipp-strings.c:1384 msgid "media-color.magenta" msgstr "Magenta" #. TRANSLATORS: Multi-color -#: locale/ipp-strings.c:1382 +#: locale/ipp-strings.c:1386 msgid "media-color.multi-color" msgstr "Multi-Color" #. TRANSLATORS: Mustard -#: locale/ipp-strings.c:1384 +#: locale/ipp-strings.c:1388 msgid "media-color.mustard" msgstr "Mustard" #. TRANSLATORS: No Color -#: locale/ipp-strings.c:1386 +#: locale/ipp-strings.c:1390 msgid "media-color.no-color" msgstr "No Color" #. TRANSLATORS: Orange -#: locale/ipp-strings.c:1388 +#: locale/ipp-strings.c:1392 msgid "media-color.orange" msgstr "Orange" #. TRANSLATORS: Pink -#: locale/ipp-strings.c:1390 +#: locale/ipp-strings.c:1394 msgid "media-color.pink" msgstr "Pink" #. TRANSLATORS: Red -#: locale/ipp-strings.c:1392 +#: locale/ipp-strings.c:1396 msgid "media-color.red" msgstr "Red" #. TRANSLATORS: Silver -#: locale/ipp-strings.c:1394 +#: locale/ipp-strings.c:1398 msgid "media-color.silver" msgstr "Silver" #. TRANSLATORS: Turquoise -#: locale/ipp-strings.c:1396 +#: locale/ipp-strings.c:1400 msgid "media-color.turquoise" msgstr "Turquoise" #. TRANSLATORS: Violet -#: locale/ipp-strings.c:1398 +#: locale/ipp-strings.c:1402 msgid "media-color.violet" msgstr "Violet" #. TRANSLATORS: White -#: locale/ipp-strings.c:1400 +#: locale/ipp-strings.c:1404 msgid "media-color.white" msgstr "White" #. TRANSLATORS: Yellow -#: locale/ipp-strings.c:1402 +#: locale/ipp-strings.c:1406 msgid "media-color.yellow" msgstr "Yellow" #. TRANSLATORS: Front Coating of Media -#: locale/ipp-strings.c:1404 +#: locale/ipp-strings.c:1408 msgid "media-front-coating" msgstr "Media Front Coating" #. TRANSLATORS: Media Grain -#: locale/ipp-strings.c:1406 +#: locale/ipp-strings.c:1410 msgid "media-grain" msgstr "Media Grain" #. TRANSLATORS: Cross-Feed Direction -#: locale/ipp-strings.c:1408 +#: locale/ipp-strings.c:1412 msgid "media-grain.x-direction" msgstr "Cross-Feed Direction" #. TRANSLATORS: Feed Direction -#: locale/ipp-strings.c:1410 +#: locale/ipp-strings.c:1414 msgid "media-grain.y-direction" msgstr "Feed Direction" #. TRANSLATORS: Media Hole Count -#: locale/ipp-strings.c:1412 +#: locale/ipp-strings.c:1416 msgid "media-hole-count" msgstr "Media Hole Count" #. TRANSLATORS: Media Info -#: locale/ipp-strings.c:1414 +#: locale/ipp-strings.c:1418 msgid "media-info" msgstr "Media Info" #. TRANSLATORS: Force Media -#: locale/ipp-strings.c:1416 +#: locale/ipp-strings.c:1420 msgid "media-input-tray-check" msgstr "Media Input Tray Check" #. TRANSLATORS: Media Left Margin -#: locale/ipp-strings.c:1418 +#: locale/ipp-strings.c:1422 msgid "media-left-margin" msgstr "Media Left Margin" #. TRANSLATORS: Pre-printed Media -#: locale/ipp-strings.c:1420 +#: locale/ipp-strings.c:1424 msgid "media-pre-printed" msgstr "Media Preprinted" #. TRANSLATORS: Blank -#: locale/ipp-strings.c:1422 +#: locale/ipp-strings.c:1426 msgid "media-pre-printed.blank" msgstr "Blank" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1424 +#: locale/ipp-strings.c:1428 msgid "media-pre-printed.letter-head" msgstr "Letterhead" #. TRANSLATORS: Pre-printed -#: locale/ipp-strings.c:1426 +#: locale/ipp-strings.c:1430 msgid "media-pre-printed.pre-printed" msgstr "Preprinted" #. TRANSLATORS: Recycled Media -#: locale/ipp-strings.c:1428 +#: locale/ipp-strings.c:1432 msgid "media-recycled" msgstr "Media Recycled" #. TRANSLATORS: None -#: locale/ipp-strings.c:1430 +#: locale/ipp-strings.c:1434 msgid "media-recycled.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:1432 +#: locale/ipp-strings.c:1436 msgid "media-recycled.standard" msgstr "Standard" #. TRANSLATORS: Media Right Margin -#: locale/ipp-strings.c:1434 +#: locale/ipp-strings.c:1438 msgid "media-right-margin" msgstr "Media Right Margin" #. TRANSLATORS: Media Dimensions -#: locale/ipp-strings.c:1436 +#: locale/ipp-strings.c:1440 msgid "media-size" msgstr "Media Dimensions" #. TRANSLATORS: Media Name -#: locale/ipp-strings.c:1438 +#: locale/ipp-strings.c:1442 msgid "media-size-name" msgstr "Media Name" #. TRANSLATORS: Media Source -#: locale/ipp-strings.c:1440 +#: locale/ipp-strings.c:1444 msgid "media-source" msgstr "Media Source" #. TRANSLATORS: Alternate -#: locale/ipp-strings.c:1442 +#: locale/ipp-strings.c:1446 msgid "media-source.alternate" msgstr "Alternate" #. TRANSLATORS: Alternate Roll -#: locale/ipp-strings.c:1444 +#: locale/ipp-strings.c:1448 msgid "media-source.alternate-roll" msgstr "Alternate Roll" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:1446 +#: locale/ipp-strings.c:1450 msgid "media-source.auto" msgstr "Automatic" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:1448 +#: locale/ipp-strings.c:1452 msgid "media-source.bottom" msgstr "Bottom" #. TRANSLATORS: By-pass Tray -#: locale/ipp-strings.c:1450 +#: locale/ipp-strings.c:1454 msgid "media-source.by-pass-tray" msgstr "By Pass Tray" #. TRANSLATORS: Center -#: locale/ipp-strings.c:1452 +#: locale/ipp-strings.c:1456 msgid "media-source.center" msgstr "Center" #. TRANSLATORS: Disc -#: locale/ipp-strings.c:1454 +#: locale/ipp-strings.c:1458 msgid "media-source.disc" msgstr "Disc" #. TRANSLATORS: Envelope -#: locale/ipp-strings.c:1456 +#: locale/ipp-strings.c:1460 msgid "media-source.envelope" msgstr "Envelope" #. TRANSLATORS: Hagaki -#: locale/ipp-strings.c:1458 +#: locale/ipp-strings.c:1462 msgid "media-source.hagaki" msgstr "Hagaki" #. TRANSLATORS: Large Capacity -#: locale/ipp-strings.c:1460 +#: locale/ipp-strings.c:1464 msgid "media-source.large-capacity" msgstr "Large Capacity" #. TRANSLATORS: Left -#: locale/ipp-strings.c:1462 +#: locale/ipp-strings.c:1466 msgid "media-source.left" msgstr "Left" #. TRANSLATORS: Main -#: locale/ipp-strings.c:1464 +#: locale/ipp-strings.c:1468 msgid "media-source.main" msgstr "Main" #. TRANSLATORS: Main Roll -#: locale/ipp-strings.c:1466 +#: locale/ipp-strings.c:1470 msgid "media-source.main-roll" msgstr "Main Roll" #. TRANSLATORS: Manual -#: locale/ipp-strings.c:1468 +#: locale/ipp-strings.c:1472 msgid "media-source.manual" msgstr "Manual" #. TRANSLATORS: Middle -#: locale/ipp-strings.c:1470 +#: locale/ipp-strings.c:1474 msgid "media-source.middle" msgstr "Middle" #. TRANSLATORS: Photo -#: locale/ipp-strings.c:1472 +#: locale/ipp-strings.c:1476 msgid "media-source.photo" msgstr "Photo" #. TRANSLATORS: Rear -#: locale/ipp-strings.c:1474 +#: locale/ipp-strings.c:1478 msgid "media-source.rear" msgstr "Rear" #. TRANSLATORS: Right -#: locale/ipp-strings.c:1476 +#: locale/ipp-strings.c:1480 msgid "media-source.right" msgstr "Right" #. TRANSLATORS: Roll 1 -#: locale/ipp-strings.c:1478 +#: locale/ipp-strings.c:1482 msgid "media-source.roll-1" msgstr "Roll 1" #. TRANSLATORS: Roll 10 -#: locale/ipp-strings.c:1480 +#: locale/ipp-strings.c:1484 msgid "media-source.roll-10" msgstr "Roll 10" #. TRANSLATORS: Roll 2 -#: locale/ipp-strings.c:1482 +#: locale/ipp-strings.c:1486 msgid "media-source.roll-2" msgstr "Roll 2" #. TRANSLATORS: Roll 3 -#: locale/ipp-strings.c:1484 +#: locale/ipp-strings.c:1488 msgid "media-source.roll-3" msgstr "Roll 3" #. TRANSLATORS: Roll 4 -#: locale/ipp-strings.c:1486 +#: locale/ipp-strings.c:1490 msgid "media-source.roll-4" msgstr "Roll 4" #. TRANSLATORS: Roll 5 -#: locale/ipp-strings.c:1488 +#: locale/ipp-strings.c:1492 msgid "media-source.roll-5" msgstr "Roll 5" #. TRANSLATORS: Roll 6 -#: locale/ipp-strings.c:1490 +#: locale/ipp-strings.c:1494 msgid "media-source.roll-6" msgstr "Roll 6" #. TRANSLATORS: Roll 7 -#: locale/ipp-strings.c:1492 +#: locale/ipp-strings.c:1496 msgid "media-source.roll-7" msgstr "Roll 7" #. TRANSLATORS: Roll 8 -#: locale/ipp-strings.c:1494 +#: locale/ipp-strings.c:1498 msgid "media-source.roll-8" msgstr "Roll 8" #. TRANSLATORS: Roll 9 -#: locale/ipp-strings.c:1496 +#: locale/ipp-strings.c:1500 msgid "media-source.roll-9" msgstr "Roll 9" #. TRANSLATORS: Side -#: locale/ipp-strings.c:1498 +#: locale/ipp-strings.c:1502 msgid "media-source.side" msgstr "Side" #. TRANSLATORS: Top -#: locale/ipp-strings.c:1500 +#: locale/ipp-strings.c:1504 msgid "media-source.top" msgstr "Top" #. TRANSLATORS: Tray 1 -#: locale/ipp-strings.c:1502 +#: locale/ipp-strings.c:1506 msgid "media-source.tray-1" msgstr "Tray 1" #. TRANSLATORS: Tray 10 -#: locale/ipp-strings.c:1504 +#: locale/ipp-strings.c:1508 msgid "media-source.tray-10" msgstr "Tray 10" #. TRANSLATORS: Tray 11 -#: locale/ipp-strings.c:1506 +#: locale/ipp-strings.c:1510 msgid "media-source.tray-11" msgstr "Tray 11" #. TRANSLATORS: Tray 12 -#: locale/ipp-strings.c:1508 +#: locale/ipp-strings.c:1512 msgid "media-source.tray-12" msgstr "Tray 12" #. TRANSLATORS: Tray 13 -#: locale/ipp-strings.c:1510 +#: locale/ipp-strings.c:1514 msgid "media-source.tray-13" msgstr "Tray 13" #. TRANSLATORS: Tray 14 -#: locale/ipp-strings.c:1512 +#: locale/ipp-strings.c:1516 msgid "media-source.tray-14" msgstr "Tray 14" #. TRANSLATORS: Tray 15 -#: locale/ipp-strings.c:1514 +#: locale/ipp-strings.c:1518 msgid "media-source.tray-15" msgstr "Tray 15" #. TRANSLATORS: Tray 16 -#: locale/ipp-strings.c:1516 +#: locale/ipp-strings.c:1520 msgid "media-source.tray-16" msgstr "Tray 16" #. TRANSLATORS: Tray 17 -#: locale/ipp-strings.c:1518 +#: locale/ipp-strings.c:1522 msgid "media-source.tray-17" msgstr "Tray 17" #. TRANSLATORS: Tray 18 -#: locale/ipp-strings.c:1520 +#: locale/ipp-strings.c:1524 msgid "media-source.tray-18" msgstr "Tray 18" #. TRANSLATORS: Tray 19 -#: locale/ipp-strings.c:1522 +#: locale/ipp-strings.c:1526 msgid "media-source.tray-19" msgstr "Tray 19" #. TRANSLATORS: Tray 2 -#: locale/ipp-strings.c:1524 +#: locale/ipp-strings.c:1528 msgid "media-source.tray-2" msgstr "Tray 2" #. TRANSLATORS: Tray 20 -#: locale/ipp-strings.c:1526 +#: locale/ipp-strings.c:1530 msgid "media-source.tray-20" msgstr "Tray 20" #. TRANSLATORS: Tray 3 -#: locale/ipp-strings.c:1528 +#: locale/ipp-strings.c:1532 msgid "media-source.tray-3" msgstr "Tray 3" #. TRANSLATORS: Tray 4 -#: locale/ipp-strings.c:1530 +#: locale/ipp-strings.c:1534 msgid "media-source.tray-4" msgstr "Tray 4" #. TRANSLATORS: Tray 5 -#: locale/ipp-strings.c:1532 +#: locale/ipp-strings.c:1536 msgid "media-source.tray-5" msgstr "Tray 5" #. TRANSLATORS: Tray 6 -#: locale/ipp-strings.c:1534 +#: locale/ipp-strings.c:1538 msgid "media-source.tray-6" msgstr "Tray 6" #. TRANSLATORS: Tray 7 -#: locale/ipp-strings.c:1536 +#: locale/ipp-strings.c:1540 msgid "media-source.tray-7" msgstr "Tray 7" #. TRANSLATORS: Tray 8 -#: locale/ipp-strings.c:1538 +#: locale/ipp-strings.c:1542 msgid "media-source.tray-8" msgstr "Tray 8" #. TRANSLATORS: Tray 9 -#: locale/ipp-strings.c:1540 +#: locale/ipp-strings.c:1544 msgid "media-source.tray-9" msgstr "Tray 9" #. TRANSLATORS: Media Thickness -#: locale/ipp-strings.c:1542 +#: locale/ipp-strings.c:1546 msgid "media-thickness" msgstr "Media Thickness" #. TRANSLATORS: Media Tooth (Texture) -#: locale/ipp-strings.c:1544 +#: locale/ipp-strings.c:1548 msgid "media-tooth" msgstr "Media Tooth" #. TRANSLATORS: Antique -#: locale/ipp-strings.c:1546 +#: locale/ipp-strings.c:1550 msgid "media-tooth.antique" msgstr "Antique" #. TRANSLATORS: Extra Smooth -#: locale/ipp-strings.c:1548 +#: locale/ipp-strings.c:1552 msgid "media-tooth.calendared" msgstr "Calendared" #. TRANSLATORS: Coarse -#: locale/ipp-strings.c:1550 +#: locale/ipp-strings.c:1554 msgid "media-tooth.coarse" msgstr "Coarse" #. TRANSLATORS: Fine -#: locale/ipp-strings.c:1552 +#: locale/ipp-strings.c:1556 msgid "media-tooth.fine" msgstr "Fine" #. TRANSLATORS: Linen -#: locale/ipp-strings.c:1554 +#: locale/ipp-strings.c:1558 msgid "media-tooth.linen" msgstr "Linen" #. TRANSLATORS: Medium -#: locale/ipp-strings.c:1556 +#: locale/ipp-strings.c:1560 msgid "media-tooth.medium" msgstr "Medium" #. TRANSLATORS: Smooth -#: locale/ipp-strings.c:1558 +#: locale/ipp-strings.c:1562 msgid "media-tooth.smooth" msgstr "Smooth" #. TRANSLATORS: Stipple -#: locale/ipp-strings.c:1560 +#: locale/ipp-strings.c:1564 msgid "media-tooth.stipple" msgstr "Stipple" #. TRANSLATORS: Rough -#: locale/ipp-strings.c:1562 +#: locale/ipp-strings.c:1566 msgid "media-tooth.uncalendared" msgstr "Uncalendared" #. TRANSLATORS: Vellum -#: locale/ipp-strings.c:1564 +#: locale/ipp-strings.c:1568 msgid "media-tooth.vellum" msgstr "Vellum" #. TRANSLATORS: Media Top Margin -#: locale/ipp-strings.c:1566 +#: locale/ipp-strings.c:1570 msgid "media-top-margin" msgstr "Media Top Margin" #. TRANSLATORS: Media Type -#: locale/ipp-strings.c:1568 +#: locale/ipp-strings.c:1572 msgid "media-type" msgstr "Media Type" #. TRANSLATORS: Aluminum -#: locale/ipp-strings.c:1570 +#: locale/ipp-strings.c:1574 msgid "media-type.aluminum" msgstr "Aluminum" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:1572 +#: locale/ipp-strings.c:1576 msgid "media-type.auto" msgstr "Automatic" #. TRANSLATORS: Back Print Film -#: locale/ipp-strings.c:1574 +#: locale/ipp-strings.c:1578 msgid "media-type.back-print-film" msgstr "Back Print Film" #. TRANSLATORS: Cardboard -#: locale/ipp-strings.c:1576 +#: locale/ipp-strings.c:1580 msgid "media-type.cardboard" msgstr "Cardboard" #. TRANSLATORS: Cardstock -#: locale/ipp-strings.c:1578 +#: locale/ipp-strings.c:1582 msgid "media-type.cardstock" msgstr "Cardstock" #. TRANSLATORS: CD -#: locale/ipp-strings.c:1580 +#: locale/ipp-strings.c:1584 msgid "media-type.cd" msgstr "CD" +#. TRANSLATORS: Photo Advanced Paper +#: locale/ipp-strings.c:1586 msgid "media-type.com.hp.advanced-photo" msgstr "Advanced Photo Paper" +#. TRANSLATORS: Brochure Glossy Paper +#: locale/ipp-strings.c:1588 msgid "media-type.com.hp.brochure-glossy" msgstr "Glossy Brochure Paper" +#. TRANSLATORS: Brochure Matte Paper +#: locale/ipp-strings.c:1590 msgid "media-type.com.hp.brochure-matte" msgstr "Matte Brochure Paper" +#. TRANSLATORS: Matte Coverstock +#: locale/ipp-strings.c:1592 msgid "media-type.com.hp.cover-matte" msgstr "Matte Cover Paper" +#. TRANSLATORS: EcoSMART Lite Paper +#: locale/ipp-strings.c:1594 msgid "media-type.com.hp.ecosmart-lite" msgstr "Office Recycled Paper" +#. TRANSLATORS: Everyday Glossy Paper +#: locale/ipp-strings.c:1596 msgid "media-type.com.hp.everyday-glossy" msgstr "Everyday Glossy Photo Paper" +#. TRANSLATORS: Everyday Matte Paper +#: locale/ipp-strings.c:1598 msgid "media-type.com.hp.everyday-matte" msgstr "Everyday Matte Paper" +#. TRANSLATORS: Extra Heavyweight Paper +#: locale/ipp-strings.c:1600 msgid "media-type.com.hp.extra-heavy" msgstr "Extra Heavyweight Paper" +#. TRANSLATORS: Intermediate Paper +#: locale/ipp-strings.c:1602 msgid "media-type.com.hp.intermediate" msgstr "Multipurpose Paper" +#. TRANSLATORS: Mid-Weight Paper +#: locale/ipp-strings.c:1604 msgid "media-type.com.hp.mid-weight" msgstr "Mid-Weight Paper" +#. TRANSLATORS: Inkjet Premium Paper +#: locale/ipp-strings.c:1606 msgid "media-type.com.hp.premium-inkjet" msgstr "Premium Inkjet Paper" +#. TRANSLATORS: Photo Premium Paper +#: locale/ipp-strings.c:1608 msgid "media-type.com.hp.premium-photo" msgstr "Premium Photo Glossy Paper" +#. TRANSLATORS: Premium Matte Presentation Paper +#: locale/ipp-strings.c:1610 msgid "media-type.com.hp.premium-presentation-matte" msgstr "Premium Presentation Matte Paper" #. TRANSLATORS: Continuous -#: locale/ipp-strings.c:1582 +#: locale/ipp-strings.c:1612 msgid "media-type.continuous" msgstr "Continuous" #. TRANSLATORS: Continuous Long -#: locale/ipp-strings.c:1584 +#: locale/ipp-strings.c:1614 msgid "media-type.continuous-long" msgstr "Continuous Long" #. TRANSLATORS: Continuous Short -#: locale/ipp-strings.c:1586 +#: locale/ipp-strings.c:1616 msgid "media-type.continuous-short" msgstr "Continuous Short" #. TRANSLATORS: Corrugated Board -#: locale/ipp-strings.c:1588 +#: locale/ipp-strings.c:1618 msgid "media-type.corrugated-board" msgstr "Corrugated Board" #. TRANSLATORS: Optical Disc -#: locale/ipp-strings.c:1590 +#: locale/ipp-strings.c:1620 msgid "media-type.disc" msgstr "Optical Disc" #. TRANSLATORS: Glossy Optical Disc -#: locale/ipp-strings.c:1592 +#: locale/ipp-strings.c:1622 msgid "media-type.disc-glossy" msgstr "Glossy Optical Disc" #. TRANSLATORS: High Gloss Optical Disc -#: locale/ipp-strings.c:1594 +#: locale/ipp-strings.c:1624 msgid "media-type.disc-high-gloss" msgstr "High Gloss Optical Disc" #. TRANSLATORS: Matte Optical Disc -#: locale/ipp-strings.c:1596 +#: locale/ipp-strings.c:1626 msgid "media-type.disc-matte" msgstr "Matte Optical Disc" #. TRANSLATORS: Satin Optical Disc -#: locale/ipp-strings.c:1598 +#: locale/ipp-strings.c:1628 msgid "media-type.disc-satin" msgstr "Satin Optical Disc" #. TRANSLATORS: Semi-Gloss Optical Disc -#: locale/ipp-strings.c:1600 +#: locale/ipp-strings.c:1630 msgid "media-type.disc-semi-gloss" msgstr "Semi-Gloss Optical Disc" #. TRANSLATORS: Double Wall -#: locale/ipp-strings.c:1602 +#: locale/ipp-strings.c:1632 msgid "media-type.double-wall" msgstr "Double Wall" #. TRANSLATORS: Dry Film -#: locale/ipp-strings.c:1604 +#: locale/ipp-strings.c:1634 msgid "media-type.dry-film" msgstr "Dry Film" #. TRANSLATORS: DVD -#: locale/ipp-strings.c:1606 +#: locale/ipp-strings.c:1636 msgid "media-type.dvd" msgstr "DVD" #. TRANSLATORS: Embossing Foil -#: locale/ipp-strings.c:1608 +#: locale/ipp-strings.c:1638 msgid "media-type.embossing-foil" msgstr "Embossing Foil" #. TRANSLATORS: End Board -#: locale/ipp-strings.c:1610 +#: locale/ipp-strings.c:1640 msgid "media-type.end-board" msgstr "End Board" #. TRANSLATORS: Envelope -#: locale/ipp-strings.c:1612 +#: locale/ipp-strings.c:1642 msgid "media-type.envelope" msgstr "Envelope" #. TRANSLATORS: Archival Envelope -#: locale/ipp-strings.c:1614 +#: locale/ipp-strings.c:1644 msgid "media-type.envelope-archival" msgstr "Archival Envelope" #. TRANSLATORS: Bond Envelope -#: locale/ipp-strings.c:1616 +#: locale/ipp-strings.c:1646 msgid "media-type.envelope-bond" msgstr "Bond Envelope" #. TRANSLATORS: Coated Envelope -#: locale/ipp-strings.c:1618 +#: locale/ipp-strings.c:1648 msgid "media-type.envelope-coated" msgstr "Coated Envelope" #. TRANSLATORS: Cotton Envelope -#: locale/ipp-strings.c:1620 +#: locale/ipp-strings.c:1650 msgid "media-type.envelope-cotton" msgstr "Cotton Envelope" #. TRANSLATORS: Fine Envelope -#: locale/ipp-strings.c:1622 +#: locale/ipp-strings.c:1652 msgid "media-type.envelope-fine" msgstr "Fine Envelope" #. TRANSLATORS: Heavyweight Envelope -#: locale/ipp-strings.c:1624 +#: locale/ipp-strings.c:1654 msgid "media-type.envelope-heavyweight" msgstr "Heavyweight Envelope" #. TRANSLATORS: Inkjet Envelope -#: locale/ipp-strings.c:1626 +#: locale/ipp-strings.c:1656 msgid "media-type.envelope-inkjet" msgstr "Inkjet Envelope" #. TRANSLATORS: Lightweight Envelope -#: locale/ipp-strings.c:1628 +#: locale/ipp-strings.c:1658 msgid "media-type.envelope-lightweight" msgstr "Lightweight Envelope" #. TRANSLATORS: Plain Envelope -#: locale/ipp-strings.c:1630 +#: locale/ipp-strings.c:1660 msgid "media-type.envelope-plain" msgstr "Plain Envelope" #. TRANSLATORS: Preprinted Envelope -#: locale/ipp-strings.c:1632 +#: locale/ipp-strings.c:1662 msgid "media-type.envelope-preprinted" msgstr "Preprinted Envelope" #. TRANSLATORS: Windowed Envelope -#: locale/ipp-strings.c:1634 +#: locale/ipp-strings.c:1664 msgid "media-type.envelope-window" msgstr "Windowed Envelope" #. TRANSLATORS: Fabric -#: locale/ipp-strings.c:1636 +#: locale/ipp-strings.c:1666 msgid "media-type.fabric" msgstr "Fabric" #. TRANSLATORS: Archival Fabric -#: locale/ipp-strings.c:1638 +#: locale/ipp-strings.c:1668 msgid "media-type.fabric-archival" msgstr "Archival Fabric" #. TRANSLATORS: Glossy Fabric -#: locale/ipp-strings.c:1640 +#: locale/ipp-strings.c:1670 msgid "media-type.fabric-glossy" msgstr "Glossy Fabric" #. TRANSLATORS: High Gloss Fabric -#: locale/ipp-strings.c:1642 +#: locale/ipp-strings.c:1672 msgid "media-type.fabric-high-gloss" msgstr "High Gloss Fabric" #. TRANSLATORS: Matte Fabric -#: locale/ipp-strings.c:1644 +#: locale/ipp-strings.c:1674 msgid "media-type.fabric-matte" msgstr "Matte Fabric" #. TRANSLATORS: Semi-Gloss Fabric -#: locale/ipp-strings.c:1646 +#: locale/ipp-strings.c:1676 msgid "media-type.fabric-semi-gloss" msgstr "Semi-Gloss Fabric" #. TRANSLATORS: Waterproof Fabric -#: locale/ipp-strings.c:1648 +#: locale/ipp-strings.c:1678 msgid "media-type.fabric-waterproof" msgstr "Waterproof Fabric" #. TRANSLATORS: Film -#: locale/ipp-strings.c:1650 +#: locale/ipp-strings.c:1680 msgid "media-type.film" msgstr "Film" #. TRANSLATORS: Flexo Base -#: locale/ipp-strings.c:1652 +#: locale/ipp-strings.c:1682 msgid "media-type.flexo-base" msgstr "Flexo Base" #. TRANSLATORS: Flexo Photo Polymer -#: locale/ipp-strings.c:1654 +#: locale/ipp-strings.c:1684 msgid "media-type.flexo-photo-polymer" msgstr "Flexo Photo Polymer" #. TRANSLATORS: Flute -#: locale/ipp-strings.c:1656 +#: locale/ipp-strings.c:1686 msgid "media-type.flute" msgstr "Flute" #. TRANSLATORS: Foil -#: locale/ipp-strings.c:1658 +#: locale/ipp-strings.c:1688 msgid "media-type.foil" msgstr "Foil" #. TRANSLATORS: Full Cut Tabs -#: locale/ipp-strings.c:1660 +#: locale/ipp-strings.c:1690 msgid "media-type.full-cut-tabs" msgstr "Full Cut Tabs" #. TRANSLATORS: Glass -#: locale/ipp-strings.c:1662 +#: locale/ipp-strings.c:1692 msgid "media-type.glass" msgstr "Glass" #. TRANSLATORS: Glass Colored -#: locale/ipp-strings.c:1664 +#: locale/ipp-strings.c:1694 msgid "media-type.glass-colored" msgstr "Glass Colored" #. TRANSLATORS: Glass Opaque -#: locale/ipp-strings.c:1666 +#: locale/ipp-strings.c:1696 msgid "media-type.glass-opaque" msgstr "Glass Opaque" #. TRANSLATORS: Glass Surfaced -#: locale/ipp-strings.c:1668 +#: locale/ipp-strings.c:1698 msgid "media-type.glass-surfaced" msgstr "Glass Surfaced" #. TRANSLATORS: Glass Textured -#: locale/ipp-strings.c:1670 +#: locale/ipp-strings.c:1700 msgid "media-type.glass-textured" msgstr "Glass Textured" #. TRANSLATORS: Gravure Cylinder -#: locale/ipp-strings.c:1672 +#: locale/ipp-strings.c:1702 msgid "media-type.gravure-cylinder" msgstr "Gravure Cylinder" #. TRANSLATORS: Image Setter Paper -#: locale/ipp-strings.c:1674 +#: locale/ipp-strings.c:1704 msgid "media-type.image-setter-paper" msgstr "Image Setter Paper" #. TRANSLATORS: Imaging Cylinder -#: locale/ipp-strings.c:1676 +#: locale/ipp-strings.c:1706 msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +#. TRANSLATORS: Photo Paper Plus Glossy II +#: locale/ipp-strings.c:1712 msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" msgstr "Photo Paper Plus Glossy II" +#. TRANSLATORS: Photo Paper Pro Platinum +#: locale/ipp-strings.c:1714 msgid "media-type.jp.co.canon_photo-paper-pro-platinum" msgstr "Photo Paper Pro Platinum" +#. TRANSLATORS: Photo Paper Plus Glossy II +#: locale/ipp-strings.c:1708 msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" msgstr "Photo Paper Plus Glossy II" +#. TRANSLATORS: Photo Paper Pro Platinum +#: locale/ipp-strings.c:1710 msgid "media-type.jp.co.canon-photo-paper-pro-platinum" msgstr "Photo Paper Pro Platinum" #. TRANSLATORS: Labels -#: locale/ipp-strings.c:1678 +#: locale/ipp-strings.c:1716 msgid "media-type.labels" msgstr "Labels" #. TRANSLATORS: Colored Labels -#: locale/ipp-strings.c:1680 +#: locale/ipp-strings.c:1718 msgid "media-type.labels-colored" msgstr "Colored Labels" #. TRANSLATORS: Glossy Labels -#: locale/ipp-strings.c:1682 +#: locale/ipp-strings.c:1720 msgid "media-type.labels-glossy" msgstr "Glossy Labels" #. TRANSLATORS: High Gloss Labels -#: locale/ipp-strings.c:1684 +#: locale/ipp-strings.c:1722 msgid "media-type.labels-high-gloss" msgstr "High Gloss Labels" #. TRANSLATORS: Inkjet Labels -#: locale/ipp-strings.c:1686 +#: locale/ipp-strings.c:1724 msgid "media-type.labels-inkjet" msgstr "Inkjet Labels" #. TRANSLATORS: Matte Labels -#: locale/ipp-strings.c:1688 +#: locale/ipp-strings.c:1726 msgid "media-type.labels-matte" msgstr "Matte Labels" #. TRANSLATORS: Permanent Labels -#: locale/ipp-strings.c:1690 +#: locale/ipp-strings.c:1728 msgid "media-type.labels-permanent" msgstr "Permanent Labels" #. TRANSLATORS: Satin Labels -#: locale/ipp-strings.c:1692 +#: locale/ipp-strings.c:1730 msgid "media-type.labels-satin" msgstr "Satin Labels" #. TRANSLATORS: Security Labels -#: locale/ipp-strings.c:1694 +#: locale/ipp-strings.c:1732 msgid "media-type.labels-security" msgstr "Security Labels" #. TRANSLATORS: Semi-Gloss Labels -#: locale/ipp-strings.c:1696 +#: locale/ipp-strings.c:1734 msgid "media-type.labels-semi-gloss" msgstr "Semi-Gloss Labels" #. TRANSLATORS: Laminating Foil -#: locale/ipp-strings.c:1698 +#: locale/ipp-strings.c:1736 msgid "media-type.laminating-foil" msgstr "Laminating Foil" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1700 +#: locale/ipp-strings.c:1738 msgid "media-type.letterhead" msgstr "Letterhead" #. TRANSLATORS: Metal -#: locale/ipp-strings.c:1702 +#: locale/ipp-strings.c:1740 msgid "media-type.metal" msgstr "Metal" #. TRANSLATORS: Metal Glossy -#: locale/ipp-strings.c:1704 +#: locale/ipp-strings.c:1742 msgid "media-type.metal-glossy" msgstr "Metal Glossy" #. TRANSLATORS: Metal High Gloss -#: locale/ipp-strings.c:1706 +#: locale/ipp-strings.c:1744 msgid "media-type.metal-high-gloss" msgstr "Metal High Gloss" #. TRANSLATORS: Metal Matte -#: locale/ipp-strings.c:1708 +#: locale/ipp-strings.c:1746 msgid "media-type.metal-matte" msgstr "Metal Matte" #. TRANSLATORS: Metal Satin -#: locale/ipp-strings.c:1710 +#: locale/ipp-strings.c:1748 msgid "media-type.metal-satin" msgstr "Metal Satin" #. TRANSLATORS: Metal Semi Gloss -#: locale/ipp-strings.c:1712 +#: locale/ipp-strings.c:1750 msgid "media-type.metal-semi-gloss" msgstr "Metal Semi Gloss" #. TRANSLATORS: Mounting Tape -#: locale/ipp-strings.c:1714 +#: locale/ipp-strings.c:1752 msgid "media-type.mounting-tape" msgstr "Mounting Tape" #. TRANSLATORS: Multi Layer -#: locale/ipp-strings.c:1716 +#: locale/ipp-strings.c:1754 msgid "media-type.multi-layer" msgstr "Multi Layer" #. TRANSLATORS: Multi Part Form -#: locale/ipp-strings.c:1718 +#: locale/ipp-strings.c:1756 msgid "media-type.multi-part-form" msgstr "Multi Part Form" #. TRANSLATORS: Other -#: locale/ipp-strings.c:1720 +#: locale/ipp-strings.c:1758 msgid "media-type.other" msgstr "Other" #. TRANSLATORS: Paper -#: locale/ipp-strings.c:1722 +#: locale/ipp-strings.c:1760 msgid "media-type.paper" msgstr "Paper" #. TRANSLATORS: Photo Paper -#: locale/ipp-strings.c:1724 +#: locale/ipp-strings.c:1762 msgid "media-type.photographic" msgstr "Photo Paper" #. TRANSLATORS: Photographic Archival -#: locale/ipp-strings.c:1726 +#: locale/ipp-strings.c:1764 msgid "media-type.photographic-archival" msgstr "Photographic Archival" #. TRANSLATORS: Photo Film -#: locale/ipp-strings.c:1728 +#: locale/ipp-strings.c:1766 msgid "media-type.photographic-film" msgstr "Photo Film" #. TRANSLATORS: Glossy Photo Paper -#: locale/ipp-strings.c:1730 +#: locale/ipp-strings.c:1768 msgid "media-type.photographic-glossy" msgstr "Glossy Photo Paper" #. TRANSLATORS: High Gloss Photo Paper -#: locale/ipp-strings.c:1732 +#: locale/ipp-strings.c:1770 msgid "media-type.photographic-high-gloss" msgstr "High Gloss Photo Paper" #. TRANSLATORS: Matte Photo Paper -#: locale/ipp-strings.c:1734 +#: locale/ipp-strings.c:1772 msgid "media-type.photographic-matte" msgstr "Matte Photo Paper" #. TRANSLATORS: Satin Photo Paper -#: locale/ipp-strings.c:1736 +#: locale/ipp-strings.c:1774 msgid "media-type.photographic-satin" msgstr "Satin Photo Paper" #. TRANSLATORS: Semi-Gloss Photo Paper -#: locale/ipp-strings.c:1738 +#: locale/ipp-strings.c:1776 msgid "media-type.photographic-semi-gloss" msgstr "Semi-Gloss Photo Paper" #. TRANSLATORS: Plastic -#: locale/ipp-strings.c:1740 +#: locale/ipp-strings.c:1778 msgid "media-type.plastic" msgstr "Plastic" #. TRANSLATORS: Plastic Archival -#: locale/ipp-strings.c:1742 +#: locale/ipp-strings.c:1780 msgid "media-type.plastic-archival" msgstr "Plastic Archival" #. TRANSLATORS: Plastic Colored -#: locale/ipp-strings.c:1744 +#: locale/ipp-strings.c:1782 msgid "media-type.plastic-colored" msgstr "Plastic Colored" #. TRANSLATORS: Plastic Glossy -#: locale/ipp-strings.c:1746 +#: locale/ipp-strings.c:1784 msgid "media-type.plastic-glossy" msgstr "Plastic Glossy" #. TRANSLATORS: Plastic High Gloss -#: locale/ipp-strings.c:1748 +#: locale/ipp-strings.c:1786 msgid "media-type.plastic-high-gloss" msgstr "Plastic High Gloss" #. TRANSLATORS: Plastic Matte -#: locale/ipp-strings.c:1750 +#: locale/ipp-strings.c:1788 msgid "media-type.plastic-matte" msgstr "Plastic Matte" #. TRANSLATORS: Plastic Satin -#: locale/ipp-strings.c:1752 +#: locale/ipp-strings.c:1790 msgid "media-type.plastic-satin" msgstr "Plastic Satin" #. TRANSLATORS: Plastic Semi Gloss -#: locale/ipp-strings.c:1754 +#: locale/ipp-strings.c:1792 msgid "media-type.plastic-semi-gloss" msgstr "Plastic Semi Gloss" #. TRANSLATORS: Plate -#: locale/ipp-strings.c:1756 +#: locale/ipp-strings.c:1794 msgid "media-type.plate" msgstr "Plate" #. TRANSLATORS: Polyester -#: locale/ipp-strings.c:1758 +#: locale/ipp-strings.c:1796 msgid "media-type.polyester" msgstr "Polyester" #. TRANSLATORS: Pre Cut Tabs -#: locale/ipp-strings.c:1760 +#: locale/ipp-strings.c:1798 msgid "media-type.pre-cut-tabs" msgstr "Pre Cut Tabs" #. TRANSLATORS: Roll -#: locale/ipp-strings.c:1762 +#: locale/ipp-strings.c:1800 msgid "media-type.roll" msgstr "Roll" #. TRANSLATORS: Screen -#: locale/ipp-strings.c:1764 +#: locale/ipp-strings.c:1802 msgid "media-type.screen" msgstr "Screen" #. TRANSLATORS: Screen Paged -#: locale/ipp-strings.c:1766 +#: locale/ipp-strings.c:1804 msgid "media-type.screen-paged" msgstr "Screen Paged" #. TRANSLATORS: Self Adhesive -#: locale/ipp-strings.c:1768 +#: locale/ipp-strings.c:1806 msgid "media-type.self-adhesive" msgstr "Self Adhesive" #. TRANSLATORS: Self Adhesive Film -#: locale/ipp-strings.c:1770 +#: locale/ipp-strings.c:1808 msgid "media-type.self-adhesive-film" msgstr "Self Adhesive Film" #. TRANSLATORS: Shrink Foil -#: locale/ipp-strings.c:1772 +#: locale/ipp-strings.c:1810 msgid "media-type.shrink-foil" msgstr "Shrink Foil" #. TRANSLATORS: Single Face -#: locale/ipp-strings.c:1774 +#: locale/ipp-strings.c:1812 msgid "media-type.single-face" msgstr "Single Face" #. TRANSLATORS: Single Wall -#: locale/ipp-strings.c:1776 +#: locale/ipp-strings.c:1814 msgid "media-type.single-wall" msgstr "Single Wall" #. TRANSLATORS: Sleeve -#: locale/ipp-strings.c:1778 +#: locale/ipp-strings.c:1816 msgid "media-type.sleeve" msgstr "Sleeve" #. TRANSLATORS: Stationery -#: locale/ipp-strings.c:1780 +#: locale/ipp-strings.c:1818 msgid "media-type.stationery" msgstr "Stationery" #. TRANSLATORS: Stationery Archival -#: locale/ipp-strings.c:1782 +#: locale/ipp-strings.c:1820 msgid "media-type.stationery-archival" msgstr "Stationery Archival" #. TRANSLATORS: Coated Paper -#: locale/ipp-strings.c:1784 +#: locale/ipp-strings.c:1822 msgid "media-type.stationery-coated" msgstr "Coated Paper" #. TRANSLATORS: Stationery Cotton -#: locale/ipp-strings.c:1786 +#: locale/ipp-strings.c:1824 msgid "media-type.stationery-cotton" msgstr "Stationery Cotton" #. TRANSLATORS: Vellum Paper -#: locale/ipp-strings.c:1788 +#: locale/ipp-strings.c:1826 msgid "media-type.stationery-fine" msgstr "Vellum Paper" #. TRANSLATORS: Heavyweight Paper -#: locale/ipp-strings.c:1790 +#: locale/ipp-strings.c:1828 msgid "media-type.stationery-heavyweight" msgstr "Heavyweight Paper" #. TRANSLATORS: Stationery Heavyweight Coated -#: locale/ipp-strings.c:1792 +#: locale/ipp-strings.c:1830 msgid "media-type.stationery-heavyweight-coated" msgstr "Stationery Heavyweight Coated" #. TRANSLATORS: Stationery Inkjet Paper -#: locale/ipp-strings.c:1794 +#: locale/ipp-strings.c:1832 msgid "media-type.stationery-inkjet" msgstr "Stationery Inkjet Paper" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1796 +#: locale/ipp-strings.c:1834 msgid "media-type.stationery-letterhead" msgstr "Letterhead" #. TRANSLATORS: Lightweight Paper -#: locale/ipp-strings.c:1798 +#: locale/ipp-strings.c:1836 msgid "media-type.stationery-lightweight" msgstr "Lightweight Paper" #. TRANSLATORS: Preprinted Paper -#: locale/ipp-strings.c:1800 +#: locale/ipp-strings.c:1838 msgid "media-type.stationery-preprinted" msgstr "Preprinted Paper" #. TRANSLATORS: Punched Paper -#: locale/ipp-strings.c:1802 +#: locale/ipp-strings.c:1840 msgid "media-type.stationery-prepunched" msgstr "Punched Paper" #. TRANSLATORS: Tab Stock -#: locale/ipp-strings.c:1804 +#: locale/ipp-strings.c:1842 msgid "media-type.tab-stock" msgstr "Tab Stock" #. TRANSLATORS: Tractor -#: locale/ipp-strings.c:1806 +#: locale/ipp-strings.c:1844 msgid "media-type.tractor" msgstr "Tractor" #. TRANSLATORS: Transfer -#: locale/ipp-strings.c:1808 +#: locale/ipp-strings.c:1846 msgid "media-type.transfer" msgstr "Transfer" #. TRANSLATORS: Transparency -#: locale/ipp-strings.c:1810 +#: locale/ipp-strings.c:1848 msgid "media-type.transparency" msgstr "Transparency" #. TRANSLATORS: Triple Wall -#: locale/ipp-strings.c:1812 +#: locale/ipp-strings.c:1850 msgid "media-type.triple-wall" msgstr "Triple Wall" #. TRANSLATORS: Wet Film -#: locale/ipp-strings.c:1814 +#: locale/ipp-strings.c:1852 msgid "media-type.wet-film" msgstr "Wet Film" #. TRANSLATORS: Media Weight (grams per m²) -#: locale/ipp-strings.c:1816 +#: locale/ipp-strings.c:1854 msgid "media-weight-metric" msgstr "Media Weight (grams per m²)" #. TRANSLATORS: 28 x 40″ -#: locale/ipp-strings.c:1818 +#: locale/ipp-strings.c:1856 msgid "media.asme_f_28x40in" msgstr "28 x 40\"" #. TRANSLATORS: A4 or US Letter -#: locale/ipp-strings.c:1820 +#: locale/ipp-strings.c:1858 msgid "media.choice_iso_a4_210x297mm_na_letter_8.5x11in" msgstr "A4 or US Letter" #. TRANSLATORS: 2a0 -#: locale/ipp-strings.c:1822 +#: locale/ipp-strings.c:1860 msgid "media.iso_2a0_1189x1682mm" msgstr "2a0" #. TRANSLATORS: A0 -#: locale/ipp-strings.c:1824 +#: locale/ipp-strings.c:1862 msgid "media.iso_a0_841x1189mm" msgstr "A0" #. TRANSLATORS: A0x3 -#: locale/ipp-strings.c:1826 +#: locale/ipp-strings.c:1864 msgid "media.iso_a0x3_1189x2523mm" msgstr "A0x3" #. TRANSLATORS: A10 -#: locale/ipp-strings.c:1828 +#: locale/ipp-strings.c:1866 msgid "media.iso_a10_26x37mm" msgstr "A10" #. TRANSLATORS: A1 -#: locale/ipp-strings.c:1830 +#: locale/ipp-strings.c:1868 msgid "media.iso_a1_594x841mm" msgstr "A1" #. TRANSLATORS: A1x3 -#: locale/ipp-strings.c:1832 +#: locale/ipp-strings.c:1870 msgid "media.iso_a1x3_841x1783mm" msgstr "A1x3" #. TRANSLATORS: A1x4 -#: locale/ipp-strings.c:1834 +#: locale/ipp-strings.c:1872 msgid "media.iso_a1x4_841x2378mm" msgstr "A1x4" #. TRANSLATORS: A2 -#: locale/ipp-strings.c:1836 +#: locale/ipp-strings.c:1874 msgid "media.iso_a2_420x594mm" msgstr "A2" #. TRANSLATORS: A2x3 -#: locale/ipp-strings.c:1838 +#: locale/ipp-strings.c:1876 msgid "media.iso_a2x3_594x1261mm" msgstr "A2x3" #. TRANSLATORS: A2x4 -#: locale/ipp-strings.c:1840 +#: locale/ipp-strings.c:1878 msgid "media.iso_a2x4_594x1682mm" msgstr "A2x4" #. TRANSLATORS: A2x5 -#: locale/ipp-strings.c:1842 +#: locale/ipp-strings.c:1880 msgid "media.iso_a2x5_594x2102mm" msgstr "A2x5" #. TRANSLATORS: A3 (Extra) -#: locale/ipp-strings.c:1844 +#: locale/ipp-strings.c:1882 msgid "media.iso_a3-extra_322x445mm" msgstr "A3 (Extra)" #. TRANSLATORS: A3 -#: locale/ipp-strings.c:1846 +#: locale/ipp-strings.c:1884 msgid "media.iso_a3_297x420mm" msgstr "A3" #. TRANSLATORS: A3x3 -#: locale/ipp-strings.c:1848 +#: locale/ipp-strings.c:1886 msgid "media.iso_a3x3_420x891mm" msgstr "A3x3" #. TRANSLATORS: A3x4 -#: locale/ipp-strings.c:1850 +#: locale/ipp-strings.c:1888 msgid "media.iso_a3x4_420x1189mm" msgstr "A3x4" #. TRANSLATORS: A3x5 -#: locale/ipp-strings.c:1852 +#: locale/ipp-strings.c:1890 msgid "media.iso_a3x5_420x1486mm" msgstr "A3x5" #. TRANSLATORS: A3x6 -#: locale/ipp-strings.c:1854 +#: locale/ipp-strings.c:1892 msgid "media.iso_a3x6_420x1783mm" msgstr "A3x6" #. TRANSLATORS: A3x7 -#: locale/ipp-strings.c:1856 +#: locale/ipp-strings.c:1894 msgid "media.iso_a3x7_420x2080mm" msgstr "A3x7" #. TRANSLATORS: A4 (Extra) -#: locale/ipp-strings.c:1858 +#: locale/ipp-strings.c:1896 msgid "media.iso_a4-extra_235.5x322.3mm" msgstr "A4 (Extra)" #. TRANSLATORS: A4 (Tab) -#: locale/ipp-strings.c:1860 +#: locale/ipp-strings.c:1898 msgid "media.iso_a4-tab_225x297mm" msgstr "A4 (Tab)" #. TRANSLATORS: A4 -#: locale/ipp-strings.c:1862 +#: locale/ipp-strings.c:1900 msgid "media.iso_a4_210x297mm" msgstr "A4" #. TRANSLATORS: A4x3 -#: locale/ipp-strings.c:1864 +#: locale/ipp-strings.c:1902 msgid "media.iso_a4x3_297x630mm" msgstr "A4x3" #. TRANSLATORS: A4x4 -#: locale/ipp-strings.c:1866 +#: locale/ipp-strings.c:1904 msgid "media.iso_a4x4_297x841mm" msgstr "A4x4" #. TRANSLATORS: A4x5 -#: locale/ipp-strings.c:1868 +#: locale/ipp-strings.c:1906 msgid "media.iso_a4x5_297x1051mm" msgstr "A4x5" #. TRANSLATORS: A4x6 -#: locale/ipp-strings.c:1870 +#: locale/ipp-strings.c:1908 msgid "media.iso_a4x6_297x1261mm" msgstr "A4x6" #. TRANSLATORS: A4x7 -#: locale/ipp-strings.c:1872 +#: locale/ipp-strings.c:1910 msgid "media.iso_a4x7_297x1471mm" msgstr "A4x7" #. TRANSLATORS: A4x8 -#: locale/ipp-strings.c:1874 +#: locale/ipp-strings.c:1912 msgid "media.iso_a4x8_297x1682mm" msgstr "A4x8" #. TRANSLATORS: A4x9 -#: locale/ipp-strings.c:1876 +#: locale/ipp-strings.c:1914 msgid "media.iso_a4x9_297x1892mm" msgstr "A4x9" #. TRANSLATORS: A5 (Extra) -#: locale/ipp-strings.c:1878 +#: locale/ipp-strings.c:1916 msgid "media.iso_a5-extra_174x235mm" msgstr "A5 (Extra)" #. TRANSLATORS: A5 -#: locale/ipp-strings.c:1880 +#: locale/ipp-strings.c:1918 msgid "media.iso_a5_148x210mm" msgstr "A5" #. TRANSLATORS: A6 -#: locale/ipp-strings.c:1882 +#: locale/ipp-strings.c:1920 msgid "media.iso_a6_105x148mm" msgstr "A6" #. TRANSLATORS: A7 -#: locale/ipp-strings.c:1884 +#: locale/ipp-strings.c:1922 msgid "media.iso_a7_74x105mm" msgstr "A7" #. TRANSLATORS: A8 -#: locale/ipp-strings.c:1886 +#: locale/ipp-strings.c:1924 msgid "media.iso_a8_52x74mm" msgstr "A8" #. TRANSLATORS: A9 -#: locale/ipp-strings.c:1888 +#: locale/ipp-strings.c:1926 msgid "media.iso_a9_37x52mm" msgstr "A9" #. TRANSLATORS: B0 -#: locale/ipp-strings.c:1890 +#: locale/ipp-strings.c:1928 msgid "media.iso_b0_1000x1414mm" msgstr "B0" #. TRANSLATORS: B10 -#: locale/ipp-strings.c:1892 +#: locale/ipp-strings.c:1930 msgid "media.iso_b10_31x44mm" msgstr "B10" #. TRANSLATORS: B1 -#: locale/ipp-strings.c:1894 +#: locale/ipp-strings.c:1932 msgid "media.iso_b1_707x1000mm" msgstr "B1" #. TRANSLATORS: B2 -#: locale/ipp-strings.c:1896 +#: locale/ipp-strings.c:1934 msgid "media.iso_b2_500x707mm" msgstr "B2" #. TRANSLATORS: B3 -#: locale/ipp-strings.c:1898 +#: locale/ipp-strings.c:1936 msgid "media.iso_b3_353x500mm" msgstr "B3" #. TRANSLATORS: B4 -#: locale/ipp-strings.c:1900 +#: locale/ipp-strings.c:1938 msgid "media.iso_b4_250x353mm" msgstr "B4" #. TRANSLATORS: B5 (Extra) -#: locale/ipp-strings.c:1902 +#: locale/ipp-strings.c:1940 msgid "media.iso_b5-extra_201x276mm" msgstr "B5 (Extra)" #. TRANSLATORS: Envelope B5 -#: locale/ipp-strings.c:1904 +#: locale/ipp-strings.c:1942 msgid "media.iso_b5_176x250mm" msgstr "B5 Envelope" #. TRANSLATORS: B6 -#: locale/ipp-strings.c:1906 +#: locale/ipp-strings.c:1944 msgid "media.iso_b6_125x176mm" msgstr "B6" #. TRANSLATORS: Envelope B6/C4 -#: locale/ipp-strings.c:1908 +#: locale/ipp-strings.c:1946 msgid "media.iso_b6c4_125x324mm" msgstr "B6/C4 Envelope" #. TRANSLATORS: B7 -#: locale/ipp-strings.c:1910 +#: locale/ipp-strings.c:1948 msgid "media.iso_b7_88x125mm" msgstr "B7" #. TRANSLATORS: B8 -#: locale/ipp-strings.c:1912 +#: locale/ipp-strings.c:1950 msgid "media.iso_b8_62x88mm" msgstr "B8" #. TRANSLATORS: B9 -#: locale/ipp-strings.c:1914 +#: locale/ipp-strings.c:1952 msgid "media.iso_b9_44x62mm" msgstr "B9" #. TRANSLATORS: CEnvelope 0 -#: locale/ipp-strings.c:1916 +#: locale/ipp-strings.c:1954 msgid "media.iso_c0_917x1297mm" msgstr "C0 Envelope" #. TRANSLATORS: CEnvelope 10 -#: locale/ipp-strings.c:1918 +#: locale/ipp-strings.c:1956 msgid "media.iso_c10_28x40mm" msgstr "C10 Envelope" #. TRANSLATORS: CEnvelope 1 -#: locale/ipp-strings.c:1920 +#: locale/ipp-strings.c:1958 msgid "media.iso_c1_648x917mm" msgstr "C1 Envelope" #. TRANSLATORS: CEnvelope 2 -#: locale/ipp-strings.c:1922 +#: locale/ipp-strings.c:1960 msgid "media.iso_c2_458x648mm" msgstr "C2 Envelope" #. TRANSLATORS: CEnvelope 3 -#: locale/ipp-strings.c:1924 +#: locale/ipp-strings.c:1962 msgid "media.iso_c3_324x458mm" msgstr "C3 Envelope" #. TRANSLATORS: CEnvelope 4 -#: locale/ipp-strings.c:1926 +#: locale/ipp-strings.c:1964 msgid "media.iso_c4_229x324mm" msgstr "C4 Envelope" #. TRANSLATORS: CEnvelope 5 -#: locale/ipp-strings.c:1928 +#: locale/ipp-strings.c:1966 msgid "media.iso_c5_162x229mm" msgstr "C5 Envelope" #. TRANSLATORS: CEnvelope 6 -#: locale/ipp-strings.c:1930 +#: locale/ipp-strings.c:1968 msgid "media.iso_c6_114x162mm" msgstr "C6 Envelope" #. TRANSLATORS: CEnvelope 6c5 -#: locale/ipp-strings.c:1932 +#: locale/ipp-strings.c:1970 msgid "media.iso_c6c5_114x229mm" msgstr "C6c5 Envelope" #. TRANSLATORS: CEnvelope 7 -#: locale/ipp-strings.c:1934 +#: locale/ipp-strings.c:1972 msgid "media.iso_c7_81x114mm" msgstr "C7 Envelope" #. TRANSLATORS: CEnvelope 7c6 -#: locale/ipp-strings.c:1936 +#: locale/ipp-strings.c:1974 msgid "media.iso_c7c6_81x162mm" msgstr "C7c6 Envelope" #. TRANSLATORS: CEnvelope 8 -#: locale/ipp-strings.c:1938 +#: locale/ipp-strings.c:1976 msgid "media.iso_c8_57x81mm" msgstr "C8 Envelope" #. TRANSLATORS: CEnvelope 9 -#: locale/ipp-strings.c:1940 +#: locale/ipp-strings.c:1978 msgid "media.iso_c9_40x57mm" msgstr "C9 Envelope" #. TRANSLATORS: Envelope DL -#: locale/ipp-strings.c:1942 +#: locale/ipp-strings.c:1980 msgid "media.iso_dl_110x220mm" msgstr "DL Envelope" #. TRANSLATORS: ISO RA0 -#: locale/ipp-strings.c:1948 +#: locale/ipp-strings.c:1986 msgid "media.iso_ra0_860x1220mm" msgstr "Ra0" #. TRANSLATORS: ISO RA1 -#: locale/ipp-strings.c:1950 +#: locale/ipp-strings.c:1988 msgid "media.iso_ra1_610x860mm" msgstr "Ra1" #. TRANSLATORS: ISO RA2 -#: locale/ipp-strings.c:1952 +#: locale/ipp-strings.c:1990 msgid "media.iso_ra2_430x610mm" msgstr "Ra2" #. TRANSLATORS: ISO RA3 -#: locale/ipp-strings.c:1954 +#: locale/ipp-strings.c:1992 msgid "media.iso_ra3_305x430mm" msgstr "Ra3" #. TRANSLATORS: ISO RA4 -#: locale/ipp-strings.c:1956 +#: locale/ipp-strings.c:1994 msgid "media.iso_ra4_215x305mm" msgstr "Ra4" #. TRANSLATORS: ISO SRA0 -#: locale/ipp-strings.c:1958 +#: locale/ipp-strings.c:1996 msgid "media.iso_sra0_900x1280mm" msgstr "Sra0" #. TRANSLATORS: ISO SRA1 -#: locale/ipp-strings.c:1960 +#: locale/ipp-strings.c:1998 msgid "media.iso_sra1_640x900mm" msgstr "Sra1" #. TRANSLATORS: ISO SRA2 -#: locale/ipp-strings.c:1962 +#: locale/ipp-strings.c:2000 msgid "media.iso_sra2_450x640mm" msgstr "Sra2" #. TRANSLATORS: ISO SRA3 -#: locale/ipp-strings.c:1964 +#: locale/ipp-strings.c:2002 msgid "media.iso_sra3_320x450mm" msgstr "Sra3" #. TRANSLATORS: ISO SRA4 -#: locale/ipp-strings.c:1966 +#: locale/ipp-strings.c:2004 msgid "media.iso_sra4_225x320mm" msgstr "Sra4" #. TRANSLATORS: JIS B0 -#: locale/ipp-strings.c:1968 +#: locale/ipp-strings.c:2006 msgid "media.jis_b0_1030x1456mm" msgstr "JIS B0" #. TRANSLATORS: JIS B10 -#: locale/ipp-strings.c:1970 +#: locale/ipp-strings.c:2008 msgid "media.jis_b10_32x45mm" msgstr "JIS B10" #. TRANSLATORS: JIS B1 -#: locale/ipp-strings.c:1972 +#: locale/ipp-strings.c:2010 msgid "media.jis_b1_728x1030mm" msgstr "JIS B1" #. TRANSLATORS: JIS B2 -#: locale/ipp-strings.c:1974 +#: locale/ipp-strings.c:2012 msgid "media.jis_b2_515x728mm" msgstr "JIS B2" #. TRANSLATORS: JIS B3 -#: locale/ipp-strings.c:1976 +#: locale/ipp-strings.c:2014 msgid "media.jis_b3_364x515mm" msgstr "JIS B3" #. TRANSLATORS: JIS B4 -#: locale/ipp-strings.c:1978 +#: locale/ipp-strings.c:2016 msgid "media.jis_b4_257x364mm" msgstr "JIS B4" #. TRANSLATORS: JIS B5 -#: locale/ipp-strings.c:1980 +#: locale/ipp-strings.c:2018 msgid "media.jis_b5_182x257mm" msgstr "JIS B5" #. TRANSLATORS: JIS B6 -#: locale/ipp-strings.c:1982 +#: locale/ipp-strings.c:2020 msgid "media.jis_b6_128x182mm" msgstr "JIS B6" #. TRANSLATORS: JIS B7 -#: locale/ipp-strings.c:1984 +#: locale/ipp-strings.c:2022 msgid "media.jis_b7_91x128mm" msgstr "JIS B7" #. TRANSLATORS: JIS B8 -#: locale/ipp-strings.c:1986 +#: locale/ipp-strings.c:2024 msgid "media.jis_b8_64x91mm" msgstr "JIS B8" #. TRANSLATORS: JIS B9 -#: locale/ipp-strings.c:1988 +#: locale/ipp-strings.c:2026 msgid "media.jis_b9_45x64mm" msgstr "JIS B9" #. TRANSLATORS: JIS Executive -#: locale/ipp-strings.c:1990 +#: locale/ipp-strings.c:2028 msgid "media.jis_exec_216x330mm" msgstr "JIS Executive" #. TRANSLATORS: Envelope Chou 2 -#: locale/ipp-strings.c:1992 +#: locale/ipp-strings.c:2030 msgid "media.jpn_chou2_111.1x146mm" msgstr "Chou 2 Envelope" #. TRANSLATORS: Envelope Chou 3 -#: locale/ipp-strings.c:1994 +#: locale/ipp-strings.c:2032 msgid "media.jpn_chou3_120x235mm" msgstr "Chou 3 Envelope" #. TRANSLATORS: Envelope Chou 4 -#: locale/ipp-strings.c:1998 +#: locale/ipp-strings.c:2036 msgid "media.jpn_chou4_90x205mm" msgstr "Chou 4 Envelope" #. TRANSLATORS: Hagaki -#: locale/ipp-strings.c:2000 +#: locale/ipp-strings.c:2038 msgid "media.jpn_hagaki_100x148mm" msgstr "Hagaki" #. TRANSLATORS: Envelope Kahu -#: locale/ipp-strings.c:2002 +#: locale/ipp-strings.c:2040 msgid "media.jpn_kahu_240x322.1mm" msgstr "Kahu Envelope" #. TRANSLATORS: Envelope Kahu 2 -#: locale/ipp-strings.c:2006 +#: locale/ipp-strings.c:2044 msgid "media.jpn_kaku2_240x332mm" msgstr "Kahu 2 Envelope" #. TRANSLATORS: 216 x 277mm -#: locale/ipp-strings.c:2008 +#: locale/ipp-strings.c:2046 msgid "media.jpn_kaku3_216x277mm" msgstr "216 x 277mme" #. TRANSLATORS: 197 x 267mm -#: locale/ipp-strings.c:2010 +#: locale/ipp-strings.c:2048 msgid "media.jpn_kaku4_197x267mm" msgstr "197 x 267mme" #. TRANSLATORS: 190 x 240mm -#: locale/ipp-strings.c:2012 +#: locale/ipp-strings.c:2050 msgid "media.jpn_kaku5_190x240mm" msgstr "190 x 240mme" #. TRANSLATORS: 142 x 205mm -#: locale/ipp-strings.c:2014 +#: locale/ipp-strings.c:2052 msgid "media.jpn_kaku7_142x205mm" msgstr "142 x 205mme" #. TRANSLATORS: 119 x 197mm -#: locale/ipp-strings.c:2016 +#: locale/ipp-strings.c:2054 msgid "media.jpn_kaku8_119x197mm" msgstr "119 x 197mme" #. TRANSLATORS: Oufuku Reply Postcard -#: locale/ipp-strings.c:2018 +#: locale/ipp-strings.c:2056 msgid "media.jpn_oufuku_148x200mm" msgstr "Oufuku Reply Postcard" #. TRANSLATORS: Envelope You 4 -#: locale/ipp-strings.c:2020 +#: locale/ipp-strings.c:2058 msgid "media.jpn_you4_105x235mm" msgstr "You 4 Envelope" #. TRANSLATORS: 10 x 11″ -#: locale/ipp-strings.c:2022 +#: locale/ipp-strings.c:2060 msgid "media.na_10x11_10x11in" msgstr "10 x 11\"" #. TRANSLATORS: 10 x 13″ -#: locale/ipp-strings.c:2024 +#: locale/ipp-strings.c:2062 msgid "media.na_10x13_10x13in" msgstr "10 x 13\"" #. TRANSLATORS: 10 x 14″ -#: locale/ipp-strings.c:2026 +#: locale/ipp-strings.c:2064 msgid "media.na_10x14_10x14in" msgstr "10 x 14\"" #. TRANSLATORS: 10 x 15″ -#: locale/ipp-strings.c:2028 +#: locale/ipp-strings.c:2066 msgid "media.na_10x15_10x15in" msgstr "10 x 15\"" #. TRANSLATORS: 11 x 12″ -#: locale/ipp-strings.c:2030 +#: locale/ipp-strings.c:2068 msgid "media.na_11x12_11x12in" msgstr "11 x 12\"" #. TRANSLATORS: 11 x 15″ -#: locale/ipp-strings.c:2032 +#: locale/ipp-strings.c:2070 msgid "media.na_11x15_11x15in" msgstr "11 x 15\"" #. TRANSLATORS: 12 x 19″ -#: locale/ipp-strings.c:2034 +#: locale/ipp-strings.c:2072 msgid "media.na_12x19_12x19in" msgstr "12 x 19\"" #. TRANSLATORS: 5 x 7″ -#: locale/ipp-strings.c:2036 +#: locale/ipp-strings.c:2074 msgid "media.na_5x7_5x7in" msgstr "5 x 7\"" #. TRANSLATORS: 6 x 9″ -#: locale/ipp-strings.c:2038 +#: locale/ipp-strings.c:2076 msgid "media.na_6x9_6x9in" msgstr "6 x 9\"" #. TRANSLATORS: 7 x 9″ -#: locale/ipp-strings.c:2040 +#: locale/ipp-strings.c:2078 msgid "media.na_7x9_7x9in" msgstr "7 x 9\"" #. TRANSLATORS: 9 x 11″ -#: locale/ipp-strings.c:2042 +#: locale/ipp-strings.c:2080 msgid "media.na_9x11_9x11in" msgstr "9 x 11\"" #. TRANSLATORS: Envelope A2 -#: locale/ipp-strings.c:2044 +#: locale/ipp-strings.c:2082 msgid "media.na_a2_4.375x5.75in" msgstr "A2 Envelope" #. TRANSLATORS: 9 x 12″ -#: locale/ipp-strings.c:2046 +#: locale/ipp-strings.c:2084 msgid "media.na_arch-a_9x12in" msgstr "9 x 12\"" #. TRANSLATORS: 12 x 18″ -#: locale/ipp-strings.c:2048 +#: locale/ipp-strings.c:2086 msgid "media.na_arch-b_12x18in" msgstr "12 x 18\"" #. TRANSLATORS: 18 x 24″ -#: locale/ipp-strings.c:2050 +#: locale/ipp-strings.c:2088 msgid "media.na_arch-c_18x24in" msgstr "18 x 24\"" #. TRANSLATORS: 24 x 36″ -#: locale/ipp-strings.c:2052 +#: locale/ipp-strings.c:2090 msgid "media.na_arch-d_24x36in" msgstr "24 x 36\"" #. TRANSLATORS: 26 x 38″ -#: locale/ipp-strings.c:2054 +#: locale/ipp-strings.c:2092 msgid "media.na_arch-e2_26x38in" msgstr "26 x 38\"" #. TRANSLATORS: 27 x 39″ -#: locale/ipp-strings.c:2056 +#: locale/ipp-strings.c:2094 msgid "media.na_arch-e3_27x39in" msgstr "27 x 39\"" #. TRANSLATORS: 36 x 48″ -#: locale/ipp-strings.c:2058 +#: locale/ipp-strings.c:2096 msgid "media.na_arch-e_36x48in" msgstr "36 x 48\"" #. TRANSLATORS: 12 x 19.17″ -#: locale/ipp-strings.c:2060 +#: locale/ipp-strings.c:2098 msgid "media.na_b-plus_12x19.17in" msgstr "12 x 19.17\"" #. TRANSLATORS: Envelope C5 -#: locale/ipp-strings.c:2062 +#: locale/ipp-strings.c:2100 msgid "media.na_c5_6.5x9.5in" msgstr "C5 Envelope" #. TRANSLATORS: 17 x 22″ -#: locale/ipp-strings.c:2064 +#: locale/ipp-strings.c:2102 msgid "media.na_c_17x22in" msgstr "17 x 22\"" #. TRANSLATORS: 22 x 34″ -#: locale/ipp-strings.c:2066 +#: locale/ipp-strings.c:2104 msgid "media.na_d_22x34in" msgstr "22 x 34\"" #. TRANSLATORS: 34 x 44″ -#: locale/ipp-strings.c:2068 +#: locale/ipp-strings.c:2106 msgid "media.na_e_34x44in" msgstr "34 x 44\"" #. TRANSLATORS: 11 x 14″ -#: locale/ipp-strings.c:2070 +#: locale/ipp-strings.c:2108 msgid "media.na_edp_11x14in" msgstr "11 x 14\"" #. TRANSLATORS: 12 x 14″ -#: locale/ipp-strings.c:2072 +#: locale/ipp-strings.c:2110 msgid "media.na_eur-edp_12x14in" msgstr "12 x 14\"" #. TRANSLATORS: Executive -#: locale/ipp-strings.c:2074 +#: locale/ipp-strings.c:2112 msgid "media.na_executive_7.25x10.5in" msgstr "Executive" #. TRANSLATORS: 44 x 68″ -#: locale/ipp-strings.c:2076 +#: locale/ipp-strings.c:2114 msgid "media.na_f_44x68in" msgstr "44 x 68\"" #. TRANSLATORS: European Fanfold -#: locale/ipp-strings.c:2078 +#: locale/ipp-strings.c:2116 msgid "media.na_fanfold-eur_8.5x12in" msgstr "European Fanfold" #. TRANSLATORS: US Fanfold -#: locale/ipp-strings.c:2080 +#: locale/ipp-strings.c:2118 msgid "media.na_fanfold-us_11x14.875in" msgstr "US Fanfold" #. TRANSLATORS: Foolscap -#: locale/ipp-strings.c:2082 +#: locale/ipp-strings.c:2120 msgid "media.na_foolscap_8.5x13in" msgstr "Foolscap" #. TRANSLATORS: 8 x 13″ -#: locale/ipp-strings.c:2084 +#: locale/ipp-strings.c:2122 msgid "media.na_govt-legal_8x13in" msgstr "8 x 13\"" #. TRANSLATORS: 8 x 10″ -#: locale/ipp-strings.c:2086 +#: locale/ipp-strings.c:2124 msgid "media.na_govt-letter_8x10in" msgstr "8 x 10\"" #. TRANSLATORS: 3 x 5″ -#: locale/ipp-strings.c:2088 +#: locale/ipp-strings.c:2126 msgid "media.na_index-3x5_3x5in" msgstr "3 x 5\"" #. TRANSLATORS: 6 x 8″ -#: locale/ipp-strings.c:2090 +#: locale/ipp-strings.c:2128 msgid "media.na_index-4x6-ext_6x8in" msgstr "6 x 8\"" #. TRANSLATORS: 4 x 6″ -#: locale/ipp-strings.c:2092 +#: locale/ipp-strings.c:2130 msgid "media.na_index-4x6_4x6in" msgstr "4 x 6\"" #. TRANSLATORS: 5 x 8″ -#: locale/ipp-strings.c:2094 +#: locale/ipp-strings.c:2132 msgid "media.na_index-5x8_5x8in" msgstr "5 x 8\"" #. TRANSLATORS: Statement -#: locale/ipp-strings.c:2096 +#: locale/ipp-strings.c:2134 msgid "media.na_invoice_5.5x8.5in" msgstr "Statement" #. TRANSLATORS: 11 x 17″ -#: locale/ipp-strings.c:2098 +#: locale/ipp-strings.c:2136 msgid "media.na_ledger_11x17in" msgstr "11 x 17\"" #. TRANSLATORS: US Legal (Extra) -#: locale/ipp-strings.c:2100 +#: locale/ipp-strings.c:2138 msgid "media.na_legal-extra_9.5x15in" msgstr "US Legal (Extra)" #. TRANSLATORS: US Legal -#: locale/ipp-strings.c:2102 +#: locale/ipp-strings.c:2140 msgid "media.na_legal_8.5x14in" msgstr "US Legal" #. TRANSLATORS: US Letter (Extra) -#: locale/ipp-strings.c:2104 +#: locale/ipp-strings.c:2142 msgid "media.na_letter-extra_9.5x12in" msgstr "US Letter (Extra)" #. TRANSLATORS: US Letter (Plus) -#: locale/ipp-strings.c:2106 +#: locale/ipp-strings.c:2144 msgid "media.na_letter-plus_8.5x12.69in" msgstr "US Letter (Plus)" #. TRANSLATORS: US Letter -#: locale/ipp-strings.c:2108 +#: locale/ipp-strings.c:2146 msgid "media.na_letter_8.5x11in" msgstr "US Letter" #. TRANSLATORS: Envelope Monarch -#: locale/ipp-strings.c:2110 +#: locale/ipp-strings.c:2148 msgid "media.na_monarch_3.875x7.5in" msgstr "Monarch Envelope" #. TRANSLATORS: Envelope #10 -#: locale/ipp-strings.c:2112 +#: locale/ipp-strings.c:2150 msgid "media.na_number-10_4.125x9.5in" msgstr "#10 Envelope" #. TRANSLATORS: Envelope #11 -#: locale/ipp-strings.c:2114 +#: locale/ipp-strings.c:2152 msgid "media.na_number-11_4.5x10.375in" msgstr "#11 Envelope" #. TRANSLATORS: Envelope #12 -#: locale/ipp-strings.c:2116 +#: locale/ipp-strings.c:2154 msgid "media.na_number-12_4.75x11in" msgstr "#12 Envelope" #. TRANSLATORS: Envelope #14 -#: locale/ipp-strings.c:2118 +#: locale/ipp-strings.c:2156 msgid "media.na_number-14_5x11.5in" msgstr "#14 Envelope" #. TRANSLATORS: Envelope #9 -#: locale/ipp-strings.c:2120 +#: locale/ipp-strings.c:2158 msgid "media.na_number-9_3.875x8.875in" msgstr "#9 Envelope" #. TRANSLATORS: 8.5 x 13.4″ -#: locale/ipp-strings.c:2122 +#: locale/ipp-strings.c:2160 msgid "media.na_oficio_8.5x13.4in" msgstr "8.5 x 13.4\"" #. TRANSLATORS: Envelope Personal -#: locale/ipp-strings.c:2124 +#: locale/ipp-strings.c:2162 msgid "media.na_personal_3.625x6.5in" msgstr "Personal Envelope" #. TRANSLATORS: Quarto -#: locale/ipp-strings.c:2126 +#: locale/ipp-strings.c:2164 msgid "media.na_quarto_8.5x10.83in" msgstr "Quarto" #. TRANSLATORS: 8.94 x 14″ -#: locale/ipp-strings.c:2128 +#: locale/ipp-strings.c:2166 msgid "media.na_super-a_8.94x14in" msgstr "8.94 x 14\"" #. TRANSLATORS: 13 x 19″ -#: locale/ipp-strings.c:2130 +#: locale/ipp-strings.c:2168 msgid "media.na_super-b_13x19in" msgstr "13 x 19\"" #. TRANSLATORS: 30 x 42″ -#: locale/ipp-strings.c:2132 +#: locale/ipp-strings.c:2170 msgid "media.na_wide-format_30x42in" msgstr "30 x 42\"" #. TRANSLATORS: 12 x 16″ -#: locale/ipp-strings.c:2134 +#: locale/ipp-strings.c:2172 msgid "media.oe_12x16_12x16in" msgstr "12 x 16\"" #. TRANSLATORS: 14 x 17″ -#: locale/ipp-strings.c:2136 +#: locale/ipp-strings.c:2174 msgid "media.oe_14x17_14x17in" msgstr "14 x 17\"" #. TRANSLATORS: 18 x 22″ -#: locale/ipp-strings.c:2138 +#: locale/ipp-strings.c:2176 msgid "media.oe_18x22_18x22in" msgstr "18 x 22\"" #. TRANSLATORS: 17 x 24″ -#: locale/ipp-strings.c:2140 +#: locale/ipp-strings.c:2178 msgid "media.oe_a2plus_17x24in" msgstr "17 x 24\"" #. TRANSLATORS: 10 x 12″ -#: locale/ipp-strings.c:2144 +#: locale/ipp-strings.c:2182 msgid "media.oe_photo-10r_10x12in" msgstr "10 x 12\"" #. TRANSLATORS: 20 x 24″ -#: locale/ipp-strings.c:2146 +#: locale/ipp-strings.c:2184 msgid "media.oe_photo-20r_20x24in" msgstr "20 x 24\"" #. TRANSLATORS: 3.5 x 5″ -#: locale/ipp-strings.c:2148 +#: locale/ipp-strings.c:2186 msgid "media.oe_photo-l_3.5x5in" msgstr "3.5 x 5\"" #. TRANSLATORS: 10 x 15″ -#: locale/ipp-strings.c:2150 +#: locale/ipp-strings.c:2188 msgid "media.oe_photo-s10r_10x15in" msgstr "10 x 15\"" #. TRANSLATORS: 184 x 260mm -#: locale/ipp-strings.c:2156 +#: locale/ipp-strings.c:2194 msgid "media.om_16k_184x260mm" msgstr "184 x 260mm" #. TRANSLATORS: 195 x 270mm -#: locale/ipp-strings.c:2158 +#: locale/ipp-strings.c:2196 msgid "media.om_16k_195x270mm" msgstr "195 x 270mm" #. TRANSLATORS: 275 x 395mm -#: locale/ipp-strings.c:2166 +#: locale/ipp-strings.c:2204 msgid "media.om_dai-pa-kai_275x395mm" msgstr "275 x 395mm" #. TRANSLATORS: Folio -#: locale/ipp-strings.c:2170 +#: locale/ipp-strings.c:2208 msgid "media.om_folio-sp_215x315mm" msgstr "Folio" #. TRANSLATORS: Folio (Special) -#: locale/ipp-strings.c:2172 +#: locale/ipp-strings.c:2210 msgid "media.om_folio_210x330mm" msgstr "Folio (Special)" #. TRANSLATORS: Envelope Invitation -#: locale/ipp-strings.c:2174 +#: locale/ipp-strings.c:2212 msgid "media.om_invite_220x220mm" msgstr "Invitation Envelope" #. TRANSLATORS: Envelope Italian -#: locale/ipp-strings.c:2176 +#: locale/ipp-strings.c:2214 msgid "media.om_italian_110x230mm" msgstr "Italian Envelope" #. TRANSLATORS: 198 x 275mm -#: locale/ipp-strings.c:2178 +#: locale/ipp-strings.c:2216 msgid "media.om_juuro-ku-kai_198x275mm" msgstr "198 x 275mm" #. TRANSLATORS: 200 x 300 -#: locale/ipp-strings.c:2180 +#: locale/ipp-strings.c:2218 msgid "media.om_large-photo_200x300" msgstr "200 x 300mm" #. TRANSLATORS: 130 x 180mm -#: locale/ipp-strings.c:2182 +#: locale/ipp-strings.c:2220 msgid "media.om_medium-photo_130x180mm" msgstr "130 x 180mm" #. TRANSLATORS: 267 x 389mm -#: locale/ipp-strings.c:2184 +#: locale/ipp-strings.c:2222 msgid "media.om_pa-kai_267x389mm" msgstr "267 x 389mm" #. TRANSLATORS: Envelope Postfix -#: locale/ipp-strings.c:2186 +#: locale/ipp-strings.c:2224 msgid "media.om_postfix_114x229mm" msgstr "Postfix Envelope" #. TRANSLATORS: 100 x 150mm -#: locale/ipp-strings.c:2188 +#: locale/ipp-strings.c:2226 msgid "media.om_small-photo_100x150mm" msgstr "100 x 150mm" #. TRANSLATORS: 100 x 200mm -#: locale/ipp-strings.c:2192 +#: locale/ipp-strings.c:2230 msgid "media.om_wide-photo_100x200mm" msgstr "100 x 200mm" #. TRANSLATORS: Envelope Chinese #10 -#: locale/ipp-strings.c:2194 +#: locale/ipp-strings.c:2232 msgid "media.prc_10_324x458mm" msgstr "Chinese #10 Envelope" #. TRANSLATORS: Chinese 16k -#: locale/ipp-strings.c:2196 +#: locale/ipp-strings.c:2234 msgid "media.prc_16k_146x215mm" msgstr "Chinese 16k" #. TRANSLATORS: Envelope Chinese #1 -#: locale/ipp-strings.c:2198 +#: locale/ipp-strings.c:2236 msgid "media.prc_1_102x165mm" msgstr "Chinese #1 Envelope" #. TRANSLATORS: Envelope Chinese #2 -#: locale/ipp-strings.c:2200 +#: locale/ipp-strings.c:2238 msgid "media.prc_2_102x176mm" msgstr "Chinese #2 Envelope" #. TRANSLATORS: Chinese 32k -#: locale/ipp-strings.c:2202 +#: locale/ipp-strings.c:2240 msgid "media.prc_32k_97x151mm" msgstr "Chinese 32k" #. TRANSLATORS: Envelope Chinese #3 -#: locale/ipp-strings.c:2204 +#: locale/ipp-strings.c:2242 msgid "media.prc_3_125x176mm" msgstr "Chinese #3 Envelope" #. TRANSLATORS: Envelope Chinese #4 -#: locale/ipp-strings.c:2206 +#: locale/ipp-strings.c:2244 msgid "media.prc_4_110x208mm" msgstr "Chinese #4 Envelope" #. TRANSLATORS: Envelope Chinese #5 -#: locale/ipp-strings.c:2208 +#: locale/ipp-strings.c:2246 msgid "media.prc_5_110x220mm" msgstr "Chinese #5 Envelope" #. TRANSLATORS: Envelope Chinese #6 -#: locale/ipp-strings.c:2210 +#: locale/ipp-strings.c:2248 msgid "media.prc_6_120x320mm" msgstr "Chinese #6 Envelope" #. TRANSLATORS: Envelope Chinese #7 -#: locale/ipp-strings.c:2212 +#: locale/ipp-strings.c:2250 msgid "media.prc_7_160x230mm" msgstr "Chinese #7 Envelope" #. TRANSLATORS: Envelope Chinese #8 -#: locale/ipp-strings.c:2214 +#: locale/ipp-strings.c:2252 msgid "media.prc_8_120x309mm" msgstr "Chinese #8 Envelope" #. TRANSLATORS: ROC 16k -#: locale/ipp-strings.c:2216 +#: locale/ipp-strings.c:2254 msgid "media.roc_16k_7.75x10.75in" msgstr "ROC 16k" #. TRANSLATORS: ROC 8k -#: locale/ipp-strings.c:2218 +#: locale/ipp-strings.c:2256 msgid "media.roc_8k_10.75x15.5in" msgstr "ROC 8k" #. TRANSLATORS: Multiple Document Handling -#: locale/ipp-strings.c:2220 +#: locale/ipp-strings.c:2258 msgid "multiple-document-handling" msgstr "Multiple Document Handling" #. TRANSLATORS: Separate Documents Collated Copies -#: locale/ipp-strings.c:2222 +#: locale/ipp-strings.c:2260 msgid "multiple-document-handling.separate-documents-collated-copies" msgstr "Separate Documents Collated Copies" #. TRANSLATORS: Separate Documents Uncollated Copies -#: locale/ipp-strings.c:2224 +#: locale/ipp-strings.c:2262 msgid "multiple-document-handling.separate-documents-uncollated-copies" msgstr "Separate Documents Uncollated Copies" #. TRANSLATORS: Single Document -#: locale/ipp-strings.c:2226 +#: locale/ipp-strings.c:2264 msgid "multiple-document-handling.single-document" msgstr "Single Document" #. TRANSLATORS: Single Document New Sheet -#: locale/ipp-strings.c:2228 +#: locale/ipp-strings.c:2266 msgid "multiple-document-handling.single-document-new-sheet" msgstr "Single Document New Sheet" #. TRANSLATORS: Multiple Object Handling -#: locale/ipp-strings.c:2230 +#: locale/ipp-strings.c:2268 msgid "multiple-object-handling" msgstr "Multiple Object Handling" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2234 +#: locale/ipp-strings.c:2272 msgid "multiple-object-handling.auto" msgstr "Automatic" #. TRANSLATORS: Best Fit -#: locale/ipp-strings.c:2236 +#: locale/ipp-strings.c:2274 msgid "multiple-object-handling.best-fit" msgstr "Best Fit" #. TRANSLATORS: Best Quality -#: locale/ipp-strings.c:2238 +#: locale/ipp-strings.c:2276 msgid "multiple-object-handling.best-quality" msgstr "Best Quality" #. TRANSLATORS: Best Speed -#: locale/ipp-strings.c:2240 +#: locale/ipp-strings.c:2278 msgid "multiple-object-handling.best-speed" msgstr "Best Speed" #. TRANSLATORS: One At A Time -#: locale/ipp-strings.c:2242 +#: locale/ipp-strings.c:2280 msgid "multiple-object-handling.one-at-a-time" msgstr "One At A Time" #. TRANSLATORS: On Timeout -#: locale/ipp-strings.c:2244 +#: locale/ipp-strings.c:2282 msgid "multiple-operation-time-out-action" msgstr "Multiple Operation Time Out Action" #. TRANSLATORS: Abort Job -#: locale/ipp-strings.c:2246 +#: locale/ipp-strings.c:2284 msgid "multiple-operation-time-out-action.abort-job" msgstr "Abort Job" #. TRANSLATORS: Hold Job -#: locale/ipp-strings.c:2248 +#: locale/ipp-strings.c:2286 msgid "multiple-operation-time-out-action.hold-job" msgstr "Hold Job" #. TRANSLATORS: Process Job -#: locale/ipp-strings.c:2250 +#: locale/ipp-strings.c:2288 msgid "multiple-operation-time-out-action.process-job" msgstr "Process Job" #. TRANSLATORS: Noise Removal -#: locale/ipp-strings.c:2252 +#: locale/ipp-strings.c:2290 msgid "noise-removal" msgstr "Noise Removal" #. TRANSLATORS: Notify Attributes -#: locale/ipp-strings.c:2254 +#: locale/ipp-strings.c:2292 msgid "notify-attributes" msgstr "Notify Attributes" #. TRANSLATORS: Notify Charset -#: locale/ipp-strings.c:2256 +#: locale/ipp-strings.c:2294 msgid "notify-charset" msgstr "Notify Charset" #. TRANSLATORS: Notify Events -#: locale/ipp-strings.c:2258 +#: locale/ipp-strings.c:2296 msgid "notify-events" msgstr "Notify Events" #. TRANSLATORS: Document Completed -#: locale/ipp-strings.c:2260 +#: locale/ipp-strings.c:2298 msgid "notify-events.document-completed" msgstr "Document Completed" #. TRANSLATORS: Document Config Changed -#: locale/ipp-strings.c:2262 +#: locale/ipp-strings.c:2300 msgid "notify-events.document-config-changed" msgstr "Document Config Changed" #. TRANSLATORS: Document Created -#: locale/ipp-strings.c:2264 +#: locale/ipp-strings.c:2302 msgid "notify-events.document-created" msgstr "Document Created" #. TRANSLATORS: Document Fetchable -#: locale/ipp-strings.c:2266 +#: locale/ipp-strings.c:2304 msgid "notify-events.document-fetchable" msgstr "Document Fetchable" #. TRANSLATORS: Document State Changed -#: locale/ipp-strings.c:2268 +#: locale/ipp-strings.c:2306 msgid "notify-events.document-state-changed" msgstr "Document State Changed" #. TRANSLATORS: Document Stopped -#: locale/ipp-strings.c:2270 +#: locale/ipp-strings.c:2308 msgid "notify-events.document-stopped" msgstr "Document Stopped" #. TRANSLATORS: Job Completed -#: locale/ipp-strings.c:2272 +#: locale/ipp-strings.c:2310 msgid "notify-events.job-completed" msgstr "Job Completed" #. TRANSLATORS: Job Config Changed -#: locale/ipp-strings.c:2274 +#: locale/ipp-strings.c:2312 msgid "notify-events.job-config-changed" msgstr "Job Config Changed" #. TRANSLATORS: Job Created -#: locale/ipp-strings.c:2276 +#: locale/ipp-strings.c:2314 msgid "notify-events.job-created" msgstr "Job Created" #. TRANSLATORS: Job Fetchable -#: locale/ipp-strings.c:2278 +#: locale/ipp-strings.c:2316 msgid "notify-events.job-fetchable" msgstr "Job Fetchable" #. TRANSLATORS: Job Progress -#: locale/ipp-strings.c:2280 +#: locale/ipp-strings.c:2318 msgid "notify-events.job-progress" msgstr "Job Progress" #. TRANSLATORS: Job State Changed -#: locale/ipp-strings.c:2282 +#: locale/ipp-strings.c:2320 msgid "notify-events.job-state-changed" msgstr "Job State Changed" #. TRANSLATORS: Job Stopped -#: locale/ipp-strings.c:2284 +#: locale/ipp-strings.c:2322 msgid "notify-events.job-stopped" msgstr "Job Stopped" #. TRANSLATORS: None -#: locale/ipp-strings.c:2286 +#: locale/ipp-strings.c:2324 msgid "notify-events.none" msgstr "None" #. TRANSLATORS: Printer Config Changed -#: locale/ipp-strings.c:2288 +#: locale/ipp-strings.c:2326 msgid "notify-events.printer-config-changed" msgstr "Printer Config Changed" #. TRANSLATORS: Printer Finishings Changed -#: locale/ipp-strings.c:2290 +#: locale/ipp-strings.c:2328 msgid "notify-events.printer-finishings-changed" msgstr "Printer Finishings Changed" #. TRANSLATORS: Printer Media Changed -#: locale/ipp-strings.c:2292 +#: locale/ipp-strings.c:2330 msgid "notify-events.printer-media-changed" msgstr "Printer Media Changed" #. TRANSLATORS: Printer Queue Order Changed -#: locale/ipp-strings.c:2294 +#: locale/ipp-strings.c:2332 msgid "notify-events.printer-queue-order-changed" msgstr "Printer Queue Order Changed" #. TRANSLATORS: Printer Restarted -#: locale/ipp-strings.c:2296 +#: locale/ipp-strings.c:2334 msgid "notify-events.printer-restarted" msgstr "Printer Restarted" #. TRANSLATORS: Printer Shutdown -#: locale/ipp-strings.c:2298 +#: locale/ipp-strings.c:2336 msgid "notify-events.printer-shutdown" msgstr "Printer Shutdown" #. TRANSLATORS: Printer State Changed -#: locale/ipp-strings.c:2300 +#: locale/ipp-strings.c:2338 msgid "notify-events.printer-state-changed" msgstr "Printer State Changed" #. TRANSLATORS: Printer Stopped -#: locale/ipp-strings.c:2302 +#: locale/ipp-strings.c:2340 msgid "notify-events.printer-stopped" msgstr "Printer Stopped" #. TRANSLATORS: Notify Get Interval -#: locale/ipp-strings.c:2304 +#: locale/ipp-strings.c:2342 msgid "notify-get-interval" msgstr "Notify Get Interval" #. TRANSLATORS: Notify Lease Duration -#: locale/ipp-strings.c:2306 +#: locale/ipp-strings.c:2344 msgid "notify-lease-duration" msgstr "Notify Lease Duration" #. TRANSLATORS: Notify Natural Language -#: locale/ipp-strings.c:2308 +#: locale/ipp-strings.c:2346 msgid "notify-natural-language" msgstr "Notify Natural Language" #. TRANSLATORS: Notify Pull Method -#: locale/ipp-strings.c:2310 +#: locale/ipp-strings.c:2348 msgid "notify-pull-method" msgstr "Notify Pull Method" #. TRANSLATORS: Notify Recipient -#: locale/ipp-strings.c:2312 +#: locale/ipp-strings.c:2350 msgid "notify-recipient-uri" msgstr "Notify Recipient" #. TRANSLATORS: Notify Sequence Numbers -#: locale/ipp-strings.c:2314 +#: locale/ipp-strings.c:2352 msgid "notify-sequence-numbers" msgstr "Notify Sequence Numbers" #. TRANSLATORS: Notify Subscription Ids -#: locale/ipp-strings.c:2316 +#: locale/ipp-strings.c:2354 msgid "notify-subscription-ids" msgstr "Notify Subscription Ids" #. TRANSLATORS: Notify Time Interval -#: locale/ipp-strings.c:2318 +#: locale/ipp-strings.c:2356 msgid "notify-time-interval" msgstr "Notify Time Interval" #. TRANSLATORS: Notify User Data -#: locale/ipp-strings.c:2320 +#: locale/ipp-strings.c:2358 msgid "notify-user-data" msgstr "Notify User Data" #. TRANSLATORS: Notify Wait -#: locale/ipp-strings.c:2322 +#: locale/ipp-strings.c:2360 msgid "notify-wait" msgstr "Notify Wait" #. TRANSLATORS: Number Of Retries -#: locale/ipp-strings.c:2324 +#: locale/ipp-strings.c:2362 msgid "number-of-retries" msgstr "Number Of Retries" #. TRANSLATORS: Number-Up -#: locale/ipp-strings.c:2326 +#: locale/ipp-strings.c:2364 msgid "number-up" msgstr "Number-Up" #. TRANSLATORS: Object Offset -#: locale/ipp-strings.c:2328 +#: locale/ipp-strings.c:2366 msgid "object-offset" msgstr "Object Offset" #. TRANSLATORS: Object Size -#: locale/ipp-strings.c:2330 +#: locale/ipp-strings.c:2368 msgid "object-size" msgstr "Object Size" #. TRANSLATORS: Organization Name -#: locale/ipp-strings.c:2332 +#: locale/ipp-strings.c:2370 msgid "organization-name" msgstr "Organization Name" #. TRANSLATORS: Orientation -#: locale/ipp-strings.c:2334 +#: locale/ipp-strings.c:2372 msgid "orientation-requested" msgstr "Orientation" #. TRANSLATORS: Portrait -#: locale/ipp-strings.c:2336 +#: locale/ipp-strings.c:2374 msgid "orientation-requested.3" msgstr "Portrait" #. TRANSLATORS: Landscape -#: locale/ipp-strings.c:2338 +#: locale/ipp-strings.c:2376 msgid "orientation-requested.4" msgstr "Landscape" #. TRANSLATORS: Reverse Landscape -#: locale/ipp-strings.c:2340 +#: locale/ipp-strings.c:2378 msgid "orientation-requested.5" msgstr "Reverse Landscape" #. TRANSLATORS: Reverse Portrait -#: locale/ipp-strings.c:2342 +#: locale/ipp-strings.c:2380 msgid "orientation-requested.6" msgstr "Reverse Portrait" #. TRANSLATORS: None -#: locale/ipp-strings.c:2344 +#: locale/ipp-strings.c:2382 msgid "orientation-requested.7" msgstr "None" #. TRANSLATORS: Scanned Image Options -#: locale/ipp-strings.c:2346 +#: locale/ipp-strings.c:2384 msgid "output-attributes" msgstr "Output Attributes" #. TRANSLATORS: Output Tray -#: locale/ipp-strings.c:2348 +#: locale/ipp-strings.c:2386 msgid "output-bin" msgstr "Output Bin" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2350 +#: locale/ipp-strings.c:2388 msgid "output-bin.auto" msgstr "Automatic" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:2352 +#: locale/ipp-strings.c:2390 msgid "output-bin.bottom" msgstr "Bottom" #. TRANSLATORS: Center -#: locale/ipp-strings.c:2354 +#: locale/ipp-strings.c:2392 msgid "output-bin.center" msgstr "Center" #. TRANSLATORS: Face Down -#: locale/ipp-strings.c:2356 +#: locale/ipp-strings.c:2394 msgid "output-bin.face-down" msgstr "Face Down" #. TRANSLATORS: Face Up -#: locale/ipp-strings.c:2358 +#: locale/ipp-strings.c:2396 msgid "output-bin.face-up" msgstr "Face Up" #. TRANSLATORS: Large Capacity -#: locale/ipp-strings.c:2360 +#: locale/ipp-strings.c:2398 msgid "output-bin.large-capacity" msgstr "Large Capacity" #. TRANSLATORS: Left -#: locale/ipp-strings.c:2362 +#: locale/ipp-strings.c:2400 msgid "output-bin.left" msgstr "Left" #. TRANSLATORS: Mailbox 1 -#: locale/ipp-strings.c:2364 +#: locale/ipp-strings.c:2402 msgid "output-bin.mailbox-1" msgstr "Mailbox 1" #. TRANSLATORS: Mailbox 10 -#: locale/ipp-strings.c:2366 +#: locale/ipp-strings.c:2404 msgid "output-bin.mailbox-10" msgstr "Mailbox 10" #. TRANSLATORS: Mailbox 2 -#: locale/ipp-strings.c:2368 +#: locale/ipp-strings.c:2406 msgid "output-bin.mailbox-2" msgstr "Mailbox 2" #. TRANSLATORS: Mailbox 3 -#: locale/ipp-strings.c:2370 +#: locale/ipp-strings.c:2408 msgid "output-bin.mailbox-3" msgstr "Mailbox 3" #. TRANSLATORS: Mailbox 4 -#: locale/ipp-strings.c:2372 +#: locale/ipp-strings.c:2410 msgid "output-bin.mailbox-4" msgstr "Mailbox 4" #. TRANSLATORS: Mailbox 5 -#: locale/ipp-strings.c:2374 +#: locale/ipp-strings.c:2412 msgid "output-bin.mailbox-5" msgstr "Mailbox 5" #. TRANSLATORS: Mailbox 6 -#: locale/ipp-strings.c:2376 +#: locale/ipp-strings.c:2414 msgid "output-bin.mailbox-6" msgstr "Mailbox 6" #. TRANSLATORS: Mailbox 7 -#: locale/ipp-strings.c:2378 +#: locale/ipp-strings.c:2416 msgid "output-bin.mailbox-7" msgstr "Mailbox 7" #. TRANSLATORS: Mailbox 8 -#: locale/ipp-strings.c:2380 +#: locale/ipp-strings.c:2418 msgid "output-bin.mailbox-8" msgstr "Mailbox 8" #. TRANSLATORS: Mailbox 9 -#: locale/ipp-strings.c:2382 +#: locale/ipp-strings.c:2420 msgid "output-bin.mailbox-9" msgstr "Mailbox 9" #. TRANSLATORS: Middle -#: locale/ipp-strings.c:2384 +#: locale/ipp-strings.c:2422 msgid "output-bin.middle" msgstr "Middle" #. TRANSLATORS: My Mailbox -#: locale/ipp-strings.c:2386 +#: locale/ipp-strings.c:2424 msgid "output-bin.my-mailbox" msgstr "My Mailbox" #. TRANSLATORS: Rear -#: locale/ipp-strings.c:2388 +#: locale/ipp-strings.c:2426 msgid "output-bin.rear" msgstr "Rear" #. TRANSLATORS: Right -#: locale/ipp-strings.c:2390 +#: locale/ipp-strings.c:2428 msgid "output-bin.right" msgstr "Right" #. TRANSLATORS: Side -#: locale/ipp-strings.c:2392 +#: locale/ipp-strings.c:2430 msgid "output-bin.side" msgstr "Side" #. TRANSLATORS: Stacker 1 -#: locale/ipp-strings.c:2394 +#: locale/ipp-strings.c:2432 msgid "output-bin.stacker-1" msgstr "Stacker 1" #. TRANSLATORS: Stacker 10 -#: locale/ipp-strings.c:2396 +#: locale/ipp-strings.c:2434 msgid "output-bin.stacker-10" msgstr "Stacker 10" #. TRANSLATORS: Stacker 2 -#: locale/ipp-strings.c:2398 +#: locale/ipp-strings.c:2436 msgid "output-bin.stacker-2" msgstr "Stacker 2" #. TRANSLATORS: Stacker 3 -#: locale/ipp-strings.c:2400 +#: locale/ipp-strings.c:2438 msgid "output-bin.stacker-3" msgstr "Stacker 3" #. TRANSLATORS: Stacker 4 -#: locale/ipp-strings.c:2402 +#: locale/ipp-strings.c:2440 msgid "output-bin.stacker-4" msgstr "Stacker 4" #. TRANSLATORS: Stacker 5 -#: locale/ipp-strings.c:2404 +#: locale/ipp-strings.c:2442 msgid "output-bin.stacker-5" msgstr "Stacker 5" #. TRANSLATORS: Stacker 6 -#: locale/ipp-strings.c:2406 +#: locale/ipp-strings.c:2444 msgid "output-bin.stacker-6" msgstr "Stacker 6" #. TRANSLATORS: Stacker 7 -#: locale/ipp-strings.c:2408 +#: locale/ipp-strings.c:2446 msgid "output-bin.stacker-7" msgstr "Stacker 7" #. TRANSLATORS: Stacker 8 -#: locale/ipp-strings.c:2410 +#: locale/ipp-strings.c:2448 msgid "output-bin.stacker-8" msgstr "Stacker 8" #. TRANSLATORS: Stacker 9 -#: locale/ipp-strings.c:2412 +#: locale/ipp-strings.c:2450 msgid "output-bin.stacker-9" msgstr "Stacker 9" #. TRANSLATORS: Top -#: locale/ipp-strings.c:2414 +#: locale/ipp-strings.c:2452 msgid "output-bin.top" msgstr "Top" #. TRANSLATORS: Tray 1 -#: locale/ipp-strings.c:2416 +#: locale/ipp-strings.c:2454 msgid "output-bin.tray-1" msgstr "Tray 1" #. TRANSLATORS: Tray 10 -#: locale/ipp-strings.c:2418 +#: locale/ipp-strings.c:2456 msgid "output-bin.tray-10" msgstr "Tray 10" #. TRANSLATORS: Tray 2 -#: locale/ipp-strings.c:2420 +#: locale/ipp-strings.c:2458 msgid "output-bin.tray-2" msgstr "Tray 2" #. TRANSLATORS: Tray 3 -#: locale/ipp-strings.c:2422 +#: locale/ipp-strings.c:2460 msgid "output-bin.tray-3" msgstr "Tray 3" #. TRANSLATORS: Tray 4 -#: locale/ipp-strings.c:2424 +#: locale/ipp-strings.c:2462 msgid "output-bin.tray-4" msgstr "Tray 4" #. TRANSLATORS: Tray 5 -#: locale/ipp-strings.c:2426 +#: locale/ipp-strings.c:2464 msgid "output-bin.tray-5" msgstr "Tray 5" #. TRANSLATORS: Tray 6 -#: locale/ipp-strings.c:2428 +#: locale/ipp-strings.c:2466 msgid "output-bin.tray-6" msgstr "Tray 6" #. TRANSLATORS: Tray 7 -#: locale/ipp-strings.c:2430 +#: locale/ipp-strings.c:2468 msgid "output-bin.tray-7" msgstr "Tray 7" #. TRANSLATORS: Tray 8 -#: locale/ipp-strings.c:2432 +#: locale/ipp-strings.c:2470 msgid "output-bin.tray-8" msgstr "Tray 8" #. TRANSLATORS: Tray 9 -#: locale/ipp-strings.c:2434 +#: locale/ipp-strings.c:2472 msgid "output-bin.tray-9" msgstr "Tray 9" #. TRANSLATORS: Scanned Image Quality -#: locale/ipp-strings.c:2436 +#: locale/ipp-strings.c:2474 msgid "output-compression-quality-factor" msgstr "Scanned Image Quality" #. TRANSLATORS: Page Delivery -#: locale/ipp-strings.c:2438 +#: locale/ipp-strings.c:2476 msgid "page-delivery" msgstr "Page Delivery" #. TRANSLATORS: Reverse Order Face-down -#: locale/ipp-strings.c:2440 +#: locale/ipp-strings.c:2478 msgid "page-delivery.reverse-order-face-down" msgstr "Reverse Order Face Down" #. TRANSLATORS: Reverse Order Face-up -#: locale/ipp-strings.c:2442 +#: locale/ipp-strings.c:2480 msgid "page-delivery.reverse-order-face-up" msgstr "Reverse Order Face Up" #. TRANSLATORS: Same Order Face-down -#: locale/ipp-strings.c:2444 +#: locale/ipp-strings.c:2482 msgid "page-delivery.same-order-face-down" msgstr "Same Order Face Down" #. TRANSLATORS: Same Order Face-up -#: locale/ipp-strings.c:2446 +#: locale/ipp-strings.c:2484 msgid "page-delivery.same-order-face-up" msgstr "Same Order Face Up" #. TRANSLATORS: System Specified -#: locale/ipp-strings.c:2448 +#: locale/ipp-strings.c:2486 msgid "page-delivery.system-specified" msgstr "System Specified" #. TRANSLATORS: Page Order Received -#: locale/ipp-strings.c:2450 +#: locale/ipp-strings.c:2488 msgid "page-order-received" msgstr "Page Order Received" #. TRANSLATORS: 1 To N -#: locale/ipp-strings.c:2452 +#: locale/ipp-strings.c:2490 msgid "page-order-received.1-to-n-order" msgstr "1 To N Order" #. TRANSLATORS: N To 1 -#: locale/ipp-strings.c:2454 +#: locale/ipp-strings.c:2492 msgid "page-order-received.n-to-1-order" msgstr "N To 1 Order" #. TRANSLATORS: Page Ranges -#: locale/ipp-strings.c:2456 +#: locale/ipp-strings.c:2494 msgid "page-ranges" msgstr "Page Ranges" #. TRANSLATORS: Pages -#: locale/ipp-strings.c:2458 +#: locale/ipp-strings.c:2496 msgid "pages" msgstr "Pages" #. TRANSLATORS: Pages Per Subset -#: locale/ipp-strings.c:2460 +#: locale/ipp-strings.c:2498 msgid "pages-per-subset" msgstr "Pages Per Subset" #. TRANSLATORS: Platform Shape -#: locale/ipp-strings.c:2472 +#: locale/ipp-strings.c:2510 msgid "platform-shape" msgstr "Platform Shape" #. TRANSLATORS: Round -#: locale/ipp-strings.c:2474 +#: locale/ipp-strings.c:2512 msgid "platform-shape.ellipse" msgstr "Round" #. TRANSLATORS: Rectangle -#: locale/ipp-strings.c:2476 +#: locale/ipp-strings.c:2514 msgid "platform-shape.rectangle" msgstr "Rectangle" #. TRANSLATORS: Platform Temperature -#: locale/ipp-strings.c:2478 +#: locale/ipp-strings.c:2516 msgid "platform-temperature" msgstr "Platform Temperature" #. TRANSLATORS: Post-dial String -#: locale/ipp-strings.c:2480 +#: locale/ipp-strings.c:2518 msgid "post-dial-string" msgstr "Post-dial String" #. TRANSLATORS: Pre-dial String -#: locale/ipp-strings.c:2482 +#: locale/ipp-strings.c:2520 msgid "pre-dial-string" msgstr "Pre-dial String" #. TRANSLATORS: Number-Up Layout -#: locale/ipp-strings.c:2484 +#: locale/ipp-strings.c:2522 msgid "presentation-direction-number-up" msgstr "Number-Up Layout" #. TRANSLATORS: Top-bottom, Right-left -#: locale/ipp-strings.c:2486 +#: locale/ipp-strings.c:2524 msgid "presentation-direction-number-up.tobottom-toleft" msgstr "Top-Bottom, Right-Left" #. TRANSLATORS: Top-bottom, Left-right -#: locale/ipp-strings.c:2488 +#: locale/ipp-strings.c:2526 msgid "presentation-direction-number-up.tobottom-toright" msgstr "Top-Bottom, Left-Right" #. TRANSLATORS: Right-left, Top-bottom -#: locale/ipp-strings.c:2490 +#: locale/ipp-strings.c:2528 msgid "presentation-direction-number-up.toleft-tobottom" msgstr "Right-Left, Top-Bottom" #. TRANSLATORS: Right-left, Bottom-top -#: locale/ipp-strings.c:2492 +#: locale/ipp-strings.c:2530 msgid "presentation-direction-number-up.toleft-totop" msgstr "Right-Left, Bottom-Top" #. TRANSLATORS: Left-right, Top-bottom -#: locale/ipp-strings.c:2494 +#: locale/ipp-strings.c:2532 msgid "presentation-direction-number-up.toright-tobottom" msgstr "Left-Right, Top-Bottom" #. TRANSLATORS: Left-right, Bottom-top -#: locale/ipp-strings.c:2496 +#: locale/ipp-strings.c:2534 msgid "presentation-direction-number-up.toright-totop" msgstr "Left-Right, Bottom-Top" #. TRANSLATORS: Bottom-top, Right-left -#: locale/ipp-strings.c:2498 +#: locale/ipp-strings.c:2536 msgid "presentation-direction-number-up.totop-toleft" msgstr "Bottom-Top, Right-Left" #. TRANSLATORS: Bottom-top, Left-right -#: locale/ipp-strings.c:2500 +#: locale/ipp-strings.c:2538 msgid "presentation-direction-number-up.totop-toright" msgstr "Bottom-Top, Left-Right" #. TRANSLATORS: Print Accuracy -#: locale/ipp-strings.c:2502 +#: locale/ipp-strings.c:2540 msgid "print-accuracy" msgstr "Print Accuracy" #. TRANSLATORS: Print Base -#: locale/ipp-strings.c:2504 +#: locale/ipp-strings.c:2542 msgid "print-base" msgstr "Print Base" #. TRANSLATORS: Brim -#: locale/ipp-strings.c:2508 +#: locale/ipp-strings.c:2546 msgid "print-base.brim" msgstr "Brim" #. TRANSLATORS: None -#: locale/ipp-strings.c:2510 +#: locale/ipp-strings.c:2548 msgid "print-base.none" msgstr "None" #. TRANSLATORS: Raft -#: locale/ipp-strings.c:2512 +#: locale/ipp-strings.c:2550 msgid "print-base.raft" msgstr "Raft" #. TRANSLATORS: Skirt -#: locale/ipp-strings.c:2514 +#: locale/ipp-strings.c:2552 msgid "print-base.skirt" msgstr "Skirt" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:2516 +#: locale/ipp-strings.c:2554 msgid "print-base.standard" msgstr "Standard" #. TRANSLATORS: Print Color Mode -#: locale/ipp-strings.c:2518 +#: locale/ipp-strings.c:2556 msgid "print-color-mode" msgstr "Print Color Mode" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2520 +#: locale/ipp-strings.c:2558 msgid "print-color-mode.auto" msgstr "Automatic" #. TRANSLATORS: Text -#: locale/ipp-strings.c:2524 +#: locale/ipp-strings.c:2562 msgid "print-color-mode.bi-level" msgstr "Bi-Level" #. TRANSLATORS: Color -#: locale/ipp-strings.c:2526 +#: locale/ipp-strings.c:2564 msgid "print-color-mode.color" msgstr "Color" #. TRANSLATORS: Highlight -#: locale/ipp-strings.c:2528 +#: locale/ipp-strings.c:2566 msgid "print-color-mode.highlight" msgstr "Highlight" #. TRANSLATORS: Monochrome -#: locale/ipp-strings.c:2530 +#: locale/ipp-strings.c:2568 msgid "print-color-mode.monochrome" msgstr "Monochrome" #. TRANSLATORS: Process Text -#: locale/ipp-strings.c:2532 +#: locale/ipp-strings.c:2570 msgid "print-color-mode.process-bi-level" msgstr "Process Bi-Level" #. TRANSLATORS: Process Monochrome -#: locale/ipp-strings.c:2534 +#: locale/ipp-strings.c:2572 msgid "print-color-mode.process-monochrome" msgstr "Process Monochrome" #. TRANSLATORS: Print Optimization -#: locale/ipp-strings.c:2536 +#: locale/ipp-strings.c:2574 msgid "print-content-optimize" msgstr "Print Optimization" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2540 +#: locale/ipp-strings.c:2578 msgid "print-content-optimize.auto" msgstr "Automatic" #. TRANSLATORS: Graphics -#: locale/ipp-strings.c:2542 +#: locale/ipp-strings.c:2580 msgid "print-content-optimize.graphic" msgstr "Graphics" #. TRANSLATORS: Photo -#: locale/ipp-strings.c:2546 +#: locale/ipp-strings.c:2584 msgid "print-content-optimize.photo" msgstr "Photo" #. TRANSLATORS: Text -#: locale/ipp-strings.c:2548 +#: locale/ipp-strings.c:2586 msgid "print-content-optimize.text" msgstr "Text" #. TRANSLATORS: Text and Graphics -#: locale/ipp-strings.c:2550 +#: locale/ipp-strings.c:2588 msgid "print-content-optimize.text-and-graphic" msgstr "Text And Graphics" #. TRANSLATORS: Print Objects -#: locale/ipp-strings.c:2554 +#: locale/ipp-strings.c:2592 msgid "print-objects" msgstr "Print Objects" #. TRANSLATORS: Print Quality -#: locale/ipp-strings.c:2556 +#: locale/ipp-strings.c:2594 msgid "print-quality" msgstr "Print Quality" #. TRANSLATORS: Draft -#: locale/ipp-strings.c:2558 +#: locale/ipp-strings.c:2596 msgid "print-quality.3" msgstr "Draft" #. TRANSLATORS: Normal -#: locale/ipp-strings.c:2560 +#: locale/ipp-strings.c:2598 msgid "print-quality.4" msgstr "Normal" #. TRANSLATORS: High -#: locale/ipp-strings.c:2562 +#: locale/ipp-strings.c:2600 msgid "print-quality.5" msgstr "High" #. TRANSLATORS: Print Rendering Intent -#: locale/ipp-strings.c:2564 +#: locale/ipp-strings.c:2602 msgid "print-rendering-intent" msgstr "Print Rendering Intent" #. TRANSLATORS: Absolute -#: locale/ipp-strings.c:2566 +#: locale/ipp-strings.c:2604 msgid "print-rendering-intent.absolute" msgstr "Absolute" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2568 +#: locale/ipp-strings.c:2606 msgid "print-rendering-intent.auto" msgstr "Automatic" #. TRANSLATORS: Perceptual -#: locale/ipp-strings.c:2570 +#: locale/ipp-strings.c:2608 msgid "print-rendering-intent.perceptual" msgstr "Perceptual" #. TRANSLATORS: Relative -#: locale/ipp-strings.c:2572 +#: locale/ipp-strings.c:2610 msgid "print-rendering-intent.relative" msgstr "Relative" #. TRANSLATORS: Relative w/Black Point Compensation -#: locale/ipp-strings.c:2574 +#: locale/ipp-strings.c:2612 msgid "print-rendering-intent.relative-bpc" msgstr "Relative w/Black Point Compensation" #. TRANSLATORS: Saturation -#: locale/ipp-strings.c:2576 +#: locale/ipp-strings.c:2614 msgid "print-rendering-intent.saturation" msgstr "Saturation" #. TRANSLATORS: Print Scaling -#: locale/ipp-strings.c:2578 +#: locale/ipp-strings.c:2616 msgid "print-scaling" msgstr "Print Scaling" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2580 +#: locale/ipp-strings.c:2618 msgid "print-scaling.auto" msgstr "Automatic" #. TRANSLATORS: Auto-fit -#: locale/ipp-strings.c:2582 +#: locale/ipp-strings.c:2620 msgid "print-scaling.auto-fit" msgstr "Auto Fit" #. TRANSLATORS: Fill -#: locale/ipp-strings.c:2584 +#: locale/ipp-strings.c:2622 msgid "print-scaling.fill" msgstr "Fill" #. TRANSLATORS: Fit -#: locale/ipp-strings.c:2586 +#: locale/ipp-strings.c:2624 msgid "print-scaling.fit" msgstr "Fit" #. TRANSLATORS: None -#: locale/ipp-strings.c:2588 +#: locale/ipp-strings.c:2626 msgid "print-scaling.none" msgstr "None" #. TRANSLATORS: Print Supports -#: locale/ipp-strings.c:2590 +#: locale/ipp-strings.c:2628 msgid "print-supports" msgstr "Print Supports" #. TRANSLATORS: With Specified Material -#: locale/ipp-strings.c:2594 +#: locale/ipp-strings.c:2632 msgid "print-supports.material" msgstr "Material" #. TRANSLATORS: None -#: locale/ipp-strings.c:2596 +#: locale/ipp-strings.c:2634 msgid "print-supports.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:2598 +#: locale/ipp-strings.c:2636 msgid "print-supports.standard" msgstr "Standard" #. TRANSLATORS: Message From Operator -#: locale/ipp-strings.c:2620 +#: locale/ipp-strings.c:2658 msgid "printer-message-from-operator" msgstr "Printer Message From Operator" #. TRANSLATORS: Print Resolution -#: locale/ipp-strings.c:2622 +#: locale/ipp-strings.c:2660 msgid "printer-resolution" msgstr "Printer Resolution" #. TRANSLATORS: Printer State -#: locale/ipp-strings.c:2624 +#: locale/ipp-strings.c:2662 msgid "printer-state" msgstr "Printer State" #. TRANSLATORS: Detailed Printer State -#: locale/ipp-strings.c:2626 +#: locale/ipp-strings.c:2664 msgid "printer-state-reasons" msgstr "Detailed Printer State" #. TRANSLATORS: Old Alerts Have Been Removed -#: locale/ipp-strings.c:2628 +#: locale/ipp-strings.c:2666 msgid "printer-state-reasons.alert-removal-of-binary-change-entry" msgstr "Alert Removal Of Binary Change Entry" #. TRANSLATORS: Bander Added -#: locale/ipp-strings.c:2630 +#: locale/ipp-strings.c:2668 msgid "printer-state-reasons.bander-added" msgstr "Bander Added" #. TRANSLATORS: Bander Almost Empty -#: locale/ipp-strings.c:2632 +#: locale/ipp-strings.c:2670 msgid "printer-state-reasons.bander-almost-empty" msgstr "Bander Almost Empty" #. TRANSLATORS: Bander Almost Full -#: locale/ipp-strings.c:2634 +#: locale/ipp-strings.c:2672 msgid "printer-state-reasons.bander-almost-full" msgstr "Bander Almost Full" #. TRANSLATORS: Bander At Limit -#: locale/ipp-strings.c:2636 +#: locale/ipp-strings.c:2674 msgid "printer-state-reasons.bander-at-limit" msgstr "Bander At Limit" #. TRANSLATORS: Bander Closed -#: locale/ipp-strings.c:2638 +#: locale/ipp-strings.c:2676 msgid "printer-state-reasons.bander-closed" msgstr "Bander Closed" #. TRANSLATORS: Bander Configuration Change -#: locale/ipp-strings.c:2640 +#: locale/ipp-strings.c:2678 msgid "printer-state-reasons.bander-configuration-change" msgstr "Bander Configuration Change" #. TRANSLATORS: Bander Cover Closed -#: locale/ipp-strings.c:2642 +#: locale/ipp-strings.c:2680 msgid "printer-state-reasons.bander-cover-closed" msgstr "Bander Cover Closed" #. TRANSLATORS: Bander Cover Open -#: locale/ipp-strings.c:2644 +#: locale/ipp-strings.c:2682 msgid "printer-state-reasons.bander-cover-open" msgstr "Bander Cover Open" #. TRANSLATORS: Bander Empty -#: locale/ipp-strings.c:2646 +#: locale/ipp-strings.c:2684 msgid "printer-state-reasons.bander-empty" msgstr "Bander Empty" #. TRANSLATORS: Bander Full -#: locale/ipp-strings.c:2648 +#: locale/ipp-strings.c:2686 msgid "printer-state-reasons.bander-full" msgstr "Bander Full" #. TRANSLATORS: Bander Interlock Closed -#: locale/ipp-strings.c:2650 +#: locale/ipp-strings.c:2688 msgid "printer-state-reasons.bander-interlock-closed" msgstr "Bander Interlock Closed" #. TRANSLATORS: Bander Interlock Open -#: locale/ipp-strings.c:2652 +#: locale/ipp-strings.c:2690 msgid "printer-state-reasons.bander-interlock-open" msgstr "Bander Interlock Open" #. TRANSLATORS: Bander Jam -#: locale/ipp-strings.c:2654 +#: locale/ipp-strings.c:2692 msgid "printer-state-reasons.bander-jam" msgstr "Bander Jam" #. TRANSLATORS: Bander Life Almost Over -#: locale/ipp-strings.c:2656 +#: locale/ipp-strings.c:2694 msgid "printer-state-reasons.bander-life-almost-over" msgstr "Bander Life Almost Over" #. TRANSLATORS: Bander Life Over -#: locale/ipp-strings.c:2658 +#: locale/ipp-strings.c:2696 msgid "printer-state-reasons.bander-life-over" msgstr "Bander Life Over" #. TRANSLATORS: Bander Memory Exhausted -#: locale/ipp-strings.c:2660 +#: locale/ipp-strings.c:2698 msgid "printer-state-reasons.bander-memory-exhausted" msgstr "Bander Memory Exhausted" #. TRANSLATORS: Bander Missing -#: locale/ipp-strings.c:2662 +#: locale/ipp-strings.c:2700 msgid "printer-state-reasons.bander-missing" msgstr "Bander Missing" #. TRANSLATORS: Bander Motor Failure -#: locale/ipp-strings.c:2664 +#: locale/ipp-strings.c:2702 msgid "printer-state-reasons.bander-motor-failure" msgstr "Bander Motor Failure" #. TRANSLATORS: Bander Near Limit -#: locale/ipp-strings.c:2666 +#: locale/ipp-strings.c:2704 msgid "printer-state-reasons.bander-near-limit" msgstr "Bander Near Limit" #. TRANSLATORS: Bander Offline -#: locale/ipp-strings.c:2668 +#: locale/ipp-strings.c:2706 msgid "printer-state-reasons.bander-offline" msgstr "Bander Offline" #. TRANSLATORS: Bander Opened -#: locale/ipp-strings.c:2670 +#: locale/ipp-strings.c:2708 msgid "printer-state-reasons.bander-opened" msgstr "Bander Opened" #. TRANSLATORS: Bander Over Temperature -#: locale/ipp-strings.c:2672 +#: locale/ipp-strings.c:2710 msgid "printer-state-reasons.bander-over-temperature" msgstr "Bander Over Temperature" #. TRANSLATORS: Bander Power Saver -#: locale/ipp-strings.c:2674 +#: locale/ipp-strings.c:2712 msgid "printer-state-reasons.bander-power-saver" msgstr "Bander Power Saver" #. TRANSLATORS: Bander Recoverable Failure -#: locale/ipp-strings.c:2676 +#: locale/ipp-strings.c:2714 msgid "printer-state-reasons.bander-recoverable-failure" msgstr "Bander Recoverable Failure" #. TRANSLATORS: Bander Recoverable Storage -#: locale/ipp-strings.c:2678 +#: locale/ipp-strings.c:2716 msgid "printer-state-reasons.bander-recoverable-storage" msgstr "Bander Recoverable Storage" #. TRANSLATORS: Bander Removed -#: locale/ipp-strings.c:2680 +#: locale/ipp-strings.c:2718 msgid "printer-state-reasons.bander-removed" msgstr "Bander Removed" #. TRANSLATORS: Bander Resource Added -#: locale/ipp-strings.c:2682 +#: locale/ipp-strings.c:2720 msgid "printer-state-reasons.bander-resource-added" msgstr "Bander Resource Added" #. TRANSLATORS: Bander Resource Removed -#: locale/ipp-strings.c:2684 +#: locale/ipp-strings.c:2722 msgid "printer-state-reasons.bander-resource-removed" msgstr "Bander Resource Removed" #. TRANSLATORS: Bander Thermistor Failure -#: locale/ipp-strings.c:2686 +#: locale/ipp-strings.c:2724 msgid "printer-state-reasons.bander-thermistor-failure" msgstr "Bander Thermistor Failure" #. TRANSLATORS: Bander Timing Failure -#: locale/ipp-strings.c:2688 +#: locale/ipp-strings.c:2726 msgid "printer-state-reasons.bander-timing-failure" msgstr "Bander Timing Failure" #. TRANSLATORS: Bander Turned Off -#: locale/ipp-strings.c:2690 +#: locale/ipp-strings.c:2728 msgid "printer-state-reasons.bander-turned-off" msgstr "Bander Turned Off" #. TRANSLATORS: Bander Turned On -#: locale/ipp-strings.c:2692 +#: locale/ipp-strings.c:2730 msgid "printer-state-reasons.bander-turned-on" msgstr "Bander Turned On" #. TRANSLATORS: Bander Under Temperature -#: locale/ipp-strings.c:2694 +#: locale/ipp-strings.c:2732 msgid "printer-state-reasons.bander-under-temperature" msgstr "Bander Under Temperature" #. TRANSLATORS: Bander Unrecoverable Failure -#: locale/ipp-strings.c:2696 +#: locale/ipp-strings.c:2734 msgid "printer-state-reasons.bander-unrecoverable-failure" msgstr "Bander Unrecoverable Failure" #. TRANSLATORS: Bander Unrecoverable Storage Error -#: locale/ipp-strings.c:2698 +#: locale/ipp-strings.c:2736 msgid "printer-state-reasons.bander-unrecoverable-storage-error" msgstr "Bander Unrecoverable Storage Error" #. TRANSLATORS: Bander Warming Up -#: locale/ipp-strings.c:2700 +#: locale/ipp-strings.c:2738 msgid "printer-state-reasons.bander-warming-up" msgstr "Bander Warming Up" #. TRANSLATORS: Binder Added -#: locale/ipp-strings.c:2702 +#: locale/ipp-strings.c:2740 msgid "printer-state-reasons.binder-added" msgstr "Binder Added" #. TRANSLATORS: Binder Almost Empty -#: locale/ipp-strings.c:2704 +#: locale/ipp-strings.c:2742 msgid "printer-state-reasons.binder-almost-empty" msgstr "Binder Almost Empty" #. TRANSLATORS: Binder Almost Full -#: locale/ipp-strings.c:2706 +#: locale/ipp-strings.c:2744 msgid "printer-state-reasons.binder-almost-full" msgstr "Binder Almost Full" #. TRANSLATORS: Binder At Limit -#: locale/ipp-strings.c:2708 +#: locale/ipp-strings.c:2746 msgid "printer-state-reasons.binder-at-limit" msgstr "Binder At Limit" #. TRANSLATORS: Binder Closed -#: locale/ipp-strings.c:2710 +#: locale/ipp-strings.c:2748 msgid "printer-state-reasons.binder-closed" msgstr "Binder Closed" #. TRANSLATORS: Binder Configuration Change -#: locale/ipp-strings.c:2712 +#: locale/ipp-strings.c:2750 msgid "printer-state-reasons.binder-configuration-change" msgstr "Binder Configuration Change" #. TRANSLATORS: Binder Cover Closed -#: locale/ipp-strings.c:2714 +#: locale/ipp-strings.c:2752 msgid "printer-state-reasons.binder-cover-closed" msgstr "Binder Cover Closed" #. TRANSLATORS: Binder Cover Open -#: locale/ipp-strings.c:2716 +#: locale/ipp-strings.c:2754 msgid "printer-state-reasons.binder-cover-open" msgstr "Binder Cover Open" #. TRANSLATORS: Binder Empty -#: locale/ipp-strings.c:2718 +#: locale/ipp-strings.c:2756 msgid "printer-state-reasons.binder-empty" msgstr "Binder Empty" #. TRANSLATORS: Binder Full -#: locale/ipp-strings.c:2720 +#: locale/ipp-strings.c:2758 msgid "printer-state-reasons.binder-full" msgstr "Binder Full" #. TRANSLATORS: Binder Interlock Closed -#: locale/ipp-strings.c:2722 +#: locale/ipp-strings.c:2760 msgid "printer-state-reasons.binder-interlock-closed" msgstr "Binder Interlock Closed" #. TRANSLATORS: Binder Interlock Open -#: locale/ipp-strings.c:2724 +#: locale/ipp-strings.c:2762 msgid "printer-state-reasons.binder-interlock-open" msgstr "Binder Interlock Open" #. TRANSLATORS: Binder Jam -#: locale/ipp-strings.c:2726 +#: locale/ipp-strings.c:2764 msgid "printer-state-reasons.binder-jam" msgstr "Binder Jam" #. TRANSLATORS: Binder Life Almost Over -#: locale/ipp-strings.c:2728 +#: locale/ipp-strings.c:2766 msgid "printer-state-reasons.binder-life-almost-over" msgstr "Binder Life Almost Over" #. TRANSLATORS: Binder Life Over -#: locale/ipp-strings.c:2730 +#: locale/ipp-strings.c:2768 msgid "printer-state-reasons.binder-life-over" msgstr "Binder Life Over" #. TRANSLATORS: Binder Memory Exhausted -#: locale/ipp-strings.c:2732 +#: locale/ipp-strings.c:2770 msgid "printer-state-reasons.binder-memory-exhausted" msgstr "Binder Memory Exhausted" #. TRANSLATORS: Binder Missing -#: locale/ipp-strings.c:2734 +#: locale/ipp-strings.c:2772 msgid "printer-state-reasons.binder-missing" msgstr "Binder Missing" #. TRANSLATORS: Binder Motor Failure -#: locale/ipp-strings.c:2736 +#: locale/ipp-strings.c:2774 msgid "printer-state-reasons.binder-motor-failure" msgstr "Binder Motor Failure" #. TRANSLATORS: Binder Near Limit -#: locale/ipp-strings.c:2738 +#: locale/ipp-strings.c:2776 msgid "printer-state-reasons.binder-near-limit" msgstr "Binder Near Limit" #. TRANSLATORS: Binder Offline -#: locale/ipp-strings.c:2740 +#: locale/ipp-strings.c:2778 msgid "printer-state-reasons.binder-offline" msgstr "Binder Offline" #. TRANSLATORS: Binder Opened -#: locale/ipp-strings.c:2742 +#: locale/ipp-strings.c:2780 msgid "printer-state-reasons.binder-opened" msgstr "Binder Opened" #. TRANSLATORS: Binder Over Temperature -#: locale/ipp-strings.c:2744 +#: locale/ipp-strings.c:2782 msgid "printer-state-reasons.binder-over-temperature" msgstr "Binder Over Temperature" #. TRANSLATORS: Binder Power Saver -#: locale/ipp-strings.c:2746 +#: locale/ipp-strings.c:2784 msgid "printer-state-reasons.binder-power-saver" msgstr "Binder Power Saver" #. TRANSLATORS: Binder Recoverable Failure -#: locale/ipp-strings.c:2748 +#: locale/ipp-strings.c:2786 msgid "printer-state-reasons.binder-recoverable-failure" msgstr "Binder Recoverable Failure" #. TRANSLATORS: Binder Recoverable Storage -#: locale/ipp-strings.c:2750 +#: locale/ipp-strings.c:2788 msgid "printer-state-reasons.binder-recoverable-storage" msgstr "Binder Recoverable Storage" #. TRANSLATORS: Binder Removed -#: locale/ipp-strings.c:2752 +#: locale/ipp-strings.c:2790 msgid "printer-state-reasons.binder-removed" msgstr "Binder Removed" #. TRANSLATORS: Binder Resource Added -#: locale/ipp-strings.c:2754 +#: locale/ipp-strings.c:2792 msgid "printer-state-reasons.binder-resource-added" msgstr "Binder Resource Added" #. TRANSLATORS: Binder Resource Removed -#: locale/ipp-strings.c:2756 +#: locale/ipp-strings.c:2794 msgid "printer-state-reasons.binder-resource-removed" msgstr "Binder Resource Removed" #. TRANSLATORS: Binder Thermistor Failure -#: locale/ipp-strings.c:2758 +#: locale/ipp-strings.c:2796 msgid "printer-state-reasons.binder-thermistor-failure" msgstr "Binder Thermistor Failure" #. TRANSLATORS: Binder Timing Failure -#: locale/ipp-strings.c:2760 +#: locale/ipp-strings.c:2798 msgid "printer-state-reasons.binder-timing-failure" msgstr "Binder Timing Failure" #. TRANSLATORS: Binder Turned Off -#: locale/ipp-strings.c:2762 +#: locale/ipp-strings.c:2800 msgid "printer-state-reasons.binder-turned-off" msgstr "Binder Turned Off" #. TRANSLATORS: Binder Turned On -#: locale/ipp-strings.c:2764 +#: locale/ipp-strings.c:2802 msgid "printer-state-reasons.binder-turned-on" msgstr "Binder Turned On" #. TRANSLATORS: Binder Under Temperature -#: locale/ipp-strings.c:2766 +#: locale/ipp-strings.c:2804 msgid "printer-state-reasons.binder-under-temperature" msgstr "Binder Under Temperature" #. TRANSLATORS: Binder Unrecoverable Failure -#: locale/ipp-strings.c:2768 +#: locale/ipp-strings.c:2806 msgid "printer-state-reasons.binder-unrecoverable-failure" msgstr "Binder Unrecoverable Failure" #. TRANSLATORS: Binder Unrecoverable Storage Error -#: locale/ipp-strings.c:2770 +#: locale/ipp-strings.c:2808 msgid "printer-state-reasons.binder-unrecoverable-storage-error" msgstr "Binder Unrecoverable Storage Error" #. TRANSLATORS: Binder Warming Up -#: locale/ipp-strings.c:2772 +#: locale/ipp-strings.c:2810 msgid "printer-state-reasons.binder-warming-up" msgstr "Binder Warming Up" #. TRANSLATORS: Camera Failure -#: locale/ipp-strings.c:2774 +#: locale/ipp-strings.c:2812 msgid "printer-state-reasons.camera-failure" msgstr "Camera Failure" #. TRANSLATORS: Chamber Cooling -#: locale/ipp-strings.c:2776 +#: locale/ipp-strings.c:2814 msgid "printer-state-reasons.chamber-cooling" msgstr "Chamber Cooling" #. TRANSLATORS: Chamber Heating -#: locale/ipp-strings.c:2780 +#: locale/ipp-strings.c:2818 msgid "printer-state-reasons.chamber-heating" msgstr "Chamber Heating" #. TRANSLATORS: Chamber Temperature High -#: locale/ipp-strings.c:2782 +#: locale/ipp-strings.c:2820 msgid "printer-state-reasons.chamber-temperature-high" msgstr "Chamber Temperature High" #. TRANSLATORS: Chamber Temperature Low -#: locale/ipp-strings.c:2784 +#: locale/ipp-strings.c:2822 msgid "printer-state-reasons.chamber-temperature-low" msgstr "Chamber Temperature Low" #. TRANSLATORS: Cleaner Life Almost Over -#: locale/ipp-strings.c:2786 +#: locale/ipp-strings.c:2824 msgid "printer-state-reasons.cleaner-life-almost-over" msgstr "Cleaner Life Almost Over" #. TRANSLATORS: Cleaner Life Over -#: locale/ipp-strings.c:2788 +#: locale/ipp-strings.c:2826 msgid "printer-state-reasons.cleaner-life-over" msgstr "Cleaner Life Over" #. TRANSLATORS: Configuration Change -#: locale/ipp-strings.c:2790 +#: locale/ipp-strings.c:2828 msgid "printer-state-reasons.configuration-change" msgstr "Configuration Change" #. TRANSLATORS: Connecting To Device -#: locale/ipp-strings.c:2792 +#: locale/ipp-strings.c:2830 msgid "printer-state-reasons.connecting-to-device" msgstr "Connecting To Device" #. TRANSLATORS: Cover Open -#: locale/ipp-strings.c:2794 +#: locale/ipp-strings.c:2832 msgid "printer-state-reasons.cover-open" msgstr "Cover Open" #. TRANSLATORS: Deactivated -#: locale/ipp-strings.c:2796 +#: locale/ipp-strings.c:2834 msgid "printer-state-reasons.deactivated" msgstr "Deactivated" #. TRANSLATORS: Developer Empty -#: locale/ipp-strings.c:2798 +#: locale/ipp-strings.c:2836 msgid "printer-state-reasons.developer-empty" msgstr "Developer Empty" #. TRANSLATORS: Developer Low -#: locale/ipp-strings.c:2800 +#: locale/ipp-strings.c:2838 msgid "printer-state-reasons.developer-low" msgstr "Developer Low" #. TRANSLATORS: Die Cutter Added -#: locale/ipp-strings.c:2802 +#: locale/ipp-strings.c:2840 msgid "printer-state-reasons.die-cutter-added" msgstr "Die Cutter Added" #. TRANSLATORS: Die Cutter Almost Empty -#: locale/ipp-strings.c:2804 +#: locale/ipp-strings.c:2842 msgid "printer-state-reasons.die-cutter-almost-empty" msgstr "Die Cutter Almost Empty" #. TRANSLATORS: Die Cutter Almost Full -#: locale/ipp-strings.c:2806 +#: locale/ipp-strings.c:2844 msgid "printer-state-reasons.die-cutter-almost-full" msgstr "Die Cutter Almost Full" #. TRANSLATORS: Die Cutter At Limit -#: locale/ipp-strings.c:2808 +#: locale/ipp-strings.c:2846 msgid "printer-state-reasons.die-cutter-at-limit" msgstr "Die Cutter At Limit" #. TRANSLATORS: Die Cutter Closed -#: locale/ipp-strings.c:2810 +#: locale/ipp-strings.c:2848 msgid "printer-state-reasons.die-cutter-closed" msgstr "Die Cutter Closed" #. TRANSLATORS: Die Cutter Configuration Change -#: locale/ipp-strings.c:2812 +#: locale/ipp-strings.c:2850 msgid "printer-state-reasons.die-cutter-configuration-change" msgstr "Die Cutter Configuration Change" #. TRANSLATORS: Die Cutter Cover Closed -#: locale/ipp-strings.c:2814 +#: locale/ipp-strings.c:2852 msgid "printer-state-reasons.die-cutter-cover-closed" msgstr "Die Cutter Cover Closed" #. TRANSLATORS: Die Cutter Cover Open -#: locale/ipp-strings.c:2816 +#: locale/ipp-strings.c:2854 msgid "printer-state-reasons.die-cutter-cover-open" msgstr "Die Cutter Cover Open" #. TRANSLATORS: Die Cutter Empty -#: locale/ipp-strings.c:2818 +#: locale/ipp-strings.c:2856 msgid "printer-state-reasons.die-cutter-empty" msgstr "Die Cutter Empty" #. TRANSLATORS: Die Cutter Full -#: locale/ipp-strings.c:2820 +#: locale/ipp-strings.c:2858 msgid "printer-state-reasons.die-cutter-full" msgstr "Die Cutter Full" #. TRANSLATORS: Die Cutter Interlock Closed -#: locale/ipp-strings.c:2822 +#: locale/ipp-strings.c:2860 msgid "printer-state-reasons.die-cutter-interlock-closed" msgstr "Die Cutter Interlock Closed" #. TRANSLATORS: Die Cutter Interlock Open -#: locale/ipp-strings.c:2824 +#: locale/ipp-strings.c:2862 msgid "printer-state-reasons.die-cutter-interlock-open" msgstr "Die Cutter Interlock Open" #. TRANSLATORS: Die Cutter Jam -#: locale/ipp-strings.c:2826 +#: locale/ipp-strings.c:2864 msgid "printer-state-reasons.die-cutter-jam" msgstr "Die Cutter Jam" #. TRANSLATORS: Die Cutter Life Almost Over -#: locale/ipp-strings.c:2828 +#: locale/ipp-strings.c:2866 msgid "printer-state-reasons.die-cutter-life-almost-over" msgstr "Die Cutter Life Almost Over" #. TRANSLATORS: Die Cutter Life Over -#: locale/ipp-strings.c:2830 +#: locale/ipp-strings.c:2868 msgid "printer-state-reasons.die-cutter-life-over" msgstr "Die Cutter Life Over" #. TRANSLATORS: Die Cutter Memory Exhausted -#: locale/ipp-strings.c:2832 +#: locale/ipp-strings.c:2870 msgid "printer-state-reasons.die-cutter-memory-exhausted" msgstr "Die Cutter Memory Exhausted" #. TRANSLATORS: Die Cutter Missing -#: locale/ipp-strings.c:2834 +#: locale/ipp-strings.c:2872 msgid "printer-state-reasons.die-cutter-missing" msgstr "Die Cutter Missing" #. TRANSLATORS: Die Cutter Motor Failure -#: locale/ipp-strings.c:2836 +#: locale/ipp-strings.c:2874 msgid "printer-state-reasons.die-cutter-motor-failure" msgstr "Die Cutter Motor Failure" #. TRANSLATORS: Die Cutter Near Limit -#: locale/ipp-strings.c:2838 +#: locale/ipp-strings.c:2876 msgid "printer-state-reasons.die-cutter-near-limit" msgstr "Die Cutter Near Limit" #. TRANSLATORS: Die Cutter Offline -#: locale/ipp-strings.c:2840 +#: locale/ipp-strings.c:2878 msgid "printer-state-reasons.die-cutter-offline" msgstr "Die Cutter Offline" #. TRANSLATORS: Die Cutter Opened -#: locale/ipp-strings.c:2842 +#: locale/ipp-strings.c:2880 msgid "printer-state-reasons.die-cutter-opened" msgstr "Die Cutter Opened" #. TRANSLATORS: Die Cutter Over Temperature -#: locale/ipp-strings.c:2844 +#: locale/ipp-strings.c:2882 msgid "printer-state-reasons.die-cutter-over-temperature" msgstr "Die Cutter Over Temperature" #. TRANSLATORS: Die Cutter Power Saver -#: locale/ipp-strings.c:2846 +#: locale/ipp-strings.c:2884 msgid "printer-state-reasons.die-cutter-power-saver" msgstr "Die Cutter Power Saver" #. TRANSLATORS: Die Cutter Recoverable Failure -#: locale/ipp-strings.c:2848 +#: locale/ipp-strings.c:2886 msgid "printer-state-reasons.die-cutter-recoverable-failure" msgstr "Die Cutter Recoverable Failure" #. TRANSLATORS: Die Cutter Recoverable Storage -#: locale/ipp-strings.c:2850 +#: locale/ipp-strings.c:2888 msgid "printer-state-reasons.die-cutter-recoverable-storage" msgstr "Die Cutter Recoverable Storage" #. TRANSLATORS: Die Cutter Removed -#: locale/ipp-strings.c:2852 +#: locale/ipp-strings.c:2890 msgid "printer-state-reasons.die-cutter-removed" msgstr "Die Cutter Removed" #. TRANSLATORS: Die Cutter Resource Added -#: locale/ipp-strings.c:2854 +#: locale/ipp-strings.c:2892 msgid "printer-state-reasons.die-cutter-resource-added" msgstr "Die Cutter Resource Added" #. TRANSLATORS: Die Cutter Resource Removed -#: locale/ipp-strings.c:2856 +#: locale/ipp-strings.c:2894 msgid "printer-state-reasons.die-cutter-resource-removed" msgstr "Die Cutter Resource Removed" #. TRANSLATORS: Die Cutter Thermistor Failure -#: locale/ipp-strings.c:2858 +#: locale/ipp-strings.c:2896 msgid "printer-state-reasons.die-cutter-thermistor-failure" msgstr "Die Cutter Thermistor Failure" #. TRANSLATORS: Die Cutter Timing Failure -#: locale/ipp-strings.c:2860 +#: locale/ipp-strings.c:2898 msgid "printer-state-reasons.die-cutter-timing-failure" msgstr "Die Cutter Timing Failure" #. TRANSLATORS: Die Cutter Turned Off -#: locale/ipp-strings.c:2862 +#: locale/ipp-strings.c:2900 msgid "printer-state-reasons.die-cutter-turned-off" msgstr "Die Cutter Turned Off" #. TRANSLATORS: Die Cutter Turned On -#: locale/ipp-strings.c:2864 +#: locale/ipp-strings.c:2902 msgid "printer-state-reasons.die-cutter-turned-on" msgstr "Die Cutter Turned On" #. TRANSLATORS: Die Cutter Under Temperature -#: locale/ipp-strings.c:2866 +#: locale/ipp-strings.c:2904 msgid "printer-state-reasons.die-cutter-under-temperature" msgstr "Die Cutter Under Temperature" #. TRANSLATORS: Die Cutter Unrecoverable Failure -#: locale/ipp-strings.c:2868 +#: locale/ipp-strings.c:2906 msgid "printer-state-reasons.die-cutter-unrecoverable-failure" msgstr "Die Cutter Unrecoverable Failure" #. TRANSLATORS: Die Cutter Unrecoverable Storage Error -#: locale/ipp-strings.c:2870 +#: locale/ipp-strings.c:2908 msgid "printer-state-reasons.die-cutter-unrecoverable-storage-error" msgstr "Die Cutter Unrecoverable Storage Error" #. TRANSLATORS: Die Cutter Warming Up -#: locale/ipp-strings.c:2872 +#: locale/ipp-strings.c:2910 msgid "printer-state-reasons.die-cutter-warming-up" msgstr "Die Cutter Warming Up" #. TRANSLATORS: Door Open -#: locale/ipp-strings.c:2874 +#: locale/ipp-strings.c:2912 msgid "printer-state-reasons.door-open" msgstr "Door Open" #. TRANSLATORS: Extruder Cooling -#: locale/ipp-strings.c:2876 +#: locale/ipp-strings.c:2914 msgid "printer-state-reasons.extruder-cooling" msgstr "Extruder Cooling" #. TRANSLATORS: Extruder Failure -#: locale/ipp-strings.c:2878 +#: locale/ipp-strings.c:2916 msgid "printer-state-reasons.extruder-failure" msgstr "Extruder Failure" #. TRANSLATORS: Extruder Heating -#: locale/ipp-strings.c:2880 +#: locale/ipp-strings.c:2918 msgid "printer-state-reasons.extruder-heating" msgstr "Extruder Heating" #. TRANSLATORS: Extruder Jam -#: locale/ipp-strings.c:2882 +#: locale/ipp-strings.c:2920 msgid "printer-state-reasons.extruder-jam" msgstr "Extruder Jam" #. TRANSLATORS: Extruder Temperature High -#: locale/ipp-strings.c:2884 +#: locale/ipp-strings.c:2922 msgid "printer-state-reasons.extruder-temperature-high" msgstr "Extruder Temperature High" #. TRANSLATORS: Extruder Temperature Low -#: locale/ipp-strings.c:2886 +#: locale/ipp-strings.c:2924 msgid "printer-state-reasons.extruder-temperature-low" msgstr "Extruder Temperature Low" #. TRANSLATORS: Fan Failure -#: locale/ipp-strings.c:2888 +#: locale/ipp-strings.c:2926 msgid "printer-state-reasons.fan-failure" msgstr "Fan Failure" #. TRANSLATORS: Folder Added -#: locale/ipp-strings.c:2900 +#: locale/ipp-strings.c:2938 msgid "printer-state-reasons.folder-added" msgstr "Folder Added" #. TRANSLATORS: Folder Almost Empty -#: locale/ipp-strings.c:2902 +#: locale/ipp-strings.c:2940 msgid "printer-state-reasons.folder-almost-empty" msgstr "Folder Almost Empty" #. TRANSLATORS: Folder Almost Full -#: locale/ipp-strings.c:2904 +#: locale/ipp-strings.c:2942 msgid "printer-state-reasons.folder-almost-full" msgstr "Folder Almost Full" #. TRANSLATORS: Folder At Limit -#: locale/ipp-strings.c:2906 +#: locale/ipp-strings.c:2944 msgid "printer-state-reasons.folder-at-limit" msgstr "Folder At Limit" #. TRANSLATORS: Folder Closed -#: locale/ipp-strings.c:2908 +#: locale/ipp-strings.c:2946 msgid "printer-state-reasons.folder-closed" msgstr "Folder Closed" #. TRANSLATORS: Folder Configuration Change -#: locale/ipp-strings.c:2910 +#: locale/ipp-strings.c:2948 msgid "printer-state-reasons.folder-configuration-change" msgstr "Folder Configuration Change" #. TRANSLATORS: Folder Cover Closed -#: locale/ipp-strings.c:2912 +#: locale/ipp-strings.c:2950 msgid "printer-state-reasons.folder-cover-closed" msgstr "Folder Cover Closed" #. TRANSLATORS: Folder Cover Open -#: locale/ipp-strings.c:2914 +#: locale/ipp-strings.c:2952 msgid "printer-state-reasons.folder-cover-open" msgstr "Folder Cover Open" #. TRANSLATORS: Folder Empty -#: locale/ipp-strings.c:2916 +#: locale/ipp-strings.c:2954 msgid "printer-state-reasons.folder-empty" msgstr "Folder Empty" #. TRANSLATORS: Folder Full -#: locale/ipp-strings.c:2918 +#: locale/ipp-strings.c:2956 msgid "printer-state-reasons.folder-full" msgstr "Folder Full" #. TRANSLATORS: Folder Interlock Closed -#: locale/ipp-strings.c:2920 +#: locale/ipp-strings.c:2958 msgid "printer-state-reasons.folder-interlock-closed" msgstr "Folder Interlock Closed" #. TRANSLATORS: Folder Interlock Open -#: locale/ipp-strings.c:2922 +#: locale/ipp-strings.c:2960 msgid "printer-state-reasons.folder-interlock-open" msgstr "Folder Interlock Open" #. TRANSLATORS: Folder Jam -#: locale/ipp-strings.c:2924 +#: locale/ipp-strings.c:2962 msgid "printer-state-reasons.folder-jam" msgstr "Folder Jam" #. TRANSLATORS: Folder Life Almost Over -#: locale/ipp-strings.c:2926 +#: locale/ipp-strings.c:2964 msgid "printer-state-reasons.folder-life-almost-over" msgstr "Folder Life Almost Over" #. TRANSLATORS: Folder Life Over -#: locale/ipp-strings.c:2928 +#: locale/ipp-strings.c:2966 msgid "printer-state-reasons.folder-life-over" msgstr "Folder Life Over" #. TRANSLATORS: Folder Memory Exhausted -#: locale/ipp-strings.c:2930 +#: locale/ipp-strings.c:2968 msgid "printer-state-reasons.folder-memory-exhausted" msgstr "Folder Memory Exhausted" #. TRANSLATORS: Folder Missing -#: locale/ipp-strings.c:2932 +#: locale/ipp-strings.c:2970 msgid "printer-state-reasons.folder-missing" msgstr "Folder Missing" #. TRANSLATORS: Folder Motor Failure -#: locale/ipp-strings.c:2934 +#: locale/ipp-strings.c:2972 msgid "printer-state-reasons.folder-motor-failure" msgstr "Folder Motor Failure" #. TRANSLATORS: Folder Near Limit -#: locale/ipp-strings.c:2936 +#: locale/ipp-strings.c:2974 msgid "printer-state-reasons.folder-near-limit" msgstr "Folder Near Limit" #. TRANSLATORS: Folder Offline -#: locale/ipp-strings.c:2938 +#: locale/ipp-strings.c:2976 msgid "printer-state-reasons.folder-offline" msgstr "Folder Offline" #. TRANSLATORS: Folder Opened -#: locale/ipp-strings.c:2940 +#: locale/ipp-strings.c:2978 msgid "printer-state-reasons.folder-opened" msgstr "Folder Opened" #. TRANSLATORS: Folder Over Temperature -#: locale/ipp-strings.c:2942 +#: locale/ipp-strings.c:2980 msgid "printer-state-reasons.folder-over-temperature" msgstr "Folder Over Temperature" #. TRANSLATORS: Folder Power Saver -#: locale/ipp-strings.c:2944 +#: locale/ipp-strings.c:2982 msgid "printer-state-reasons.folder-power-saver" msgstr "Folder Power Saver" #. TRANSLATORS: Folder Recoverable Failure -#: locale/ipp-strings.c:2946 +#: locale/ipp-strings.c:2984 msgid "printer-state-reasons.folder-recoverable-failure" msgstr "Folder Recoverable Failure" #. TRANSLATORS: Folder Recoverable Storage -#: locale/ipp-strings.c:2948 +#: locale/ipp-strings.c:2986 msgid "printer-state-reasons.folder-recoverable-storage" msgstr "Folder Recoverable Storage" #. TRANSLATORS: Folder Removed -#: locale/ipp-strings.c:2950 +#: locale/ipp-strings.c:2988 msgid "printer-state-reasons.folder-removed" msgstr "Folder Removed" #. TRANSLATORS: Folder Resource Added -#: locale/ipp-strings.c:2952 +#: locale/ipp-strings.c:2990 msgid "printer-state-reasons.folder-resource-added" msgstr "Folder Resource Added" #. TRANSLATORS: Folder Resource Removed -#: locale/ipp-strings.c:2954 +#: locale/ipp-strings.c:2992 msgid "printer-state-reasons.folder-resource-removed" msgstr "Folder Resource Removed" #. TRANSLATORS: Folder Thermistor Failure -#: locale/ipp-strings.c:2956 +#: locale/ipp-strings.c:2994 msgid "printer-state-reasons.folder-thermistor-failure" msgstr "Folder Thermistor Failure" #. TRANSLATORS: Folder Timing Failure -#: locale/ipp-strings.c:2958 +#: locale/ipp-strings.c:2996 msgid "printer-state-reasons.folder-timing-failure" msgstr "Folder Timing Failure" #. TRANSLATORS: Folder Turned Off -#: locale/ipp-strings.c:2960 +#: locale/ipp-strings.c:2998 msgid "printer-state-reasons.folder-turned-off" msgstr "Folder Turned Off" #. TRANSLATORS: Folder Turned On -#: locale/ipp-strings.c:2962 +#: locale/ipp-strings.c:3000 msgid "printer-state-reasons.folder-turned-on" msgstr "Folder Turned On" #. TRANSLATORS: Folder Under Temperature -#: locale/ipp-strings.c:2964 +#: locale/ipp-strings.c:3002 msgid "printer-state-reasons.folder-under-temperature" msgstr "Folder Under Temperature" #. TRANSLATORS: Folder Unrecoverable Failure -#: locale/ipp-strings.c:2966 +#: locale/ipp-strings.c:3004 msgid "printer-state-reasons.folder-unrecoverable-failure" msgstr "Folder Unrecoverable Failure" #. TRANSLATORS: Folder Unrecoverable Storage Error -#: locale/ipp-strings.c:2968 +#: locale/ipp-strings.c:3006 msgid "printer-state-reasons.folder-unrecoverable-storage-error" msgstr "Folder Unrecoverable Storage Error" #. TRANSLATORS: Folder Warming Up -#: locale/ipp-strings.c:2970 +#: locale/ipp-strings.c:3008 msgid "printer-state-reasons.folder-warming-up" msgstr "Folder Warming Up" #. TRANSLATORS: Fuser temperature high -#: locale/ipp-strings.c:2972 +#: locale/ipp-strings.c:3010 msgid "printer-state-reasons.fuser-over-temp" msgstr "Fuser Over Temp" #. TRANSLATORS: Fuser temperature low -#: locale/ipp-strings.c:2974 +#: locale/ipp-strings.c:3012 msgid "printer-state-reasons.fuser-under-temp" msgstr "Fuser Under Temp" #. TRANSLATORS: Hold New Jobs -#: locale/ipp-strings.c:2976 +#: locale/ipp-strings.c:3014 msgid "printer-state-reasons.hold-new-jobs" msgstr "Hold New Jobs" #. TRANSLATORS: Identify Printer -#: locale/ipp-strings.c:2978 +#: locale/ipp-strings.c:3016 msgid "printer-state-reasons.identify-printer-requested" msgstr "Identify Printer" #. TRANSLATORS: Imprinter Added -#: locale/ipp-strings.c:2980 +#: locale/ipp-strings.c:3018 msgid "printer-state-reasons.imprinter-added" msgstr "Imprinter Added" #. TRANSLATORS: Imprinter Almost Empty -#: locale/ipp-strings.c:2982 +#: locale/ipp-strings.c:3020 msgid "printer-state-reasons.imprinter-almost-empty" msgstr "Imprinter Almost Empty" #. TRANSLATORS: Imprinter Almost Full -#: locale/ipp-strings.c:2984 +#: locale/ipp-strings.c:3022 msgid "printer-state-reasons.imprinter-almost-full" msgstr "Imprinter Almost Full" #. TRANSLATORS: Imprinter At Limit -#: locale/ipp-strings.c:2986 +#: locale/ipp-strings.c:3024 msgid "printer-state-reasons.imprinter-at-limit" msgstr "Imprinter At Limit" #. TRANSLATORS: Imprinter Closed -#: locale/ipp-strings.c:2988 +#: locale/ipp-strings.c:3026 msgid "printer-state-reasons.imprinter-closed" msgstr "Imprinter Closed" #. TRANSLATORS: Imprinter Configuration Change -#: locale/ipp-strings.c:2990 +#: locale/ipp-strings.c:3028 msgid "printer-state-reasons.imprinter-configuration-change" msgstr "Imprinter Configuration Change" #. TRANSLATORS: Imprinter Cover Closed -#: locale/ipp-strings.c:2992 +#: locale/ipp-strings.c:3030 msgid "printer-state-reasons.imprinter-cover-closed" msgstr "Imprinter Cover Closed" #. TRANSLATORS: Imprinter Cover Open -#: locale/ipp-strings.c:2994 +#: locale/ipp-strings.c:3032 msgid "printer-state-reasons.imprinter-cover-open" msgstr "Imprinter Cover Open" #. TRANSLATORS: Imprinter Empty -#: locale/ipp-strings.c:2996 +#: locale/ipp-strings.c:3034 msgid "printer-state-reasons.imprinter-empty" msgstr "Imprinter Empty" #. TRANSLATORS: Imprinter Full -#: locale/ipp-strings.c:2998 +#: locale/ipp-strings.c:3036 msgid "printer-state-reasons.imprinter-full" msgstr "Imprinter Full" #. TRANSLATORS: Imprinter Interlock Closed -#: locale/ipp-strings.c:3000 +#: locale/ipp-strings.c:3038 msgid "printer-state-reasons.imprinter-interlock-closed" msgstr "Imprinter Interlock Closed" #. TRANSLATORS: Imprinter Interlock Open -#: locale/ipp-strings.c:3002 +#: locale/ipp-strings.c:3040 msgid "printer-state-reasons.imprinter-interlock-open" msgstr "Imprinter Interlock Open" #. TRANSLATORS: Imprinter Jam -#: locale/ipp-strings.c:3004 +#: locale/ipp-strings.c:3042 msgid "printer-state-reasons.imprinter-jam" msgstr "Imprinter Jam" #. TRANSLATORS: Imprinter Life Almost Over -#: locale/ipp-strings.c:3006 +#: locale/ipp-strings.c:3044 msgid "printer-state-reasons.imprinter-life-almost-over" msgstr "Imprinter Life Almost Over" #. TRANSLATORS: Imprinter Life Over -#: locale/ipp-strings.c:3008 +#: locale/ipp-strings.c:3046 msgid "printer-state-reasons.imprinter-life-over" msgstr "Imprinter Life Over" #. TRANSLATORS: Imprinter Memory Exhausted -#: locale/ipp-strings.c:3010 +#: locale/ipp-strings.c:3048 msgid "printer-state-reasons.imprinter-memory-exhausted" msgstr "Imprinter Memory Exhausted" #. TRANSLATORS: Imprinter Missing -#: locale/ipp-strings.c:3012 +#: locale/ipp-strings.c:3050 msgid "printer-state-reasons.imprinter-missing" msgstr "Imprinter Missing" #. TRANSLATORS: Imprinter Motor Failure -#: locale/ipp-strings.c:3014 +#: locale/ipp-strings.c:3052 msgid "printer-state-reasons.imprinter-motor-failure" msgstr "Imprinter Motor Failure" #. TRANSLATORS: Imprinter Near Limit -#: locale/ipp-strings.c:3016 +#: locale/ipp-strings.c:3054 msgid "printer-state-reasons.imprinter-near-limit" msgstr "Imprinter Near Limit" #. TRANSLATORS: Imprinter Offline -#: locale/ipp-strings.c:3018 +#: locale/ipp-strings.c:3056 msgid "printer-state-reasons.imprinter-offline" msgstr "Imprinter Offline" #. TRANSLATORS: Imprinter Opened -#: locale/ipp-strings.c:3020 +#: locale/ipp-strings.c:3058 msgid "printer-state-reasons.imprinter-opened" msgstr "Imprinter Opened" #. TRANSLATORS: Imprinter Over Temperature -#: locale/ipp-strings.c:3022 +#: locale/ipp-strings.c:3060 msgid "printer-state-reasons.imprinter-over-temperature" msgstr "Imprinter Over Temperature" #. TRANSLATORS: Imprinter Power Saver -#: locale/ipp-strings.c:3024 +#: locale/ipp-strings.c:3062 msgid "printer-state-reasons.imprinter-power-saver" msgstr "Imprinter Power Saver" #. TRANSLATORS: Imprinter Recoverable Failure -#: locale/ipp-strings.c:3026 +#: locale/ipp-strings.c:3064 msgid "printer-state-reasons.imprinter-recoverable-failure" msgstr "Imprinter Recoverable Failure" #. TRANSLATORS: Imprinter Recoverable Storage -#: locale/ipp-strings.c:3028 +#: locale/ipp-strings.c:3066 msgid "printer-state-reasons.imprinter-recoverable-storage" msgstr "Imprinter Recoverable Storage" #. TRANSLATORS: Imprinter Removed -#: locale/ipp-strings.c:3030 +#: locale/ipp-strings.c:3068 msgid "printer-state-reasons.imprinter-removed" msgstr "Imprinter Removed" #. TRANSLATORS: Imprinter Resource Added -#: locale/ipp-strings.c:3032 +#: locale/ipp-strings.c:3070 msgid "printer-state-reasons.imprinter-resource-added" msgstr "Imprinter Resource Added" #. TRANSLATORS: Imprinter Resource Removed -#: locale/ipp-strings.c:3034 +#: locale/ipp-strings.c:3072 msgid "printer-state-reasons.imprinter-resource-removed" msgstr "Imprinter Resource Removed" #. TRANSLATORS: Imprinter Thermistor Failure -#: locale/ipp-strings.c:3036 +#: locale/ipp-strings.c:3074 msgid "printer-state-reasons.imprinter-thermistor-failure" msgstr "Imprinter Thermistor Failure" #. TRANSLATORS: Imprinter Timing Failure -#: locale/ipp-strings.c:3038 +#: locale/ipp-strings.c:3076 msgid "printer-state-reasons.imprinter-timing-failure" msgstr "Imprinter Timing Failure" #. TRANSLATORS: Imprinter Turned Off -#: locale/ipp-strings.c:3040 +#: locale/ipp-strings.c:3078 msgid "printer-state-reasons.imprinter-turned-off" msgstr "Imprinter Turned Off" #. TRANSLATORS: Imprinter Turned On -#: locale/ipp-strings.c:3042 +#: locale/ipp-strings.c:3080 msgid "printer-state-reasons.imprinter-turned-on" msgstr "Imprinter Turned On" #. TRANSLATORS: Imprinter Under Temperature -#: locale/ipp-strings.c:3044 +#: locale/ipp-strings.c:3082 msgid "printer-state-reasons.imprinter-under-temperature" msgstr "Imprinter Under Temperature" #. TRANSLATORS: Imprinter Unrecoverable Failure -#: locale/ipp-strings.c:3046 +#: locale/ipp-strings.c:3084 msgid "printer-state-reasons.imprinter-unrecoverable-failure" msgstr "Imprinter Unrecoverable Failure" #. TRANSLATORS: Imprinter Unrecoverable Storage Error -#: locale/ipp-strings.c:3048 +#: locale/ipp-strings.c:3086 msgid "printer-state-reasons.imprinter-unrecoverable-storage-error" msgstr "Imprinter Unrecoverable Storage Error" #. TRANSLATORS: Imprinter Warming Up -#: locale/ipp-strings.c:3050 +#: locale/ipp-strings.c:3088 msgid "printer-state-reasons.imprinter-warming-up" msgstr "Imprinter Warming Up" #. TRANSLATORS: Input Cannot Feed Size Selected -#: locale/ipp-strings.c:3052 +#: locale/ipp-strings.c:3090 msgid "printer-state-reasons.input-cannot-feed-size-selected" msgstr "Input Cannot Feed Size Selected" #. TRANSLATORS: Input Manual Input Request -#: locale/ipp-strings.c:3054 +#: locale/ipp-strings.c:3092 msgid "printer-state-reasons.input-manual-input-request" msgstr "Input Manual Input Request" #. TRANSLATORS: Input Media Color Change -#: locale/ipp-strings.c:3056 +#: locale/ipp-strings.c:3094 msgid "printer-state-reasons.input-media-color-change" msgstr "Input Media Color Change" #. TRANSLATORS: Input Media Form Parts Change -#: locale/ipp-strings.c:3058 +#: locale/ipp-strings.c:3096 msgid "printer-state-reasons.input-media-form-parts-change" msgstr "Input Media Form Parts Change" #. TRANSLATORS: Input Media Size Change -#: locale/ipp-strings.c:3060 +#: locale/ipp-strings.c:3098 msgid "printer-state-reasons.input-media-size-change" msgstr "Input Media Size Change" #. TRANSLATORS: Input Media Type Change -#: locale/ipp-strings.c:3068 +#: locale/ipp-strings.c:3106 msgid "printer-state-reasons.input-media-type-change" msgstr "Input Media Type Change" #. TRANSLATORS: Input Media Weight Change -#: locale/ipp-strings.c:3070 +#: locale/ipp-strings.c:3108 msgid "printer-state-reasons.input-media-weight-change" msgstr "Input Media Weight Change" #. TRANSLATORS: Input Tray Elevation Failure -#: locale/ipp-strings.c:3080 +#: locale/ipp-strings.c:3118 msgid "printer-state-reasons.input-tray-elevation-failure" msgstr "Input Tray Elevation Failure" #. TRANSLATORS: Paper tray is missing -#: locale/ipp-strings.c:3082 +#: locale/ipp-strings.c:3120 msgid "printer-state-reasons.input-tray-missing" msgstr "Input Tray Missing" #. TRANSLATORS: Input Tray Position Failure -#: locale/ipp-strings.c:3084 +#: locale/ipp-strings.c:3122 msgid "printer-state-reasons.input-tray-position-failure" msgstr "Input Tray Position Failure" #. TRANSLATORS: Inserter Added -#: locale/ipp-strings.c:3086 +#: locale/ipp-strings.c:3124 msgid "printer-state-reasons.inserter-added" msgstr "Inserter Added" #. TRANSLATORS: Inserter Almost Empty -#: locale/ipp-strings.c:3088 +#: locale/ipp-strings.c:3126 msgid "printer-state-reasons.inserter-almost-empty" msgstr "Inserter Almost Empty" #. TRANSLATORS: Inserter Almost Full -#: locale/ipp-strings.c:3090 +#: locale/ipp-strings.c:3128 msgid "printer-state-reasons.inserter-almost-full" msgstr "Inserter Almost Full" #. TRANSLATORS: Inserter At Limit -#: locale/ipp-strings.c:3092 +#: locale/ipp-strings.c:3130 msgid "printer-state-reasons.inserter-at-limit" msgstr "Inserter At Limit" #. TRANSLATORS: Inserter Closed -#: locale/ipp-strings.c:3094 +#: locale/ipp-strings.c:3132 msgid "printer-state-reasons.inserter-closed" msgstr "Inserter Closed" #. TRANSLATORS: Inserter Configuration Change -#: locale/ipp-strings.c:3096 +#: locale/ipp-strings.c:3134 msgid "printer-state-reasons.inserter-configuration-change" msgstr "Inserter Configuration Change" #. TRANSLATORS: Inserter Cover Closed -#: locale/ipp-strings.c:3098 +#: locale/ipp-strings.c:3136 msgid "printer-state-reasons.inserter-cover-closed" msgstr "Inserter Cover Closed" #. TRANSLATORS: Inserter Cover Open -#: locale/ipp-strings.c:3100 +#: locale/ipp-strings.c:3138 msgid "printer-state-reasons.inserter-cover-open" msgstr "Inserter Cover Open" #. TRANSLATORS: Inserter Empty -#: locale/ipp-strings.c:3102 +#: locale/ipp-strings.c:3140 msgid "printer-state-reasons.inserter-empty" msgstr "Inserter Empty" #. TRANSLATORS: Inserter Full -#: locale/ipp-strings.c:3104 +#: locale/ipp-strings.c:3142 msgid "printer-state-reasons.inserter-full" msgstr "Inserter Full" #. TRANSLATORS: Inserter Interlock Closed -#: locale/ipp-strings.c:3106 +#: locale/ipp-strings.c:3144 msgid "printer-state-reasons.inserter-interlock-closed" msgstr "Inserter Interlock Closed" #. TRANSLATORS: Inserter Interlock Open -#: locale/ipp-strings.c:3108 +#: locale/ipp-strings.c:3146 msgid "printer-state-reasons.inserter-interlock-open" msgstr "Inserter Interlock Open" #. TRANSLATORS: Inserter Jam -#: locale/ipp-strings.c:3110 +#: locale/ipp-strings.c:3148 msgid "printer-state-reasons.inserter-jam" msgstr "Inserter Jam" #. TRANSLATORS: Inserter Life Almost Over -#: locale/ipp-strings.c:3112 +#: locale/ipp-strings.c:3150 msgid "printer-state-reasons.inserter-life-almost-over" msgstr "Inserter Life Almost Over" #. TRANSLATORS: Inserter Life Over -#: locale/ipp-strings.c:3114 +#: locale/ipp-strings.c:3152 msgid "printer-state-reasons.inserter-life-over" msgstr "Inserter Life Over" #. TRANSLATORS: Inserter Memory Exhausted -#: locale/ipp-strings.c:3116 +#: locale/ipp-strings.c:3154 msgid "printer-state-reasons.inserter-memory-exhausted" msgstr "Inserter Memory Exhausted" #. TRANSLATORS: Inserter Missing -#: locale/ipp-strings.c:3118 +#: locale/ipp-strings.c:3156 msgid "printer-state-reasons.inserter-missing" msgstr "Inserter Missing" #. TRANSLATORS: Inserter Motor Failure -#: locale/ipp-strings.c:3120 +#: locale/ipp-strings.c:3158 msgid "printer-state-reasons.inserter-motor-failure" msgstr "Inserter Motor Failure" #. TRANSLATORS: Inserter Near Limit -#: locale/ipp-strings.c:3122 +#: locale/ipp-strings.c:3160 msgid "printer-state-reasons.inserter-near-limit" msgstr "Inserter Near Limit" #. TRANSLATORS: Inserter Offline -#: locale/ipp-strings.c:3124 +#: locale/ipp-strings.c:3162 msgid "printer-state-reasons.inserter-offline" msgstr "Inserter Offline" #. TRANSLATORS: Inserter Opened -#: locale/ipp-strings.c:3126 +#: locale/ipp-strings.c:3164 msgid "printer-state-reasons.inserter-opened" msgstr "Inserter Opened" #. TRANSLATORS: Inserter Over Temperature -#: locale/ipp-strings.c:3128 +#: locale/ipp-strings.c:3166 msgid "printer-state-reasons.inserter-over-temperature" msgstr "Inserter Over Temperature" #. TRANSLATORS: Inserter Power Saver -#: locale/ipp-strings.c:3130 +#: locale/ipp-strings.c:3168 msgid "printer-state-reasons.inserter-power-saver" msgstr "Inserter Power Saver" #. TRANSLATORS: Inserter Recoverable Failure -#: locale/ipp-strings.c:3132 +#: locale/ipp-strings.c:3170 msgid "printer-state-reasons.inserter-recoverable-failure" msgstr "Inserter Recoverable Failure" #. TRANSLATORS: Inserter Recoverable Storage -#: locale/ipp-strings.c:3134 +#: locale/ipp-strings.c:3172 msgid "printer-state-reasons.inserter-recoverable-storage" msgstr "Inserter Recoverable Storage" #. TRANSLATORS: Inserter Removed -#: locale/ipp-strings.c:3136 +#: locale/ipp-strings.c:3174 msgid "printer-state-reasons.inserter-removed" msgstr "Inserter Removed" #. TRANSLATORS: Inserter Resource Added -#: locale/ipp-strings.c:3138 +#: locale/ipp-strings.c:3176 msgid "printer-state-reasons.inserter-resource-added" msgstr "Inserter Resource Added" #. TRANSLATORS: Inserter Resource Removed -#: locale/ipp-strings.c:3140 +#: locale/ipp-strings.c:3178 msgid "printer-state-reasons.inserter-resource-removed" msgstr "Inserter Resource Removed" #. TRANSLATORS: Inserter Thermistor Failure -#: locale/ipp-strings.c:3142 +#: locale/ipp-strings.c:3180 msgid "printer-state-reasons.inserter-thermistor-failure" msgstr "Inserter Thermistor Failure" #. TRANSLATORS: Inserter Timing Failure -#: locale/ipp-strings.c:3144 +#: locale/ipp-strings.c:3182 msgid "printer-state-reasons.inserter-timing-failure" msgstr "Inserter Timing Failure" #. TRANSLATORS: Inserter Turned Off -#: locale/ipp-strings.c:3146 +#: locale/ipp-strings.c:3184 msgid "printer-state-reasons.inserter-turned-off" msgstr "Inserter Turned Off" #. TRANSLATORS: Inserter Turned On -#: locale/ipp-strings.c:3148 +#: locale/ipp-strings.c:3186 msgid "printer-state-reasons.inserter-turned-on" msgstr "Inserter Turned On" #. TRANSLATORS: Inserter Under Temperature -#: locale/ipp-strings.c:3150 +#: locale/ipp-strings.c:3188 msgid "printer-state-reasons.inserter-under-temperature" msgstr "Inserter Under Temperature" #. TRANSLATORS: Inserter Unrecoverable Failure -#: locale/ipp-strings.c:3152 +#: locale/ipp-strings.c:3190 msgid "printer-state-reasons.inserter-unrecoverable-failure" msgstr "Inserter Unrecoverable Failure" #. TRANSLATORS: Inserter Unrecoverable Storage Error -#: locale/ipp-strings.c:3154 +#: locale/ipp-strings.c:3192 msgid "printer-state-reasons.inserter-unrecoverable-storage-error" msgstr "Inserter Unrecoverable Storage Error" #. TRANSLATORS: Inserter Warming Up -#: locale/ipp-strings.c:3156 +#: locale/ipp-strings.c:3194 msgid "printer-state-reasons.inserter-warming-up" msgstr "Inserter Warming Up" #. TRANSLATORS: Interlock Closed -#: locale/ipp-strings.c:3158 +#: locale/ipp-strings.c:3196 msgid "printer-state-reasons.interlock-closed" msgstr "Interlock Closed" #. TRANSLATORS: Interlock Open -#: locale/ipp-strings.c:3160 +#: locale/ipp-strings.c:3198 msgid "printer-state-reasons.interlock-open" msgstr "Interlock Open" #. TRANSLATORS: Interpreter Cartridge Added -#: locale/ipp-strings.c:3162 +#: locale/ipp-strings.c:3200 msgid "printer-state-reasons.interpreter-cartridge-added" msgstr "Interpreter Cartridge Added" #. TRANSLATORS: Interpreter Cartridge Removed -#: locale/ipp-strings.c:3164 +#: locale/ipp-strings.c:3202 msgid "printer-state-reasons.interpreter-cartridge-deleted" msgstr "Interpreter Cartridge Deleted" #. TRANSLATORS: Interpreter Complex Page Encountered -#: locale/ipp-strings.c:3166 +#: locale/ipp-strings.c:3204 msgid "printer-state-reasons.interpreter-complex-page-encountered" msgstr "Interpreter Complex Page Encountered" #. TRANSLATORS: Interpreter Memory Decrease -#: locale/ipp-strings.c:3168 +#: locale/ipp-strings.c:3206 msgid "printer-state-reasons.interpreter-memory-decrease" msgstr "Interpreter Memory Decrease" #. TRANSLATORS: Interpreter Memory Increase -#: locale/ipp-strings.c:3170 +#: locale/ipp-strings.c:3208 msgid "printer-state-reasons.interpreter-memory-increase" msgstr "Interpreter Memory Increase" #. TRANSLATORS: Interpreter Resource Added -#: locale/ipp-strings.c:3172 +#: locale/ipp-strings.c:3210 msgid "printer-state-reasons.interpreter-resource-added" msgstr "Interpreter Resource Added" #. TRANSLATORS: Interpreter Resource Deleted -#: locale/ipp-strings.c:3174 +#: locale/ipp-strings.c:3212 msgid "printer-state-reasons.interpreter-resource-deleted" msgstr "Interpreter Resource Deleted" #. TRANSLATORS: Printer resource unavailable -#: locale/ipp-strings.c:3176 +#: locale/ipp-strings.c:3214 msgid "printer-state-reasons.interpreter-resource-unavailable" msgstr "Interpreter Resource Unavailable" #. TRANSLATORS: Lamp At End of Life -#: locale/ipp-strings.c:3178 +#: locale/ipp-strings.c:3216 msgid "printer-state-reasons.lamp-at-eol" msgstr "Lamp At Eol" #. TRANSLATORS: Lamp Failure -#: locale/ipp-strings.c:3180 +#: locale/ipp-strings.c:3218 msgid "printer-state-reasons.lamp-failure" msgstr "Lamp Failure" #. TRANSLATORS: Lamp Near End of Life -#: locale/ipp-strings.c:3182 +#: locale/ipp-strings.c:3220 msgid "printer-state-reasons.lamp-near-eol" msgstr "Lamp Near Eol" #. TRANSLATORS: Laser At End of Life -#: locale/ipp-strings.c:3184 +#: locale/ipp-strings.c:3222 msgid "printer-state-reasons.laser-at-eol" msgstr "Laser At Eol" #. TRANSLATORS: Laser Failure -#: locale/ipp-strings.c:3186 +#: locale/ipp-strings.c:3224 msgid "printer-state-reasons.laser-failure" msgstr "Laser Failure" #. TRANSLATORS: Laser Near End of Life -#: locale/ipp-strings.c:3188 +#: locale/ipp-strings.c:3226 msgid "printer-state-reasons.laser-near-eol" msgstr "Laser Near Eol" #. TRANSLATORS: Envelope Maker Added -#: locale/ipp-strings.c:3190 +#: locale/ipp-strings.c:3228 msgid "printer-state-reasons.make-envelope-added" msgstr "Make Envelope Added" #. TRANSLATORS: Envelope Maker Almost Empty -#: locale/ipp-strings.c:3192 +#: locale/ipp-strings.c:3230 msgid "printer-state-reasons.make-envelope-almost-empty" msgstr "Make Envelope Almost Empty" #. TRANSLATORS: Envelope Maker Almost Full -#: locale/ipp-strings.c:3194 +#: locale/ipp-strings.c:3232 msgid "printer-state-reasons.make-envelope-almost-full" msgstr "Make Envelope Almost Full" #. TRANSLATORS: Envelope Maker At Limit -#: locale/ipp-strings.c:3196 +#: locale/ipp-strings.c:3234 msgid "printer-state-reasons.make-envelope-at-limit" msgstr "Make Envelope At Limit" #. TRANSLATORS: Envelope Maker Closed -#: locale/ipp-strings.c:3198 +#: locale/ipp-strings.c:3236 msgid "printer-state-reasons.make-envelope-closed" msgstr "Make Envelope Closed" #. TRANSLATORS: Envelope Maker Configuration Change -#: locale/ipp-strings.c:3200 +#: locale/ipp-strings.c:3238 msgid "printer-state-reasons.make-envelope-configuration-change" msgstr "Make Envelope Configuration Change" #. TRANSLATORS: Envelope Maker Cover Closed -#: locale/ipp-strings.c:3202 +#: locale/ipp-strings.c:3240 msgid "printer-state-reasons.make-envelope-cover-closed" msgstr "Make Envelope Cover Closed" #. TRANSLATORS: Envelope Maker Cover Open -#: locale/ipp-strings.c:3204 +#: locale/ipp-strings.c:3242 msgid "printer-state-reasons.make-envelope-cover-open" msgstr "Make Envelope Cover Open" #. TRANSLATORS: Envelope Maker Empty -#: locale/ipp-strings.c:3206 +#: locale/ipp-strings.c:3244 msgid "printer-state-reasons.make-envelope-empty" msgstr "Make Envelope Empty" #. TRANSLATORS: Envelope Maker Full -#: locale/ipp-strings.c:3208 +#: locale/ipp-strings.c:3246 msgid "printer-state-reasons.make-envelope-full" msgstr "Make Envelope Full" #. TRANSLATORS: Envelope Maker Interlock Closed -#: locale/ipp-strings.c:3210 +#: locale/ipp-strings.c:3248 msgid "printer-state-reasons.make-envelope-interlock-closed" msgstr "Make Envelope Interlock Closed" #. TRANSLATORS: Envelope Maker Interlock Open -#: locale/ipp-strings.c:3212 +#: locale/ipp-strings.c:3250 msgid "printer-state-reasons.make-envelope-interlock-open" msgstr "Make Envelope Interlock Open" #. TRANSLATORS: Envelope Maker Jam -#: locale/ipp-strings.c:3214 +#: locale/ipp-strings.c:3252 msgid "printer-state-reasons.make-envelope-jam" msgstr "Make Envelope Jam" #. TRANSLATORS: Envelope Maker Life Almost Over -#: locale/ipp-strings.c:3216 +#: locale/ipp-strings.c:3254 msgid "printer-state-reasons.make-envelope-life-almost-over" msgstr "Make Envelope Life Almost Over" #. TRANSLATORS: Envelope Maker Life Over -#: locale/ipp-strings.c:3218 +#: locale/ipp-strings.c:3256 msgid "printer-state-reasons.make-envelope-life-over" msgstr "Make Envelope Life Over" #. TRANSLATORS: Envelope Maker Memory Exhausted -#: locale/ipp-strings.c:3220 +#: locale/ipp-strings.c:3258 msgid "printer-state-reasons.make-envelope-memory-exhausted" msgstr "Make Envelope Memory Exhausted" #. TRANSLATORS: Envelope Maker Missing -#: locale/ipp-strings.c:3222 +#: locale/ipp-strings.c:3260 msgid "printer-state-reasons.make-envelope-missing" msgstr "Make Envelope Missing" #. TRANSLATORS: Envelope Maker Motor Failure -#: locale/ipp-strings.c:3224 +#: locale/ipp-strings.c:3262 msgid "printer-state-reasons.make-envelope-motor-failure" msgstr "Make Envelope Motor Failure" #. TRANSLATORS: Envelope Maker Near Limit -#: locale/ipp-strings.c:3226 +#: locale/ipp-strings.c:3264 msgid "printer-state-reasons.make-envelope-near-limit" msgstr "Make Envelope Near Limit" #. TRANSLATORS: Envelope Maker Offline -#: locale/ipp-strings.c:3228 +#: locale/ipp-strings.c:3266 msgid "printer-state-reasons.make-envelope-offline" msgstr "Make Envelope Offline" #. TRANSLATORS: Envelope Maker Opened -#: locale/ipp-strings.c:3230 +#: locale/ipp-strings.c:3268 msgid "printer-state-reasons.make-envelope-opened" msgstr "Make Envelope Opened" #. TRANSLATORS: Envelope Maker Over Temperature -#: locale/ipp-strings.c:3232 +#: locale/ipp-strings.c:3270 msgid "printer-state-reasons.make-envelope-over-temperature" msgstr "Make Envelope Over Temperature" #. TRANSLATORS: Envelope Maker Power Saver -#: locale/ipp-strings.c:3234 +#: locale/ipp-strings.c:3272 msgid "printer-state-reasons.make-envelope-power-saver" msgstr "Make Envelope Power Saver" #. TRANSLATORS: Envelope Maker Recoverable Failure -#: locale/ipp-strings.c:3236 +#: locale/ipp-strings.c:3274 msgid "printer-state-reasons.make-envelope-recoverable-failure" msgstr "Make Envelope Recoverable Failure" #. TRANSLATORS: Envelope Maker Recoverable Storage -#: locale/ipp-strings.c:3238 +#: locale/ipp-strings.c:3276 msgid "printer-state-reasons.make-envelope-recoverable-storage" msgstr "Make Envelope Recoverable Storage" #. TRANSLATORS: Envelope Maker Removed -#: locale/ipp-strings.c:3240 +#: locale/ipp-strings.c:3278 msgid "printer-state-reasons.make-envelope-removed" msgstr "Make Envelope Removed" #. TRANSLATORS: Envelope Maker Resource Added -#: locale/ipp-strings.c:3242 +#: locale/ipp-strings.c:3280 msgid "printer-state-reasons.make-envelope-resource-added" msgstr "Make Envelope Resource Added" #. TRANSLATORS: Envelope Maker Resource Removed -#: locale/ipp-strings.c:3244 +#: locale/ipp-strings.c:3282 msgid "printer-state-reasons.make-envelope-resource-removed" msgstr "Make Envelope Resource Removed" #. TRANSLATORS: Envelope Maker Thermistor Failure -#: locale/ipp-strings.c:3246 +#: locale/ipp-strings.c:3284 msgid "printer-state-reasons.make-envelope-thermistor-failure" msgstr "Make Envelope Thermistor Failure" #. TRANSLATORS: Envelope Maker Timing Failure -#: locale/ipp-strings.c:3248 +#: locale/ipp-strings.c:3286 msgid "printer-state-reasons.make-envelope-timing-failure" msgstr "Make Envelope Timing Failure" #. TRANSLATORS: Envelope Maker Turned Off -#: locale/ipp-strings.c:3250 +#: locale/ipp-strings.c:3288 msgid "printer-state-reasons.make-envelope-turned-off" msgstr "Make Envelope Turned Off" #. TRANSLATORS: Envelope Maker Turned On -#: locale/ipp-strings.c:3252 +#: locale/ipp-strings.c:3290 msgid "printer-state-reasons.make-envelope-turned-on" msgstr "Make Envelope Turned On" #. TRANSLATORS: Envelope Maker Under Temperature -#: locale/ipp-strings.c:3254 +#: locale/ipp-strings.c:3292 msgid "printer-state-reasons.make-envelope-under-temperature" msgstr "Make Envelope Under Temperature" #. TRANSLATORS: Envelope Maker Unrecoverable Failure -#: locale/ipp-strings.c:3256 +#: locale/ipp-strings.c:3294 msgid "printer-state-reasons.make-envelope-unrecoverable-failure" msgstr "Make Envelope Unrecoverable Failure" #. TRANSLATORS: Envelope Maker Unrecoverable Storage Error -#: locale/ipp-strings.c:3258 +#: locale/ipp-strings.c:3296 msgid "printer-state-reasons.make-envelope-unrecoverable-storage-error" msgstr "Make Envelope Unrecoverable Storage Error" #. TRANSLATORS: Envelope Maker Warming Up -#: locale/ipp-strings.c:3260 +#: locale/ipp-strings.c:3298 msgid "printer-state-reasons.make-envelope-warming-up" msgstr "Make Envelope Warming Up" #. TRANSLATORS: Marker Adjusting Print Quality -#: locale/ipp-strings.c:3262 +#: locale/ipp-strings.c:3300 msgid "printer-state-reasons.marker-adjusting-print-quality" msgstr "Marker Adjusting Print Quality" #. TRANSLATORS: Marker Developer Almost Empty -#: locale/ipp-strings.c:3266 +#: locale/ipp-strings.c:3304 msgid "printer-state-reasons.marker-developer-almost-empty" msgstr "Marker Developer Almost Empty" #. TRANSLATORS: Marker Developer Empty -#: locale/ipp-strings.c:3268 +#: locale/ipp-strings.c:3306 msgid "printer-state-reasons.marker-developer-empty" msgstr "Marker Developer Empty" #. TRANSLATORS: Marker Fuser Thermistor Failure -#: locale/ipp-strings.c:3274 +#: locale/ipp-strings.c:3312 msgid "printer-state-reasons.marker-fuser-thermistor-failure" msgstr "Marker Fuser Thermistor Failure" #. TRANSLATORS: Marker Fuser Timing Failure -#: locale/ipp-strings.c:3276 +#: locale/ipp-strings.c:3314 msgid "printer-state-reasons.marker-fuser-timing-failure" msgstr "Marker Fuser Timing Failure" #. TRANSLATORS: Marker Ink Almost Empty -#: locale/ipp-strings.c:3278 +#: locale/ipp-strings.c:3316 msgid "printer-state-reasons.marker-ink-almost-empty" msgstr "Marker Ink Almost Empty" #. TRANSLATORS: Marker Ink Empty -#: locale/ipp-strings.c:3280 +#: locale/ipp-strings.c:3318 msgid "printer-state-reasons.marker-ink-empty" msgstr "Marker Ink Empty" #. TRANSLATORS: Marker Print Ribbon Almost Empty -#: locale/ipp-strings.c:3286 +#: locale/ipp-strings.c:3324 msgid "printer-state-reasons.marker-print-ribbon-almost-empty" msgstr "Marker Print Ribbon Almost Empty" #. TRANSLATORS: Marker Print Ribbon Empty -#: locale/ipp-strings.c:3288 +#: locale/ipp-strings.c:3326 msgid "printer-state-reasons.marker-print-ribbon-empty" msgstr "Marker Print Ribbon Empty" #. TRANSLATORS: Ink/toner empty -#: locale/ipp-strings.c:3294 +#: locale/ipp-strings.c:3332 msgid "printer-state-reasons.marker-supply-empty" msgstr "Marker Supply Empty" #. TRANSLATORS: Ink/toner low -#: locale/ipp-strings.c:3296 +#: locale/ipp-strings.c:3334 msgid "printer-state-reasons.marker-supply-low" msgstr "Marker Supply Low" #. TRANSLATORS: Marker Toner Cartridge Missing -#: locale/ipp-strings.c:3300 +#: locale/ipp-strings.c:3338 msgid "printer-state-reasons.marker-toner-cartridge-missing" msgstr "Marker Toner Cartridge Missing" #. TRANSLATORS: Ink/toner waste bin almost full -#: locale/ipp-strings.c:3304 +#: locale/ipp-strings.c:3342 msgid "printer-state-reasons.marker-waste-almost-full" msgstr "Marker Waste Almost Full" #. TRANSLATORS: Ink/toner waste bin full -#: locale/ipp-strings.c:3306 +#: locale/ipp-strings.c:3344 msgid "printer-state-reasons.marker-waste-full" msgstr "Marker Waste Full" #. TRANSLATORS: Marker Waste Ink Receptacle Almost Full -#: locale/ipp-strings.c:3308 +#: locale/ipp-strings.c:3346 msgid "printer-state-reasons.marker-waste-ink-receptacle-almost-full" msgstr "Marker Waste Ink Receptacle Almost Full" #. TRANSLATORS: Marker Waste Ink Receptacle Full -#: locale/ipp-strings.c:3310 +#: locale/ipp-strings.c:3348 msgid "printer-state-reasons.marker-waste-ink-receptacle-full" msgstr "Marker Waste Ink Receptacle Full" #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full -#: locale/ipp-strings.c:3316 +#: locale/ipp-strings.c:3354 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full" msgstr "Marker Waste Toner Receptacle Almost Full" #. TRANSLATORS: Marker Waste Toner Receptacle Full -#: locale/ipp-strings.c:3318 +#: locale/ipp-strings.c:3356 msgid "printer-state-reasons.marker-waste-toner-receptacle-full" msgstr "Marker Waste Toner Receptacle Full" #. TRANSLATORS: Material Empty -#: locale/ipp-strings.c:3322 +#: locale/ipp-strings.c:3360 msgid "printer-state-reasons.material-empty" msgstr "Material Empty" #. TRANSLATORS: Material Low -#: locale/ipp-strings.c:3324 +#: locale/ipp-strings.c:3362 msgid "printer-state-reasons.material-low" msgstr "Material Low" #. TRANSLATORS: Material Needed -#: locale/ipp-strings.c:3326 +#: locale/ipp-strings.c:3364 msgid "printer-state-reasons.material-needed" msgstr "Material Needed" #. TRANSLATORS: Paper tray is empty -#: locale/ipp-strings.c:3330 +#: locale/ipp-strings.c:3368 msgid "printer-state-reasons.media-empty" msgstr "Media Empty" #. TRANSLATORS: Paper jam -#: locale/ipp-strings.c:3332 +#: locale/ipp-strings.c:3370 msgid "printer-state-reasons.media-jam" msgstr "Media Jam" #. TRANSLATORS: Paper tray is almost empty -#: locale/ipp-strings.c:3334 +#: locale/ipp-strings.c:3372 msgid "printer-state-reasons.media-low" msgstr "Media Low" #. TRANSLATORS: Load paper -#: locale/ipp-strings.c:3336 +#: locale/ipp-strings.c:3374 msgid "printer-state-reasons.media-needed" msgstr "Media Needed" #. TRANSLATORS: Media Path Cannot Do 2-Sided Printing -#: locale/ipp-strings.c:3338 +#: locale/ipp-strings.c:3376 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected" msgstr "Media Path Cannot Duplex Media Selected" #. TRANSLATORS: Media Path Media Tray Almost Full -#: locale/ipp-strings.c:3352 +#: locale/ipp-strings.c:3390 msgid "printer-state-reasons.media-path-media-tray-almost-full" msgstr "Media Path Media Tray Almost Full" #. TRANSLATORS: Media Path Media Tray Full -#: locale/ipp-strings.c:3354 +#: locale/ipp-strings.c:3392 msgid "printer-state-reasons.media-path-media-tray-full" msgstr "Media Path Media Tray Full" #. TRANSLATORS: Media Path Media Tray Missing -#: locale/ipp-strings.c:3356 +#: locale/ipp-strings.c:3394 msgid "printer-state-reasons.media-path-media-tray-missing" msgstr "Media Path Media Tray Missing" #. TRANSLATORS: Motor Failure -#: locale/ipp-strings.c:3372 +#: locale/ipp-strings.c:3410 msgid "printer-state-reasons.motor-failure" msgstr "Motor Failure" #. TRANSLATORS: Printer going offline -#: locale/ipp-strings.c:3374 +#: locale/ipp-strings.c:3412 msgid "printer-state-reasons.moving-to-paused" msgstr "Moving To Paused" #. TRANSLATORS: None -#: locale/ipp-strings.c:3376 +#: locale/ipp-strings.c:3414 msgid "printer-state-reasons.none" msgstr "None" #. TRANSLATORS: Optical Photoconductor Life Over -#: locale/ipp-strings.c:3378 +#: locale/ipp-strings.c:3416 msgid "printer-state-reasons.opc-life-over" msgstr "Opc Life Over" #. TRANSLATORS: OPC almost at end-of-life -#: locale/ipp-strings.c:3380 +#: locale/ipp-strings.c:3418 msgid "printer-state-reasons.opc-near-eol" msgstr "Opc Near Eol" #. TRANSLATORS: Check the printer for errors -#: locale/ipp-strings.c:3382 +#: locale/ipp-strings.c:3420 msgid "printer-state-reasons.other" msgstr "Other" #. TRANSLATORS: Output bin is almost full -#: locale/ipp-strings.c:3384 +#: locale/ipp-strings.c:3422 msgid "printer-state-reasons.output-area-almost-full" msgstr "Output Area Almost Full" #. TRANSLATORS: Output bin is full -#: locale/ipp-strings.c:3386 +#: locale/ipp-strings.c:3424 msgid "printer-state-reasons.output-area-full" msgstr "Output Area Full" #. TRANSLATORS: Output Mailbox Select Failure -#: locale/ipp-strings.c:3388 +#: locale/ipp-strings.c:3426 msgid "printer-state-reasons.output-mailbox-select-failure" msgstr "Output Mailbox Select Failure" #. TRANSLATORS: Output tray is missing -#: locale/ipp-strings.c:3396 +#: locale/ipp-strings.c:3434 msgid "printer-state-reasons.output-tray-missing" msgstr "Output Tray Missing" #. TRANSLATORS: Paused -#: locale/ipp-strings.c:3398 +#: locale/ipp-strings.c:3436 msgid "printer-state-reasons.paused" msgstr "Paused" #. TRANSLATORS: Perforater Added -#: locale/ipp-strings.c:3400 +#: locale/ipp-strings.c:3438 msgid "printer-state-reasons.perforater-added" msgstr "Perforater Added" #. TRANSLATORS: Perforater Almost Empty -#: locale/ipp-strings.c:3402 +#: locale/ipp-strings.c:3440 msgid "printer-state-reasons.perforater-almost-empty" msgstr "Perforater Almost Empty" #. TRANSLATORS: Perforater Almost Full -#: locale/ipp-strings.c:3404 +#: locale/ipp-strings.c:3442 msgid "printer-state-reasons.perforater-almost-full" msgstr "Perforater Almost Full" #. TRANSLATORS: Perforater At Limit -#: locale/ipp-strings.c:3406 +#: locale/ipp-strings.c:3444 msgid "printer-state-reasons.perforater-at-limit" msgstr "Perforater At Limit" #. TRANSLATORS: Perforater Closed -#: locale/ipp-strings.c:3408 +#: locale/ipp-strings.c:3446 msgid "printer-state-reasons.perforater-closed" msgstr "Perforater Closed" #. TRANSLATORS: Perforater Configuration Change -#: locale/ipp-strings.c:3410 +#: locale/ipp-strings.c:3448 msgid "printer-state-reasons.perforater-configuration-change" msgstr "Perforater Configuration Change" #. TRANSLATORS: Perforater Cover Closed -#: locale/ipp-strings.c:3412 +#: locale/ipp-strings.c:3450 msgid "printer-state-reasons.perforater-cover-closed" msgstr "Perforater Cover Closed" #. TRANSLATORS: Perforater Cover Open -#: locale/ipp-strings.c:3414 +#: locale/ipp-strings.c:3452 msgid "printer-state-reasons.perforater-cover-open" msgstr "Perforater Cover Open" #. TRANSLATORS: Perforater Empty -#: locale/ipp-strings.c:3416 +#: locale/ipp-strings.c:3454 msgid "printer-state-reasons.perforater-empty" msgstr "Perforater Empty" #. TRANSLATORS: Perforater Full -#: locale/ipp-strings.c:3418 +#: locale/ipp-strings.c:3456 msgid "printer-state-reasons.perforater-full" msgstr "Perforater Full" #. TRANSLATORS: Perforater Interlock Closed -#: locale/ipp-strings.c:3420 +#: locale/ipp-strings.c:3458 msgid "printer-state-reasons.perforater-interlock-closed" msgstr "Perforater Interlock Closed" #. TRANSLATORS: Perforater Interlock Open -#: locale/ipp-strings.c:3422 +#: locale/ipp-strings.c:3460 msgid "printer-state-reasons.perforater-interlock-open" msgstr "Perforater Interlock Open" #. TRANSLATORS: Perforater Jam -#: locale/ipp-strings.c:3424 +#: locale/ipp-strings.c:3462 msgid "printer-state-reasons.perforater-jam" msgstr "Perforater Jam" #. TRANSLATORS: Perforater Life Almost Over -#: locale/ipp-strings.c:3426 +#: locale/ipp-strings.c:3464 msgid "printer-state-reasons.perforater-life-almost-over" msgstr "Perforater Life Almost Over" #. TRANSLATORS: Perforater Life Over -#: locale/ipp-strings.c:3428 +#: locale/ipp-strings.c:3466 msgid "printer-state-reasons.perforater-life-over" msgstr "Perforater Life Over" #. TRANSLATORS: Perforater Memory Exhausted -#: locale/ipp-strings.c:3430 +#: locale/ipp-strings.c:3468 msgid "printer-state-reasons.perforater-memory-exhausted" msgstr "Perforater Memory Exhausted" #. TRANSLATORS: Perforater Missing -#: locale/ipp-strings.c:3432 +#: locale/ipp-strings.c:3470 msgid "printer-state-reasons.perforater-missing" msgstr "Perforater Missing" #. TRANSLATORS: Perforater Motor Failure -#: locale/ipp-strings.c:3434 +#: locale/ipp-strings.c:3472 msgid "printer-state-reasons.perforater-motor-failure" msgstr "Perforater Motor Failure" #. TRANSLATORS: Perforater Near Limit -#: locale/ipp-strings.c:3436 +#: locale/ipp-strings.c:3474 msgid "printer-state-reasons.perforater-near-limit" msgstr "Perforater Near Limit" #. TRANSLATORS: Perforater Offline -#: locale/ipp-strings.c:3438 +#: locale/ipp-strings.c:3476 msgid "printer-state-reasons.perforater-offline" msgstr "Perforater Offline" #. TRANSLATORS: Perforater Opened -#: locale/ipp-strings.c:3440 +#: locale/ipp-strings.c:3478 msgid "printer-state-reasons.perforater-opened" msgstr "Perforater Opened" #. TRANSLATORS: Perforater Over Temperature -#: locale/ipp-strings.c:3442 +#: locale/ipp-strings.c:3480 msgid "printer-state-reasons.perforater-over-temperature" msgstr "Perforater Over Temperature" #. TRANSLATORS: Perforater Power Saver -#: locale/ipp-strings.c:3444 +#: locale/ipp-strings.c:3482 msgid "printer-state-reasons.perforater-power-saver" msgstr "Perforater Power Saver" #. TRANSLATORS: Perforater Recoverable Failure -#: locale/ipp-strings.c:3446 +#: locale/ipp-strings.c:3484 msgid "printer-state-reasons.perforater-recoverable-failure" msgstr "Perforater Recoverable Failure" #. TRANSLATORS: Perforater Recoverable Storage -#: locale/ipp-strings.c:3448 +#: locale/ipp-strings.c:3486 msgid "printer-state-reasons.perforater-recoverable-storage" msgstr "Perforater Recoverable Storage" #. TRANSLATORS: Perforater Removed -#: locale/ipp-strings.c:3450 +#: locale/ipp-strings.c:3488 msgid "printer-state-reasons.perforater-removed" msgstr "Perforater Removed" #. TRANSLATORS: Perforater Resource Added -#: locale/ipp-strings.c:3452 +#: locale/ipp-strings.c:3490 msgid "printer-state-reasons.perforater-resource-added" msgstr "Perforater Resource Added" #. TRANSLATORS: Perforater Resource Removed -#: locale/ipp-strings.c:3454 +#: locale/ipp-strings.c:3492 msgid "printer-state-reasons.perforater-resource-removed" msgstr "Perforater Resource Removed" #. TRANSLATORS: Perforater Thermistor Failure -#: locale/ipp-strings.c:3456 +#: locale/ipp-strings.c:3494 msgid "printer-state-reasons.perforater-thermistor-failure" msgstr "Perforater Thermistor Failure" #. TRANSLATORS: Perforater Timing Failure -#: locale/ipp-strings.c:3458 +#: locale/ipp-strings.c:3496 msgid "printer-state-reasons.perforater-timing-failure" msgstr "Perforater Timing Failure" #. TRANSLATORS: Perforater Turned Off -#: locale/ipp-strings.c:3460 +#: locale/ipp-strings.c:3498 msgid "printer-state-reasons.perforater-turned-off" msgstr "Perforater Turned Off" #. TRANSLATORS: Perforater Turned On -#: locale/ipp-strings.c:3462 +#: locale/ipp-strings.c:3500 msgid "printer-state-reasons.perforater-turned-on" msgstr "Perforater Turned On" #. TRANSLATORS: Perforater Under Temperature -#: locale/ipp-strings.c:3464 +#: locale/ipp-strings.c:3502 msgid "printer-state-reasons.perforater-under-temperature" msgstr "Perforater Under Temperature" #. TRANSLATORS: Perforater Unrecoverable Failure -#: locale/ipp-strings.c:3466 +#: locale/ipp-strings.c:3504 msgid "printer-state-reasons.perforater-unrecoverable-failure" msgstr "Perforater Unrecoverable Failure" #. TRANSLATORS: Perforater Unrecoverable Storage Error -#: locale/ipp-strings.c:3468 +#: locale/ipp-strings.c:3506 msgid "printer-state-reasons.perforater-unrecoverable-storage-error" msgstr "Perforater Unrecoverable Storage Error" #. TRANSLATORS: Perforater Warming Up -#: locale/ipp-strings.c:3470 +#: locale/ipp-strings.c:3508 msgid "printer-state-reasons.perforater-warming-up" msgstr "Perforater Warming Up" #. TRANSLATORS: Power Down -#: locale/ipp-strings.c:3482 +#: locale/ipp-strings.c:3520 msgid "printer-state-reasons.power-down" msgstr "Power Down" #. TRANSLATORS: Power Up -#: locale/ipp-strings.c:3484 +#: locale/ipp-strings.c:3522 msgid "printer-state-reasons.power-up" msgstr "Power Up" #. TRANSLATORS: Printer Reset Manually -#: locale/ipp-strings.c:3486 +#: locale/ipp-strings.c:3524 msgid "printer-state-reasons.printer-manual-reset" msgstr "Printer Manual Reset" #. TRANSLATORS: Printer Reset Remotely -#: locale/ipp-strings.c:3488 +#: locale/ipp-strings.c:3526 msgid "printer-state-reasons.printer-nms-reset" msgstr "Printer Nms Reset" #. TRANSLATORS: Printer Ready To Print -#: locale/ipp-strings.c:3490 +#: locale/ipp-strings.c:3528 msgid "printer-state-reasons.printer-ready-to-print" msgstr "Printer Ready To Print" #. TRANSLATORS: Puncher Added -#: locale/ipp-strings.c:3492 +#: locale/ipp-strings.c:3530 msgid "printer-state-reasons.puncher-added" msgstr "Puncher Added" #. TRANSLATORS: Puncher Almost Empty -#: locale/ipp-strings.c:3494 +#: locale/ipp-strings.c:3532 msgid "printer-state-reasons.puncher-almost-empty" msgstr "Puncher Almost Empty" #. TRANSLATORS: Puncher Almost Full -#: locale/ipp-strings.c:3496 +#: locale/ipp-strings.c:3534 msgid "printer-state-reasons.puncher-almost-full" msgstr "Puncher Almost Full" #. TRANSLATORS: Puncher At Limit -#: locale/ipp-strings.c:3498 +#: locale/ipp-strings.c:3536 msgid "printer-state-reasons.puncher-at-limit" msgstr "Puncher At Limit" #. TRANSLATORS: Puncher Closed -#: locale/ipp-strings.c:3500 +#: locale/ipp-strings.c:3538 msgid "printer-state-reasons.puncher-closed" msgstr "Puncher Closed" #. TRANSLATORS: Puncher Configuration Change -#: locale/ipp-strings.c:3502 +#: locale/ipp-strings.c:3540 msgid "printer-state-reasons.puncher-configuration-change" msgstr "Puncher Configuration Change" #. TRANSLATORS: Puncher Cover Closed -#: locale/ipp-strings.c:3504 +#: locale/ipp-strings.c:3542 msgid "printer-state-reasons.puncher-cover-closed" msgstr "Puncher Cover Closed" #. TRANSLATORS: Puncher Cover Open -#: locale/ipp-strings.c:3506 +#: locale/ipp-strings.c:3544 msgid "printer-state-reasons.puncher-cover-open" msgstr "Puncher Cover Open" #. TRANSLATORS: Puncher Empty -#: locale/ipp-strings.c:3508 +#: locale/ipp-strings.c:3546 msgid "printer-state-reasons.puncher-empty" msgstr "Puncher Empty" #. TRANSLATORS: Puncher Full -#: locale/ipp-strings.c:3510 +#: locale/ipp-strings.c:3548 msgid "printer-state-reasons.puncher-full" msgstr "Puncher Full" #. TRANSLATORS: Puncher Interlock Closed -#: locale/ipp-strings.c:3512 +#: locale/ipp-strings.c:3550 msgid "printer-state-reasons.puncher-interlock-closed" msgstr "Puncher Interlock Closed" #. TRANSLATORS: Puncher Interlock Open -#: locale/ipp-strings.c:3514 +#: locale/ipp-strings.c:3552 msgid "printer-state-reasons.puncher-interlock-open" msgstr "Puncher Interlock Open" #. TRANSLATORS: Puncher Jam -#: locale/ipp-strings.c:3516 +#: locale/ipp-strings.c:3554 msgid "printer-state-reasons.puncher-jam" msgstr "Puncher Jam" #. TRANSLATORS: Puncher Life Almost Over -#: locale/ipp-strings.c:3518 +#: locale/ipp-strings.c:3556 msgid "printer-state-reasons.puncher-life-almost-over" msgstr "Puncher Life Almost Over" #. TRANSLATORS: Puncher Life Over -#: locale/ipp-strings.c:3520 +#: locale/ipp-strings.c:3558 msgid "printer-state-reasons.puncher-life-over" msgstr "Puncher Life Over" #. TRANSLATORS: Puncher Memory Exhausted -#: locale/ipp-strings.c:3522 +#: locale/ipp-strings.c:3560 msgid "printer-state-reasons.puncher-memory-exhausted" msgstr "Puncher Memory Exhausted" #. TRANSLATORS: Puncher Missing -#: locale/ipp-strings.c:3524 +#: locale/ipp-strings.c:3562 msgid "printer-state-reasons.puncher-missing" msgstr "Puncher Missing" #. TRANSLATORS: Puncher Motor Failure -#: locale/ipp-strings.c:3526 +#: locale/ipp-strings.c:3564 msgid "printer-state-reasons.puncher-motor-failure" msgstr "Puncher Motor Failure" #. TRANSLATORS: Puncher Near Limit -#: locale/ipp-strings.c:3528 +#: locale/ipp-strings.c:3566 msgid "printer-state-reasons.puncher-near-limit" msgstr "Puncher Near Limit" #. TRANSLATORS: Puncher Offline -#: locale/ipp-strings.c:3530 +#: locale/ipp-strings.c:3568 msgid "printer-state-reasons.puncher-offline" msgstr "Puncher Offline" #. TRANSLATORS: Puncher Opened -#: locale/ipp-strings.c:3532 +#: locale/ipp-strings.c:3570 msgid "printer-state-reasons.puncher-opened" msgstr "Puncher Opened" #. TRANSLATORS: Puncher Over Temperature -#: locale/ipp-strings.c:3534 +#: locale/ipp-strings.c:3572 msgid "printer-state-reasons.puncher-over-temperature" msgstr "Puncher Over Temperature" #. TRANSLATORS: Puncher Power Saver -#: locale/ipp-strings.c:3536 +#: locale/ipp-strings.c:3574 msgid "printer-state-reasons.puncher-power-saver" msgstr "Puncher Power Saver" #. TRANSLATORS: Puncher Recoverable Failure -#: locale/ipp-strings.c:3538 +#: locale/ipp-strings.c:3576 msgid "printer-state-reasons.puncher-recoverable-failure" msgstr "Puncher Recoverable Failure" #. TRANSLATORS: Puncher Recoverable Storage -#: locale/ipp-strings.c:3540 +#: locale/ipp-strings.c:3578 msgid "printer-state-reasons.puncher-recoverable-storage" msgstr "Puncher Recoverable Storage" #. TRANSLATORS: Puncher Removed -#: locale/ipp-strings.c:3542 +#: locale/ipp-strings.c:3580 msgid "printer-state-reasons.puncher-removed" msgstr "Puncher Removed" #. TRANSLATORS: Puncher Resource Added -#: locale/ipp-strings.c:3544 +#: locale/ipp-strings.c:3582 msgid "printer-state-reasons.puncher-resource-added" msgstr "Puncher Resource Added" #. TRANSLATORS: Puncher Resource Removed -#: locale/ipp-strings.c:3546 +#: locale/ipp-strings.c:3584 msgid "printer-state-reasons.puncher-resource-removed" msgstr "Puncher Resource Removed" #. TRANSLATORS: Puncher Thermistor Failure -#: locale/ipp-strings.c:3548 +#: locale/ipp-strings.c:3586 msgid "printer-state-reasons.puncher-thermistor-failure" msgstr "Puncher Thermistor Failure" #. TRANSLATORS: Puncher Timing Failure -#: locale/ipp-strings.c:3550 +#: locale/ipp-strings.c:3588 msgid "printer-state-reasons.puncher-timing-failure" msgstr "Puncher Timing Failure" #. TRANSLATORS: Puncher Turned Off -#: locale/ipp-strings.c:3552 +#: locale/ipp-strings.c:3590 msgid "printer-state-reasons.puncher-turned-off" msgstr "Puncher Turned Off" #. TRANSLATORS: Puncher Turned On -#: locale/ipp-strings.c:3554 +#: locale/ipp-strings.c:3592 msgid "printer-state-reasons.puncher-turned-on" msgstr "Puncher Turned On" #. TRANSLATORS: Puncher Under Temperature -#: locale/ipp-strings.c:3556 +#: locale/ipp-strings.c:3594 msgid "printer-state-reasons.puncher-under-temperature" msgstr "Puncher Under Temperature" #. TRANSLATORS: Puncher Unrecoverable Failure -#: locale/ipp-strings.c:3558 +#: locale/ipp-strings.c:3596 msgid "printer-state-reasons.puncher-unrecoverable-failure" msgstr "Puncher Unrecoverable Failure" #. TRANSLATORS: Puncher Unrecoverable Storage Error -#: locale/ipp-strings.c:3560 +#: locale/ipp-strings.c:3598 msgid "printer-state-reasons.puncher-unrecoverable-storage-error" msgstr "Puncher Unrecoverable Storage Error" #. TRANSLATORS: Puncher Warming Up -#: locale/ipp-strings.c:3562 +#: locale/ipp-strings.c:3600 msgid "printer-state-reasons.puncher-warming-up" msgstr "Puncher Warming Up" #. TRANSLATORS: Separation Cutter Added -#: locale/ipp-strings.c:3564 +#: locale/ipp-strings.c:3602 msgid "printer-state-reasons.separation-cutter-added" msgstr "Separation Cutter Added" #. TRANSLATORS: Separation Cutter Almost Empty -#: locale/ipp-strings.c:3566 +#: locale/ipp-strings.c:3604 msgid "printer-state-reasons.separation-cutter-almost-empty" msgstr "Separation Cutter Almost Empty" #. TRANSLATORS: Separation Cutter Almost Full -#: locale/ipp-strings.c:3568 +#: locale/ipp-strings.c:3606 msgid "printer-state-reasons.separation-cutter-almost-full" msgstr "Separation Cutter Almost Full" #. TRANSLATORS: Separation Cutter At Limit -#: locale/ipp-strings.c:3570 +#: locale/ipp-strings.c:3608 msgid "printer-state-reasons.separation-cutter-at-limit" msgstr "Separation Cutter At Limit" #. TRANSLATORS: Separation Cutter Closed -#: locale/ipp-strings.c:3572 +#: locale/ipp-strings.c:3610 msgid "printer-state-reasons.separation-cutter-closed" msgstr "Separation Cutter Closed" #. TRANSLATORS: Separation Cutter Configuration Change -#: locale/ipp-strings.c:3574 +#: locale/ipp-strings.c:3612 msgid "printer-state-reasons.separation-cutter-configuration-change" msgstr "Separation Cutter Configuration Change" #. TRANSLATORS: Separation Cutter Cover Closed -#: locale/ipp-strings.c:3576 +#: locale/ipp-strings.c:3614 msgid "printer-state-reasons.separation-cutter-cover-closed" msgstr "Separation Cutter Cover Closed" #. TRANSLATORS: Separation Cutter Cover Open -#: locale/ipp-strings.c:3578 +#: locale/ipp-strings.c:3616 msgid "printer-state-reasons.separation-cutter-cover-open" msgstr "Separation Cutter Cover Open" #. TRANSLATORS: Separation Cutter Empty -#: locale/ipp-strings.c:3580 +#: locale/ipp-strings.c:3618 msgid "printer-state-reasons.separation-cutter-empty" msgstr "Separation Cutter Empty" #. TRANSLATORS: Separation Cutter Full -#: locale/ipp-strings.c:3582 +#: locale/ipp-strings.c:3620 msgid "printer-state-reasons.separation-cutter-full" msgstr "Separation Cutter Full" #. TRANSLATORS: Separation Cutter Interlock Closed -#: locale/ipp-strings.c:3584 +#: locale/ipp-strings.c:3622 msgid "printer-state-reasons.separation-cutter-interlock-closed" msgstr "Separation Cutter Interlock Closed" #. TRANSLATORS: Separation Cutter Interlock Open -#: locale/ipp-strings.c:3586 +#: locale/ipp-strings.c:3624 msgid "printer-state-reasons.separation-cutter-interlock-open" msgstr "Separation Cutter Interlock Open" #. TRANSLATORS: Separation Cutter Jam -#: locale/ipp-strings.c:3588 +#: locale/ipp-strings.c:3626 msgid "printer-state-reasons.separation-cutter-jam" msgstr "Separation Cutter Jam" #. TRANSLATORS: Separation Cutter Life Almost Over -#: locale/ipp-strings.c:3590 +#: locale/ipp-strings.c:3628 msgid "printer-state-reasons.separation-cutter-life-almost-over" msgstr "Separation Cutter Life Almost Over" #. TRANSLATORS: Separation Cutter Life Over -#: locale/ipp-strings.c:3592 +#: locale/ipp-strings.c:3630 msgid "printer-state-reasons.separation-cutter-life-over" msgstr "Separation Cutter Life Over" #. TRANSLATORS: Separation Cutter Memory Exhausted -#: locale/ipp-strings.c:3594 +#: locale/ipp-strings.c:3632 msgid "printer-state-reasons.separation-cutter-memory-exhausted" msgstr "Separation Cutter Memory Exhausted" #. TRANSLATORS: Separation Cutter Missing -#: locale/ipp-strings.c:3596 +#: locale/ipp-strings.c:3634 msgid "printer-state-reasons.separation-cutter-missing" msgstr "Separation Cutter Missing" #. TRANSLATORS: Separation Cutter Motor Failure -#: locale/ipp-strings.c:3598 +#: locale/ipp-strings.c:3636 msgid "printer-state-reasons.separation-cutter-motor-failure" msgstr "Separation Cutter Motor Failure" #. TRANSLATORS: Separation Cutter Near Limit -#: locale/ipp-strings.c:3600 +#: locale/ipp-strings.c:3638 msgid "printer-state-reasons.separation-cutter-near-limit" msgstr "Separation Cutter Near Limit" #. TRANSLATORS: Separation Cutter Offline -#: locale/ipp-strings.c:3602 +#: locale/ipp-strings.c:3640 msgid "printer-state-reasons.separation-cutter-offline" msgstr "Separation Cutter Offline" #. TRANSLATORS: Separation Cutter Opened -#: locale/ipp-strings.c:3604 +#: locale/ipp-strings.c:3642 msgid "printer-state-reasons.separation-cutter-opened" msgstr "Separation Cutter Opened" #. TRANSLATORS: Separation Cutter Over Temperature -#: locale/ipp-strings.c:3606 +#: locale/ipp-strings.c:3644 msgid "printer-state-reasons.separation-cutter-over-temperature" msgstr "Separation Cutter Over Temperature" #. TRANSLATORS: Separation Cutter Power Saver -#: locale/ipp-strings.c:3608 +#: locale/ipp-strings.c:3646 msgid "printer-state-reasons.separation-cutter-power-saver" msgstr "Separation Cutter Power Saver" #. TRANSLATORS: Separation Cutter Recoverable Failure -#: locale/ipp-strings.c:3610 +#: locale/ipp-strings.c:3648 msgid "printer-state-reasons.separation-cutter-recoverable-failure" msgstr "Separation Cutter Recoverable Failure" #. TRANSLATORS: Separation Cutter Recoverable Storage -#: locale/ipp-strings.c:3612 +#: locale/ipp-strings.c:3650 msgid "printer-state-reasons.separation-cutter-recoverable-storage" msgstr "Separation Cutter Recoverable Storage" #. TRANSLATORS: Separation Cutter Removed -#: locale/ipp-strings.c:3614 +#: locale/ipp-strings.c:3652 msgid "printer-state-reasons.separation-cutter-removed" msgstr "Separation Cutter Removed" #. TRANSLATORS: Separation Cutter Resource Added -#: locale/ipp-strings.c:3616 +#: locale/ipp-strings.c:3654 msgid "printer-state-reasons.separation-cutter-resource-added" msgstr "Separation Cutter Resource Added" #. TRANSLATORS: Separation Cutter Resource Removed -#: locale/ipp-strings.c:3618 +#: locale/ipp-strings.c:3656 msgid "printer-state-reasons.separation-cutter-resource-removed" msgstr "Separation Cutter Resource Removed" #. TRANSLATORS: Separation Cutter Thermistor Failure -#: locale/ipp-strings.c:3620 +#: locale/ipp-strings.c:3658 msgid "printer-state-reasons.separation-cutter-thermistor-failure" msgstr "Separation Cutter Thermistor Failure" #. TRANSLATORS: Separation Cutter Timing Failure -#: locale/ipp-strings.c:3622 +#: locale/ipp-strings.c:3660 msgid "printer-state-reasons.separation-cutter-timing-failure" msgstr "Separation Cutter Timing Failure" #. TRANSLATORS: Separation Cutter Turned Off -#: locale/ipp-strings.c:3624 +#: locale/ipp-strings.c:3662 msgid "printer-state-reasons.separation-cutter-turned-off" msgstr "Separation Cutter Turned Off" #. TRANSLATORS: Separation Cutter Turned On -#: locale/ipp-strings.c:3626 +#: locale/ipp-strings.c:3664 msgid "printer-state-reasons.separation-cutter-turned-on" msgstr "Separation Cutter Turned On" #. TRANSLATORS: Separation Cutter Under Temperature -#: locale/ipp-strings.c:3628 +#: locale/ipp-strings.c:3666 msgid "printer-state-reasons.separation-cutter-under-temperature" msgstr "Separation Cutter Under Temperature" #. TRANSLATORS: Separation Cutter Unrecoverable Failure -#: locale/ipp-strings.c:3630 +#: locale/ipp-strings.c:3668 msgid "printer-state-reasons.separation-cutter-unrecoverable-failure" msgstr "Separation Cutter Unrecoverable Failure" #. TRANSLATORS: Separation Cutter Unrecoverable Storage Error -#: locale/ipp-strings.c:3632 +#: locale/ipp-strings.c:3670 msgid "printer-state-reasons.separation-cutter-unrecoverable-storage-error" msgstr "Separation Cutter Unrecoverable Storage Error" #. TRANSLATORS: Separation Cutter Warming Up -#: locale/ipp-strings.c:3634 +#: locale/ipp-strings.c:3672 msgid "printer-state-reasons.separation-cutter-warming-up" msgstr "Separation Cutter Warming Up" #. TRANSLATORS: Sheet Rotator Added -#: locale/ipp-strings.c:3636 +#: locale/ipp-strings.c:3674 msgid "printer-state-reasons.sheet-rotator-added" msgstr "Sheet Rotator Added" #. TRANSLATORS: Sheet Rotator Almost Empty -#: locale/ipp-strings.c:3638 +#: locale/ipp-strings.c:3676 msgid "printer-state-reasons.sheet-rotator-almost-empty" msgstr "Sheet Rotator Almost Empty" #. TRANSLATORS: Sheet Rotator Almost Full -#: locale/ipp-strings.c:3640 +#: locale/ipp-strings.c:3678 msgid "printer-state-reasons.sheet-rotator-almost-full" msgstr "Sheet Rotator Almost Full" #. TRANSLATORS: Sheet Rotator At Limit -#: locale/ipp-strings.c:3642 +#: locale/ipp-strings.c:3680 msgid "printer-state-reasons.sheet-rotator-at-limit" msgstr "Sheet Rotator At Limit" #. TRANSLATORS: Sheet Rotator Closed -#: locale/ipp-strings.c:3644 +#: locale/ipp-strings.c:3682 msgid "printer-state-reasons.sheet-rotator-closed" msgstr "Sheet Rotator Closed" #. TRANSLATORS: Sheet Rotator Configuration Change -#: locale/ipp-strings.c:3646 +#: locale/ipp-strings.c:3684 msgid "printer-state-reasons.sheet-rotator-configuration-change" msgstr "Sheet Rotator Configuration Change" #. TRANSLATORS: Sheet Rotator Cover Closed -#: locale/ipp-strings.c:3648 +#: locale/ipp-strings.c:3686 msgid "printer-state-reasons.sheet-rotator-cover-closed" msgstr "Sheet Rotator Cover Closed" #. TRANSLATORS: Sheet Rotator Cover Open -#: locale/ipp-strings.c:3650 +#: locale/ipp-strings.c:3688 msgid "printer-state-reasons.sheet-rotator-cover-open" msgstr "Sheet Rotator Cover Open" #. TRANSLATORS: Sheet Rotator Empty -#: locale/ipp-strings.c:3652 +#: locale/ipp-strings.c:3690 msgid "printer-state-reasons.sheet-rotator-empty" msgstr "Sheet Rotator Empty" #. TRANSLATORS: Sheet Rotator Full -#: locale/ipp-strings.c:3654 +#: locale/ipp-strings.c:3692 msgid "printer-state-reasons.sheet-rotator-full" msgstr "Sheet Rotator Full" #. TRANSLATORS: Sheet Rotator Interlock Closed -#: locale/ipp-strings.c:3656 +#: locale/ipp-strings.c:3694 msgid "printer-state-reasons.sheet-rotator-interlock-closed" msgstr "Sheet Rotator Interlock Closed" #. TRANSLATORS: Sheet Rotator Interlock Open -#: locale/ipp-strings.c:3658 +#: locale/ipp-strings.c:3696 msgid "printer-state-reasons.sheet-rotator-interlock-open" msgstr "Sheet Rotator Interlock Open" #. TRANSLATORS: Sheet Rotator Jam -#: locale/ipp-strings.c:3660 +#: locale/ipp-strings.c:3698 msgid "printer-state-reasons.sheet-rotator-jam" msgstr "Sheet Rotator Jam" #. TRANSLATORS: Sheet Rotator Life Almost Over -#: locale/ipp-strings.c:3662 +#: locale/ipp-strings.c:3700 msgid "printer-state-reasons.sheet-rotator-life-almost-over" msgstr "Sheet Rotator Life Almost Over" #. TRANSLATORS: Sheet Rotator Life Over -#: locale/ipp-strings.c:3664 +#: locale/ipp-strings.c:3702 msgid "printer-state-reasons.sheet-rotator-life-over" msgstr "Sheet Rotator Life Over" #. TRANSLATORS: Sheet Rotator Memory Exhausted -#: locale/ipp-strings.c:3666 +#: locale/ipp-strings.c:3704 msgid "printer-state-reasons.sheet-rotator-memory-exhausted" msgstr "Sheet Rotator Memory Exhausted" #. TRANSLATORS: Sheet Rotator Missing -#: locale/ipp-strings.c:3668 +#: locale/ipp-strings.c:3706 msgid "printer-state-reasons.sheet-rotator-missing" msgstr "Sheet Rotator Missing" #. TRANSLATORS: Sheet Rotator Motor Failure -#: locale/ipp-strings.c:3670 +#: locale/ipp-strings.c:3708 msgid "printer-state-reasons.sheet-rotator-motor-failure" msgstr "Sheet Rotator Motor Failure" #. TRANSLATORS: Sheet Rotator Near Limit -#: locale/ipp-strings.c:3672 +#: locale/ipp-strings.c:3710 msgid "printer-state-reasons.sheet-rotator-near-limit" msgstr "Sheet Rotator Near Limit" #. TRANSLATORS: Sheet Rotator Offline -#: locale/ipp-strings.c:3674 +#: locale/ipp-strings.c:3712 msgid "printer-state-reasons.sheet-rotator-offline" msgstr "Sheet Rotator Offline" #. TRANSLATORS: Sheet Rotator Opened -#: locale/ipp-strings.c:3676 +#: locale/ipp-strings.c:3714 msgid "printer-state-reasons.sheet-rotator-opened" msgstr "Sheet Rotator Opened" #. TRANSLATORS: Sheet Rotator Over Temperature -#: locale/ipp-strings.c:3678 +#: locale/ipp-strings.c:3716 msgid "printer-state-reasons.sheet-rotator-over-temperature" msgstr "Sheet Rotator Over Temperature" #. TRANSLATORS: Sheet Rotator Power Saver -#: locale/ipp-strings.c:3680 +#: locale/ipp-strings.c:3718 msgid "printer-state-reasons.sheet-rotator-power-saver" msgstr "Sheet Rotator Power Saver" #. TRANSLATORS: Sheet Rotator Recoverable Failure -#: locale/ipp-strings.c:3682 +#: locale/ipp-strings.c:3720 msgid "printer-state-reasons.sheet-rotator-recoverable-failure" msgstr "Sheet Rotator Recoverable Failure" #. TRANSLATORS: Sheet Rotator Recoverable Storage -#: locale/ipp-strings.c:3684 +#: locale/ipp-strings.c:3722 msgid "printer-state-reasons.sheet-rotator-recoverable-storage" msgstr "Sheet Rotator Recoverable Storage" #. TRANSLATORS: Sheet Rotator Removed -#: locale/ipp-strings.c:3686 +#: locale/ipp-strings.c:3724 msgid "printer-state-reasons.sheet-rotator-removed" msgstr "Sheet Rotator Removed" #. TRANSLATORS: Sheet Rotator Resource Added -#: locale/ipp-strings.c:3688 +#: locale/ipp-strings.c:3726 msgid "printer-state-reasons.sheet-rotator-resource-added" msgstr "Sheet Rotator Resource Added" #. TRANSLATORS: Sheet Rotator Resource Removed -#: locale/ipp-strings.c:3690 +#: locale/ipp-strings.c:3728 msgid "printer-state-reasons.sheet-rotator-resource-removed" msgstr "Sheet Rotator Resource Removed" #. TRANSLATORS: Sheet Rotator Thermistor Failure -#: locale/ipp-strings.c:3692 +#: locale/ipp-strings.c:3730 msgid "printer-state-reasons.sheet-rotator-thermistor-failure" msgstr "Sheet Rotator Thermistor Failure" #. TRANSLATORS: Sheet Rotator Timing Failure -#: locale/ipp-strings.c:3694 +#: locale/ipp-strings.c:3732 msgid "printer-state-reasons.sheet-rotator-timing-failure" msgstr "Sheet Rotator Timing Failure" #. TRANSLATORS: Sheet Rotator Turned Off -#: locale/ipp-strings.c:3696 +#: locale/ipp-strings.c:3734 msgid "printer-state-reasons.sheet-rotator-turned-off" msgstr "Sheet Rotator Turned Off" #. TRANSLATORS: Sheet Rotator Turned On -#: locale/ipp-strings.c:3698 +#: locale/ipp-strings.c:3736 msgid "printer-state-reasons.sheet-rotator-turned-on" msgstr "Sheet Rotator Turned On" #. TRANSLATORS: Sheet Rotator Under Temperature -#: locale/ipp-strings.c:3700 +#: locale/ipp-strings.c:3738 msgid "printer-state-reasons.sheet-rotator-under-temperature" msgstr "Sheet Rotator Under Temperature" #. TRANSLATORS: Sheet Rotator Unrecoverable Failure -#: locale/ipp-strings.c:3702 +#: locale/ipp-strings.c:3740 msgid "printer-state-reasons.sheet-rotator-unrecoverable-failure" msgstr "Sheet Rotator Unrecoverable Failure" #. TRANSLATORS: Sheet Rotator Unrecoverable Storage Error -#: locale/ipp-strings.c:3704 +#: locale/ipp-strings.c:3742 msgid "printer-state-reasons.sheet-rotator-unrecoverable-storage-error" msgstr "Sheet Rotator Unrecoverable Storage Error" #. TRANSLATORS: Sheet Rotator Warming Up -#: locale/ipp-strings.c:3706 +#: locale/ipp-strings.c:3744 msgid "printer-state-reasons.sheet-rotator-warming-up" msgstr "Sheet Rotator Warming Up" #. TRANSLATORS: Printer offline -#: locale/ipp-strings.c:3708 +#: locale/ipp-strings.c:3746 msgid "printer-state-reasons.shutdown" msgstr "Shutdown" #. TRANSLATORS: Slitter Added -#: locale/ipp-strings.c:3710 +#: locale/ipp-strings.c:3748 msgid "printer-state-reasons.slitter-added" msgstr "Slitter Added" #. TRANSLATORS: Slitter Almost Empty -#: locale/ipp-strings.c:3712 +#: locale/ipp-strings.c:3750 msgid "printer-state-reasons.slitter-almost-empty" msgstr "Slitter Almost Empty" #. TRANSLATORS: Slitter Almost Full -#: locale/ipp-strings.c:3714 +#: locale/ipp-strings.c:3752 msgid "printer-state-reasons.slitter-almost-full" msgstr "Slitter Almost Full" #. TRANSLATORS: Slitter At Limit -#: locale/ipp-strings.c:3716 +#: locale/ipp-strings.c:3754 msgid "printer-state-reasons.slitter-at-limit" msgstr "Slitter At Limit" #. TRANSLATORS: Slitter Closed -#: locale/ipp-strings.c:3718 +#: locale/ipp-strings.c:3756 msgid "printer-state-reasons.slitter-closed" msgstr "Slitter Closed" #. TRANSLATORS: Slitter Configuration Change -#: locale/ipp-strings.c:3720 +#: locale/ipp-strings.c:3758 msgid "printer-state-reasons.slitter-configuration-change" msgstr "Slitter Configuration Change" #. TRANSLATORS: Slitter Cover Closed -#: locale/ipp-strings.c:3722 +#: locale/ipp-strings.c:3760 msgid "printer-state-reasons.slitter-cover-closed" msgstr "Slitter Cover Closed" #. TRANSLATORS: Slitter Cover Open -#: locale/ipp-strings.c:3724 +#: locale/ipp-strings.c:3762 msgid "printer-state-reasons.slitter-cover-open" msgstr "Slitter Cover Open" #. TRANSLATORS: Slitter Empty -#: locale/ipp-strings.c:3726 +#: locale/ipp-strings.c:3764 msgid "printer-state-reasons.slitter-empty" msgstr "Slitter Empty" #. TRANSLATORS: Slitter Full -#: locale/ipp-strings.c:3728 +#: locale/ipp-strings.c:3766 msgid "printer-state-reasons.slitter-full" msgstr "Slitter Full" #. TRANSLATORS: Slitter Interlock Closed -#: locale/ipp-strings.c:3730 +#: locale/ipp-strings.c:3768 msgid "printer-state-reasons.slitter-interlock-closed" msgstr "Slitter Interlock Closed" #. TRANSLATORS: Slitter Interlock Open -#: locale/ipp-strings.c:3732 +#: locale/ipp-strings.c:3770 msgid "printer-state-reasons.slitter-interlock-open" msgstr "Slitter Interlock Open" #. TRANSLATORS: Slitter Jam -#: locale/ipp-strings.c:3734 +#: locale/ipp-strings.c:3772 msgid "printer-state-reasons.slitter-jam" msgstr "Slitter Jam" #. TRANSLATORS: Slitter Life Almost Over -#: locale/ipp-strings.c:3736 +#: locale/ipp-strings.c:3774 msgid "printer-state-reasons.slitter-life-almost-over" msgstr "Slitter Life Almost Over" #. TRANSLATORS: Slitter Life Over -#: locale/ipp-strings.c:3738 +#: locale/ipp-strings.c:3776 msgid "printer-state-reasons.slitter-life-over" msgstr "Slitter Life Over" #. TRANSLATORS: Slitter Memory Exhausted -#: locale/ipp-strings.c:3740 +#: locale/ipp-strings.c:3778 msgid "printer-state-reasons.slitter-memory-exhausted" msgstr "Slitter Memory Exhausted" #. TRANSLATORS: Slitter Missing -#: locale/ipp-strings.c:3742 +#: locale/ipp-strings.c:3780 msgid "printer-state-reasons.slitter-missing" msgstr "Slitter Missing" #. TRANSLATORS: Slitter Motor Failure -#: locale/ipp-strings.c:3744 +#: locale/ipp-strings.c:3782 msgid "printer-state-reasons.slitter-motor-failure" msgstr "Slitter Motor Failure" #. TRANSLATORS: Slitter Near Limit -#: locale/ipp-strings.c:3746 +#: locale/ipp-strings.c:3784 msgid "printer-state-reasons.slitter-near-limit" msgstr "Slitter Near Limit" #. TRANSLATORS: Slitter Offline -#: locale/ipp-strings.c:3748 +#: locale/ipp-strings.c:3786 msgid "printer-state-reasons.slitter-offline" msgstr "Slitter Offline" #. TRANSLATORS: Slitter Opened -#: locale/ipp-strings.c:3750 +#: locale/ipp-strings.c:3788 msgid "printer-state-reasons.slitter-opened" msgstr "Slitter Opened" #. TRANSLATORS: Slitter Over Temperature -#: locale/ipp-strings.c:3752 +#: locale/ipp-strings.c:3790 msgid "printer-state-reasons.slitter-over-temperature" msgstr "Slitter Over Temperature" #. TRANSLATORS: Slitter Power Saver -#: locale/ipp-strings.c:3754 +#: locale/ipp-strings.c:3792 msgid "printer-state-reasons.slitter-power-saver" msgstr "Slitter Power Saver" #. TRANSLATORS: Slitter Recoverable Failure -#: locale/ipp-strings.c:3756 +#: locale/ipp-strings.c:3794 msgid "printer-state-reasons.slitter-recoverable-failure" msgstr "Slitter Recoverable Failure" #. TRANSLATORS: Slitter Recoverable Storage -#: locale/ipp-strings.c:3758 +#: locale/ipp-strings.c:3796 msgid "printer-state-reasons.slitter-recoverable-storage" msgstr "Slitter Recoverable Storage" #. TRANSLATORS: Slitter Removed -#: locale/ipp-strings.c:3760 +#: locale/ipp-strings.c:3798 msgid "printer-state-reasons.slitter-removed" msgstr "Slitter Removed" #. TRANSLATORS: Slitter Resource Added -#: locale/ipp-strings.c:3762 +#: locale/ipp-strings.c:3800 msgid "printer-state-reasons.slitter-resource-added" msgstr "Slitter Resource Added" #. TRANSLATORS: Slitter Resource Removed -#: locale/ipp-strings.c:3764 +#: locale/ipp-strings.c:3802 msgid "printer-state-reasons.slitter-resource-removed" msgstr "Slitter Resource Removed" #. TRANSLATORS: Slitter Thermistor Failure -#: locale/ipp-strings.c:3766 +#: locale/ipp-strings.c:3804 msgid "printer-state-reasons.slitter-thermistor-failure" msgstr "Slitter Thermistor Failure" #. TRANSLATORS: Slitter Timing Failure -#: locale/ipp-strings.c:3768 +#: locale/ipp-strings.c:3806 msgid "printer-state-reasons.slitter-timing-failure" msgstr "Slitter Timing Failure" #. TRANSLATORS: Slitter Turned Off -#: locale/ipp-strings.c:3770 +#: locale/ipp-strings.c:3808 msgid "printer-state-reasons.slitter-turned-off" msgstr "Slitter Turned Off" #. TRANSLATORS: Slitter Turned On -#: locale/ipp-strings.c:3772 +#: locale/ipp-strings.c:3810 msgid "printer-state-reasons.slitter-turned-on" msgstr "Slitter Turned On" #. TRANSLATORS: Slitter Under Temperature -#: locale/ipp-strings.c:3774 +#: locale/ipp-strings.c:3812 msgid "printer-state-reasons.slitter-under-temperature" msgstr "Slitter Under Temperature" #. TRANSLATORS: Slitter Unrecoverable Failure -#: locale/ipp-strings.c:3776 +#: locale/ipp-strings.c:3814 msgid "printer-state-reasons.slitter-unrecoverable-failure" msgstr "Slitter Unrecoverable Failure" #. TRANSLATORS: Slitter Unrecoverable Storage Error -#: locale/ipp-strings.c:3778 +#: locale/ipp-strings.c:3816 msgid "printer-state-reasons.slitter-unrecoverable-storage-error" msgstr "Slitter Unrecoverable Storage Error" #. TRANSLATORS: Slitter Warming Up -#: locale/ipp-strings.c:3780 +#: locale/ipp-strings.c:3818 msgid "printer-state-reasons.slitter-warming-up" msgstr "Slitter Warming Up" #. TRANSLATORS: Spool Area Full -#: locale/ipp-strings.c:3782 +#: locale/ipp-strings.c:3820 msgid "printer-state-reasons.spool-area-full" msgstr "Spool Area Full" #. TRANSLATORS: Stacker Added -#: locale/ipp-strings.c:3784 +#: locale/ipp-strings.c:3822 msgid "printer-state-reasons.stacker-added" msgstr "Stacker Added" #. TRANSLATORS: Stacker Almost Empty -#: locale/ipp-strings.c:3786 +#: locale/ipp-strings.c:3824 msgid "printer-state-reasons.stacker-almost-empty" msgstr "Stacker Almost Empty" #. TRANSLATORS: Stacker Almost Full -#: locale/ipp-strings.c:3788 +#: locale/ipp-strings.c:3826 msgid "printer-state-reasons.stacker-almost-full" msgstr "Stacker Almost Full" #. TRANSLATORS: Stacker At Limit -#: locale/ipp-strings.c:3790 +#: locale/ipp-strings.c:3828 msgid "printer-state-reasons.stacker-at-limit" msgstr "Stacker At Limit" #. TRANSLATORS: Stacker Closed -#: locale/ipp-strings.c:3792 +#: locale/ipp-strings.c:3830 msgid "printer-state-reasons.stacker-closed" msgstr "Stacker Closed" #. TRANSLATORS: Stacker Configuration Change -#: locale/ipp-strings.c:3794 +#: locale/ipp-strings.c:3832 msgid "printer-state-reasons.stacker-configuration-change" msgstr "Stacker Configuration Change" #. TRANSLATORS: Stacker Cover Closed -#: locale/ipp-strings.c:3796 +#: locale/ipp-strings.c:3834 msgid "printer-state-reasons.stacker-cover-closed" msgstr "Stacker Cover Closed" #. TRANSLATORS: Stacker Cover Open -#: locale/ipp-strings.c:3798 +#: locale/ipp-strings.c:3836 msgid "printer-state-reasons.stacker-cover-open" msgstr "Stacker Cover Open" #. TRANSLATORS: Stacker Empty -#: locale/ipp-strings.c:3800 +#: locale/ipp-strings.c:3838 msgid "printer-state-reasons.stacker-empty" msgstr "Stacker Empty" #. TRANSLATORS: Stacker Full -#: locale/ipp-strings.c:3802 +#: locale/ipp-strings.c:3840 msgid "printer-state-reasons.stacker-full" msgstr "Stacker Full" #. TRANSLATORS: Stacker Interlock Closed -#: locale/ipp-strings.c:3804 +#: locale/ipp-strings.c:3842 msgid "printer-state-reasons.stacker-interlock-closed" msgstr "Stacker Interlock Closed" #. TRANSLATORS: Stacker Interlock Open -#: locale/ipp-strings.c:3806 +#: locale/ipp-strings.c:3844 msgid "printer-state-reasons.stacker-interlock-open" msgstr "Stacker Interlock Open" #. TRANSLATORS: Stacker Jam -#: locale/ipp-strings.c:3808 +#: locale/ipp-strings.c:3846 msgid "printer-state-reasons.stacker-jam" msgstr "Stacker Jam" #. TRANSLATORS: Stacker Life Almost Over -#: locale/ipp-strings.c:3810 +#: locale/ipp-strings.c:3848 msgid "printer-state-reasons.stacker-life-almost-over" msgstr "Stacker Life Almost Over" #. TRANSLATORS: Stacker Life Over -#: locale/ipp-strings.c:3812 +#: locale/ipp-strings.c:3850 msgid "printer-state-reasons.stacker-life-over" msgstr "Stacker Life Over" #. TRANSLATORS: Stacker Memory Exhausted -#: locale/ipp-strings.c:3814 +#: locale/ipp-strings.c:3852 msgid "printer-state-reasons.stacker-memory-exhausted" msgstr "Stacker Memory Exhausted" #. TRANSLATORS: Stacker Missing -#: locale/ipp-strings.c:3816 +#: locale/ipp-strings.c:3854 msgid "printer-state-reasons.stacker-missing" msgstr "Stacker Missing" #. TRANSLATORS: Stacker Motor Failure -#: locale/ipp-strings.c:3818 +#: locale/ipp-strings.c:3856 msgid "printer-state-reasons.stacker-motor-failure" msgstr "Stacker Motor Failure" #. TRANSLATORS: Stacker Near Limit -#: locale/ipp-strings.c:3820 +#: locale/ipp-strings.c:3858 msgid "printer-state-reasons.stacker-near-limit" msgstr "Stacker Near Limit" #. TRANSLATORS: Stacker Offline -#: locale/ipp-strings.c:3822 +#: locale/ipp-strings.c:3860 msgid "printer-state-reasons.stacker-offline" msgstr "Stacker Offline" #. TRANSLATORS: Stacker Opened -#: locale/ipp-strings.c:3824 +#: locale/ipp-strings.c:3862 msgid "printer-state-reasons.stacker-opened" msgstr "Stacker Opened" #. TRANSLATORS: Stacker Over Temperature -#: locale/ipp-strings.c:3826 +#: locale/ipp-strings.c:3864 msgid "printer-state-reasons.stacker-over-temperature" msgstr "Stacker Over Temperature" #. TRANSLATORS: Stacker Power Saver -#: locale/ipp-strings.c:3828 +#: locale/ipp-strings.c:3866 msgid "printer-state-reasons.stacker-power-saver" msgstr "Stacker Power Saver" #. TRANSLATORS: Stacker Recoverable Failure -#: locale/ipp-strings.c:3830 +#: locale/ipp-strings.c:3868 msgid "printer-state-reasons.stacker-recoverable-failure" msgstr "Stacker Recoverable Failure" #. TRANSLATORS: Stacker Recoverable Storage -#: locale/ipp-strings.c:3832 +#: locale/ipp-strings.c:3870 msgid "printer-state-reasons.stacker-recoverable-storage" msgstr "Stacker Recoverable Storage" #. TRANSLATORS: Stacker Removed -#: locale/ipp-strings.c:3834 +#: locale/ipp-strings.c:3872 msgid "printer-state-reasons.stacker-removed" msgstr "Stacker Removed" #. TRANSLATORS: Stacker Resource Added -#: locale/ipp-strings.c:3836 +#: locale/ipp-strings.c:3874 msgid "printer-state-reasons.stacker-resource-added" msgstr "Stacker Resource Added" #. TRANSLATORS: Stacker Resource Removed -#: locale/ipp-strings.c:3838 +#: locale/ipp-strings.c:3876 msgid "printer-state-reasons.stacker-resource-removed" msgstr "Stacker Resource Removed" #. TRANSLATORS: Stacker Thermistor Failure -#: locale/ipp-strings.c:3840 +#: locale/ipp-strings.c:3878 msgid "printer-state-reasons.stacker-thermistor-failure" msgstr "Stacker Thermistor Failure" #. TRANSLATORS: Stacker Timing Failure -#: locale/ipp-strings.c:3842 +#: locale/ipp-strings.c:3880 msgid "printer-state-reasons.stacker-timing-failure" msgstr "Stacker Timing Failure" #. TRANSLATORS: Stacker Turned Off -#: locale/ipp-strings.c:3844 +#: locale/ipp-strings.c:3882 msgid "printer-state-reasons.stacker-turned-off" msgstr "Stacker Turned Off" #. TRANSLATORS: Stacker Turned On -#: locale/ipp-strings.c:3846 +#: locale/ipp-strings.c:3884 msgid "printer-state-reasons.stacker-turned-on" msgstr "Stacker Turned On" #. TRANSLATORS: Stacker Under Temperature -#: locale/ipp-strings.c:3848 +#: locale/ipp-strings.c:3886 msgid "printer-state-reasons.stacker-under-temperature" msgstr "Stacker Under Temperature" #. TRANSLATORS: Stacker Unrecoverable Failure -#: locale/ipp-strings.c:3850 +#: locale/ipp-strings.c:3888 msgid "printer-state-reasons.stacker-unrecoverable-failure" msgstr "Stacker Unrecoverable Failure" #. TRANSLATORS: Stacker Unrecoverable Storage Error -#: locale/ipp-strings.c:3852 +#: locale/ipp-strings.c:3890 msgid "printer-state-reasons.stacker-unrecoverable-storage-error" msgstr "Stacker Unrecoverable Storage Error" #. TRANSLATORS: Stacker Warming Up -#: locale/ipp-strings.c:3854 +#: locale/ipp-strings.c:3892 msgid "printer-state-reasons.stacker-warming-up" msgstr "Stacker Warming Up" #. TRANSLATORS: Stapler Added -#: locale/ipp-strings.c:3856 +#: locale/ipp-strings.c:3894 msgid "printer-state-reasons.stapler-added" msgstr "Stapler Added" #. TRANSLATORS: Stapler Almost Empty -#: locale/ipp-strings.c:3858 +#: locale/ipp-strings.c:3896 msgid "printer-state-reasons.stapler-almost-empty" msgstr "Stapler Almost Empty" #. TRANSLATORS: Stapler Almost Full -#: locale/ipp-strings.c:3860 +#: locale/ipp-strings.c:3898 msgid "printer-state-reasons.stapler-almost-full" msgstr "Stapler Almost Full" #. TRANSLATORS: Stapler At Limit -#: locale/ipp-strings.c:3862 +#: locale/ipp-strings.c:3900 msgid "printer-state-reasons.stapler-at-limit" msgstr "Stapler At Limit" #. TRANSLATORS: Stapler Closed -#: locale/ipp-strings.c:3864 +#: locale/ipp-strings.c:3902 msgid "printer-state-reasons.stapler-closed" msgstr "Stapler Closed" #. TRANSLATORS: Stapler Configuration Change -#: locale/ipp-strings.c:3866 +#: locale/ipp-strings.c:3904 msgid "printer-state-reasons.stapler-configuration-change" msgstr "Stapler Configuration Change" #. TRANSLATORS: Stapler Cover Closed -#: locale/ipp-strings.c:3868 +#: locale/ipp-strings.c:3906 msgid "printer-state-reasons.stapler-cover-closed" msgstr "Stapler Cover Closed" #. TRANSLATORS: Stapler Cover Open -#: locale/ipp-strings.c:3870 +#: locale/ipp-strings.c:3908 msgid "printer-state-reasons.stapler-cover-open" msgstr "Stapler Cover Open" #. TRANSLATORS: Stapler Empty -#: locale/ipp-strings.c:3872 +#: locale/ipp-strings.c:3910 msgid "printer-state-reasons.stapler-empty" msgstr "Stapler Empty" #. TRANSLATORS: Stapler Full -#: locale/ipp-strings.c:3874 +#: locale/ipp-strings.c:3912 msgid "printer-state-reasons.stapler-full" msgstr "Stapler Full" #. TRANSLATORS: Stapler Interlock Closed -#: locale/ipp-strings.c:3876 +#: locale/ipp-strings.c:3914 msgid "printer-state-reasons.stapler-interlock-closed" msgstr "Stapler Interlock Closed" #. TRANSLATORS: Stapler Interlock Open -#: locale/ipp-strings.c:3878 +#: locale/ipp-strings.c:3916 msgid "printer-state-reasons.stapler-interlock-open" msgstr "Stapler Interlock Open" #. TRANSLATORS: Stapler Jam -#: locale/ipp-strings.c:3880 +#: locale/ipp-strings.c:3918 msgid "printer-state-reasons.stapler-jam" msgstr "Stapler Jam" #. TRANSLATORS: Stapler Life Almost Over -#: locale/ipp-strings.c:3882 +#: locale/ipp-strings.c:3920 msgid "printer-state-reasons.stapler-life-almost-over" msgstr "Stapler Life Almost Over" #. TRANSLATORS: Stapler Life Over -#: locale/ipp-strings.c:3884 +#: locale/ipp-strings.c:3922 msgid "printer-state-reasons.stapler-life-over" msgstr "Stapler Life Over" #. TRANSLATORS: Stapler Memory Exhausted -#: locale/ipp-strings.c:3886 +#: locale/ipp-strings.c:3924 msgid "printer-state-reasons.stapler-memory-exhausted" msgstr "Stapler Memory Exhausted" #. TRANSLATORS: Stapler Missing -#: locale/ipp-strings.c:3888 +#: locale/ipp-strings.c:3926 msgid "printer-state-reasons.stapler-missing" msgstr "Stapler Missing" #. TRANSLATORS: Stapler Motor Failure -#: locale/ipp-strings.c:3890 +#: locale/ipp-strings.c:3928 msgid "printer-state-reasons.stapler-motor-failure" msgstr "Stapler Motor Failure" #. TRANSLATORS: Stapler Near Limit -#: locale/ipp-strings.c:3892 +#: locale/ipp-strings.c:3930 msgid "printer-state-reasons.stapler-near-limit" msgstr "Stapler Near Limit" #. TRANSLATORS: Stapler Offline -#: locale/ipp-strings.c:3894 +#: locale/ipp-strings.c:3932 msgid "printer-state-reasons.stapler-offline" msgstr "Stapler Offline" #. TRANSLATORS: Stapler Opened -#: locale/ipp-strings.c:3896 +#: locale/ipp-strings.c:3934 msgid "printer-state-reasons.stapler-opened" msgstr "Stapler Opened" #. TRANSLATORS: Stapler Over Temperature -#: locale/ipp-strings.c:3898 +#: locale/ipp-strings.c:3936 msgid "printer-state-reasons.stapler-over-temperature" msgstr "Stapler Over Temperature" #. TRANSLATORS: Stapler Power Saver -#: locale/ipp-strings.c:3900 +#: locale/ipp-strings.c:3938 msgid "printer-state-reasons.stapler-power-saver" msgstr "Stapler Power Saver" #. TRANSLATORS: Stapler Recoverable Failure -#: locale/ipp-strings.c:3902 +#: locale/ipp-strings.c:3940 msgid "printer-state-reasons.stapler-recoverable-failure" msgstr "Stapler Recoverable Failure" #. TRANSLATORS: Stapler Recoverable Storage -#: locale/ipp-strings.c:3904 +#: locale/ipp-strings.c:3942 msgid "printer-state-reasons.stapler-recoverable-storage" msgstr "Stapler Recoverable Storage" #. TRANSLATORS: Stapler Removed -#: locale/ipp-strings.c:3906 +#: locale/ipp-strings.c:3944 msgid "printer-state-reasons.stapler-removed" msgstr "Stapler Removed" #. TRANSLATORS: Stapler Resource Added -#: locale/ipp-strings.c:3908 +#: locale/ipp-strings.c:3946 msgid "printer-state-reasons.stapler-resource-added" msgstr "Stapler Resource Added" #. TRANSLATORS: Stapler Resource Removed -#: locale/ipp-strings.c:3910 +#: locale/ipp-strings.c:3948 msgid "printer-state-reasons.stapler-resource-removed" msgstr "Stapler Resource Removed" #. TRANSLATORS: Stapler Thermistor Failure -#: locale/ipp-strings.c:3912 +#: locale/ipp-strings.c:3950 msgid "printer-state-reasons.stapler-thermistor-failure" msgstr "Stapler Thermistor Failure" #. TRANSLATORS: Stapler Timing Failure -#: locale/ipp-strings.c:3914 +#: locale/ipp-strings.c:3952 msgid "printer-state-reasons.stapler-timing-failure" msgstr "Stapler Timing Failure" #. TRANSLATORS: Stapler Turned Off -#: locale/ipp-strings.c:3916 +#: locale/ipp-strings.c:3954 msgid "printer-state-reasons.stapler-turned-off" msgstr "Stapler Turned Off" #. TRANSLATORS: Stapler Turned On -#: locale/ipp-strings.c:3918 +#: locale/ipp-strings.c:3956 msgid "printer-state-reasons.stapler-turned-on" msgstr "Stapler Turned On" #. TRANSLATORS: Stapler Under Temperature -#: locale/ipp-strings.c:3920 +#: locale/ipp-strings.c:3958 msgid "printer-state-reasons.stapler-under-temperature" msgstr "Stapler Under Temperature" #. TRANSLATORS: Stapler Unrecoverable Failure -#: locale/ipp-strings.c:3922 +#: locale/ipp-strings.c:3960 msgid "printer-state-reasons.stapler-unrecoverable-failure" msgstr "Stapler Unrecoverable Failure" #. TRANSLATORS: Stapler Unrecoverable Storage Error -#: locale/ipp-strings.c:3924 +#: locale/ipp-strings.c:3962 msgid "printer-state-reasons.stapler-unrecoverable-storage-error" msgstr "Stapler Unrecoverable Storage Error" #. TRANSLATORS: Stapler Warming Up -#: locale/ipp-strings.c:3926 +#: locale/ipp-strings.c:3964 msgid "printer-state-reasons.stapler-warming-up" msgstr "Stapler Warming Up" #. TRANSLATORS: Stitcher Added -#: locale/ipp-strings.c:3928 +#: locale/ipp-strings.c:3966 msgid "printer-state-reasons.stitcher-added" msgstr "Stitcher Added" #. TRANSLATORS: Stitcher Almost Empty -#: locale/ipp-strings.c:3930 +#: locale/ipp-strings.c:3968 msgid "printer-state-reasons.stitcher-almost-empty" msgstr "Stitcher Almost Empty" #. TRANSLATORS: Stitcher Almost Full -#: locale/ipp-strings.c:3932 +#: locale/ipp-strings.c:3970 msgid "printer-state-reasons.stitcher-almost-full" msgstr "Stitcher Almost Full" #. TRANSLATORS: Stitcher At Limit -#: locale/ipp-strings.c:3934 +#: locale/ipp-strings.c:3972 msgid "printer-state-reasons.stitcher-at-limit" msgstr "Stitcher At Limit" #. TRANSLATORS: Stitcher Closed -#: locale/ipp-strings.c:3936 +#: locale/ipp-strings.c:3974 msgid "printer-state-reasons.stitcher-closed" msgstr "Stitcher Closed" #. TRANSLATORS: Stitcher Configuration Change -#: locale/ipp-strings.c:3938 +#: locale/ipp-strings.c:3976 msgid "printer-state-reasons.stitcher-configuration-change" msgstr "Stitcher Configuration Change" #. TRANSLATORS: Stitcher Cover Closed -#: locale/ipp-strings.c:3940 +#: locale/ipp-strings.c:3978 msgid "printer-state-reasons.stitcher-cover-closed" msgstr "Stitcher Cover Closed" #. TRANSLATORS: Stitcher Cover Open -#: locale/ipp-strings.c:3942 +#: locale/ipp-strings.c:3980 msgid "printer-state-reasons.stitcher-cover-open" msgstr "Stitcher Cover Open" #. TRANSLATORS: Stitcher Empty -#: locale/ipp-strings.c:3944 +#: locale/ipp-strings.c:3982 msgid "printer-state-reasons.stitcher-empty" msgstr "Stitcher Empty" #. TRANSLATORS: Stitcher Full -#: locale/ipp-strings.c:3946 +#: locale/ipp-strings.c:3984 msgid "printer-state-reasons.stitcher-full" msgstr "Stitcher Full" #. TRANSLATORS: Stitcher Interlock Closed -#: locale/ipp-strings.c:3948 +#: locale/ipp-strings.c:3986 msgid "printer-state-reasons.stitcher-interlock-closed" msgstr "Stitcher Interlock Closed" #. TRANSLATORS: Stitcher Interlock Open -#: locale/ipp-strings.c:3950 +#: locale/ipp-strings.c:3988 msgid "printer-state-reasons.stitcher-interlock-open" msgstr "Stitcher Interlock Open" #. TRANSLATORS: Stitcher Jam -#: locale/ipp-strings.c:3952 +#: locale/ipp-strings.c:3990 msgid "printer-state-reasons.stitcher-jam" msgstr "Stitcher Jam" #. TRANSLATORS: Stitcher Life Almost Over -#: locale/ipp-strings.c:3954 +#: locale/ipp-strings.c:3992 msgid "printer-state-reasons.stitcher-life-almost-over" msgstr "Stitcher Life Almost Over" #. TRANSLATORS: Stitcher Life Over -#: locale/ipp-strings.c:3956 +#: locale/ipp-strings.c:3994 msgid "printer-state-reasons.stitcher-life-over" msgstr "Stitcher Life Over" #. TRANSLATORS: Stitcher Memory Exhausted -#: locale/ipp-strings.c:3958 +#: locale/ipp-strings.c:3996 msgid "printer-state-reasons.stitcher-memory-exhausted" msgstr "Stitcher Memory Exhausted" #. TRANSLATORS: Stitcher Missing -#: locale/ipp-strings.c:3960 +#: locale/ipp-strings.c:3998 msgid "printer-state-reasons.stitcher-missing" msgstr "Stitcher Missing" #. TRANSLATORS: Stitcher Motor Failure -#: locale/ipp-strings.c:3962 +#: locale/ipp-strings.c:4000 msgid "printer-state-reasons.stitcher-motor-failure" msgstr "Stitcher Motor Failure" #. TRANSLATORS: Stitcher Near Limit -#: locale/ipp-strings.c:3964 +#: locale/ipp-strings.c:4002 msgid "printer-state-reasons.stitcher-near-limit" msgstr "Stitcher Near Limit" #. TRANSLATORS: Stitcher Offline -#: locale/ipp-strings.c:3966 +#: locale/ipp-strings.c:4004 msgid "printer-state-reasons.stitcher-offline" msgstr "Stitcher Offline" #. TRANSLATORS: Stitcher Opened -#: locale/ipp-strings.c:3968 +#: locale/ipp-strings.c:4006 msgid "printer-state-reasons.stitcher-opened" msgstr "Stitcher Opened" #. TRANSLATORS: Stitcher Over Temperature -#: locale/ipp-strings.c:3970 +#: locale/ipp-strings.c:4008 msgid "printer-state-reasons.stitcher-over-temperature" msgstr "Stitcher Over Temperature" #. TRANSLATORS: Stitcher Power Saver -#: locale/ipp-strings.c:3972 +#: locale/ipp-strings.c:4010 msgid "printer-state-reasons.stitcher-power-saver" msgstr "Stitcher Power Saver" #. TRANSLATORS: Stitcher Recoverable Failure -#: locale/ipp-strings.c:3974 +#: locale/ipp-strings.c:4012 msgid "printer-state-reasons.stitcher-recoverable-failure" msgstr "Stitcher Recoverable Failure" #. TRANSLATORS: Stitcher Recoverable Storage -#: locale/ipp-strings.c:3976 +#: locale/ipp-strings.c:4014 msgid "printer-state-reasons.stitcher-recoverable-storage" msgstr "Stitcher Recoverable Storage" #. TRANSLATORS: Stitcher Removed -#: locale/ipp-strings.c:3978 +#: locale/ipp-strings.c:4016 msgid "printer-state-reasons.stitcher-removed" msgstr "Stitcher Removed" #. TRANSLATORS: Stitcher Resource Added -#: locale/ipp-strings.c:3980 +#: locale/ipp-strings.c:4018 msgid "printer-state-reasons.stitcher-resource-added" msgstr "Stitcher Resource Added" #. TRANSLATORS: Stitcher Resource Removed -#: locale/ipp-strings.c:3982 +#: locale/ipp-strings.c:4020 msgid "printer-state-reasons.stitcher-resource-removed" msgstr "Stitcher Resource Removed" #. TRANSLATORS: Stitcher Thermistor Failure -#: locale/ipp-strings.c:3984 +#: locale/ipp-strings.c:4022 msgid "printer-state-reasons.stitcher-thermistor-failure" msgstr "Stitcher Thermistor Failure" #. TRANSLATORS: Stitcher Timing Failure -#: locale/ipp-strings.c:3986 +#: locale/ipp-strings.c:4024 msgid "printer-state-reasons.stitcher-timing-failure" msgstr "Stitcher Timing Failure" #. TRANSLATORS: Stitcher Turned Off -#: locale/ipp-strings.c:3988 +#: locale/ipp-strings.c:4026 msgid "printer-state-reasons.stitcher-turned-off" msgstr "Stitcher Turned Off" #. TRANSLATORS: Stitcher Turned On -#: locale/ipp-strings.c:3990 +#: locale/ipp-strings.c:4028 msgid "printer-state-reasons.stitcher-turned-on" msgstr "Stitcher Turned On" #. TRANSLATORS: Stitcher Under Temperature -#: locale/ipp-strings.c:3992 +#: locale/ipp-strings.c:4030 msgid "printer-state-reasons.stitcher-under-temperature" msgstr "Stitcher Under Temperature" #. TRANSLATORS: Stitcher Unrecoverable Failure -#: locale/ipp-strings.c:3994 +#: locale/ipp-strings.c:4032 msgid "printer-state-reasons.stitcher-unrecoverable-failure" msgstr "Stitcher Unrecoverable Failure" #. TRANSLATORS: Stitcher Unrecoverable Storage Error -#: locale/ipp-strings.c:3996 +#: locale/ipp-strings.c:4034 msgid "printer-state-reasons.stitcher-unrecoverable-storage-error" msgstr "Stitcher Unrecoverable Storage Error" #. TRANSLATORS: Stitcher Warming Up -#: locale/ipp-strings.c:3998 +#: locale/ipp-strings.c:4036 msgid "printer-state-reasons.stitcher-warming-up" msgstr "Stitcher Warming Up" #. TRANSLATORS: Partially stopped -#: locale/ipp-strings.c:4000 +#: locale/ipp-strings.c:4038 msgid "printer-state-reasons.stopped-partly" msgstr "Stopped Partly" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:4002 +#: locale/ipp-strings.c:4040 msgid "printer-state-reasons.stopping" msgstr "Stopping" #. TRANSLATORS: Subunit Added -#: locale/ipp-strings.c:4004 +#: locale/ipp-strings.c:4042 msgid "printer-state-reasons.subunit-added" msgstr "Subunit Added" #. TRANSLATORS: Subunit Almost Empty -#: locale/ipp-strings.c:4006 +#: locale/ipp-strings.c:4044 msgid "printer-state-reasons.subunit-almost-empty" msgstr "Subunit Almost Empty" #. TRANSLATORS: Subunit Almost Full -#: locale/ipp-strings.c:4008 +#: locale/ipp-strings.c:4046 msgid "printer-state-reasons.subunit-almost-full" msgstr "Subunit Almost Full" #. TRANSLATORS: Subunit At Limit -#: locale/ipp-strings.c:4010 +#: locale/ipp-strings.c:4048 msgid "printer-state-reasons.subunit-at-limit" msgstr "Subunit At Limit" #. TRANSLATORS: Subunit Closed -#: locale/ipp-strings.c:4012 +#: locale/ipp-strings.c:4050 msgid "printer-state-reasons.subunit-closed" msgstr "Subunit Closed" #. TRANSLATORS: Subunit Empty -#: locale/ipp-strings.c:4016 +#: locale/ipp-strings.c:4054 msgid "printer-state-reasons.subunit-empty" msgstr "Subunit Empty" #. TRANSLATORS: Subunit Full -#: locale/ipp-strings.c:4018 +#: locale/ipp-strings.c:4056 msgid "printer-state-reasons.subunit-full" msgstr "Subunit Full" #. TRANSLATORS: Subunit Life Almost Over -#: locale/ipp-strings.c:4020 +#: locale/ipp-strings.c:4058 msgid "printer-state-reasons.subunit-life-almost-over" msgstr "Subunit Life Almost Over" #. TRANSLATORS: Subunit Life Over -#: locale/ipp-strings.c:4022 +#: locale/ipp-strings.c:4060 msgid "printer-state-reasons.subunit-life-over" msgstr "Subunit Life Over" #. TRANSLATORS: Subunit Memory Exhausted -#: locale/ipp-strings.c:4024 +#: locale/ipp-strings.c:4062 msgid "printer-state-reasons.subunit-memory-exhausted" msgstr "Subunit Memory Exhausted" #. TRANSLATORS: Subunit Missing -#: locale/ipp-strings.c:4026 +#: locale/ipp-strings.c:4064 msgid "printer-state-reasons.subunit-missing" msgstr "Subunit Missing" #. TRANSLATORS: Subunit Motor Failure -#: locale/ipp-strings.c:4028 +#: locale/ipp-strings.c:4066 msgid "printer-state-reasons.subunit-motor-failure" msgstr "Subunit Motor Failure" #. TRANSLATORS: Subunit Near Limit -#: locale/ipp-strings.c:4030 +#: locale/ipp-strings.c:4068 msgid "printer-state-reasons.subunit-near-limit" msgstr "Subunit Near Limit" #. TRANSLATORS: Subunit Offline -#: locale/ipp-strings.c:4032 +#: locale/ipp-strings.c:4070 msgid "printer-state-reasons.subunit-offline" msgstr "Subunit Offline" #. TRANSLATORS: Subunit Opened -#: locale/ipp-strings.c:4034 +#: locale/ipp-strings.c:4072 msgid "printer-state-reasons.subunit-opened" msgstr "Subunit Opened" #. TRANSLATORS: Subunit Over Temperature -#: locale/ipp-strings.c:4036 +#: locale/ipp-strings.c:4074 msgid "printer-state-reasons.subunit-over-temperature" msgstr "Subunit Over Temperature" #. TRANSLATORS: Subunit Power Saver -#: locale/ipp-strings.c:4038 +#: locale/ipp-strings.c:4076 msgid "printer-state-reasons.subunit-power-saver" msgstr "Subunit Power Saver" #. TRANSLATORS: Subunit Recoverable Failure -#: locale/ipp-strings.c:4040 +#: locale/ipp-strings.c:4078 msgid "printer-state-reasons.subunit-recoverable-failure" msgstr "Subunit Recoverable Failure" #. TRANSLATORS: Subunit Recoverable Storage -#: locale/ipp-strings.c:4042 +#: locale/ipp-strings.c:4080 msgid "printer-state-reasons.subunit-recoverable-storage" msgstr "Subunit Recoverable Storage" #. TRANSLATORS: Subunit Removed -#: locale/ipp-strings.c:4044 +#: locale/ipp-strings.c:4082 msgid "printer-state-reasons.subunit-removed" msgstr "Subunit Removed" #. TRANSLATORS: Subunit Resource Added -#: locale/ipp-strings.c:4046 +#: locale/ipp-strings.c:4084 msgid "printer-state-reasons.subunit-resource-added" msgstr "Subunit Resource Added" #. TRANSLATORS: Subunit Resource Removed -#: locale/ipp-strings.c:4048 +#: locale/ipp-strings.c:4086 msgid "printer-state-reasons.subunit-resource-removed" msgstr "Subunit Resource Removed" #. TRANSLATORS: Subunit Thermistor Failure -#: locale/ipp-strings.c:4050 +#: locale/ipp-strings.c:4088 msgid "printer-state-reasons.subunit-thermistor-failure" msgstr "Subunit Thermistor Failure" #. TRANSLATORS: Subunit Timing Failure -#: locale/ipp-strings.c:4052 +#: locale/ipp-strings.c:4090 msgid "printer-state-reasons.subunit-timing-Failure" msgstr "Subunit Timing Failure" #. TRANSLATORS: Subunit Turned Off -#: locale/ipp-strings.c:4054 +#: locale/ipp-strings.c:4092 msgid "printer-state-reasons.subunit-turned-off" msgstr "Subunit Turned Off" #. TRANSLATORS: Subunit Turned On -#: locale/ipp-strings.c:4056 +#: locale/ipp-strings.c:4094 msgid "printer-state-reasons.subunit-turned-on" msgstr "Subunit Turned On" #. TRANSLATORS: Subunit Under Temperature -#: locale/ipp-strings.c:4058 +#: locale/ipp-strings.c:4096 msgid "printer-state-reasons.subunit-under-temperature" msgstr "Subunit Under Temperature" #. TRANSLATORS: Subunit Unrecoverable Failure -#: locale/ipp-strings.c:4060 +#: locale/ipp-strings.c:4098 msgid "printer-state-reasons.subunit-unrecoverable-failure" msgstr "Subunit Unrecoverable Failure" #. TRANSLATORS: Subunit Unrecoverable Storage -#: locale/ipp-strings.c:4062 +#: locale/ipp-strings.c:4100 msgid "printer-state-reasons.subunit-unrecoverable-storage" msgstr "Subunit Unrecoverable Storage" #. TRANSLATORS: Subunit Warming Up -#: locale/ipp-strings.c:4064 +#: locale/ipp-strings.c:4102 msgid "printer-state-reasons.subunit-warming-up" msgstr "Subunit Warming Up" #. TRANSLATORS: Printer stopped responding -#: locale/ipp-strings.c:4066 +#: locale/ipp-strings.c:4104 msgid "printer-state-reasons.timed-out" msgstr "Timed Out" #. TRANSLATORS: Out of toner -#: locale/ipp-strings.c:4068 +#: locale/ipp-strings.c:4106 msgid "printer-state-reasons.toner-empty" msgstr "Toner Empty" #. TRANSLATORS: Toner low -#: locale/ipp-strings.c:4070 +#: locale/ipp-strings.c:4108 msgid "printer-state-reasons.toner-low" msgstr "Toner Low" #. TRANSLATORS: Trimmer Added -#: locale/ipp-strings.c:4072 +#: locale/ipp-strings.c:4110 msgid "printer-state-reasons.trimmer-added" msgstr "Trimmer Added" #. TRANSLATORS: Trimmer Almost Empty -#: locale/ipp-strings.c:4074 +#: locale/ipp-strings.c:4112 msgid "printer-state-reasons.trimmer-almost-empty" msgstr "Trimmer Almost Empty" #. TRANSLATORS: Trimmer Almost Full -#: locale/ipp-strings.c:4076 +#: locale/ipp-strings.c:4114 msgid "printer-state-reasons.trimmer-almost-full" msgstr "Trimmer Almost Full" #. TRANSLATORS: Trimmer At Limit -#: locale/ipp-strings.c:4078 +#: locale/ipp-strings.c:4116 msgid "printer-state-reasons.trimmer-at-limit" msgstr "Trimmer At Limit" #. TRANSLATORS: Trimmer Closed -#: locale/ipp-strings.c:4080 +#: locale/ipp-strings.c:4118 msgid "printer-state-reasons.trimmer-closed" msgstr "Trimmer Closed" #. TRANSLATORS: Trimmer Configuration Change -#: locale/ipp-strings.c:4082 +#: locale/ipp-strings.c:4120 msgid "printer-state-reasons.trimmer-configuration-change" msgstr "Trimmer Configuration Change" #. TRANSLATORS: Trimmer Cover Closed -#: locale/ipp-strings.c:4084 +#: locale/ipp-strings.c:4122 msgid "printer-state-reasons.trimmer-cover-closed" msgstr "Trimmer Cover Closed" #. TRANSLATORS: Trimmer Cover Open -#: locale/ipp-strings.c:4086 +#: locale/ipp-strings.c:4124 msgid "printer-state-reasons.trimmer-cover-open" msgstr "Trimmer Cover Open" #. TRANSLATORS: Trimmer Empty -#: locale/ipp-strings.c:4088 +#: locale/ipp-strings.c:4126 msgid "printer-state-reasons.trimmer-empty" msgstr "Trimmer Empty" #. TRANSLATORS: Trimmer Full -#: locale/ipp-strings.c:4090 +#: locale/ipp-strings.c:4128 msgid "printer-state-reasons.trimmer-full" msgstr "Trimmer Full" #. TRANSLATORS: Trimmer Interlock Closed -#: locale/ipp-strings.c:4092 +#: locale/ipp-strings.c:4130 msgid "printer-state-reasons.trimmer-interlock-closed" msgstr "Trimmer Interlock Closed" #. TRANSLATORS: Trimmer Interlock Open -#: locale/ipp-strings.c:4094 +#: locale/ipp-strings.c:4132 msgid "printer-state-reasons.trimmer-interlock-open" msgstr "Trimmer Interlock Open" #. TRANSLATORS: Trimmer Jam -#: locale/ipp-strings.c:4096 +#: locale/ipp-strings.c:4134 msgid "printer-state-reasons.trimmer-jam" msgstr "Trimmer Jam" #. TRANSLATORS: Trimmer Life Almost Over -#: locale/ipp-strings.c:4098 +#: locale/ipp-strings.c:4136 msgid "printer-state-reasons.trimmer-life-almost-over" msgstr "Trimmer Life Almost Over" #. TRANSLATORS: Trimmer Life Over -#: locale/ipp-strings.c:4100 +#: locale/ipp-strings.c:4138 msgid "printer-state-reasons.trimmer-life-over" msgstr "Trimmer Life Over" #. TRANSLATORS: Trimmer Memory Exhausted -#: locale/ipp-strings.c:4102 +#: locale/ipp-strings.c:4140 msgid "printer-state-reasons.trimmer-memory-exhausted" msgstr "Trimmer Memory Exhausted" #. TRANSLATORS: Trimmer Missing -#: locale/ipp-strings.c:4104 +#: locale/ipp-strings.c:4142 msgid "printer-state-reasons.trimmer-missing" msgstr "Trimmer Missing" #. TRANSLATORS: Trimmer Motor Failure -#: locale/ipp-strings.c:4106 +#: locale/ipp-strings.c:4144 msgid "printer-state-reasons.trimmer-motor-failure" msgstr "Trimmer Motor Failure" #. TRANSLATORS: Trimmer Near Limit -#: locale/ipp-strings.c:4108 +#: locale/ipp-strings.c:4146 msgid "printer-state-reasons.trimmer-near-limit" msgstr "Trimmer Near Limit" #. TRANSLATORS: Trimmer Offline -#: locale/ipp-strings.c:4110 +#: locale/ipp-strings.c:4148 msgid "printer-state-reasons.trimmer-offline" msgstr "Trimmer Offline" #. TRANSLATORS: Trimmer Opened -#: locale/ipp-strings.c:4112 +#: locale/ipp-strings.c:4150 msgid "printer-state-reasons.trimmer-opened" msgstr "Trimmer Opened" #. TRANSLATORS: Trimmer Over Temperature -#: locale/ipp-strings.c:4114 +#: locale/ipp-strings.c:4152 msgid "printer-state-reasons.trimmer-over-temperature" msgstr "Trimmer Over Temperature" #. TRANSLATORS: Trimmer Power Saver -#: locale/ipp-strings.c:4116 +#: locale/ipp-strings.c:4154 msgid "printer-state-reasons.trimmer-power-saver" msgstr "Trimmer Power Saver" #. TRANSLATORS: Trimmer Recoverable Failure -#: locale/ipp-strings.c:4118 +#: locale/ipp-strings.c:4156 msgid "printer-state-reasons.trimmer-recoverable-failure" msgstr "Trimmer Recoverable Failure" #. TRANSLATORS: Trimmer Recoverable Storage -#: locale/ipp-strings.c:4120 +#: locale/ipp-strings.c:4158 msgid "printer-state-reasons.trimmer-recoverable-storage" msgstr "Trimmer Recoverable Storage" #. TRANSLATORS: Trimmer Removed -#: locale/ipp-strings.c:4122 +#: locale/ipp-strings.c:4160 msgid "printer-state-reasons.trimmer-removed" msgstr "Trimmer Removed" #. TRANSLATORS: Trimmer Resource Added -#: locale/ipp-strings.c:4124 +#: locale/ipp-strings.c:4162 msgid "printer-state-reasons.trimmer-resource-added" msgstr "Trimmer Resource Added" #. TRANSLATORS: Trimmer Resource Removed -#: locale/ipp-strings.c:4126 +#: locale/ipp-strings.c:4164 msgid "printer-state-reasons.trimmer-resource-removed" msgstr "Trimmer Resource Removed" #. TRANSLATORS: Trimmer Thermistor Failure -#: locale/ipp-strings.c:4128 +#: locale/ipp-strings.c:4166 msgid "printer-state-reasons.trimmer-thermistor-failure" msgstr "Trimmer Thermistor Failure" #. TRANSLATORS: Trimmer Timing Failure -#: locale/ipp-strings.c:4130 +#: locale/ipp-strings.c:4168 msgid "printer-state-reasons.trimmer-timing-failure" msgstr "Trimmer Timing Failure" #. TRANSLATORS: Trimmer Turned Off -#: locale/ipp-strings.c:4132 +#: locale/ipp-strings.c:4170 msgid "printer-state-reasons.trimmer-turned-off" msgstr "Trimmer Turned Off" #. TRANSLATORS: Trimmer Turned On -#: locale/ipp-strings.c:4134 +#: locale/ipp-strings.c:4172 msgid "printer-state-reasons.trimmer-turned-on" msgstr "Trimmer Turned On" #. TRANSLATORS: Trimmer Under Temperature -#: locale/ipp-strings.c:4136 +#: locale/ipp-strings.c:4174 msgid "printer-state-reasons.trimmer-under-temperature" msgstr "Trimmer Under Temperature" #. TRANSLATORS: Trimmer Unrecoverable Failure -#: locale/ipp-strings.c:4138 +#: locale/ipp-strings.c:4176 msgid "printer-state-reasons.trimmer-unrecoverable-failure" msgstr "Trimmer Unrecoverable Failure" #. TRANSLATORS: Trimmer Unrecoverable Storage Error -#: locale/ipp-strings.c:4140 +#: locale/ipp-strings.c:4178 msgid "printer-state-reasons.trimmer-unrecoverable-storage-error" msgstr "Trimmer Unrecoverable Storage Error" #. TRANSLATORS: Trimmer Warming Up -#: locale/ipp-strings.c:4142 +#: locale/ipp-strings.c:4180 msgid "printer-state-reasons.trimmer-warming-up" msgstr "Trimmer Warming Up" #. TRANSLATORS: Unknown -#: locale/ipp-strings.c:4144 +#: locale/ipp-strings.c:4182 msgid "printer-state-reasons.unknown" msgstr "Unknown" #. TRANSLATORS: Wrapper Added -#: locale/ipp-strings.c:4146 +#: locale/ipp-strings.c:4184 msgid "printer-state-reasons.wrapper-added" msgstr "Wrapper Added" #. TRANSLATORS: Wrapper Almost Empty -#: locale/ipp-strings.c:4148 +#: locale/ipp-strings.c:4186 msgid "printer-state-reasons.wrapper-almost-empty" msgstr "Wrapper Almost Empty" #. TRANSLATORS: Wrapper Almost Full -#: locale/ipp-strings.c:4150 +#: locale/ipp-strings.c:4188 msgid "printer-state-reasons.wrapper-almost-full" msgstr "Wrapper Almost Full" #. TRANSLATORS: Wrapper At Limit -#: locale/ipp-strings.c:4152 +#: locale/ipp-strings.c:4190 msgid "printer-state-reasons.wrapper-at-limit" msgstr "Wrapper At Limit" #. TRANSLATORS: Wrapper Closed -#: locale/ipp-strings.c:4154 +#: locale/ipp-strings.c:4192 msgid "printer-state-reasons.wrapper-closed" msgstr "Wrapper Closed" #. TRANSLATORS: Wrapper Configuration Change -#: locale/ipp-strings.c:4156 +#: locale/ipp-strings.c:4194 msgid "printer-state-reasons.wrapper-configuration-change" msgstr "Wrapper Configuration Change" #. TRANSLATORS: Wrapper Cover Closed -#: locale/ipp-strings.c:4158 +#: locale/ipp-strings.c:4196 msgid "printer-state-reasons.wrapper-cover-closed" msgstr "Wrapper Cover Closed" #. TRANSLATORS: Wrapper Cover Open -#: locale/ipp-strings.c:4160 +#: locale/ipp-strings.c:4198 msgid "printer-state-reasons.wrapper-cover-open" msgstr "Wrapper Cover Open" #. TRANSLATORS: Wrapper Empty -#: locale/ipp-strings.c:4162 +#: locale/ipp-strings.c:4200 msgid "printer-state-reasons.wrapper-empty" msgstr "Wrapper Empty" #. TRANSLATORS: Wrapper Full -#: locale/ipp-strings.c:4164 +#: locale/ipp-strings.c:4202 msgid "printer-state-reasons.wrapper-full" msgstr "Wrapper Full" #. TRANSLATORS: Wrapper Interlock Closed -#: locale/ipp-strings.c:4166 +#: locale/ipp-strings.c:4204 msgid "printer-state-reasons.wrapper-interlock-closed" msgstr "Wrapper Interlock Closed" #. TRANSLATORS: Wrapper Interlock Open -#: locale/ipp-strings.c:4168 +#: locale/ipp-strings.c:4206 msgid "printer-state-reasons.wrapper-interlock-open" msgstr "Wrapper Interlock Open" #. TRANSLATORS: Wrapper Jam -#: locale/ipp-strings.c:4170 +#: locale/ipp-strings.c:4208 msgid "printer-state-reasons.wrapper-jam" msgstr "Wrapper Jam" #. TRANSLATORS: Wrapper Life Almost Over -#: locale/ipp-strings.c:4172 +#: locale/ipp-strings.c:4210 msgid "printer-state-reasons.wrapper-life-almost-over" msgstr "Wrapper Life Almost Over" #. TRANSLATORS: Wrapper Life Over -#: locale/ipp-strings.c:4174 +#: locale/ipp-strings.c:4212 msgid "printer-state-reasons.wrapper-life-over" msgstr "Wrapper Life Over" #. TRANSLATORS: Wrapper Memory Exhausted -#: locale/ipp-strings.c:4176 +#: locale/ipp-strings.c:4214 msgid "printer-state-reasons.wrapper-memory-exhausted" msgstr "Wrapper Memory Exhausted" #. TRANSLATORS: Wrapper Missing -#: locale/ipp-strings.c:4178 +#: locale/ipp-strings.c:4216 msgid "printer-state-reasons.wrapper-missing" msgstr "Wrapper Missing" #. TRANSLATORS: Wrapper Motor Failure -#: locale/ipp-strings.c:4180 +#: locale/ipp-strings.c:4218 msgid "printer-state-reasons.wrapper-motor-failure" msgstr "Wrapper Motor Failure" #. TRANSLATORS: Wrapper Near Limit -#: locale/ipp-strings.c:4182 +#: locale/ipp-strings.c:4220 msgid "printer-state-reasons.wrapper-near-limit" msgstr "Wrapper Near Limit" #. TRANSLATORS: Wrapper Offline -#: locale/ipp-strings.c:4184 +#: locale/ipp-strings.c:4222 msgid "printer-state-reasons.wrapper-offline" msgstr "Wrapper Offline" #. TRANSLATORS: Wrapper Opened -#: locale/ipp-strings.c:4186 +#: locale/ipp-strings.c:4224 msgid "printer-state-reasons.wrapper-opened" msgstr "Wrapper Opened" #. TRANSLATORS: Wrapper Over Temperature -#: locale/ipp-strings.c:4188 +#: locale/ipp-strings.c:4226 msgid "printer-state-reasons.wrapper-over-temperature" msgstr "Wrapper Over Temperature" #. TRANSLATORS: Wrapper Power Saver -#: locale/ipp-strings.c:4190 +#: locale/ipp-strings.c:4228 msgid "printer-state-reasons.wrapper-power-saver" msgstr "Wrapper Power Saver" #. TRANSLATORS: Wrapper Recoverable Failure -#: locale/ipp-strings.c:4192 +#: locale/ipp-strings.c:4230 msgid "printer-state-reasons.wrapper-recoverable-failure" msgstr "Wrapper Recoverable Failure" #. TRANSLATORS: Wrapper Recoverable Storage -#: locale/ipp-strings.c:4194 +#: locale/ipp-strings.c:4232 msgid "printer-state-reasons.wrapper-recoverable-storage" msgstr "Wrapper Recoverable Storage" #. TRANSLATORS: Wrapper Removed -#: locale/ipp-strings.c:4196 +#: locale/ipp-strings.c:4234 msgid "printer-state-reasons.wrapper-removed" msgstr "Wrapper Removed" #. TRANSLATORS: Wrapper Resource Added -#: locale/ipp-strings.c:4198 +#: locale/ipp-strings.c:4236 msgid "printer-state-reasons.wrapper-resource-added" msgstr "Wrapper Resource Added" #. TRANSLATORS: Wrapper Resource Removed -#: locale/ipp-strings.c:4200 +#: locale/ipp-strings.c:4238 msgid "printer-state-reasons.wrapper-resource-removed" msgstr "Wrapper Resource Removed" #. TRANSLATORS: Wrapper Thermistor Failure -#: locale/ipp-strings.c:4202 +#: locale/ipp-strings.c:4240 msgid "printer-state-reasons.wrapper-thermistor-failure" msgstr "Wrapper Thermistor Failure" #. TRANSLATORS: Wrapper Timing Failure -#: locale/ipp-strings.c:4204 +#: locale/ipp-strings.c:4242 msgid "printer-state-reasons.wrapper-timing-failure" msgstr "Wrapper Timing Failure" #. TRANSLATORS: Wrapper Turned Off -#: locale/ipp-strings.c:4206 +#: locale/ipp-strings.c:4244 msgid "printer-state-reasons.wrapper-turned-off" msgstr "Wrapper Turned Off" #. TRANSLATORS: Wrapper Turned On -#: locale/ipp-strings.c:4208 +#: locale/ipp-strings.c:4246 msgid "printer-state-reasons.wrapper-turned-on" msgstr "Wrapper Turned On" #. TRANSLATORS: Wrapper Under Temperature -#: locale/ipp-strings.c:4210 +#: locale/ipp-strings.c:4248 msgid "printer-state-reasons.wrapper-under-temperature" msgstr "Wrapper Under Temperature" #. TRANSLATORS: Wrapper Unrecoverable Failure -#: locale/ipp-strings.c:4212 +#: locale/ipp-strings.c:4250 msgid "printer-state-reasons.wrapper-unrecoverable-failure" msgstr "Wrapper Unrecoverable Failure" #. TRANSLATORS: Wrapper Unrecoverable Storage Error -#: locale/ipp-strings.c:4214 +#: locale/ipp-strings.c:4252 msgid "printer-state-reasons.wrapper-unrecoverable-storage-error" msgstr "Wrapper Unrecoverable Storage Error" #. TRANSLATORS: Wrapper Warming Up -#: locale/ipp-strings.c:4216 +#: locale/ipp-strings.c:4254 msgid "printer-state-reasons.wrapper-warming-up" msgstr "Wrapper Warming Up" #. TRANSLATORS: Idle -#: locale/ipp-strings.c:4218 +#: locale/ipp-strings.c:4256 msgid "printer-state.3" msgstr "Idle" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:4220 +#: locale/ipp-strings.c:4258 msgid "printer-state.4" msgstr "Processing" #. TRANSLATORS: Stopped -#: locale/ipp-strings.c:4222 +#: locale/ipp-strings.c:4260 msgid "printer-state.5" msgstr "Stopped" #. TRANSLATORS: Printer Uptime -#: locale/ipp-strings.c:4224 +#: locale/ipp-strings.c:4262 msgid "printer-up-time" msgstr "Printer Uptime" #. TRANSLATORS: Proof Print -#: locale/ipp-strings.c:4226 +#: locale/ipp-strings.c:4264 msgid "proof-print" msgstr "Proof Print" #. TRANSLATORS: Proof Print Copies -#: locale/ipp-strings.c:4228 +#: locale/ipp-strings.c:4266 msgid "proof-print-copies" msgstr "Proof Print Copies" #. TRANSLATORS: Punching -#: locale/ipp-strings.c:4230 +#: locale/ipp-strings.c:4268 msgid "punching" msgstr "Punching" #. TRANSLATORS: Punching Locations -#: locale/ipp-strings.c:4232 +#: locale/ipp-strings.c:4270 msgid "punching-locations" msgstr "Punching Locations" #. TRANSLATORS: Punching Offset -#: locale/ipp-strings.c:4234 +#: locale/ipp-strings.c:4272 msgid "punching-offset" msgstr "Punching Offset" #. TRANSLATORS: Punch Edge -#: locale/ipp-strings.c:4236 +#: locale/ipp-strings.c:4274 msgid "punching-reference-edge" msgstr "Punching Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4238 +#: locale/ipp-strings.c:4276 msgid "punching-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4240 +#: locale/ipp-strings.c:4278 msgid "punching-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4242 +#: locale/ipp-strings.c:4280 msgid "punching-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4244 +#: locale/ipp-strings.c:4282 msgid "punching-reference-edge.top" msgstr "Top" #. TRANSLATORS: Requested Attributes -#: locale/ipp-strings.c:4246 +#: locale/ipp-strings.c:4284 msgid "requested-attributes" msgstr "Requested Attributes" #. TRANSLATORS: Retry Interval -#: locale/ipp-strings.c:4248 +#: locale/ipp-strings.c:4286 msgid "retry-interval" msgstr "Retry Interval" #. TRANSLATORS: Retry Timeout -#: locale/ipp-strings.c:4250 +#: locale/ipp-strings.c:4288 msgid "retry-time-out" msgstr "Retry Time Out" #. TRANSLATORS: Save Disposition -#: locale/ipp-strings.c:4252 +#: locale/ipp-strings.c:4290 msgid "save-disposition" msgstr "Save Disposition" #. TRANSLATORS: None -#: locale/ipp-strings.c:4254 +#: locale/ipp-strings.c:4292 msgid "save-disposition.none" msgstr "None" #. TRANSLATORS: Print and Save -#: locale/ipp-strings.c:4256 +#: locale/ipp-strings.c:4294 msgid "save-disposition.print-save" msgstr "Print Save" #. TRANSLATORS: Save Only -#: locale/ipp-strings.c:4258 +#: locale/ipp-strings.c:4296 msgid "save-disposition.save-only" msgstr "Save Only" #. TRANSLATORS: Save Document Format -#: locale/ipp-strings.c:4260 +#: locale/ipp-strings.c:4298 msgid "save-document-format" msgstr "Save Document Format" #. TRANSLATORS: Save Info -#: locale/ipp-strings.c:4262 +#: locale/ipp-strings.c:4300 msgid "save-info" msgstr "Save Info" #. TRANSLATORS: Save Location -#: locale/ipp-strings.c:4264 +#: locale/ipp-strings.c:4302 msgid "save-location" msgstr "Save Location" #. TRANSLATORS: Save Name -#: locale/ipp-strings.c:4266 +#: locale/ipp-strings.c:4304 msgid "save-name" msgstr "Save Name" #. TRANSLATORS: Separator Sheets -#: locale/ipp-strings.c:4268 +#: locale/ipp-strings.c:4306 msgid "separator-sheets" msgstr "Separator Sheets" #. TRANSLATORS: Type of Separator Sheets -#: locale/ipp-strings.c:4270 +#: locale/ipp-strings.c:4308 msgid "separator-sheets-type" msgstr "Separator Sheets Type" #. TRANSLATORS: Start and End Sheets -#: locale/ipp-strings.c:4272 +#: locale/ipp-strings.c:4310 msgid "separator-sheets-type.both-sheets" msgstr "Both Sheets" #. TRANSLATORS: End Sheet -#: locale/ipp-strings.c:4274 +#: locale/ipp-strings.c:4312 msgid "separator-sheets-type.end-sheet" msgstr "End Sheet" #. TRANSLATORS: None -#: locale/ipp-strings.c:4276 +#: locale/ipp-strings.c:4314 msgid "separator-sheets-type.none" msgstr "None" #. TRANSLATORS: Slip Sheets -#: locale/ipp-strings.c:4278 +#: locale/ipp-strings.c:4316 msgid "separator-sheets-type.slip-sheets" msgstr "Slip Sheets" #. TRANSLATORS: Start Sheet -#: locale/ipp-strings.c:4280 +#: locale/ipp-strings.c:4318 msgid "separator-sheets-type.start-sheet" msgstr "Start Sheet" @@ -19210,291 +19244,291 @@ msgstr "No" #. TRANSLATORS: 2-Sided Printing -#: locale/ipp-strings.c:4282 +#: locale/ipp-strings.c:4320 msgid "sides" msgstr "2-Sided Printing" #. TRANSLATORS: Off -#: locale/ipp-strings.c:4284 +#: locale/ipp-strings.c:4322 msgid "sides.one-sided" msgstr "Off" #. TRANSLATORS: On (Portrait) -#: locale/ipp-strings.c:4286 +#: locale/ipp-strings.c:4324 msgid "sides.two-sided-long-edge" msgstr "On (Portrait)" #. TRANSLATORS: On (Landscape) -#: locale/ipp-strings.c:4288 +#: locale/ipp-strings.c:4326 msgid "sides.two-sided-short-edge" msgstr "On (Landscape)" #. TRANSLATORS: Status Message -#: locale/ipp-strings.c:4290 +#: locale/ipp-strings.c:4328 msgid "status-message" msgstr "Status Message" #. TRANSLATORS: Staple -#: locale/ipp-strings.c:4292 +#: locale/ipp-strings.c:4330 msgid "stitching" msgstr "Staple" #. TRANSLATORS: Stitching Angle -#: locale/ipp-strings.c:4294 +#: locale/ipp-strings.c:4332 msgid "stitching-angle" msgstr "Stitching Angle" #. TRANSLATORS: Stitching Locations -#: locale/ipp-strings.c:4296 +#: locale/ipp-strings.c:4334 msgid "stitching-locations" msgstr "Stitching Locations" #. TRANSLATORS: Staple Method -#: locale/ipp-strings.c:4298 +#: locale/ipp-strings.c:4336 msgid "stitching-method" msgstr "Stitching Method" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:4300 +#: locale/ipp-strings.c:4338 msgid "stitching-method.auto" msgstr "Automatic" #. TRANSLATORS: Crimp -#: locale/ipp-strings.c:4302 +#: locale/ipp-strings.c:4340 msgid "stitching-method.crimp" msgstr "Crimp" #. TRANSLATORS: Wire -#: locale/ipp-strings.c:4304 +#: locale/ipp-strings.c:4342 msgid "stitching-method.wire" msgstr "Wire" #. TRANSLATORS: Stitching Offset -#: locale/ipp-strings.c:4306 +#: locale/ipp-strings.c:4344 msgid "stitching-offset" msgstr "Stitching Offset" #. TRANSLATORS: Staple Edge -#: locale/ipp-strings.c:4308 +#: locale/ipp-strings.c:4346 msgid "stitching-reference-edge" msgstr "Stitching Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4310 +#: locale/ipp-strings.c:4348 msgid "stitching-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4312 +#: locale/ipp-strings.c:4350 msgid "stitching-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4314 +#: locale/ipp-strings.c:4352 msgid "stitching-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4316 +#: locale/ipp-strings.c:4354 msgid "stitching-reference-edge.top" msgstr "Top" #. TRANSLATORS: Subject -#: locale/ipp-strings.c:4318 +#: locale/ipp-strings.c:4356 msgid "subject" msgstr "Subject" #. TRANSLATORS: T33 Subaddress -#: locale/ipp-strings.c:4342 +#: locale/ipp-strings.c:4380 msgid "t33-subaddress" msgstr "T33 Subaddress" #. TRANSLATORS: To Name -#: locale/ipp-strings.c:4344 +#: locale/ipp-strings.c:4382 msgid "to-name" msgstr "To Name" #. TRANSLATORS: Transmission Status -#: locale/ipp-strings.c:4346 +#: locale/ipp-strings.c:4384 msgid "transmission-status" msgstr "Transmission Status" #. TRANSLATORS: Pending -#: locale/ipp-strings.c:4348 +#: locale/ipp-strings.c:4386 msgid "transmission-status.3" msgstr "Pending" #. TRANSLATORS: Pending Retry -#: locale/ipp-strings.c:4350 +#: locale/ipp-strings.c:4388 msgid "transmission-status.4" msgstr "Pending Retry" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:4352 +#: locale/ipp-strings.c:4390 msgid "transmission-status.5" msgstr "Processing" #. TRANSLATORS: Canceled -#: locale/ipp-strings.c:4354 +#: locale/ipp-strings.c:4392 msgid "transmission-status.7" msgstr "Canceled" #. TRANSLATORS: Aborted -#: locale/ipp-strings.c:4356 +#: locale/ipp-strings.c:4394 msgid "transmission-status.8" msgstr "Aborted" #. TRANSLATORS: Completed -#: locale/ipp-strings.c:4358 +#: locale/ipp-strings.c:4396 msgid "transmission-status.9" msgstr "Completed" #. TRANSLATORS: Cut -#: locale/ipp-strings.c:4360 +#: locale/ipp-strings.c:4398 msgid "trimming" msgstr "Cut" #. TRANSLATORS: Cut Position -#: locale/ipp-strings.c:4362 +#: locale/ipp-strings.c:4400 msgid "trimming-offset" msgstr "Cut Position" #. TRANSLATORS: Cut Edge -#: locale/ipp-strings.c:4364 +#: locale/ipp-strings.c:4402 msgid "trimming-reference-edge" msgstr "Trimming Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4366 +#: locale/ipp-strings.c:4404 msgid "trimming-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4368 +#: locale/ipp-strings.c:4406 msgid "trimming-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4370 +#: locale/ipp-strings.c:4408 msgid "trimming-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4372 +#: locale/ipp-strings.c:4410 msgid "trimming-reference-edge.top" msgstr "Top" #. TRANSLATORS: Type of Cut -#: locale/ipp-strings.c:4374 +#: locale/ipp-strings.c:4412 msgid "trimming-type" msgstr "Trimming Type" #. TRANSLATORS: Draw Line -#: locale/ipp-strings.c:4376 +#: locale/ipp-strings.c:4414 msgid "trimming-type.draw-line" msgstr "Draw Line" #. TRANSLATORS: Full -#: locale/ipp-strings.c:4378 +#: locale/ipp-strings.c:4416 msgid "trimming-type.full" msgstr "Full" #. TRANSLATORS: Partial -#: locale/ipp-strings.c:4380 +#: locale/ipp-strings.c:4418 msgid "trimming-type.partial" msgstr "Partial" #. TRANSLATORS: Perforate -#: locale/ipp-strings.c:4382 +#: locale/ipp-strings.c:4420 msgid "trimming-type.perforate" msgstr "Perforate" #. TRANSLATORS: Score -#: locale/ipp-strings.c:4384 +#: locale/ipp-strings.c:4422 msgid "trimming-type.score" msgstr "Score" #. TRANSLATORS: Tab -#: locale/ipp-strings.c:4386 +#: locale/ipp-strings.c:4424 msgid "trimming-type.tab" msgstr "Tab" #. TRANSLATORS: Cut After -#: locale/ipp-strings.c:4388 +#: locale/ipp-strings.c:4426 msgid "trimming-when" msgstr "Trimming When" #. TRANSLATORS: Every Document -#: locale/ipp-strings.c:4390 +#: locale/ipp-strings.c:4428 msgid "trimming-when.after-documents" msgstr "After Documents" #. TRANSLATORS: Job -#: locale/ipp-strings.c:4392 +#: locale/ipp-strings.c:4430 msgid "trimming-when.after-job" msgstr "After Job" #. TRANSLATORS: Every Set -#: locale/ipp-strings.c:4394 +#: locale/ipp-strings.c:4432 msgid "trimming-when.after-sets" msgstr "After Sets" #. TRANSLATORS: Every Page -#: locale/ipp-strings.c:4396 +#: locale/ipp-strings.c:4434 msgid "trimming-when.after-sheets" msgstr "After Sheets" #. TRANSLATORS: X Accuracy -#: locale/ipp-strings.c:4398 +#: locale/ipp-strings.c:4436 msgid "x-accuracy" msgstr "X Accuracy" #. TRANSLATORS: X Dimension -#: locale/ipp-strings.c:4400 +#: locale/ipp-strings.c:4438 msgid "x-dimension" msgstr "X Dimension" #. TRANSLATORS: X Offset -#: locale/ipp-strings.c:4402 +#: locale/ipp-strings.c:4440 msgid "x-offset" msgstr "X Offset" #. TRANSLATORS: X Origin -#: locale/ipp-strings.c:4404 +#: locale/ipp-strings.c:4442 msgid "x-origin" msgstr "X Origin" #. TRANSLATORS: Y Accuracy -#: locale/ipp-strings.c:4406 +#: locale/ipp-strings.c:4444 msgid "y-accuracy" msgstr "Y Accuracy" #. TRANSLATORS: Y Dimension -#: locale/ipp-strings.c:4408 +#: locale/ipp-strings.c:4446 msgid "y-dimension" msgstr "Y Dimension" #. TRANSLATORS: Y Offset -#: locale/ipp-strings.c:4410 +#: locale/ipp-strings.c:4448 msgid "y-offset" msgstr "Y Offset" #. TRANSLATORS: Y Origin -#: locale/ipp-strings.c:4412 +#: locale/ipp-strings.c:4450 msgid "y-origin" msgstr "Y Origin" #. TRANSLATORS: Z Accuracy -#: locale/ipp-strings.c:4414 +#: locale/ipp-strings.c:4452 msgid "z-accuracy" msgstr "Z Accuracy" #. TRANSLATORS: Z Dimension -#: locale/ipp-strings.c:4416 +#: locale/ipp-strings.c:4454 msgid "z-dimension" msgstr "Z Dimension" #. TRANSLATORS: Z Offset -#: locale/ipp-strings.c:4418 +#: locale/ipp-strings.c:4456 msgid "z-offset" msgstr "Z Offset" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/debconf.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/debconf.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/debconf.po 2020-01-23 16:51:35.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/debconf.po 2020-07-08 13:53:32.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: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: ../Debconf/AutoSelect.pm:88 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dpkg-dev.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dpkg-dev.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dpkg-dev.po 2020-01-23 16:51:35.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dpkg-dev.po 2020-07-08 13:53:31.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: 2020-01-23 10:43+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: scripts/dpkg-architecture.pl scripts/dpkg-buildflags.pl #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl @@ -545,8 +545,9 @@ #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm -#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm -#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm +#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm +#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm +#: scripts/Dpkg/Source/Quilt.pm #, perl-format msgid "cannot write %s" msgstr "" @@ -630,7 +631,7 @@ msgid "missing Priority for source files" msgstr "" -#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm +#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm #, perl-format msgid "%s is empty" msgstr "" @@ -672,10 +673,10 @@ msgid "package %s in control file but not in files list" msgstr "" -#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm -#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm -#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm -#: scripts/Dpkg/Source/Quilt.pm +#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm +#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm +#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm +#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm #, perl-format msgid "cannot read %s" msgstr "" @@ -1386,7 +1387,8 @@ msgid "shared libs info file '%s' line %d: bad line '%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm +#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm +#: scripts/Dpkg/Checksums.pm #, perl-format msgid "cannot open file %s" msgstr "" @@ -1432,7 +1434,7 @@ msgid "directory argument %s is not a directory" msgstr "" -#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm +#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm #, perl-format msgid "unable to chdir to '%s'" @@ -2755,12 +2757,12 @@ msgid "-b takes only one parameter with format '%s'" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "unwanted binary file: %s" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "" "detected %d unwanted binary file (add it in debian/source/include-binaries " @@ -2839,7 +2841,7 @@ msgid "cannot find an editor" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "adding %s to %s" msgstr "" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dpkg.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dpkg.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dpkg.po 2020-01-23 16:51:36.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dpkg.po 2020-07-08 13:53:33.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: 2020-01-23 10:43+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: lib/dpkg/ar.c @@ -150,7 +150,8 @@ msgid "error creating new backup file '%s'" msgstr "新しいバックアップファイル '%s' の作成中にエラーが発生しました" -#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c +#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c +#: src/remove.c #, c-format msgid "cannot remove '%.250s'" msgstr "`%.250s' を削除できません" @@ -1170,7 +1171,7 @@ msgid "rm command for cleanup" msgstr "クリーンアップ用の rm コマンド" -#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c +#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c #, c-format msgid "ambiguous package name '%s' with more than one installed instance" msgstr "1つ以上のインストール済み実体がある、あいまいなパッケージ名 '%s' です" @@ -1498,7 +1499,7 @@ msgid "error creating device '%.255s'" msgstr "デバイス `%.255s' の作成中にエラーが発生しました" -#: src/archives.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c src/archives.c #, c-format msgid "error creating hard link '%.255s'" msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました" @@ -1802,10 +1803,10 @@ msgid "archive '%s' is not a regular file" msgstr "" -#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c -#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c -#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c -#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c +#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c +#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c +#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c +#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c msgid "" msgstr "<標準出力>" @@ -2537,15 +2538,15 @@ msgid "divert-to may not contain newlines" msgstr "退避先は改行を含んではなりません" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to open diversions file" msgstr "diversions ファイルのオープンに失敗しました" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to fstat diversions file" msgstr "diversions ファイルの状態を取得できませんでした (fstat に失敗)" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c #, c-format msgid "conflicting diversions involving '%.250s' or '%.250s'" msgstr "`%.250s' か `%.250s' が関係する退避操作 (diversion) は競合しています" @@ -2831,26 +2832,26 @@ "Package %s is on hold, not touching it. Use --force-hold to override.\n" msgstr "パッケージ %s は保持されているため、手をつけません。上書きするには --force-hold を使ってください。\n" -#: src/errors.c +#: src/force.c msgid "overriding problem because --force enabled:" msgstr "--force が有効なので、問題を無視します:" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing final newline" msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value separator" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' contains empty filename" msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' が空のファイル名を含んでいます" @@ -2885,7 +2886,7 @@ msgid "unable to open files list file for package '%.250s'" msgstr "パッケージ `%.250s' のファイル一覧ファイルをオープンできません" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "" "files list file for package '%.250s' missing; assuming package has no files " @@ -2908,12 +2909,12 @@ msgid "reading files list for package '%.250s'" msgstr "パッケージ '%.250s' のファイル一覧を読み込んでいます" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' is missing final newline" msgstr "パッケージ '%.250s' のファイル一覧ファイルに最後の改行がありません" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' contains empty filename" msgstr "パッケージ `%.250s' のファイル一覧ファイルが空のファイル名を含んでいます" @@ -2923,11 +2924,11 @@ msgid "error closing files list file for package '%.250s'" msgstr "パッケージ `%.250s' のファイル一覧ファイルのクローズ中にエラーが発生しました" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c msgid "(Reading database ... " msgstr "(データベースを読み込んでいます ... " -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "%d file or directory currently installed.)\n" msgid_plural "%d files and directories currently installed.)\n" @@ -2991,37 +2992,37 @@ "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin" msgstr "(注): root の PATH は通常、/usr/local/sbin、/usr/sbin、/sbin を含んでいるはずです" -#: src/infodb-access.c +#: lib/dpkg/db-ctrl-access.c #, c-format msgid "unable to check existence of '%.250s'" msgstr "`%.250s' の存在を確認できません" -#: src/infodb-access.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c msgid "cannot read info directory" msgstr "情報ディレクトリを読み取れません" -#: src/infodb-format.c src/unpack.c +#: lib/dpkg/db-ctrl-format.c src/unpack.c #, c-format msgid "error trying to open %.250s" msgstr "%.250s のオープン時にエラーが発生しました" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "corrupt info database format file '%s'" msgstr "壊れた情報データベース形式ファイル '%s'" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "" "info database format (%d) is bogus or too new; try getting a newer dpkg" msgstr "情報データベース形式 (%d) が偽物か新しすぎます。より新しい dpkg を取得してみてください" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "info file %s/%s not associated to any package" msgstr "情報ファイル %s/%s がどのパッケージにも関連付けられていません" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "error while writing '%s'" msgstr "'%s' の書き込み中にエラーが発生しました" @@ -3222,67 +3223,67 @@ "\n" "[*] のあるものは大量の情報が出力されます。`less' や `more' にパイプするようにしてください!" -#: src/main.c +#: src/force.c msgid "Set all force options" msgstr "すべての強制オプションをセットする" -#: src/main.c +#: src/force.c msgid "Replace a package with a lower version" msgstr "パッケージをより古いバージョンで置き換える" -#: src/main.c +#: src/force.c msgid "Configure any package which may help this one" msgstr "これが助けになるかもしれないパッケージを設定する" -#: src/main.c +#: src/force.c msgid "Process incidental packages even when on hold" msgstr "保持していても付帯パッケージを処理する" -#: src/main.c +#: src/force.c msgid "Try to (de)install things even when not root" msgstr "root でなくてもインストール/削除の実行を試みる" -#: src/main.c +#: src/force.c msgid "PATH is missing important programs, problems likely" msgstr "PATH に重要なプログラムを見つけられなくても実行する。問題が起きる可能性が高い" -#: src/main.c +#: src/force.c msgid "Install a package even if it fails authenticity check" msgstr "正当性チェックに失敗してもパッケージをインストールする" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong versions" msgstr "パッケージのバージョンがおかしくても処理する" -#: src/main.c +#: src/force.c msgid "Overwrite a file from one package with another" msgstr "あるパッケージから提供されているファイルを別のもので上書きする" -#: src/main.c +#: src/force.c msgid "Overwrite a diverted file with an undiverted version" msgstr "退避されているファイルを退避されていないバージョンで上書きする" -#: src/main.c +#: src/force.c msgid "Overwrite one package's directory with another's file" msgstr "あるパッケージのディレクトリを別のファイルで上書きする" -#: src/main.c +#: src/force.c msgid "Do not perform safe I/O operations when unpacking" msgstr "展開時に安全な I/O 操作を行わない" -#: src/main.c +#: src/force.c msgid "Do not chroot into maintainer script environment" msgstr "" -#: src/main.c +#: src/force.c msgid "Always use the new config files, don't prompt" msgstr "常に新しい設定ファイルを使用し、問い合わせない" -#: src/main.c +#: src/force.c msgid "Always use the old config files, don't prompt" msgstr "常に古い設定ファイルを使用し、問い合わせない" -#: src/main.c +#: src/force.c msgid "" "Use the default option for new config files if one\n" "is available, don't prompt. If no default can be found,\n" @@ -3294,39 +3295,39 @@ "ない場合は、confold または confnew オプションが与えられ\n" "ていない限り、問い合わせが行われる" -#: src/main.c +#: src/force.c msgid "Always install missing config files" msgstr "見つからなかった設定ファイルを常にインストールする" -#: src/main.c +#: src/force.c msgid "Offer to replace config files with no new versions" msgstr "設定ファイルを新しいバージョンでないもので置き換えるか尋ねる" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong or no architecture" msgstr "パッケージがおかしい、あるいはアーキテクチャがなくても処理する" -#: src/main.c +#: src/force.c msgid "Install even if it would break another package" msgstr "別のパッケージを壊す可能性があってもインストールする" -#: src/main.c +#: src/force.c msgid "Allow installation of conflicting packages" msgstr "競合するパッケージのインストールを許可する" -#: src/main.c +#: src/force.c msgid "Turn all dependency problems into warnings" msgstr "すべての依存関係の問題を警告に切り替える" -#: src/main.c +#: src/force.c msgid "Turn dependency version problems into warnings" msgstr "依存バージョンの問題を警告に切り替える" -#: src/main.c +#: src/force.c msgid "Remove packages which require installation" msgstr "インストールに必要なパッケージを削除する" -#: src/main.c +#: src/force.c msgid "Remove an essential package" msgstr "不可欠パッケージを削除する" @@ -3458,7 +3459,7 @@ msgid "cannot remove architecture '%s' currently in use by the database" msgstr "データベースで現在使用中のアーキテクチャ '%s' を削除できません" -#: src/main.c +#: src/force.c #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -3471,7 +3472,7 @@ " エラーで停止: --refuse-<事象>,<事象>,... | --no-force-<事象>,...\n" " 事象の強制:\n" -#: src/main.c +#: src/force.c #, c-format msgid "" "\n" @@ -3482,12 +3483,12 @@ "警告: [!] と記されているオプションの使用は、あなたのシステムに深刻な傷害を与える\n" "可能性があります。[*] と記されているオプションの強制はデフォルトで有効です。\n" -#: src/main.c +#: src/force.c #, c-format msgid "unknown force/refuse option '%.*s'" msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'" -#: src/main.c +#: src/force.c #, c-format msgid "obsolete force/refuse option '%s'" msgstr "時代遅れの強制・拒否 (force/refuse) オプション `%s'" @@ -4168,43 +4169,43 @@ msgid "--update is useless for --remove" msgstr "--update は --remove には無意味です" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride uid %s" msgstr "statoverride のユーザ ID %s は無効です" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride gid %s" msgstr "statoverride のグループ ID %s は無効です" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride mode %s" msgstr "statoverride のモード %s は無効です" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to open statoverride file" msgstr "statoverride ファイルのオープンに失敗しました" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to fstat statoverride file" msgstr "statoverride ファイルの状態を取得できませんでした (fstat に失敗)" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "reading statoverride file '%.250s'" msgstr "statoverride ファイル '%.250s' を読み込んでいます" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file is missing final newline" msgstr "statoverride ファイルの最後の行に改行がありません" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file contains empty line" msgstr "statoverride ファイルが空行を含んでいます" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "syntax error in statoverride file" msgstr "statoverride ファイルに文法エラーがあります" @@ -4213,7 +4214,7 @@ msgid "unknown user '%s' in statoverride file" msgstr "statoverride ファイルに未知のユーザ '%s' があります" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "unexpected end of line in statoverride file" msgstr "statoverride ファイルに予期せぬ eof があります" @@ -4222,7 +4223,7 @@ msgid "unknown group '%s' in statoverride file" msgstr "statoverride ファイルに未知のグループ '%s' があります" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "multiple statoverrides present for file '%.250s'" msgstr "複数の statoverrides が ファイル '%.250s' に対して提供されています" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dselect.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dselect.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/dselect.po 2020-01-23 16:51:36.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/dselect.po 2020-07-08 13:53:33.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: 2020-01-23 10:44+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: dselect/basecmds.cc diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/e2fsprogs.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/e2fsprogs.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/e2fsprogs.po 2020-01-23 16:51:30.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/e2fsprogs.po 2020-07-08 13:53: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: 2020-01-23 10:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: e2fsck/badblocks.c:23 misc/mke2fs.c:220 #, c-format @@ -34,9 +34,9 @@ #: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1571 #: e2fsck/unix.c:1685 misc/badblocks.c:1251 misc/badblocks.c:1259 #: misc/badblocks.c:1273 misc/badblocks.c:1285 misc/dumpe2fs.c:431 -#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1430 +#: misc/dumpe2fs.c:692 misc/dumpe2fs.c:696 misc/e2image.c:1430 #: misc/e2image.c:1627 misc/e2image.c:1648 misc/mke2fs.c:236 -#: misc/tune2fs.c:2796 misc/tune2fs.c:2895 resize/main.c:414 +#: misc/tune2fs.c:2808 misc/tune2fs.c:2907 resize/main.c:414 #, c-format msgid "while trying to open %s" msgstr "" @@ -87,15 +87,15 @@ msgid "Error writing block %lu (%s). " msgstr "" -#: e2fsck/emptydir.c:57 +#: e2fsck/emptydir.c:56 msgid "empty dirblocks" msgstr "" -#: e2fsck/emptydir.c:62 +#: e2fsck/emptydir.c:61 msgid "empty dir map" msgstr "" -#: e2fsck/emptydir.c:98 +#: e2fsck/emptydir.c:97 #, c-format msgid "Empty directory block %u (#%d) in inode %u\n" msgstr "" @@ -105,12 +105,12 @@ msgid "%s: %s filename nblocks blocksize\n" msgstr "" -#: e2fsck/extend.c:44 +#: e2fsck/extend.c:45 #, c-format msgid "Illegal number of blocks!\n" msgstr "" -#: e2fsck/extend.c:50 +#: e2fsck/extend.c:51 #, c-format msgid "Couldn't allocate block buffer (size=%d)\n" msgstr "" @@ -176,7 +176,7 @@ msgid "%s: journal too short\n" msgstr "" -#: e2fsck/journal.c:972 misc/fuse2fs.c:3792 +#: e2fsck/journal.c:972 misc/fuse2fs.c:3787 #, c-format msgid "%s: recovering journal\n" msgstr "" @@ -428,21 +428,21 @@ msgid "multiply claimed inode map" msgstr "" -#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:826 +#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:830 #, c-format msgid "internal error: can't find dup_blk for %llu\n" msgstr "" -#: e2fsck/pass1b.c:952 +#: e2fsck/pass1b.c:956 msgid "returned from clone_file_block" msgstr "" -#: e2fsck/pass1b.c:976 +#: e2fsck/pass1b.c:980 #, c-format msgid "internal error: couldn't lookup EA block record for %llu" msgstr "" -#: e2fsck/pass1b.c:988 +#: e2fsck/pass1b.c:992 #, c-format msgid "internal error: couldn't lookup EA inode record for %u" msgstr "" @@ -452,89 +452,89 @@ msgid "while hashing entry with e_value_inum = %u" msgstr "" -#: e2fsck/pass1.c:775 e2fsck/pass2.c:1007 +#: e2fsck/pass1.c:775 e2fsck/pass2.c:1010 msgid "reading directory block" msgstr "ディレクトリブロックを読み込み中" -#: e2fsck/pass1.c:1224 +#: e2fsck/pass1.c:1226 msgid "in-use inode map" msgstr "" -#: e2fsck/pass1.c:1235 +#: e2fsck/pass1.c:1237 msgid "directory inode map" msgstr "" -#: e2fsck/pass1.c:1245 +#: e2fsck/pass1.c:1247 msgid "regular file inode map" msgstr "" -#: e2fsck/pass1.c:1254 misc/e2image.c:1282 +#: e2fsck/pass1.c:1256 misc/e2image.c:1282 msgid "in-use block map" msgstr "" -#: e2fsck/pass1.c:1263 +#: e2fsck/pass1.c:1265 msgid "metadata block map" msgstr "" -#: e2fsck/pass1.c:1325 +#: e2fsck/pass1.c:1327 msgid "opening inode scan" msgstr "" -#: e2fsck/pass1.c:1363 +#: e2fsck/pass1.c:1174 msgid "getting next inode from scan" msgstr "" -#: e2fsck/pass1.c:2067 +#: e2fsck/pass1.c:2080 msgid "Pass 1" msgstr "パス 1" -#: e2fsck/pass1.c:2128 +#: e2fsck/pass1.c:2141 #, c-format msgid "reading indirect blocks of inode %u" msgstr "" -#: e2fsck/pass1.c:2179 +#: e2fsck/pass1.c:2192 msgid "bad inode map" msgstr "" -#: e2fsck/pass1.c:2219 +#: e2fsck/pass1.c:2232 msgid "inode in bad block map" msgstr "" -#: e2fsck/pass1.c:2239 +#: e2fsck/pass1.c:2252 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:2270 +#: e2fsck/pass1.c:2283 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:2395 +#: e2fsck/pass1.c:2408 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:3640 +#: e2fsck/pass1.c:3653 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:4060 +#: e2fsck/pass1.c:4073 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:4066 +#: e2fsck/pass1.c:4079 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:4072 +#: e2fsck/pass1.c:4085 msgid "inode table" msgstr "iノード テーブル" -#: e2fsck/pass2.c:307 +#: e2fsck/pass2.c:308 msgid "Pass 2" msgstr "パス 2" -#: e2fsck/pass2.c:1079 e2fsck/pass2.c:1246 +#: e2fsck/pass2.c:1083 e2fsck/pass2.c:1250 msgid "Can not continue." msgstr "続けられませんでした." @@ -550,11 +550,11 @@ msgid "Pass 3" msgstr "パス 3" -#: e2fsck/pass3.c:344 +#: e2fsck/pass3.c:350 msgid "inode loop detection bitmap" msgstr "" -#: e2fsck/pass4.c:277 +#: e2fsck/pass4.c:289 msgid "Pass 4" msgstr "パス 4" @@ -570,179 +570,179 @@ msgid "check_block_bitmap_checksum: Memory allocation error" msgstr "" -#: e2fsck/problem.c:52 +#: e2fsck/problem.c:53 msgid "(no prompt)" msgstr "" -#: e2fsck/problem.c:53 +#: e2fsck/problem.c:54 msgid "Fix" msgstr "修正" -#: e2fsck/problem.c:54 +#: e2fsck/problem.c:55 msgid "Clear" msgstr "クリア" -#: e2fsck/problem.c:55 +#: e2fsck/problem.c:56 msgid "Relocate" msgstr "" -#: e2fsck/problem.c:56 +#: e2fsck/problem.c:57 msgid "Allocate" msgstr "アロケート" -#: e2fsck/problem.c:57 +#: e2fsck/problem.c:58 msgid "Expand" msgstr "" -#: e2fsck/problem.c:58 +#: e2fsck/problem.c:59 msgid "Connect to /lost+found" msgstr "" -#: e2fsck/problem.c:59 +#: e2fsck/problem.c:60 msgid "Create" msgstr "" -#: e2fsck/problem.c:60 +#: e2fsck/problem.c:61 msgid "Salvage" msgstr "" -#: e2fsck/problem.c:61 +#: e2fsck/problem.c:62 msgid "Truncate" msgstr "" -#: e2fsck/problem.c:62 +#: e2fsck/problem.c:63 msgid "Clear inode" msgstr "" -#: e2fsck/problem.c:63 +#: e2fsck/problem.c:64 msgid "Abort" msgstr "中止" -#: e2fsck/problem.c:64 +#: e2fsck/problem.c:65 msgid "Split" msgstr "" -#: e2fsck/problem.c:65 +#: e2fsck/problem.c:66 msgid "Continue" msgstr "続行" -#: e2fsck/problem.c:66 +#: e2fsck/problem.c:67 msgid "Clone multiply-claimed blocks" msgstr "" -#: e2fsck/problem.c:67 +#: e2fsck/problem.c:68 msgid "Delete file" msgstr "" -#: e2fsck/problem.c:68 +#: e2fsck/problem.c:69 msgid "Suppress messages" msgstr "" -#: e2fsck/problem.c:69 +#: e2fsck/problem.c:70 msgid "Unlink" msgstr "" -#: e2fsck/problem.c:70 +#: e2fsck/problem.c:71 msgid "Clear HTree index" msgstr "" -#: e2fsck/problem.c:71 +#: e2fsck/problem.c:72 msgid "Recreate" msgstr "" -#: e2fsck/problem.c:81 +#: e2fsck/problem.c:83 msgid "(NONE)" msgstr "" -#: e2fsck/problem.c:82 +#: e2fsck/problem.c:84 msgid "FIXED" msgstr "" -#: e2fsck/problem.c:83 +#: e2fsck/problem.c:85 msgid "CLEARED" msgstr "" -#: e2fsck/problem.c:84 +#: e2fsck/problem.c:86 msgid "RELOCATED" msgstr "" -#: e2fsck/problem.c:85 +#: e2fsck/problem.c:87 msgid "ALLOCATED" msgstr "" -#: e2fsck/problem.c:86 +#: e2fsck/problem.c:88 msgid "EXPANDED" msgstr "" -#: e2fsck/problem.c:87 +#: e2fsck/problem.c:89 msgid "RECONNECTED" msgstr "" -#: e2fsck/problem.c:88 +#: e2fsck/problem.c:90 msgid "CREATED" msgstr "" -#: e2fsck/problem.c:89 +#: e2fsck/problem.c:91 msgid "SALVAGED" msgstr "" -#: e2fsck/problem.c:90 +#: e2fsck/problem.c:92 msgid "TRUNCATED" msgstr "" -#: e2fsck/problem.c:91 +#: e2fsck/problem.c:93 msgid "INODE CLEARED" msgstr "" -#: e2fsck/problem.c:92 +#: e2fsck/problem.c:94 msgid "ABORTED" msgstr "" -#: e2fsck/problem.c:93 +#: e2fsck/problem.c:95 msgid "SPLIT" msgstr "" -#: e2fsck/problem.c:94 +#: e2fsck/problem.c:96 msgid "CONTINUING" msgstr "" -#: e2fsck/problem.c:95 +#: e2fsck/problem.c:97 msgid "MULTIPLY-CLAIMED BLOCKS CLONED" msgstr "" -#: e2fsck/problem.c:96 +#: e2fsck/problem.c:98 msgid "FILE DELETED" msgstr "" -#: e2fsck/problem.c:97 +#: e2fsck/problem.c:99 msgid "SUPPRESSED" msgstr "" -#: e2fsck/problem.c:98 +#: e2fsck/problem.c:100 msgid "UNLINKED" msgstr "" -#: e2fsck/problem.c:99 +#: e2fsck/problem.c:101 msgid "HTREE INDEX CLEARED" msgstr "" -#: e2fsck/problem.c:100 +#: e2fsck/problem.c:102 msgid "WILL RECREATE" msgstr "" #. @-expanded: block bitmap for group %g is not in group. (block %b)\n -#: e2fsck/problem.c:115 +#: e2fsck/problem.c:118 msgid "@b @B for @g %g is not in @g. (@b %b)\n" msgstr "" #. @-expanded: inode bitmap for group %g is not in group. (block %b)\n -#: e2fsck/problem.c:119 +#: e2fsck/problem.c:122 msgid "@i @B for @g %g is not in @g. (@b %b)\n" msgstr "" #. @-expanded: inode table for group %g is not in group. (block %b)\n #. @-expanded: WARNING: SEVERE DATA LOSS POSSIBLE.\n -#: e2fsck/problem.c:124 +#: e2fsck/problem.c:127 msgid "" "@i table for @g %g is not in @g. (@b %b)\n" "WARNING: SEVERE DATA LOSS POSSIBLE.\n" @@ -757,7 +757,7 @@ #. @-expanded: or\n #. @-expanded: e2fsck -b 32768 \n #. @-expanded: \n -#: e2fsck/problem.c:130 +#: e2fsck/problem.c:133 msgid "" "\n" "The @S could not be read or does not describe a valid ext2/ext3/ext4\n" @@ -773,7 +773,7 @@ #. @-expanded: The filesystem size (according to the superblock) is %b blocks\n #. @-expanded: The physical size of the device is %c blocks\n #. @-expanded: Either the superblock or the partition table is likely to be corrupt!\n -#: e2fsck/problem.c:141 +#: e2fsck/problem.c:144 msgid "" "The @f size (according to the @S) is %b @bs\n" "The physical size of the @v is %c @bs\n" @@ -783,7 +783,7 @@ #. @-expanded: superblock block_size = %b, fragsize = %c.\n #. @-expanded: This version of e2fsck does not support fragment sizes different\n #. @-expanded: from the block size.\n -#: e2fsck/problem.c:148 +#: e2fsck/problem.c:151 msgid "" "@S @b_size = %b, fragsize = %c.\n" "This version of e2fsck does not support fragment sizes different\n" @@ -791,24 +791,24 @@ msgstr "" #. @-expanded: superblock blocks_per_group = %b, should have been %c\n -#: e2fsck/problem.c:155 +#: e2fsck/problem.c:158 msgid "@S @bs_per_group = %b, should have been %c\n" msgstr "" #. @-expanded: superblock first_data_block = %b, should have been %c\n -#: e2fsck/problem.c:160 +#: e2fsck/problem.c:163 msgid "@S first_data_@b = %b, should have been %c\n" msgstr "" #. @-expanded: filesystem did not have a UUID; generating one.\n #. @-expanded: \n -#: e2fsck/problem.c:165 +#: e2fsck/problem.c:168 msgid "" "@f did not have a UUID; generating one.\n" "\n" msgstr "" -#: e2fsck/problem.c:171 +#: e2fsck/problem.c:174 #, no-c-format msgid "" "Note: if several inode or block bitmap blocks or part\n" @@ -820,48 +820,48 @@ msgstr "" #. @-expanded: Corruption found in superblock. (%s = %N).\n -#: e2fsck/problem.c:180 +#: e2fsck/problem.c:183 msgid "Corruption found in @S. (%s = %N).\n" msgstr "" #. @-expanded: Error determining size of the physical device: %m\n -#: e2fsck/problem.c:186 +#: e2fsck/problem.c:189 #, no-c-format msgid "Error determining size of the physical @v: %m\n" msgstr "" #. @-expanded: inode count in superblock is %i, should be %j.\n -#: e2fsck/problem.c:191 +#: e2fsck/problem.c:194 msgid "@i count in @S is %i, @s %j.\n" msgstr "" -#: e2fsck/problem.c:195 +#: e2fsck/problem.c:198 msgid "The Hurd does not support the filetype feature.\n" msgstr "" #. @-expanded: superblock has an invalid journal (inode %i).\n -#: e2fsck/problem.c:201 +#: e2fsck/problem.c:204 #, no-c-format msgid "@S has an @n @j (@i %i).\n" msgstr "" #. @-expanded: External journal has multiple filesystem users (unsupported).\n -#: e2fsck/problem.c:206 +#: e2fsck/problem.c:209 msgid "External @j has multiple @f users (unsupported).\n" msgstr "" #. @-expanded: Can't find external journal\n -#: e2fsck/problem.c:211 +#: e2fsck/problem.c:214 msgid "Can't find external @j\n" msgstr "" #. @-expanded: External journal has bad superblock\n -#: e2fsck/problem.c:216 +#: e2fsck/problem.c:219 msgid "External @j has bad @S\n" msgstr "" #. @-expanded: External journal does not support this filesystem\n -#: e2fsck/problem.c:221 +#: e2fsck/problem.c:224 msgid "External @j does not support this @f\n" msgstr "" @@ -869,7 +869,7 @@ #. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal #. @-expanded: format.\n #. @-expanded: It is also possible the journal superblock is corrupt.\n -#: e2fsck/problem.c:226 +#: e2fsck/problem.c:229 msgid "" "@f @j @S is unknown type %N (unsupported).\n" "It is likely that your copy of e2fsck is old and/or doesn't support this @j " @@ -878,80 +878,80 @@ msgstr "" #. @-expanded: journal superblock is corrupt.\n -#: e2fsck/problem.c:235 +#: e2fsck/problem.c:238 msgid "@j @S is corrupt.\n" msgstr "" #. @-expanded: superblock has_journal flag is clear, but a journal is present.\n -#: e2fsck/problem.c:240 +#: e2fsck/problem.c:243 msgid "@S has_@j flag is clear, but a @j is present.\n" msgstr "" #. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n -#: e2fsck/problem.c:245 +#: e2fsck/problem.c:248 msgid "@S needs_recovery flag is set, but no @j is present.\n" msgstr "" #. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n -#: e2fsck/problem.c:250 +#: e2fsck/problem.c:253 msgid "@S needs_recovery flag is clear, but @j has data.\n" msgstr "" #. @-expanded: Clear journal -#: e2fsck/problem.c:255 +#: e2fsck/problem.c:258 msgid "Clear @j" msgstr "" #. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem. -#: e2fsck/problem.c:260 e2fsck/problem.c:796 +#: e2fsck/problem.c:263 e2fsck/problem.c:799 msgid "@f has feature flag(s) set, but is a revision 0 @f. " msgstr "" #. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n -#: e2fsck/problem.c:265 +#: e2fsck/problem.c:268 msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n" msgstr "" #. @-expanded: illegal %B (%b) found in orphaned inode %i.\n -#: e2fsck/problem.c:270 +#: e2fsck/problem.c:273 msgid "@I %B (%b) found in @o @i %i.\n" msgstr "" #. @-expanded: Already cleared %B (%b) found in orphaned inode %i.\n -#: e2fsck/problem.c:275 +#: e2fsck/problem.c:278 msgid "Already cleared %B (%b) found in @o @i %i.\n" msgstr "" #. @-expanded: illegal orphaned inode %i in superblock.\n -#: e2fsck/problem.c:281 +#: e2fsck/problem.c:284 #, no-c-format msgid "@I @o @i %i in @S.\n" msgstr "" #. @-expanded: illegal inode %i in orphaned inode list.\n -#: e2fsck/problem.c:287 +#: e2fsck/problem.c:290 #, no-c-format msgid "@I @i %i in @o @i list.\n" msgstr "" #. @-expanded: journal superblock has an unknown read-only feature flag set.\n -#: e2fsck/problem.c:292 +#: e2fsck/problem.c:295 msgid "@j @S has an unknown read-only feature flag set.\n" msgstr "" #. @-expanded: journal superblock has an unknown incompatible feature flag set.\n -#: e2fsck/problem.c:297 +#: e2fsck/problem.c:300 msgid "@j @S has an unknown incompatible feature flag set.\n" msgstr "" #. @-expanded: journal version not supported by this e2fsck.\n -#: e2fsck/problem.c:302 +#: e2fsck/problem.c:305 msgid "@j version not supported by this e2fsck.\n" msgstr "" #. @-expanded: Moving journal from /%s to hidden inode.\n #. @-expanded: \n -#: e2fsck/problem.c:308 +#: e2fsck/problem.c:311 #, no-c-format msgid "" "Moving @j from /%s to hidden @i.\n" @@ -960,7 +960,7 @@ #. @-expanded: Error moving journal: %m\n #. @-expanded: \n -#: e2fsck/problem.c:314 +#: e2fsck/problem.c:317 #, no-c-format msgid "" "Error moving @j: %m\n" @@ -970,7 +970,7 @@ #. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n #. @-expanded: Clearing fields beyond the V1 journal superblock...\n #. @-expanded: \n -#: e2fsck/problem.c:319 +#: e2fsck/problem.c:322 msgid "" "Found @n V2 @j @S fields (from V1 @j).\n" "Clearing fields beyond the V1 @j @S...\n" @@ -978,18 +978,18 @@ msgstr "" #. @-expanded: Run journal anyway -#: e2fsck/problem.c:325 +#: e2fsck/problem.c:328 msgid "Run @j anyway" msgstr "" #. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n -#: e2fsck/problem.c:330 +#: e2fsck/problem.c:333 msgid "Recovery flag not set in backup @S, so running @j anyway.\n" msgstr "" #. @-expanded: Backing up journal inode block information.\n #. @-expanded: \n -#: e2fsck/problem.c:335 +#: e2fsck/problem.c:338 msgid "" "Backing up @j @i @b information.\n" "\n" @@ -997,25 +997,25 @@ #. @-expanded: filesystem does not have resize_inode enabled, but s_reserved_gdt_blocks\n #. @-expanded: is %N; should be zero. -#: e2fsck/problem.c:341 +#: e2fsck/problem.c:344 msgid "" "@f does not have resize_@i enabled, but s_reserved_gdt_@bs\n" "is %N; @s zero. " msgstr "" #. @-expanded: Resize_inode not enabled, but the resize inode is non-zero. -#: e2fsck/problem.c:347 +#: e2fsck/problem.c:350 msgid "Resize_@i not enabled, but the resize @i is non-zero. " msgstr "" #. @-expanded: Resize inode not valid. -#: e2fsck/problem.c:352 +#: e2fsck/problem.c:355 msgid "Resize @i not valid. " msgstr "" #. @-expanded: superblock last mount time (%t,\n #. @-expanded: \tnow = %T) is in the future.\n -#: e2fsck/problem.c:357 +#: e2fsck/problem.c:360 msgid "" "@S last mount time (%t,\n" "\tnow = %T) is in the future.\n" @@ -1023,60 +1023,60 @@ #. @-expanded: superblock last write time (%t,\n #. @-expanded: \tnow = %T) is in the future.\n -#: e2fsck/problem.c:362 +#: e2fsck/problem.c:365 msgid "" "@S last write time (%t,\n" "\tnow = %T) is in the future.\n" msgstr "" #. @-expanded: superblock hint for external superblock should be %X. -#: e2fsck/problem.c:368 +#: e2fsck/problem.c:371 #, no-c-format msgid "@S hint for external superblock @s %X. " msgstr "" #. @-expanded: Adding dirhash hint to filesystem.\n #. @-expanded: \n -#: e2fsck/problem.c:373 +#: e2fsck/problem.c:376 msgid "" "Adding dirhash hint to @f.\n" "\n" msgstr "" #. @-expanded: group descriptor %g checksum is %04x, should be %04y. -#: e2fsck/problem.c:378 +#: e2fsck/problem.c:381 msgid "@g descriptor %g checksum is %04x, should be %04y. " msgstr "" #. @-expanded: group descriptor %g marked uninitialized without feature set.\n -#: e2fsck/problem.c:384 +#: e2fsck/problem.c:387 #, no-c-format msgid "@g descriptor %g marked uninitialized without feature set.\n" msgstr "" #. @-expanded: group descriptor %g has invalid unused inodes count %b. -#: e2fsck/problem.c:389 +#: e2fsck/problem.c:392 msgid "@g descriptor %g has invalid unused inodes count %b. " msgstr "" #. @-expanded: Last group block bitmap uninitialized. -#: e2fsck/problem.c:394 +#: e2fsck/problem.c:397 msgid "Last @g @b @B uninitialized. " msgstr "" -#: e2fsck/problem.c:400 +#: e2fsck/problem.c:403 #, no-c-format msgid "Journal transaction %i was corrupt, replay was aborted.\n" msgstr "" -#: e2fsck/problem.c:405 +#: e2fsck/problem.c:408 msgid "The test_fs flag is set (and ext4 is available). " msgstr "" #. @-expanded: superblock last mount time is in the future.\n #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly #. @-expanded: set)\n -#: e2fsck/problem.c:410 +#: e2fsck/problem.c:413 msgid "" "@S last mount time is in the future.\n" "\t(by less than a day, probably due to the hardware clock being incorrectly " @@ -1086,7 +1086,7 @@ #. @-expanded: superblock last write time is in the future.\n #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly #. @-expanded: set)\n -#: e2fsck/problem.c:416 +#: e2fsck/problem.c:419 msgid "" "@S last write time is in the future.\n" "\t(by less than a day, probably due to the hardware clock being incorrectly " @@ -1094,48 +1094,48 @@ msgstr "" #. @-expanded: One or more block group descriptor checksums are invalid. -#: e2fsck/problem.c:422 +#: e2fsck/problem.c:425 msgid "One or more @b @g descriptor checksums are invalid. " msgstr "" #. @-expanded: Setting free inodes count to %j (was %i)\n -#: e2fsck/problem.c:427 +#: e2fsck/problem.c:430 msgid "Setting free @is count to %j (was %i)\n" msgstr "" #. @-expanded: Setting free blocks count to %c (was %b)\n -#: e2fsck/problem.c:432 +#: e2fsck/problem.c:435 msgid "Setting free @bs count to %c (was %b)\n" msgstr "" #. @-expanded: Hiding %U quota inode %i (%Q).\n -#: e2fsck/problem.c:437 +#: e2fsck/problem.c:440 msgid "Hiding %U @q @i %i (%Q).\n" msgstr "" #. @-expanded: superblock has invalid MMP block. -#: e2fsck/problem.c:442 +#: e2fsck/problem.c:445 msgid "@S has invalid MMP block. " msgstr "" #. @-expanded: superblock has invalid MMP magic. -#: e2fsck/problem.c:447 +#: e2fsck/problem.c:450 msgid "@S has invalid MMP magic. " msgstr "" -#: e2fsck/problem.c:453 +#: e2fsck/problem.c:456 #, no-c-format msgid "ext2fs_open2: %m\n" msgstr "" -#: e2fsck/problem.c:459 +#: e2fsck/problem.c:462 #, no-c-format msgid "ext2fs_check_desc: %m\n" msgstr "" #. @-expanded: superblock metadata_csum supersedes uninit_bg; both feature bits cannot be set #. @-expanded: simultaneously. -#: e2fsck/problem.c:465 +#: e2fsck/problem.c:468 msgid "" "@S metadata_csum supersedes uninit_bg; both feature bits cannot be set " "simultaneously." @@ -1147,156 +1147,156 @@ msgstr "" #. @-expanded: superblock 64bit filesystem needs extents to access the whole disk. -#: e2fsck/problem.c:476 +#: e2fsck/problem.c:479 msgid "@S 64bit @f needs extents to access the whole disk. " msgstr "" -#: e2fsck/problem.c:481 +#: e2fsck/problem.c:484 msgid "First_meta_bg is too big. (%N, max value %g). " msgstr "" #. @-expanded: External journal superblock checksum does not match superblock. -#: e2fsck/problem.c:486 +#: e2fsck/problem.c:489 msgid "External @j @S checksum does not match @S. " msgstr "" #. @-expanded: superblock metadata_csum_seed is not necessary without metadata_csum. -#: e2fsck/problem.c:491 +#: e2fsck/problem.c:494 msgid "@S metadata_csum_seed is not necessary without metadata_csum." msgstr "" -#: e2fsck/problem.c:497 +#: e2fsck/problem.c:500 #, no-c-format msgid "Error initializing quota context in support library: %m\n" msgstr "" #. @-expanded: Bad required extra isize in superblock (%N). -#: e2fsck/problem.c:502 +#: e2fsck/problem.c:505 msgid "Bad required extra isize in @S (%N). " msgstr "" #. @-expanded: Bad desired extra isize in superblock (%N). -#: e2fsck/problem.c:507 +#: e2fsck/problem.c:510 msgid "Bad desired extra isize in @S (%N). " msgstr "" #. @-expanded: Invalid %U quota inode %i. -#: e2fsck/problem.c:512 +#: e2fsck/problem.c:515 msgid "Invalid %U @q @i %i. " msgstr "" #. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n -#: e2fsck/problem.c:530 +#: e2fsck/problem.c:533 msgid "Pass 1: Checking @is, @bs, and sizes\n" msgstr "" #. @-expanded: root inode is not a directory. -#: e2fsck/problem.c:534 +#: e2fsck/problem.c:537 msgid "@r is not a @d. " msgstr "" #. @-expanded: root inode has dtime set (probably due to old mke2fs). -#: e2fsck/problem.c:539 +#: e2fsck/problem.c:542 msgid "@r has dtime set (probably due to old mke2fs). " msgstr "" #. @-expanded: Reserved inode %i (%Q) has invalid mode. -#: e2fsck/problem.c:544 +#: e2fsck/problem.c:547 msgid "Reserved @i %i (%Q) has @n mode. " msgstr "" #. @-expanded: deleted inode %i has zero dtime. -#: e2fsck/problem.c:550 +#: e2fsck/problem.c:553 #, no-c-format msgid "@D @i %i has zero dtime. " msgstr "" #. @-expanded: inode %i is in use, but has dtime set. -#: e2fsck/problem.c:556 +#: e2fsck/problem.c:559 #, no-c-format msgid "@i %i is in use, but has dtime set. " msgstr "" #. @-expanded: inode %i is a zero-length directory. -#: e2fsck/problem.c:562 +#: e2fsck/problem.c:565 #, no-c-format msgid "@i %i is a @z @d. " msgstr "" #. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:567 +#: e2fsck/problem.c:570 msgid "@g %g's @b @B at %b @C.\n" msgstr "" #. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:572 +#: e2fsck/problem.c:575 msgid "@g %g's @i @B at %b @C.\n" msgstr "" #. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:577 +#: e2fsck/problem.c:580 msgid "@g %g's @i table at %b @C.\n" msgstr "" #. @-expanded: group %g's block bitmap (%b) is bad. -#: e2fsck/problem.c:582 +#: e2fsck/problem.c:585 msgid "@g %g's @b @B (%b) is bad. " msgstr "" #. @-expanded: group %g's inode bitmap (%b) is bad. -#: e2fsck/problem.c:587 +#: e2fsck/problem.c:590 msgid "@g %g's @i @B (%b) is bad. " msgstr "" #. @-expanded: inode %i, i_size is %Is, should be %N. -#: e2fsck/problem.c:592 +#: e2fsck/problem.c:595 msgid "@i %i, i_size is %Is, @s %N. " msgstr "" #. @-expanded: inode %i, i_blocks is %Ib, should be %N. -#: e2fsck/problem.c:597 +#: e2fsck/problem.c:600 msgid "@i %i, i_@bs is %Ib, @s %N. " msgstr "" #. @-expanded: illegal %B (%b) in inode %i. -#: e2fsck/problem.c:602 +#: e2fsck/problem.c:605 msgid "@I %B (%b) in @i %i. " msgstr "" #. @-expanded: %B (%b) overlaps filesystem metadata in inode %i. -#: e2fsck/problem.c:607 +#: e2fsck/problem.c:610 msgid "%B (%b) overlaps @f metadata in @i %i. " msgstr "" #. @-expanded: inode %i has illegal block(s). -#: e2fsck/problem.c:613 +#: e2fsck/problem.c:616 #, no-c-format msgid "@i %i has illegal @b(s). " msgstr "" #. @-expanded: Too many illegal blocks in inode %i.\n -#: e2fsck/problem.c:619 +#: e2fsck/problem.c:622 #, no-c-format msgid "Too many illegal @bs in @i %i.\n" msgstr "" #. @-expanded: illegal %B (%b) in bad block inode. -#: e2fsck/problem.c:624 +#: e2fsck/problem.c:627 msgid "@I %B (%b) in bad @b @i. " msgstr "" #. @-expanded: Bad block inode has illegal block(s). -#: e2fsck/problem.c:629 +#: e2fsck/problem.c:632 msgid "Bad @b @i has illegal @b(s). " msgstr "" #. @-expanded: Duplicate or bad block in use!\n -#: e2fsck/problem.c:634 +#: e2fsck/problem.c:637 msgid "Duplicate or bad @b in use!\n" msgstr "" #. @-expanded: Bad block %b used as bad block inode indirect block. -#: e2fsck/problem.c:639 +#: e2fsck/problem.c:642 msgid "Bad @b %b used as bad @b @i indirect @b. " msgstr "" @@ -1304,7 +1304,7 @@ #. @-expanded: The bad block inode has probably been corrupted. You probably\n #. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n #. @-expanded: in the filesystem.\n -#: e2fsck/problem.c:644 +#: e2fsck/problem.c:647 msgid "" "\n" "The bad @b @i has probably been corrupted. You probably\n" @@ -1314,7 +1314,7 @@ #. @-expanded: \n #. @-expanded: If the block is really bad, the filesystem can not be fixed.\n -#: e2fsck/problem.c:651 +#: e2fsck/problem.c:654 msgid "" "\n" "If the @b is really bad, the @f can not be fixed.\n" @@ -1323,7 +1323,7 @@ #. @-expanded: You can remove this block from the bad block list and hope\n #. @-expanded: that the block is really OK. But there are no guarantees.\n #. @-expanded: \n -#: e2fsck/problem.c:656 +#: e2fsck/problem.c:659 msgid "" "You can remove this @b from the bad @b list and hope\n" "that the @b is really OK. But there are no guarantees.\n" @@ -1331,121 +1331,121 @@ msgstr "" #. @-expanded: The primary superblock (%b) is on the bad block list.\n -#: e2fsck/problem.c:662 +#: e2fsck/problem.c:665 msgid "The primary @S (%b) is on the bad @b list.\n" msgstr "" #. @-expanded: Block %b in the primary group descriptors is on the bad block list\n -#: e2fsck/problem.c:667 +#: e2fsck/problem.c:670 msgid "Block %b in the primary @g descriptors is on the bad @b list\n" msgstr "" #. @-expanded: Warning: Group %g's superblock (%b) is bad.\n -#: e2fsck/problem.c:673 +#: e2fsck/problem.c:676 msgid "Warning: Group %g's @S (%b) is bad.\n" msgstr "" #. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n -#: e2fsck/problem.c:679 +#: e2fsck/problem.c:682 msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n" msgstr "" #. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n -#: e2fsck/problem.c:685 +#: e2fsck/problem.c:688 msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n" msgstr "" #. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n -#: e2fsck/problem.c:691 +#: e2fsck/problem.c:694 msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n" msgstr "" #. @-expanded: error allocating block buffer for relocating %s\n -#: e2fsck/problem.c:697 +#: e2fsck/problem.c:700 #, no-c-format msgid "@A @b buffer for relocating %s\n" msgstr "" #. @-expanded: Relocating group %g's %s from %b to %c...\n -#: e2fsck/problem.c:702 +#: e2fsck/problem.c:705 msgid "Relocating @g %g's %s from %b to %c...\n" msgstr "" #. @-expanded: Relocating group %g's %s to %c...\n -#: e2fsck/problem.c:708 +#: e2fsck/problem.c:711 #, no-c-format msgid "Relocating @g %g's %s to %c...\n" msgstr "" #. @-expanded: Warning: could not read block %b of %s: %m\n -#: e2fsck/problem.c:713 +#: e2fsck/problem.c:716 msgid "Warning: could not read @b %b of %s: %m\n" msgstr "" #. @-expanded: Warning: could not write block %b for %s: %m\n -#: e2fsck/problem.c:718 +#: e2fsck/problem.c:721 msgid "Warning: could not write @b %b for %s: %m\n" msgstr "" #. @-expanded: error allocating inode bitmap (%N): %m\n -#: e2fsck/problem.c:723 e2fsck/problem.c:1871 +#: e2fsck/problem.c:726 e2fsck/problem.c:1883 msgid "@A @i @B (%N): %m\n" msgstr "" #. @-expanded: error allocating block bitmap (%N): %m\n -#: e2fsck/problem.c:728 +#: e2fsck/problem.c:731 msgid "@A @b @B (%N): %m\n" msgstr "" #. @-expanded: error allocating icount link information: %m\n -#: e2fsck/problem.c:734 +#: e2fsck/problem.c:737 #, no-c-format msgid "@A icount link information: %m\n" msgstr "" #. @-expanded: error allocating directory block array: %m\n -#: e2fsck/problem.c:740 +#: e2fsck/problem.c:743 #, no-c-format msgid "@A @d @b array: %m\n" msgstr "" #. @-expanded: Error while scanning inodes (%i): %m\n -#: e2fsck/problem.c:746 +#: e2fsck/problem.c:749 #, no-c-format msgid "Error while scanning @is (%i): %m\n" msgstr "" #. @-expanded: Error while iterating over blocks in inode %i: %m\n -#: e2fsck/problem.c:752 +#: e2fsck/problem.c:755 #, no-c-format msgid "Error while iterating over @bs in @i %i: %m\n" msgstr "" #. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n -#: e2fsck/problem.c:757 +#: e2fsck/problem.c:760 msgid "Error storing @i count information (@i=%i, count=%N): %m\n" msgstr "" #. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n -#: e2fsck/problem.c:762 +#: e2fsck/problem.c:765 msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n" msgstr "" #. @-expanded: Error reading inode %i: %m\n -#: e2fsck/problem.c:769 +#: e2fsck/problem.c:772 #, no-c-format msgid "Error reading @i %i: %m\n" msgstr "" #. @-expanded: inode %i has imagic flag set. -#: e2fsck/problem.c:778 +#: e2fsck/problem.c:781 #, no-c-format msgid "@i %i has imagic flag set. " msgstr "" #. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n #. @-expanded: or append-only flag set. -#: e2fsck/problem.c:784 +#: e2fsck/problem.c:787 #, no-c-format msgid "" "Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n" @@ -1453,198 +1453,198 @@ msgstr "" #. @-expanded: Special (device/socket/fifo) inode %i has non-zero size. -#: e2fsck/problem.c:791 +#: e2fsck/problem.c:794 #, no-c-format msgid "Special (@v/socket/fifo) @i %i has non-zero size. " msgstr "" #. @-expanded: journal inode is not in use, but contains data. -#: e2fsck/problem.c:801 +#: e2fsck/problem.c:804 msgid "@j @i is not in use, but contains data. " msgstr "" #. @-expanded: journal is not regular file. -#: e2fsck/problem.c:806 +#: e2fsck/problem.c:809 msgid "@j is not regular file. " msgstr "" #. @-expanded: inode %i was part of the orphaned inode list. -#: e2fsck/problem.c:812 +#: e2fsck/problem.c:815 #, no-c-format msgid "@i %i was part of the @o @i list. " msgstr "" #. @-expanded: inodes that were part of a corrupted orphan linked list found. -#: e2fsck/problem.c:818 +#: e2fsck/problem.c:821 msgid "@is that were part of a corrupted orphan linked list found. " msgstr "" #. @-expanded: error allocating refcount structure (%N): %m\n -#: e2fsck/problem.c:823 +#: e2fsck/problem.c:826 msgid "@A refcount structure (%N): %m\n" msgstr "" #. @-expanded: Error reading extended attribute block %b for inode %i. -#: e2fsck/problem.c:828 +#: e2fsck/problem.c:831 msgid "Error reading @a @b %b for @i %i. " msgstr "" #. @-expanded: inode %i has a bad extended attribute block %b. -#: e2fsck/problem.c:833 +#: e2fsck/problem.c:836 msgid "@i %i has a bad @a @b %b. " msgstr "" #. @-expanded: Error reading extended attribute block %b (%m). -#: e2fsck/problem.c:838 +#: e2fsck/problem.c:841 msgid "Error reading @a @b %b (%m). " msgstr "" #. @-expanded: extended attribute block %b has reference count %r, should be %N. -#: e2fsck/problem.c:843 +#: e2fsck/problem.c:846 msgid "@a @b %b has reference count %r, @s %N. " msgstr "" #. @-expanded: Error writing extended attribute block %b (%m). -#: e2fsck/problem.c:848 +#: e2fsck/problem.c:851 msgid "Error writing @a @b %b (%m). " msgstr "" #. @-expanded: extended attribute block %b has h_blocks > 1. -#: e2fsck/problem.c:853 +#: e2fsck/problem.c:856 msgid "@a @b %b has h_@bs > 1. " msgstr "" #. @-expanded: error allocating extended attribute region allocation structure. -#: e2fsck/problem.c:858 +#: e2fsck/problem.c:861 msgid "@A @a region allocation structure. " msgstr "" #. @-expanded: extended attribute block %b is corrupt (allocation collision). -#: e2fsck/problem.c:863 +#: e2fsck/problem.c:866 msgid "@a @b %b is corrupt (allocation collision). " msgstr "" #. @-expanded: extended attribute block %b is corrupt (invalid name). -#: e2fsck/problem.c:868 +#: e2fsck/problem.c:871 msgid "@a @b %b is corrupt (@n name). " msgstr "" #. @-expanded: extended attribute block %b is corrupt (invalid value). -#: e2fsck/problem.c:873 +#: e2fsck/problem.c:876 msgid "@a @b %b is corrupt (@n value). " msgstr "" #. @-expanded: inode %i is too big. -#: e2fsck/problem.c:879 +#: e2fsck/problem.c:882 #, no-c-format msgid "@i %i is too big. " msgstr "" #. @-expanded: %B (%b) causes directory to be too big. -#: e2fsck/problem.c:883 +#: e2fsck/problem.c:886 msgid "%B (%b) causes @d to be too big. " msgstr "" -#: e2fsck/problem.c:888 +#: e2fsck/problem.c:891 msgid "%B (%b) causes file to be too big. " msgstr "" -#: e2fsck/problem.c:893 +#: e2fsck/problem.c:896 msgid "%B (%b) causes symlink to be too big. " msgstr "" #. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n -#: e2fsck/problem.c:899 +#: e2fsck/problem.c:902 #, no-c-format msgid "@i %i has INDEX_FL flag set on @f without htree support.\n" msgstr "" #. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n -#: e2fsck/problem.c:905 +#: e2fsck/problem.c:908 #, no-c-format msgid "@i %i has INDEX_FL flag set but is not a @d.\n" msgstr "" #. @-expanded: HTREE directory inode %i has an invalid root node.\n -#: e2fsck/problem.c:911 +#: e2fsck/problem.c:914 #, no-c-format msgid "@h %i has an @n root node.\n" msgstr "" #. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n -#: e2fsck/problem.c:916 +#: e2fsck/problem.c:919 msgid "@h %i has an unsupported hash version (%N)\n" msgstr "" #. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n -#: e2fsck/problem.c:922 +#: e2fsck/problem.c:925 #, no-c-format msgid "@h %i uses an incompatible htree root node flag.\n" msgstr "" #. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n -#: e2fsck/problem.c:927 +#: e2fsck/problem.c:930 msgid "@h %i has a tree depth (%N) which is too big\n" msgstr "" #. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n #. @-expanded: filesystem metadata. -#: e2fsck/problem.c:933 +#: e2fsck/problem.c:936 msgid "" "Bad @b @i has an indirect @b (%b) that conflicts with\n" "@f metadata. " msgstr "" #. @-expanded: Resize inode (re)creation failed: %m. -#: e2fsck/problem.c:940 +#: e2fsck/problem.c:943 #, no-c-format msgid "Resize @i (re)creation failed: %m." msgstr "" #. @-expanded: inode %i has a extra size (%IS) which is invalid\n -#: e2fsck/problem.c:945 +#: e2fsck/problem.c:948 msgid "@i %i has a extra size (%IS) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n -#: e2fsck/problem.c:950 +#: e2fsck/problem.c:953 msgid "@a in @i %i has a namelen (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n -#: e2fsck/problem.c:955 +#: e2fsck/problem.c:958 msgid "@a in @i %i has a value offset (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n -#: e2fsck/problem.c:960 +#: e2fsck/problem.c:963 msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n -#: e2fsck/problem.c:965 +#: e2fsck/problem.c:968 msgid "@a in @i %i has a value size (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n -#: e2fsck/problem.c:970 +#: e2fsck/problem.c:973 msgid "@a in @i %i has a hash (%N) which is @n\n" msgstr "" #. @-expanded: inode %i is a %It but it looks like it is really a directory.\n -#: e2fsck/problem.c:975 +#: e2fsck/problem.c:978 msgid "@i %i is a %It but it looks like it is really a directory.\n" msgstr "" #. @-expanded: Error while reading over extent tree in inode %i: %m\n -#: e2fsck/problem.c:981 +#: e2fsck/problem.c:984 #, no-c-format msgid "Error while reading over @x tree in @i %i: %m\n" msgstr "" #. @-expanded: Failed to iterate extents in inode %i\n #. @-expanded: \t(op %s, blk %b, lblk %c): %m\n -#: e2fsck/problem.c:986 +#: e2fsck/problem.c:989 msgid "" "Failed to iterate extents in @i %i\n" "\t(op %s, blk %b, lblk %c): %m\n" @@ -1652,7 +1652,7 @@ #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n -#: e2fsck/problem.c:992 +#: e2fsck/problem.c:995 msgid "" "@i %i has an @n extent\n" "\t(logical @b %c, @n physical @b %b, len %N)\n" @@ -1660,116 +1660,116 @@ #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n -#: e2fsck/problem.c:997 +#: e2fsck/problem.c:1000 msgid "" "@i %i has an @n extent\n" "\t(logical @b %c, physical @b %b, @n len %N)\n" msgstr "" #. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n -#: e2fsck/problem.c:1003 +#: e2fsck/problem.c:1006 #, no-c-format msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n" msgstr "" #. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n -#: e2fsck/problem.c:1009 +#: e2fsck/problem.c:1012 #, no-c-format msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n" msgstr "" #. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n -#: e2fsck/problem.c:1015 +#: e2fsck/problem.c:1018 #, no-c-format msgid "@i %i missing EXTENT_FL, but is in extents format\n" msgstr "" -#: e2fsck/problem.c:1021 +#: e2fsck/problem.c:1024 #, no-c-format msgid "Fast symlink %i has EXTENT_FL set. " msgstr "" #. @-expanded: inode %i has out of order extents\n #. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1026 +#: e2fsck/problem.c:1029 msgid "" "@i %i has out of order extents\n" "\t(@n logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n -#: e2fsck/problem.c:1030 +#: e2fsck/problem.c:1033 msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n" msgstr "" #. @-expanded: Error converting subcluster block bitmap: %m\n -#: e2fsck/problem.c:1036 +#: e2fsck/problem.c:1039 #, no-c-format msgid "Error converting subcluster @b @B: %m\n" msgstr "" #. @-expanded: quota inode is not a regular file. -#: e2fsck/problem.c:1041 +#: e2fsck/problem.c:1044 msgid "@q @i is not a regular file. " msgstr "" #. @-expanded: quota inode is not in use, but contains data. -#: e2fsck/problem.c:1046 +#: e2fsck/problem.c:1049 msgid "@q @i is not in use, but contains data. " msgstr "" #. @-expanded: quota inode is visible to the user. -#: e2fsck/problem.c:1051 +#: e2fsck/problem.c:1054 msgid "@q @i is visible to the user. " msgstr "" #. @-expanded: The bad block inode looks invalid. -#: e2fsck/problem.c:1056 +#: e2fsck/problem.c:1059 msgid "The bad @b @i looks @n. " msgstr "" #. @-expanded: inode %i has zero length extent\n #. @-expanded: \t(invalid logical block %c, physical block %b)\n -#: e2fsck/problem.c:1061 +#: e2fsck/problem.c:1064 msgid "" "@i %i has zero length extent\n" "\t(@n logical @b %c, physical @b %b)\n" msgstr "" #. @-expanded: inode %i seems to contain garbage. -#: e2fsck/problem.c:1067 +#: e2fsck/problem.c:1070 #, no-c-format msgid "@i %i seems to contain garbage. " msgstr "" #. @-expanded: inode %i passes checks, but checksum does not match inode. -#: e2fsck/problem.c:1073 +#: e2fsck/problem.c:1076 #, no-c-format msgid "@i %i passes checks, but checksum does not match @i. " msgstr "" #. @-expanded: inode %i extended attribute is corrupt (allocation collision). -#: e2fsck/problem.c:1079 +#: e2fsck/problem.c:1082 #, no-c-format msgid "@i %i @a is corrupt (allocation collision). " msgstr "" #. @-expanded: inode %i extent block passes checks, but checksum does not match extent\n #. @-expanded: \t(logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1087 +#: e2fsck/problem.c:1090 msgid "" "@i %i extent block passes checks, but checksum does not match extent\n" "\t(logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i extended attribute block %b passes checks, but checksum does not match block. -#: e2fsck/problem.c:1096 +#: e2fsck/problem.c:1099 msgid "@i %i @a @b %b passes checks, but checksum does not match @b. " msgstr "" #. @-expanded: Interior extent node level %N of inode %i:\n #. @-expanded: Logical start %b does not match logical start %c at next level. -#: e2fsck/problem.c:1101 +#: e2fsck/problem.c:1104 msgid "" "Interior @x node level %N of @i %i:\n" "Logical start %b does not match logical start %c at next level. " @@ -1777,59 +1777,59 @@ #. @-expanded: inode %i, end of extent exceeds allowed value\n #. @-expanded: \t(logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1107 +#: e2fsck/problem.c:1110 msgid "" "@i %i, end of extent exceeds allowed value\n" "\t(logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i has inline data, but superblock is missing INLINE_DATA feature\n -#: e2fsck/problem.c:1113 +#: e2fsck/problem.c:1116 #, no-c-format msgid "@i %i has inline data, but @S is missing INLINE_DATA feature\n" msgstr "" #. @-expanded: inode %i has INLINE_DATA_FL flag on filesystem without inline data support.\n -#: e2fsck/problem.c:1119 +#: e2fsck/problem.c:1122 #, no-c-format msgid "@i %i has INLINE_DATA_FL flag on @f without inline data support.\n" msgstr "" #. @-expanded: inode %i block %b conflicts with critical metadata, skipping block checks.\n -#: e2fsck/problem.c:1127 +#: e2fsck/problem.c:1130 #, no-c-format msgid "" "@i %i block %b conflicts with critical metadata, skipping block checks.\n" msgstr "" #. @-expanded: directory inode %i block %b should be at block %c. -#: e2fsck/problem.c:1132 +#: e2fsck/problem.c:1135 msgid "@d @i %i @b %b should be at @b %c. " msgstr "" #. @-expanded: directory inode %i has extent marked uninitialized at block %c. -#: e2fsck/problem.c:1138 +#: e2fsck/problem.c:1141 #, no-c-format msgid "@d @i %i has @x marked uninitialized at @b %c. " msgstr "" #. @-expanded: inode %i logical block %b (physical block %c) violates cluster allocation rules.\n #. @-expanded: Will fix in pass 1B.\n -#: e2fsck/problem.c:1143 +#: e2fsck/problem.c:1146 msgid "" "@i %i logical @b %b (physical @b %c) violates cluster allocation rules.\n" "Will fix in pass 1B.\n" msgstr "" #. @-expanded: inode %i has INLINE_DATA_FL flag but extended attribute not found. -#: e2fsck/problem.c:1149 +#: e2fsck/problem.c:1152 #, no-c-format msgid "@i %i has INLINE_DATA_FL flag but @a not found. " msgstr "" #. @-expanded: Special (device/socket/fifo) file (inode %i) has extents\n #. @-expanded: or inline-data flag set. -#: e2fsck/problem.c:1156 +#: e2fsck/problem.c:1159 #, no-c-format msgid "" "Special (@v/socket/fifo) file (@i %i) has extents\n" @@ -1837,88 +1837,88 @@ msgstr "" #. @-expanded: inode %i has extent header but inline data flag is set.\n -#: e2fsck/problem.c:1163 +#: e2fsck/problem.c:1166 #, no-c-format msgid "@i %i has @x header but inline data flag is set.\n" msgstr "" #. @-expanded: inode %i seems to have inline data but extent flag is set.\n -#: e2fsck/problem.c:1169 +#: e2fsck/problem.c:1172 #, no-c-format msgid "@i %i seems to have inline data but @x flag is set.\n" msgstr "" #. @-expanded: inode %i seems to have block map but inline data and extent flags set.\n -#: e2fsck/problem.c:1175 +#: e2fsck/problem.c:1178 #, no-c-format msgid "@i %i seems to have @b map but inline data and @x flags set.\n" msgstr "" #. @-expanded: inode %i has inline data and extent flags set but i_block contains junk.\n -#: e2fsck/problem.c:1181 +#: e2fsck/problem.c:1184 #, no-c-format msgid "@i %i has inline data and @x flags set but i_block contains junk.\n" msgstr "" #. @-expanded: Bad block list says the bad block list inode is bad. -#: e2fsck/problem.c:1186 +#: e2fsck/problem.c:1189 msgid "Bad block list says the bad block list @i is bad. " msgstr "" #. @-expanded: error allocating extent region allocation structure. -#: e2fsck/problem.c:1191 +#: e2fsck/problem.c:1194 msgid "@A @x region allocation structure. " msgstr "" #. @-expanded: inode %i has a duplicate extent mapping\n #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n -#: e2fsck/problem.c:1196 +#: e2fsck/problem.c:1199 msgid "" "@i %i has a duplicate @x mapping\n" "\t(logical @b %c, @n physical @b %b, len %N)\n" msgstr "" #. @-expanded: error allocating memory for encrypted directory list\n -#: e2fsck/problem.c:1201 +#: e2fsck/problem.c:1204 msgid "@A memory for encrypted @d list\n" msgstr "" #. @-expanded: inode %i extent tree could be more shallow (%b; could be <= %c)\n -#: e2fsck/problem.c:1206 +#: e2fsck/problem.c:1209 msgid "@i %i @x tree could be more shallow (%b; could be <= %c)\n" msgstr "" #. @-expanded: inode %i on bigalloc filesystem cannot be block mapped. -#: e2fsck/problem.c:1212 +#: e2fsck/problem.c:1215 #, no-c-format msgid "@i %i on bigalloc @f cannot be @b mapped. " msgstr "" #. @-expanded: inode %i has corrupt extent header. -#: e2fsck/problem.c:1218 +#: e2fsck/problem.c:1221 #, no-c-format msgid "@i %i has corrupt @x header. " msgstr "" #. @-expanded: Timestamp(s) on inode %i beyond 2310-04-04 are likely pre-1970.\n -#: e2fsck/problem.c:1224 +#: e2fsck/problem.c:1227 #, no-c-format msgid "Timestamp(s) on @i %i beyond 2310-04-04 are likely pre-1970.\n" msgstr "" #. @-expanded: inode %i has illegal extended attribute value inode %N.\n -#: e2fsck/problem.c:1229 +#: e2fsck/problem.c:1232 msgid "@i %i has @I @a value @i %N.\n" msgstr "" #. @-expanded: inode %i has invalid extended attribute. EA inode %N missing EA_INODE flag.\n -#: e2fsck/problem.c:1235 +#: e2fsck/problem.c:1238 msgid "@i %i has @n @a. EA @i %N missing EA_INODE flag.\n" msgstr "" #. @-expanded: EA inode %N for parent inode %i missing EA_INODE flag.\n #. @-expanded: -#: e2fsck/problem.c:1240 +#: e2fsck/problem.c:1243 msgid "" "EA @i %N for parent @i %i missing EA_INODE flag.\n" " " @@ -1927,7 +1927,7 @@ #. @-expanded: \n #. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n #. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n -#: e2fsck/problem.c:1248 +#: e2fsck/problem.c:1260 msgid "" "\n" "Running additional passes to resolve @bs claimed by more than one @i...\n" @@ -1935,64 +1935,64 @@ msgstr "" #. @-expanded: multiply-claimed block(s) in inode %i: -#: e2fsck/problem.c:1255 +#: e2fsck/problem.c:1267 #, no-c-format msgid "@m @b(s) in @i %i:" msgstr "" -#: e2fsck/problem.c:1271 +#: e2fsck/problem.c:1283 #, no-c-format msgid "Error while scanning inodes (%i): %m\n" msgstr "" #. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n -#: e2fsck/problem.c:1277 +#: e2fsck/problem.c:1289 #, no-c-format msgid "@A @i @B (@i_dup_map): %m\n" msgstr "" #. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n -#: e2fsck/problem.c:1283 +#: e2fsck/problem.c:1295 #, no-c-format msgid "Error while iterating over @bs in @i %i (%s): %m\n" msgstr "" #. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n -#: e2fsck/problem.c:1288 e2fsck/problem.c:1663 +#: e2fsck/problem.c:1300 e2fsck/problem.c:1675 msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n" msgstr "" #. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n -#: e2fsck/problem.c:1298 +#: e2fsck/problem.c:1310 msgid "Pass 1C: Scanning directories for @is with @m @bs\n" msgstr "" #. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n -#: e2fsck/problem.c:1304 +#: e2fsck/problem.c:1316 msgid "Pass 1D: Reconciling @m @bs\n" msgstr "" #. @-expanded: File %Q (inode #%i, mod time %IM) \n #. @-expanded: has %r multiply-claimed block(s), shared with %N file(s):\n -#: e2fsck/problem.c:1309 +#: e2fsck/problem.c:1321 msgid "" "File %Q (@i #%i, mod time %IM) \n" " has %r @m @b(s), shared with %N file(s):\n" msgstr "" #. @-expanded: \t%Q (inode #%i, mod time %IM)\n -#: e2fsck/problem.c:1315 +#: e2fsck/problem.c:1327 msgid "\t%Q (@i #%i, mod time %IM)\n" msgstr "" #. @-expanded: \t\n -#: e2fsck/problem.c:1320 +#: e2fsck/problem.c:1332 msgid "\t<@f metadata>\n" msgstr "" #. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n #. @-expanded: \n -#: e2fsck/problem.c:1325 +#: e2fsck/problem.c:1337 msgid "" "(There are %N @is containing @m @bs.)\n" "\n" @@ -2000,351 +2000,351 @@ #. @-expanded: multiply-claimed blocks already reassigned or cloned.\n #. @-expanded: \n -#: e2fsck/problem.c:1330 +#: e2fsck/problem.c:1342 msgid "" "@m @bs already reassigned or cloned.\n" "\n" msgstr "" -#: e2fsck/problem.c:1344 +#: e2fsck/problem.c:1356 #, no-c-format msgid "Couldn't clone file: %m\n" msgstr "" #. @-expanded: Pass 1E: Optimizing extent trees\n -#: e2fsck/problem.c:1350 +#: e2fsck/problem.c:1362 msgid "Pass 1E: Optimizing @x trees\n" msgstr "" #. @-expanded: Failed to optimize extent tree %p (%i): %m\n -#: e2fsck/problem.c:1356 +#: e2fsck/problem.c:1368 #, no-c-format msgid "Failed to optimize @x tree %p (%i): %m\n" msgstr "" #. @-expanded: Optimizing extent trees: -#: e2fsck/problem.c:1361 +#: e2fsck/problem.c:1373 msgid "Optimizing @x trees: " msgstr "" -#: e2fsck/problem.c:1376 +#: e2fsck/problem.c:1388 msgid "Internal error: max extent tree depth too large (%b; expected=%c).\n" msgstr "" #. @-expanded: inode %i extent tree (at level %b) could be shorter. -#: e2fsck/problem.c:1381 +#: e2fsck/problem.c:1393 msgid "@i %i @x tree (at level %b) could be shorter. " msgstr "" #. @-expanded: inode %i extent tree (at level %b) could be narrower. -#: e2fsck/problem.c:1386 +#: e2fsck/problem.c:1398 msgid "@i %i @x tree (at level %b) could be narrower. " msgstr "" #. @-expanded: Pass 2: Checking directory structure\n -#: e2fsck/problem.c:1393 +#: e2fsck/problem.c:1405 msgid "Pass 2: Checking @d structure\n" msgstr "" #. @-expanded: invalid inode number for '.' in directory inode %i.\n -#: e2fsck/problem.c:1399 +#: e2fsck/problem.c:1411 #, no-c-format msgid "@n @i number for '.' in @d @i %i.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n -#: e2fsck/problem.c:1404 +#: e2fsck/problem.c:1416 msgid "@E has @n @i #: %Di.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di. -#: e2fsck/problem.c:1409 +#: e2fsck/problem.c:1421 msgid "@E has @D/unused @i %Di. " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to '.' -#: e2fsck/problem.c:1414 +#: e2fsck/problem.c:1426 msgid "@E @L to '.' " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n -#: e2fsck/problem.c:1419 +#: e2fsck/problem.c:1431 msgid "@E points to @i (%Di) located in a bad @b.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n -#: e2fsck/problem.c:1424 +#: e2fsck/problem.c:1436 msgid "@E @L to @d %P (%Di).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n -#: e2fsck/problem.c:1429 +#: e2fsck/problem.c:1441 msgid "@E @L to the @r.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n -#: e2fsck/problem.c:1434 +#: e2fsck/problem.c:1446 msgid "@E has illegal characters in its name.\n" msgstr "" #. @-expanded: Missing '.' in directory inode %i.\n -#: e2fsck/problem.c:1440 +#: e2fsck/problem.c:1452 #, no-c-format msgid "Missing '.' in @d @i %i.\n" msgstr "" #. @-expanded: Missing '..' in directory inode %i.\n -#: e2fsck/problem.c:1446 +#: e2fsck/problem.c:1458 #, no-c-format msgid "Missing '..' in @d @i %i.\n" msgstr "" #. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n -#: e2fsck/problem.c:1451 +#: e2fsck/problem.c:1463 msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n" msgstr "" #. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n -#: e2fsck/problem.c:1456 +#: e2fsck/problem.c:1468 msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n" msgstr "" #. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n -#: e2fsck/problem.c:1461 +#: e2fsck/problem.c:1473 msgid "i_faddr @F %IF, @s zero.\n" msgstr "" #. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n -#: e2fsck/problem.c:1466 +#: e2fsck/problem.c:1478 msgid "i_file_acl @F %If, @s zero.\n" msgstr "" #. @-expanded: i_size_high for inode %i (%Q) is %Id, should be zero.\n -#: e2fsck/problem.c:1471 +#: e2fsck/problem.c:1483 msgid "i_size_high @F %Id, @s zero.\n" msgstr "" #. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1476 +#: e2fsck/problem.c:1488 msgid "i_frag @F %N, @s zero.\n" msgstr "" #. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1481 +#: e2fsck/problem.c:1493 msgid "i_fsize @F %N, @s zero.\n" msgstr "" #. @-expanded: inode %i (%Q) has invalid mode (%Im).\n -#: e2fsck/problem.c:1486 +#: e2fsck/problem.c:1498 msgid "@i %i (%Q) has @n mode (%Im).\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n -#: e2fsck/problem.c:1491 +#: e2fsck/problem.c:1503 msgid "@d @i %i, %B, offset %N: @d corrupted\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: filename too long\n -#: e2fsck/problem.c:1496 +#: e2fsck/problem.c:1508 msgid "@d @i %i, %B, offset %N: filename too long\n" msgstr "" #. @-expanded: directory inode %i has an unallocated %B. -#: e2fsck/problem.c:1501 +#: e2fsck/problem.c:1513 msgid "@d @i %i has an unallocated %B. " msgstr "" #. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n -#: e2fsck/problem.c:1507 +#: e2fsck/problem.c:1519 #, no-c-format msgid "'.' @d @e in @d @i %i is not NULL terminated\n" msgstr "" #. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n -#: e2fsck/problem.c:1513 +#: e2fsck/problem.c:1525 #, no-c-format msgid "'..' @d @e in @d @i %i is not NULL terminated\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal character device.\n -#: e2fsck/problem.c:1518 +#: e2fsck/problem.c:1530 msgid "@i %i (%Q) is an @I character @v.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal block device.\n -#: e2fsck/problem.c:1523 +#: e2fsck/problem.c:1535 msgid "@i %i (%Q) is an @I @b @v.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n -#: e2fsck/problem.c:1528 +#: e2fsck/problem.c:1540 msgid "@E is duplicate '.' @e.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n -#: e2fsck/problem.c:1533 +#: e2fsck/problem.c:1545 msgid "@E is duplicate '..' @e.\n" msgstr "" -#: e2fsck/problem.c:1539 e2fsck/problem.c:1898 +#: e2fsck/problem.c:1551 e2fsck/problem.c:1910 #, no-c-format msgid "Internal error: couldn't find dir_info for %i.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n -#: e2fsck/problem.c:1544 +#: e2fsck/problem.c:1556 msgid "@E has rec_len of %Dr, @s %N.\n" msgstr "" #. @-expanded: error allocating icount structure: %m\n -#: e2fsck/problem.c:1550 +#: e2fsck/problem.c:1562 #, no-c-format msgid "@A icount structure: %m\n" msgstr "" #. @-expanded: Error iterating over directory blocks: %m\n -#: e2fsck/problem.c:1556 +#: e2fsck/problem.c:1568 #, no-c-format msgid "Error iterating over @d @bs: %m\n" msgstr "" #. @-expanded: Error reading directory block %b (inode %i): %m\n -#: e2fsck/problem.c:1561 +#: e2fsck/problem.c:1573 msgid "Error reading @d @b %b (@i %i): %m\n" msgstr "" #. @-expanded: Error writing directory block %b (inode %i): %m\n -#: e2fsck/problem.c:1566 +#: e2fsck/problem.c:1578 msgid "Error writing @d @b %b (@i %i): %m\n" msgstr "" #. @-expanded: error allocating new directory block for inode %i (%s): %m\n -#: e2fsck/problem.c:1572 +#: e2fsck/problem.c:1584 #, no-c-format msgid "@A new @d @b for @i %i (%s): %m\n" msgstr "" #. @-expanded: Error deallocating inode %i: %m\n -#: e2fsck/problem.c:1578 +#: e2fsck/problem.c:1590 #, no-c-format msgid "Error deallocating @i %i: %m\n" msgstr "" #. @-expanded: directory entry for '.' in %p (%i) is big.\n -#: e2fsck/problem.c:1584 +#: e2fsck/problem.c:1596 #, no-c-format msgid "@d @e for '.' in %p (%i) is big.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal FIFO.\n -#: e2fsck/problem.c:1589 +#: e2fsck/problem.c:1601 msgid "@i %i (%Q) is an @I FIFO.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal socket.\n -#: e2fsck/problem.c:1594 +#: e2fsck/problem.c:1606 msgid "@i %i (%Q) is an @I socket.\n" msgstr "" #. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n -#: e2fsck/problem.c:1599 +#: e2fsck/problem.c:1611 msgid "Setting filetype for @E to %N.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n -#: e2fsck/problem.c:1604 +#: e2fsck/problem.c:1616 msgid "@E has an incorrect filetype (was %Dt, @s %N).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n -#: e2fsck/problem.c:1609 +#: e2fsck/problem.c:1621 msgid "@E has filetype set.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n -#: e2fsck/problem.c:1614 +#: e2fsck/problem.c:1626 msgid "@E has a @z name.\n" msgstr "" #. @-expanded: Symlink %Q (inode #%i) is invalid.\n -#: e2fsck/problem.c:1619 +#: e2fsck/problem.c:1631 msgid "Symlink %Q (@i #%i) is @n.\n" msgstr "" #. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n -#: e2fsck/problem.c:1624 +#: e2fsck/problem.c:1636 msgid "@a @b @F @n (%If).\n" msgstr "" #. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n -#: e2fsck/problem.c:1629 +#: e2fsck/problem.c:1641 msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B not referenced\n -#: e2fsck/problem.c:1634 +#: e2fsck/problem.c:1646 msgid "@p @h %d: %B not referenced\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n -#: e2fsck/problem.c:1639 +#: e2fsck/problem.c:1651 msgid "@p @h %d: %B referenced twice\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n -#: e2fsck/problem.c:1644 +#: e2fsck/problem.c:1656 msgid "@p @h %d: %B has bad min hash\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n -#: e2fsck/problem.c:1649 +#: e2fsck/problem.c:1661 msgid "@p @h %d: %B has bad max hash\n" msgstr "" #. @-expanded: invalid HTREE directory inode %d (%q). -#: e2fsck/problem.c:1654 +#: e2fsck/problem.c:1666 msgid "@n @h %d (%q). " msgstr "" #. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n -#: e2fsck/problem.c:1658 +#: e2fsck/problem.c:1670 msgid "@p @h %d (%q): bad @b number %b.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: root node is invalid\n -#: e2fsck/problem.c:1669 +#: e2fsck/problem.c:1681 #, no-c-format msgid "@p @h %d: root node is @n\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n -#: e2fsck/problem.c:1674 +#: e2fsck/problem.c:1686 msgid "@p @h %d: %B has @n limit (%N)\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n -#: e2fsck/problem.c:1679 +#: e2fsck/problem.c:1691 msgid "@p @h %d: %B has @n count (%N)\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n -#: e2fsck/problem.c:1684 +#: e2fsck/problem.c:1696 msgid "@p @h %d: %B has an unordered hash table\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n -#: e2fsck/problem.c:1689 +#: e2fsck/problem.c:1701 msgid "@p @h %d: %B has @n depth (%N)\n" msgstr "" #. @-expanded: Duplicate entry '%Dn' in %p (%i) found. -#: e2fsck/problem.c:1694 +#: e2fsck/problem.c:1706 msgid "Duplicate @E found. " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n #. @-expanded: Rename to %s -#: e2fsck/problem.c:1699 +#: e2fsck/problem.c:1711 #, no-c-format msgid "" "@E has a non-unique filename.\n" @@ -2354,7 +2354,7 @@ #. @-expanded: Duplicate entry '%Dn' found.\n #. @-expanded: \tMarking %p (%i) to be rebuilt.\n #. @-expanded: \n -#: e2fsck/problem.c:1704 +#: e2fsck/problem.c:1716 msgid "" "Duplicate @e '%Dn' found.\n" "\tMarking %p (%i) to be rebuilt.\n" @@ -2362,155 +2362,155 @@ msgstr "" #. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1709 +#: e2fsck/problem.c:1721 msgid "i_blocks_hi @F %N, @s zero.\n" msgstr "" #. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n -#: e2fsck/problem.c:1714 +#: e2fsck/problem.c:1726 msgid "Unexpected @b in @h %d (%q).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n -#: e2fsck/problem.c:1719 +#: e2fsck/problem.c:1731 msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n -#: e2fsck/problem.c:1724 +#: e2fsck/problem.c:1736 msgid "@E references @i %Di found in @g %g's unused inodes area.\n" msgstr "" #. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1729 +#: e2fsck/problem.c:1741 msgid "i_file_acl_hi @F %N, @s zero.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: root node fails checksum.\n -#: e2fsck/problem.c:1735 +#: e2fsck/problem.c:1747 #, no-c-format msgid "@p @h %d: root node fails checksum.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: internal node fails checksum.\n -#: e2fsck/problem.c:1741 +#: e2fsck/problem.c:1753 #, no-c-format msgid "@p @h %d: internal node fails checksum.\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: directory has no checksum.\n -#: e2fsck/problem.c:1746 +#: e2fsck/problem.c:1758 msgid "@d @i %i, %B, offset %N: @d has no checksum.\n" msgstr "" #. @-expanded: directory inode %i, %B: directory passes checks but fails checksum.\n -#: e2fsck/problem.c:1751 +#: e2fsck/problem.c:1763 msgid "@d @i %i, %B: @d passes checks but fails checksum.\n" msgstr "" #. @-expanded: Inline directory inode %i size (%N) must be a multiple of 4.\n -#: e2fsck/problem.c:1756 +#: e2fsck/problem.c:1768 msgid "Inline @d @i %i size (%N) must be a multiple of 4.\n" msgstr "" #. @-expanded: Fixing size of inline directory inode %i failed.\n -#: e2fsck/problem.c:1762 +#: e2fsck/problem.c:1774 #, no-c-format msgid "Fixing size of inline @d @i %i failed.\n" msgstr "" #. @-expanded: Encrypted entry '%Dn' in %p (%i) is too short.\n -#: e2fsck/problem.c:1767 +#: e2fsck/problem.c:1779 msgid "Encrypted @E is too short.\n" msgstr "" #. @-expanded: Pass 3: Checking directory connectivity\n -#: e2fsck/problem.c:1774 +#: e2fsck/problem.c:1786 msgid "Pass 3: Checking @d connectivity\n" msgstr "" #. @-expanded: root inode not allocated. -#: e2fsck/problem.c:1779 +#: e2fsck/problem.c:1791 msgid "@r not allocated. " msgstr "" #. @-expanded: No room in lost+found directory. -#: e2fsck/problem.c:1784 +#: e2fsck/problem.c:1796 msgid "No room in @l @d. " msgstr "" #. @-expanded: Unconnected directory inode %i (%p)\n -#: e2fsck/problem.c:1790 +#: e2fsck/problem.c:1802 #, no-c-format msgid "Unconnected @d @i %i (%p)\n" msgstr "" #. @-expanded: /lost+found not found. -#: e2fsck/problem.c:1795 +#: e2fsck/problem.c:1807 msgid "/@l not found. " msgstr "" #. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n -#: e2fsck/problem.c:1800 +#: e2fsck/problem.c:1812 msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n" msgstr "" #. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n -#: e2fsck/problem.c:1806 +#: e2fsck/problem.c:1818 #, no-c-format msgid "Bad or non-existent /@l. Cannot reconnect.\n" msgstr "" #. @-expanded: Could not expand /lost+found: %m\n -#: e2fsck/problem.c:1812 +#: e2fsck/problem.c:1824 #, no-c-format msgid "Could not expand /@l: %m\n" msgstr "" -#: e2fsck/problem.c:1818 +#: e2fsck/problem.c:1830 #, no-c-format msgid "Could not reconnect %i: %m\n" msgstr "" #. @-expanded: Error while trying to find /lost+found: %m\n -#: e2fsck/problem.c:1824 +#: e2fsck/problem.c:1836 #, no-c-format msgid "Error while trying to find /@l: %m\n" msgstr "" #. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n -#: e2fsck/problem.c:1830 +#: e2fsck/problem.c:1842 #, no-c-format msgid "ext2fs_new_@b: %m while trying to create /@l @d\n" msgstr "" #. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n -#: e2fsck/problem.c:1836 +#: e2fsck/problem.c:1848 #, no-c-format msgid "ext2fs_new_@i: %m while trying to create /@l @d\n" msgstr "" #. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n -#: e2fsck/problem.c:1842 +#: e2fsck/problem.c:1854 #, no-c-format msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n" msgstr "" #. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n -#: e2fsck/problem.c:1848 +#: e2fsck/problem.c:1860 #, no-c-format msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n" msgstr "" #. @-expanded: Error while adjusting inode count on inode %i\n -#: e2fsck/problem.c:1854 +#: e2fsck/problem.c:1866 #, no-c-format msgid "Error while adjusting @i count on @i %i\n" msgstr "" #. @-expanded: Couldn't fix parent of inode %i: %m\n #. @-expanded: \n -#: e2fsck/problem.c:1860 +#: e2fsck/problem.c:1872 #, no-c-format msgid "" "Couldn't fix parent of @i %i: %m\n" @@ -2519,7 +2519,7 @@ #. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n #. @-expanded: \n -#: e2fsck/problem.c:1866 +#: e2fsck/problem.c:1878 #, no-c-format msgid "" "Couldn't fix parent of @i %i: Couldn't find parent @d @e\n" @@ -2527,41 +2527,41 @@ msgstr "" #. @-expanded: Error creating root directory (%s): %m\n -#: e2fsck/problem.c:1877 +#: e2fsck/problem.c:1889 #, no-c-format msgid "Error creating root @d (%s): %m\n" msgstr "" #. @-expanded: Error creating /lost+found directory (%s): %m\n -#: e2fsck/problem.c:1883 +#: e2fsck/problem.c:1895 #, no-c-format msgid "Error creating /@l @d (%s): %m\n" msgstr "" #. @-expanded: root inode is not a directory; aborting.\n -#: e2fsck/problem.c:1888 +#: e2fsck/problem.c:1900 msgid "@r is not a @d; aborting.\n" msgstr "" #. @-expanded: Cannot proceed without a root inode.\n -#: e2fsck/problem.c:1893 +#: e2fsck/problem.c:1905 msgid "Cannot proceed without a @r.\n" msgstr "" #. @-expanded: /lost+found is not a directory (ino=%i)\n -#: e2fsck/problem.c:1904 +#: e2fsck/problem.c:1916 #, no-c-format msgid "/@l is not a @d (ino=%i)\n" msgstr "" #. @-expanded: /lost+found has inline data\n -#: e2fsck/problem.c:1909 +#: e2fsck/problem.c:1921 msgid "/@l has inline data\n" msgstr "" #. @-expanded: Cannot allocate space for /lost+found.\n #. @-expanded: Place lost files in root directory instead -#: e2fsck/problem.c:1914 +#: e2fsck/problem.c:1926 msgid "" "Cannot allocate space for /@l.\n" "Place lost files in root directory instead" @@ -2570,7 +2570,7 @@ #. @-expanded: Insufficient space to recover lost files!\n #. @-expanded: Move data off the filesystem and re-run e2fsck.\n #. @-expanded: \n -#: e2fsck/problem.c:1919 +#: e2fsck/problem.c:1931 msgid "" "Insufficient space to recover lost files!\n" "Move data off the @f and re-run e2fsck.\n" @@ -2578,52 +2578,52 @@ msgstr "" #. @-expanded: /lost+found is encrypted\n -#: e2fsck/problem.c:1924 +#: e2fsck/problem.c:1936 msgid "/@l is encrypted\n" msgstr "" -#: e2fsck/problem.c:1931 +#: e2fsck/problem.c:1943 msgid "Pass 3A: Optimizing directories\n" msgstr "" -#: e2fsck/problem.c:1937 +#: e2fsck/problem.c:1949 #, no-c-format msgid "Failed to create dirs_to_hash iterator: %m\n" msgstr "" -#: e2fsck/problem.c:1942 +#: e2fsck/problem.c:1954 msgid "Failed to optimize directory %q (%d): %m\n" msgstr "" -#: e2fsck/problem.c:1947 +#: e2fsck/problem.c:1959 msgid "Optimizing directories: " msgstr "" -#: e2fsck/problem.c:1964 +#: e2fsck/problem.c:1976 msgid "Pass 4: Checking reference counts\n" msgstr "" #. @-expanded: unattached zero-length inode %i. -#: e2fsck/problem.c:1970 +#: e2fsck/problem.c:1982 #, no-c-format msgid "@u @z @i %i. " msgstr "" #. @-expanded: unattached inode %i\n -#: e2fsck/problem.c:1976 +#: e2fsck/problem.c:1988 #, no-c-format msgid "@u @i %i\n" msgstr "" #. @-expanded: inode %i ref count is %Il, should be %N. -#: e2fsck/problem.c:1981 +#: e2fsck/problem.c:1993 msgid "@i %i ref count is %Il, @s %N. " msgstr "" #. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n #. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n #. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n -#: e2fsck/problem.c:1985 +#: e2fsck/problem.c:1997 msgid "" "WARNING: PROGRAMMING BUG IN E2FSCK!\n" "\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n" @@ -2631,143 +2631,143 @@ msgstr "" #. @-expanded: extended attribute inode %i ref count is %N, should be %n. -#: e2fsck/problem.c:1992 +#: e2fsck/problem.c:2004 msgid "@a @i %i ref count is %N, @s %n. " msgstr "" #. @-expanded: Pass 5: Checking group summary information\n -#: e2fsck/problem.c:2004 +#: e2fsck/problem.c:2021 msgid "Pass 5: Checking @g summary information\n" msgstr "" #. @-expanded: Padding at end of inode bitmap is not set. -#: e2fsck/problem.c:2009 +#: e2fsck/problem.c:2026 msgid "Padding at end of @i @B is not set. " msgstr "" #. @-expanded: Padding at end of block bitmap is not set. -#: e2fsck/problem.c:2014 +#: e2fsck/problem.c:2031 msgid "Padding at end of @b @B is not set. " msgstr "" #. @-expanded: block bitmap differences: -#: e2fsck/problem.c:2019 +#: e2fsck/problem.c:2036 msgid "@b @B differences: " msgstr "" #. @-expanded: inode bitmap differences: -#: e2fsck/problem.c:2041 +#: e2fsck/problem.c:2058 msgid "@i @B differences: " msgstr "" #. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n -#: e2fsck/problem.c:2063 +#: e2fsck/problem.c:2080 msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n" msgstr "" #. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n -#: e2fsck/problem.c:2068 +#: e2fsck/problem.c:2085 msgid "Directories count wrong for @g #%g (%i, counted=%j).\n" msgstr "" #. @-expanded: Free inodes count wrong (%i, counted=%j).\n -#: e2fsck/problem.c:2073 +#: e2fsck/problem.c:2090 msgid "Free @is count wrong (%i, counted=%j).\n" msgstr "" #. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n -#: e2fsck/problem.c:2078 +#: e2fsck/problem.c:2095 msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n" msgstr "" #. @-expanded: Free blocks count wrong (%b, counted=%c).\n -#: e2fsck/problem.c:2083 +#: e2fsck/problem.c:2100 msgid "Free @bs count wrong (%b, counted=%c).\n" msgstr "" #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap #. @-expanded: endpoints (%i, %j)\n -#: e2fsck/problem.c:2088 +#: e2fsck/problem.c:2105 msgid "" "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B " "endpoints (%i, %j)\n" msgstr "" -#: e2fsck/problem.c:2094 +#: e2fsck/problem.c:2111 msgid "Internal error: fudging end of bitmap (%N)\n" msgstr "" #. @-expanded: Error copying in replacement inode bitmap: %m\n -#: e2fsck/problem.c:2100 +#: e2fsck/problem.c:2117 #, no-c-format msgid "Error copying in replacement @i @B: %m\n" msgstr "" #. @-expanded: Error copying in replacement block bitmap: %m\n -#: e2fsck/problem.c:2106 +#: e2fsck/problem.c:2123 #, no-c-format msgid "Error copying in replacement @b @B: %m\n" msgstr "" #. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n -#: e2fsck/problem.c:2136 +#: e2fsck/problem.c:2153 #, no-c-format msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n" msgstr "" #. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n -#: e2fsck/problem.c:2142 +#: e2fsck/problem.c:2159 #, no-c-format msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n" msgstr "" #. @-expanded: group %g inode bitmap does not match checksum.\n -#: e2fsck/problem.c:2148 +#: e2fsck/problem.c:2165 #, no-c-format msgid "@g %g @i @B does not match checksum.\n" msgstr "" #. @-expanded: group %g block bitmap does not match checksum.\n -#: e2fsck/problem.c:2154 +#: e2fsck/problem.c:2171 #, no-c-format msgid "@g %g @b @B does not match checksum.\n" msgstr "" #. @-expanded: Recreate journal -#: e2fsck/problem.c:2161 +#: e2fsck/problem.c:2178 msgid "Recreate @j" msgstr "" -#: e2fsck/problem.c:2166 +#: e2fsck/problem.c:2183 msgid "Update quota info for quota type %N" msgstr "" #. @-expanded: Error setting block group checksum info: %m\n -#: e2fsck/problem.c:2172 +#: e2fsck/problem.c:2189 #, no-c-format msgid "Error setting @b @g checksum info: %m\n" msgstr "" -#: e2fsck/problem.c:2178 +#: e2fsck/problem.c:2195 #, no-c-format msgid "Error writing file system info: %m\n" msgstr "" -#: e2fsck/problem.c:2184 +#: e2fsck/problem.c:2201 #, no-c-format msgid "Error flushing writes to storage device: %m\n" msgstr "" -#: e2fsck/problem.c:2189 +#: e2fsck/problem.c:2206 msgid "Error writing quota info for quota type %N: %m\n" msgstr "" -#: e2fsck/problem.c:2352 +#: e2fsck/problem.c:2369 #, c-format msgid "Unhandled error code (0x%x)!\n" msgstr "" -#: e2fsck/problem.c:2482 e2fsck/problem.c:2486 +#: e2fsck/problem.c:2499 e2fsck/problem.c:2503 msgid "IGNORED" msgstr "" @@ -2983,7 +2983,7 @@ msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2986 misc/util.c:129 +#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2997 misc/util.c:129 #: resize/main.c:354 #, c-format msgid "while determining whether %s is mounted." @@ -3140,7 +3140,7 @@ msgstr "" #: e2fsck/unix.c:934 e2fsck/unix.c:1012 misc/e2initrd_helper.c:330 -#: misc/tune2fs.c:1695 misc/tune2fs.c:1990 misc/tune2fs.c:2008 +#: misc/tune2fs.c:1707 misc/tune2fs.c:2002 misc/tune2fs.c:2020 #, c-format msgid "Unable to resolve '%s'" msgstr "" @@ -3195,7 +3195,7 @@ msgid "while checking MMP block" msgstr "" -#: misc/tune2fs.c:2900 +#: misc/tune2fs.c:2912 msgid "" "If you are sure the filesystem is not in use on any node, run:\n" "'tune2fs -f -E clear_mmp {device}'\n" @@ -3206,8 +3206,8 @@ msgstr "" #: e2fsck/unix.c:1302 e2fsck/unix.c:1354 misc/e2undo.c:236 misc/e2undo.c:281 -#: misc/mke2fs.c:2696 misc/mke2fs.c:2747 misc/tune2fs.c:2713 -#: misc/tune2fs.c:2758 resize/main.c:188 resize/main.c:233 +#: misc/mke2fs.c:2694 misc/mke2fs.c:2745 misc/tune2fs.c:2725 +#: misc/tune2fs.c:2770 resize/main.c:188 resize/main.c:233 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3215,13 +3215,13 @@ "\n" msgstr "" -#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2736 misc/tune2fs.c:2747 +#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2734 misc/tune2fs.c:2759 #: resize/main.c:222 #, c-format msgid "while trying to delete %s" msgstr "" -#: e2fsck/unix.c:1369 misc/mke2fs.c:2762 resize/main.c:243 +#: e2fsck/unix.c:1369 misc/mke2fs.c:2760 resize/main.c:243 msgid "while trying to setup undo file\n" msgstr "" @@ -3303,100 +3303,100 @@ msgid "Get a newer version of e2fsck!" msgstr "" -#: e2fsck/unix.c:1749 +#: e2fsck/unix.c:1748 #, c-format msgid "while checking journal for %s" msgstr "" -#: e2fsck/unix.c:1752 +#: e2fsck/unix.c:1751 msgid "Cannot proceed with file system check" msgstr "" -#: e2fsck/unix.c:1763 +#: e2fsck/unix.c:1762 msgid "" "Warning: skipping journal recovery because doing a read-only filesystem " "check.\n" msgstr "" -#: e2fsck/unix.c:1775 +#: e2fsck/unix.c:1774 #, c-format msgid "unable to set superblock flags on %s\n" msgstr "" -#: e2fsck/unix.c:1781 +#: e2fsck/unix.c:1780 #, c-format msgid "Journal checksum error found in %s\n" msgstr "" -#: e2fsck/unix.c:1785 +#: e2fsck/unix.c:1784 #, c-format msgid "Journal corrupted in %s\n" msgstr "" -#: e2fsck/unix.c:1789 +#: e2fsck/unix.c:1788 #, c-format msgid "while recovering journal of %s" msgstr "" -#: e2fsck/unix.c:1811 +#: e2fsck/unix.c:1810 #, c-format msgid "%s has unsupported feature(s):" msgstr "" -#: e2fsck/unix.c:1876 +#: e2fsck/unix.c:1875 #, c-format msgid "%s: %s while reading bad blocks inode\n" msgstr "" -#: e2fsck/unix.c:1879 +#: e2fsck/unix.c:1878 msgid "This doesn't bode well, but we'll try to go on...\n" msgstr "" -#: e2fsck/unix.c:1919 +#: e2fsck/unix.c:1918 #, c-format msgid "Creating journal (%d blocks): " msgstr "" -#: e2fsck/unix.c:1929 +#: e2fsck/unix.c:1928 msgid " Done.\n" msgstr "" -#: e2fsck/unix.c:1931 +#: e2fsck/unix.c:1930 msgid "" "\n" "*** journal has been regenerated ***\n" msgstr "" -#: e2fsck/unix.c:1937 +#: e2fsck/unix.c:1936 msgid "aborted" msgstr "" -#: e2fsck/unix.c:1939 +#: e2fsck/unix.c:1938 #, c-format msgid "%s: e2fsck canceled.\n" msgstr "" -#: e2fsck/unix.c:1966 +#: e2fsck/unix.c:1965 msgid "Restarting e2fsck from the beginning...\n" msgstr "" -#: e2fsck/unix.c:1970 +#: e2fsck/unix.c:1969 msgid "while resetting context" msgstr "" -#: e2fsck/unix.c:2029 +#: e2fsck/unix.c:2028 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n" msgstr "" -#: e2fsck/unix.c:2031 +#: e2fsck/unix.c:2030 #, c-format msgid "%s: File system was modified.\n" msgstr "" -#: e2fsck/unix.c:2035 e2fsck/util.c:71 +#: e2fsck/unix.c:2034 e2fsck/util.c:71 #, c-format msgid "" "\n" @@ -3405,12 +3405,12 @@ "\n" "%s: ***** ファイルシステムは変更されました *****\n" -#: e2fsck/unix.c:2040 +#: e2fsck/unix.c:2039 #, c-format msgid "%s: ***** REBOOT SYSTEM *****\n" msgstr "" -#: e2fsck/unix.c:2050 e2fsck/util.c:77 +#: e2fsck/unix.c:2049 e2fsck/util.c:77 #, c-format msgid "" "\n" @@ -3418,96 +3418,96 @@ "\n" msgstr "" -#: e2fsck/util.c:196 misc/util.c:93 +#: e2fsck/util.c:195 misc/util.c:93 msgid "yY" msgstr "" -#: e2fsck/util.c:197 misc/util.c:112 +#: e2fsck/util.c:196 misc/util.c:112 msgid "nN" msgstr "" -#: e2fsck/util.c:198 +#: e2fsck/util.c:197 msgid "aA" msgstr "" -#: e2fsck/util.c:202 +#: e2fsck/util.c:201 msgid " ('a' enables 'yes' to all) " msgstr "" -#: e2fsck/util.c:219 +#: e2fsck/util.c:218 msgid "" msgstr "" -#: e2fsck/util.c:221 +#: e2fsck/util.c:220 msgid "" msgstr "" -#: e2fsck/util.c:223 +#: e2fsck/util.c:222 msgid " (y/n)" msgstr "" -#: e2fsck/util.c:246 +#: e2fsck/util.c:245 msgid "cancelled!\n" msgstr "" -#: e2fsck/util.c:279 +#: e2fsck/util.c:278 msgid "yes to all\n" msgstr "" -#: e2fsck/util.c:281 +#: e2fsck/util.c:280 msgid "yes\n" msgstr "" -#: e2fsck/util.c:283 +#: e2fsck/util.c:282 msgid "no\n" msgstr "" -#: e2fsck/util.c:293 +#: e2fsck/util.c:292 #, c-format msgid "" "%s? no\n" "\n" msgstr "" -#: e2fsck/util.c:297 +#: e2fsck/util.c:296 #, c-format msgid "" "%s? yes\n" "\n" msgstr "" -#: e2fsck/util.c:301 +#: e2fsck/util.c:300 msgid "yes" msgstr "" -#: e2fsck/util.c:301 +#: e2fsck/util.c:300 msgid "no" msgstr "" -#: e2fsck/util.c:317 +#: e2fsck/util.c:316 #, c-format msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s" msgstr "" -#: e2fsck/util.c:322 +#: e2fsck/util.c:321 msgid "reading inode and block bitmaps" msgstr "" -#: e2fsck/util.c:334 +#: e2fsck/util.c:333 #, c-format msgid "while retrying to read bitmaps for %s" msgstr "" -#: e2fsck/util.c:346 +#: e2fsck/util.c:345 msgid "writing block and inode bitmaps" msgstr "" -#: e2fsck/util.c:351 +#: e2fsck/util.c:350 #, c-format msgid "while rewriting block and inode bitmaps for %s" msgstr "" -#: e2fsck/util.c:363 +#: e2fsck/util.c:362 #, c-format msgid "" "\n" @@ -3526,27 +3526,27 @@ msgid "Memory used: %lu, " msgstr "" -#: e2fsck/util.c:455 +#: e2fsck/util.c:454 #, c-format msgid "time: %5.2f/%5.2f/%5.2f\n" msgstr "" -#: e2fsck/util.c:460 +#: e2fsck/util.c:459 #, c-format msgid "elapsed time: %6.3f\n" msgstr "" -#: e2fsck/util.c:495 e2fsck/util.c:509 +#: e2fsck/util.c:494 e2fsck/util.c:508 #, c-format msgid "while reading inode %lu in %s" msgstr "" -#: e2fsck/util.c:523 e2fsck/util.c:536 +#: e2fsck/util.c:522 e2fsck/util.c:535 #, c-format msgid "while writing inode %lu in %s" msgstr "" -#: e2fsck/util.c:792 +#: e2fsck/util.c:793 msgid "" "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is " "running.\n" @@ -3819,8 +3819,8 @@ msgid "while reading inode %u" msgstr "" -#: misc/create_inode.c:90 misc/create_inode.c:288 misc/create_inode.c:353 -#: misc/create_inode.c:391 +#: misc/create_inode.c:90 misc/create_inode.c:290 misc/create_inode.c:355 +#: misc/create_inode.c:393 msgid "while expanding directory" msgstr "" @@ -3829,73 +3829,73 @@ msgid "while linking \"%s\"" msgstr "" -#: misc/create_inode.c:105 misc/create_inode.c:132 misc/create_inode.c:322 +#: misc/create_inode.c:105 misc/create_inode.c:134 misc/create_inode.c:324 #, c-format msgid "while writing inode %u" msgstr "" -#: misc/create_inode.c:152 misc/create_inode.c:176 +#: misc/create_inode.c:154 misc/create_inode.c:178 #, c-format msgid "while listing attributes of \"%s\"" msgstr "" -#: misc/create_inode.c:163 +#: misc/create_inode.c:165 #, c-format msgid "while opening inode %u" msgstr "" -#: misc/create_inode.c:169 misc/create_inode.c:196 misc/create_inode.c:1043 +#: misc/create_inode.c:171 misc/create_inode.c:198 misc/create_inode.c:1045 #: misc/e2undo.c:182 misc/e2undo.c:479 misc/e2undo.c:485 misc/e2undo.c:491 #: misc/mke2fs.c:359 msgid "while allocating memory" msgstr "" -#: misc/create_inode.c:189 misc/create_inode.c:205 +#: misc/create_inode.c:191 misc/create_inode.c:207 #, c-format msgid "while reading attribute \"%s\" of \"%s\"" msgstr "" -#: misc/create_inode.c:214 +#: misc/create_inode.c:216 #, c-format msgid "while writing attribute \"%s\" to inode %u" msgstr "" -#: misc/create_inode.c:224 +#: misc/create_inode.c:226 #, c-format msgid "while closing inode %u" msgstr "" -#: misc/create_inode.c:275 +#: misc/create_inode.c:277 #, c-format msgid "while allocating inode \"%s\"" msgstr "" -#: misc/create_inode.c:294 +#: misc/create_inode.c:296 #, c-format msgid "while creating inode \"%s\"" msgstr "" -#: misc/create_inode.c:360 +#: misc/create_inode.c:362 #, c-format msgid "while creating symlink \"%s\"" msgstr "" -#: misc/create_inode.c:378 misc/create_inode.c:963 +#: misc/create_inode.c:380 misc/create_inode.c:965 #, c-format msgid "while looking up \"%s\"" msgstr "" -#: misc/create_inode.c:398 +#: misc/create_inode.c:400 #, c-format msgid "while creating directory \"%s\"" msgstr "" -#: misc/create_inode.c:627 +#: misc/create_inode.c:629 #, c-format msgid "while opening \"%s\" to copy" msgstr "" -#: misc/create_inode.c:805 +#: misc/create_inode.c:807 #, c-format msgid "while changing working directory to \"%s\"" msgstr "" @@ -3905,64 +3905,64 @@ msgid "while opening directory \"%s\"" msgstr "" -#: misc/create_inode.c:825 +#: misc/create_inode.c:827 #, c-format msgid "while lstat \"%s\"" msgstr "" -#: misc/create_inode.c:875 +#: misc/create_inode.c:877 #, c-format msgid "while creating special file \"%s\"" msgstr "" -#: misc/create_inode.c:884 +#: misc/create_inode.c:886 msgid "malloc failed" msgstr "" -#: misc/create_inode.c:892 +#: misc/create_inode.c:894 #, c-format msgid "while trying to read link \"%s\"" msgstr "" -#: misc/create_inode.c:899 +#: misc/create_inode.c:901 msgid "symlink increased in size between lstat() and readlink()" msgstr "" -#: misc/create_inode.c:910 +#: misc/create_inode.c:912 #, c-format msgid "while writing symlink\"%s\"" msgstr "" -#: misc/create_inode.c:921 +#: misc/create_inode.c:923 #, c-format msgid "while writing file \"%s\"" msgstr "" -#: misc/create_inode.c:934 +#: misc/create_inode.c:936 #, c-format msgid "while making dir \"%s\"" msgstr "" -#: misc/create_inode.c:952 +#: misc/create_inode.c:954 msgid "while changing directory" msgstr "" -#: misc/create_inode.c:958 +#: misc/create_inode.c:960 #, c-format msgid "ignoring entry \"%s\"" msgstr "" -#: misc/create_inode.c:971 +#: misc/create_inode.c:973 #, c-format msgid "while setting inode for \"%s\"" msgstr "" -#: misc/create_inode.c:978 +#: misc/create_inode.c:980 #, c-format msgid "while setting xattrs for \"%s\"" msgstr "" -#: misc/create_inode.c:1004 +#: misc/create_inode.c:1006 msgid "while saving inode data" msgstr "" @@ -4104,21 +4104,21 @@ msgid "Couldn't find journal superblock magic numbers" msgstr "" -#: misc/dumpe2fs.c:507 misc/mke2fs.c:800 misc/tune2fs.c:2027 +#: misc/dumpe2fs.c:511 misc/mke2fs.c:798 misc/tune2fs.c:2039 msgid "Couldn't allocate memory to parse options!\n" msgstr "" -#: misc/dumpe2fs.c:533 +#: misc/dumpe2fs.c:537 #, c-format msgid "Invalid superblock parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:548 +#: misc/dumpe2fs.c:552 #, c-format msgid "Invalid blocksize parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:559 +#: misc/dumpe2fs.c:563 #, c-format msgid "" "\n" @@ -4132,7 +4132,7 @@ "\tblocksize=\n" msgstr "" -#: misc/dumpe2fs.c:649 misc/mke2fs.c:1889 +#: misc/dumpe2fs.c:653 misc/mke2fs.c:1887 #, c-format msgid "\tUsing %s\n" msgstr "\t%sを使います\n" @@ -4144,7 +4144,7 @@ "\n" msgstr "" -#: misc/dumpe2fs.c:694 misc/e2image.c:1629 misc/tune2fs.c:2913 +#: misc/dumpe2fs.c:698 misc/e2image.c:1629 misc/tune2fs.c:2925 #: resize/main.c:416 msgid "Couldn't find valid filesystem superblock.\n" msgstr "" @@ -4426,7 +4426,7 @@ msgid "e2label: not an ext2 filesystem\n" msgstr "e2label: ext2 ファイルシステムではありません\n" -#: misc/e2label.c:97 misc/tune2fs.c:3117 +#: misc/e2label.c:97 misc/tune2fs.c:3128 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -4441,7 +4441,7 @@ msgid "e2label: error writing superblock\n" msgstr "" -#: misc/e2label.c:117 misc/tune2fs.c:1687 +#: misc/e2label.c:117 misc/tune2fs.c:1699 #, c-format msgid "Usage: e2label device [newlabel]\n" msgstr "" @@ -4646,7 +4646,7 @@ " sb_uuid label\n" msgstr "" -#: misc/findsuper.c:264 +#: misc/findsuper.c:265 #, c-format msgid "" "\n" @@ -4748,53 +4748,53 @@ msgid "%s: too many arguments\n" msgstr "%s: 引数が多すぎます\n" -#: misc/fuse2fs.c:3745 +#: misc/fuse2fs.c:3740 msgid "Mounting read-only.\n" msgstr "" -#: misc/fuse2fs.c:3769 +#: misc/fuse2fs.c:3764 #, c-format msgid "%s: Allowing users to allocate all blocks. This is dangerous!\n" msgstr "" -#: misc/fuse2fs.c:3781 misc/fuse2fs.c:3795 +#: misc/fuse2fs.c:3776 misc/fuse2fs.c:3790 #, c-format msgid "%s: %s.\n" msgstr "" -#: misc/fuse2fs.c:3782 misc/fuse2fs.c:3797 misc/tune2fs.c:3013 +#: misc/fuse2fs.c:3777 misc/fuse2fs.c:3792 misc/tune2fs.c:3024 #, c-format msgid "Please run e2fsck -fy %s.\n" msgstr "" -#: misc/fuse2fs.c:3804 +#: misc/fuse2fs.c:3799 msgid "" "Journal needs recovery; running `e2fsck -E journal_only' is required.\n" msgstr "" -#: misc/fuse2fs.c:3812 +#: misc/fuse2fs.c:3807 #, c-format msgid "%s: Writing to the journal is not supported.\n" msgstr "" -#: misc/fuse2fs.c:3827 +#: misc/fuse2fs.c:3822 msgid "Warning: Mounting unchecked fs, running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3831 +#: misc/fuse2fs.c:3826 msgid "" "Warning: Maximal mount count reached, running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3836 +#: misc/fuse2fs.c:3831 msgid "Warning: Check time reached; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3840 +#: misc/fuse2fs.c:3835 msgid "Orphans detected; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3844 +#: misc/fuse2fs.c:3839 msgid "Errors detected; running e2fsck is required.\n" msgstr "" @@ -4883,7 +4883,7 @@ "Could not write %d blocks in inode table starting at %llu: %s\n" msgstr "" -#: misc/mke2fs.c:456 misc/mke2fs.c:2809 misc/mke2fs.c:3214 +#: misc/mke2fs.c:456 misc/mke2fs.c:2807 misc/mke2fs.c:3212 msgid "done \n" msgstr "" @@ -4947,12 +4947,12 @@ msgid "while writing journal superblock" msgstr "" -#: misc/mke2fs.c:665 +#: misc/mke2fs.c:664 #, c-format msgid "Creating filesystem with %llu %dk blocks and %u inodes\n" msgstr "" -#: misc/mke2fs.c:673 +#: misc/mke2fs.c:672 #, c-format msgid "" "warning: %llu blocks unused.\n" @@ -4964,154 +4964,154 @@ msgid "Filesystem label=%s\n" msgstr "" -#: misc/mke2fs.c:681 +#: misc/mke2fs.c:679 #, c-format msgid "OS type: %s\n" msgstr "" -#: misc/mke2fs.c:683 +#: misc/mke2fs.c:681 #, c-format msgid "Block size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:686 +#: misc/mke2fs.c:684 #, c-format msgid "Cluster size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:690 +#: misc/mke2fs.c:688 #, c-format msgid "Fragment size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:692 +#: misc/mke2fs.c:690 #, c-format msgid "Stride=%u blocks, Stripe width=%u blocks\n" msgstr "" -#: misc/mke2fs.c:694 +#: misc/mke2fs.c:692 #, c-format msgid "%u inodes, %llu blocks\n" msgstr "" -#: misc/mke2fs.c:696 +#: misc/mke2fs.c:694 #, c-format msgid "%llu blocks (%2.2f%%) reserved for the super user\n" msgstr "" -#: misc/mke2fs.c:699 +#: misc/mke2fs.c:697 #, c-format msgid "First data block=%u\n" msgstr "" -#: misc/mke2fs.c:701 +#: misc/mke2fs.c:699 #, c-format msgid "Root directory owner=%u:%u\n" msgstr "" -#: misc/mke2fs.c:703 +#: misc/mke2fs.c:701 #, c-format msgid "Maximum filesystem blocks=%lu\n" msgstr "" -#: misc/mke2fs.c:707 +#: misc/mke2fs.c:705 #, c-format msgid "%u block groups\n" msgstr "" -#: misc/mke2fs.c:709 +#: misc/mke2fs.c:707 #, c-format msgid "%u block group\n" msgstr "" -#: misc/mke2fs.c:711 +#: misc/mke2fs.c:709 #, c-format msgid "%u blocks per group, %u clusters per group\n" msgstr "" -#: misc/mke2fs.c:714 +#: misc/mke2fs.c:712 #, c-format msgid "%u blocks per group, %u fragments per group\n" msgstr "" -#: misc/mke2fs.c:716 +#: misc/mke2fs.c:714 #, c-format msgid "%u inodes per group\n" msgstr "" -#: misc/mke2fs.c:725 +#: misc/mke2fs.c:723 #, c-format msgid "Filesystem UUID: %s\n" msgstr "" -#: misc/mke2fs.c:726 +#: misc/mke2fs.c:724 msgid "Superblock backups stored on blocks: " msgstr "" -#: misc/mke2fs.c:822 +#: misc/mke2fs.c:820 #, c-format msgid "%s requires '-O 64bit'\n" msgstr "" -#: misc/mke2fs.c:828 +#: misc/mke2fs.c:826 #, c-format msgid "'%s' must be before 'resize=%u'\n" msgstr "" -#: misc/mke2fs.c:841 +#: misc/mke2fs.c:839 #, c-format msgid "Invalid desc_size: '%s'\n" msgstr "" -#: misc/mke2fs.c:855 +#: misc/mke2fs.c:853 #, c-format msgid "Invalid hash seed: %s\n" msgstr "" -#: misc/mke2fs.c:867 +#: misc/mke2fs.c:865 #, c-format msgid "Invalid offset: %s\n" msgstr "" -#: misc/mke2fs.c:881 misc/tune2fs.c:2055 +#: misc/mke2fs.c:879 misc/tune2fs.c:2067 #, c-format msgid "Invalid mmp_update_interval: %s\n" msgstr "" -#: misc/mke2fs.c:898 +#: misc/mke2fs.c:896 #, c-format msgid "Invalid # of backup superblocks: %s\n" msgstr "" -#: misc/mke2fs.c:920 +#: misc/mke2fs.c:918 #, c-format msgid "Invalid stride parameter: %s\n" msgstr "" -#: misc/mke2fs.c:935 +#: misc/mke2fs.c:933 #, c-format msgid "Invalid stripe-width parameter: %s\n" msgstr "" -#: misc/mke2fs.c:958 +#: misc/mke2fs.c:956 #, c-format msgid "Invalid resize parameter: %s\n" msgstr "" -#: misc/mke2fs.c:965 +#: misc/mke2fs.c:963 msgid "The resize maximum must be greater than the filesystem size.\n" msgstr "" -#: misc/mke2fs.c:989 +#: misc/mke2fs.c:987 msgid "On-line resizing not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1015 misc/mke2fs.c:1024 +#: misc/mke2fs.c:1013 misc/mke2fs.c:1022 #, c-format msgid "Invalid root_owner: '%s'\n" msgstr "" -#: misc/mke2fs.c:1056 +#: misc/mke2fs.c:1065 #, c-format msgid "" "\n" @@ -5138,7 +5138,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:1114 +#: misc/mke2fs.c:1112 #, c-format msgid "" "\n" @@ -5146,41 +5146,41 @@ "\n" msgstr "" -#: misc/mke2fs.c:1179 +#: misc/mke2fs.c:1177 #, c-format msgid "" "Syntax error in mke2fs config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: misc/mke2fs.c:1192 misc/tune2fs.c:1068 +#: misc/mke2fs.c:1190 misc/tune2fs.c:1068 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:1204 misc/tune2fs.c:417 +#: misc/mke2fs.c:1202 misc/tune2fs.c:417 #, c-format msgid "Invalid mount option set: %s\n" msgstr "" -#: misc/mke2fs.c:1340 +#: misc/mke2fs.c:1338 #, c-format msgid "" "\n" "Your mke2fs.conf file does not define the %s filesystem type.\n" msgstr "" -#: misc/mke2fs.c:1344 +#: misc/mke2fs.c:1342 msgid "" "You probably need to install an updated mke2fs.conf file.\n" "\n" msgstr "" -#: misc/mke2fs.c:1348 +#: misc/mke2fs.c:1346 msgid "Aborting...\n" msgstr "" -#: misc/mke2fs.c:1389 +#: misc/mke2fs.c:1387 #, c-format msgid "" "\n" @@ -5188,154 +5188,154 @@ "\n" msgstr "" -#: misc/mke2fs.c:1571 +#: misc/mke2fs.c:1569 msgid "Couldn't allocate memory for new PATH.\n" msgstr "" -#: misc/mke2fs.c:1608 +#: misc/mke2fs.c:1606 #, c-format msgid "Couldn't init profile successfully (error: %ld).\n" msgstr "" -#: misc/mke2fs.c:1641 +#: misc/mke2fs.c:1639 #, c-format msgid "invalid block size - %s" msgstr "" -#: misc/mke2fs.c:1645 +#: misc/mke2fs.c:1643 #, c-format msgid "Warning: blocksize %d not usable on most systems.\n" msgstr "" -#: misc/mke2fs.c:1661 +#: misc/mke2fs.c:1659 #, c-format msgid "invalid cluster size - %s" msgstr "" -#: misc/mke2fs.c:1674 +#: misc/mke2fs.c:1672 msgid "'-R' is deprecated, use '-E' instead" msgstr "" -#: misc/mke2fs.c:1688 misc/tune2fs.c:1784 +#: misc/mke2fs.c:1686 misc/tune2fs.c:1796 #, c-format msgid "bad error behavior - %s" msgstr "" -#: misc/mke2fs.c:1700 +#: misc/mke2fs.c:1698 msgid "Illegal number for blocks per group" msgstr "" -#: misc/mke2fs.c:1705 +#: misc/mke2fs.c:1703 msgid "blocks per group must be multiple of 8" msgstr "" -#: misc/mke2fs.c:1713 +#: misc/mke2fs.c:1711 msgid "Illegal number for flex_bg size" msgstr "" -#: misc/mke2fs.c:1719 +#: misc/mke2fs.c:1717 msgid "flex_bg size must be a power of 2" msgstr "" -#: misc/mke2fs.c:1724 +#: misc/mke2fs.c:1722 #, c-format msgid "flex_bg size (%lu) must be less than or equal to 2^31" msgstr "" -#: misc/mke2fs.c:1734 +#: misc/mke2fs.c:1732 #, c-format msgid "invalid inode ratio %s (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1744 +#: misc/mke2fs.c:1742 #, c-format msgid "invalid inode size - %s" msgstr "" -#: misc/mke2fs.c:1757 +#: misc/mke2fs.c:1755 msgid "" "Warning: -K option is deprecated and should not be used anymore. Use '-E " "nodiscard' extended option instead!\n" msgstr "" -#: misc/mke2fs.c:1768 +#: misc/mke2fs.c:1766 msgid "in malloc for bad_blocks_filename" msgstr "" -#: misc/mke2fs.c:1777 +#: misc/mke2fs.c:1775 #, c-format msgid "" "Warning: label too long; will be truncated to '%s'\n" "\n" msgstr "" -#: misc/mke2fs.c:1786 +#: misc/mke2fs.c:1784 #, c-format msgid "invalid reserved blocks percent - %s" msgstr "" -#: misc/mke2fs.c:1801 +#: misc/mke2fs.c:1799 #, c-format msgid "bad num inodes - %s" msgstr "" -#: misc/mke2fs.c:1814 +#: misc/mke2fs.c:1812 msgid "while allocating fs_feature string" msgstr "" -#: misc/mke2fs.c:1831 +#: misc/mke2fs.c:1829 #, c-format msgid "bad revision level - %s" msgstr "" -#: misc/mke2fs.c:1836 +#: misc/mke2fs.c:1834 #, c-format msgid "while trying to create revision %d" msgstr "" -#: misc/mke2fs.c:1850 +#: misc/mke2fs.c:1848 msgid "The -t option may only be used once" msgstr "" -#: misc/mke2fs.c:1858 +#: misc/mke2fs.c:1856 msgid "The -T option may only be used once" msgstr "" -#: misc/mke2fs.c:1914 misc/mke2fs.c:3298 +#: misc/mke2fs.c:1912 misc/mke2fs.c:3296 #, c-format msgid "while trying to open journal device %s\n" msgstr "" -#: misc/mke2fs.c:1920 +#: misc/mke2fs.c:1918 #, c-format msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n" msgstr "" -#: misc/mke2fs.c:1926 +#: misc/mke2fs.c:1924 #, c-format msgid "Using journal device's blocksize: %d\n" msgstr "" -#: misc/mke2fs.c:1937 +#: misc/mke2fs.c:1935 #, c-format msgid "invalid blocks '%s' on device '%s'" msgstr "" -#: misc/mke2fs.c:1967 +#: misc/mke2fs.c:1965 msgid "filesystem" msgstr "" -#: misc/mke2fs.c:1985 resize/main.c:497 +#: misc/mke2fs.c:1983 resize/main.c:497 msgid "while trying to determine filesystem size" msgstr "" -#: misc/mke2fs.c:1991 +#: misc/mke2fs.c:1989 msgid "" "Couldn't determine device size; you must specify\n" "the size of the filesystem\n" msgstr "" -#: misc/mke2fs.c:1998 +#: misc/mke2fs.c:1996 msgid "" "Device size reported to be zero. Invalid partition specified, or\n" "\tpartition table wasn't reread after running fdisk, due to\n" @@ -5343,132 +5343,132 @@ "\tto re-read your partition table.\n" msgstr "" -#: misc/mke2fs.c:2015 +#: misc/mke2fs.c:2013 msgid "Filesystem larger than apparent device size." msgstr "" -#: misc/mke2fs.c:2035 +#: misc/mke2fs.c:2033 msgid "Failed to parse fs types list\n" msgstr "" -#: misc/mke2fs.c:2085 +#: misc/mke2fs.c:2083 msgid "The HURD does not support the filetype feature.\n" msgstr "" -#: misc/mke2fs.c:2090 +#: misc/mke2fs.c:2088 msgid "The HURD does not support the huge_file feature.\n" msgstr "" -#: misc/mke2fs.c:2095 +#: misc/mke2fs.c:2093 msgid "The HURD does not support the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:2100 +#: misc/mke2fs.c:2098 msgid "The HURD does not support the ea_inode feature.\n" msgstr "" -#: misc/mke2fs.c:2110 +#: misc/mke2fs.c:2108 msgid "while trying to determine hardware sector size" msgstr "" -#: misc/mke2fs.c:2116 +#: misc/mke2fs.c:2114 msgid "while trying to determine physical sector size" msgstr "" -#: misc/mke2fs.c:2148 +#: misc/mke2fs.c:2146 msgid "while setting blocksize; too small for device\n" msgstr "" -#: misc/mke2fs.c:2153 +#: misc/mke2fs.c:2151 #, c-format msgid "" "Warning: specified blocksize %d is less than device physical sectorsize %d\n" msgstr "" -#: misc/mke2fs.c:2177 +#: misc/mke2fs.c:2175 #, 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:2191 +#: misc/mke2fs.c:2189 #, 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:2213 +#: misc/mke2fs.c:2211 msgid "fs_types for mke2fs.conf resolution: " msgstr "" -#: misc/mke2fs.c:2220 +#: misc/mke2fs.c:2218 msgid "Filesystem features not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2228 +#: misc/mke2fs.c:2226 msgid "Sparse superblocks not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2238 +#: misc/mke2fs.c:2236 msgid "Journals not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2251 +#: misc/mke2fs.c:2249 #, c-format msgid "invalid reserved blocks percent - %lf" msgstr "" -#: misc/mke2fs.c:2268 +#: misc/mke2fs.c:2266 msgid "" "Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to " "rectify.\n" msgstr "" -#: misc/mke2fs.c:2288 +#: misc/mke2fs.c:2286 msgid "The cluster size may not be smaller than the block size.\n" msgstr "" -#: misc/mke2fs.c:2294 +#: misc/mke2fs.c:2292 msgid "specifying a cluster size requires the bigalloc feature" msgstr "" -#: misc/mke2fs.c:2314 +#: misc/mke2fs.c:2312 #, c-format msgid "warning: Unable to get device geometry for %s\n" msgstr "" -#: misc/mke2fs.c:2317 +#: misc/mke2fs.c:2315 #, c-format msgid "%s alignment is offset by %lu bytes.\n" msgstr "" -#: misc/mke2fs.c:2319 +#: misc/mke2fs.c:2317 #, c-format msgid "" "This may result in very poor performance, (re)-partitioning suggested.\n" msgstr "" -#: misc/mke2fs.c:2340 +#: misc/mke2fs.c:2338 #, c-format msgid "%d-byte blocks too big for system (max %d)" msgstr "" -#: misc/mke2fs.c:2344 +#: misc/mke2fs.c:2342 #, c-format msgid "" "Warning: %d-byte blocks too big for system (max %d), forced to continue\n" msgstr "" -#: misc/mke2fs.c:2352 +#: misc/mke2fs.c:2350 #, 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:2432 #, c-format msgid "" "\n" @@ -5478,22 +5478,22 @@ "\n" msgstr "" -#: misc/mke2fs.c:2449 +#: misc/mke2fs.c:2447 #, c-format msgid "%d byte inodes are too small for project quota" msgstr "" -#: misc/mke2fs.c:2480 +#: misc/mke2fs.c:2478 msgid "Can't support bigalloc feature without extents feature" msgstr "" -#: misc/mke2fs.c:2487 +#: misc/mke2fs.c:2485 msgid "" "The resize_inode and meta_bg features are not compatible.\n" "They can not be both enabled simultaneously.\n" msgstr "" -#: misc/mke2fs.c:2495 +#: misc/mke2fs.c:2493 msgid "" "\n" "Warning: the bigalloc feature is still under development\n" @@ -5501,39 +5501,39 @@ "\n" msgstr "" -#: misc/mke2fs.c:2507 +#: misc/mke2fs.c:2505 msgid "reserved online resize blocks not supported on non-sparse filesystem" msgstr "" -#: misc/mke2fs.c:2516 +#: misc/mke2fs.c:2514 msgid "blocks per group count out of range" msgstr "" -#: misc/mke2fs.c:2538 +#: misc/mke2fs.c:2536 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified" msgstr "" -#: misc/mke2fs.c:2550 +#: misc/mke2fs.c:2548 #, c-format msgid "invalid inode size %d (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:2565 +#: misc/mke2fs.c:2563 #, c-format msgid "%d byte inodes are too small for inline data; specify larger size" msgstr "" -#: misc/mke2fs.c:2580 +#: misc/mke2fs.c:2578 #, c-format msgid "too many inodes (%llu), raise inode ratio?" msgstr "" -#: misc/mke2fs.c:2587 +#: misc/mke2fs.c:2585 #, c-format msgid "too many inodes (%llu), specify < 2^32 inodes" msgstr "" -#: misc/mke2fs.c:2601 +#: misc/mke2fs.c:2599 #, c-format msgid "" "inode_size (%u) * inodes_count (%u) too big for a\n" @@ -5541,146 +5541,146 @@ "\tor lower inode count (-N).\n" msgstr "" -#: misc/mke2fs.c:2788 +#: misc/mke2fs.c:2786 msgid "Discarding device blocks: " msgstr "" -#: misc/mke2fs.c:2804 +#: misc/mke2fs.c:2802 msgid "failed - " msgstr "" -#: misc/mke2fs.c:2863 +#: misc/mke2fs.c:2861 msgid "while initializing quota context" msgstr "" -#: misc/mke2fs.c:2870 +#: misc/mke2fs.c:2868 msgid "while writing quota inodes" msgstr "" -#: misc/mke2fs.c:2895 +#: misc/mke2fs.c:2893 #, c-format msgid "bad error behavior in profile - %s" msgstr "" -#: misc/mke2fs.c:2971 +#: misc/mke2fs.c:2969 msgid "in malloc for android_sparse_params" msgstr "" -#: misc/mke2fs.c:2985 +#: misc/mke2fs.c:2983 msgid "while setting up superblock" msgstr "" -#: misc/mke2fs.c:3001 +#: misc/mke2fs.c:2999 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:3008 +#: misc/mke2fs.c:3006 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:3016 +#: misc/mke2fs.c:3014 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:3040 +#: misc/mke2fs.c:3038 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n" msgstr "" -#: misc/mke2fs.c:3139 +#: misc/mke2fs.c:3137 #, c-format msgid "unknown os - %s" msgstr "" -#: misc/mke2fs.c:3202 +#: misc/mke2fs.c:3200 msgid "Allocating group tables: " msgstr "" -#: misc/mke2fs.c:3210 +#: misc/mke2fs.c:3208 msgid "while trying to allocate filesystem tables" msgstr "" -#: misc/mke2fs.c:3219 +#: misc/mke2fs.c:3217 msgid "" "\n" "\twhile converting subcluster bitmap" msgstr "" -#: misc/mke2fs.c:3225 +#: misc/mke2fs.c:3223 #, c-format msgid "%s may be further corrupted by superblock rewrite\n" msgstr "" -#: misc/mke2fs.c:3266 +#: misc/mke2fs.c:3264 #, c-format msgid "while zeroing block %llu at end of filesystem" msgstr "" -#: misc/mke2fs.c:3279 +#: misc/mke2fs.c:3277 msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:3291 misc/tune2fs.c:1492 +#: misc/mke2fs.c:3289 misc/tune2fs.c:1504 msgid "journal" msgstr "ジャーナル" -#: misc/mke2fs.c:3303 +#: misc/mke2fs.c:3301 #, c-format msgid "Adding journal to device %s: " msgstr "" -#: misc/mke2fs.c:3310 +#: misc/mke2fs.c:3308 #, c-format msgid "" "\n" "\twhile trying to add journal to device %s" msgstr "" -#: misc/mke2fs.c:3315 misc/mke2fs.c:3344 misc/mke2fs.c:3382 -#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1521 misc/tune2fs.c:1540 +#: misc/mke2fs.c:3313 misc/mke2fs.c:3342 misc/mke2fs.c:3380 +#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1533 misc/tune2fs.c:1552 msgid "done\n" msgstr "" -#: misc/mke2fs.c:3321 +#: misc/mke2fs.c:3319 msgid "Skipping journal creation in super-only mode\n" msgstr "" -#: misc/mke2fs.c:3331 +#: misc/mke2fs.c:3329 #, c-format msgid "Creating journal (%u blocks): " msgstr "" -#: misc/mke2fs.c:3340 +#: misc/mke2fs.c:3338 msgid "" "\n" "\twhile trying to create journal" msgstr "" -#: misc/mke2fs.c:3352 misc/tune2fs.c:1133 +#: misc/mke2fs.c:3350 misc/tune2fs.c:1133 msgid "" "\n" "Error while enabling multiple mount protection feature." msgstr "" -#: misc/mke2fs.c:3357 +#: misc/mke2fs.c:3355 #, c-format msgid "" "Multiple mount protection is enabled with update interval %d seconds.\n" msgstr "" -#: misc/mke2fs.c:3373 +#: misc/mke2fs.c:3371 msgid "Copying files into the device: " msgstr "" -#: misc/mke2fs.c:3379 +#: misc/mke2fs.c:3377 msgid "while populating file system" msgstr "" -#: misc/mke2fs.c:3386 +#: misc/mke2fs.c:3384 msgid "Writing superblocks and filesystem accounting information: " msgstr "" @@ -5690,7 +5690,7 @@ "Warning, had trouble writing out superblocks.\n" msgstr "" -#: misc/mke2fs.c:3396 +#: misc/mke2fs.c:3394 msgid "" "done\n" "\n" @@ -5795,12 +5795,12 @@ msgid "while trying to open external journal" msgstr "" -#: misc/tune2fs.c:287 misc/tune2fs.c:2804 +#: misc/tune2fs.c:287 misc/tune2fs.c:2816 #, c-format msgid "%s is not a journal device.\n" msgstr "" -#: misc/tune2fs.c:303 misc/tune2fs.c:2820 +#: misc/tune2fs.c:303 misc/tune2fs.c:2832 msgid "Filesystem's UUID not found on journal device.\n" msgstr "" @@ -5963,100 +5963,100 @@ msgid "Cannot disable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1334 +#: misc/tune2fs.c:1346 #, c-format msgid "Cannot enable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1344 +#: misc/tune2fs.c:1356 #, c-format msgid "Cannot disable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1374 +#: misc/tune2fs.c:1386 #, c-format msgid "Cannot enable project feature; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1395 +#: misc/tune2fs.c:1407 msgid "" "\n" "Warning: '^quota' option overrides '-Q'arguments.\n" msgstr "" -#: misc/tune2fs.c:1419 +#: misc/tune2fs.c:1431 msgid "" "Setting feature 'metadata_csum_seed' is only supported\n" "on filesystems with the metadata_csum feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1437 +#: misc/tune2fs.c:1449 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:1443 +#: misc/tune2fs.c:1455 msgid "Recalculating checksums could take some time." msgstr "" -#: misc/tune2fs.c:1485 +#: misc/tune2fs.c:1497 msgid "The filesystem already has a journal.\n" msgstr "" -#: misc/tune2fs.c:1505 +#: misc/tune2fs.c:1517 #, c-format msgid "" "\n" "\twhile trying to open journal on %s\n" msgstr "" -#: misc/tune2fs.c:1509 +#: misc/tune2fs.c:1521 #, c-format msgid "Creating journal on device %s: " msgstr "" -#: misc/tune2fs.c:1517 +#: misc/tune2fs.c:1529 #, c-format msgid "while adding filesystem to journal on %s" msgstr "" -#: misc/tune2fs.c:1523 +#: misc/tune2fs.c:1535 msgid "Creating journal inode: " msgstr "" -#: misc/tune2fs.c:1537 +#: misc/tune2fs.c:1549 msgid "" "\n" "\twhile trying to create journal file" msgstr "" -#: misc/tune2fs.c:1575 +#: misc/tune2fs.c:1587 #, c-format msgid "Cannot enable project quota; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1588 +#: misc/tune2fs.c:1600 msgid "while initializing quota context in support library" msgstr "" -#: misc/tune2fs.c:1603 +#: misc/tune2fs.c:1615 #, c-format msgid "while updating quota limits (%d)" msgstr "" -#: misc/tune2fs.c:1611 +#: misc/tune2fs.c:1623 #, c-format msgid "while writing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1629 +#: misc/tune2fs.c:1641 #, c-format msgid "while removing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1672 +#: misc/tune2fs.c:1684 msgid "" "\n" "Bad quota options specified.\n" @@ -6070,65 +6070,65 @@ "\n" msgstr "" -#: misc/tune2fs.c:1730 +#: misc/tune2fs.c:1742 #, c-format msgid "Couldn't parse date/time specifier: %s" msgstr "" -#: misc/tune2fs.c:1755 misc/tune2fs.c:1768 +#: misc/tune2fs.c:1767 misc/tune2fs.c:1780 #, c-format msgid "bad mounts count - %s" msgstr "" -#: misc/tune2fs.c:1811 +#: misc/tune2fs.c:1823 #, c-format msgid "bad gid/group name - %s" msgstr "" -#: misc/tune2fs.c:1844 +#: misc/tune2fs.c:1856 #, c-format msgid "bad interval - %s" msgstr "" -#: misc/tune2fs.c:1873 +#: misc/tune2fs.c:1885 #, c-format msgid "bad reserved block ratio - %s" msgstr "" -#: misc/tune2fs.c:1888 +#: misc/tune2fs.c:1900 msgid "-o may only be specified once" msgstr "" -#: misc/tune2fs.c:1897 +#: misc/tune2fs.c:1909 msgid "-O may only be specified once" msgstr "" -#: misc/tune2fs.c:1914 +#: misc/tune2fs.c:1926 #, c-format msgid "bad reserved blocks count - %s" msgstr "" -#: misc/tune2fs.c:1943 +#: misc/tune2fs.c:1955 #, c-format msgid "bad uid/user name - %s" msgstr "" -#: misc/tune2fs.c:1960 +#: misc/tune2fs.c:1972 #, c-format msgid "bad inode size - %s" msgstr "" -#: misc/tune2fs.c:1967 +#: misc/tune2fs.c:1979 #, c-format msgid "Inode size must be a power of two- %s" msgstr "" -#: misc/tune2fs.c:2064 +#: misc/tune2fs.c:2076 #, c-format msgid "mmp_update_interval too big: %lu\n" msgstr "" -#: misc/tune2fs.c:2069 +#: misc/tune2fs.c:2081 #, c-format msgid "Setting multiple mount protection update interval to %lu second\n" msgid_plural "" @@ -6136,27 +6136,27 @@ msgstr[0] "" msgstr[1] "" -#: misc/tune2fs.c:2096 +#: misc/tune2fs.c:2108 #, c-format msgid "Invalid RAID stride: %s\n" msgstr "" -#: misc/tune2fs.c:2111 +#: misc/tune2fs.c:2123 #, c-format msgid "Invalid RAID stripe-width: %s\n" msgstr "" -#: misc/tune2fs.c:2126 +#: misc/tune2fs.c:2138 #, c-format msgid "Invalid hash algorithm: %s\n" msgstr "" -#: misc/tune2fs.c:2132 +#: misc/tune2fs.c:2144 #, c-format msgid "Setting default hash algorithm to %s (%d)\n" msgstr "" -#: misc/tune2fs.c:2191 +#: misc/tune2fs.c:2199 msgid "" "\n" "Bad options specified.\n" @@ -6175,66 +6175,66 @@ "\t^test_fs\n" msgstr "" -#: misc/tune2fs.c:2622 +#: misc/tune2fs.c:2634 msgid "Failed to read inode bitmap\n" msgstr "" -#: misc/tune2fs.c:2627 +#: misc/tune2fs.c:2639 msgid "Failed to read block bitmap\n" msgstr "" -#: misc/tune2fs.c:2644 resize/resize2fs.c:1277 +#: misc/tune2fs.c:2656 resize/resize2fs.c:1277 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:2647 +#: misc/tune2fs.c:2659 msgid "Failed to allocate block bitmap when increasing inode size\n" msgstr "" -#: misc/tune2fs.c:2653 +#: misc/tune2fs.c:2665 msgid "Not enough space to increase inode size \n" msgstr "" -#: misc/tune2fs.c:2658 +#: misc/tune2fs.c:2670 msgid "Failed to relocate blocks during inode resize \n" msgstr "" -#: misc/tune2fs.c:2690 +#: misc/tune2fs.c:2702 msgid "" "Error in resizing the inode size.\n" "Run e2undo to undo the file system changes. \n" msgstr "" -#: misc/tune2fs.c:2907 +#: misc/tune2fs.c:2919 #, c-format msgid "" "MMP block magic is bad. Try to fix it by running:\n" "'e2fsck -f %s'\n" msgstr "" -#: misc/tune2fs.c:2919 +#: misc/tune2fs.c:2931 msgid "Cannot modify a journal device.\n" msgstr "" -#: misc/tune2fs.c:2932 +#: misc/tune2fs.c:2944 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:2939 +#: misc/tune2fs.c:2951 msgid "Shrinking inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:2944 +#: misc/tune2fs.c:2956 #, c-format msgid "Invalid inode size %lu (max %d)\n" msgstr "" -#: misc/tune2fs.c:2950 +#: misc/tune2fs.c:2962 msgid "Resizing inodes could take some time." msgstr "" -#: misc/tune2fs.c:2998 +#: misc/tune2fs.c:3009 #, c-format msgid "" "Warning: The journal is dirty. You may wish to replay the journal like:\n" @@ -6245,106 +6245,106 @@ "by journal recovery.\n" msgstr "" -#: misc/tune2fs.c:3009 +#: misc/tune2fs.c:3020 #, c-format msgid "Recovering journal.\n" msgstr "" -#: misc/tune2fs.c:3028 +#: misc/tune2fs.c:3039 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3034 +#: misc/tune2fs.c:3045 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3039 +#: misc/tune2fs.c:3050 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:3044 +#: misc/tune2fs.c:3055 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:3049 +#: misc/tune2fs.c:3060 #, c-format msgid "interval between checks is too big (%lu)" msgstr "" -#: misc/tune2fs.c:3056 +#: misc/tune2fs.c:3067 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:3063 +#: misc/tune2fs.c:3074 #, c-format msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n" msgstr "" -#: misc/tune2fs.c:3069 +#: misc/tune2fs.c:3080 #, c-format msgid "reserved blocks count is too big (%llu)" msgstr "" -#: misc/tune2fs.c:3076 +#: misc/tune2fs.c:3087 #, c-format msgid "Setting reserved blocks count to %llu\n" msgstr "" -#: misc/tune2fs.c:3081 +#: misc/tune2fs.c:3092 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:3084 +#: misc/tune2fs.c:3095 msgid "" "\n" "Setting the sparse superblock flag not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3094 +#: misc/tune2fs.c:3105 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:3099 +#: misc/tune2fs.c:3110 msgid "" "\n" "Clearing the sparse superblock flag not supported.\n" msgstr "" -#: misc/tune2fs.c:3107 +#: misc/tune2fs.c:3118 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:3113 +#: misc/tune2fs.c:3124 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:3145 +#: misc/tune2fs.c:3156 msgid "Error in using clear_mmp. It must be used with -f\n" msgstr "" -#: misc/tune2fs.c:3163 +#: misc/tune2fs.c:3174 msgid "" "The quota feature may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3196 +#: misc/tune2fs.c:3207 msgid "The UUID may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3199 +#: misc/tune2fs.c:3210 msgid "" "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' " "and re-run this command.\n" @@ -6354,45 +6354,45 @@ msgid "Setting UUID on a checksummed filesystem could take some time." msgstr "" -#: misc/tune2fs.c:3229 +#: misc/tune2fs.c:3240 msgid "Invalid UUID format\n" msgstr "" -#: misc/tune2fs.c:3245 +#: misc/tune2fs.c:3256 msgid "Need to update journal superblock.\n" msgstr "" -#: misc/tune2fs.c:3267 +#: misc/tune2fs.c:3278 msgid "" "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3274 +#: misc/tune2fs.c:3285 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3292 +#: misc/tune2fs.c:3303 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:3296 +#: misc/tune2fs.c:3307 msgid "Failed to change inode size\n" msgstr "" -#: misc/tune2fs.c:3310 +#: misc/tune2fs.c:3321 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:3315 +#: misc/tune2fs.c:3326 #, c-format msgid "Setting stripe width to %d\n" msgstr "" -#: misc/tune2fs.c:3322 +#: misc/tune2fs.c:3333 #, c-format msgid "Setting extended default mount options to '%s'\n" msgstr "" @@ -7731,63 +7731,63 @@ msgid "\tlast mounted on %s on %s" msgstr "" -#: lib/support/plausible.c:121 +#: lib/support/plausible.c:117 #, c-format msgid "\tlast mounted on %s" msgstr "" -#: lib/support/plausible.c:124 +#: lib/support/plausible.c:120 #, c-format msgid "\tcreated on %s" msgstr "" -#: lib/support/plausible.c:127 +#: lib/support/plausible.c:123 #, c-format msgid "\tlast modified on %s" msgstr "" -#: lib/support/plausible.c:161 +#: lib/support/plausible.c:157 #, c-format msgid "Found a %s partition table in %s\n" msgstr "" -#: lib/support/plausible.c:191 +#: lib/support/plausible.c:187 #, c-format msgid "The file %s does not exist and no size was specified.\n" msgstr "" -#: lib/support/plausible.c:199 +#: lib/support/plausible.c:195 #, c-format msgid "Creating regular file %s\n" msgstr "" -#: lib/support/plausible.c:202 +#: lib/support/plausible.c:198 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: lib/support/plausible.c:205 +#: lib/support/plausible.c:201 msgid "" "\n" "The device apparently does not exist; did you specify it correctly?\n" msgstr "" -#: lib/support/plausible.c:227 +#: lib/support/plausible.c:223 #, c-format msgid "%s is not a block special device.\n" msgstr "" -#: lib/support/plausible.c:249 +#: lib/support/plausible.c:245 #, c-format msgid "%s contains a %s file system labelled '%s'\n" msgstr "" -#: lib/support/plausible.c:252 +#: lib/support/plausible.c:248 #, c-format msgid "%s contains a %s file system\n" msgstr "" -#: lib/support/plausible.c:276 +#: lib/support/plausible.c:272 #, c-format msgid "%s contains `%s' data\n" msgstr "" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/elfutils.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/elfutils.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/elfutils.po 2020-01-23 16:51:31.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/elfutils.po 2020-07-08 13:53:27.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: 2020-01-23 11:39+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: lib/color.c:53 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/fcitx-mozc.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/fcitx-mozc.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/fcitx-mozc.po 2020-01-23 16:51:28.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/fcitx-mozc.po 2020-07-08 13:53:24.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: 2020-01-23 12:02+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:43+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: ../eim.cc:184 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/fetchmail.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/fetchmail.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/fetchmail.po 2020-01-23 16:51:36.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/fetchmail.po 2020-07-08 13:53:33.000000000 +0000 @@ -17,8 +17,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: 2020-01-23 10:52+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:45+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: checkalias.c:174 @@ -370,7 +370,7 @@ msgid "%s at %s (folder %s)" msgstr "アカウント %s , サーバ %s (フォルダ %s)" -#: driver.c:1335 rcfile_y.y:392 +#: driver.c:1335 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "アカウント %s , サーバ %s" @@ -499,7 +499,7 @@ msgid "Option --limit is not supported with %s\n" msgstr "オプション --limit と %s は同時に設定できません。\n" -#: env.c:62 +#: env.c:58 #, c-format msgid "" "%s: The QMAILINJECT environment variable is set.\n" @@ -514,7 +514,7 @@ "\"env QMAILINJECT = %s (引数)\" を実行してみて下さい。\n" "%s: 終了します。\n" -#: env.c:74 +#: env.c:70 #, c-format msgid "" "%s: The NULLMAILER_FLAGS environment variable is set.\n" @@ -530,12 +530,12 @@ "\"env NULLMAILER_FLAGS= %s (あなたの利用しているエージェント)\" として下さい。\n" "%s: 終了します。\n" -#: env.c:86 +#: env.c:82 #, c-format msgid "%s: You don't exist. Go away.\n" msgstr "%s: 貴様のアカウントは存在しない。さっさと立ち去り二度と戻ってくるな。\n" -#: env.c:204 +#: env.c:200 #, c-format msgid "%s: can't determine your host!" msgstr "%s: ホストが決定できません!" @@ -545,11 +545,11 @@ msgid "gethostbyname failed for %s\n" msgstr "ホスト %s を gethostbyname で検索できませんでした。\n" -#: env.c:229 +#: env.c:225 msgid "Cannot find my own host in hosts database to qualify it!\n" msgstr "hosts データベースでこのホスト自身を確認できません!\n" -#: env.c:233 +#: env.c:229 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar " @@ -660,259 +660,259 @@ msgid "could not get current working directory\n" msgstr "カレントディレクトリを取得できません\n" -#: fetchmail.c:297 +#: fetchmail.c:304 #, c-format msgid "This is fetchmail release %s" msgstr "fetchmail リリース %s" -#: fetchmail.c:322 +#: fetchmail.c:339 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "nodetach オプションが有効ですので、logfile オプションを無視します。\n" -#: fetchmail.c:329 +#: fetchmail.c:346 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "デーモンモードではありませんので、logfile オプションを無視します。\n" -#: fetchmail.c:336 +#: fetchmail.c:353 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "ログファイル \"%s\" が存在しませんので logfile オプションを無視します。\n" -#: fetchmail.c:342 +#: fetchmail.c:359 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "ログファイル \"%s\" には書き込みできません、中止します。\n" -#: fetchmail.c:360 +#: fetchmail.c:377 #, c-format msgid "" "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "syslog と logfile オプションが両方とも設定されているので syslog を無視し、%s にログを書き込みます" -#: fetchmail.c:448 +#: fetchmail.c:468 #, c-format msgid "Taking options from command line%s%s\n" msgstr "コマンドライン%s%sよりオプションを設定します。\n" -#: fetchmail.c:449 +#: fetchmail.c:469 msgid " and " msgstr " 及び " -#: fetchmail.c:454 +#: fetchmail.c:474 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "メールサーバの準備が整いません -- おそらく %s が存在しないためです\n" -#: fetchmail.c:475 +#: fetchmail.c:495 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: メールサーバが指定されておりません。\n" -#: fetchmail.c:487 +#: fetchmail.c:507 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: 実行中の fetchmail は存在しません。\n" -#: fetchmail.c:493 +#: fetchmail.c:513 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: エラーの発生により%s fetchmail (PID=%ld) を終了します。\n" -#: fetchmail.c:494 fetchmail.c:503 +#: fetchmail.c:514 fetchmail.c:523 msgid "background" msgstr "バックグラウンドの" -#: fetchmail.c:494 fetchmail.c:503 +#: fetchmail.c:514 fetchmail.c:523 msgid "foreground" msgstr "フォアグラウンドの" -#: fetchmail.c:502 +#: fetchmail.c:522 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail (PID=%ld) を終了しました。\n" -#: fetchmail.c:525 +#: fetchmail.c:545 msgid "" "fetchmail: can't check mail while another fetchmail to same host is " "running.\n" msgstr "fetchmail: 同じホストに対して別の fetchmail が交信しているためメールの確認が出来ません。\n" -#: fetchmail.c:531 +#: fetchmail.c:551 #, c-format msgid "" "fetchmail: can't poll specified hosts with another fetchmail running at " "%ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) が実行中のため指定されたホストと接続できません。\n" -#: fetchmail.c:538 +#: fetchmail.c:558 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) がフォアグラウンド動作中です。\n" -#: fetchmail.c:548 +#: fetchmail.c:568 msgid "" "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: バックグラウンドで fetchmail が動作中のためオプションが受け付けられません。\n" -#: fetchmail.c:560 +#: fetchmail.c:580 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: バックグラウンドの fetchmail (PID=%ld) が動作を再開しました。\n" -#: fetchmail.c:572 +#: fetchmail.c:592 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: 同時に動作していた fetchmail (PID=%ld) が突然消滅しました。\n" -#: fetchmail.c:587 +#: fetchmail.c:607 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: %s@%s にログインするためのパスワードがありません。\n" -#: fetchmail.c:591 +#: fetchmail.c:611 #, c-format msgid "Enter password for %s@%s: " msgstr "%s@%s にログインするためのパスワードを入力して下さい : " -#: fetchmail.c:633 +#: fetchmail.c:653 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: バックグラウンドに移れません。終了します。\n" -#: fetchmail.c:637 +#: fetchmail.c:657 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "fetchmail %s デーモンを動作開始します\n" -#: fetchmail.c:653 fetchmail.c:655 +#: fetchmail.c:673 fetchmail.c:675 #, c-format msgid "could not open %s to append logs to\n" msgstr "ログを追加するために %s を開くことが出来ませんでした\n" -#: fetchmail.c:674 +#: fetchmail.c:694 msgid "--check mode enabled, not fetching mail\n" msgstr "--check モードが有効なので、メールを取り込みません\n" -#: fetchmail.c:696 +#: fetchmail.c:716 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "%s の編集された時間を調べることができません。(エラー %d)\n" -#: fetchmail.c:701 +#: fetchmail.c:721 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "%s が編集されたため fetchmail を再起動します。\n" -#: fetchmail.c:705 +#: fetchmail.c:725 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "ディレクトリが回復できないので、再実行は失敗するでしょう。\n" -#: fetchmail.c:731 +#: fetchmail.c:751 msgid "attempt to re-exec fetchmail failed\n" msgstr "fetchmail の再起動に失敗しました。\n" -#: fetchmail.c:761 +#: fetchmail.c:781 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "認証失敗か制限時間超過が頻発したため %s との交信を飛ばします。\n" -#: fetchmail.c:773 +#: fetchmail.c:793 #, c-format msgid "interval not reached, not querying %s\n" msgstr "時間間隔に達していないので %s の一時保管を行いません。\n" -#: fetchmail.c:811 +#: fetchmail.c:831 msgid "Query status=0 (SUCCESS)\n" msgstr "Query status=0 (SUCCESS)\n" -#: fetchmail.c:813 +#: fetchmail.c:833 msgid "Query status=1 (NOMAIL)\n" msgstr "Query status=1 (NOMAIL)\n" -#: fetchmail.c:815 +#: fetchmail.c:835 msgid "Query status=2 (SOCKET)\n" msgstr "Query status=2 (SOCKET)\n" -#: fetchmail.c:817 +#: fetchmail.c:837 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Query status=3 (AUTHFAIL)\n" -#: fetchmail.c:819 +#: fetchmail.c:839 msgid "Query status=4 (PROTOCOL)\n" msgstr "Query status=4 (PROTOCOL)\n" -#: fetchmail.c:821 +#: fetchmail.c:841 msgid "Query status=5 (SYNTAX)\n" msgstr "Query status=5 (SYNTAX)\n" -#: fetchmail.c:823 +#: fetchmail.c:843 msgid "Query status=6 (IOERR)\n" msgstr "Query status=6 (IOERR)\n" -#: fetchmail.c:825 +#: fetchmail.c:845 msgid "Query status=7 (ERROR)\n" msgstr "Query status=7 (ERROR)\n" -#: fetchmail.c:827 +#: fetchmail.c:847 msgid "Query status=8 (EXCLUDE)\n" msgstr "Query status=8 (EXCLUDE)\n" -#: fetchmail.c:829 +#: fetchmail.c:849 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Query status=9 (LOCKBUSY)\n" -#: fetchmail.c:831 +#: fetchmail.c:851 msgid "Query status=10 (SMTP)\n" msgstr "Query status=10 (SMTP)\n" -#: fetchmail.c:833 +#: fetchmail.c:853 msgid "Query status=11 (DNS)\n" msgstr "Query status=11 (DNS)\n" -#: fetchmail.c:835 +#: fetchmail.c:855 msgid "Query status=12 (BSMTP)\n" msgstr "Query status=12 (BSMTP)\n" -#: fetchmail.c:837 +#: fetchmail.c:857 msgid "Query status=13 (MAXFETCH)\n" msgstr "Query status=13 (MAXFETCH)\n" -#: fetchmail.c:839 +#: fetchmail.c:859 #, c-format msgid "Query status=%d\n" msgstr "Query status=%d\n" -#: fetchmail.c:881 +#: fetchmail.c:901 msgid "All connections are wedged. Exiting.\n" msgstr "全ての接続が動作不全に陥ってしまいました。終了します。\n" -#: fetchmail.c:889 +#: fetchmail.c:909 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "%s から %d秒休眠状態になります。\n" -#: fetchmail.c:913 +#: fetchmail.c:933 #, c-format msgid "awakened by %s\n" msgstr "%s 信号を受信したため動作を再開しました。\n" -#: fetchmail.c:916 +#: fetchmail.c:936 #, c-format msgid "awakened by signal %d\n" msgstr "%d 番の信号を受信したため動作を再開しました。\n" -#: fetchmail.c:924 +#: fetchmail.c:944 #, c-format msgid "awakened at %s\n" msgstr "%s に動作を再開しました。\n" -#: fetchmail.c:929 +#: fetchmail.c:949 #, c-format msgid "normal termination, status %d\n" msgstr "通常の終了です。status %d\n" -#: fetchmail.c:1090 +#: fetchmail.c:1113 msgid "couldn't time-check the run-control file\n" msgstr "動作制御ファイルの編集時間を確認することができませんでした。\n" -#: fetchmail.c:1124 +#: fetchmail.c:1147 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "警告 : 設定ファイル中にホスト %s を複数回記述しています\n" @@ -921,671 +921,671 @@ msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n" msgstr "fetchmail: エラー : 設定ファイル中に \"defaults\" を複数回記述しています\n" -#: fetchmail.c:1285 +#: fetchmail.c:1316 msgid "SSL support is not compiled in.\n" msgstr "SSL 対応がコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1292 +#: fetchmail.c:1323 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "KERBEROS v4 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1298 +#: fetchmail.c:1329 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "KERBEROS v5 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1304 +#: fetchmail.c:1335 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "GSSAPI 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1334 +#: fetchmail.c:1365 #, c-format msgid "" "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: 警告 : %s より multidrop fetch を確認するための DNS が有効でありません。\n" -#: fetchmail.c:1345 +#: fetchmail.c:1376 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "警告: %s へのマルチドロップを行うにはエンベロープオプションが必要です!\n" -#: fetchmail.c:1346 +#: fetchmail.c:1377 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "警告: すべてのメールが postmaster 宛にフォワードされてしまう可能性があります!\n" -#: fetchmail.c:1363 +#: fetchmail.c:1394 #, c-format msgid "" "fetchmail: %s configuration invalid, specify positive port number for " "service or port\n" msgstr "fetchmail: サーバ %s の設定が無効です。サービス番号、ポート番号は負の数ではいけません。\n" -#: fetchmail.c:1370 +#: fetchmail.c:1401 #, c-format msgid "" "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: サーバ %s の設定が無効です。 RPOP では privileged port を利用する必要があります。\n" -#: fetchmail.c:1388 +#: fetchmail.c:1419 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "サーバ %s の設定が無効です。LMTP はデフォルトの SMTP ポートを利用できません。\n" -#: fetchmail.c:1402 +#: fetchmail.c:1433 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "fetchall と keep オプションはデーモンモード、休止モードでは同時に指定できません。\n" -#: fetchmail.c:1436 +#: fetchmail.c:1467 #, c-format msgid "terminated with signal %d\n" msgstr "シグナル %d で終了しました。\n" -#: fetchmail.c:1509 +#: fetchmail.c:1540 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が開始されました。\n" -#: fetchmail.c:1534 +#: fetchmail.c:1565 msgid "POP2 support is not configured.\n" msgstr "POP2 に対応した設定が行われておりません。\n" -#: fetchmail.c:1546 +#: fetchmail.c:1577 msgid "POP3 support is not configured.\n" msgstr "POP3 に対応した設定が行われておりません。\n" -#: fetchmail.c:1556 +#: fetchmail.c:1587 msgid "IMAP support is not configured.\n" msgstr "IMAP に対応した設定が行われておりません。\n" -#: fetchmail.c:1562 +#: fetchmail.c:1593 msgid "ETRN support is not configured.\n" msgstr "ETRN に対応した設定が行われておりません。\n" -#: fetchmail.c:1570 +#: fetchmail.c:1601 msgid "ODMR support is not configured.\n" msgstr "ODMR に対応した設定が行われておりません。\n" -#: fetchmail.c:1577 +#: fetchmail.c:1608 msgid "unsupported protocol selected.\n" msgstr "対応していないプロトコルが選択されました。\n" -#: fetchmail.c:1588 +#: fetchmail.c:1619 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が終了しました。\n" -#: fetchmail.c:1613 +#: fetchmail.c:1644 #, c-format msgid "Poll interval is %d seconds\n" msgstr "交信間隔は %d 秒です。\n" -#: fetchmail.c:1615 +#: fetchmail.c:1646 #, c-format msgid "Logfile is %s\n" msgstr "ログファイルは %s です。\n" -#: fetchmail.c:1617 +#: fetchmail.c:1648 #, c-format msgid "Idfile is %s\n" msgstr "ID ファイルは %s です。\n" -#: fetchmail.c:1620 +#: fetchmail.c:1651 msgid "Progress messages will be logged via syslog\n" msgstr "進行状況のメッセージは syslog を通して記録されます。\n" -#: fetchmail.c:1623 +#: fetchmail.c:1654 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail はアドレスを書き換え、Received を生成しません。\n" -#: fetchmail.c:1625 +#: fetchmail.c:1656 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail はログファイル中にも進行状況を示す . を書き込みます。\n" -#: fetchmail.c:1627 +#: fetchmail.c:1658 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail は誤った宛先の書かれたメッセージを %s に転送します。\n" -#: fetchmail.c:1631 +#: fetchmail.c:1662 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail は postmaster 宛にエラーメールを送信します。\n" -#: fetchmail.c:1633 +#: fetchmail.c:1664 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail は送り主にエラーメッセージを送信します。\n" -#: fetchmail.c:1636 +#: fetchmail.c:1667 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail は恒久的なエラーを恒久的なものとして扱います（メッセージを破棄）。\n" -#: fetchmail.c:1638 +#: fetchmail.c:1669 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail は恒久的なエラーを一時的なものとして扱います（メッセージを保存）。\n" -#: fetchmail.c:1645 +#: fetchmail.c:1676 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "アカウント %s@%s でのオプションです。\n" -#: fetchmail.c:1649 +#: fetchmail.c:1680 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " メールはホスト %s を介してやりとりされます。\n" -#: fetchmail.c:1652 +#: fetchmail.c:1683 #, 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:1656 +#: fetchmail.c:1687 #, c-format msgid " True name of server is %s.\n" msgstr " サーバの本名は %s です。\n" -#: fetchmail.c:1659 +#: fetchmail.c:1690 msgid " This host will not be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にはアクセスされません。\n" -#: fetchmail.c:1660 +#: fetchmail.c:1691 msgid " This host will be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にアクセスされます。\n" -#: fetchmail.c:1664 +#: fetchmail.c:1695 msgid " Password will be prompted for.\n" msgstr " パスワード入力が必要です。\n" -#: fetchmail.c:1668 +#: fetchmail.c:1699 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP secret = \"%s\".\n" -#: fetchmail.c:1671 +#: fetchmail.c:1702 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = \"%s\".\n" -#: fetchmail.c:1674 +#: fetchmail.c:1705 #, c-format msgid " Password = \"%s\".\n" msgstr " パスワード = \"%s\"\n" -#: fetchmail.c:1683 +#: fetchmail.c:1714 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Kerberos %s 認証による KPOP プロトコルを利用します" -#: fetchmail.c:1686 +#: fetchmail.c:1717 #, c-format msgid " Protocol is %s" msgstr " %s プロトコルを利用します" -#: fetchmail.c:1688 +#: fetchmail.c:1719 #, c-format msgid " (using service %s)" msgstr " (%s サービスを利用します)" -#: fetchmail.c:1690 +#: fetchmail.c:1721 msgid " (using default port)" msgstr " (デフォルトのポートを利用します)" -#: fetchmail.c:1692 +#: fetchmail.c:1723 msgid " (forcing UIDL use)" msgstr " (UIDL の利用を強制します)" -#: fetchmail.c:1698 +#: fetchmail.c:1729 msgid " All available authentication methods will be tried.\n" msgstr " 利用可能な全ての認証方式を試みます。\n" -#: fetchmail.c:1701 +#: fetchmail.c:1732 msgid " Password authentication will be forced.\n" msgstr " パスワードによる認証を強制的に行います。\n" -#: fetchmail.c:1704 +#: fetchmail.c:1735 msgid " MSN authentication will be forced.\n" msgstr " MSN 認証を強制的に行います。\n" -#: fetchmail.c:1707 +#: fetchmail.c:1738 msgid " NTLM authentication will be forced.\n" msgstr " NTLM 認証を強制的に行います。\n" -#: fetchmail.c:1710 +#: fetchmail.c:1741 msgid " OTP authentication will be forced.\n" msgstr " OTP による認証を強制的に行います。\n" -#: fetchmail.c:1713 +#: fetchmail.c:1744 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1716 +#: fetchmail.c:1747 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI 方式による認証を強制的に行います。\n" -#: fetchmail.c:1719 +#: fetchmail.c:1750 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos V4 方式による認証を強制的に行います。\n" -#: fetchmail.c:1722 +#: fetchmail.c:1753 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos V5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1725 +#: fetchmail.c:1756 msgid " End-to-end encryption assumed.\n" msgstr " End-to-end 暗号化であるとします。\n" -#: fetchmail.c:1729 +#: fetchmail.c:1760 #, c-format msgid " Mail service principal is: %s\n" msgstr " メールサービスは %s によって行われます。\n" -#: fetchmail.c:1732 +#: fetchmail.c:1763 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL による暗号化通信が行われます。\n" -#: fetchmail.c:1734 +#: fetchmail.c:1765 #, c-format msgid " SSL protocol: %s.\n" msgstr " %s プロトコルを利用します。\n" -#: fetchmail.c:1736 +#: fetchmail.c:1767 msgid " SSL server certificate checking enabled.\n" msgstr " SSL サーバ証明書の確認が設定されました。\n" -#: fetchmail.c:1741 +#: fetchmail.c:1772 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " SSL 信頼する証明書はファイル %s に格納されています。\n" -#: fetchmail.c:1743 +#: fetchmail.c:1774 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " SSL 信用可能証明書は %s に格納されています。\n" -#: fetchmail.c:1745 +#: fetchmail.c:1776 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSLサーバの CommonName: %s\n" -#: fetchmail.c:1747 +#: fetchmail.c:1778 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL key fingerprint (server key と照合されました): %s\n" -#: fetchmail.c:1750 +#: fetchmail.c:1781 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " サーバの応答制限時間は %d 秒です" -#: fetchmail.c:1752 +#: fetchmail.c:1783 msgid " (default).\n" msgstr " (デフォルト)。\n" -#: fetchmail.c:1759 +#: fetchmail.c:1790 msgid " Default mailbox selected.\n" msgstr " デフォルトのメールボックスが選択されました。\n" -#: fetchmail.c:1764 +#: fetchmail.c:1795 msgid " Selected mailboxes are:" msgstr " 選択されたメールボックス:" -#: fetchmail.c:1770 +#: fetchmail.c:1801 msgid " All messages will be retrieved (--all on).\n" msgstr " すべてのメッセージを取得します。 (--all on)\n" -#: fetchmail.c:1771 +#: fetchmail.c:1802 msgid " Only new messages will be retrieved (--all off).\n" msgstr " 新しいメッセージだけを取得します。 (--all off)\n" -#: fetchmail.c:1773 +#: fetchmail.c:1804 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " 取得したメッセージをサーバにも保持します。 (--keep on)\n" -#: fetchmail.c:1774 +#: fetchmail.c:1805 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " 取得したメッセージはサーバに保持しません (--keep off)\n" -#: fetchmail.c:1776 +#: fetchmail.c:1807 msgid "" " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " 古いメッセージは取得の前に消去されます。 (--flush on)\n" -#: fetchmail.c:1777 +#: fetchmail.c:1808 msgid "" " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " メッセージ取得の前に古いメッセージを消去しません。 (--flush off)\n" -#: fetchmail.c:1779 +#: fetchmail.c:1810 msgid "" " Oversized messages will be flushed before message retrieval (--limitflush " "on).\n" msgstr " 容量超過したメッセージは取得の前に消去されます。 (--limitflush on)\n" -#: fetchmail.c:1780 +#: fetchmail.c:1811 msgid "" " Oversized messages will not be flushed before message retrieval (--" "limitflush off).\n" msgstr " メッセージ取得の前に容量超過したメッセージを消去しません。 (--limitflush off)\n" -#: fetchmail.c:1782 +#: fetchmail.c:1813 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " server-local アドレスへの書き換えを行います。 (--norewrite off)\n" -#: fetchmail.c:1783 +#: fetchmail.c:1814 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " server-local アドレスへの書き換えを行いません。 (--norewrite on)\n" -#: fetchmail.c:1785 +#: fetchmail.c:1816 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " 改行記号の除去を行います。 (stripcr on)\n" -#: fetchmail.c:1786 +#: fetchmail.c:1817 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " 改行記号の除去を行いません。 (stripcr off)\n" -#: fetchmail.c:1788 +#: fetchmail.c:1819 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " 改行記号の追加を行います。 (forcecr on)\n" -#: fetchmail.c:1789 +#: fetchmail.c:1820 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " 改行記号の追加を行いません。 (forcecr off)\n" -#: fetchmail.c:1791 +#: fetchmail.c:1822 msgid "" " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Content-Transfer-Encoding の変換を行いません。 (pass8bits on)\n" -#: fetchmail.c:1792 +#: fetchmail.c:1823 msgid "" " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Content-Transfer-Encoding の変換を行います。 (pass8bits off)\n" -#: fetchmail.c:1794 +#: fetchmail.c:1825 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME のデコードを行います。 (mimedecode on)\n" -#: fetchmail.c:1795 +#: fetchmail.c:1826 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME のデコードを行いません。 (mimedecode off)\n" -#: fetchmail.c:1797 +#: fetchmail.c:1828 msgid " Idle after poll is enabled (idle on).\n" msgstr " サーバアクセス後、休止します。 (idle on)\n" -#: fetchmail.c:1798 +#: fetchmail.c:1829 msgid " Idle after poll is disabled (idle off).\n" msgstr " サーバアクセス後、休止しません。 (idle off)\n" -#: fetchmail.c:1800 +#: fetchmail.c:1831 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " 記述のある Status 行を破棄します。 (dropstatus on)\n" -#: fetchmail.c:1801 +#: fetchmail.c:1832 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " 記述のある Status 行を保持します。 (dropstatus off)\n" -#: fetchmail.c:1803 +#: fetchmail.c:1834 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Delivered-To 行を保持します。 (dropdelivered on)\n" -#: fetchmail.c:1804 +#: fetchmail.c:1835 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Delivered-To 行を破棄します。 (dropdelivered off)\n" -#: fetchmail.c:1808 +#: fetchmail.c:1839 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " メッセージの大きさの最大 %d バイトに制限されます。 (--limit %d)\n" -#: fetchmail.c:1811 +#: fetchmail.c:1842 msgid " No message size limit (--limit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--limit 0)\n" -#: fetchmail.c:1813 +#: fetchmail.c:1844 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " メッセージの大きさに対する警告は %d 秒毎に行われます。 (--warnings %d)\n" -#: fetchmail.c:1816 +#: fetchmail.c:1847 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " サーバアクセスの度にメッセージの大きさの警告を行います。 (--warnings 0)\n" -#: fetchmail.c:1819 +#: fetchmail.c:1850 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " 一回の接続で取得できるメッセージは %d 通に制限されます。(--fetchlimit %d)\n" -#: fetchmail.c:1822 +#: fetchmail.c:1853 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " 一回の接続で取得できるメッセージの数に制限はありません。 (--fetchlimit 0)\n" -#: fetchmail.c:1824 +#: fetchmail.c:1855 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " 取得できるメッセージのサイズは %d に制限されます。(--fetchsizelimit %d)\n" -#: fetchmail.c:1827 +#: fetchmail.c:1858 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--fetchsizelimit 0)\n" -#: fetchmail.c:1831 +#: fetchmail.c:1862 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " 接続ごとに UID の二分木検索を行います。(--fastuidl 1)\n" -#: fetchmail.c:1833 +#: fetchmail.c:1864 #, 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:1836 +#: fetchmail.c:1867 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " 接続ごとに UID の線形検索を行います。(--fastuidl 0)\n" -#: fetchmail.c:1838 +#: fetchmail.c:1869 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " 一回の接続で転送できるメッセージは %d 通に制限されます。\n" -#: fetchmail.c:1840 +#: fetchmail.c:1871 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " 一回の接続で転送できるメッセージの数に制限はありません。 (--batchlimit 0)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1875 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " メッセージは %d 通毎に削除されます。 (--expunge %d)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1877 msgid " No forced expunges (--expunge 0).\n" msgstr " メッセージを削除する間隔は設定されていません。 (--expunge 0)\n" -#: fetchmail.c:1853 +#: fetchmail.c:1884 msgid " Domains for which mail will be fetched are:" msgstr " メールを取得するドメインは :" -#: fetchmail.c:1858 fetchmail.c:1878 +#: fetchmail.c:1889 fetchmail.c:1909 msgid " (default)" msgstr " (デフォルト)" -#: fetchmail.c:1863 +#: fetchmail.c:1894 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " ファイル %s に BSMTP 形式でメッセージが追記されます。\n" -#: fetchmail.c:1865 +#: fetchmail.c:1896 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " アプリケーション\"%s\"によってメッセージが送信されます。\n" -#: fetchmail.c:1872 +#: fetchmail.c:1903 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " 受信したメッセージは %cMTP によって次に示すサーバへ転送されます :" -#: fetchmail.c:1883 +#: fetchmail.c:1914 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " ホストの MAIL FROM 行のアドレスは %s です。\n" -#: fetchmail.c:1886 +#: fetchmail.c:1917 #, 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:1895 +#: fetchmail.c:1926 msgid " Recognized listener spam block responses are:" msgstr " 送信先のスパムブロックに対する応答は :" -#: fetchmail.c:1901 +#: fetchmail.c:1932 msgid " Spam-blocking disabled\n" msgstr " スパムブロックは行われません。\n" -#: fetchmail.c:1904 +#: fetchmail.c:1935 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって行われます。\n" -#: fetchmail.c:1907 +#: fetchmail.c:1938 msgid " No pre-connection command.\n" msgstr " 接続前に実行する命令はありません。\n" -#: fetchmail.c:1909 +#: fetchmail.c:1940 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって切断されます。\n" -#: fetchmail.c:1912 +#: fetchmail.c:1943 msgid " No post-connection command.\n" msgstr " 接続終了時に行う命令はありません。\n" -#: fetchmail.c:1915 +#: fetchmail.c:1946 msgid " No localnames declared for this host.\n" msgstr " このホストに対する localname は宣言されていません。\n" -#: fetchmail.c:1925 +#: fetchmail.c:1956 msgid " Multi-drop mode: " msgstr " `multi-drop' モード: " -#: fetchmail.c:1927 +#: fetchmail.c:1958 msgid " Single-drop mode: " msgstr " `single-drop' モード: " -#: fetchmail.c:1929 +#: fetchmail.c:1960 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d 個の localname が存在します。\n" -#: fetchmail.c:1944 +#: fetchmail.c:1975 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " multidrop アドレスを検索する DNS が有効です。\n" -#: fetchmail.c:1945 +#: fetchmail.c:1976 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " multidrop アドレスを検索する DNS が無効です。\n" -#: fetchmail.c:1949 +#: fetchmail.c:1980 msgid "" " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " サーバの別名は multidrop アドレスと IP アドレスで比較されます。\n" -#: fetchmail.c:1951 +#: fetchmail.c:1982 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " サーバの別名は multidrop アドレスとホスト名で比較されます。\n" -#: fetchmail.c:1954 +#: fetchmail.c:1985 msgid " Envelope-address routing is disabled\n" msgstr " Envelope-address によるルーティングは行われません。\n" -#: fetchmail.c:1957 +#: fetchmail.c:1988 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Envelope header は %s とされます。\n" -#: fetchmail.c:1960 +#: fetchmail.c:1991 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " %d 個を超える Envelope header はスキップされます。\n" -#: fetchmail.c:1963 +#: fetchmail.c:1994 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefix %s はユーザ ID から除去されます。\n" -#: fetchmail.c:1966 +#: fetchmail.c:1997 msgid " No prefix stripping\n" msgstr " Prefix は除去されません。\n" -#: fetchmail.c:1971 +#: fetchmail.c:2002 msgid " Predeclared mailserver aliases:" msgstr " 予め宣言されたメールサーバの別名:" -#: fetchmail.c:1979 +#: fetchmail.c:2010 msgid " Local domains:" msgstr " ローカルドメイン:" -#: fetchmail.c:1989 +#: fetchmail.c:2020 #, c-format msgid " Connection must be through interface %s.\n" msgstr " 接続はインターフェイス %s を通して行われます。\n" -#: fetchmail.c:1991 +#: fetchmail.c:2022 msgid " No interface requirement specified.\n" msgstr " 接続に利用すべきインターフェイスの指定はありません。\n" -#: fetchmail.c:1993 +#: fetchmail.c:2024 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " 接続は %s の状態を監視して行われます。\n" -#: fetchmail.c:1995 +#: fetchmail.c:2026 msgid " No monitor interface specified.\n" msgstr " 状態を監視して接続はおこないません。\n" -#: fetchmail.c:1999 +#: fetchmail.c:2030 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " サーバとの接続にはプラグイン \"%s\" を利用します。(--plugin %s)\n" -#: fetchmail.c:2001 +#: fetchmail.c:2032 msgid " No plugin command specified.\n" msgstr " サーバとの接続に利用するプラグインの指定はありません。\n" -#: fetchmail.c:2003 +#: fetchmail.c:2034 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " アプリケーションとの接続にはプラグアウト\"%s\"を利用します。(--plugout %s)\n" -#: fetchmail.c:2005 +#: fetchmail.c:2036 msgid " No plugout command specified.\n" msgstr " アプリケーションとの接続に利用するプラグアウトの指定はありません。\n" -#: fetchmail.c:2012 +#: fetchmail.c:2043 msgid " No UIDs saved from this host.\n" msgstr " このホストからの UID は記録されていません。\n" -#: fetchmail.c:2015 +#: fetchmail.c:2046 #, c-format msgid " %d UIDs saved.\n" msgstr " %d 個の UID が記録されています。\n" -#: fetchmail.c:2021 +#: fetchmail.c:2052 msgid " Poll trace information will be added to the Received header.\n" msgstr " 接続情報は Received ヘッダに追加されます。\n" -#: fetchmail.c:2023 +#: fetchmail.c:2054 msgid " No poll trace information will be added to the Received header.\n" msgstr " Poll 追跡情報は Received ヘッダに追加されません。\n" -#: fetchmail.c:2028 +#: fetchmail.c:2059 msgid " Messages with bad headers will be rejected.\n" msgstr " 不良ヘッダを持つメッセージを拒否します。\n" -#: fetchmail.c:2031 +#: fetchmail.c:2062 msgid " Messages with bad headers will be passed on.\n" msgstr " 不良ヘッダを持つメッセージを受け入れます。\n" -#: fetchmail.c:2036 +#: fetchmail.c:2067 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " プロパティ \"%s\" は無視されます。\n" @@ -2402,47 +2402,47 @@ msgid "Option --folder is not supported with POP3\n" msgstr "POP3 では --folder オプションは利用できません。\n" -#: rcfile_y.y:132 +#: rcfile_y.y:130 msgid "server option after user options" msgstr "サーバオプションはユーザオプションの後で設定します" -#: rcfile_y.y:175 +#: rcfile_y.y:173 msgid "SDPS not enabled." msgstr "SDPS は利用できません。" -#: rcfile_y.y:219 +#: rcfile_y.y:217 msgid "" "fetchmail: interface option is only supported under Linux (without IPv6) and " "FreeBSD\n" msgstr "" "fetchmail: interface オプションは Linux (IPv6 は利用できません) とFreeBSD のみで利用可能です。\n" -#: rcfile_y.y:227 +#: rcfile_y.y:225 msgid "" "fetchmail: monitor option is only supported under Linux (without IPv6) and " "FreeBSD\n" msgstr "" "fetchmail: monitor オプションは Linux (IPv6 は利用できません) とFreeBSD のみで利用可能です。\n" -#: rcfile_y.y:341 +#: rcfile_y.y:339 msgid "SSL is not enabled" msgstr "SSL が有効になっていません" -#: rcfile_y.y:393 +#: rcfile_y.y:391 msgid "end of input" msgstr "入力の終端" -#: rcfile_y.y:431 +#: rcfile_y.y:429 #, c-format msgid "File %s must be a regular file.\n" msgstr "%s は通常ファイルである必要があります（シンボリックリンクであってはいけません）。\n" -#: rcfile_y.y:441 +#: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "ファイル %s のパーミッションは -rwx------ (0700) でないといけません。\n" -#: rcfile_y.y:453 +#: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "%s の所有者は貴方自身である必要があります。\n" @@ -2824,80 +2824,80 @@ msgid "smtp listener protocol error\n" msgstr "SMTP リスナでプロトコルエラーが発生しました\n" -#: socket.c:111 socket.c:140 +#: socket.c:112 socket.c:141 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc ができませんでした。\n" -#: socket.c:172 +#: socket.c:173 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair に失敗しました。\n" -#: socket.c:178 +#: socket.c:179 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork できませんでした。\n" -#: socket.c:185 +#: socket.c:186 msgid "dup2 failed\n" msgstr "dup2 ができませんでした。\n" -#: socket.c:191 +#: socket.c:192 #, c-format msgid "running %s (host %s service %s)\n" msgstr "%s を実行中です。(ホスト %s サービス %s)\n" -#: socket.c:196 +#: socket.c:197 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) ができませんでした。\n" -#: socket.c:271 +#: socket.c:272 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\") エラー: %s\n" -#: socket.c:274 +#: socket.c:275 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "オプション --service を足して試してください(FAQ の R12 も参照のこと)。\n" -#: socket.c:288 socket.c:291 +#: socket.c:289 socket.c:292 #, c-format msgid "unknown (%s)" msgstr "不明 (%s)" -#: socket.c:294 +#: socket.c:295 #, c-format msgid "Trying to connect to %s/%s..." msgstr "%s/%s へ接続しようとしています..." -#: socket.c:303 +#: socket.c:304 #, c-format msgid "cannot create socket: %s\n" msgstr "ソケット %s を作成できません\n" -#: socket.c:305 +#: socket.c:306 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "名前 %d: ソケットファミリー %d タイプ %d を作成できません: %s\n" -#: socket.c:323 +#: socket.c:324 msgid "connection failed.\n" msgstr "接続に失敗しました。\n" -#: socket.c:325 +#: socket.c:326 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "%s:%s への接続に失敗しました。バッファ [%s/%s] : %s\n" -#: socket.c:326 +#: socket.c:327 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "名前 %d: %s:%s [%s/%s] への接続を開けません: %s\n" -#: socket.c:332 +#: socket.c:333 msgid "connected.\n" msgstr "接続しました。\n" -#: socket.c:345 +#: socket.c:346 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2906,128 +2906,128 @@ "今回の問い合わせで接続エラーが発生しました:\n" "%s" -#: socket.c:411 +#: socket.c:416 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL からの報告: %s\n" -#: socket.c:652 +#: socket.c:657 msgid "Server certificate:\n" msgstr "サーバ証明書:\n" -#: socket.c:657 +#: socket.c:662 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "root から peer への証明パスで深さ %d で始まっています\n" -#: socket.c:660 +#: socket.c:665 #, c-format msgid "Certificate at depth %d:\n" msgstr "深さ%d での証明書:\n" -#: socket.c:666 +#: socket.c:671 #, c-format msgid "Issuer Organization: %s\n" msgstr "発行元の組織: %s\n" -#: socket.c:669 +#: socket.c:674 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "警告 : 発行元の組織名が長過ぎます。(捏造された可能性があります)\n" -#: socket.c:671 +#: socket.c:676 msgid "Unknown Organization\n" msgstr "不明な組織です。\n" -#: socket.c:673 +#: socket.c:678 #, c-format msgid "Issuer CommonName: %s\n" msgstr "発行元の CommonName: %s\n" -#: socket.c:676 +#: socket.c:681 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "警告 : 発行元の CommonName が長過ぎます。 (捏造された可能性があります)\n" -#: socket.c:678 +#: socket.c:683 msgid "Unknown Issuer CommonName\n" msgstr "不明な発行元の CommonName です。\n" -#: socket.c:684 +#: socket.c:689 #, c-format msgid "Subject CommonName: %s\n" msgstr "Subject CommonName: %s\n" -#: socket.c:690 +#: socket.c:695 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "不正証明書 : Subject CommonName が長過ぎます。\n" -#: socket.c:696 +#: socket.c:701 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "不正証明書 : Subject CommonName が NUL を含んでいます。中止します。\n" -#: socket.c:724 +#: socket.c:729 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "サブジェクトの別名: %s\n" -#: socket.c:730 +#: socket.c:735 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "不正証明書 : サブジェクトの別名 が NUL を含んでいます。中止します。\n" -#: socket.c:747 +#: socket.c:752 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "サーバの CommonName が一致しません : %s != %s\n" -#: socket.c:754 +#: socket.c:759 msgid "Server name not set, could not verify certificate!\n" msgstr "サーバ名が設定されておらず、証明書を検証できません。\n" -#: socket.c:759 +#: socket.c:764 msgid "Unknown Server CommonName\n" msgstr "不明なサーバの CommonName です。\n" -#: socket.c:761 +#: socket.c:766 msgid "Server name not specified in certificate!\n" msgstr "証明書中にサーバ名が指定されていません。\n" -#: socket.c:773 +#: socket.c:778 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() ができませんでした。\n" -#: socket.c:777 +#: socket.c:782 msgid "Out of memory!\n" msgstr "メモリ不足です。\n" -#: socket.c:785 +#: socket.c:790 msgid "Digest text buffer too small!\n" msgstr "ダイジェストテキストバッファが少な過ぎます。\n" -#: socket.c:791 +#: socket.c:796 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s の key fingerprint は次の通りです。: %s\n" -#: socket.c:795 +#: socket.c:800 #, c-format msgid "%s fingerprints match.\n" msgstr "%s の fingerprints が一致しました。\n" -#: socket.c:797 +#: socket.c:802 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s の fingerprints が一致しませんでした。\n" -#: socket.c:809 +#: socket.c:814 #, c-format msgid "Server certificate verification error: %s\n" msgstr "サーバ証明書検証エラー: %s\n" -#: socket.c:824 +#: socket.c:829 #, c-format msgid "Broken certification chain at: %s\n" msgstr "証明パスが %s で壊れています\n" -#: socket.c:826 +#: socket.c:831 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 " @@ -3037,7 +3037,7 @@ "このエラーは、サーバが中間CAの証明書を提供しなかったことを意味し、fetchmail はどうすることもできません。詳しくは fetchmail " "に同梱されているドキュメント README.SSL-SERVER を参照してください。\n" -#: socket.c:836 +#: socket.c:841 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "トラストアンカー証明書がありません: %s\n" @@ -3053,7 +3053,7 @@ "を走らせる必要があることを示しています。詳しくは、マニュアルページの --sslcertpath と --sslcertfile " "についての記述を参照してください。\n" -#: socket.c:1100 +#: socket.c:1106 msgid "File descriptor out of range for SSL" msgstr "ファイル識別子が SSL としては長過ぎます" @@ -3066,21 +3066,21 @@ msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n" msgstr "無効な SSL プロトコル `%s' が指定されたため、デフォルト (SSLv23)を利用します。\n" -#: socket.c:1274 +#: socket.c:1280 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "証明書/fingerprint 検証が幾つか飛ばされました。\n" -#: socket.c:1291 +#: socket.c:1297 msgid "" "Warning: the connection is insecure, continuing anyways. (Better use --" "sslcertck!)\n" msgstr "警告:接続は保護されていません、続けます。(--sslcertckの使用をお勧めします!)\n" -#: socket.c:1333 +#: socket.c:1339 msgid "Cygwin socket read retry\n" msgstr "Cygwin ソケット読み込み リトライ\n" -#: socket.c:1336 +#: socket.c:1342 msgid "Cygwin socket read retry failed!\n" msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n" @@ -3199,7 +3199,7 @@ msgid "Old UID list from %s:" msgstr "サーバ %s からの古い UID リスト :" -#: uid.c:266 uid.c:275 uid.c:343 +#: uid.c:277 uid.c:286 uid.c:355 msgid " " msgstr " <ありません>" @@ -3221,43 +3221,43 @@ msgid "swapping UID lists\n" msgstr "UID リストを交換しています。\n" -#: uid.c:390 +#: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" msgstr "UID リストを交換しません。この交信に対する UID はありません\n" -#: uid.c:410 +#: uid.c:422 msgid "discarding new UID list\n" msgstr "UID リストを交換しています。\n" -#: uid.c:467 +#: uid.c:479 msgid "Deleting fetchids file.\n" msgstr "fetchids ファイルを削除しています。\n" -#: uid.c:470 +#: uid.c:482 #, c-format msgid "Error deleting %s: %s\n" msgstr "エラーです。削除しています %s: %s\n" -#: uid.c:477 +#: uid.c:489 msgid "Writing fetchids file.\n" msgstr "fetchids ファイルを書き込み中です。\n" -#: uid.c:491 uid.c:500 +#: uid.c:503 uid.c:512 #, c-format msgid "Write error on fetchids file %s: %s\n" msgstr "fetchids ファイル %s を書き込み中にエラーが発生しました:%s\n" -#: uid.c:512 +#: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" msgstr "fetchids ファイル %s の書込みでエラーが発生しました。古いファイルが残っています。\n" -#: uid.c:516 +#: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" msgstr "fetchids ファイルの名前を変更できません。%s から %sへ: %s\n" -#: uid.c:520 +#: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" msgstr "fetchids ファイル %s を書込みのために開こうとしましたができませんでした: %s\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/friendly-recovery.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/friendly-recovery.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/friendly-recovery.po 2020-01-23 16:51:36.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/friendly-recovery.po 2020-07-08 13:53:33.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: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gas.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gas.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gas.po 2020-01-23 16:51:30.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gas.po 2020-07-08 13:53: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: 2020-01-23 10:36+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -174,7 +174,7 @@ " --size-check=[error|warning]\n" "\t\t\t ELF .size 指示を検査する (デフォルト --size-check=error)\n" -#: as.c:303 +#: as.c:302 #, c-format msgid "" " --elf-stt-common=[no|yes]\n" @@ -421,7 +421,7 @@ msgid "GNU assembler %s\n" msgstr "GNU アセンブラ %s\n" -#: as.c:673 +#: as.c:659 #, c-format msgid "Copyright (C) 2018 Free Software Foundation, Inc.\n" msgstr "" @@ -1925,7 +1925,7 @@ msgid "selected processor does not support `%s'" msgstr "" -#: config/tc-aarch64.c:7544 config/tc-arm.c:27479 +#: config/tc-aarch64.c:7544 config/tc-arm.c:27481 msgid "GOT already in the symbol table" msgstr "" @@ -1951,8 +1951,8 @@ msgid "immediate offset out of range" msgstr "" -#: config/tc-aarch64.c:7953 config/tc-arm.c:27817 config/tc-arm.c:27885 -#: config/tc-arm.c:28167 +#: config/tc-aarch64.c:7953 config/tc-arm.c:27819 config/tc-arm.c:27887 +#: config/tc-arm.c:28169 #, c-format msgid "undefined symbol %s used as an immediate value" msgstr "" @@ -1973,7 +1973,7 @@ msgid "conditional branch target not word aligned" msgstr "" -#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28462 +#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28464 msgid "conditional branch out of range" msgstr "" @@ -1981,14 +1981,14 @@ msgid "branch target not word aligned" msgstr "" -#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29265 +#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29267 #: config/tc-mips.c:16047 config/tc-mips.c:16063 config/tc-mips.c:16153 msgid "branch out of range" msgstr "" -#: config/tc-aarch64.c:8085 config/tc-arm.c:28058 config/tc-arm.c:28073 -#: config/tc-arm.c:28088 config/tc-arm.c:28099 config/tc-arm.c:28122 -#: config/tc-arm.c:28969 config/tc-moxie.c:716 config/tc-pj.c:452 +#: config/tc-aarch64.c:8085 config/tc-arm.c:28060 config/tc-arm.c:28075 +#: config/tc-arm.c:28090 config/tc-arm.c:28101 config/tc-arm.c:28124 +#: config/tc-arm.c:28971 config/tc-moxie.c:716 config/tc-pj.c:452 #: config/tc-sh.c:3727 msgid "offset out of range" msgstr "" @@ -2006,7 +2006,7 @@ msgid "unexpected %s fixup" msgstr "" -#: config/tc-aarch64.c:8327 config/tc-arm.c:29685 config/tc-arm.c:29706 +#: config/tc-aarch64.c:8327 config/tc-arm.c:29687 config/tc-arm.c:29708 #: config/tc-mips.c:18414 config/tc-or1k.c:345 config/tc-score.c:7468 #, c-format msgid "cannot represent %s relocation in this object file format" @@ -2017,16 +2017,16 @@ msgid "cannot do %u-byte relocation" msgstr "" -#: config/tc-aarch64.c:8683 config/tc-arm.c:30180 config/tc-score.c:6293 +#: 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:8849 config/tc-arm.c:30523 +#: config/tc-aarch64.c:8849 config/tc-arm.c:30525 msgid "assemble for big-endian" msgstr "" -#: config/tc-aarch64.c:8850 config/tc-arm.c:30524 +#: config/tc-aarch64.c:8850 config/tc-arm.c:30526 msgid "assemble for little-endian" msgstr "" @@ -2042,41 +2042,41 @@ msgid "do not output verbose error messages" msgstr "" -#: config/tc-aarch64.c:9137 config/tc-arm.c:31607 +#: config/tc-aarch64.c:9137 config/tc-arm.c:31611 msgid "invalid architectural extension" msgstr "" -#: config/tc-aarch64.c:9162 config/tc-arm.c:31639 +#: config/tc-aarch64.c:9162 config/tc-arm.c:31643 msgid "must specify extensions to add before specifying those to remove" msgstr "" -#: config/tc-aarch64.c:9170 config/tc-arm.c:31647 +#: config/tc-aarch64.c:9170 config/tc-arm.c:31651 msgid "missing architectural extension" msgstr "" -#: config/tc-aarch64.c:9197 config/tc-arm.c:31733 +#: config/tc-aarch64.c:9197 config/tc-arm.c:31737 #, c-format msgid "unknown architectural extension `%s'" msgstr "" -#: config/tc-aarch64.c:9221 config/tc-arm.c:31783 config/tc-metag.c:5834 +#: config/tc-aarch64.c:9221 config/tc-arm.c:31787 config/tc-metag.c:5834 #, c-format msgid "missing cpu name `%s'" msgstr "" -#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31818 -#: config/tc-arm.c:32617 config/tc-csky.c:896 config/tc-metag.c:5845 +#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31822 +#: config/tc-arm.c:32621 config/tc-csky.c:896 config/tc-metag.c:5845 #, c-format msgid "unknown cpu `%s'" msgstr "" -#: config/tc-aarch64.c:9253 config/tc-arm.c:31836 +#: config/tc-aarch64.c:9253 config/tc-arm.c:31840 #, c-format msgid "missing architecture name `%s'" msgstr "" -#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31858 -#: config/tc-arm.c:32652 config/tc-arm.c:32682 config/tc-score.c:7703 +#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31862 +#: config/tc-arm.c:32656 config/tc-arm.c:32686 config/tc-score.c:7703 #, c-format msgid "unknown architecture `%s'\n" msgstr "" @@ -2095,16 +2095,16 @@ msgid "\t specify for ABI " msgstr "" -#: config/tc-aarch64.c:9310 config/tc-arm.c:31945 config/tc-metag.c:5911 +#: config/tc-aarch64.c:9310 config/tc-arm.c:31949 config/tc-metag.c:5911 msgid "\t assemble for CPU " msgstr "" -#: config/tc-aarch64.c:9312 config/tc-arm.c:31947 +#: config/tc-aarch64.c:9312 config/tc-arm.c:31951 msgid "\t assemble for architecture " msgstr "" -#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32015 -#: config/tc-arm.c:32033 config/tc-arm.c:32053 config/tc-metag.c:5936 +#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32019 +#: config/tc-arm.c:32037 config/tc-arm.c:32057 config/tc-metag.c:5936 #, c-format msgid "option `-%c%s' is deprecated: %s" msgstr "" @@ -2114,12 +2114,12 @@ msgid " AArch64-specific assembler options:\n" msgstr "" -#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32084 +#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32088 #, c-format msgid " -EB assemble code for a big-endian cpu\n" msgstr "" -#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32089 +#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32093 #, c-format msgid " -EL assemble code for a little-endian cpu\n" msgstr "" @@ -3476,7 +3476,7 @@ #: config/tc-arm.c:12139 config/tc-arm.c:14259 config/tc-arm.c:16192 #: config/tc-arm.c:16227 config/tc-arm.c:17155 config/tc-arm.c:19082 #: config/tc-arm.c:19090 config/tc-arm.c:19097 config/tc-arm.c:20739 -#: config/tc-arm.c:28846 config/tc-arm.c:28910 config/tc-arm.c:28918 +#: config/tc-arm.c:28848 config/tc-arm.c:28912 config/tc-arm.c:28920 #: config/tc-metag.c:5176 config/tc-z8k.c:1151 config/tc-z8k.c:1161 msgid "immediate value out of range" msgstr "" @@ -3897,7 +3897,7 @@ msgid "shift by register not allowed in thumb mode" msgstr "" -#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28140 +#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28142 msgid "shift expression is too large" msgstr "" @@ -4138,7 +4138,7 @@ msgid "operand size must match register width" msgstr "" -#: config/tc-arm.c:14158 +#: config/tc-arm.c:14139 msgid "bad type in Neon instruction" msgstr "" @@ -4402,580 +4402,580 @@ msgid "file finished with an open IT block." msgstr "" -#: config/tc-arm.c:26787 +#: config/tc-arm.c:26789 #, c-format msgid "alignments greater than %d bytes not supported in .text sections." msgstr "" -#: config/tc-arm.c:27054 config/tc-ia64.c:3594 +#: config/tc-arm.c:27056 config/tc-ia64.c:3594 #, c-format msgid "Group section `%s' has no group signature" msgstr "" -#: config/tc-arm.c:27100 +#: config/tc-arm.c:27102 msgid "handlerdata in cantunwind frame" msgstr "" -#: config/tc-arm.c:27117 +#: config/tc-arm.c:27119 msgid "too many unwind opcodes for personality routine 0" msgstr "" -#: config/tc-arm.c:27148 +#: config/tc-arm.c:27150 msgid "attempt to recreate an unwind entry" msgstr "" -#: config/tc-arm.c:27158 +#: config/tc-arm.c:27160 msgid "too many unwind opcodes" msgstr "" -#: config/tc-arm.c:27457 +#: config/tc-arm.c:27459 #, c-format msgid "[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s" msgstr "" -#: config/tc-arm.c:27819 config/tc-arm.c:27887 +#: config/tc-arm.c:27821 config/tc-arm.c:27889 #, c-format msgid "symbol %s is in a different section" msgstr "" -#: config/tc-arm.c:27821 config/tc-arm.c:27889 +#: config/tc-arm.c:27823 config/tc-arm.c:27891 #, c-format msgid "symbol %s is weak and may be overridden later" msgstr "" -#: config/tc-arm.c:27866 config/tc-arm.c:28238 +#: config/tc-arm.c:27868 config/tc-arm.c:28240 #, c-format msgid "invalid constant (%lx) after fixup" msgstr "" -#: config/tc-arm.c:27922 +#: config/tc-arm.c:27924 #, c-format msgid "unable to compute ADRL instructions for PC offset of 0x%lx" msgstr "" -#: config/tc-arm.c:27958 config/tc-arm.c:27988 +#: config/tc-arm.c:27960 config/tc-arm.c:27990 msgid "invalid literal constant: pool needs to be closer" msgstr "" -#: config/tc-arm.c:27961 config/tc-arm.c:28010 +#: config/tc-arm.c:27963 config/tc-arm.c:28012 #, c-format msgid "bad immediate value for offset (%ld)" msgstr "" -#: config/tc-arm.c:27991 +#: config/tc-arm.c:27993 #, c-format msgid "bad immediate value for 8-bit offset (%ld)" msgstr "" -#: config/tc-arm.c:28051 +#: config/tc-arm.c:28053 msgid "offset not a multiple of 4" msgstr "" -#: config/tc-arm.c:28254 +#: config/tc-arm.c:28256 msgid "invalid smc expression" msgstr "" -#: config/tc-arm.c:28264 +#: config/tc-arm.c:28266 msgid "invalid hvc expression" msgstr "" -#: config/tc-arm.c:28275 config/tc-arm.c:28284 +#: config/tc-arm.c:28277 config/tc-arm.c:28286 msgid "invalid swi expression" msgstr "" -#: config/tc-arm.c:28294 +#: config/tc-arm.c:28296 msgid "invalid expression in load/store multiple" msgstr "" -#: config/tc-arm.c:28356 +#: config/tc-arm.c:28358 #, c-format msgid "blx to '%s' an ARM ISA state function changed to bl" msgstr "" -#: config/tc-arm.c:28375 +#: config/tc-arm.c:28377 msgid "misaligned branch destination" msgstr "" -#: config/tc-arm.c:28496 +#: config/tc-arm.c:28498 #, c-format msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl" msgstr "" -#: config/tc-arm.c:28545 +#: config/tc-arm.c:28547 msgid "Thumb2 branch out of range" msgstr "" -#: config/tc-arm.c:28660 +#: config/tc-arm.c:28662 msgid "rel31 relocation overflow" msgstr "" -#: config/tc-arm.c:28682 config/tc-arm.c:28688 config/tc-arm.c:28692 -#: config/tc-arm.c:28739 +#: config/tc-arm.c:28684 config/tc-arm.c:28690 config/tc-arm.c:28694 +#: config/tc-arm.c:28741 msgid "co-processor offset out of range" msgstr "" -#: config/tc-arm.c:28756 +#: config/tc-arm.c:28758 #, c-format msgid "invalid offset, target not word aligned (0x%08lX)" msgstr "" -#: config/tc-arm.c:28763 config/tc-arm.c:28772 config/tc-arm.c:28780 -#: config/tc-arm.c:28788 config/tc-arm.c:28796 +#: config/tc-arm.c:28765 config/tc-arm.c:28774 config/tc-arm.c:28782 +#: config/tc-arm.c:28790 config/tc-arm.c:28798 #, c-format msgid "invalid offset, value too big (0x%08lX)" msgstr "" -#: config/tc-arm.c:28837 +#: config/tc-arm.c:28839 msgid "invalid Hi register with immediate" msgstr "" -#: config/tc-arm.c:28853 +#: config/tc-arm.c:28855 msgid "invalid immediate for stack address calculation" msgstr "" -#: config/tc-arm.c:28872 +#: config/tc-arm.c:28874 msgid "address calculation needs a strongly defined nearby symbol" msgstr "" -#: config/tc-arm.c:28888 +#: config/tc-arm.c:28890 msgid "symbol too far away" msgstr "" -#: config/tc-arm.c:28900 +#: config/tc-arm.c:28902 #, c-format msgid "invalid immediate for address calculation (value = 0x%08lX)" msgstr "" -#: config/tc-arm.c:28930 +#: config/tc-arm.c:28932 #, c-format msgid "invalid immediate: %ld is out of range" msgstr "" -#: config/tc-arm.c:28942 +#: config/tc-arm.c:28944 #, c-format msgid "invalid shift value: %ld" msgstr "" -#: config/tc-arm.c:29012 config/tc-arm.c:29083 +#: config/tc-arm.c:29014 config/tc-arm.c:29085 #, c-format msgid "the offset 0x%08lX is not representable" msgstr "" -#: config/tc-arm.c:29044 +#: config/tc-arm.c:29046 #, c-format msgid "Unable to process relocation for thumb opcode: %lx" msgstr "" -#: config/tc-arm.c:29123 +#: config/tc-arm.c:29125 #, c-format msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)" msgstr "" -#: config/tc-arm.c:29162 +#: config/tc-arm.c:29164 #, c-format msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)" msgstr "" -#: config/tc-arm.c:29202 +#: config/tc-arm.c:29204 #, c-format msgid "bad offset 0x%08lX (must be word-aligned)" msgstr "" -#: config/tc-arm.c:29207 +#: config/tc-arm.c:29209 #, c-format msgid "bad offset 0x%08lX (must be an 8-bit number of words)" msgstr "" -#: config/tc-arm.c:29428 config/tc-score.c:7379 +#: config/tc-arm.c:29430 config/tc-score.c:7379 #, c-format msgid "bad relocation fixup type (%d)" msgstr "" -#: config/tc-arm.c:29546 +#: config/tc-arm.c:29548 msgid "literal referenced across section boundary" msgstr "" -#: config/tc-arm.c:29626 +#: config/tc-arm.c:29628 msgid "internal relocation (type: IMMEDIATE) not fixed up" msgstr "" -#: config/tc-arm.c:29631 +#: config/tc-arm.c:29633 msgid "ADRL used for a symbol not defined in the same file" msgstr "" -#: config/tc-arm.c:29654 +#: config/tc-arm.c:29656 #, c-format msgid "undefined local label `%s'" msgstr "" -#: config/tc-arm.c:29660 +#: config/tc-arm.c:29662 msgid "internal_relocation (type: OFFSET_IMM) not fixed up" msgstr "" -#: config/tc-arm.c:29682 config/tc-cris.c:4006 config/tc-csky.c:877 +#: config/tc-arm.c:29684 config/tc-cris.c:4006 config/tc-csky.c:877 #: config/tc-ft32.c:709 config/tc-mcore.c:1928 config/tc-microblaze.c:1995 #: config/tc-mmix.c:2894 config/tc-moxie.c:825 config/tc-ns32k.c:2248 #: config/tc-score.c:7466 msgid "" msgstr "" -#: config/tc-arm.c:30084 +#: config/tc-arm.c:30086 #, c-format msgid "%s: unexpected function type: %d" msgstr "" -#: config/tc-arm.c:30224 +#: config/tc-arm.c:30226 msgid "use of old and new-style options to set CPU type" msgstr "" -#: config/tc-arm.c:30243 +#: config/tc-arm.c:30245 msgid "use of old and new-style options to set FPU type" msgstr "" -#: config/tc-arm.c:30322 +#: config/tc-arm.c:30324 msgid "hard-float conflicts with specified fpu" msgstr "" -#: config/tc-arm.c:30513 +#: config/tc-arm.c:30515 msgid "generate PIC code" msgstr "" -#: config/tc-arm.c:30514 +#: config/tc-arm.c:30516 msgid "assemble Thumb code" msgstr "" -#: config/tc-arm.c:30515 +#: config/tc-arm.c:30517 msgid "support ARM/Thumb interworking" msgstr "" -#: config/tc-arm.c:30517 +#: config/tc-arm.c:30519 msgid "code uses 32-bit program counter" msgstr "" -#: config/tc-arm.c:30518 +#: config/tc-arm.c:30520 msgid "code uses 26-bit program counter" msgstr "" -#: config/tc-arm.c:30519 +#: config/tc-arm.c:30521 msgid "floating point args are in fp regs" msgstr "" -#: config/tc-arm.c:30521 +#: config/tc-arm.c:30523 msgid "re-entrant code" msgstr "" -#: config/tc-arm.c:30522 +#: config/tc-arm.c:30524 msgid "code is ATPCS conformant" msgstr "" #. These are recognized by the assembler, but have no affect on code. -#: config/tc-arm.c:30528 +#: config/tc-arm.c:30530 msgid "use frame pointer" msgstr "" -#: config/tc-arm.c:30529 +#: config/tc-arm.c:30531 msgid "use stack size checking" msgstr "" -#: config/tc-arm.c:30532 +#: config/tc-arm.c:30534 msgid "do not warn on use of deprecated feature" msgstr "" -#: config/tc-arm.c:30539 +#: config/tc-arm.c:30541 msgid "warn about symbols that match instruction names [default]" msgstr "" -#: config/tc-arm.c:30540 +#: config/tc-arm.c:30542 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:30556 config/tc-arm.c:30557 +#: config/tc-arm.c:30558 config/tc-arm.c:30559 msgid "use -mcpu=arm1" msgstr "" -#: config/tc-arm.c:30558 config/tc-arm.c:30559 +#: config/tc-arm.c:30560 config/tc-arm.c:30561 msgid "use -mcpu=arm2" msgstr "" -#: config/tc-arm.c:30560 config/tc-arm.c:30561 +#: config/tc-arm.c:30562 config/tc-arm.c:30563 msgid "use -mcpu=arm250" msgstr "" -#: config/tc-arm.c:30562 config/tc-arm.c:30563 +#: config/tc-arm.c:30564 config/tc-arm.c:30565 msgid "use -mcpu=arm3" msgstr "" -#: config/tc-arm.c:30564 config/tc-arm.c:30565 +#: config/tc-arm.c:30566 config/tc-arm.c:30567 msgid "use -mcpu=arm6" msgstr "" -#: config/tc-arm.c:30566 config/tc-arm.c:30567 +#: config/tc-arm.c:30568 config/tc-arm.c:30569 msgid "use -mcpu=arm600" msgstr "" -#: config/tc-arm.c:30568 config/tc-arm.c:30569 +#: config/tc-arm.c:30570 config/tc-arm.c:30571 msgid "use -mcpu=arm610" msgstr "" -#: config/tc-arm.c:30570 config/tc-arm.c:30571 +#: config/tc-arm.c:30572 config/tc-arm.c:30573 msgid "use -mcpu=arm620" msgstr "" -#: config/tc-arm.c:30572 config/tc-arm.c:30573 +#: config/tc-arm.c:30574 config/tc-arm.c:30575 msgid "use -mcpu=arm7" msgstr "" -#: config/tc-arm.c:30574 config/tc-arm.c:30575 +#: config/tc-arm.c:30576 config/tc-arm.c:30577 msgid "use -mcpu=arm70" msgstr "" -#: config/tc-arm.c:30576 config/tc-arm.c:30577 +#: config/tc-arm.c:30578 config/tc-arm.c:30579 msgid "use -mcpu=arm700" msgstr "" -#: config/tc-arm.c:30578 config/tc-arm.c:30579 +#: config/tc-arm.c:30580 config/tc-arm.c:30581 msgid "use -mcpu=arm700i" msgstr "" -#: config/tc-arm.c:30580 config/tc-arm.c:30581 +#: config/tc-arm.c:30582 config/tc-arm.c:30583 msgid "use -mcpu=arm710" msgstr "" -#: config/tc-arm.c:30582 config/tc-arm.c:30583 +#: config/tc-arm.c:30584 config/tc-arm.c:30585 msgid "use -mcpu=arm710c" msgstr "" -#: config/tc-arm.c:30584 config/tc-arm.c:30585 +#: config/tc-arm.c:30586 config/tc-arm.c:30587 msgid "use -mcpu=arm720" msgstr "" -#: config/tc-arm.c:30586 config/tc-arm.c:30587 +#: config/tc-arm.c:30588 config/tc-arm.c:30589 msgid "use -mcpu=arm7d" msgstr "" -#: config/tc-arm.c:30588 config/tc-arm.c:30589 +#: config/tc-arm.c:30590 config/tc-arm.c:30591 msgid "use -mcpu=arm7di" msgstr "" -#: config/tc-arm.c:30590 config/tc-arm.c:30591 +#: config/tc-arm.c:30592 config/tc-arm.c:30593 msgid "use -mcpu=arm7m" msgstr "" -#: config/tc-arm.c:30592 config/tc-arm.c:30593 +#: config/tc-arm.c:30594 config/tc-arm.c:30595 msgid "use -mcpu=arm7dm" msgstr "" -#: config/tc-arm.c:30594 config/tc-arm.c:30595 +#: config/tc-arm.c:30596 config/tc-arm.c:30597 msgid "use -mcpu=arm7dmi" msgstr "" -#: config/tc-arm.c:30596 config/tc-arm.c:30597 +#: config/tc-arm.c:30598 config/tc-arm.c:30599 msgid "use -mcpu=arm7100" msgstr "" -#: config/tc-arm.c:30598 config/tc-arm.c:30599 +#: config/tc-arm.c:30600 config/tc-arm.c:30601 msgid "use -mcpu=arm7500" msgstr "" -#: config/tc-arm.c:30600 config/tc-arm.c:30601 +#: config/tc-arm.c:30602 config/tc-arm.c:30603 msgid "use -mcpu=arm7500fe" msgstr "" -#: config/tc-arm.c:30602 config/tc-arm.c:30603 config/tc-arm.c:30604 -#: config/tc-arm.c:30605 +#: config/tc-arm.c:30604 config/tc-arm.c:30605 config/tc-arm.c:30606 +#: config/tc-arm.c:30607 msgid "use -mcpu=arm7tdmi" msgstr "" -#: config/tc-arm.c:30606 config/tc-arm.c:30607 +#: config/tc-arm.c:30608 config/tc-arm.c:30609 msgid "use -mcpu=arm710t" msgstr "" -#: config/tc-arm.c:30608 config/tc-arm.c:30609 +#: config/tc-arm.c:30610 config/tc-arm.c:30611 msgid "use -mcpu=arm720t" msgstr "" -#: config/tc-arm.c:30610 config/tc-arm.c:30611 +#: config/tc-arm.c:30612 config/tc-arm.c:30613 msgid "use -mcpu=arm740t" msgstr "" -#: config/tc-arm.c:30612 config/tc-arm.c:30613 +#: config/tc-arm.c:30614 config/tc-arm.c:30615 msgid "use -mcpu=arm8" msgstr "" -#: config/tc-arm.c:30614 config/tc-arm.c:30615 +#: config/tc-arm.c:30616 config/tc-arm.c:30617 msgid "use -mcpu=arm810" msgstr "" -#: config/tc-arm.c:30616 config/tc-arm.c:30617 +#: config/tc-arm.c:30618 config/tc-arm.c:30619 msgid "use -mcpu=arm9" msgstr "" -#: config/tc-arm.c:30618 config/tc-arm.c:30619 +#: config/tc-arm.c:30620 config/tc-arm.c:30621 msgid "use -mcpu=arm9tdmi" msgstr "" -#: config/tc-arm.c:30620 config/tc-arm.c:30621 +#: config/tc-arm.c:30622 config/tc-arm.c:30623 msgid "use -mcpu=arm920" msgstr "" -#: config/tc-arm.c:30622 config/tc-arm.c:30623 +#: config/tc-arm.c:30624 config/tc-arm.c:30625 msgid "use -mcpu=arm940" msgstr "" -#: config/tc-arm.c:30624 +#: config/tc-arm.c:30626 msgid "use -mcpu=strongarm" msgstr "" -#: config/tc-arm.c:30626 +#: config/tc-arm.c:30628 msgid "use -mcpu=strongarm110" msgstr "" -#: config/tc-arm.c:30628 +#: config/tc-arm.c:30630 msgid "use -mcpu=strongarm1100" msgstr "" -#: config/tc-arm.c:30630 +#: config/tc-arm.c:30632 msgid "use -mcpu=strongarm1110" msgstr "" -#: config/tc-arm.c:30631 +#: config/tc-arm.c:30633 msgid "use -mcpu=xscale" msgstr "" -#: config/tc-arm.c:30632 +#: config/tc-arm.c:30634 msgid "use -mcpu=iwmmxt" msgstr "" -#: config/tc-arm.c:30633 +#: config/tc-arm.c:30635 msgid "use -mcpu=all" msgstr "" #. Architecture variants -- don't add any more to this list either. -#: config/tc-arm.c:30636 config/tc-arm.c:30637 +#: config/tc-arm.c:30638 config/tc-arm.c:30639 msgid "use -march=armv2" msgstr "" -#: config/tc-arm.c:30638 config/tc-arm.c:30639 +#: config/tc-arm.c:30640 config/tc-arm.c:30641 msgid "use -march=armv2a" msgstr "" -#: config/tc-arm.c:30640 config/tc-arm.c:30641 +#: config/tc-arm.c:30642 config/tc-arm.c:30643 msgid "use -march=armv3" msgstr "" -#: config/tc-arm.c:30642 config/tc-arm.c:30643 +#: config/tc-arm.c:30644 config/tc-arm.c:30645 msgid "use -march=armv3m" msgstr "" -#: config/tc-arm.c:30644 config/tc-arm.c:30645 +#: config/tc-arm.c:30646 config/tc-arm.c:30647 msgid "use -march=armv4" msgstr "" -#: config/tc-arm.c:30646 config/tc-arm.c:30647 +#: config/tc-arm.c:30648 config/tc-arm.c:30649 msgid "use -march=armv4t" msgstr "" -#: config/tc-arm.c:30648 config/tc-arm.c:30649 +#: config/tc-arm.c:30650 config/tc-arm.c:30651 msgid "use -march=armv5" msgstr "" -#: config/tc-arm.c:30650 config/tc-arm.c:30651 +#: config/tc-arm.c:30652 config/tc-arm.c:30653 msgid "use -march=armv5t" msgstr "" -#: config/tc-arm.c:30652 config/tc-arm.c:30653 +#: config/tc-arm.c:30654 config/tc-arm.c:30655 msgid "use -march=armv5te" msgstr "" #. Floating point variants -- don't add any more to this list either. -#: config/tc-arm.c:30656 +#: config/tc-arm.c:30658 msgid "use -mfpu=fpe" msgstr "" -#: config/tc-arm.c:30657 +#: config/tc-arm.c:30659 msgid "use -mfpu=fpa10" msgstr "" -#: config/tc-arm.c:30658 +#: config/tc-arm.c:30660 msgid "use -mfpu=fpa11" msgstr "" -#: config/tc-arm.c:30660 +#: config/tc-arm.c:30662 msgid "use either -mfpu=softfpa or -mfpu=softvfp" msgstr "" -#: config/tc-arm.c:31706 +#: config/tc-arm.c:31710 msgid "extension does not apply to the base architecture" msgstr "" -#: config/tc-arm.c:31735 +#: config/tc-arm.c:31739 msgid "architectural extensions must be specified in alphabetical order" msgstr "" -#: config/tc-arm.c:31874 config/tc-arm.c:32815 +#: config/tc-arm.c:31878 config/tc-arm.c:32819 #, c-format msgid "unknown floating point format `%s'\n" msgstr "" -#: config/tc-arm.c:31890 +#: config/tc-arm.c:31894 #, c-format msgid "unknown floating point abi `%s'\n" msgstr "" -#: config/tc-arm.c:31906 +#: config/tc-arm.c:31910 #, c-format msgid "unknown EABI `%s'\n" msgstr "" -#: config/tc-arm.c:31926 +#: config/tc-arm.c:31930 #, c-format msgid "" "unknown implicit IT mode `%s', should be arm, thumb, always, or never." msgstr "" -#: config/tc-arm.c:31949 config/tc-metag.c:5913 +#: config/tc-arm.c:31953 config/tc-metag.c:5913 msgid "\t assemble for FPU architecture " msgstr "" -#: config/tc-arm.c:31951 +#: config/tc-arm.c:31955 msgid "\t assemble for floating point ABI " msgstr "" -#: config/tc-arm.c:31954 +#: config/tc-arm.c:31958 msgid "\t\t assemble for eabi version " msgstr "" -#: config/tc-arm.c:31957 +#: config/tc-arm.c:31961 msgid "\t controls implicit insertion of IT instructions" msgstr "" -#: config/tc-arm.c:31959 +#: config/tc-arm.c:31963 msgid "\t\t\t TI CodeComposer Studio syntax compatibility mode" msgstr "" -#: config/tc-arm.c:32073 +#: config/tc-arm.c:32077 #, c-format msgid " ARM-specific assembler options:\n" msgstr "" -#: config/tc-arm.c:32093 +#: config/tc-arm.c:32097 #, c-format msgid " --fix-v4bx Allow BX in ARMv4 code\n" msgstr "" -#: config/tc-arm.c:32403 +#: config/tc-arm.c:32407 msgid "no architecture contains all the instructions used\n" msgstr "" -#: config/tc-arm.c:32755 +#: config/tc-arm.c:32759 #, c-format msgid "" "architectural extension `%s' is not allowed for the current base architecture" msgstr "" -#: config/tc-arm.c:32778 +#: config/tc-arm.c:32782 #, c-format msgid "unknown architecture extension `%s'\n" msgstr "" @@ -7196,7 +7196,7 @@ msgid "Internal assembler error for macro %s" msgstr "" -#: config/tc-ppc.c:2141 +#: config/tc-i370.c:629 config/tc-ppc.c:2129 msgid "identifier+constant@got means identifier@got+constant" msgstr "" @@ -7436,7 +7436,7 @@ msgid "cannot do %s %u byte relocation" msgstr "" -#: config/tc-i386.c:3838 config/tc-i386.c:3865 +#: config/tc-i386.c:3549 config/tc-i386.c:3576 #, c-format msgid "can't use register '%s%s' as operand %d in '%s'." msgstr "" @@ -7497,7 +7497,7 @@ msgid "translating to `%sp'" msgstr "" -#: config/tc-i386.c:4291 +#: config/tc-i386.c:3854 #, c-format msgid "instruction `%s' isn't supported in 16-bit mode." msgstr "" @@ -7647,7 +7647,7 @@ msgid "unsupported broadcast" msgstr "" -#: config/tc-i386.c:5687 +#: config/tc-i386.c:5282 msgid "broadcast not on source memory operand" msgstr "" @@ -7701,7 +7701,7 @@ msgid "stand-alone `%s' prefix" msgstr "" -#: config/tc-i386.c:6199 config/tc-i386.c:6215 +#: config/tc-i386.c:5362 config/tc-i386.c:5378 #, c-format msgid "`%s' operand %d must use `%ses' segment" msgstr "" @@ -7746,7 +7746,7 @@ "`%s%.3s%d' source group in `%s'" msgstr "" -#: config/tc-i386.c:6817 +#: config/tc-i386.c:6139 #, c-format msgid "you can't `pop %scs'" msgstr "" @@ -7768,7 +7768,7 @@ msgid "segment override on `%s' is ineffectual" msgstr "" -#: config/tc-i386.c:7837 config/tc-i386.c:7978 config/tc-i386.c:8042 +#: config/tc-i386.c:6975 config/tc-i386.c:7076 config/tc-i386.c:7131 msgid "skipping prefixes on this instruction" msgstr "" @@ -8049,7 +8049,7 @@ msgid "invalid -mrelax-relocations= option: `%s'" msgstr "" -#: config/tc-i386.c:11463 +#: config/tc-i386.c:10486 #, c-format msgid "" " -Q ignored\n" @@ -8112,7 +8112,7 @@ msgid " -msse2avx encode SSE instructions with VEX prefix\n" msgstr "" -#: config/tc-i386.c:10994 +#: config/tc-i386.c:10522 #, c-format msgid "" " -msse-check=[none|error|warning]\n" @@ -8121,14 +8121,14 @@ " -msse-check=[none|error|warning]\n" " SSE 命令を検査する\n" -#: config/tc-i386.c:10997 +#: config/tc-i386.c:10525 #, c-format msgid "" " -moperand-check=[none|error|warning]\n" " check operand combinations for validity\n" msgstr "" -#: config/tc-i386.c:11000 +#: config/tc-i386.c:10528 #, c-format msgid "" " -mavxscalar=[128|256] encode scalar AVX instructions with specific " @@ -8136,7 +8136,7 @@ " length\n" msgstr "" -#: config/tc-i386.c:11003 +#: config/tc-i386.c:10531 #, c-format msgid "" " -mevexlig=[128|256|512] encode scalar EVEX instructions with specific " @@ -8144,7 +8144,7 @@ " length\n" msgstr "" -#: config/tc-i386.c:11006 +#: config/tc-i386.c:10534 #, c-format msgid "" " -mevexwig=[0|1] encode EVEX instructions with specific EVEX.W " @@ -8152,7 +8152,7 @@ " for EVEX.W bit ignored instructions\n" msgstr "" -#: config/tc-i386.c:11009 +#: config/tc-i386.c:10537 #, c-format msgid "" " -mevexrcig=[rne|rd|ru|rz]\n" @@ -8161,12 +8161,12 @@ " for SAE-only ignored instructions\n" msgstr "" -#: config/tc-i386.c:11013 +#: config/tc-i386.c:10541 #, c-format msgid " -mmnemonic=[att|intel] use AT&T/Intel mnemonic\n" msgstr "" -#: config/tc-i386.c:11015 +#: config/tc-i386.c:10543 #, c-format msgid " -msyntax=[att|intel] use AT&T/Intel syntax\n" msgstr " -msyntax=[att|intel] AT&T/Intel 構文を使用する\n" @@ -8202,14 +8202,14 @@ msgid " -mbig-obj generate big object files\n" msgstr "" -#: config/tc-i386.c:11029 +#: config/tc-i386.c:10559 #, c-format msgid "" " -momit-lock-prefix=[no|yes]\n" " strip all lock prefixes\n" msgstr "" -#: config/tc-i386.c:11032 +#: config/tc-i386.c:10562 #, c-format msgid "" " -mfence-as-lock-add=[no|yes]\n" @@ -8217,14 +8217,14 @@ " lock addl $0x0, (%%{re}sp)\n" msgstr "" -#: config/tc-i386.c:11036 +#: config/tc-i386.c:10566 #, c-format msgid "" " -mrelax-relocations=[no|yes]\n" " generate relax relocations\n" msgstr "" -#: config/tc-i386.c:11039 +#: config/tc-i386.c:10569 #, c-format msgid " -mamd64 accept only AMD64 ISA\n" msgstr "" @@ -13377,7 +13377,7 @@ msgid "Can not find match relax hint. Line: %d" msgstr "" -#: config/tc-nds32.c:5046 +#: config/tc-nds32.c:4999 #, c-format msgid "Internal error: Relax hint error. %s: %x" msgstr "" @@ -13436,7 +13436,7 @@ msgid "Internal error: Unknown fixup type %d (`%s')" msgstr "" -#: config/tc-nds32.c:6762 +#: config/tc-nds32.c:6711 msgid "need PIC qualifier with symbol." msgstr "" @@ -13970,7 +13970,7 @@ "-m821, -m850, -m860 generate code for PowerPC 821/850/860\n" msgstr "" -#: config/tc-ppc.c:1346 +#: config/tc-ppc.c:1345 #, c-format msgid "" "-mppc64, -m620 generate code for PowerPC 620/625/630\n" @@ -13991,7 +13991,7 @@ "-many generate code for any architecture (PWR/PWRX/PPC)\n" msgstr "" -#: config/tc-ppc.c:1361 +#: config/tc-ppc.c:1360 #, c-format msgid "" "-maltivec generate code for AltiVec\n" @@ -14010,7 +14010,7 @@ "-mno-regnames Do not allow symbolic names for registers\n" msgstr "" -#: config/tc-ppc.c:1377 +#: config/tc-ppc.c:1376 #, c-format msgid "" "-mrelocatable support for GCC's -mrelocatble option\n" @@ -14027,7 +14027,7 @@ "-Qy, -Qn ignored\n" msgstr "" -#: config/tc-ppc.c:1391 +#: config/tc-ppc.c:1390 #, c-format msgid "" "-nops=count when aligning, more than COUNT nops uses a branch\n" @@ -14095,7 +14095,7 @@ msgid "duplicate macro %s" msgstr "" -#: config/tc-ppc.c:2161 +#: config/tc-ppc.c:2149 msgid "symbol+offset not supported for got tls" msgstr "" @@ -15986,7 +15986,7 @@ msgid "FP branch in delay slot" msgstr "" -#: config/tc-sparc.c:1573 +#: config/tc-sparc.c:1629 msgid "FP branch preceded by FP instruction; NOP inserted" msgstr "" @@ -19154,12 +19154,12 @@ msgid "unresolved loop target symbol: %s" msgstr "" -#: config/tc-xtensa.c:11008 +#: config/tc-xtensa.c:10972 #, c-format msgid "invalid expression evaluation type %d" msgstr "" -#: config/tc-xtensa.c:11025 +#: config/tc-xtensa.c:10989 msgid "loop too long for LOOP instruction" msgstr "" @@ -19641,7 +19641,7 @@ msgid "file number less than one" msgstr "" -#: dwarf2dbg.c:792 +#: dwarf2dbg.c:789 #, c-format msgid "file number %ld already allocated" msgstr "" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gcc.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gcc.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gcc.po 2020-01-23 16:51:33.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gcc.po 2020-07-08 13:53:29.000000000 +0000 @@ -21,15 +21,15 @@ "Project-Id-Version: gcc 8.1.0\n" "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n" "POT-Creation-Date: 2018-07-25 14:25+0000\n" -"PO-Revision-Date: 2019-04-07 07:30+0000\n" +"PO-Revision-Date: 2020-03-30 14:39+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: 2020-01-23 12:22+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 12:00+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gettext-runtime.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gettext-runtime.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gettext-runtime.po 2020-01-23 16:51:29.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gettext-runtime.po 2020-07-08 13:53: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: 2020-01-23 10:58+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: gnulib-lib/closeout.c:66 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gettext-tools.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gettext-tools.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/gettext-tools.po 2020-01-23 16:51:28.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/gettext-tools.po 2020-07-08 13:53:24.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: 2020-01-23 10:58+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" #: gnulib-lib/argmatch.c:133 diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/git-gui.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/git-gui.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/git-gui.po 2020-01-23 16:51:34.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/git-gui.po 2020-07-08 13:53:30.000000000 +0000 @@ -16,37 +16,37 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:18+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:07+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ja\n" -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 +#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 +#: git-gui.sh:3212 msgid "git-gui: fatal error" msgstr "git-gui: 致命的なエラー" -#: git-gui.sh:743 +#: git-gui.sh:847 #, tcl-format msgid "Invalid font specified in %s:" msgstr "%s に無効なフォントが指定されています:" -#: git-gui.sh:779 +#: git-gui.sh:901 msgid "Main Font" msgstr "メインのフォント" -#: git-gui.sh:780 +#: git-gui.sh:902 msgid "Diff/Console Font" msgstr "diff/コンソールフォント" -#: git-gui.sh:794 +#: git-gui.sh:918 msgid "Cannot find git in PATH." msgstr "PATH 中に git が見つかりません" -#: git-gui.sh:821 +#: git-gui.sh:945 msgid "Cannot parse Git version string:" msgstr "Git バージョン名をパースできません:" -#: git-gui.sh:839 +#: git-gui.sh:970 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -65,39 +65,39 @@ "\n" "'%s' はバージョン 1.5.0 と思って良いですか？\n" -#: git-gui.sh:1128 +#: git-gui.sh:1267 msgid "Git directory not found:" msgstr "Git ディレクトリが見つかりません:" -#: git-gui.sh:1146 +#: git-gui.sh:1301 msgid "Cannot move to top of working directory:" msgstr "作業ディレクトリの最上位に移動できません" -#: git-gui.sh:1154 +#: git-gui.sh:1309 msgid "Cannot use bare repository:" msgstr "ベアリポジトリは使えません:" -#: git-gui.sh:1162 +#: git-gui.sh:1317 msgid "No working directory" msgstr "作業ディレクトリがありません" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1491 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "ファイル状態を更新しています..." -#: git-gui.sh:1390 +#: git-gui.sh:1551 msgid "Scanning for modified files ..." msgstr "変更されたファイルをスキャンしています..." -#: git-gui.sh:1454 +#: git-gui.sh:1629 msgid "Calling prepare-commit-msg hook..." msgstr "prepare-commit-msg フックを実行中..." -#: git-gui.sh:1471 +#: git-gui.sh:1646 msgid "Commit declined by prepare-commit-msg hook." msgstr "prepare-commit-msg フックがコミットを拒否しました" -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1804 lib/browser.tcl:252 msgid "Ready." msgstr "準備完了" @@ -106,52 +106,52 @@ msgid "Displaying only %s of %s files." msgstr "全体で%s個の内の%sファイルだけ表示しています" -#: git-gui.sh:1913 +#: git-gui.sh:2091 msgid "Unmodified" msgstr "変更なし" -#: git-gui.sh:1915 +#: git-gui.sh:2093 msgid "Modified, not staged" msgstr "変更あり、コミット未予定" -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2094 git-gui.sh:2106 msgid "Staged for commit" msgstr "コミット予定済" -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2095 git-gui.sh:2107 msgid "Portions staged for commit" msgstr "部分的にコミット予定済" -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2096 git-gui.sh:2108 msgid "Staged for commit, missing" msgstr "コミット予定済、ファイルなし" -#: git-gui.sh:1920 +#: git-gui.sh:2098 msgid "File type changed, not staged" msgstr "ファイル型変更、コミット未予定" -#: git-gui.sh:1921 +#: git-gui.sh:2101 msgid "File type changed, staged" msgstr "ファイル型変更、コミット予定済" -#: git-gui.sh:1923 +#: git-gui.sh:2105 msgid "Untracked, not staged" msgstr "管理外、コミット未予定" -#: git-gui.sh:1928 +#: git-gui.sh:2110 msgid "Missing" msgstr "ファイルなし" -#: git-gui.sh:1929 +#: git-gui.sh:2111 msgid "Staged for removal" msgstr "削除予定済" -#: git-gui.sh:1930 +#: git-gui.sh:2112 msgid "Staged for removal, still present" msgstr "削除予定済、ファイル未削除" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 +#: git-gui.sh:2118 git-gui.sh:2119 msgid "Requires merge resolution" msgstr "要マージ解決" @@ -159,148 +159,147 @@ msgid "Starting gitk... please wait..." msgstr "gitk を起動中... お待ちください..." -#: git-gui.sh:1984 +#: git-gui.sh:2164 msgid "Couldn't find gitk in PATH" msgstr "PATH 中に gitk が見つかりません" -#: git-gui.sh:2043 +#: git-gui.sh:2224 msgid "Couldn't find git gui in PATH" msgstr "PATH 中に git gui が見つかりません" -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2726 lib/choose_repository.tcl:53 msgid "Repository" msgstr "リポジトリ" -#: git-gui.sh:2456 +#: git-gui.sh:2727 msgid "Edit" msgstr "編集" -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2729 lib/choose_rev.tcl:567 msgid "Branch" msgstr "ブランチ" -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2732 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "コミット" -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 msgid "Merge" msgstr "マージ" -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2736 lib/choose_rev.tcl:563 msgid "Remote" msgstr "リモート" -#: git-gui.sh:2468 +#: git-gui.sh:2739 msgid "Tools" msgstr "ツール" -#: git-gui.sh:2477 +#: git-gui.sh:2748 msgid "Explore Working Copy" msgstr "ワーキングコピーをブラウズ" -#: git-gui.sh:2483 +#: git-gui.sh:2772 msgid "Browse Current Branch's Files" msgstr "現在のブランチのファイルを見る" -#: git-gui.sh:2487 +#: git-gui.sh:2776 msgid "Browse Branch Files..." msgstr "ブランチのファイルを見る..." -#: git-gui.sh:2492 +#: git-gui.sh:2781 msgid "Visualize Current Branch's History" msgstr "現在のブランチの履歴を見る" -#: git-gui.sh:2496 +#: git-gui.sh:2785 msgid "Visualize All Branch History" msgstr "全てのブランチの履歴を見る" -#: git-gui.sh:2503 +#: git-gui.sh:2792 #, tcl-format msgid "Browse %s's Files" msgstr "ブランチ %s のファイルを見る" -#: git-gui.sh:2505 +#: git-gui.sh:2794 #, tcl-format msgid "Visualize %s's History" msgstr "ブランチ %s の履歴を見る" -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2799 lib/database.tcl:40 msgid "Database Statistics" msgstr "データベース統計" -#: git-gui.sh:2513 lib/database.tcl:34 +#: git-gui.sh:2802 lib/database.tcl:33 msgid "Compress Database" msgstr "データベース圧縮" -#: git-gui.sh:2516 +#: git-gui.sh:2805 msgid "Verify Database" msgstr "データベース検証" -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 msgid "Create Desktop Icon" msgstr "デスクトップアイコンを作成" -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 msgid "Quit" msgstr "終了" -#: git-gui.sh:2547 +#: git-gui.sh:2836 msgid "Undo" msgstr "元に戻す" -#: git-gui.sh:2550 +#: git-gui.sh:2839 msgid "Redo" msgstr "やり直し" -#: git-gui.sh:2554 git-gui.sh:3109 +#: git-gui.sh:2843 git-gui.sh:3461 msgid "Cut" msgstr "切り取り" -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 #: lib/console.tcl:69 msgid "Copy" msgstr "コピー" -#: git-gui.sh:2560 git-gui.sh:3115 +#: git-gui.sh:2849 git-gui.sh:3467 msgid "Paste" msgstr "貼り付け" -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 +#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "削除" -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 msgid "Select All" msgstr "全て選択" -#: git-gui.sh:2576 +#: git-gui.sh:2865 msgid "Create..." msgstr "作成..." -#: git-gui.sh:2582 +#: git-gui.sh:2871 msgid "Checkout..." msgstr "チェックアウト" -#: git-gui.sh:2588 +#: git-gui.sh:2877 msgid "Rename..." msgstr "名前変更" -#: git-gui.sh:2593 +#: git-gui.sh:2882 msgid "Delete..." msgstr "削除..." -#: git-gui.sh:2598 +#: git-gui.sh:2887 msgid "Reset..." msgstr "リセット..." -#: git-gui.sh:2608 +#: git-gui.sh:2897 msgid "Done" msgstr "完了" -#: git-gui.sh:2610 +#: git-gui.sh:2899 msgid "Commit@@verb" msgstr "コミット" @@ -308,230 +307,230 @@ msgid "New Commit" msgstr "新規コミット" -#: git-gui.sh:2627 git-gui.sh:3057 +#: git-gui.sh:2908 git-gui.sh:3400 msgid "Amend Last Commit" msgstr "最新コミットを訂正" -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "再スキャン" -#: git-gui.sh:2643 +#: git-gui.sh:2924 msgid "Stage To Commit" msgstr "コミット予定する" -#: git-gui.sh:2649 +#: git-gui.sh:2930 msgid "Stage Changed Files To Commit" msgstr "変更されたファイルをコミット予定" -#: git-gui.sh:2655 +#: git-gui.sh:2936 msgid "Unstage From Commit" msgstr "コミットから降ろす" -#: git-gui.sh:2661 lib/index.tcl:412 +#: git-gui.sh:2942 lib/index.tcl:521 msgid "Revert Changes" msgstr "変更を元に戻す" -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 msgid "Show Less Context" msgstr "文脈を少なく" -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 msgid "Show More Context" msgstr "文脈を多く" -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 msgid "Sign Off" msgstr "署名" -#: git-gui.sh:2696 +#: git-gui.sh:2977 msgid "Local Merge..." msgstr "ローカルマージ..." -#: git-gui.sh:2701 +#: git-gui.sh:2982 msgid "Abort Merge..." msgstr "マージ中止..." -#: git-gui.sh:2713 git-gui.sh:2741 +#: git-gui.sh:2994 git-gui.sh:3022 msgid "Add..." msgstr "追加" -#: git-gui.sh:2717 +#: git-gui.sh:2998 msgid "Push..." msgstr "プッシュ..." -#: git-gui.sh:2721 +#: git-gui.sh:3002 msgid "Delete Branch..." msgstr "ブランチ削除..." -#: git-gui.sh:2731 git-gui.sh:3292 +#: git-gui.sh:3012 git-gui.sh:3666 msgid "Options..." msgstr "オプション..." -#: git-gui.sh:2742 +#: git-gui.sh:3023 msgid "Remove..." msgstr "削除..." -#: git-gui.sh:2751 lib/choose_repository.tcl:50 +#: git-gui.sh:3032 lib/choose_repository.tcl:67 msgid "Help" msgstr "ヘルプ" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 +#: lib/choose_repository.tcl:70 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "%s について" -#: git-gui.sh:2783 +#: git-gui.sh:3064 msgid "Online Documentation" msgstr "オンラインドキュメント" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 msgid "Show SSH Key" msgstr "SSH キーを表示" -#: git-gui.sh:2893 +#: git-gui.sh:3213 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありません" -#: git-gui.sh:2926 +#: git-gui.sh:3246 msgid "Current Branch:" msgstr "現在のブランチ" -#: git-gui.sh:2947 +#: git-gui.sh:3293 msgid "Staged Changes (Will Commit)" msgstr "ステージングされた（コミット予定済の）変更" -#: git-gui.sh:2967 +#: git-gui.sh:3271 msgid "Unstaged Changes" msgstr "コミット予定に入っていない変更" -#: git-gui.sh:3017 +#: git-gui.sh:3367 msgid "Stage Changed" msgstr "変更をコミット予定に入れる" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +#: git-gui.sh:3386 lib/transport.tcl:137 msgid "Push" msgstr "プッシュ" -#: git-gui.sh:3071 +#: git-gui.sh:3413 msgid "Initial Commit Message:" msgstr "最初のコミットメッセージ:" -#: git-gui.sh:3072 +#: git-gui.sh:3414 msgid "Amended Commit Message:" msgstr "訂正したコミットメッセージ:" -#: git-gui.sh:3073 +#: git-gui.sh:3415 msgid "Amended Initial Commit Message:" msgstr "訂正した最初のコミットメッセージ:" -#: git-gui.sh:3074 +#: git-gui.sh:3416 msgid "Amended Merge Commit Message:" msgstr "訂正したマージコミットメッセージ:" -#: git-gui.sh:3075 +#: git-gui.sh:3417 msgid "Merge Commit Message:" msgstr "マージコミットメッセージ:" -#: git-gui.sh:3076 +#: git-gui.sh:3418 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 msgid "Copy All" msgstr "全てコピー" -#: git-gui.sh:3149 lib/blame.tcl:104 +#: git-gui.sh:3501 lib/blame.tcl:106 msgid "File:" msgstr "ファイル:" -#: git-gui.sh:3255 +#: git-gui.sh:3629 msgid "Refresh" msgstr "再読み込み" -#: git-gui.sh:3276 +#: git-gui.sh:3650 msgid "Decrease Font Size" msgstr "フォントを小さく" -#: git-gui.sh:3280 +#: git-gui.sh:3654 msgid "Increase Font Size" msgstr "フォントを大きく" -#: git-gui.sh:3288 lib/blame.tcl:281 +#: git-gui.sh:3662 lib/blame.tcl:296 msgid "Encoding" msgstr "エンコーディング" -#: git-gui.sh:3299 +#: git-gui.sh:3673 msgid "Apply/Reverse Hunk" msgstr "パッチを適用/取り消す" -#: git-gui.sh:3304 +#: git-gui.sh:3678 msgid "Apply/Reverse Line" msgstr "パッチ行を適用/取り消す" -#: git-gui.sh:3323 +#: git-gui.sh:3713 msgid "Run Merge Tool" msgstr "マージツールを起動" -#: git-gui.sh:3328 +#: git-gui.sh:3718 msgid "Use Remote Version" msgstr "リモートの方を採用" -#: git-gui.sh:3332 +#: git-gui.sh:3722 msgid "Use Local Version" msgstr "ローカルの方を採用" -#: git-gui.sh:3336 +#: git-gui.sh:3726 msgid "Revert To Base" msgstr "ベース版を採用" -#: git-gui.sh:3354 +#: git-gui.sh:3744 msgid "Visualize These Changes In The Submodule" msgstr "サブモジュール内のこれらの変更を見る" -#: git-gui.sh:3358 +#: git-gui.sh:3748 msgid "Visualize Current Branch History In The Submodule" msgstr "サブモジュール内で現在のブランチの履歴を見る" -#: git-gui.sh:3362 +#: git-gui.sh:3752 msgid "Visualize All Branch History In The Submodule" msgstr "サブモジュール内で全てのブランチの履歴を見る" -#: git-gui.sh:3367 +#: git-gui.sh:3757 msgid "Start git gui In The Submodule" msgstr "サブモジュール内でgit guiを起動する" -#: git-gui.sh:3389 +#: git-gui.sh:3793 msgid "Unstage Hunk From Commit" msgstr "パッチをコミット予定から外す" -#: git-gui.sh:3391 +#: git-gui.sh:3797 msgid "Unstage Lines From Commit" msgstr "コミット予定から行を外す" -#: git-gui.sh:3393 +#: git-gui.sh:3800 msgid "Unstage Line From Commit" msgstr "コミット予定から行を外す" -#: git-gui.sh:3396 +#: git-gui.sh:3804 msgid "Stage Hunk For Commit" msgstr "パッチをコミット予定に加える" -#: git-gui.sh:3398 +#: git-gui.sh:3808 msgid "Stage Lines For Commit" msgstr "パッチ行をコミット予定に加える" -#: git-gui.sh:3400 +#: git-gui.sh:3811 msgid "Stage Line For Commit" msgstr "パッチ行をコミット予定に加える" -#: git-gui.sh:3424 +#: git-gui.sh:3861 msgid "Initializing..." msgstr "初期化しています..." -#: git-gui.sh:3541 +#: git-gui.sh:4017 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -546,7 +545,7 @@ "以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n" "\n" -#: git-gui.sh:3570 +#: git-gui.sh:4046 msgid "" "\n" "This is due to a known issue with the\n" @@ -556,7 +555,7 @@ "これは Cygwin で配布されている Tcl バイナリに\n" "関しての既知の問題によります" -#: git-gui.sh:3575 +#: git-gui.sh:4051 #, tcl-format msgid "" "\n" @@ -579,137 +578,136 @@ msgid "File Viewer" msgstr "ファイルピューワ" -#: lib/blame.tcl:78 +#: lib/blame.tcl:80 msgid "Commit:" msgstr "コミット:" -#: lib/blame.tcl:271 +#: lib/blame.tcl:282 msgid "Copy Commit" msgstr "コミットをコピー" -#: lib/blame.tcl:275 +#: lib/blame.tcl:286 msgid "Find Text..." msgstr "テキストを検索" -#: lib/blame.tcl:284 +#: lib/blame.tcl:299 msgid "Do Full Copy Detection" msgstr "コピー検知" -#: lib/blame.tcl:288 +#: lib/blame.tcl:303 msgid "Show History Context" msgstr "文脈を見せる" -#: lib/blame.tcl:291 +#: lib/blame.tcl:306 msgid "Blame Parent Commit" msgstr "親コミットを注釈" -#: lib/blame.tcl:450 +#: lib/blame.tcl:468 #, tcl-format msgid "Reading %s..." msgstr "%s を読んでいます..." -#: lib/blame.tcl:557 +#: lib/blame.tcl:596 msgid "Loading copy/move tracking annotations..." msgstr "コピー・移動追跡データを読んでいます..." -#: lib/blame.tcl:577 +#: lib/blame.tcl:613 msgid "lines annotated" msgstr "行を注釈しました" -#: lib/blame.tcl:769 +#: lib/blame.tcl:815 msgid "Loading original location annotations..." msgstr "元位置行の注釈データを読んでいます..." -#: lib/blame.tcl:772 +#: lib/blame.tcl:818 msgid "Annotation complete." msgstr "注釈完了しました" -#: lib/blame.tcl:802 +#: lib/blame.tcl:849 msgid "Busy" msgstr "実行中" -#: lib/blame.tcl:803 +#: lib/blame.tcl:850 msgid "Annotation process is already running." msgstr "すでに blame プロセスを実行中です。" -#: lib/blame.tcl:842 +#: lib/blame.tcl:889 msgid "Running thorough copy detection..." msgstr "コピー検知を実行中..." -#: lib/blame.tcl:910 +#: lib/blame.tcl:957 msgid "Loading annotation..." msgstr "注釈を読み込んでいます..." -#: lib/blame.tcl:963 +#: lib/blame.tcl:1010 msgid "Author:" msgstr "作者:" -#: lib/blame.tcl:967 +#: lib/blame.tcl:1014 msgid "Committer:" msgstr "コミット者:" -#: lib/blame.tcl:972 +#: lib/blame.tcl:1019 msgid "Original File:" msgstr "元ファイル" -#: lib/blame.tcl:1020 +#: lib/blame.tcl:1067 msgid "Cannot find HEAD commit:" msgstr "HEAD コミットが見つかりません" -#: lib/blame.tcl:1075 +#: lib/blame.tcl:1122 msgid "Cannot find parent commit:" msgstr "親コミットが見つかりません:" -#: lib/blame.tcl:1090 +#: lib/blame.tcl:1137 msgid "Unable to display parent" msgstr "親を表示できません" -#: lib/blame.tcl:1091 lib/diff.tcl:320 +#: lib/blame.tcl:1138 lib/diff.tcl:345 msgid "Error loading diff:" msgstr "diff を読む際のエラーです:" -#: lib/blame.tcl:1231 +#: lib/blame.tcl:1279 msgid "Originally By:" msgstr "原作者:" -#: lib/blame.tcl:1237 +#: lib/blame.tcl:1285 msgid "In File:" msgstr "ファイル:" -#: lib/blame.tcl:1242 +#: lib/blame.tcl:1290 msgid "Copied Or Moved Here By:" msgstr "複写・移動者:" -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +#: lib/branch_checkout.tcl:21 msgid "Checkout Branch" msgstr "ブランチをチェックアウト" -#: lib/branch_checkout.tcl:23 +#: lib/branch_checkout.tcl:26 msgid "Checkout" msgstr "チェックアウト" -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 +#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 +#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 +#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 +#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 +#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 msgid "Cancel" msgstr "中止" -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 msgid "Revision" msgstr "リビジョン" -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 msgid "Options" msgstr "オプション" -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 msgid "Fetch Tracking Branch" msgstr "トラッキングブランチをフェッチ" -#: lib/branch_checkout.tcl:44 +#: lib/branch_checkout.tcl:47 msgid "Detach From Local Branch" msgstr "ローカルブランチから削除" @@ -717,23 +715,23 @@ msgid "Create Branch" msgstr "ブランチを作成" -#: lib/branch_create.tcl:27 +#: lib/branch_create.tcl:28 msgid "Create New Branch" msgstr "ブランチを新規作成" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 msgid "Create" msgstr "作成" -#: lib/branch_create.tcl:40 +#: lib/branch_create.tcl:42 msgid "Branch Name" msgstr "ブランチ名" -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 msgid "Name:" msgstr "名前:" -#: lib/branch_create.tcl:58 +#: lib/branch_create.tcl:57 msgid "Match Tracking Branch Name" msgstr "トラッキングブランチ名を合わせる" @@ -753,7 +751,7 @@ msgid "Fast Forward Only" msgstr "早送りのみ" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 msgid "Reset" msgstr "リセット" @@ -761,20 +759,20 @@ msgid "Checkout After Creation" msgstr "作成してすぐチェックアウト" -#: lib/branch_create.tcl:131 +#: lib/branch_create.tcl:132 msgid "Please select a tracking branch." msgstr "トラッキングブランチを選択してください。" -#: lib/branch_create.tcl:140 +#: lib/branch_create.tcl:141 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." msgstr "トラッキングブランチ %s はリモートリポジトリのブランチではありません。" -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 msgid "Please supply a branch name." msgstr "ブランチ名を指定してください。" -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 #, tcl-format msgid "'%s' is not an acceptable branch name." msgstr "'%s' はブランチ名に使えません。" @@ -783,19 +781,19 @@ msgid "Delete Branch" msgstr "ブランチ削除" -#: lib/branch_delete.tcl:20 +#: lib/branch_delete.tcl:21 msgid "Delete Local Branch" msgstr "ローカルブランチを削除" -#: lib/branch_delete.tcl:37 +#: lib/branch_delete.tcl:39 msgid "Local Branches" msgstr "ローカルブランチ" -#: lib/branch_delete.tcl:52 +#: lib/branch_delete.tcl:51 msgid "Delete Only If Merged Into" msgstr "マージ済みの時のみ削除" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 msgid "Always (Do not perform merge checks)" msgstr "無条件（マージ検査をしない）" @@ -804,7 +802,7 @@ msgid "The following branches are not completely merged into %s:" msgstr "以下のブランチは %s に完全にマージされていません:" -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 msgid "" "Recovering deleted branches is difficult.\n" "\n" @@ -823,32 +821,32 @@ "以下のブランチを削除できません:\n" "%s" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +#: lib/branch_rename.tcl:23 msgid "Rename Branch" msgstr "ブランチの名前変更" -#: lib/branch_rename.tcl:26 +#: lib/branch_rename.tcl:28 msgid "Rename" msgstr "名前変更" -#: lib/branch_rename.tcl:36 +#: lib/branch_rename.tcl:38 msgid "Branch:" msgstr "ブランチ:" -#: lib/branch_rename.tcl:39 +#: lib/branch_rename.tcl:46 msgid "New Name:" msgstr "新しい名前:" -#: lib/branch_rename.tcl:75 +#: lib/branch_rename.tcl:81 msgid "Please select a branch to rename." msgstr "名前を変更するブランチを選んでください。" -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 #, tcl-format msgid "Branch '%s' already exists." msgstr "'%s'というブランチはすでに存在します。" -#: lib/branch_rename.tcl:117 +#: lib/branch_rename.tcl:123 #, tcl-format msgid "Failed to rename '%s'." msgstr "'%s'の名前変更に失敗しました。" @@ -861,22 +859,22 @@ msgid "File Browser" msgstr "ファイルブラウザー" -#: lib/browser.tcl:126 lib/browser.tcl:143 +#: lib/browser.tcl:132 lib/browser.tcl:149 #, tcl-format msgid "Loading %s..." msgstr "%s をロード中..." -#: lib/browser.tcl:187 +#: lib/browser.tcl:193 msgid "[Up To Parent]" msgstr "[上位フォルダへ]" -#: lib/browser.tcl:267 lib/browser.tcl:273 +#: lib/browser.tcl:282 msgid "Browse Branch Files" msgstr "現在のブランチのファイルを見る" -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 +#: lib/browser.tcl:288 lib/choose_repository.tcl:437 +#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 +#: lib/choose_repository.tcl:1115 msgid "Browse" msgstr "ブラウズ" @@ -890,8 +888,8 @@ msgid "fatal: Cannot resolve %s" msgstr "致命的エラー: %s を解決できません" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 +#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 +#: lib/database.tcl:30 msgid "Close" msgstr "閉じる" @@ -956,21 +954,21 @@ msgid "files checked out" msgstr "チェックアウトされたファイル" -#: lib/checkout_op.tcl:376 +#: lib/checkout_op.tcl:377 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。" -#: lib/checkout_op.tcl:377 +#: lib/checkout_op.tcl:378 msgid "File level merge required." msgstr "ファイル毎のマージが必要です。" -#: lib/checkout_op.tcl:381 +#: lib/checkout_op.tcl:382 #, tcl-format msgid "Staying on branch '%s'." msgstr "ブランチ '%s' に滞まります。" -#: lib/checkout_op.tcl:452 +#: lib/checkout_op.tcl:453 msgid "" "You are no longer on a local branch.\n" "\n" @@ -981,30 +979,30 @@ "\n" "ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブランチを開始してください。" -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 #, tcl-format msgid "Checked out '%s'." msgstr "'%s' をチェックアウトしました" -#: lib/checkout_op.tcl:535 +#: lib/checkout_op.tcl:536 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:" -#: lib/checkout_op.tcl:557 +#: lib/checkout_op.tcl:558 msgid "Recovering lost commits may not be easy." msgstr "失なわれたコミットを回復するのは簡単ではありません。" -#: lib/checkout_op.tcl:562 +#: lib/checkout_op.tcl:563 #, tcl-format msgid "Reset '%s'?" msgstr "'%s' をリセットしますか？" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 msgid "Visualize" msgstr "可視化" -#: lib/checkout_op.tcl:635 +#: lib/checkout_op.tcl:636 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -1019,23 +1017,23 @@ "作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功しましたが、 Git の内部データを更新できませんでした。\n" "起こるはずのないエラーです。あきらめて %s を終了します。" -#: lib/choose_font.tcl:39 +#: lib/choose_font.tcl:41 msgid "Select" msgstr "選択" -#: lib/choose_font.tcl:53 +#: lib/choose_font.tcl:55 msgid "Font Family" msgstr "フォントファミリー" -#: lib/choose_font.tcl:74 +#: lib/choose_font.tcl:76 msgid "Font Size" msgstr "フォントの大きさ" -#: lib/choose_font.tcl:91 +#: lib/choose_font.tcl:93 msgid "Font Example" msgstr "フォントサンプル" -#: lib/choose_font.tcl:103 +#: lib/choose_font.tcl:105 msgid "" "This is example text.\n" "If you like this text, it can be your font." @@ -1043,234 +1041,234 @@ "これはサンプル文です。\n" "このフォントが気に入ればお使いになれます。" -#: lib/choose_repository.tcl:28 +#: lib/choose_repository.tcl:45 msgid "Git Gui" msgstr "Git GUI" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 msgid "Create New Repository" msgstr "新しいリポジトリを作成" -#: lib/choose_repository.tcl:93 +#: lib/choose_repository.tcl:110 msgid "New..." msgstr "新規..." -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 msgid "Clone Existing Repository" msgstr "既存のリポジトリを複製する" -#: lib/choose_repository.tcl:106 +#: lib/choose_repository.tcl:128 msgid "Clone..." msgstr "複製..." -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 msgid "Open Existing Repository" msgstr "既存のリポジトリを開く" -#: lib/choose_repository.tcl:119 +#: lib/choose_repository.tcl:141 msgid "Open..." msgstr "開く..." -#: lib/choose_repository.tcl:132 +#: lib/choose_repository.tcl:154 msgid "Recent Repositories" msgstr "最近使ったリポジトリ" -#: lib/choose_repository.tcl:138 +#: lib/choose_repository.tcl:164 msgid "Open Recent Repository:" msgstr "最近使ったリポジトリを開く" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 +#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 +#: lib/choose_repository.tcl:345 #, tcl-format msgid "Failed to create repository %s:" msgstr "リポジトリ %s を作製できません:" -#: lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:432 msgid "Directory:" msgstr "ディレクトリ:" -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 +#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 +#: lib/choose_repository.tcl:1139 msgid "Git Repository" msgstr "GIT リポジトリ" -#: lib/choose_repository.tcl:448 +#: lib/choose_repository.tcl:487 #, tcl-format msgid "Directory %s already exists." msgstr "ディレクトリ '%s' はすでに存在します。" -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:491 #, tcl-format msgid "File %s already exists." msgstr "ファイル '%s' はすでに存在します。" -#: lib/choose_repository.tcl:466 +#: lib/choose_repository.tcl:506 msgid "Clone" msgstr "複製" -#: lib/choose_repository.tcl:479 +#: lib/choose_repository.tcl:519 msgid "Source Location:" msgstr "ソースの位置" -#: lib/choose_repository.tcl:490 +#: lib/choose_repository.tcl:528 msgid "Target Directory:" msgstr "先ディレクトリ:" -#: lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:538 msgid "Clone Type:" msgstr "複製方式:" -#: lib/choose_repository.tcl:508 +#: lib/choose_repository.tcl:543 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "標準(高速・中冗長度・ハードリンク)" -#: lib/choose_repository.tcl:514 +#: lib/choose_repository.tcl:548 msgid "Full Copy (Slower, Redundant Backup)" msgstr "全複写(低速・冗長バックアップ)" -#: lib/choose_repository.tcl:520 +#: lib/choose_repository.tcl:553 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "共有(最高速・非推奨・バックアップなし)" -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 +#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 #, tcl-format msgid "Not a Git repository: %s" msgstr "Git リポジトリではありません: %s" -#: lib/choose_repository.tcl:592 +#: lib/choose_repository.tcl:630 msgid "Standard only available for local repository." msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" -#: lib/choose_repository.tcl:596 +#: lib/choose_repository.tcl:634 msgid "Shared only available for local repository." msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" -#: lib/choose_repository.tcl:617 +#: lib/choose_repository.tcl:655 #, tcl-format msgid "Location %s already exists." msgstr "'%s' はすでに存在します。" -#: lib/choose_repository.tcl:628 +#: lib/choose_repository.tcl:666 msgid "Failed to configure origin" msgstr "origin を設定できませんでした" -#: lib/choose_repository.tcl:640 +#: lib/choose_repository.tcl:678 msgid "Counting objects" msgstr "オブジェクトを数えています" -#: lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:679 msgid "buckets" msgstr "バケツ" -#: lib/choose_repository.tcl:665 +#: lib/choose_repository.tcl:703 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "objects/info/alternates を複写できません: %s" -#: lib/choose_repository.tcl:701 +#: lib/choose_repository.tcl:740 #, tcl-format msgid "Nothing to clone from %s." msgstr "%s から複製する内容はありません" -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 +#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:974 msgid "The 'master' branch has not been initialized." msgstr "'master' ブランチが初期化されていません" -#: lib/choose_repository.tcl:716 +#: lib/choose_repository.tcl:755 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "ハードリンクが作れないので、コピーします" -#: lib/choose_repository.tcl:728 +#: lib/choose_repository.tcl:769 #, tcl-format msgid "Cloning from %s" msgstr "%s から複製しています" -#: lib/choose_repository.tcl:759 +#: lib/choose_repository.tcl:800 msgid "Copying objects" msgstr "オブジェクトを複写しています" -#: lib/choose_repository.tcl:760 +#: lib/choose_repository.tcl:801 msgid "KiB" msgstr "KiB" -#: lib/choose_repository.tcl:784 +#: lib/choose_repository.tcl:825 #, tcl-format msgid "Unable to copy object: %s" msgstr "オブジェクトを複写できません: %s" -#: lib/choose_repository.tcl:794 +#: lib/choose_repository.tcl:837 msgid "Linking objects" msgstr "オブジェクトを連結しています" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:838 msgid "objects" msgstr "オブジェクト" -#: lib/choose_repository.tcl:803 +#: lib/choose_repository.tcl:846 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "オブジェクトをハードリンクできません: %s" -#: lib/choose_repository.tcl:858 +#: lib/choose_repository.tcl:903 msgid "Cannot fetch branches and objects. See console output for details." msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見てください" -#: lib/choose_repository.tcl:869 +#: lib/choose_repository.tcl:914 msgid "Cannot fetch tags. See console output for details." msgstr "タグを取得できません。コンソール出力を見てください" -#: lib/choose_repository.tcl:893 +#: lib/choose_repository.tcl:938 msgid "Cannot determine HEAD. See console output for details." msgstr "HEAD を確定できません。コンソール出力を見てください" -#: lib/choose_repository.tcl:902 +#: lib/choose_repository.tcl:947 #, tcl-format msgid "Unable to cleanup %s" msgstr "%s を掃除できません" -#: lib/choose_repository.tcl:908 +#: lib/choose_repository.tcl:953 msgid "Clone failed." msgstr "複写に失敗しました。" -#: lib/choose_repository.tcl:915 +#: lib/choose_repository.tcl:960 msgid "No default branch obtained." msgstr "デフォルトのブランチが取得できません。" -#: lib/choose_repository.tcl:926 +#: lib/choose_repository.tcl:971 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "%s をコミットとして解釈できません" -#: lib/choose_repository.tcl:938 +#: lib/choose_repository.tcl:998 msgid "Creating working directory" msgstr "作業ディレクトリを作成しています" -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 +#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 +#: lib/choose_repository.tcl:999 msgid "files" msgstr "ファイル" -#: lib/choose_repository.tcl:968 +#: lib/choose_repository.tcl:1028 msgid "Initial file checkout failed." msgstr "初期チェックアウトに失敗しました" -#: lib/choose_repository.tcl:1011 +#: git-gui.sh:3549 lib/choose_repository.tcl:1100 msgid "Open" msgstr "開く" -#: lib/choose_repository.tcl:1021 +#: lib/choose_repository.tcl:1110 msgid "Repository:" msgstr "リポジトリ:" -#: lib/choose_repository.tcl:1072 +#: lib/choose_repository.tcl:1159 #, tcl-format msgid "Failed to open repository %s:" msgstr "リポジトリ %s を開けません:" -#: lib/choose_rev.tcl:53 +#: lib/choose_rev.tcl:52 msgid "This Detached Checkout" msgstr "分離されたチェックアウト" @@ -1278,36 +1276,36 @@ msgid "Revision Expression:" msgstr "リビジョン式:" -#: lib/choose_rev.tcl:74 +#: lib/choose_rev.tcl:72 msgid "Local Branch" msgstr "ローカル・ブランチ" -#: lib/choose_rev.tcl:79 +#: lib/choose_rev.tcl:77 msgid "Tracking Branch" msgstr "トラッキング・ブランチ" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 msgid "Tag" msgstr "タグ" -#: lib/choose_rev.tcl:317 +#: lib/choose_rev.tcl:321 #, tcl-format msgid "Invalid revision: %s" msgstr "無効なリビジョン: %s" -#: lib/choose_rev.tcl:338 +#: lib/choose_rev.tcl:342 msgid "No revision selected." msgstr "リビジョンが未選択です。" -#: lib/choose_rev.tcl:346 +#: lib/choose_rev.tcl:350 msgid "Revision expression is empty." msgstr "リビジョン式が空です。" -#: lib/choose_rev.tcl:531 +#: lib/choose_rev.tcl:537 msgid "Updated" msgstr "更新しました" -#: lib/choose_rev.tcl:559 +#: lib/choose_rev.tcl:565 msgid "URL" msgstr "URL" @@ -1334,24 +1332,24 @@ "\n" "現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正はできません\n" -#: lib/commit.tcl:48 +#: lib/commit.tcl:56 msgid "Error loading commit data for amend:" msgstr "訂正するコミットのデータを読めません:" -#: lib/commit.tcl:75 +#: lib/commit.tcl:83 msgid "Unable to obtain your identity:" msgstr "ユーザの正体を確認できません:" -#: lib/commit.tcl:80 +#: lib/commit.tcl:88 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "GIT_COMMITTER_IDENT が無効です:" -#: lib/commit.tcl:129 +#: lib/commit.tcl:138 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" -#: lib/commit.tcl:149 +#: lib/commit.tcl:158 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -1366,7 +1364,7 @@ "\n" "自動的に再スキャンを開始します。\n" -#: lib/commit.tcl:172 +#: lib/commit.tcl:182 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -1378,7 +1376,7 @@ "\n" "ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必要があります。\n" -#: lib/commit.tcl:180 +#: lib/commit.tcl:190 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -1389,7 +1387,7 @@ "\n" "ファイル %s は本プログラムではコミットできません。\n" -#: lib/commit.tcl:188 +#: lib/commit.tcl:198 msgid "" "No changes to commit.\n" "\n" @@ -1399,7 +1397,7 @@ "\n" "最低一つの変更をコミット予定に加えてからコミットしてください。\n" -#: lib/commit.tcl:203 +#: lib/commit.tcl:213 msgid "" "Please supply a commit message.\n" "\n" @@ -1417,40 +1415,40 @@ "- 第２行: 空白\n" "- 残りの行: なぜ、この変更が良い変更か、の説明。\n" -#: lib/commit.tcl:234 +#: lib/commit.tcl:244 msgid "Calling pre-commit hook..." msgstr "コミット前フックを実行中・・・" -#: lib/commit.tcl:249 +#: lib/commit.tcl:259 msgid "Commit declined by pre-commit hook." msgstr "コミット前フックがコミットを拒否しました" -#: lib/commit.tcl:272 +#: lib/commit.tcl:299 msgid "Calling commit-msg hook..." msgstr "コミット・メッセージ・フックを実行中・・・" -#: lib/commit.tcl:287 +#: lib/commit.tcl:314 msgid "Commit declined by commit-msg hook." msgstr "コミット・メッセージ・フックがコミットを拒否しました" -#: lib/commit.tcl:300 +#: lib/commit.tcl:327 msgid "Committing changes..." msgstr "変更点をコミット中・・・" -#: lib/commit.tcl:316 +#: lib/commit.tcl:344 msgid "write-tree failed:" msgstr "write-tree が失敗しました:" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 msgid "Commit failed." msgstr "コミットに失敗しました。" -#: lib/commit.tcl:334 +#: lib/commit.tcl:362 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "コミット %s は壊れています" -#: lib/commit.tcl:339 +#: lib/commit.tcl:367 msgid "" "No changes to commit.\n" "\n" @@ -1464,19 +1462,19 @@ "\n" "自動的に再スキャンを開始します。\n" -#: lib/commit.tcl:346 +#: lib/commit.tcl:374 msgid "No changes to commit." msgstr "コミットする変更がありません。" -#: lib/commit.tcl:360 +#: lib/commit.tcl:394 msgid "commit-tree failed:" msgstr "commit-tree が失敗しました:" -#: lib/commit.tcl:381 +#: lib/commit.tcl:421 msgid "update-ref failed:" msgstr "update-ref が失敗しました:" -#: lib/commit.tcl:469 +#: lib/commit.tcl:514 #, tcl-format msgid "Created commit %s: %s" msgstr "コミット %s を作成しました: %s" @@ -1493,31 +1491,31 @@ msgid "Error: Command Failed" msgstr "エラー: コマンドが失敗しました" -#: lib/database.tcl:43 +#: lib/database.tcl:42 msgid "Number of loose objects" msgstr "ばらばらなオブジェクトの数" -#: lib/database.tcl:44 +#: lib/database.tcl:43 msgid "Disk space used by loose objects" msgstr "ばらばらなオブジェクトの使用するディスク量" -#: lib/database.tcl:45 +#: lib/database.tcl:44 msgid "Number of packed objects" msgstr "パックされたオブジェクトの数" -#: lib/database.tcl:46 +#: lib/database.tcl:45 msgid "Number of packs" msgstr "パックの数" -#: lib/database.tcl:47 +#: lib/database.tcl:46 msgid "Disk space used by packed objects" msgstr "パックされたオブジェクトの使用するディスク量" -#: lib/database.tcl:48 +#: lib/database.tcl:47 msgid "Packed objects waiting for pruning" msgstr "パックに存在するので捨てて良いオブジェクトの数" -#: lib/database.tcl:49 +#: lib/database.tcl:48 msgid "Garbage files" msgstr "ゴミファイル" @@ -1550,7 +1548,7 @@ msgid "Invalid date from Git: %s" msgstr "Git から出た無効な日付: %s" -#: lib/diff.tcl:64 +#: lib/diff.tcl:77 #, tcl-format msgid "" "No differences detected.\n" @@ -1571,12 +1569,12 @@ "\n" "同様な状態のファイルを探すために、自動的に再スキャンを開始します。" -#: lib/diff.tcl:104 +#: lib/diff.tcl:117 #, tcl-format msgid "Loading diff of %s..." msgstr "%s の変更点をロード中..." -#: lib/diff.tcl:125 +#: lib/diff.tcl:143 msgid "" "LOCAL: deleted\n" "REMOTE:\n" @@ -1584,7 +1582,7 @@ "LOCAL: 削除\n" "Remote:\n" -#: lib/diff.tcl:130 +#: lib/diff.tcl:148 msgid "" "REMOTE: deleted\n" "LOCAL:\n" @@ -1592,32 +1590,32 @@ "REMOTE: 削除\n" "LOCAL:\n" -#: lib/diff.tcl:137 +#: lib/diff.tcl:155 msgid "LOCAL:\n" msgstr "LOCAL:\n" -#: lib/diff.tcl:140 +#: lib/diff.tcl:158 msgid "REMOTE:\n" msgstr "REMOTE\n" -#: lib/diff.tcl:202 lib/diff.tcl:319 +#: lib/diff.tcl:220 lib/diff.tcl:344 #, tcl-format msgid "Unable to display %s" msgstr "%s を表示できません" -#: lib/diff.tcl:203 +#: lib/diff.tcl:221 msgid "Error loading file:" msgstr "ファイルを読む際のエラーです:" -#: lib/diff.tcl:210 +#: lib/diff.tcl:227 msgid "Git Repository (subproject)" msgstr "Git リポジトリ(サブプロジェクト)" -#: lib/diff.tcl:222 +#: lib/diff.tcl:239 msgid "* Binary file (not showing content)." msgstr "* バイナリファイル(内容は表示しません)" -#: lib/diff.tcl:227 +#: lib/diff.tcl:244 #, tcl-format msgid "" "* Untracked file is %d bytes.\n" @@ -1626,7 +1624,7 @@ "* 管理外のファイルの大きさは %d バイトです。\n" "* 最初の %d バイトだけ表示しています。\n" -#: lib/diff.tcl:233 +#: lib/diff.tcl:250 #, tcl-format msgid "" "\n" @@ -1637,19 +1635,19 @@ "* %s は管理外のファイルをここで切りおとしました。\n" "* 全体を見るには外部エディタを使ってください。\n" -#: lib/diff.tcl:482 +#: lib/diff.tcl:583 msgid "Failed to unstage selected hunk." msgstr "選択されたパッチをコミット予定から外せません。" -#: lib/diff.tcl:489 +#: lib/diff.tcl:594 msgid "Failed to stage selected hunk." msgstr "選択されたパッチをコミット予定に加えられません。" -#: lib/diff.tcl:568 +#: lib/diff.tcl:687 msgid "Failed to unstage selected line." msgstr "選択されたパッチ行をコミット予定から外せません。" -#: lib/diff.tcl:576 +#: lib/diff.tcl:700 msgid "Failed to stage selected line." msgstr "選択されたパッチ行をコミット予定に加えられません。" @@ -1674,7 +1672,7 @@ msgid "warning" msgstr "警告" -#: lib/error.tcl:94 +#: lib/error.tcl:96 msgid "You must correct the above errors before committing." msgstr "コミットする前に、以上のエラーを修正してください" @@ -1682,61 +1680,61 @@ msgid "Unable to unlock the index." msgstr "インデックスをロックできません" -#: lib/index.tcl:15 +#: lib/index.tcl:30 msgid "Index Error" msgstr "索引エラー" -#: lib/index.tcl:17 +#: lib/index.tcl:32 msgid "" "Updating the Git index failed. A rescan will be automatically started to " "resynchronize git-gui." msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。" -#: lib/index.tcl:28 +#: lib/index.tcl:43 msgid "Continue" msgstr "続行" -#: lib/index.tcl:31 +#: lib/index.tcl:46 msgid "Unlock Index" msgstr "インデックスのロック解除" -#: lib/index.tcl:289 +#: lib/index.tcl:330 #, tcl-format msgid "Unstaging %s from commit" msgstr "コミットから '%s' を降ろす" -#: lib/index.tcl:328 +#: lib/index.tcl:369 msgid "Ready to commit." msgstr "コミット準備完了" -#: lib/index.tcl:341 +#: lib/index.tcl:382 #, tcl-format msgid "Adding %s" msgstr "コミットに %s を加えています" -#: lib/index.tcl:398 +#: lib/index.tcl:503 #, tcl-format msgid "Revert changes in file %s?" msgstr "ファイル %s にした変更を元に戻しますか？" -#: lib/index.tcl:400 +#: lib/index.tcl:508 #, tcl-format msgid "Revert changes in these %i files?" msgstr "これら %i 個のファイルにした変更を元に戻しますか？" -#: lib/index.tcl:408 +#: lib/index.tcl:517 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" -#: lib/index.tcl:411 +#: lib/index.tcl:520 lib/index.tcl:563 msgid "Do Nothing" msgstr "何もしない" -#: lib/index.tcl:429 +#: lib/index.tcl:726 msgid "Reverting selected files" msgstr "選択されたファイルにした変更を元に戻します" -#: lib/index.tcl:433 +#: lib/index.tcl:730 #, tcl-format msgid "Reverting %s" msgstr "%s にした変更を元に戻します" @@ -1798,34 +1796,34 @@ "\n" "現在のコミットを完了してからマージを開始してください。そうする方がマージに失敗したときの回復が楽です。\n" -#: lib/merge.tcl:107 +#: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" msgstr "%2$s の %1$s ブランチ" -#: lib/merge.tcl:120 +#: lib/merge.tcl:126 #, tcl-format msgid "Merging %s and %s..." msgstr "%s と %s をマージ中・・・" -#: lib/merge.tcl:131 +#: lib/merge.tcl:137 msgid "Merge completed successfully." msgstr "マージが完了しました" -#: lib/merge.tcl:133 +#: lib/merge.tcl:139 msgid "Merge failed. Conflict resolution is required." msgstr "マージが失敗しました。衝突の解決が必要です。" -#: lib/merge.tcl:158 +#: lib/merge.tcl:164 #, tcl-format msgid "Merge Into %s" msgstr "%s にマージ" -#: lib/merge.tcl:177 +#: lib/merge.tcl:183 msgid "Revision To Merge" msgstr "マージするリビジョン" -#: lib/merge.tcl:212 +#: lib/merge.tcl:218 msgid "" "Cannot abort while amending.\n" "\n" @@ -1835,7 +1833,7 @@ "\n" "まず今のコミット訂正を完了させてください。\n" -#: lib/merge.tcl:222 +#: lib/merge.tcl:228 msgid "" "Abort merge?\n" "\n" @@ -1849,7 +1847,7 @@ "\n" "マージを中断してよろしいですか？" -#: lib/merge.tcl:228 +#: lib/merge.tcl:234 msgid "" "Reset changes?\n" "\n" @@ -1863,19 +1861,19 @@ "\n" "リセットしてよろしいですか？" -#: lib/merge.tcl:239 +#: lib/merge.tcl:246 msgid "Aborting" msgstr "中断しています" -#: lib/merge.tcl:239 +#: lib/merge.tcl:247 msgid "files reset" msgstr "リセットしたファイル" -#: lib/merge.tcl:267 +#: lib/merge.tcl:277 msgid "Abort failed." msgstr "中断に失敗しました。" -#: lib/merge.tcl:269 +#: lib/merge.tcl:279 msgid "Abort completed. Ready." msgstr "中断完了。" @@ -1924,21 +1922,21 @@ msgid "Conflict file does not exist" msgstr "競合ファイルは存在しません。" -#: lib/mergetool.tcl:264 +#: lib/mergetool.tcl:246 #, tcl-format msgid "Not a GUI merge tool: '%s'" msgstr "GUI マージツールではありません: %s" -#: lib/mergetool.tcl:268 +#: lib/mergetool.tcl:275 #, tcl-format msgid "Unsupported merge tool '%s'" msgstr "マージツール '%s' はサポートしていません" -#: lib/mergetool.tcl:303 +#: lib/mergetool.tcl:310 msgid "Merge tool is already running, terminate it?" msgstr "マージツールはすでに起動しています。終了しますか?" -#: lib/mergetool.tcl:323 +#: lib/mergetool.tcl:330 #, tcl-format msgid "" "Error retrieving versions:\n" @@ -1947,7 +1945,7 @@ "版の取り出し時にエラーが出ました:\n" "%s" -#: lib/mergetool.tcl:343 +#: lib/mergetool.tcl:350 #, tcl-format msgid "" "Could not start the merge tool:\n" @@ -1958,11 +1956,11 @@ "\n" "%s" -#: lib/mergetool.tcl:347 +#: lib/mergetool.tcl:354 msgid "Running merge tool..." msgstr "マージツールを実行しています..." -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 msgid "Merge tool failed." msgstr "マージツールが失敗しました。" @@ -1976,129 +1974,129 @@ msgid "Invalid repo encoding '%s'" msgstr "リポジトリエンコーディングに 無効な %s が指定されています" -#: lib/option.tcl:117 +#: lib/option.tcl:119 msgid "Restore Defaults" msgstr "デフォルトに戻す" -#: lib/option.tcl:121 +#: lib/option.tcl:123 msgid "Save" msgstr "保存" -#: lib/option.tcl:131 +#: lib/option.tcl:133 #, tcl-format msgid "%s Repository" msgstr "%s リポジトリ" -#: lib/option.tcl:132 +#: lib/option.tcl:134 msgid "Global (All Repositories)" msgstr "大域（全てのリポジトリ）" -#: lib/option.tcl:138 +#: lib/option.tcl:140 msgid "User Name" msgstr "ユーザ名" -#: lib/option.tcl:139 +#: lib/option.tcl:141 msgid "Email Address" msgstr "メールアドレス" -#: lib/option.tcl:141 +#: lib/option.tcl:143 msgid "Summarize Merge Commits" msgstr "マージコミットの要約" -#: lib/option.tcl:142 +#: lib/option.tcl:144 msgid "Merge Verbosity" msgstr "マージの冗長度" -#: lib/option.tcl:143 +#: lib/option.tcl:145 msgid "Show Diffstat After Merge" msgstr "マージ後に diffstat を表示" -#: lib/option.tcl:144 +#: lib/option.tcl:146 msgid "Use Merge Tool" msgstr "マージツールを使用" -#: lib/option.tcl:146 +#: lib/option.tcl:148 msgid "Trust File Modification Timestamps" msgstr "ファイル変更時刻を信頼する" -#: lib/option.tcl:147 +#: lib/option.tcl:149 msgid "Prune Tracking Branches During Fetch" msgstr "フェッチ中にトラッキングブランチを刈る" -#: lib/option.tcl:148 +#: lib/option.tcl:150 msgid "Match Tracking Branches" msgstr "トラッキングブランチを合わせる" -#: lib/option.tcl:149 +#: lib/option.tcl:152 msgid "Blame Copy Only On Changed Files" msgstr "変更されたファイルのみコピー検知を行なう" -#: lib/option.tcl:150 +#: lib/option.tcl:154 msgid "Minimum Letters To Blame Copy On" msgstr "コピーを検知する最少文字数" -#: lib/option.tcl:151 +#: lib/option.tcl:155 msgid "Blame History Context Radius (days)" msgstr "注釈する履歴半径（日数）" -#: lib/option.tcl:152 +#: lib/option.tcl:156 msgid "Number of Diff Context Lines" msgstr "diff の文脈行数" -#: lib/option.tcl:153 +#: lib/option.tcl:158 msgid "Commit Message Text Width" msgstr "コミットメッセージのテキスト幅" -#: lib/option.tcl:154 +#: lib/option.tcl:159 msgid "New Branch Name Template" msgstr "新しいブランチ名のテンプレート" -#: lib/option.tcl:155 +#: lib/option.tcl:160 msgid "Default File Contents Encoding" msgstr "ファイル内容のデフォルトエンコーディング" -#: lib/option.tcl:203 +#: lib/option.tcl:210 msgid "Change" msgstr "変更" -#: lib/option.tcl:230 +#: lib/option.tcl:254 msgid "Spelling Dictionary:" msgstr "スペルチェック辞書" -#: lib/option.tcl:254 +#: lib/option.tcl:284 msgid "Change Font" msgstr "フォントを変更" -#: lib/option.tcl:258 +#: lib/option.tcl:288 #, tcl-format msgid "Choose %s" msgstr "%s を選択" -#: lib/option.tcl:264 +#: lib/option.tcl:294 msgid "pt." msgstr "ポイント" -#: lib/option.tcl:278 +#: lib/option.tcl:308 msgid "Preferences" msgstr "設定" -#: lib/option.tcl:314 +#: lib/option.tcl:345 msgid "Failed to completely save options:" msgstr "完全にオプションを保存できません:" -#: lib/remote.tcl:163 +#: lib/remote.tcl:218 msgid "Remove Remote" msgstr "リモートを削除" -#: lib/remote.tcl:168 +#: lib/remote.tcl:223 msgid "Prune from" msgstr "から刈込む" -#: lib/remote.tcl:173 +#: lib/remote.tcl:228 msgid "Fetch from" msgstr "取得元" -#: lib/remote.tcl:215 +#: lib/remote.tcl:200 msgid "Push to" msgstr "プッシュ先" @@ -2106,15 +2104,15 @@ msgid "Add Remote" msgstr "リモートを追加" -#: lib/remote_add.tcl:24 +#: lib/remote_add.tcl:25 msgid "Add New Remote" msgstr "リモートを新規に追加" -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 msgid "Add" msgstr "追加" -#: lib/remote_add.tcl:37 +#: lib/remote_add.tcl:39 msgid "Remote Details" msgstr "リモートの詳細" @@ -2122,95 +2120,95 @@ msgid "Location:" msgstr "場所:" -#: lib/remote_add.tcl:62 +#: lib/remote_add.tcl:60 msgid "Further Action" msgstr "その他の動作" -#: lib/remote_add.tcl:65 +#: lib/remote_add.tcl:63 msgid "Fetch Immediately" msgstr "即座に取得" -#: lib/remote_add.tcl:71 +#: lib/remote_add.tcl:69 msgid "Initialize Remote Repository and Push" msgstr "リモートリポジトリを初期化してプッシュ" -#: lib/remote_add.tcl:77 +#: lib/remote_add.tcl:75 msgid "Do Nothing Else Now" msgstr "何もしない" -#: lib/remote_add.tcl:101 +#: lib/remote_add.tcl:100 msgid "Please supply a remote name." msgstr "リモート名を指定してください。" -#: lib/remote_add.tcl:114 +#: lib/remote_add.tcl:113 #, tcl-format msgid "'%s' is not an acceptable remote name." msgstr "'%s' はリモート名に使えません。" -#: lib/remote_add.tcl:125 +#: lib/remote_add.tcl:124 #, tcl-format msgid "Failed to add remote '%s' of location '%s'." msgstr "場所 '%2$s' のリモート '%1$s'の名前変更に失敗しました。" -#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#: lib/transport.tcl:6 lib/remote_add.tcl:132 #, tcl-format msgid "fetch %s" msgstr "%s を取得" -#: lib/remote_add.tcl:134 +#: lib/remote_add.tcl:133 #, tcl-format msgid "Fetching the %s" msgstr "%s からフェッチしています" -#: lib/remote_add.tcl:157 +#: lib/remote_add.tcl:156 #, tcl-format msgid "Do not know how to initialize repository at location '%s'." msgstr "リポジトリ '%s' を初期化できません。" -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 #, tcl-format msgid "push %s" msgstr "%s をプッシュ" -#: lib/remote_add.tcl:164 +#: lib/remote_add.tcl:163 #, tcl-format msgid "Setting up the %s (at %s)" msgstr "%2$s にある %1$s をセットアップします" -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +#: lib/remote_branch_delete.tcl:34 msgid "Delete Branch Remotely" msgstr "リモートブランチ削除" -#: lib/remote_branch_delete.tcl:47 +#: lib/remote_branch_delete.tcl:48 msgid "From Repository" msgstr "元のリポジトリ" -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 msgid "Remote:" msgstr "リモート:" -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 msgid "Arbitrary Location:" msgstr "任意の位置:" -#: lib/remote_branch_delete.tcl:84 +#: lib/remote_branch_delete.tcl:88 msgid "Branches" msgstr "ブランチ" -#: lib/remote_branch_delete.tcl:109 +#: lib/remote_branch_delete.tcl:110 msgid "Delete Only If" msgstr "条件付で削除" -#: lib/remote_branch_delete.tcl:111 +#: lib/remote_branch_delete.tcl:112 msgid "Merged Into:" msgstr "マージ先:" -#: lib/remote_branch_delete.tcl:152 +#: lib/remote_branch_delete.tcl:153 msgid "A branch is required for 'Merged Into'." msgstr "'マージ先' にはブランチが必要です。" -#: lib/remote_branch_delete.tcl:184 +#: lib/remote_branch_delete.tcl:185 #, tcl-format msgid "" "The following branches are not completely merged into %s:\n" @@ -2221,40 +2219,40 @@ "\n" " - %s" -#: lib/remote_branch_delete.tcl:189 +#: lib/remote_branch_delete.tcl:190 #, tcl-format msgid "" "One or more of the merge tests failed because you have not fetched the " "necessary commits. Try fetching from %s first." msgstr "必要なコミットが不足しているために、マージ検査が失敗しました。まず %s からフェッチしてください。" -#: lib/remote_branch_delete.tcl:207 +#: lib/remote_branch_delete.tcl:208 msgid "Please select one or more branches to delete." msgstr "削除するブランチを選択してください。" -#: lib/remote_branch_delete.tcl:226 +#: lib/remote_branch_delete.tcl:227 #, tcl-format msgid "Deleting branches from %s" msgstr "%s からブランチを削除しています。" -#: lib/remote_branch_delete.tcl:292 +#: lib/remote_branch_delete.tcl:300 msgid "No repository selected." msgstr "リポジトリが選択されていません。" -#: lib/remote_branch_delete.tcl:297 +#: lib/remote_branch_delete.tcl:305 #, tcl-format msgid "Scanning %s..." msgstr "%s をスキャンしています..." -#: lib/search.tcl:21 +#: lib/search.tcl:48 msgid "Find:" msgstr "検索:" -#: lib/search.tcl:23 +#: lib/search.tcl:50 msgid "Next" msgstr "次" -#: lib/search.tcl:24 +#: lib/search.tcl:51 msgid "Prev" msgstr "前" @@ -2262,11 +2260,11 @@ msgid "Case-Sensitive" msgstr "大文字小文字を区別" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 msgid "Cannot write shortcut:" msgstr "ショートカットが書けません:" -#: lib/shortcut.tcl:137 +#: lib/shortcut.tcl:140 msgid "Cannot write icon:" msgstr "アイコンが書けません:" @@ -2307,32 +2305,32 @@ msgid "Spell Checker Failed" msgstr "スペルチェック失敗" -#: lib/sshkey.tcl:31 +#: lib/sshkey.tcl:34 msgid "No keys found." msgstr "キーがありません。" -#: lib/sshkey.tcl:34 +#: lib/sshkey.tcl:37 #, tcl-format msgid "Found a public key in: %s" msgstr "公開鍵がありました: %s" -#: lib/sshkey.tcl:40 +#: lib/sshkey.tcl:43 msgid "Generate Key" msgstr "鍵を生成" -#: lib/sshkey.tcl:56 +#: lib/sshkey.tcl:61 msgid "Copy To Clipboard" msgstr "クリップボードにコピー" -#: lib/sshkey.tcl:70 +#: lib/sshkey.tcl:75 msgid "Your OpenSSH Public Key" msgstr "あなたの OpenSSH 公開鍵" -#: lib/sshkey.tcl:78 +#: lib/sshkey.tcl:83 msgid "Generating..." msgstr "生成中..." -#: lib/sshkey.tcl:84 +#: lib/sshkey.tcl:89 #, tcl-format msgid "" "Could not start ssh-keygen:\n" @@ -2343,50 +2341,50 @@ "\n" "%s" -#: lib/sshkey.tcl:111 +#: lib/sshkey.tcl:116 msgid "Generation failed." msgstr "生成に失敗しました。" -#: lib/sshkey.tcl:118 +#: lib/sshkey.tcl:123 msgid "Generation succeeded, but no keys found." msgstr "生成には成功しましたが、鍵が見つかりません。" -#: lib/sshkey.tcl:121 +#: lib/sshkey.tcl:126 #, tcl-format msgid "Your key is in: %s" msgstr "あなたの鍵は %s にあります" -#: lib/status_bar.tcl:83 +#: lib/status_bar.tcl:263 #, tcl-format msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)" -#: lib/tools.tcl:75 +#: lib/tools.tcl:76 #, tcl-format msgid "Running %s requires a selected file." msgstr "ファイルを選択してから %s を起動してください。" -#: lib/tools.tcl:90 +#: lib/tools.tcl:96 #, tcl-format msgid "Are you sure you want to run %s?" msgstr "本当に %s を起動しますか?" -#: lib/tools.tcl:110 +#: lib/tools.tcl:118 #, tcl-format msgid "Tool: %s" msgstr "ツール: %s" -#: lib/tools.tcl:111 +#: lib/tools.tcl:119 #, tcl-format msgid "Running: %s" msgstr "実行中: %s" -#: lib/tools.tcl:149 +#: lib/tools.tcl:158 #, tcl-format msgid "Tool completed successfully: %s" msgstr "ツールが完了しました: %s" -#: lib/tools.tcl:151 +#: lib/tools.tcl:160 #, tcl-format msgid "Tool failed: %s" msgstr "ツールが失敗しました: %s" @@ -2399,52 +2397,52 @@ msgid "Add New Tool Command" msgstr "新規ツールコマンドの追加" -#: lib/tools_dlg.tcl:33 +#: lib/tools_dlg.tcl:34 msgid "Add globally" msgstr "全体に追加" -#: lib/tools_dlg.tcl:45 +#: lib/tools_dlg.tcl:46 msgid "Tool Details" msgstr "ツールの詳細" -#: lib/tools_dlg.tcl:48 +#: lib/tools_dlg.tcl:49 msgid "Use '/' separators to create a submenu tree:" msgstr "'/' でサブメニューを区切ります:" -#: lib/tools_dlg.tcl:61 +#: lib/tools_dlg.tcl:60 msgid "Command:" msgstr "コマンド:" -#: lib/tools_dlg.tcl:74 +#: lib/tools_dlg.tcl:71 msgid "Show a dialog before running" msgstr "起動する前にダイアログを表示" -#: lib/tools_dlg.tcl:80 +#: lib/tools_dlg.tcl:77 msgid "Ask the user to select a revision (sets $REVISION)" msgstr "ユーザにコミットを一つ選ばせる ($REVISION にセットします)" -#: lib/tools_dlg.tcl:85 +#: lib/tools_dlg.tcl:82 msgid "Ask the user for additional arguments (sets $ARGS)" msgstr "ユーザに他の引数を追加させる ($ARGS にセットします)" -#: lib/tools_dlg.tcl:92 +#: lib/tools_dlg.tcl:89 msgid "Don't show the command output window" msgstr "コマンドからの出力ウィンドウを見せない" -#: lib/tools_dlg.tcl:97 +#: lib/tools_dlg.tcl:94 msgid "Run only if a diff is selected ($FILENAME not empty)" msgstr "パッチが選ばれているときだけ動かす($FILENAME が空でない)" -#: lib/tools_dlg.tcl:121 +#: lib/tools_dlg.tcl:118 msgid "Please supply a name for the tool." msgstr "ツール名を指定してください。" -#: lib/tools_dlg.tcl:129 +#: lib/tools_dlg.tcl:126 #, tcl-format msgid "Tool '%s' already exists." msgstr "ツール '%s' はすでに存在します。" -#: lib/tools_dlg.tcl:151 +#: lib/tools_dlg.tcl:148 #, tcl-format msgid "" "Could not add tool:\n" @@ -2457,28 +2455,28 @@ msgid "Remove Tool" msgstr "ツールの削除" -#: lib/tools_dlg.tcl:196 +#: lib/tools_dlg.tcl:193 msgid "Remove Tool Commands" msgstr "ツールコマンドの削除" -#: lib/tools_dlg.tcl:200 +#: lib/tools_dlg.tcl:198 msgid "Remove" msgstr "削除" -#: lib/tools_dlg.tcl:236 +#: lib/tools_dlg.tcl:231 msgid "(Blue denotes repository-local tools)" msgstr "(青色はローカルリポジトリのツールです)" -#: lib/tools_dlg.tcl:297 +#: lib/tools_dlg.tcl:292 #, tcl-format msgid "Run Command: %s" msgstr "コマンドを起動: %s" -#: lib/tools_dlg.tcl:311 +#: lib/tools_dlg.tcl:306 msgid "Arguments" msgstr "引数" -#: lib/tools_dlg.tcl:348 +#: lib/tools_dlg.tcl:341 msgid "OK" msgstr "OK" @@ -2497,45 +2495,45 @@ msgid "Pruning tracking branches deleted from %s" msgstr "%s から削除されたトラッキング・ブランチを刈っています" -#: lib/transport.tcl:26 +#: lib/transport.tcl:55 #, tcl-format msgid "Pushing changes to %s" msgstr "%s へ変更をプッシュしています" -#: lib/transport.tcl:64 +#: lib/transport.tcl:93 #, tcl-format msgid "Mirroring to %s" msgstr "%s へミラーしています" -#: lib/transport.tcl:82 +#: lib/transport.tcl:111 #, tcl-format msgid "Pushing %s %s to %s" msgstr "%3$s へ %1$s %2$s をプッシュしています" -#: lib/transport.tcl:100 +#: lib/transport.tcl:132 msgid "Push Branches" msgstr "ブランチをプッシュ" -#: lib/transport.tcl:114 +#: lib/transport.tcl:147 msgid "Source Branches" msgstr "元のブランチ" -#: lib/transport.tcl:131 +#: lib/transport.tcl:162 msgid "Destination Repository" msgstr "送り先リポジトリ" -#: lib/transport.tcl:169 +#: lib/transport.tcl:205 msgid "Transfer Options" msgstr "転送オプション" -#: lib/transport.tcl:171 +#: lib/transport.tcl:207 msgid "Force overwrite existing branch (may discard changes)" msgstr "既存のブランチを上書き(変更を破棄する可能性があります)" -#: lib/transport.tcl:175 +#: lib/transport.tcl:211 msgid "Use thin pack (for slow network connections)" msgstr "Thin Pack を使う（遅いネットワーク向け）" -#: lib/transport.tcl:179 +#: lib/transport.tcl:215 msgid "Include tags" msgstr "タグを含める" diff -Nru language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/git.po language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/git.po --- language-pack-ja-18.04+20200123/data/ja/LC_MESSAGES/git.po 2020-01-23 16:51:35.000000000 +0000 +++ language-pack-ja-18.04+20200702/data/ja/LC_MESSAGES/git.po 2020-07-08 13:53:31.000000000 +0000 @@ -15,62 +15,62 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2020-01-23 11:17+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:06+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" -#: advice.c:62 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "ヒント: %.*s\n" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:265 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:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:130 +#: advice.c:192 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -240,465 +240,467 @@ msgid "unable to open or read %s" msgstr "" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3152 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3160 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3178 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3191 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3197 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3218 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3341 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3401 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3430 apply.c:3673 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3516 apply.c:3688 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3525 apply.c:3696 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3560 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3563 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3579 apply.c:3583 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3595 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3609 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3614 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3640 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3713 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3715 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3924 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3927 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3947 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3952 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3972 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3976 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3991 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4083 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4090 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4093 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4102 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4112 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4250 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4284 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4290 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4298 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4304 apply.c:4449 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4351 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4421 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4519 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4527 +#: apply.c:4539 msgid "internal error" msgstr "" -#: apply.c:4530 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4541 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4567 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4686 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4694 +#: apply.c:4706 msgid "unrecognized input" msgstr "" -#: apply.c:4714 +#: apply.c:4726 msgid "unable to read index file" msgstr "" -#: apply.c:4871 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4898 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4904 apply.c:4919 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4912 +#: apply.c:4924 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "" -#: apply.c:4956 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4959 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "" -#: apply.c:4962 +#: apply.c:4974 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4965 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4967 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4971 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4973 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4975 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4977 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4981 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4983 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4986 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4988 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4990 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4995 +#: apply.c:5007 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "" -#: apply.c:4997 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5000 apply.c:5003 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5006 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5008 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5010 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5012 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5015 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5018 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "" -#: apply.c:5021 +#: apply.c:5033 msgid "prepend to all filenames" msgstr "" @@ -719,110 +721,110 @@ msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <リポジトリ> [--exec <コマンド>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "アーカイブフォーマット" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "このファイルにアーカイブを書き込む" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "ワーキングディレクトリの.gitattributesを読み込む" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "stderrに圧縮ファイルを報告" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "保存のみ" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "高速で圧縮" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "圧縮率を高める" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "リポジトリ" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -838,33 +840,33 @@ msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:758 +#: bisect.c:770 #, 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:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:768 +#: bisect.c:780 #, 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:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -872,7 +874,7 @@ "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -880,43 +882,43 @@ "We continue anyway." msgstr "" -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -926,44 +928,44 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2735 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:2762 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1083,12 +1085,12 @@ msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1103,8 +1105,8 @@ msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "'%s'を開けません" @@ -1131,58 +1133,58 @@ msgstr[0] "" msgstr[1] "" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "参照 '%s'はrev-listのオプションから除外されています。" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "%s をパースできませんでした" -#: commit.c:52 +#: commit.c:54 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s はコミットではありません!" -#: commit.c:1391 +#: commit.c:1432 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" @@ -1193,157 +1195,157 @@ msgid "memory exhausted" msgstr "" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1740 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" -#: config.c:2091 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2261 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2144 +#: config.c:2250 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2306 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2352 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2354 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2467 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2832 config.c:3085 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2971 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "" @@ -1360,19 +1362,19 @@ "and the repository exists." msgstr "" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:100 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "'git rev-list'を実行できませんでした" -#: connected.c:120 +#: connected.c:139 msgid "failed write to rev-list" msgstr "" -#: connected.c:127 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "" @@ -1473,11 +1475,11 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:543 +#: diffcore-rename.c:592 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "" @@ -1512,24 +1514,24 @@ "'diff.dirstat' の設定変数にエラーが見つかりました:\n" "%s" -#: diff.c:4218 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4563 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4566 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4644 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4729 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1538,31 +1540,31 @@ "--dirstat/-X オプションパラメーターのパースに失敗しました:\n" "%s" -#: diff.c:4417 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:6180 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6186 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1877 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2128 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "" @@ -1570,17 +1572,17 @@ msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:3101 dir.c:3106 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3135 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -1589,20 +1591,20 @@ msgid "Filtering content" msgstr "" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" @@ -1611,209 +1613,209 @@ msgid "remote error: %s" msgstr "リモートエラー: %s" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:476 progress.c:336 msgid "done" msgstr "" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:742 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:781 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:789 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:857 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:873 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:914 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:947 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:953 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:957 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:961 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:965 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:1157 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:907 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:974 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:983 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1000 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1693 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1743 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1746 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:321 +#: gpg-interface.c:457 msgid "gpg failed to sign the data" msgstr "gpg はデータを署名するのに失敗しました" -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s を読み取れません" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "" @@ -1831,38 +1833,38 @@ msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:596 +#: help.c:511 #, 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:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' はgitコマンドではありません。 'git --help'を参照してください。" -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -1872,16 +1874,16 @@ msgstr[0] "" msgstr[1] "" -#: help.c:714 +#: help.c:653 msgid "git version []" msgstr "" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -1935,7 +1937,7 @@ msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" @@ -1944,11 +1946,11 @@ msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:137 msgid "cannot change partial clone promisor remote" msgstr "" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1960,7 +1962,7 @@ "remove the file manually to continue." msgstr "" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" @@ -1969,220 +1971,220 @@ msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 -#: builtin/stash.c:264 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:329 +#: merge-recursive.c:435 msgid "error building trees" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "データベースに%sを追加できません" -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, 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:1487 +#: merge-recursive.c:1479 #, 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:1494 +#: merge-recursive.c:1486 #, 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:1499 +#: merge-recursive.c:1491 #, 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:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1851 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1379 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1597 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:3120 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:2961 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2964 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modify" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modified" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3052 msgid "content" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3056 msgid "add/add" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3101 git-submodule.sh:985 msgid "submodule" msgstr "" -#: merge-recursive.c:3090 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3327 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3350 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "" -#: merge-recursive.c:3355 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3374 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3371 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "" @@ -2192,36 +2194,36 @@ msgid "Dirty index: cannot merge (dirty: %s)" msgstr "" -#: merge-recursive.c:3424 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3433 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3537 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "" -#: merge-recursive.c:3550 +#: merge-recursive.c:3562 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3600 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3756 +#: merge-recursive.c:3768 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "" @@ -2266,25 +2268,25 @@ msgid "unable to parse object: %s" msgstr "" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1887 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1891 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:888 +#: parse-options.c:882 msgid "..." msgstr "" -#: parse-options.c:907 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "" @@ -2292,17 +2294,17 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:916 +#: parse-options.c:910 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:949 msgid "-NUM" msgstr "" @@ -2311,146 +2313,147 @@ msgid "malformed object name '%s'" msgstr "" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pretty.c:966 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1635 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1645 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3126 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3138 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:706 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "書き込み用として '%s' を開けませんでした" -#: refs.c:2055 +#: refs.c:2011 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "" @@ -2614,12 +2617,12 @@ msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1313 +#: ref-filter.c:1424 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1316 +#: ref-filter.c:1430 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2627,7 +2630,7 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1438 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2635,157 +2638,157 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1445 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1335 +#: ref-filter.c:1449 msgid "(no branch)" msgstr "" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: refs.c:669 ref-filter.c:2098 +#: ref-filter.c:2095 refs.c:625 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2389 +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:611 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:615 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:619 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:811 +#: remote.c:623 msgid "Internal error" msgstr "" -#: remote.c:1627 remote.c:1728 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1636 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1639 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1645 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1660 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1672 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1682 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1717 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2019 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2023 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2026 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2033 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2037 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "このブランチは '%s' よりも%dコミット進んでいます。\n" -#: remote.c:2043 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2046 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "このブランチは '%s' に比べて%dコミット遅れています。fast-forwardすることができます。\n" -#: remote.c:2054 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2057 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2796,20 +2799,20 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2067 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2509 +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2512 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2720 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -2824,56 +2827,56 @@ "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:142 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:144 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:146 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:307 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:421 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:423 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:435 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:440 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:187 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:321 +#: sequencer.c:326 msgid "revert" msgstr "" -#: sequencer.c:323 +#: sequencer.c:328 msgid "cherry-pick" msgstr "" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "" @@ -2882,79 +2885,79 @@ msgid "Unknown action: %d" msgstr "" -#: sequencer.c:385 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:388 +#: sequencer.c:393 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:401 sequencer.c:2847 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:408 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "'%s'を読み込めません" -#: sequencer.c:462 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:466 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:498 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:631 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:662 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:648 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:872 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2971,11 +2974,11 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:1146 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1153 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2990,7 +2993,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1166 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3004,63 +3007,63 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1208 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1210 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1256 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1258 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "" -#: sequencer.c:1262 +#: sequencer.c:1256 msgid " (root-commit)" msgstr "" -#: sequencer.c:1283 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1285 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1456 +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1461 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "" @@ -3081,246 +3084,248 @@ "\t%.*s" msgstr "" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1602 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1606 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1612 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1627 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1728 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1754 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1510 +#: sequencer.c:1770 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:1776 +#: sequencer.c:1811 #, 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:1795 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1860 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1915 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "%sをrevertできませんでした... %s" -#: sequencer.c:1916 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "%sを適用できませんでした... %s" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1983 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1990 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2066 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2075 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2166 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2177 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2302 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2304 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2309 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "" -#: sequencer.c:2320 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2322 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "" -#: config.c:406 sequencer.c:2401 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:2404 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2507 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2100 +#: sequencer.c:2487 msgid "a cherry-pick or revert is already in progress" msgstr "すでにcherry-pickまたはrevertを実行中です" -#: sequencer.c:2101 +#: sequencer.c:2488 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "\"git cherry-pick (--continue | --quit | --abort)\" を試してください" -#: sequencer.c:2627 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2642 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "HEADを解決できません" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2738 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2739 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "予期せぬファイル終端(OEF)です" -#: sequencer.c:2745 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2756 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:1433 sequencer.c:4118 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "" -#: sequencer.c:3074 +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -3330,11 +3335,11 @@ "\n" msgstr "" -#: sequencer.c:3080 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3086 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -3345,121 +3350,120 @@ "\n" msgstr "" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3635 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 -#, c-format +#: git-rebase--preserve-merges.sh:113 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3827 +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3898 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3957 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "" -#: sequencer.c:3962 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:3976 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4069 +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4174 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4078 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4080 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4082 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4085 +#: sequencer.c:4234 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:4181 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4285 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4289 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4324 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4774 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4777 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: rebase-interactive.c:26 +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3470,25 +3474,25 @@ "\n" msgstr "" -#: sequencer.c:4935 +#: rebase-interactive.c:11 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:5166 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "" @@ -3497,14 +3501,14 @@ msgid "'%s' is outside repository" msgstr "" -#: setup.c:174 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" -#: setup.c:187 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3512,12 +3516,12 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:236 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:255 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3525,152 +3529,152 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:391 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:395 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:541 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:549 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:568 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:570 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:572 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:574 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:576 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:578 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:677 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:691 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "" -#: setup.c:1110 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:852 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1090 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1099 setup.c:1105 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1116 +#: setup.c:1147 #, 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:1227 +#: setup.c:1258 #, 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:1271 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1286 +#: setup.c:1319 msgid "fork failed" msgstr "" -#: setup.c:1291 +#: setup.c:1324 msgid "setsid failed" msgstr "" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "" -#: sha1_name.c:693 +#: sha1-name.c:770 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" @@ -3692,7 +3696,7 @@ msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule-config.c:761 +#: submodule-config.c:766 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" @@ -3721,48 +3725,48 @@ msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1651 +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1789 +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:2007 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:2026 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3770,12 +3774,12 @@ "'%s'\n" msgstr "" -#: submodule.c:2109 +#: submodule.c:1855 submodule.c:2165 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:2153 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "" @@ -3783,16 +3787,16 @@ msgid "BUG: returned path string doesn't match cwd?" msgstr "" -#: submodule.c:2192 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:303 +#: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:490 +#: submodule-config.c:499 #, c-format msgid "invalid value for %s" msgstr "" @@ -3808,7 +3812,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "" @@ -3861,14 +3865,14 @@ msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:1044 +#: transport.c:1052 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1048 +#: transport.c:1056 #, c-format msgid "" "\n" @@ -3884,123 +3888,123 @@ "\n" msgstr "" -#: transport.c:1056 +#: transport.c:1064 msgid "Aborting." msgstr "" -#: transport-helper.c:1079 +#: transport-helper.c:1025 #, c-format msgid "Could not read ref %s" msgstr "" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, 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:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, 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:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, 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:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, 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:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, 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:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, 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:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4008,7 +4012,7 @@ "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4016,35 +4020,35 @@ "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, 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:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, 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:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" @@ -4072,19 +4076,19 @@ "%s" msgstr "" -#: unpack-trees.c:178 +#: unpack-trees.c:175 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:333 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "" @@ -4117,32 +4121,32 @@ msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2084 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" @@ -4152,8 +4156,8 @@ msgid "could not open '%s' for reading and writing" msgstr "" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4171,7 +4175,7 @@ msgid "Unmerged paths:" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" @@ -4192,11 +4196,11 @@ msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "コミット予定の変更点:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "" @@ -4208,7 +4212,7 @@ msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" @@ -4294,250 +4298,250 @@ msgid "untracked content, " msgstr "" -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "現在のパスは空です。" -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (このパッチをスキップするには\"git am --skip\"を使用してください)" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1331 #, 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:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (このパッチをスキップするには\"git rebase --skip\"を使用してください)" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (全てのコンフリクトが修正されました: \"git rebase --continue\"を実行してください)" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1392 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1439 +#: wt-status.c:1437 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "ブランチ " -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "" -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "現在どのブランチ上でもありません。" -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "最初のコミット" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "追跡されていないファイル" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "無視されるファイル" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4545,226 +4549,226 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "変更なし" -#: wt-status.c:1770 +#: wt-status.c:1768 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "" -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "" -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [] [--] ..." msgstr "" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "'%s'を削除する\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "indexが読み込めせんでした" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "'%s'を適用できません" -#: builtin/add.c:270 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "追跡しているファイルを更新する" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:964 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4782,177 +4786,178 @@ "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:426 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:430 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:445 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1695 builtin/commit.c:374 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1703 +#: builtin/am.c:1659 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "" @@ -4960,26 +4965,26 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1699 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1756 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1762 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "" @@ -4988,14 +4993,14 @@ msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1814 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:1817 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5003,129 +5008,131 @@ "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1976 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2020 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2117 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2153 +#: builtin/am.c:2206 msgid "git am [] [( | )...]" msgstr "" -#: builtin/am.c:2154 +#: builtin/am.c:2207 msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2160 +#: builtin/am.c:2213 msgid "run interactively" msgstr "" -#: builtin/am.c:2162 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "" -#: builtin/am.c:2167 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2170 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2172 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2174 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2176 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2231 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2184 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "" -#: builtin/am.c:2210 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2216 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2218 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2283 msgid "abort the patching operation but keep HEAD where it is." msgstr "" @@ -5133,51 +5140,51 @@ msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2245 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2263 +#: builtin/am.c:2318 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:2270 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2285 +#: builtin/am.c:2340 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2309 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2315 +#: builtin/am.c:2370 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -5250,31 +5257,31 @@ msgid "could not open the file BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "" @@ -5350,43 +5357,43 @@ msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:870 +#: builtin/blame.c:817 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -5398,7 +5405,7 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "" @@ -5600,7 +5607,7 @@ msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "" @@ -5608,7 +5615,7 @@ msgid "change the upstream info" msgstr "" -#: builtin/branch.c:627 +#: builtin/branch.c:603 msgid "Unset the upstream info" msgstr "" @@ -5696,190 +5703,190 @@ msgid "field name to sort on" msgstr "" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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:433 +#: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:812 msgid "" "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:45 +#: builtin/bundle.c:119 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:58 +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:62 +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 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:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:638 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "" @@ -5907,8 +5914,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "" @@ -5920,27 +5927,27 @@ msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -5998,9 +6005,9 @@ msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:675 msgid "string" msgstr "" @@ -6020,105 +6027,105 @@ msgid "git checkout [] [] -- ..." msgstr "" -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:191 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:241 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:259 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:275 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:430 +#: builtin/checkout.c:450 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:833 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:875 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:883 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:945 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:951 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6133,7 +6140,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6150,196 +6157,197 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1443 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "ブランチ" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1537 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1262 msgid "second guess 'git checkout '" msgstr "" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1517 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1693 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1697 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1720 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -6348,7 +6356,7 @@ " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -6361,38 +6369,38 @@ " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1763 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6403,70 +6411,70 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1849 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1846 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:935 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6476,27 +6484,27 @@ msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "" @@ -6508,285 +6516,287 @@ msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:284 +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:401 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:457 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:461 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:491 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:582 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:701 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:751 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:782 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:832 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:895 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:941 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:954 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:957 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:970 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "リポジトリ '%s' は存在しません" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1016 +#: builtin/clone.c:1050 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1036 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1038 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1062 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1123 +#: builtin/clone.c:1160 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1125 +#: builtin/clone.c:1162 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1127 +#: builtin/clone.c:1164 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1129 +#: builtin/clone.c:1166 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1132 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1137 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1223 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6846,11 +6856,11 @@ "\n" msgstr "" -#: builtin/commit.c:59 +#: builtin/commit.c:62 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:62 +#: builtin/commit.c:65 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6860,98 +6870,98 @@ "the remaining commits.\n" msgstr "" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:356 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:465 +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:829 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -6961,7 +6971,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -6971,14 +6981,14 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:870 #, 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:855 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6986,339 +6996,339 @@ "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:905 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "indexを読み込めません" -#: builtin/commit.c:972 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1187 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1213 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1202 +#: builtin/commit.c:361 msgid "No paths with --include/--only does not make sense." msgstr "" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1376 msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 -#: builtin/worktree.c:650 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1385 builtin/commit.c:1543 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1417 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "author" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "コミットメッセージ" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1510 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1511 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1429 +#: builtin/commit.c:1481 msgid "default" msgstr "" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1515 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1535 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1659 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7329,143 +7339,143 @@ msgid "git config []" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7475,16 +7485,16 @@ "#\temail = %s\n" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7507,19 +7517,19 @@ msgid "git describe [] --dirty" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "" @@ -7534,131 +7544,131 @@ msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:441 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:444 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:512 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:515 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:523 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:556 msgid "use any ref" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:541 +#: builtin/describe.c:558 msgid "always use long format" msgstr "" -#: builtin/describe.c:542 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:564 msgid "consider most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:566 msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:551 +#: builtin/describe.c:568 msgid "do not consider tags matching " msgstr "" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:572 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:558 +#: builtin/describe.c:575 msgid "append on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:576 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:605 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:658 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7829,7 +7839,7 @@ msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "" @@ -7841,184 +7851,184 @@ msgid "anonymize output" msgstr "" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [] " msgstr "" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/pull.c:212 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:151 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:157 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:165 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:170 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 msgid "dir" msgstr "" -#: builtin/fetch.c:179 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:182 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:510 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:650 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:748 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:752 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:766 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:776 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:803 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:809 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:848 +#: builtin/fetch.c:852 msgid "forced update" msgstr "" -#: builtin/fetch.c:853 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:908 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:929 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "" @@ -8030,119 +8040,119 @@ " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1481 builtin/fetch.c:1649 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1687 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:1722 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1782 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1800 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "" @@ -8182,7 +8192,7 @@ msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "" @@ -8206,63 +8216,63 @@ msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "" @@ -8337,7 +8347,7 @@ "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" @@ -8355,226 +8365,226 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:849 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:868 msgid "show filenames" msgstr "ファイル名を表示する" -#: builtin/grep.c:862 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:871 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:889 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:892 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:895 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:897 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:891 +#: builtin/grep.c:899 msgid "use worker threads" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:903 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:910 msgid "match " msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:920 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "pager" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:928 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:962 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1036 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1096 +#: builtin/grep.c:1121 msgid "--open-files-in-pager only works on the worktree" msgstr "" @@ -8582,15 +8592,15 @@ msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1094 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1100 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1108 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "" @@ -8633,131 +8643,131 @@ msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" -#: command-list.h:195 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:408 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:409 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "" -#: command-list.h:203 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: command-list.h:204 +#: command-list.h:207 msgid "Defining submodule properties" msgstr "" -#: command-list.h:207 +#: command-list.h:210 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:413 +#: builtin/help.c:417 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: command-list.h:210 +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" @@ -8796,15 +8806,15 @@ msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: builtin/index-pack.c:306 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "" @@ -8861,307 +8871,307 @@ msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1598 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1646 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1653 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:120 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -9224,300 +9234,300 @@ msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:55 +#: builtin/log.c:57 msgid "git log [] [] [[--] ...]" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git show [] ..." msgstr "" -#: builtin/log.c:109 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "show source" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "" -#: builtin/log.c:176 +#: builtin/log.c:182 msgid "only decorate refs that match " msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:184 msgid "do not decorate refs that match " msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:185 msgid "decorate options" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:280 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:534 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:537 builtin/log.c:631 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:643 +#: builtin/log.c:655 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:792 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "" -#: builtin/log.c:909 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:881 +#: builtin/log.c:893 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:898 +#: builtin/log.c:910 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:920 msgid "Not a range." msgstr "" -#: builtin/log.c:1014 +#: builtin/log.c:1043 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1160 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1187 +#: builtin/log.c:1276 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1204 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 #, c-format msgid "Unknown commit %s" msgstr "不明なコミット %s" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1294 +#: builtin/log.c:1326 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1298 +#: builtin/log.c:1330 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:1318 +#: builtin/log.c:1350 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1406 +#: builtin/log.c:1495 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1410 +#: builtin/log.c:1499 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1560 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1563 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1661 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1662 msgid "sfx" msgstr "" -#: builtin/log.c:1573 +#: builtin/log.c:1663 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1665 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1579 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1582 +#: builtin/log.c:1675 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1585 +#: builtin/log.c:1678 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1588 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1591 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1593 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1595 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1597 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1692 msgid "Messaging" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1693 msgid "header" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1694 msgid "add email header" msgstr "" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1695 msgid "add To: header" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1697 msgid "ident" msgstr "" -#: builtin/log.c:1607 +#: builtin/log.c:1698 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1700 msgid "message-id" msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1701 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "" -#: builtin/log.c:1615 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "" -#: builtin/log.c:1619 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1712 msgid "signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1713 msgid "add a signature" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1714 msgid "base-commit" msgstr "" -#: builtin/log.c:1624 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1627 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1629 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1711 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1362 msgid "-n and -k are mutually exclusive." msgstr "" @@ -9525,151 +9535,151 @@ msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1738 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1740 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1773 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1729 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1912 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1948 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1931 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:2051 +#: builtin/log.c:2152 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:2105 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [] [...]" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "" @@ -9684,7 +9694,7 @@ msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "" @@ -9757,180 +9767,180 @@ msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:118 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:247 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:256 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:268 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:274 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:241 +#: builtin/merge.c:277 msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:307 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "" -#: builtin/merge.c:312 +#: builtin/merge.c:316 msgid "stash failed" msgstr "" -#: builtin/merge.c:317 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:498 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:585 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:719 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:734 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:786 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:795 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:764 +#: builtin/merge.c:797 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9940,185 +9950,185 @@ "the commit.\n" msgstr "" -#: builtin/merge.c:862 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "コミットメッセージが空です。" -#: builtin/merge.c:877 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:949 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:988 msgid "No current branch." msgstr "" -#: builtin/merge.c:979 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:986 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1043 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1146 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1180 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1283 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1287 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1309 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1313 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1329 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1336 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1353 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1371 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1409 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1411 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1395 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1397 +#: builtin/merge.c:1418 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: commit.c:1128 +#: commit.c:1168 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1131 +#: commit.c:1172 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1134 +#: commit.c:1175 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1137 +#: commit.c:1178 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1476 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1485 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1537 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1544 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1569 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1575 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1602 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1654 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1656 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1665 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1677 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10143,23 +10153,23 @@ msgid "git merge-base --fork-point []" msgstr "" -#: builtin/merge-base.c:153 +#: builtin/merge-base.c:143 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:155 +#: builtin/merge-base.c:145 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:157 +#: builtin/merge-base.c:147 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:159 +#: builtin/merge-base.c:149 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:161 +#: builtin/merge-base.c:151 msgid "find where forked from reflog of " msgstr "" @@ -10335,52 +10345,52 @@ msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:465 msgid "git name-rev [] ..." msgstr "" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:466 msgid "git name-rev [] --all" msgstr "" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:467 msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:527 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:529 msgid "ignore refs matching " msgstr "" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "" @@ -10520,12 +10530,12 @@ msgid "the note contents have been left in %s" msgstr "" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -10759,7 +10769,7 @@ msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "" @@ -10775,201 +10785,201 @@ msgid "use notes from " msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:973 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1298 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3385 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3396 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3398 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3406 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3412 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3418 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3426 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than