From bd1dfdab48e3cda765b37efa7d61fb51ae113b4a Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 6 May 2007 12:40:06 +0000 Subject: - 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 | patch -p1'', anyway. - Update German translation. --- po/de.po | 42 ++++++++++++++++++++++++------------------ po/fr.po | 33 +++++++++++++++++++-------------- po/ja.po | 33 +++++++++++++++++++-------------- po/quilt.pot | 32 ++++++++++++++++++-------------- 4 files changed, 80 insertions(+), 60 deletions(-) (limited to 'po') diff --git a/po/de.po b/po/de.po index 45529c3..cd7f2ba 100644 --- a/po/de.po +++ b/po/de.po @@ -322,7 +322,7 @@ msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\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 "Patch %s ist nicht vor Patch %s angewandt\\n" @@ -731,7 +731,8 @@ msgid "" "[first_patch [last_patch]]\\n" msgstr "" "Verwendung: quilt mail {--mbox datei|--send} [-m text] [--prefix prefix] [--" -"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] [first_patch [last_patch]]\\n" +"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] " +"[first_patch [last_patch]]\\n" #: quilt/mail.in:27 msgid "" @@ -740,8 +741,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" @@ -775,8 +776,8 @@ msgstr "" "speichere sie in einer Mailbox-Datei, oder versende sie sofort. Der Editor\n" "wird mit der Vorlage einer Einleitung geöffnet. Für Details siehe\n" "%s.\n" -"Wenn ein Bereich von Patches angegeben wird, kann \\`-' für den ersten Patch\n" -"verwendet werden.\n" +"Wenn ein Bereich von Patches angegeben wird, kann \\`-' für den ersten bzw.\n" +"letzten Patch in der Series-Datei angegeben werden.\n" "\n" "-m text\n" "\tText, der für die Einleitung verwendet werden soll. Wenn\n" @@ -804,28 +805,28 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:184 +#: quilt/mail.in:189 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:345 +#: quilt/mail.in:350 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:373 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:410 +#: quilt/mail.in:415 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:413 +#: quilt/mail.in:418 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:503 +#: quilt/mail.in:508 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -1279,17 +1280,18 @@ msgstr "Verwendung: quilt revert [-P patch] {datei} ...\\n" #: quilt/revert.in:25 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" "\tRevert changes in the named patch.\n" msgstr "" "\n" -"Änderungen an den angegebenen Datei(en) im obersten oder angegebenen Patch\n" +"Änderungen an den angegebenen Dateien am obersten oder angegebenen Patch\n" "zurücknehmen. Änderungen in Dateien, die durch Patches über dem angegebenen\n" "Patch verändert werden, können nicht zurückgenommen werden.\n" +"\n" "-P patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" @@ -1297,11 +1299,15 @@ msgstr "" msgid "File %s is not in patch %s\\n" msgstr "Datei %s ist nicht in Patch %s\\n" -#: quilt/revert.in:92 -msgid "Failed to revert changed to %s in patch %s\\n" +#: quilt/revert.in:102 quilt/revert.in:112 +msgid "File %s is unchanged\\n" +msgstr "Datei %s ist unverändert\\n" + +#: quilt/revert.in:120 +msgid "Failed to revert changes to %s in patch %s\\n" msgstr "Konnte Änderungen an %s in Patch %s nicht zurücknehmen\\n" -#: quilt/revert.in:106 +#: quilt/revert.in:124 msgid "Changes to %s in patch %s reverted\\n" msgstr "Änderungen an %s in Patch %s zurückgenommen\\n" diff --git a/po/fr.po b/po/fr.po index 6fb604d..d00bc57 100644 --- a/po/fr.po +++ b/po/fr.po @@ -324,7 +324,7 @@ msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\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 "Le patch %s n'est pas appliqu avant %s\\n." @@ -738,8 +738,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" @@ -804,28 +804,28 @@ msgstr "" "\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n" "\tcache, respectivement.\n" -#: quilt/mail.in:184 +#: quilt/mail.in:189 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender." -#: quilt/mail.in:345 +#: quilt/mail.in:350 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:373 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqus.\\n" -#: quilt/mail.in:410 +#: quilt/mail.in:415 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" "L'introduction n'a pas de ligne de sujet (sauvegard en tant que %s)\\n" -#: quilt/mail.in:413 +#: quilt/mail.in:418 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:503 +#: quilt/mail.in:508 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegarde en tant que %s\\n" @@ -1291,8 +1291,8 @@ msgstr "Usage : quilt remove [-P patch] {fichier} ...\\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" @@ -1310,12 +1310,17 @@ msgstr "" msgid "File %s is not in patch %s\\n" msgstr "Le fichier %s n'est pas dans le patch %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 "Patch %s inchang\\n" + +#: quilt/revert.in:120 +#, fuzzy +msgid "Failed to revert changes to %s in patch %s\\n" msgstr "Impossible d'enlever le fichier %s du patch %s.\\n" -#: quilt/revert.in:106 +#: quilt/revert.in:124 #, fuzzy msgid "Changes to %s in patch %s reverted\\n" msgstr "Impossible d'inserer %s dans le fichier de srie.\\n" diff --git a/po/ja.po b/po/ja.po index a52eee5..85ccab1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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" diff --git a/po/quilt.pot b/po/quilt.pot index 37711c9..1635bd1 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -206,7 +206,7 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: 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 "" @@ -490,8 +490,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" @@ -521,27 +521,27 @@ msgid "" "\tAppend a recipient to the To, Cc, or Bcc header.\n" msgstr "" -#: quilt/mail.in:184 +#: quilt/mail.in:189 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:345 +#: quilt/mail.in:350 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:368 +#: quilt/mail.in:373 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:410 +#: quilt/mail.in:415 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:413 +#: quilt/mail.in:418 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:503 +#: quilt/mail.in:508 msgid "Introduction saved as %s\\n" msgstr "" @@ -859,8 +859,8 @@ msgstr "" #: quilt/revert.in:25 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" @@ -871,11 +871,15 @@ msgstr "" msgid "File %s is not in patch %s\\n" msgstr "" -#: quilt/revert.in:92 -msgid "Failed to revert changed to %s in patch %s\\n" +#: quilt/revert.in:102 quilt/revert.in:112 +msgid "File %s is unchanged\\n" msgstr "" -#: quilt/revert.in:106 +#: quilt/revert.in:120 +msgid "Failed to revert changes to %s in patch %s\\n" +msgstr "" + +#: quilt/revert.in:124 msgid "Changes to %s in patch %s reverted\\n" msgstr "" -- cgit