From 916474e003209b04c79342dbb1fa4e5798b9109d Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 29 Apr 2005 07:32:05 +0000 Subject: - Add add-filename-check.test and trailing-ws.test test cases. --- po/ja.po | 74 ++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 25 deletions(-) (limited to 'po/ja.po') diff --git a/po/ja.po b/po/ja.po index bd5cf8a..747a8a7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -21,6 +21,7 @@ msgid "Commands are:" msgstr "コマンド一覧:" #: ../bin/quilt.in:30 +#, fuzzy msgid "" "\n" "Common options to all commands:\n" @@ -30,8 +31,8 @@ msgid "" "\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc (or\n" -"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n" -"\tdocumentation for details about its possible content." +"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" +"\tdocumentation for details about its possible contents." msgstr "" "\n" "全コマンド共通オプション:\n" @@ -73,20 +74,20 @@ msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:141 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" #: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../quilt/remove.in:74 +#: ../quilt/pop.in:254 ../quilt/refresh.in:147 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 -#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 +#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:148 ../quilt/remove.in:81 +#: ../quilt/refresh.in:155 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -278,7 +279,7 @@ msgstr "ソースディレクトリに移動できません\\n" msgid "File %s is not being modified\\n" msgstr "ファイル %sは変更されていません\\n" -#: ../quilt/diff.in:415 ../quilt/refresh.in:187 +#: ../quilt/diff.in:415 ../quilt/refresh.in:194 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" @@ -375,26 +376,28 @@ msgstr "使い方: quilt fork [new_name]\\n" #: ../quilt/fork.in:25 msgid "" "\n" -"Fork the topmost patch. If new_name is missing, the name of the\n" -"forked patch will be the current patch name, followed by \\\"-2\\\".\n" -"If the patch name already ends in a dash-and-number, the number is\n" -"further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n" +"Fork the topmost patch. Forking a patch means creating a verbatim copy\n" +"of it under a new name, and use that new name instead of the original\n" +"one in the current series. This is useful when a patch has to be\n" +"modified, but the original version of it should be preserved, e.g.\n" +"because it is used in another series, or for the history. A typical\n" +"sequence of commands would be: fork, edit, refresh.\n" +"\n" +"If new_name is missing, the name of the forked patch will be the current\n" +"patch name, followed by \\\"-2\\\". If the patch name already ends in a\n" +"dash-and-number, the number is further incremented (e.g., patch.diff,\n" +"patch-2.diff, patch-3.diff).\n" msgstr "" -"\n" -"最上位のパッチを分岐。new_nameが指定されなかった場合、分岐したパッチ名\n" -"は現在のパッチ名の後に \\\"-2\\\"が付く。すでにパッチ名がハイフンと番号で\n" -"終っている場合、番号の値が1増える (例: patch.diff、patch-2.diff、\n" -"patch-3.diff)。\n" -#: ../quilt/fork.in:92 +#: ../quilt/fork.in:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n" -#: ../quilt/fork.in:104 +#: ../quilt/fork.in:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n" -#: ../quilt/fork.in:110 +#: ../quilt/fork.in:117 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %sの分岐で %sが作成されました\\n" @@ -843,7 +846,7 @@ msgstr "" #, fuzzy msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [patch]\\n" +"backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " "[パッチ]\\n" @@ -884,6 +887,9 @@ msgid "" "\tCreate a backup copy of the old version of a patch as patch~.\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" +"\n" +"--strip-trailing-whitespace\n" +"\tStrip trailing whitespace at the end of lines of the generated patch.\n" msgstr "" "\n" "指定されたパッチを作成し直す。これをリフレッシュすると呼ぶ。デフォルト\n" @@ -917,27 +923,31 @@ msgstr "" "\tバックアップ用のコピーとして古いバージョンのパッチを patch~の\n" "\t形で作成する。\n" -#: ../quilt/refresh.in:159 +#: ../quilt/refresh.in:166 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: ../quilt/refresh.in:193 +#: ../quilt/refresh.in:200 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行" "する場合は -f オプションを使用してください。\\n" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: ../quilt/refresh.in:261 +#: ../quilt/refresh.in:221 +msgid "Warning: %s adds trailing whitespace\\n" +msgstr "" + +#: ../quilt/refresh.in:283 msgid "Patch %s is unchanged\\n" msgstr "パッチ % に変更はありません\\n" -#: ../quilt/refresh.in:275 +#: ../quilt/refresh.in:297 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1151,3 +1161,17 @@ msgid "" msgstr "" "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので" "す。'quilt upgrade'を実行してください。\\n" + +#~ msgid "" +#~ "\n" +#~ "Fork the topmost patch. If new_name is missing, the name of the\n" +#~ "forked patch will be the current patch name, followed by \\\"-2\\\".\n" +#~ "If the patch name already ends in a dash-and-number, the number is\n" +#~ "further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n" +#~ msgstr "" +#~ "\n" +#~ "最上位のパッチを分岐。new_nameが指定されなかった場合、分岐したパッチ名\n" +#~ "は現在のパッチ名の後に \\\"-2\\\"が付く。すでにパッチ名がハイフンと番号" +#~ "で\n" +#~ "終っている場合、番号の値が1増える (例: patch.diff、patch-2.diff、\n" +#~ "patch-3.diff)。\n" -- cgit