summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-04-26 10:33:32 +0000
committerJean Delvare <khali@linux-fr.org>2006-04-26 10:33:32 +0000
commit14a8982f98baaa99205bc62cf272a596fcd693f3 (patch)
tree3ed42e6a6e32b79a313f98ceb3dc09f3e9e69cb8 /po
parent968586bd01386d198f7fa8d1dfa5e49e539a0bbf (diff)
downloadquilt-14a8982f98baaa99205bc62cf272a596fcd693f3.tar.gz
- quilt/pop.in: Delete .pc/$patch directory when popping empty
patches. Report and original patch by Arnaud Patard. - quilt/push.in: Create .pc/$patch directory when pushing missing or empty patches. If we don't, some commands such as rename can fail later. - test/missing.test: Test rename command on missing patches. - test/empty.test: New test case similar to missing.test, but for empty patches. Somewhat based on a contribution by Arnaud Patard.
Diffstat (limited to 'po')
-rw-r--r--po/de.po22
-rw-r--r--po/fr.po22
-rw-r--r--po/ja.po22
-rw-r--r--po/quilt.pot22
4 files changed, 44 insertions, 44 deletions
diff --git a/po/de.po b/po/de.po
index a4dfe1e..56a5442 100644
--- a/po/de.po
+++ b/po/de.po
@@ -929,23 +929,23 @@ msgstr ""
msgid "Patch %s appears to be empty, removing\\n"
msgstr "Patch %s scheint leer zu sein; wird entfernt\\n"
-#: quilt/pop.in:169
+#: quilt/pop.in:170
msgid "Removing patch %s\\n"
msgstr "Entferne patch %s\\n"
-#: quilt/pop.in:240
+#: quilt/pop.in:241
msgid "Patch %s needs to be refreshed first.\\n"
msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
-#: quilt/pop.in:250
+#: quilt/pop.in:251
msgid "No patch removed\\n"
msgstr "Kein Patch entfernt\\n"
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
msgid "No patches applied\\n"
msgstr "Keine Patches angewandt\\n"
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
msgid "Now at patch %s\\n"
msgstr "Jetzt in Patch %s\\n"
@@ -1035,27 +1035,27 @@ msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
msgid "Applying patch %s\\n"
msgstr "Wende Patch %s an\\n"
-#: quilt/push.in:209
+#: quilt/push.in:211
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
-#: quilt/push.in:213
+#: quilt/push.in:215
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Patch %s scheint leer zu sein; angewandt\\n"
-#: quilt/push.in:217
+#: quilt/push.in:219
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n"
-#: quilt/push.in:227
+#: quilt/push.in:229
msgid "Patch %s can be reverse-applied\\n"
msgstr "Patch %s kann verkehrt angewandt werden\\n"
-#: quilt/push.in:230
+#: quilt/push.in:232
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:351
+#: quilt/push.in:353
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
diff --git a/po/fr.po b/po/fr.po
index 4bf39e8..81baf6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -941,23 +941,23 @@ msgstr ""
msgid "Patch %s appears to be empty, removing\\n"
msgstr "Le patch %s semble vide, enlevé\\n"
-#: quilt/pop.in:169
+#: quilt/pop.in:170
msgid "Removing patch %s\\n"
msgstr "Retrait de %s\\n"
-#: quilt/pop.in:240
+#: quilt/pop.in:241
msgid "Patch %s needs to be refreshed first.\\n"
msgstr "Le patch %s doit être rafraichi au préalable.\\n"
-#: quilt/pop.in:250
+#: quilt/pop.in:251
msgid "No patch removed\\n"
msgstr "Aucun patch retiré\\n"
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqué\\n"
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
msgid "Now at patch %s\\n"
msgstr "Le patch %s est maintenant au sommet\\n"
@@ -1054,28 +1054,28 @@ msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
msgid "Applying patch %s\\n"
msgstr "Application de %s\\n"
-#: quilt/push.in:209
+#: quilt/push.in:211
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
-#: quilt/push.in:213
+#: quilt/push.in:215
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
-#: quilt/push.in:217
+#: quilt/push.in:219
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
-#: quilt/push.in:227
+#: quilt/push.in:229
msgid "Patch %s can be reverse-applied\\n"
msgstr "Le patch %s peut être appliqué à l'envers\\n"
-#: quilt/push.in:230
+#: quilt/push.in:232
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:351
+#: quilt/push.in:353
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
diff --git a/po/ja.po b/po/ja.po
index 5b2c4b7..6aef672 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -907,23 +907,23 @@ msgstr ""
msgid "Patch %s appears to be empty, removing\\n"
msgstr "パッム%s ã¯ã€ç©ºã®ã‚ˆã†ã§ã™ã€‚ã¯ãšã—ã¾ã™\\n"
-#: quilt/pop.in:169
+#: quilt/pop.in:170
msgid "Removing patch %s\\n"
msgstr "パッム%s ã‚’ã¯ãšã—ã¾ã™\\n"
-#: quilt/pop.in:240
+#: quilt/pop.in:241
msgid "Patch %s needs to be refreshed first.\\n"
msgstr "最åˆã«ã€ãƒ‘ッム%s ã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™ã€‚\\n"
-#: quilt/pop.in:250
+#: quilt/pop.in:251
msgid "No patch removed\\n"
msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n"
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
msgid "No patches applied\\n"
msgstr "é©ç”¨ã•ã‚Œã¦ã„るパッãƒã¯ã‚ã‚Šã¾ã›ã‚“\\n"
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
msgid "Now at patch %s\\n"
msgstr "ç¾åœ¨ä½ç½®ã¯ãƒ‘ッム%s ã§ã™\\n"
@@ -1015,28 +1015,28 @@ msgstr "ユーザã«ã‚ˆã£ã¦ä¸­æ–­ã•ã‚Œã¾ã—ãŸã€‚パッム%s ã¯é©ç”¨ã•ã‚
msgid "Applying patch %s\\n"
msgstr "パッム%s ã‚’é©ç”¨ã—ã¦ã„ã¾ã™\\n"
-#: quilt/push.in:209
+#: quilt/push.in:211
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "パッム%s ã¯å­˜åœ¨ã—ã¾ã›ã‚“。空ã®ãƒ‘ッãƒã‚’é©ç”¨ã—ã¾ã—ãŸ\\n"
-#: quilt/push.in:213
+#: quilt/push.in:215
msgid "Patch %s appears to be empty; applied\\n"
msgstr "パッム%s ã¯ç©ºã®ã‚ˆã†ã§ã™ãŒã€é©ç”¨ã—ã¾ã—ãŸ\\n"
-#: quilt/push.in:217
+#: quilt/push.in:219
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
"パッム%s ã‚’é©ç”¨ã—ã¾ã—㟠(強制é©ç”¨ã—ãŸãŸã‚ã«ã€ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒå¿…è¦ã§ã™)\\n"
-#: quilt/push.in:227
+#: quilt/push.in:229
msgid "Patch %s can be reverse-applied\\n"
msgstr "パッム%s ã¯ã€å転ã—ã¦é©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™\\n"
-#: quilt/push.in:230
+#: quilt/push.in:232
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "パッム%s ãŒé©ç”¨ã§ãã¾ã›ã‚“ (強制é©ç”¨ã™ã‚‹å ´åˆã¯ -fを付ã‘ã¦ãã ã•ã„)\\n"
-#: quilt/push.in:351
+#: quilt/push.in:353
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "最上ä½ãƒ‘ッãƒã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒæœ€åˆã«å¿…è¦ã§ã™ã€‚\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 7e006e9..ecf33ac 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -625,23 +625,23 @@ msgstr ""
msgid "Patch %s appears to be empty, removing\\n"
msgstr ""
-#: quilt/pop.in:169
+#: quilt/pop.in:170
msgid "Removing patch %s\\n"
msgstr ""
-#: quilt/pop.in:240
+#: quilt/pop.in:241
msgid "Patch %s needs to be refreshed first.\\n"
msgstr ""
-#: quilt/pop.in:250
+#: quilt/pop.in:251
msgid "No patch removed\\n"
msgstr ""
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
msgid "No patches applied\\n"
msgstr ""
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
msgid "Now at patch %s\\n"
msgstr ""
@@ -701,27 +701,27 @@ msgstr ""
msgid "Applying patch %s\\n"
msgstr ""
-#: quilt/push.in:209
+#: quilt/push.in:211
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr ""
-#: quilt/push.in:213
+#: quilt/push.in:215
msgid "Patch %s appears to be empty; applied\\n"
msgstr ""
-#: quilt/push.in:217
+#: quilt/push.in:219
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
-#: quilt/push.in:227
+#: quilt/push.in:229
msgid "Patch %s can be reverse-applied\\n"
msgstr ""
-#: quilt/push.in:230
+#: quilt/push.in:232
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
-#: quilt/push.in:351
+#: quilt/push.in:353
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr ""