- quilt/scripts/patchfns.in: Drop an unused local variable in function

  find_patch_file.
- quilt/import.in: Add a missing print_patch call.
- quilt/import.in: Fix several temporary file leaks.

4 files changed, 46 insertions, 39 deletions

diff --git a/po/de.po b/po/de.po
index 93e7116..a46046f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -664,41 +664,41 @@ msgstr ""
 "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header "
 "erhalten bleiben sollen.\\n"
 
-#: quilt/import.in:125
+#: quilt/import.in:133
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import.in:145
+#: quilt/import.in:153
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import.in:154
+#: quilt/import.in:162
 msgid "Patch %s already exists in series.\\n"
 msgstr "Patch %s existiert bereits in der series-Datei\\n"
 
-#: quilt/import.in:160
+#: quilt/import.in:168
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import.in:171
+#: quilt/import.in:179
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import.in:175
+#: quilt/import.in:183
 msgid "Importing patch %s\\n"
 msgstr "Importiere patch %s\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:185
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import.in:187
+#: quilt/import.in:195
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:204
 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 602f2b7..3561742 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -668,40 +668,40 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 "Veuillez utiliser -d {o|a|n} pour spécifier quel(s) en-tête(s) conserver.\\n"
 
-#: quilt/import.in:125
+#: quilt/import.in:133
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option « -P » ne peut être utilisé que lors de l'import d'un seul patch.\\n"
 
-#: quilt/import.in:145
+#: quilt/import.in:153
 msgid "Patch %s is applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/import.in:154
+#: quilt/import.in:162
 msgid "Patch %s already exists in series.\\n"
 msgstr "Le patch %s existe déjà dans la série.\\n"
 
-#: quilt/import.in:160
+#: quilt/import.in:168
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n"
 
-#: quilt/import.in:171
+#: quilt/import.in:179
 msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch %s avec la nouvelle version\\n"
 
-#: quilt/import.in:175
+#: quilt/import.in:183
 msgid "Importing patch %s\\n"
 msgstr "Import du patch %s\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:185
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch %s (enregistré dans %s)\\n"
 
-#: quilt/import.in:187
+#: quilt/import.in:195
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:204
 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 15104cc..169b6c3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -203,7 +203,10 @@ msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
 "patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
 "[--color] [file ...]\\n"
-msgstr "使�方: quilt diff [-p n] [-u|-U 数|-c|-C 数] [--combine パッ�|-z] [-R] [-P パッ�] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [ファイル ...]\\n"
+msgstr ""
+"使�方: quilt diff [-p n] [-u|-U 数|-c|-C 数] [--combine パッ�|-z] [-R] [-P "
+"パッ�] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--"
+"sort] [--color] [ファイル ...]\\n"
 
 #: quilt/diff.in:28
 msgid ""
@@ -538,7 +541,9 @@ msgstr ""
 msgid ""
 "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
 "trailing-whitespace] [patch]\\n"
-msgstr "使�方: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-trailing-whitespace] [パッ�]\\n"
+msgstr ""
+"使�方: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
+"trailing-whitespace] [パッ�]\\n"
 
 #: quilt/header.in:28
 msgid ""
@@ -639,39 +644,39 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 "��パッ�ヘッダを残���オプション -d {o|a|n}を使��指定������"
 
-#: quilt/import.in:125
+#: quilt/import.in:133
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-P'��パッ�を一����り込む����有効��\\n"
 
-#: quilt/import.in:145
+#: quilt/import.in:153
 msgid "Patch %s is applied\\n"
 msgstr "パッ� %s ������用�れ����\\n"
 
-#: quilt/import.in:154
+#: quilt/import.in:162
 msgid "Patch %s already exists in series.\\n"
 msgstr "パッ� %s ����� series�中��り��\\n"
 
-#: quilt/import.in:160
+#: quilt/import.in:168
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッ� %s �����存在���。-f�置���る�������\\n"
 
-#: quilt/import.in:171
+#: quilt/import.in:179
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッ� %s を新���ージョン�置�����\\n"
 
-#: quilt/import.in:175
+#: quilt/import.in:183
 msgid "Importing patch %s\\n"
 msgstr "パッ� %s を�り込���\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:185
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッ� %s を�り込ん���� (%s ����存�れ��)\\n"
 
-#: quilt/import.in:187
+#: quilt/import.in:195
 msgid "Failed to import patch %s\\n"
 msgstr "パッ� %s ��り込��失敗����\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:204
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイル��パッ� %s �書�込��失敗����\\n"
 
@@ -993,7 +998,9 @@ msgstr "最上�パッ��リフレッシュ�最��必���。\\n"
 msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
 "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
-msgstr "使�方: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [パッ�]\\n"
+msgstr ""
+"使�方: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
+"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [パッ�]\\n"
 
 #: quilt/refresh.in:26
 msgid ""
diff --git a/po/quilt.pot b/po/quilt.pot
index 2478672..f744765 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -435,39 +435,39 @@ msgstr ""
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 
-#: quilt/import.in:125
+#: quilt/import.in:133
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:145
+#: quilt/import.in:153
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:154
+#: quilt/import.in:162
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:160
+#: quilt/import.in:168
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:171
+#: quilt/import.in:179
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:175
+#: quilt/import.in:183
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:177
+#: quilt/import.in:185
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:187
+#: quilt/import.in:195
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:194
+#: quilt/import.in:204
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""