diff options
-rw-r--r-- | po/de.po | 26 | ||||
-rw-r--r-- | po/fr.po | 25 | ||||
-rw-r--r-- | po/ja.po | 36 | ||||
-rw-r--r-- | po/quilt.pot | 16 | ||||
-rw-r--r-- | quilt.changes | 5 | ||||
-rw-r--r-- | quilt/add.in | 4 | ||||
-rw-r--r-- | quilt/delete.in | 6 | ||||
-rw-r--r-- | quilt/diff.in | 2 | ||||
-rw-r--r-- | quilt/files.in | 2 | ||||
-rw-r--r-- | quilt/fork.in | 2 | ||||
-rw-r--r-- | quilt/mail.in | 2 | ||||
-rw-r--r-- | quilt/scripts/dependency-graph.in | 2 | ||||
-rw-r--r-- | test/add-filename-check.test | 4 |
13 files changed, 69 insertions, 63 deletions
@@ -79,7 +79,7 @@ msgstr "" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" #: quilt/add.in:48 quilt/add.in:54 -msgid "File \\`%s' is located below \\`%s'\\n" +msgid "File %s is located below %s\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" #: quilt/add.in:103 @@ -157,7 +157,7 @@ msgid "" "\n" "--backup\n" "\tRename the patch file to patch~ rather than deleting it.\n" -"\tIgnored if not used with \\\"-r\\\".\n" +"\tIgnored if not used with \\`-r'.\n" msgstr "" "\n" "Löscht den obersten oder angegebenen Patch aus der series-Datei. Falls\n" @@ -194,11 +194,11 @@ msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/delete.in:126 -msgid "Failed to backup patch file \\\"%s\\\"\\n" +msgid "Failed to backup patch file %s\\n" msgstr "Konnte Datei %s nicht sichern\\n" #: quilt/delete.in:133 -msgid "Failed to remove patch file \\\"%s\\\"\\n" +msgid "Failed to remove patch file %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/diff.in:24 @@ -242,7 +242,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tthe patch specified with -P. A patch name of \\`-' is equivalent\n" "\tto specifying the first applied patch.\n" "\n" "--snapshot\n" @@ -273,7 +273,7 @@ msgstr "" "\tKeine Zeitstempel in Patches angeben.\n" "\n" "--no-index\n" -"\tErzeuge keine \"Index:\"-Zeilen\n" +"\tErzeuge keine \\`Index:'-Zeilen\n" "\n" "-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n" "\n" @@ -369,7 +369,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a listing for all patches between this patch and\n" -"\tthe topmost or specified patch. A patch name of \\\"-\\\" is\n" +"\tthe topmost or specified patch. A patch name of \\`-' is\n" "\tequivalent to specifying the first applied patch.\n" "\n" msgstr "" @@ -385,7 +385,7 @@ msgstr "" "\n" "--combine patch\n" "\tErzeige eine Liste für alle Patches zwischen diesem und dem obersten\n" -"\toder angegebenen Patch am Stack. Der Patchname \\\"-\\\"\n" +"\toder angegebenen Patch am Stack. Der Patchname \\`-'\n" "\tentspricht dem ersten angewandten Patch.\n" "\n" @@ -434,7 +434,7 @@ msgid "" "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" +"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 "" @@ -448,7 +448,7 @@ msgstr "" "refresh.\n" "\n" "Wenn neuer_name fehlt, wird der Name des ursprünglichen Patches verwendet,\n" -"gefolgt von \\\"-2\\\". Falls der name bereits in Strick-Nummer endet, wird " +"gefolgt von \\`-2'. Falls der name bereits in Strick-Nummer endet, wird " "die\n" "Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" @@ -735,7 +735,7 @@ msgid "" "\n" "--sender\n" "\tThe envelope sender address to use. The address must be of the form\n" -"\t\\`\\`user@domain.name''. No display name is allowed.\n" +"\t\\`user@domain.name'. No display name is allowed.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use. If no --from\n" @@ -768,7 +768,7 @@ msgstr "" "\n" "--sender\n" "\tVerwende die angegebene Envelope-Adresse. Die Adresse muss von der Form\n" -"\t\\`\\`user@domain.name'' sein; Anzeigenamen sind nicht möglich.\n" +"\t\\`user@domain.name' sein; Anzeigenamen sind nicht möglich.\n" "\n" "--from, --subject\n" "\tDie Werte für die From- und Subject-Kopfzeilen.\n" @@ -1123,7 +1123,7 @@ msgstr "" "\tKeine Zeitstempel in Patches angeben.\n" "\n" "--no-index\n" -"\tErzeuge keine \"Index:\"-Zeilen\n" +"\tErzeuge keine \\`Index:'-Zeilen\n" "\n" "--diffstat\n" "\tFüge dem Patch-Kopf einen diffstat-Abschnitt hinzu, oder ersetzte den\n" @@ -79,7 +79,7 @@ msgstr "" "\tPatch auquel les fichiers doivent tre ajouts.\n" #: quilt/add.in:48 quilt/add.in:54 -msgid "File \\`%s' is located below \\`%s'\\n" +msgid "File %s is located below %s\\n" msgstr "Le fichier %s est situ en dessous de %s\\n" #: quilt/add.in:103 @@ -157,7 +157,7 @@ msgid "" "\n" "--backup\n" "\tRename the patch file to patch~ rather than deleting it.\n" -"\tIgnored if not used with \\\"-r\\\".\n" +"\tIgnored if not used with \\`-r'.\n" msgstr "" "\n" "Efface le patch spcifi (ou celui au sommet de la pile) de la srie \n" @@ -171,7 +171,7 @@ msgstr "" "\n" "--backup\n" "\tRenomme le fichier en patch~ au lieu de le supprimer.\n" -"\tIgnor si \\\"-r\\\" n'est pas galement utilis.\n" +"\tIgnor si \\`-r' n'est pas galement utilis.\n" #: quilt/delete.in:89 msgid "No next patch\\n" @@ -194,12 +194,12 @@ msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" #: quilt/delete.in:126 -msgid "Failed to backup patch file \\\"%s\\\"\\n" -msgstr "Impossible de faire une copie de scurit du fichier \\\"%s\\\"\\n" +msgid "Failed to backup patch file %s\\n" +msgstr "Impossible de faire une copie de scurit du fichier %s\\n" #: quilt/delete.in:133 -msgid "Failed to remove patch file \\\"%s\\\"\\n" -msgstr "Impossible de retirer le patch \\\"%s\\\"\\n" +msgid "Failed to remove patch file %s\\n" +msgstr "Impossible de retirer le patch %s\\n" #: quilt/diff.in:24 msgid "" @@ -242,7 +242,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tthe patch specified with -P. A patch name of \\`-' is equivalent\n" "\tto specifying the first applied patch.\n" "\n" "--snapshot\n" @@ -371,7 +371,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a listing for all patches between this patch and\n" -"\tthe topmost or specified patch. A patch name of \\\"-\\\" is\n" +"\tthe topmost or specified patch. A patch name of \\`-' is\n" "\tequivalent to specifying the first applied patch.\n" "\n" msgstr "" @@ -435,7 +435,7 @@ msgid "" "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" +"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 "" @@ -451,7 +451,7 @@ msgstr "" "(rafrachir le patch).\n" "\n" "Si nouveau_nom n'est pas prcis, le nouveau nom du patch sera le nom\n" -"actuel suivi de \\\"-2\\\". Si le nom du patch se termine dj par un\n" +"actuel suivi de \\`-2'. Si le nom du patch se termine dj par un\n" "tiret suivi d'un nombre, ce nombre est augment la place (par\n" "exemple : patch.diff, patch-2.diff, patch-3.diff).\n" @@ -738,7 +738,7 @@ msgid "" "\n" "--sender\n" "\tThe envelope sender address to use. The address must be of the form\n" -"\t\\`\\`user@domain.name''. No display name is allowed.\n" +"\t\\`user@domain.name'. No display name is allowed.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use. If no --from\n" @@ -753,6 +753,7 @@ msgstr "" "immdiatement. Un diteur est ouvert avec un patron pour saisir une\n" "introduction. Voir %s pour plus de dtails.\n" "-m texte\n" +"\n" "\tTexte utiliser pour l'introduction. Lorsque cette option est\n" "\tutilise, l'diteur n'est pas invoqu, et les patches sont traits\n" "\timmdiatement.\n" @@ -77,8 +77,8 @@ msgstr "" "\tファイルを追加するパッチ\n" #: quilt/add.in:48 quilt/add.in:54 -msgid "File \\`%s' is located below \\`%s'\\n" -msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" +msgid "File %s is located below %s\\n" +msgstr "ファイル %sは、%s以下にあります\\n" #: quilt/add.in:103 msgid "File %s is already in patch %s\\n" @@ -153,7 +153,7 @@ msgid "" "\n" "--backup\n" "\tRename the patch file to patch~ rather than deleting it.\n" -"\tIgnored if not used with \\\"-r\\\".\n" +"\tIgnored if not used with \\`-r'.\n" msgstr "" "\n" "指定されたパッチ、または最上位のパッチをシリーズファイルから削除する。\n" @@ -167,7 +167,7 @@ msgstr "" "\t削除する。\n" "\n" "--backup\n" -"\tパッチを削除せず、パッチ~に名前を変更します。オプション\\\"-r\\\"が\n" +"\tパッチを削除せず、パッチ~に名前を変更します。オプション\\`-r'が\n" "\t有効ではないときは無視される。\n" #: quilt/delete.in:89 @@ -191,12 +191,12 @@ msgid "Failed to remove patch %s\\n" msgstr "パッチ %s の削除に失敗しました\\n" #: quilt/delete.in:126 -msgid "Failed to backup patch file \\\"%s\\\"\\n" -msgstr "ファイル \\\"%s\\\" のバックアップに失敗しました\\n" +msgid "Failed to backup patch file %s\\n" +msgstr "ファイル %s のバックアップに失敗しました\\n" #: quilt/delete.in:133 -msgid "Failed to remove patch file \\\"%s\\\"\\n" -msgstr "パッチ \\\"%s\\\" の削除に失敗しました\\n" +msgid "Failed to remove patch file %s\\n" +msgstr "パッチ %s の削除に失敗しました\\n" #: quilt/diff.in:24 msgid "" @@ -239,7 +239,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tthe patch specified with -P. A patch name of \\`-' is equivalent\n" "\tto specifying the first applied patch.\n" "\n" "--snapshot\n" @@ -280,7 +280,7 @@ msgstr "" "\n" "--combine パッチ\n" "\tこのパッチと -Pで指定されたパッチの間すべてのパッチの差分を合\n" -"\tせて一つのパッチを作成。\\\"-\\\" というパッチ名は最初に適用された\n" +"\tせて一つのパッチを作成。\\`-' というパッチ名は最初に適用された\n" "\tパッチを指定するするのと同じ意味がある。\n" "\n" "--snapshot\n" @@ -359,7 +359,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a listing for all patches between this patch and\n" -"\tthe topmost or specified patch. A patch name of \\\"-\\\" is\n" +"\tthe topmost or specified patch. A patch name of \\`-' is\n" "\tequivalent to specifying the first applied patch.\n" "\n" msgstr "" @@ -375,7 +375,7 @@ msgstr "" "\n" "--combine パッチ\n" "\t最上位パッチから指定されたパッチまでのパッチ一覧を作成。パッチ\n" -"\t名に\\\"-\\\"を指定すると、一番最初に適用されているパッチを指定した\n" +"\t名に \\`-' を指定すると、一番最初に適用されているパッチを指定した\n" "\tことになる。\n" "\n" @@ -422,7 +422,7 @@ msgid "" "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" +"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 "" @@ -433,8 +433,8 @@ msgstr "" "(例: 別シリーズでの使用や過程の保存) 。典型的なコマンドの順番としては、fork、" "edit、refreshとなる。\n" "\n" -"new_nameが指定されなかった場合、フォークしたパッチ名は現在のパッチ名の後に \\" -"\"-2\\\"が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える " +"new_nameが指定されなかった場合、フォークしたパッチ名は現在のパッチ名の後に " +"\\`-2' が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える " "(例: patch.diff、patch-2.diff、patch-3.diff)。\n" #: quilt/fork.in:94 @@ -455,7 +455,7 @@ msgid "" "[-T ps] [patch]\\n" msgstr "" "使い方: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " -"[-T ps] [パッチ]\\n\"" +"[-T ps] [パッチ]\\n" #: quilt/graph.in:26 msgid "" @@ -713,7 +713,7 @@ msgid "" "\n" "--sender\n" "\tThe envelope sender address to use. The address must be of the form\n" -"\t\\`\\`user@domain.name''. No display name is allowed.\n" +"\t\\`user@domain.name'. No display name is allowed.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use. If no --from\n" @@ -743,7 +743,7 @@ msgstr "" "\n" "--sender\n" "\tエンベロープ用送信者アドレスの指定。アドレスは必ず \n" -"\t\\`\\`user@domain.name''という形になっていなければならない。表示用\n" +"\t\\`user@domain.name'という形になっていなければならない。表示用\n" "\tの名前は使用不可。\n" "\n" "--from, --subject\n" diff --git a/po/quilt.pot b/po/quilt.pot index 80c8d22..0908f03 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -43,7 +43,7 @@ msgid "" msgstr "" #: quilt/add.in:48 quilt/add.in:54 -msgid "File \\`%s' is located below \\`%s'\\n" +msgid "File %s is located below %s\\n" msgstr "" #: quilt/add.in:103 @@ -110,7 +110,7 @@ msgid "" "\n" "--backup\n" "\tRename the patch file to patch~ rather than deleting it.\n" -"\tIgnored if not used with \\\"-r\\\".\n" +"\tIgnored if not used with \\`-r'.\n" msgstr "" #: quilt/delete.in:89 @@ -134,11 +134,11 @@ msgid "Failed to remove patch %s\\n" msgstr "" #: quilt/delete.in:126 -msgid "Failed to backup patch file \\\"%s\\\"\\n" +msgid "Failed to backup patch file %s\\n" msgstr "" #: quilt/delete.in:133 -msgid "Failed to remove patch file \\\"%s\\\"\\n" +msgid "Failed to remove patch file %s\\n" msgstr "" #: quilt/diff.in:24 @@ -179,7 +179,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tthe patch specified with -P. A patch name of \\`-' is equivalent\n" "\tto specifying the first applied patch.\n" "\n" "--snapshot\n" @@ -256,7 +256,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a listing for all patches between this patch and\n" -"\tthe topmost or specified patch. A patch name of \\\"-\\\" is\n" +"\tthe topmost or specified patch. A patch name of \\`-' is\n" "\tequivalent to specifying the first applied patch.\n" "\n" msgstr "" @@ -297,7 +297,7 @@ msgid "" "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" +"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 "" @@ -502,7 +502,7 @@ msgid "" "\n" "--sender\n" "\tThe envelope sender address to use. The address must be of the form\n" -"\t\\`\\`user@domain.name''. No display name is allowed.\n" +"\t\\`user@domain.name'. No display name is allowed.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use. If no --from\n" diff --git a/quilt.changes b/quilt.changes index f3af0db..47b7769 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 1 05:04:04 CET 2006 - agruen@suse.de + +- Clean up quoting in messages. + +------------------------------------------------------------------- Wed Feb 1 01:15:38 CET 2006 - agruen@suse.de - Japanese translation update from Yasushi Shoji. diff --git a/quilt/add.in b/quilt/add.in index bf98e0c..373192f 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -45,13 +45,13 @@ in_valid_dir() do if [ "$path" -ef "$QUILT_PATCHES" ] then - printf $"File \`%s' is located below \`%s'\n" \ + printf $"File %s is located below %s\n" \ "$1" "$QUILT_PATCHES/" return 1 fi if [ "$path" -ef "$QUILT_PC" ] then - printf $"File \`%s' is located below \`%s'\n" \ + printf $"File %s is located below %s\n" \ "$1" "$QUILT_PC/" return 1 fi diff --git a/quilt/delete.in b/quilt/delete.in index 1cb2523..4cb4364 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -34,7 +34,7 @@ topmost patch can be removed right now.) --backup Rename the patch file to patch~ rather than deleting it. - Ignored if not used with \"-r\". + Ignored if not used with \`-r'. " exit 0 @@ -123,14 +123,14 @@ then then if ! mv -f "$patch_file" "$patch_file~" then - printf $"Failed to backup patch file \"%s\"\n" \ + printf $"Failed to backup patch file %s\n" \ "$patch_file" >&2 exit 1 fi else if ! rm -f "$patch_file" then - printf $"Failed to remove patch file \"%s\"\n" \ + printf $"Failed to remove patch file %s\n" \ "$patch_file" >&2 exit 1 fi diff --git a/quilt/diff.in b/quilt/diff.in index 5e56286..25de4fb 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -54,7 +54,7 @@ included. --combine patch Create a combined diff for all patches between this patch and - the patch specified with -P. A patch name of \"-\" is equivalent + the patch specified with -P. A patch name of \`-' is equivalent to specifying the first applied patch. --snapshot diff --git a/quilt/files.in b/quilt/files.in index df0d9db..ba8b054 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -33,7 +33,7 @@ Print the list of files that the topmost or specified patch changes. --combine patch Create a listing for all patches between this patch and - the topmost or specified patch. A patch name of \"-\" is + the topmost or specified patch. A patch name of \`-' is equivalent to specifying the first applied patch. " diff --git a/quilt/fork.in b/quilt/fork.in index e725e2b..f45b5bd 100644 --- a/quilt/fork.in +++ b/quilt/fork.in @@ -31,7 +31,7 @@ because it is used in another series, or for the history. A typical sequence of commands would be: fork, edit, refresh. If new_name is missing, the name of the forked patch will be the current -patch name, followed by \"-2\". If the patch name already ends in a +patch name, followed by \`-2'. If the patch name already ends in a dash-and-number, the number is further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff). " diff --git a/quilt/mail.in b/quilt/mail.in index 2c79ab9..082cb65 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -47,7 +47,7 @@ with a template for the introduction. Please see %s for details. --sender The envelope sender address to use. The address must be of the form - \`\`user@domain.name''. No display name is allowed. + \`user@domain.name'. No display name is allowed. --from, --subject The values for the From and Subject headers to use. If no --from diff --git a/quilt/scripts/dependency-graph.in b/quilt/scripts/dependency-graph.in index 9ee6da6..dee153f 100644 --- a/quilt/scripts/dependency-graph.in +++ b/quilt/scripts/dependency-graph.in @@ -297,7 +297,7 @@ if ($filter_patchnames) { unless ($pid) { # child # open a second pipe to the actual filter open(PIPE, "| $filter_patchnames") - or die "\`$filter_patchnames': $!\n"; + or die "$filter_patchnames: $!\n"; map { print PIPE "$_\n" } @patches; close(PIPE); exit; diff --git a/test/add-filename-check.test b/test/add-filename-check.test index f19f3de..306af66 100644 --- a/test/add-filename-check.test +++ b/test/add-filename-check.test @@ -9,10 +9,10 @@ $ quilt add foo > File foo added to patch patches/test.diff $ quilt add patches/bar -> File `patches/bar' is located below `patches/' +> File patches/bar is located below patches/ $ quilt add .pc/baz -> File `.pc/baz' is located below `.pc/' +> File .pc/baz is located below .pc/ $ cd .. $ rm -rf d |