diff options
| -rw-r--r-- | po/de.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 22 | ||||
| -rw-r--r-- | po/ja.po | 22 | ||||
| -rw-r--r-- | po/quilt.pot | 22 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/pop.in | 2 |
6 files changed, 51 insertions, 45 deletions
@@ -84,20 +84,20 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 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/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 -#: quilt/pop.in:272 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:248 quilt/refresh.in:154 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:88 quilt/diff.in:247 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:306 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -332,11 +332,11 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:343 quilt/pop.in:125 +#: quilt/diff.in:343 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/diff.in:367 quilt/pop.in:149 +#: quilt/diff.in:367 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -842,29 +842,29 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:167 +#: quilt/pop.in:143 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " "erzwingen mit -f)\\n" -#: quilt/pop.in:192 +#: quilt/pop.in:168 msgid "Patch %s appears to be empty, removing\\n" msgstr "Patch %s scheint leer zu sein; wird entfernt\\n" -#: quilt/pop.in:196 +#: quilt/pop.in:172 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: quilt/pop.in:280 +#: quilt/pop.in:256 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: quilt/pop.in:290 +#: quilt/pop.in:266 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:313 quilt/push.in:372 +#: quilt/pop.in:289 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -84,20 +84,20 @@ msgstr "Le fichier %s est situé en dessous de %s\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" #: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 -#: quilt/pop.in:272 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:248 quilt/refresh.in:154 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:88 quilt/diff.in:247 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:306 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" @@ -334,11 +334,11 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqué avant %s\\n." -#: quilt/diff.in:343 quilt/pop.in:125 +#: quilt/diff.in:343 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" -#: quilt/diff.in:367 quilt/pop.in:149 +#: quilt/diff.in:367 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -854,29 +854,29 @@ msgstr "" "\n" "-v\tOpère verbeusement.\n" -#: quilt/pop.in:167 +#: quilt/pop.in:143 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" "\\n" -#: quilt/pop.in:192 +#: quilt/pop.in:168 msgid "Patch %s appears to be empty, removing\\n" msgstr "Le patch %s semble vide, enlevé\\n" -#: quilt/pop.in:196 +#: quilt/pop.in:172 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/pop.in:280 +#: quilt/pop.in:256 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit être rafraichi au préalable.\\n" -#: quilt/pop.in:290 +#: quilt/pop.in:266 msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: quilt/pop.in:313 quilt/push.in:372 +#: quilt/pop.in:289 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -82,20 +82,20 @@ msgstr "ファイル \\`%s'ã¯ã€\\`%s'以下ã«ã‚ã‚Šã¾ã™\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッム%s 㯠seriesã®ä¸ã«ã‚ã‚Šã¾ã›ã‚“\\n" #: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 -#: quilt/pop.in:272 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッム%s ã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“\\n" #: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:306 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 msgid "No patches applied\\n" msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n" @@ -328,11 +328,11 @@ msgstr "-p%sã§ãƒ‘ッãƒã®å·®åˆ†ã¯ã¨ã‚Œã¾ã›ã‚“。-p0ã‹ -p1を指定ã—ã¦ã msgid "Patch %s not applied before patch %s\\n" msgstr "パッム%s ã¯ã€ãƒ‘ッム%s ã®å‰ã«é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“\\n" -#: quilt/diff.in:343 quilt/pop.in:125 +#: quilt/diff.in:343 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "テンãƒãƒ©ãƒªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚³ãƒ”ーã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/diff.in:367 quilt/pop.in:149 +#: quilt/diff.in:367 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "テンãƒãƒ©ãƒªãƒ•ã‚¡ã‚¤ãƒ«ã¸ã®ãƒ‘ッãƒé©ç”¨ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" @@ -827,29 +827,29 @@ msgstr "" "\n" "-v\t詳細ã«è¡¨ç¤ºã€‚\n" -#: quilt/pop.in:167 +#: quilt/pop.in:143 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッム%s ã‚’ã€æ£å¸¸ã«ã¯ãšã™ã“ã¨ãŒã§ãã¾ã›ã‚“ (リフレッシュã™ã‚‹ã‹ -fを付\n" "ã‘ã¦ã¯ãšã—ã¦ãã ã•ã„)\\n" -#: quilt/pop.in:192 +#: quilt/pop.in:168 msgid "Patch %s appears to be empty, removing\\n" msgstr "パッム%s ã¯ã€ç©ºã®ã‚ˆã†ã§ã™ã€‚ã¯ãšã—ã¾ã™\\n" -#: quilt/pop.in:196 +#: quilt/pop.in:172 msgid "Removing patch %s\\n" msgstr "パッム%s ã‚’ã¯ãšã—ã¾ã™\\n" -#: quilt/pop.in:280 +#: quilt/pop.in:256 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最åˆã«ã€ãƒ‘ッム%s ã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™ã€‚\\n" -#: quilt/pop.in:290 +#: quilt/pop.in:266 msgid "No patch removed\\n" msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/pop.in:313 quilt/push.in:372 +#: quilt/pop.in:289 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "ç¾åœ¨ä½ç½®ã¯ãƒ‘ッム%s ã§ã™\\n" diff --git a/po/quilt.pot b/po/quilt.pot index e42f7ea..6918748 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -48,20 +48,20 @@ msgstr "" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" #: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 -#: quilt/pop.in:272 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" #: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:306 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 msgid "No patches applied\\n" msgstr "" @@ -228,11 +228,11 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:343 quilt/pop.in:125 +#: quilt/diff.in:343 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:367 quilt/pop.in:149 +#: quilt/diff.in:367 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "" @@ -576,27 +576,27 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:167 +#: quilt/pop.in:143 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:192 +#: quilt/pop.in:168 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:196 +#: quilt/pop.in:172 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:280 +#: quilt/pop.in:256 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:290 +#: quilt/pop.in:266 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:313 quilt/push.in:372 +#: quilt/pop.in:289 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index c282069..d13c97c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 15 23:35:44 CEST 2005 - agruen@suse.de + +- Fix off-by-one error: it's not a good idea to edit $x instead + of $x.in. + +------------------------------------------------------------------- Thu Sep 15 22:19:55 CEST 2005 - khali@linux-fr.org - Makefile.in: Add missing dependency of doc/README on quilt/*. diff --git a/quilt/pop.in b/quilt/pop.in index 2b4f021..2026be1 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -52,7 +52,7 @@ list_patches() { local n patches patches=( $(applied_patches) ) - for ((n=${#patches[@]}-1; n>0; n--)) + for ((n=${#patches[@]}-1; n>=0; n--)) do if [ -n "$number" ] then |