summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2006-01-22 23:29:04 +0000
committerAndreas Gruenbacher <agruen@suse.de>2006-01-22 23:29:04 +0000
commit4507162b2b4f0eb4b11ac9317c6bcd49c9007da6 (patch)
treef84e03ce76b0509a59ef9c16dc5069d5ffe94557 /po
parentd208809b7d42c769fc966bac8afc4d7e84189488 (diff)
downloadquilt-4507162b2b4f0eb4b11ac9317c6bcd49c9007da6.tar.gz
- Use a more clear message for when patches apply with -R.
Diffstat (limited to 'po')
-rw-r--r--po/de.po26
-rw-r--r--po/fr.po23
-rw-r--r--po/ja.po23
-rw-r--r--po/quilt.pot22
4 files changed, 57 insertions, 37 deletions
diff --git a/po/de.po b/po/de.po
index e4879c6..b09ff4c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -657,7 +657,9 @@ msgstr "Die Patch-Header unterscheiden sich:\\n"
#: quilt/import.in:70
msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
-msgstr "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header erhalten bleiben sollen.\\n"
+msgstr ""
+"Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header "
+"erhalten bleiben sollen.\\n"
#: quilt/import.in:123
msgid "Option \\`-n' can only be used when importing a single patch\\n"
@@ -891,7 +893,7 @@ msgstr "Kein Patch entfernt\\n"
msgid "No patches applied\\n"
msgstr "Keine Patches angewandt\\n"
-#: quilt/pop.in:273 quilt/push.in:340
+#: quilt/pop.in:273 quilt/push.in:368
msgid "Now at patch %s\\n"
msgstr "Jetzt in Patch %s\\n"
@@ -977,27 +979,31 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
-#: quilt/push.in:157
+#: quilt/push.in:177
msgid "Applying patch %s\\n"
msgstr "Wende Patch %s an\\n"
-#: quilt/push.in:189
+#: quilt/push.in:209
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
-#: quilt/push.in:193
+#: quilt/push.in:213
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Patch %s scheint leer zu sein; angewandt\\n"
-#: quilt/push.in:197
+#: quilt/push.in:217
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n"
-#: quilt/push.in:202
+#: quilt/push.in:226
+msgid "Patch %s can be reverse-applied\\n"
+msgstr "Patch %s kann verkehrt angewandt werden\\n"
+
+#: quilt/push.in:229
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
-#: quilt/push.in:320
+#: quilt/push.in:348
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
@@ -1122,11 +1128,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "Patch %s ist leer\\n"
-#: quilt/refresh.in:271
+#: quilt/refresh.in:272
msgid "Patch %s is unchanged\\n"
msgstr "Patch %s ist unverändert\\n"
-#: quilt/refresh.in:276
+#: quilt/refresh.in:277
msgid "Refreshed patch %s\\n"
msgstr "Patch %s aufgefrischt\\n"
diff --git a/po/fr.po b/po/fr.po
index c4847f8..57a908a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -901,7 +901,7 @@ msgstr "Aucun patch retiré\\n"
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqué\\n"
-#: quilt/pop.in:273 quilt/push.in:340
+#: quilt/pop.in:273 quilt/push.in:368
msgid "Now at patch %s\\n"
msgstr "Le patch %s est maintenant au sommet\\n"
@@ -994,28 +994,33 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
-#: quilt/push.in:157
+#: quilt/push.in:177
msgid "Applying patch %s\\n"
msgstr "Application de %s\\n"
-#: quilt/push.in:189
+#: quilt/push.in:209
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
-#: quilt/push.in:193
+#: quilt/push.in:213
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
-#: quilt/push.in:197
+#: quilt/push.in:217
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
-#: quilt/push.in:202
+#: quilt/push.in:226
+#, fuzzy
+msgid "Patch %s can be reverse-applied\\n"
+msgstr "Le patch %s n'est pas appliqué\\n"
+
+#: quilt/push.in:229
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
-#: quilt/push.in:320
+#: quilt/push.in:348
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
@@ -1136,11 +1141,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "Le patch %s ne contient rien\\n"
-#: quilt/refresh.in:271
+#: quilt/refresh.in:272
msgid "Patch %s is unchanged\\n"
msgstr "Patch %s inchangé\\n"
-#: quilt/refresh.in:276
+#: quilt/refresh.in:277
msgid "Refreshed patch %s\\n"
msgstr "Patch %s rafraîchi\\n"
diff --git a/po/ja.po b/po/ja.po
index 185a9b7..cecd920 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -875,7 +875,7 @@ msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n"
msgid "No patches applied\\n"
msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n"
-#: quilt/pop.in:273 quilt/push.in:340
+#: quilt/pop.in:273 quilt/push.in:368
msgid "Now at patch %s\\n"
msgstr "ç¾åœ¨ä½ç½®ã¯ãƒ‘ッム%s ã§ã™\\n"
@@ -963,28 +963,33 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "ユーザã«ã‚ˆã£ã¦ä¸­æ–­ã•ã‚Œã¾ã—ãŸã€‚パッム% ã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“。\\n"
-#: quilt/push.in:157
+#: quilt/push.in:177
msgid "Applying patch %s\\n"
msgstr "パッム%s ã‚’é©ç”¨ã—ã¦ã„ã¾ã™\\n"
-#: quilt/push.in:189
+#: quilt/push.in:209
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "パッム%s ã¯å­˜åœ¨ã—ã¾ã›ã‚“。空ã®ãƒ‘ッãƒã‚’é©ç”¨ã—ã¾ã—ãŸ\\n"
-#: quilt/push.in:193
+#: quilt/push.in:213
msgid "Patch %s appears to be empty; applied\\n"
msgstr "パッム%s ã¯ç©ºã®ã‚ˆã†ã§ã™ãŒã€é©ç”¨ã—ã¾ã—ãŸ\\n"
-#: quilt/push.in:197
+#: quilt/push.in:217
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
"パッム% ã‚’é©ç”¨ã—ã¾ã—㟠(強制é©ç”¨ã—ãŸãŸã‚ã«ã€ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™)\\n"
-#: quilt/push.in:202
+#: quilt/push.in:226
+#, fuzzy
+msgid "Patch %s can be reverse-applied\\n"
+msgstr "パッム%s ã¯ã€ã™ã§ã«é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n"
+
+#: quilt/push.in:229
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "パッム%sãŒé©ç”¨ã§ãã¾ã›ã‚“ (強制é©ç”¨ã™ã‚‹å ´åˆã¯ -fを付ã‘ã¦ãã ã•ã„)\\n"
-#: quilt/push.in:320
+#: quilt/push.in:348
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "最上ä½ãƒ‘ッãƒã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒæœ€åˆã«å¿…è¦ã§ã™ã€‚\\n"
@@ -1100,11 +1105,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "パッム%s ã«ã¯ãªã«ã‚‚å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“\\n"
-#: quilt/refresh.in:271
+#: quilt/refresh.in:272
msgid "Patch %s is unchanged\\n"
msgstr "パッム% ã«å¤‰æ›´ã¯ã‚ã‚Šã¾ã›ã‚“\\n"
-#: quilt/refresh.in:276
+#: quilt/refresh.in:277
msgid "Refreshed patch %s\\n"
msgstr "パッム%s をリフレッシュã—ã¾ã—ãŸ\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 23a6850..de38a19 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -609,7 +609,7 @@ msgstr ""
msgid "No patches applied\\n"
msgstr ""
-#: quilt/pop.in:273 quilt/push.in:340
+#: quilt/pop.in:273 quilt/push.in:368
msgid "Now at patch %s\\n"
msgstr ""
@@ -665,27 +665,31 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr ""
-#: quilt/push.in:157
+#: quilt/push.in:177
msgid "Applying patch %s\\n"
msgstr ""
-#: quilt/push.in:189
+#: quilt/push.in:209
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr ""
-#: quilt/push.in:193
+#: quilt/push.in:213
msgid "Patch %s appears to be empty; applied\\n"
msgstr ""
-#: quilt/push.in:197
+#: quilt/push.in:217
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
-#: quilt/push.in:202
+#: quilt/push.in:226
+msgid "Patch %s can be reverse-applied\\n"
+msgstr ""
+
+#: quilt/push.in:229
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
-#: quilt/push.in:320
+#: quilt/push.in:348
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr ""
@@ -756,11 +760,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr ""
-#: quilt/refresh.in:271
+#: quilt/refresh.in:272
msgid "Patch %s is unchanged\\n"
msgstr ""
-#: quilt/refresh.in:276
+#: quilt/refresh.in:277
msgid "Refreshed patch %s\\n"
msgstr ""