- quilt/fold.in: fold did not work when invoked from a

  subdirectory; update test case.

4 files changed, 44 insertions, 37 deletions

diff --git a/po/de.po b/po/de.po
index a0021cc..2af9050 100644
--- a/po/de.po
+++ b/po/de.po
@@ -409,7 +409,7 @@ msgstr ""
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen.\n"
 
-#: quilt/fold.in:116
+#: quilt/fold.in:117
 msgid "File %s may be corrupted\\n"
 msgstr "Datei %s ist möglicherweise defekt\\n"
 
@@ -608,7 +608,8 @@ msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n"
 #: quilt/import.in:25
 msgid ""
 "\n"
-"Import external patches.\n"
+"Import external patches.  The patches will be inserted following the\n"
+"current top patch, and must be pushed after import to apply them.\n"
 "\n"
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
@@ -620,7 +621,8 @@ msgid ""
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
-"Importiere externe Patches.\n"
+"Importiere externe Patches. Die Patches werden nach dem momentan obersten\n"
+"Patch eingefügt, und können dann mit dem push-Befehl angewandt werden.\n"
 "\n"
 "-p num\n"
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
@@ -631,33 +633,33 @@ msgstr ""
 "\n"
 "-f\tÜberschreibe/aktualisiere existierende Patches.\n"
 
-#: quilt/import.in:74
+#: quilt/import.in:75
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import.in:92
+#: quilt/import.in:93
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import.in:100
+#: quilt/import.in:101
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import.in:104
+#: quilt/import.in:105
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import.in:107
+#: quilt/import.in:108
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import.in:115
+#: quilt/import.in:116
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:122
+#: quilt/import.in:123
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 5c90a36..de0fd35 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -409,7 +409,7 @@ msgstr ""
 "\tNombre de niveaux de r�pertoires � retirer lors de l'application du \n"
 "\tpatch.\n"
 
-#: quilt/fold.in:116
+#: quilt/fold.in:117
 msgid "File %s may be corrupted\\n"
 msgstr "Le fichier %s est peut-�tre corrompu\\n"
 
@@ -609,9 +609,11 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
-"Import external patches.\n"
+"Import external patches.  The patches will be inserted following the\n"
+"current top patch, and must be pushed after import to apply them.\n"
 "\n"
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
@@ -635,32 +637,32 @@ msgstr ""
 "\n"
 "-f\t�crase/met � jour les patchs existants.\n"
 
-#: quilt/import.in:74
+#: quilt/import.in:75
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option � -n � ne peut �tre utilis� que lors de l'import d'un seul patch.\\n"
 
-#: quilt/import.in:92
+#: quilt/import.in:93
 msgid "Patch %s is applied\\n"
 msgstr "Le patch %s n'est pas appliqu�\\n"
 
-#: quilt/import.in:100
+#: quilt/import.in:101
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n"
 
-#: quilt/import.in:104
+#: quilt/import.in:105
 msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch %s avec la nouvelle version\\n"
 
-#: quilt/import.in:107
+#: quilt/import.in:108
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch %s (enregistr� dans %s)\\n"
 
-#: quilt/import.in:115
+#: quilt/import.in:116
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:122
+#: quilt/import.in:123
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 282d083..f894626 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -398,7 +398,7 @@ msgstr ""
 "-p strip-level\n"
 "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n"
 
-#: quilt/fold.in:116
+#: quilt/fold.in:117
 msgid "File %s may be corrupted\\n"
 msgstr "ファイル %s は壊れている可能性があります\\n"
 
@@ -589,9 +589,11 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "使い方: quilt import [-f] [-p num] [-n パッチ] パッチファイル ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
-"Import external patches.\n"
+"Import external patches.  The patches will be inserted following the\n"
+"current top patch, and must be pushed after import to apply them.\n"
 "\n"
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
@@ -614,31 +616,31 @@ msgstr ""
 "\n"
 "-f\t存在するパッチの上書き、またはアップデート。\n"
 
-#: quilt/import.in:74
+#: quilt/import.in:75
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n"
 
-#: quilt/import.in:92
+#: quilt/import.in:93
 msgid "Patch %s is applied\\n"
 msgstr "パッチ %s は、すでに適用されています\\n"
 
-#: quilt/import.in:100
+#: quilt/import.in:101
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n"
 
-#: quilt/import.in:104
+#: quilt/import.in:105
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッチ %s を新しいバージョンに置き換えます\\n"
 
-#: quilt/import.in:107
+#: quilt/import.in:108
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n"
 
-#: quilt/import.in:115
+#: quilt/import.in:116
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:122
+#: quilt/import.in:123
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 3b85f74..34df47c 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -283,7 +283,7 @@ msgid ""
 "\twhen applying patchfile.\n"
 msgstr ""
 
-#: quilt/fold.in:116
+#: quilt/fold.in:117
 msgid "File %s may be corrupted\\n"
 msgstr ""
 
@@ -413,7 +413,8 @@ msgstr ""
 #: quilt/import.in:25
 msgid ""
 "\n"
-"Import external patches.\n"
+"Import external patches.  The patches will be inserted following the\n"
+"current top patch, and must be pushed after import to apply them.\n"
 "\n"
 "-p num\n"
 "\tNumber of directory levels to strip when applying (default=1)\n"
@@ -425,31 +426,31 @@ msgid ""
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 
-#: quilt/import.in:74
+#: quilt/import.in:75
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:92
+#: quilt/import.in:93
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:100
+#: quilt/import.in:101
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:104
+#: quilt/import.in:105
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:107
+#: quilt/import.in:108
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:115
+#: quilt/import.in:116
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:122
+#: quilt/import.in:123
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""