diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2007-05-06 12:40:06 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2007-05-06 12:40:06 +0000 |
commit | bd1dfdab48e3cda765b37efa7d61fb51ae113b4a (patch) | |
tree | a10189c9fabbd319ce15ab71f0e3671a3c6dc4e2 /po/ja.po | |
parent | f08763e88006195c13c2072c466e248d9cb001a1 (diff) | |
download | quilt-bd1dfdab48e3cda765b37efa7d61fb51ae113b4a.tar.gz |
- Mail command: when only a single patch is specified, only mail
that one. Only mail all patches to the end of the series if the
last patch is '-', or no patches have been specified.
- Revert command: change semantics to really revert the changes
relative to the patch instead of removing the file from the
patch. That's much more useful; the other behavior is available
as ``quilt diff <file> | patch -p1'', anyway.
- Update German translation.
Diffstat (limited to 'po/ja.po')
-rw-r--r-- | po/ja.po | 33 |
1 files changed, 19 insertions, 14 deletions
@@ -312,7 +312,7 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:315 +#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:320 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" @@ -712,8 +712,8 @@ msgid "" "the series file, and either store them in a mailbox file, or send them\n" "immediately. The editor is opened with a template for the introduction.\n" "Please see %s for details.\n" -"When specifying a range of patches, a first patch name of \\`-' is\n" -"equivalent to specifying the first applied patch.\n" +"When specifying a range of patches, a first patch name of \\`-' denotes the\n" +"first, and a last patch name of \\`-' denotes the last patch in the series.\n" "\n" "-m text\n" "\tText to use as the text in the introduction. When this option is\n" @@ -773,29 +773,29 @@ msgstr "" "--to, --cc, --bcc\n" "\tToやCC、BCCへの受信者の追加。\n" -#: quilt/mail.in:184 +#: quilt/mail.in:189 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:345 +#: quilt/mail.in:350 msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:373 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:410 +#: quilt/mail.in:415 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "序文に件名がありません(%s として保存されました)\\n" -#: quilt/mail.in:413 +#: quilt/mail.in:418 msgid "Introduction has no subject header\\n" msgstr "序文に件名がありません\\n" -#: quilt/mail.in:503 +#: quilt/mail.in:508 msgid "Introduction saved as %s\\n" msgstr "序文は %s という名前で保存されました\\n" @@ -1249,8 +1249,8 @@ msgstr "使い方: quilt remove [-P パッチ] {ファイル} ...\\n" #, fuzzy msgid "" "\n" -"Revert the changes to one or more files in the topmost or named patch.\n" -"Changes in files that are modified by patches on top of the specified patch\n" +"Revert the changes to the topmost or named patch for the specified file(s).\n" +"Changes to files that are modified by patches on top of the specified patch\n" "cannot be reverted.\n" "\n" "-P patch\n" @@ -1267,12 +1267,17 @@ msgstr "" msgid "File %s is not in patch %s\\n" msgstr "ファイル %s は、パッチ %s に含まれていません\\n" -#: quilt/revert.in:92 +#: quilt/revert.in:102 quilt/revert.in:112 #, fuzzy -msgid "Failed to revert changed to %s in patch %s\\n" +msgid "File %s is unchanged\\n" +msgstr "パッチ %s に変更はありません\\n" + +#: quilt/revert.in:120 +#, fuzzy +msgid "Failed to revert changes to %s in patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n" -#: quilt/revert.in:106 +#: quilt/revert.in:124 #, fuzzy msgid "Changes to %s in patch %s reverted\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" |