From 4507162b2b4f0eb4b11ac9317c6bcd49c9007da6 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Sun, 22 Jan 2006 23:29:04 +0000
Subject: - Use a more clear message for when patches apply with -R.

---
 po/de.po      | 26 ++++++++++++++++----------
 po/fr.po      | 23 ++++++++++++++---------
 po/ja.po      | 23 ++++++++++++++---------
 po/quilt.pot  | 22 +++++++++++++---------
 quilt/push.in |  2 +-
 5 files changed, 58 insertions(+), 38 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
 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 ""
 
diff --git a/quilt/push.in b/quilt/push.in
index 89afc28..0c7a1e0 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -223,7 +223,7 @@ add_patch()
 		if apply_patch $patch "$patch_file" > /dev/null 2> /dev/null
 		then
 			rollback_patch $patch
-			printf $"Patch %s is already applied\n" \
+			printf $"Patch %s can be reverse-applied\n" \
 			       "$(print_patch "$patch")"
 		else
 			printf $"Patch %s does not apply (enforce with -f)\n" \
-- 
cgit