diff options
| -rw-r--r-- | po/de.po | 75 | ||||
| -rw-r--r-- | po/fr.po | 72 | ||||
| -rw-r--r-- | po/ja.po | 74 | ||||
| -rw-r--r-- | po/quilt.pot | 54 | ||||
| -rw-r--r-- | quilt/.cvsignore | 1 | ||||
| -rw-r--r-- | scripts/.cvsignore | 1 | ||||
| -rw-r--r-- | test/add-filename-check.test | 18 | ||||
| -rw-r--r-- | test/trailing-ws.test | 25 |
8 files changed, 224 insertions, 96 deletions
@@ -20,6 +20,7 @@ msgid "Commands are:" msgstr "Vorhandene Befehle:" #: ../bin/quilt.in:30 +#, fuzzy msgid "" "\n" "Common options to all commands:\n" @@ -29,8 +30,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" "Gemeinsame Optionen für alle Befehle:\n" @@ -73,20 +74,20 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %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 "Patch %s ist nicht in der series-Datei enthalten\\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 "Patch %s ist nicht angewandt\\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 "Keine Patches angewandt\\n" @@ -283,7 +284,7 @@ msgstr "Kann nicht in Quellverzeichnis wechseln\\n" msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:415 ../quilt/refresh.in:187 +#: ../quilt/diff.in:415 ../quilt/refresh.in:194 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" @@ -383,27 +384,28 @@ msgstr "Verwendung: quilt fork [neuer_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" -"Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n" -"angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2\\" -"\".\n" -"Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n" -"erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" -#: ../quilt/fork.in:92 +#: ../quilt/fork.in:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" -#: ../quilt/fork.in:104 +#: ../quilt/fork.in:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: ../quilt/fork.in:110 +#: ../quilt/fork.in:117 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -849,7 +851,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" #, fuzzy msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [patch]\\n" +"backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--" "backup] [patch]\\n" @@ -890,6 +892,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" "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n" @@ -926,28 +931,32 @@ msgstr "" "--backup\n" "\tErzeuge ein Backup der alten Version von patch als patch~.\n" -#: ../quilt/refresh.in:159 +#: ../quilt/refresh.in:166 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben\\n" -#: ../quilt/refresh.in:193 +#: ../quilt/refresh.in:200 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " "erzwingen.\\n" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "Nothing in patch %s\\n" msgstr "Patch %s is leer\\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 "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:275 +#: ../quilt/refresh.in:297 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1164,3 +1173,17 @@ msgid "" msgstr "" "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " "Bitte führen Sie \\`quilt upgrade' aus.\\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" +#~ "Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n" +#~ "angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2" +#~ "\\\".\n" +#~ "Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n" +#~ "erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" @@ -31,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" "Options communes toutes les commandes :\n" @@ -76,20 +76,20 @@ msgstr "Le fichier %s n'est pas dans le patch %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 "Le patch %s n'est pas dans la srie\\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 "Le patch %s n'est pas appliqu\\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 "Aucun patch n'est appliqu\\n" @@ -293,7 +293,7 @@ msgstr "Impossible d'entrer dans le rpertoire source\\n" msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: ../quilt/diff.in:415 ../quilt/refresh.in:187 +#: ../quilt/diff.in:415 ../quilt/refresh.in:194 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" @@ -392,27 +392,28 @@ msgstr "Usage : quilt fork [nouveau_nom]\\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" -msgstr "" +"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" -"Fork (c--d duplique) le patch au sommet.\n" -"Si {nouveau_nom} n'est pas spcifi, il s'agira du nom actuel du patch \n" -"dupliqu suivi de -2. Si le nom du patch se termine dj par\n" -"un tiret et un nombre, ce nombre sera incrment. (ex: patch.diff,\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 "" -#: ../quilt/fork.in:92 +#: ../quilt/fork.in:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom.\\n" -#: ../quilt/fork.in:104 +#: ../quilt/fork.in:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Le fork de %s en %s a chou.\\n" -#: ../quilt/fork.in:110 +#: ../quilt/fork.in:117 msgid "Fork of patch %s created as %s\\n" msgstr "Le fork de %s a t cr en tant que %s\\n" @@ -815,7 +816,7 @@ msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" #, fuzzy msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [patch]\\n" +"backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" "Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " "[patch]\\n" @@ -856,6 +857,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" "Rafrachit un patch appliqu, ou celui au sommet dfaut. La " @@ -891,28 +895,32 @@ msgstr "" "\tCre une copie de sauvegarde du patch en ajoutant ~ la fin de \n" "\tson nom.\n" -#: ../quilt/refresh.in:159 +#: ../quilt/refresh.in:166 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de rafrachir des patchs avec -p%s. Veuillez spcifier -p0 ou -p1 " " la place.\\n" -#: ../quilt/refresh.in:193 +#: ../quilt/refresh.in:200 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Des fichiers plus rcents modifient les mmes fichiers que %s.\n" "Forcez le rafrachissement avec -f.\\n" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\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 "Le patch %s n'a pas t modifi\\n" -#: ../quilt/refresh.in:275 +#: ../quilt/refresh.in:297 msgid "Refreshed patch %s\\n" msgstr "Le patch %s a t rafraichi.\\n" @@ -1130,6 +1138,20 @@ msgstr "" "Votre arbre a t cr par une vieille version de quilt. Veuillez \n" "utiliser 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" +#~ "Fork (c--d duplique) le patch au sommet.\n" +#~ "Si {nouveau_nom} n'est pas spcifi, il s'agira du nom actuel du patch \n" +#~ "dupliqu suivi de -2. Si le nom du patch se termine dj par\n" +#~ "un tiret et un nombre, ce nombre sera incrment. (ex: patch.diff,\n" +#~ "patch-2.diff, patch-3.diff).\n" + #~ msgid "Usage: $0 [-fqv] patchname\\n" #~ msgstr "Usage : $0 [-fqv] patchname\\n" @@ -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" diff --git a/po/quilt.pot b/po/quilt.pot index 8159997..52edb17 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -16,8 +16,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 "" #: ../quilt/add.in:22 @@ -42,20 +42,20 @@ msgstr "" #: ../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 "" #: ../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 "" #: ../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 "" @@ -200,7 +200,7 @@ msgstr "" msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:415 ../quilt/refresh.in:187 +#: ../quilt/diff.in:415 ../quilt/refresh.in:194 msgid "Diff failed, aborting\\n" msgstr "" @@ -273,21 +273,28 @@ msgstr "" #: ../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 "" -#: ../quilt/fork.in:92 +#: ../quilt/fork.in:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: ../quilt/fork.in:104 +#: ../quilt/fork.in:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: ../quilt/fork.in:110 +#: ../quilt/fork.in:117 msgid "Fork of patch %s created as %s\\n" msgstr "" @@ -603,7 +610,7 @@ msgstr "" #: ../quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [patch]\\n" +"backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" #: ../quilt/refresh.in:26 @@ -641,26 +648,33 @@ 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 "" -#: ../quilt/refresh.in:159 +#: ../quilt/refresh.in:166 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:193 +#: ../quilt/refresh.in:200 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "Nothing in patch %s\\n" msgstr "" -#: ../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 "" -#: ../quilt/refresh.in:275 +#: ../quilt/refresh.in:297 msgid "Refreshed patch %s\\n" msgstr "" diff --git a/quilt/.cvsignore b/quilt/.cvsignore index 7c9a9be..ad87ee6 100644 --- a/quilt/.cvsignore +++ b/quilt/.cvsignore @@ -1 +1,2 @@ add applied delete diff files grep import new next patches pop previous push refresh remove rest series setup top graph edit fold fork snapshot unapplied +mail upgrade diff --git a/scripts/.cvsignore b/scripts/.cvsignore index 81ec9ae..76fc822 100644 --- a/scripts/.cvsignore +++ b/scripts/.cvsignore @@ -1,3 +1,4 @@ dependency-graph parse-patch apatch patchfns rpatch inspect +edmail diff --git a/test/add-filename-check.test b/test/add-filename-check.test new file mode 100644 index 0000000..b056d74 --- /dev/null +++ b/test/add-filename-check.test @@ -0,0 +1,18 @@ +$ mkdir d +$ cd d +$ mkdir patches +$ quilt new test.diff +>Patch patches/test.diff is now on top + +$ echo foo > foo +$ quilt add foo +> File foo added to patch patches/test.diff + +$ quilt add patches/bar +> File `patches/bar' is located below `patches/' + +$ quilt add .pc/baz +> File `.pc/baz' is located below `.pc/' + +$ cd .. +$ rm -rf d diff --git a/test/trailing-ws.test b/test/trailing-ws.test new file mode 100644 index 0000000..4d63a4b --- /dev/null +++ b/test/trailing-ws.test @@ -0,0 +1,25 @@ + $ mkdir d + $ cd d + + $ echo a > a + $ quilt new test.diff + > Patch patches/test.diff is now on top + + $ quilt add a + > File a added to patch patches/test.diff + + $ echo "a " > a + $ quilt refresh + > Warning: patches/test.diff adds trailing whitespace + > Refreshed patch patches/test.diff + + $ grep '[ \t]$' patches/test.diff + > +a + + $ quilt refresh --strip-trailing-whitespace + > Refreshed patch patches/test.diff + + $ grep '[ \t]$' patches/test.diff + + $ cd .. + $ rm -rf d |