From f2f92510fd45879643c4068b2c005f2b4659bf4e Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 21 Oct 2016 14:47:57 +0200
Subject: Resync translation files

---
 po/de.po     | 58 +++++++++++++++++++++++++++++++---------------------------
 po/fr.po     | 58 +++++++++++++++++++++++++++++++---------------------------
 po/ja.po     | 58 +++++++++++++++++++++++++++++++---------------------------
 po/quilt.pot | 58 +++++++++++++++++++++++++++++++---------------------------
 po/ru.po     | 58 +++++++++++++++++++++++++++++++---------------------------
 5 files changed, 155 insertions(+), 135 deletions(-)

(limited to 'po')

diff --git a/po/de.po b/po/de.po
index b22173b..46e57cc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -487,7 +487,7 @@ msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Fehler beim Aufspalten von %s nach %s\\n"
 
-#: quilt/fork.in:102 quilt/refresh.in:347
+#: quilt/fork.in:102 quilt/refresh.in:344
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Neue Version von %s erstellt als %s\\n"
 
@@ -626,11 +626,11 @@ msgstr ""
 "--backup\n"
 "\tErzeugen einer Sicherungskopie von patch als patch~.\n"
 
-#: quilt/header.in:169
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "Header von Patch %s ersetzt\\n"
 
-#: quilt/header.in:172
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "Text an Header von Patch %s angefügt\\n"
 
@@ -736,7 +736,7 @@ msgstr "Importieren von Patch %s (abgelegt als %s)\\n"
 msgid "Failed to import patch %s\\n"
 msgstr "Patch %s konnte nicht importiert werden\\n"
 
-#: quilt/import.in:248 quilt/refresh.in:334
+#: quilt/import.in:248 quilt/refresh.in:331
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Patch %s konnte nicht in die series-Datei eingefügt werden\\n"
 
@@ -940,7 +940,7 @@ msgstr "Patch %s existiert bereits\\n"
 msgid "Patch %s is now on top\\n"
 msgstr "Der oberste Patch ist jetzt %s\\n"
 
-#: quilt/new.in:110 quilt/refresh.in:343
+#: quilt/new.in:110 quilt/refresh.in:340
 msgid "Failed to create patch %s\\n"
 msgstr "Patch %s konnte nicht erzeugt werden\\n"
 
@@ -1042,7 +1042,7 @@ msgstr ""
 "\tJeden Patch automatisch neu erzeugen, bevor seine Anwendung rückgängig\n"
 "gemacht wird.\n"
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Dateien konnten nicht in temporäres Verzeichnis kopiert werden\\n"
 
@@ -1337,18 +1337,14 @@ msgstr ""
 "Patches mit Level -p%s können nicht aktualisiert werden, bitte -p0, -p1 oder "
 "-pab angeben\\n"
 
-#: quilt/refresh.in:235
-msgid "Diff failed on file '%s', aborting\\n"
-msgstr "Diff gegen Datei '%s' fehlgeschlagen, Abbruch.\\n"
-
-#: quilt/refresh.in:241
+#: quilt/refresh.in:240
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Später angewandte Patches verändern Dateien von %s. Aktualisieren mit -f "
 "erzwingen.\\n"
 
-#: quilt/refresh.in:247
+#: quilt/refresh.in:246
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
@@ -1356,15 +1352,15 @@ msgstr ""
 "Dateien enthalten, welche danach von anderen Patches weiter verändert werden."
 "\\n"
 
-#: quilt/refresh.in:253 quilt/refresh.in:355
+#: quilt/refresh.in:252 quilt/refresh.in:352
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s ist leer\\n"
 
-#: quilt/refresh.in:325
+#: quilt/refresh.in:324
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s ist unverändert\\n"
 
-#: quilt/refresh.in:353
+#: quilt/refresh.in:350
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aktualisiert\\n"
 
@@ -1504,11 +1500,15 @@ msgstr "Patch %s ist nicht angewandt\\n"
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:764
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr "Diff gegen Datei '%s' fehlgeschlagen, Abbruch.\\n"
+
+#: quilt/scripts/patchfns.in:929
 msgid "Failed to patch temporary files\\n"
 msgstr "Patch konnte nicht auf temporäre Dateien angewandt werden\\n"
 
-#: quilt/scripts/patchfns.in:945
+#: quilt/scripts/patchfns.in:972
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1521,13 +1521,17 @@ msgstr ""
 "der Version von quilt, die zur Erstellung des Arbeitsverzeichnisses "
 "verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:1018
+#: quilt/scripts/patchfns.in:1045
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr ""
 "Sie müssen '%s' (aus dem Paket %s) installieren, um 'quilt %s' nutzen zu "
 "können\\n"
 
-#: quilt/scripts/patchfns.in:1138
+#: quilt/scripts/patchfns.in:1124
+msgid "Cannot change into parent directory %s/\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1165
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1535,7 +1539,7 @@ msgstr ""
 "Das Arbeitsverzeichnis wurde von einer älteren quilt-Version erstellt. Bitte "
 "führen Sie \\`quilt upgrade' aus.\\n"
 
-#: quilt/scripts/patchfns.in:1146
+#: quilt/scripts/patchfns.in:1173
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
@@ -1609,7 +1613,7 @@ msgstr "Verzeichnis %s existiert\\n"
 msgid "File %s exists\\n"
 msgstr "Datei %s existiert\\n"
 
-#: quilt/setup.in:264
+#: quilt/setup.in:266
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
@@ -1617,7 +1621,7 @@ msgstr ""
 "Aufruf: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--"
 "fuzz=N] [--slow|--fast] {spec-datei|series-datei}\\n"
 
-#: quilt/setup.in:267
+#: quilt/setup.in:269
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1671,25 +1675,25 @@ msgstr ""
 "\terfolgt, wird davon ausgegangen, dass alle Archive vorher händisch\n"
 "\textrahiert wurden.\n"
 
-#: quilt/setup.in:371
+#: quilt/setup.in:373
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind "
 "möglicherweise unvollständig.\\n"
 
-#: quilt/setup.in:374
+#: quilt/setup.in:376
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:428 quilt/setup.in:440
+#: quilt/setup.in:432 quilt/setup.in:444
 msgid "File %s not found\\n"
 msgstr "Datei %s nicht gefunden\\n"
 
-#: quilt/setup.in:431 quilt/setup.in:443
+#: quilt/setup.in:435 quilt/setup.in:447
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacken des Archivs %s\\n"
 
-#: quilt/setup.in:453
+#: quilt/setup.in:457
 msgid "Trying alternative patches and series names..."
 msgstr "Versuch alternativer patches- und series-Namen ..."
 
diff --git a/po/fr.po b/po/fr.po
index 01d45cd..e96cbf1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -485,7 +485,7 @@ msgstr "Le patch %s existe déjà, veuillez choisir un nouveau nom\\n"
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Le fork de %s en %s a échoué\\n"
 
-#: quilt/fork.in:102 quilt/refresh.in:347
+#: quilt/fork.in:102 quilt/refresh.in:344
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Le fork de %s a été créé en tant que %s\\n"
 
@@ -625,11 +625,11 @@ msgstr ""
 "\tCrée une sauvegarde de la version originale du patch en tant\n"
 "\tque patch~.\n"
 
-#: quilt/header.in:169
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "En-tête du patch %s remplacé\\n"
 
-#: quilt/header.in:172
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "Texte ajouté à la fin de l'en-tête du patch %s\\n"
 
@@ -734,7 +734,7 @@ msgstr "Import du patch %s (enregistré dans %s)\\n"
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:248 quilt/refresh.in:334
+#: quilt/import.in:248 quilt/refresh.in:331
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de série.\\n"
 
@@ -933,7 +933,7 @@ msgstr "Le patch %s existe déjà\\n"
 msgid "Patch %s is now on top\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
-#: quilt/new.in:110 quilt/refresh.in:343
+#: quilt/new.in:110 quilt/refresh.in:340
 msgid "Failed to create patch %s\\n"
 msgstr "Impossible de créer le patch %s\\n"
 
@@ -1039,7 +1039,7 @@ msgstr ""
 "--refresh\n"
 "\tRafraichit automatiquement chaque patch avant de l'enlever.\n"
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
 
@@ -1338,33 +1338,29 @@ msgstr ""
 "Impossible de rafraîchir des patchs avec -p%s. Veuillez spécifier -p0, -p1 "
 "ou -pab à la place.\\n"
 
-#: quilt/refresh.in:235
-msgid "Diff failed on file '%s', aborting\\n"
-msgstr "Le diff a échoué sur le fichier «%s». Abandon.\\n"
-
-#: quilt/refresh.in:241
+#: quilt/refresh.in:240
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Des fichiers plus récents modifient les mêmes fichiers que %s.\n"
 "Forcez le rafraîchissement avec -f.\\n"
 
-#: quilt/refresh.in:247
+#: quilt/refresh.in:246
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n"
 "certains fichiers sont masqués.\\n"
 
-#: quilt/refresh.in:253 quilt/refresh.in:355
+#: quilt/refresh.in:252 quilt/refresh.in:352
 msgid "Nothing in patch %s\\n"
 msgstr "Le patch %s ne contient rien\\n"
 
-#: quilt/refresh.in:325
+#: quilt/refresh.in:324
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s inchangé\\n"
 
-#: quilt/refresh.in:353
+#: quilt/refresh.in:350
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s rafraîchi\\n"
 
@@ -1503,11 +1499,15 @@ msgstr "Le patch %s n'est pas appliqué\\n"
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:764
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr "Le diff a échoué sur le fichier «%s». Abandon.\\n"
+
+#: quilt/scripts/patchfns.in:929
 msgid "Failed to patch temporary files\\n"
 msgstr "Impossible de patcher les fichiers temporaires\\n"
 
-#: quilt/scripts/patchfns.in:945
+#: quilt/scripts/patchfns.in:972
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1519,11 +1519,15 @@ msgstr ""
 "format %s (inclus). Veuillez retirer vos patches avec la version \n"
 "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n"
 
-#: quilt/scripts/patchfns.in:1018
+#: quilt/scripts/patchfns.in:1045
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr "Vous devez installer '%s' (paquet %s) pour utiliser « quilt %s »\\n"
 
-#: quilt/scripts/patchfns.in:1138
+#: quilt/scripts/patchfns.in:1124
+msgid "Cannot change into parent directory %s/\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1165
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1531,7 +1535,7 @@ msgstr ""
 "Votre arbre a été créé par une vieille version de quilt. Veuillez \n"
 "utiliser « quilt upgrade ».\\n"
 
-#: quilt/scripts/patchfns.in:1146
+#: quilt/scripts/patchfns.in:1173
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
@@ -1605,7 +1609,7 @@ msgstr "Le répertoire %s existe\\n"
 msgid "File %s exists\\n"
 msgstr "Le fichier %s existe\\n"
 
-#: quilt/setup.in:264
+#: quilt/setup.in:266
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
@@ -1613,7 +1617,7 @@ msgstr ""
 "Usage : quilt setup [-d répertoire_source] [-v] [--sourcedir répertoire] [--"
 "fuzz=N] [--slow|--fast] {fichier_spec|fichier_séries}\\n"
 
-#: quilt/setup.in:267
+#: quilt/setup.in:269
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1666,24 +1670,24 @@ msgstr ""
 "\tfichier de série quilt, il est supposé que toutes les archives ont\n"
 "\tdéjà été extraites manuellement.\n"
 
-#: quilt/setup.in:371
+#: quilt/setup.in:373
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n"
 
-#: quilt/setup.in:374
+#: quilt/setup.in:376
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:428 quilt/setup.in:440
+#: quilt/setup.in:432 quilt/setup.in:444
 msgid "File %s not found\\n"
 msgstr "Le fichier %s est introuvable\\n"
 
-#: quilt/setup.in:431 quilt/setup.in:443
+#: quilt/setup.in:435 quilt/setup.in:447
 msgid "Unpacking archive %s\\n"
 msgstr "Désarchivage de %s\\n"
 
-#: quilt/setup.in:453
+#: quilt/setup.in:457
 msgid "Trying alternative patches and series names..."
 msgstr "Tentative d'utilisation des noms de patches et séries alternatifs..."
 
diff --git a/po/ja.po b/po/ja.po
index 90a61cd..a2132ca 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -466,7 +466,7 @@ msgstr "パッチ %s はすでに存在します。新しい名前を選んで
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n"
 
-#: quilt/fork.in:102 quilt/refresh.in:347
+#: quilt/fork.in:102 quilt/refresh.in:344
 msgid "Fork of patch %s created as %s\\n"
 msgstr "パッチ %s の分岐で %s が作成されました\\n"
 
@@ -602,11 +602,11 @@ msgstr ""
 "--backup\n"
 "\t古いバージョンのパッチのバックアップコピーをパッチ~として作成する。\n"
 
-#: quilt/header.in:169
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "パッチ %s のヘッダを変更しました\\n"
 
-#: quilt/header.in:172
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "パッチ %s のヘッダに追加しました\\n"
 
@@ -708,7 +708,7 @@ msgstr "パッチ %s を取り込んでいます (%s として保存されます
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:248 quilt/refresh.in:334
+#: quilt/import.in:248 quilt/refresh.in:331
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
@@ -907,7 +907,7 @@ msgstr "パッチ %s は、すでに存在します\\n"
 msgid "Patch %s is now on top\\n"
 msgstr "パッチ %s を最上位にしました\\n"
 
-#: quilt/new.in:110 quilt/refresh.in:343
+#: quilt/new.in:110 quilt/refresh.in:340
 msgid "Failed to create patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
@@ -1005,7 +1005,7 @@ msgstr ""
 "--refresh\n"
 "\tパッチを外す前に自動的にパッチを更新する。\n"
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
@@ -1294,32 +1294,28 @@ msgstr ""
 "-p%s でパッチを作成することができません。-p0、-p1 または -pab を指定してくだ"
 "さい\\n"
 
-#: quilt/refresh.in:235
-msgid "Diff failed on file '%s', aborting\\n"
-msgstr "ファイル'%s'の差分に失敗しました。異常終了します\\n"
-
-#: quilt/refresh.in:241
+#: quilt/refresh.in:240
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実"
 "行する場合は -f オプションを使用してください。\\n"
 
-#: quilt/refresh.in:247
+#: quilt/refresh.in:246
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "--strip-trailing-whitespace は影になっているファイルがある場合は使えません"
 
-#: quilt/refresh.in:253 quilt/refresh.in:355
+#: quilt/refresh.in:252 quilt/refresh.in:352
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: quilt/refresh.in:325
+#: quilt/refresh.in:324
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ %s に変更はありません\\n"
 
-#: quilt/refresh.in:353
+#: quilt/refresh.in:350
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
@@ -1458,11 +1454,15 @@ msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:764
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr "ファイル'%s'の差分に失敗しました。異常終了します\\n"
+
+#: quilt/scripts/patchfns.in:929
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
-#: quilt/scripts/patchfns.in:945
+#: quilt/scripts/patchfns.in:972
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1474,13 +1474,17 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:1018
+#: quilt/scripts/patchfns.in:1045
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr ""
 "'%s' (%s パッケージ) がインストールされていないと、'quilt %s' は利用できませ"
 "ん\\n"
 
-#: quilt/scripts/patchfns.in:1138
+#: quilt/scripts/patchfns.in:1124
+msgid "Cannot change into parent directory %s/\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1165
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1488,7 +1492,7 @@ msgstr ""
 "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
 "す。'quilt upgrade'を実行してください。\\n"
 
-#: quilt/scripts/patchfns.in:1146
+#: quilt/scripts/patchfns.in:1173
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
@@ -1562,7 +1566,7 @@ msgstr "ディレクトリ %s は、すでに存在します\\n"
 msgid "File %s exists\\n"
 msgstr "ファイル %s は、すでに存在します\\n"
 
-#: quilt/setup.in:264
+#: quilt/setup.in:266
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
@@ -1570,7 +1574,7 @@ msgstr ""
 "使い方: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
 
-#: quilt/setup.in:267
+#: quilt/setup.in:269
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1620,25 +1624,25 @@ msgstr ""
 "\tる。もし入力がシリーズファイルの場合、すべてのアーカイブは事前\n"
 "\tに展開されていることが期待される。\n"
 
-#: quilt/setup.in:371
+#: quilt/setup.in:373
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup.in:374
+#: quilt/setup.in:376
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:428 quilt/setup.in:440
+#: quilt/setup.in:432 quilt/setup.in:444
 msgid "File %s not found\\n"
 msgstr "ファイル %s が見つかりません"
 
-#: quilt/setup.in:431 quilt/setup.in:443
+#: quilt/setup.in:435 quilt/setup.in:447
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
-#: quilt/setup.in:453
+#: quilt/setup.in:457
 msgid "Trying alternative patches and series names..."
 msgstr "別名の patches と series を試します..."
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 264943f..3591afe 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr ""
 
-#: quilt/fork.in:102 quilt/refresh.in:347
+#: quilt/fork.in:102 quilt/refresh.in:344
 msgid "Fork of patch %s created as %s\\n"
 msgstr ""
 
@@ -399,11 +399,11 @@ msgid ""
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
 
-#: quilt/header.in:169
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr ""
 
-#: quilt/header.in:172
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:248 quilt/refresh.in:334
+#: quilt/import.in:248 quilt/refresh.in:331
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -613,7 +613,7 @@ msgstr ""
 msgid "Patch %s is now on top\\n"
 msgstr ""
 
-#: quilt/new.in:110 quilt/refresh.in:343
+#: quilt/new.in:110 quilt/refresh.in:340
 msgid "Failed to create patch %s\\n"
 msgstr ""
 
@@ -676,7 +676,7 @@ msgid ""
 "\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
 msgid "Failed to copy files to temporary directory\\n"
 msgstr ""
 
@@ -872,29 +872,25 @@ msgid ""
 "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
 
-#: quilt/refresh.in:235
-msgid "Diff failed on file '%s', aborting\\n"
-msgstr ""
-
-#: quilt/refresh.in:241
+#: quilt/refresh.in:240
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: quilt/refresh.in:247
+#: quilt/refresh.in:246
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh.in:253 quilt/refresh.in:355
+#: quilt/refresh.in:252 quilt/refresh.in:352
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: quilt/refresh.in:325
+#: quilt/refresh.in:324
 msgid "Patch %s is unchanged\\n"
 msgstr ""
 
-#: quilt/refresh.in:353
+#: quilt/refresh.in:350
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
@@ -1013,11 +1009,15 @@ msgstr ""
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:764
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:929
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:945
+#: quilt/scripts/patchfns.in:972
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1025,17 +1025,21 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1018
+#: quilt/scripts/patchfns.in:1045
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1138
+#: quilt/scripts/patchfns.in:1124
+msgid "Cannot change into parent directory %s/\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1165
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1146
+#: quilt/scripts/patchfns.in:1173
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
@@ -1099,13 +1103,13 @@ msgstr ""
 msgid "File %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:264
+#: quilt/setup.in:266
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 
-#: quilt/setup.in:267
+#: quilt/setup.in:269
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1132,23 +1136,23 @@ msgid ""
 "\tall archives have been extracted manually beforehand.\n"
 msgstr ""
 
-#: quilt/setup.in:371
+#: quilt/setup.in:373
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:374
+#: quilt/setup.in:376
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:428 quilt/setup.in:440
+#: quilt/setup.in:432 quilt/setup.in:444
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:431 quilt/setup.in:443
+#: quilt/setup.in:435 quilt/setup.in:447
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
-#: quilt/setup.in:453
+#: quilt/setup.in:457
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 78b9f38..a18ab58 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -479,7 +479,7 @@ msgstr "Патч %s уже существует, выберите новое и
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Не удалось создать ответвление патча %s в патч %s\\n"
 
-#: quilt/fork.in:102 quilt/refresh.in:347
+#: quilt/fork.in:102 quilt/refresh.in:344
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Ответвление патча %s создано как %s\\n"
 
@@ -615,11 +615,11 @@ msgstr ""
 "--backup\n"
 "\tСоздать резервную копию старой версии патча в файле имя_патча~.\n"
 
-#: quilt/header.in:169
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "Заменён заголовок патча %s\\n"
 
-#: quilt/header.in:172
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "Добавлен текст к заголовку патча %s\\n"
 
@@ -723,7 +723,7 @@ msgstr "Импорт патча %s (сохранён как %s)\\n"
 msgid "Failed to import patch %s\\n"
 msgstr "Не удалось импортировать патч %s\\n"
 
-#: quilt/import.in:248 quilt/refresh.in:334
+#: quilt/import.in:248 quilt/refresh.in:331
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Не удалось вставить патч %s в файл series\\n"
 
@@ -919,7 +919,7 @@ msgstr "Патч %s уже существует\\n"
 msgid "Patch %s is now on top\\n"
 msgstr "Патч %s теперь наверху\\n"
 
-#: quilt/new.in:110 quilt/refresh.in:343
+#: quilt/new.in:110 quilt/refresh.in:340
 msgid "Failed to create patch %s\\n"
 msgstr "Не удалось создать патч %s\\n"
 
@@ -1018,7 +1018,7 @@ msgstr ""
 "--refresh\n"
 "\tАвтоматически обновить каждый патч перед его откатом.\n"
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Не удалось скопировать файлы во временную директорию\\n"
 
@@ -1302,33 +1302,29 @@ msgid ""
 "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr "Не удалось обновить патчи с -p%s, используйте -p0, -p1 или -pab\\n"
 
-#: quilt/refresh.in:235
-msgid "Diff failed on file '%s', aborting\\n"
-msgstr "Не удалось выполнить diff на файле «%s», завершение\\n"
-
-#: quilt/refresh.in:241
+#: quilt/refresh.in:240
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Более новые патчи изменяют файлы в патче %s. Принудительное обновление можно "
 "сделать с помощью опции -f.\\n"
 
-#: quilt/refresh.in:247
+#: quilt/refresh.in:246
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Нельзя использовать --strip-trailing-whitespace на патче с затенёнными "
 "файлами.\\n"
 
-#: quilt/refresh.in:253 quilt/refresh.in:355
+#: quilt/refresh.in:252 quilt/refresh.in:352
 msgid "Nothing in patch %s\\n"
 msgstr "Ничего нет в патче %s\\n"
 
-#: quilt/refresh.in:325
+#: quilt/refresh.in:324
 msgid "Patch %s is unchanged\\n"
 msgstr "Патч %s не изменён\\n"
 
-#: quilt/refresh.in:353
+#: quilt/refresh.in:350
 msgid "Refreshed patch %s\\n"
 msgstr "Патч %s обновлён\\n"
 
@@ -1467,11 +1463,15 @@ msgstr "Патч %s не наложен\\n"
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:764
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr "Не удалось выполнить diff на файле «%s», завершение\\n"
+
+#: quilt/scripts/patchfns.in:929
 msgid "Failed to patch temporary files\\n"
 msgstr "Не удалось применить патч к временным файлам\\n"
 
-#: quilt/scripts/patchfns.in:945
+#: quilt/scripts/patchfns.in:972
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1483,11 +1483,15 @@ msgstr ""
 "отмените все патчи, используя версию quilt, которая использовалась для их "
 "наложения, прежде чем использовать эту версию.\\n"
 
-#: quilt/scripts/patchfns.in:1018
+#: quilt/scripts/patchfns.in:1045
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr "Нужно установить «%s» (из пакета %s), чтобы использовать «quilt %s»\\n"
 
-#: quilt/scripts/patchfns.in:1138
+#: quilt/scripts/patchfns.in:1124
+msgid "Cannot change into parent directory %s/\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1165
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1495,7 +1499,7 @@ msgstr ""
 "Рабочее дерево было создано более старой версией quilt. Пожалуйста, "
 "выполните «quilt upgrade».\\n"
 
-#: quilt/scripts/patchfns.in:1146
+#: quilt/scripts/patchfns.in:1173
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
@@ -1569,7 +1573,7 @@ msgstr "Директория %s существует\\n"
 msgid "File %s exists\\n"
 msgstr "Файл %s существует\\n"
 
-#: quilt/setup.in:264
+#: quilt/setup.in:266
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
@@ -1577,7 +1581,7 @@ msgstr ""
 "Синтаксис: quilt setup [-d префикс-пути] [-v] [--sourcedir путь] [--fuzz=N] "
 "[--slow|--fast] {файл-spec|файл-series}\\n"
 
-#: quilt/setup.in:267
+#: quilt/setup.in:269
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1630,24 +1634,24 @@ msgstr ""
 "\tЕсли на ввод дан файл series, предполагается, что все архивы были\n"
 "\tуже распакованы вручную.\n"
 
-#: quilt/setup.in:371
+#: quilt/setup.in:373
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
 
-#: quilt/setup.in:374
+#: quilt/setup.in:376
 msgid "The -v option will show rpm's output\\n"
 msgstr "Опция -v покажет вывод rpm\\n"
 
-#: quilt/setup.in:428 quilt/setup.in:440
+#: quilt/setup.in:432 quilt/setup.in:444
 msgid "File %s not found\\n"
 msgstr "Файл %s не найден\\n"
 
-#: quilt/setup.in:431 quilt/setup.in:443
+#: quilt/setup.in:435 quilt/setup.in:447
 msgid "Unpacking archive %s\\n"
 msgstr "Распаковка архива %s\\n"
 
-#: quilt/setup.in:453
+#: quilt/setup.in:457
 msgid "Trying alternative patches and series names..."
 msgstr "Попытка использовать альтернативные имена для series и patches…"
 
-- 
cgit