diff options
-rw-r--r-- | po/de.po | 26 | ||||
-rw-r--r-- | po/fr.po | 26 | ||||
-rw-r--r-- | po/ja.po | 26 | ||||
-rw-r--r-- | po/quilt.pot | 26 | ||||
-rw-r--r-- | quilt.changes | 5 | ||||
-rw-r--r-- | quilt/pop.in | 35 |
6 files changed, 68 insertions, 76 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:246 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 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:261 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:272 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:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:306 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:114 +#: quilt/diff.in:343 quilt/pop.in:125 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:138 +#: quilt/diff.in:367 quilt/pop.in:149 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -688,7 +688,7 @@ msgstr "Konnte Patch %s nicht importieren\\n" msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" -#: quilt/mail.in:25 +#: quilt/mail.in:24 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -696,7 +696,7 @@ msgstr "" "Verwendung: quilt mail {--mbox datei|--send} [--from ...] [--to ...] [--" "cc ...] [--bcc ...] [--subject ...]\\n" -#: quilt/mail.in:28 +#: quilt/mail.in:27 msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -842,29 +842,29 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:156 +#: quilt/pop.in:167 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:181 +#: quilt/pop.in:192 msgid "Patch %s appears to be empty, removing\\n" msgstr "Patch %s scheint leer zu sein; wird entfernt\\n" -#: quilt/pop.in:185 +#: quilt/pop.in:196 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: quilt/pop.in:269 +#: quilt/pop.in:280 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: quilt/pop.in:279 +#: quilt/pop.in:290 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:302 quilt/push.in:372 +#: quilt/pop.in:313 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:246 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 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:261 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:272 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:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:306 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:114 +#: quilt/diff.in:343 quilt/pop.in:125 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:138 +#: quilt/diff.in:367 quilt/pop.in:149 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -691,7 +691,7 @@ msgstr "Impossible d'importer le patch %s\\n" msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" -#: quilt/mail.in:25 +#: quilt/mail.in:24 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -699,7 +699,7 @@ msgstr "" "Usage : quilt mail {--mbox fichier|--send} [--from ...] [--to ...] [--" "cc ...] [--bcc ...] [--subject ...]\\n" -#: quilt/mail.in:28 +#: quilt/mail.in:27 msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -854,29 +854,29 @@ msgstr "" "\n" "-v\tOpère verbeusement.\n" -#: quilt/pop.in:156 +#: quilt/pop.in:167 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:181 +#: quilt/pop.in:192 msgid "Patch %s appears to be empty, removing\\n" msgstr "Le patch %s semble vide, enlevé\\n" -#: quilt/pop.in:185 +#: quilt/pop.in:196 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/pop.in:269 +#: quilt/pop.in:280 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit être rafraichi au préalable.\\n" -#: quilt/pop.in:279 +#: quilt/pop.in:290 msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: quilt/pop.in:302 quilt/push.in:372 +#: quilt/pop.in:313 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:246 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 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:261 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:272 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:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:306 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:114 +#: quilt/diff.in:343 quilt/pop.in:125 msgid "Failed to copy files to temporary directory\\n" msgstr "テンãƒãƒ©ãƒªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚³ãƒ”ーã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/diff.in:367 quilt/pop.in:138 +#: quilt/diff.in:367 quilt/pop.in:149 msgid "Failed to patch temporary files\\n" msgstr "テンãƒãƒ©ãƒªãƒ•ã‚¡ã‚¤ãƒ«ã¸ã®ãƒ‘ッãƒé©ç”¨ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" @@ -672,7 +672,7 @@ msgstr "パッム%s ã®å–ã‚Šè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルã¸ã®ãƒ‘ッム%s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/mail.in:25 +#: quilt/mail.in:24 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -680,7 +680,7 @@ msgstr "" "使ã„æ–¹: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] " "[--bcc ...] [--subject ...]\\n" -#: quilt/mail.in:28 +#: quilt/mail.in:27 msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -827,29 +827,29 @@ msgstr "" "\n" "-v\t詳細ã«è¡¨ç¤ºã€‚\n" -#: quilt/pop.in:156 +#: quilt/pop.in:167 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッム%s ã‚’ã€æ£å¸¸ã«ã¯ãšã™ã“ã¨ãŒã§ãã¾ã›ã‚“ (リフレッシュã™ã‚‹ã‹ -fを付\n" "ã‘ã¦ã¯ãšã—ã¦ãã ã•ã„)\\n" -#: quilt/pop.in:181 +#: quilt/pop.in:192 msgid "Patch %s appears to be empty, removing\\n" msgstr "パッム%s ã¯ã€ç©ºã®ã‚ˆã†ã§ã™ã€‚ã¯ãšã—ã¾ã™\\n" -#: quilt/pop.in:185 +#: quilt/pop.in:196 msgid "Removing patch %s\\n" msgstr "パッム%s ã‚’ã¯ãšã—ã¾ã™\\n" -#: quilt/pop.in:269 +#: quilt/pop.in:280 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最åˆã«ã€ãƒ‘ッム%s ã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™ã€‚\\n" -#: quilt/pop.in:279 +#: quilt/pop.in:290 msgid "No patch removed\\n" msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/pop.in:302 quilt/push.in:372 +#: quilt/pop.in:313 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "ç¾åœ¨ä½ç½®ã¯ãƒ‘ッム%s ã§ã™\\n" diff --git a/po/quilt.pot b/po/quilt.pot index ee730e5..e42f7ea 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:246 quilt/previous.in:62 +#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:257 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:261 quilt/refresh.in:154 quilt/remove.in:74 +#: quilt/pop.in:272 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:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 +#: quilt/pop.in:306 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:114 +#: quilt/diff.in:343 quilt/pop.in:125 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:367 quilt/pop.in:138 +#: quilt/diff.in:367 quilt/pop.in:149 msgid "Failed to patch temporary files\\n" msgstr "" @@ -473,13 +473,13 @@ msgstr "" msgid "Failed to insert patch %s into file series\\n" msgstr "" -#: quilt/mail.in:25 +#: quilt/mail.in:24 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" msgstr "" -#: quilt/mail.in:28 +#: quilt/mail.in:27 msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -576,27 +576,27 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:156 +#: quilt/pop.in:167 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:181 +#: quilt/pop.in:192 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:185 +#: quilt/pop.in:196 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:269 +#: quilt/pop.in:280 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:279 +#: quilt/pop.in:290 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:302 quilt/push.in:372 +#: quilt/pop.in:313 quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index a3b70da..4c225c0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 15 12:33:32 CEST 2005 - agruen@suse.de + +- quilt/pop.in: get rid of tac. + +------------------------------------------------------------------- Thu Sep 15 01:51:20 CEST 2005 - agruen@suse.de - quilt/mail.in: Remove stray getopt line. If --subject is given, diff --git a/quilt/pop.in b/quilt/pop.in index ac67625..2b4f021 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -50,30 +50,17 @@ completion can be used. list_patches() { - local n=0 patch - applied_patches \ - | tac \ - | if [ -n "$opt_all" ] - then - cat - else - while read patch - do - if [ -n "$number" ] - then - if [ $n -eq $number ] - then - break - fi - n=$[$n+1] - fi - if [ $patch = "$stop_at_patch" ] - then - break - fi - echo $patch - done - fi + local n patches + patches=( $(applied_patches) ) + for ((n=${#patches[@]}-1; n>0; n--)) + do + if [ -n "$number" ] + then + (( number-- > 0 )) || break + fi + [ ${patches[n]} = "$stop_at_patch" ] && break + echo ${patches[n]} + done } files_may_have_changed() |