Resync translation files

5 files changed, 69 insertions, 35 deletions

diff --git a/po/de.po b/po/de.po
index cf7f109..e3aefaa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1668,8 +1668,14 @@ msgid ""
 "applying all the patches is the last thing done in the %%prep section. This\n"
 "is a design limitation due to the fact that quilt can only operate on\n"
 "patches. If other commands in the %%prep section modify the patched files,\n"
-"this must happen first, otherwise you won't be able to push the patch\n"
+"they must come first, otherwise you won't be able to push the patch\n"
 "series.\n"
+"\n"
+"For example, a %%prep section where you first unpack a tarball, then\n"
+"apply patches, and lastly perform a tree-wide string substitution, is\n"
+"not OK. For \\\"quilt setup\\\" to work, it would have to be changed to\n"
+"unpacking the tarball, then performing the tree-wide string substitution,\n"
+"and lastly applying the patches.\n"
 msgstr ""
 "\n"
 "Initialisiert einen Quellbaum aus einer rpm-spec-Datei oder einer quilt-\n"
@@ -1686,7 +1692,8 @@ msgstr ""
 "\tDen maximalen Unscharf-Faktor (fuzz) setzen (benötigt rpm 4.6 oder \n"
 "\tspäter).\n"
 "\n"
-"--slow\tDie unrsprüngliche, langsame Methode zur Verarbeitung der spec-Datei\n"
+"--slow\tDie unrsprüngliche, langsame Methode zur Verarbeitung der spec-"
+"Datei\n"
 "\tverwenden. Bei dieser Methode erzeugt rpmbuild ein Arbeits-\n"
 "\tverzeichnis in einem temporären Verzeichnis, wobei alle Aktionen\n"
 "\taufgezeichnet werden; anschließend wird im Zielverzeichnis alles\n"
@@ -1697,25 +1704,25 @@ msgstr ""
 "\tdirekt im Zielverzeichnis.  Seit quilt Version 0.67 ist das die\n"
 "\tStandard-Methode.\n"
 
-#: quilt/setup.in:397
+#: quilt/setup.in:403
 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:400
+#: quilt/setup.in:406
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:461 quilt/setup.in:473 quilt/setup.in:484
+#: quilt/setup.in:467 quilt/setup.in:479 quilt/setup.in:490
 msgid "File %s not found\\n"
 msgstr "Datei %s nicht gefunden\\n"
 
-#: quilt/setup.in:464 quilt/setup.in:476 quilt/setup.in:487
+#: quilt/setup.in:470 quilt/setup.in:482 quilt/setup.in:493
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacken des Archivs %s\\n"
 
-#: quilt/setup.in:497
+#: quilt/setup.in:503
 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 43360fd..ed0eb3d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1639,6 +1639,7 @@ msgstr ""
 "fuzz=N] [--slow|--fast] {fichier_spec|fichier_séries}\\n"
 
 #: quilt/setup.in:268
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1667,8 +1668,14 @@ msgid ""
 "applying all the patches is the last thing done in the %%prep section. This\n"
 "is a design limitation due to the fact that quilt can only operate on\n"
 "patches. If other commands in the %%prep section modify the patched files,\n"
-"this must happen first, otherwise you won't be able to push the patch\n"
+"they must come first, otherwise you won't be able to push the patch\n"
 "series.\n"
+"\n"
+"For example, a %%prep section where you first unpack a tarball, then\n"
+"apply patches, and lastly perform a tree-wide string substitution, is\n"
+"not OK. For \\\"quilt setup\\\" to work, it would have to be changed to\n"
+"unpacking the tarball, then performing the tree-wide string substitution,\n"
+"and lastly applying the patches.\n"
 msgstr ""
 "\n"
 "Initialise un arbre de sources à partir d'un fichier de\n"
@@ -1703,24 +1710,24 @@ msgstr ""
 "patchés, ceci doit se produire en premier, sinon la série de patches ne\n"
 "pourra pas être appliquée.\n"
 
-#: quilt/setup.in:397
+#: quilt/setup.in:403
 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:400
+#: quilt/setup.in:406
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:461 quilt/setup.in:473 quilt/setup.in:484
+#: quilt/setup.in:467 quilt/setup.in:479 quilt/setup.in:490
 msgid "File %s not found\\n"
 msgstr "Le fichier %s est introuvable\\n"
 
-#: quilt/setup.in:464 quilt/setup.in:476 quilt/setup.in:487
+#: quilt/setup.in:470 quilt/setup.in:482 quilt/setup.in:493
 msgid "Unpacking archive %s\\n"
 msgstr "Désarchivage de %s\\n"
 
-#: quilt/setup.in:497
+#: quilt/setup.in:503
 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 605705a..ed7e29d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1590,6 +1590,7 @@ msgstr ""
 "slow|--fast] {specfile|seriesfile}\\n"
 
 #: quilt/setup.in:268
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1618,8 +1619,14 @@ msgid ""
 "applying all the patches is the last thing done in the %%prep section. This\n"
 "is a design limitation due to the fact that quilt can only operate on\n"
 "patches. If other commands in the %%prep section modify the patched files,\n"
-"this must happen first, otherwise you won't be able to push the patch\n"
+"they must come first, otherwise you won't be able to push the patch\n"
 "series.\n"
+"\n"
+"For example, a %%prep section where you first unpack a tarball, then\n"
+"apply patches, and lastly perform a tree-wide string substitution, is\n"
+"not OK. For \\\"quilt setup\\\" to work, it would have to be changed to\n"
+"unpacking the tarball, then performing the tree-wide string substitution,\n"
+"and lastly applying the patches.\n"
 msgstr ""
 "\n"
 "rpmの specファイルまたは quiltの seriesファイルを使って、ソースツリー\n"
@@ -1650,25 +1657,25 @@ msgstr ""
 "ければならない。それ以外の場合は、パッチシリーズをプッシュすることがで\n"
 "きない。\n"
 
-#: quilt/setup.in:397
+#: quilt/setup.in:403
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup.in:400
+#: quilt/setup.in:406
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:461 quilt/setup.in:473 quilt/setup.in:484
+#: quilt/setup.in:467 quilt/setup.in:479 quilt/setup.in:490
 msgid "File %s not found\\n"
 msgstr "ファイル %s が見つかりません"
 
-#: quilt/setup.in:464 quilt/setup.in:476 quilt/setup.in:487
+#: quilt/setup.in:470 quilt/setup.in:482 quilt/setup.in:493
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
-#: quilt/setup.in:497
+#: quilt/setup.in:503
 msgid "Trying alternative patches and series names..."
 msgstr "別名の patches と series を試します..."
 
diff --git a/po/quilt.pot b/po/quilt.pot
index b4ea59e..ed41c35 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1148,27 +1148,33 @@ msgid ""
 "applying all the patches is the last thing done in the %%prep section. This\n"
 "is a design limitation due to the fact that quilt can only operate on\n"
 "patches. If other commands in the %%prep section modify the patched files,\n"
-"this must happen first, otherwise you won't be able to push the patch\n"
+"they must come first, otherwise you won't be able to push the patch\n"
 "series.\n"
+"\n"
+"For example, a %%prep section where you first unpack a tarball, then\n"
+"apply patches, and lastly perform a tree-wide string substitution, is\n"
+"not OK. For \\\"quilt setup\\\" to work, it would have to be changed to\n"
+"unpacking the tarball, then performing the tree-wide string substitution,\n"
+"and lastly applying the patches.\n"
 msgstr ""
 
-#: quilt/setup.in:397
+#: quilt/setup.in:403
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:400
+#: quilt/setup.in:406
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:461 quilt/setup.in:473 quilt/setup.in:484
+#: quilt/setup.in:467 quilt/setup.in:479 quilt/setup.in:490
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:464 quilt/setup.in:476 quilt/setup.in:487
+#: quilt/setup.in:470 quilt/setup.in:482 quilt/setup.in:493
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
-#: quilt/setup.in:497
+#: quilt/setup.in:503
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 481c8b6..3332e92 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -324,8 +324,8 @@ msgstr ""
 msgid ""
 "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
-"Невозможно сравнить патчи с -p%s, пожалуйста, используйте -p0, -p1 либо -"
-"pab\\n"
+"Невозможно сравнить патчи с -p%s, пожалуйста, используйте -p0, -p1 либо -pab"
+"\\n"
 
 #: quilt/diff.in:244
 msgid "No snapshot to diff against\\n"
@@ -1599,6 +1599,7 @@ msgstr ""
 "[--slow|--fast] {файл-spec|файл-series}\\n"
 
 #: quilt/setup.in:268
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1627,8 +1628,14 @@ msgid ""
 "applying all the patches is the last thing done in the %%prep section. This\n"
 "is a design limitation due to the fact that quilt can only operate on\n"
 "patches. If other commands in the %%prep section modify the patched files,\n"
-"this must happen first, otherwise you won't be able to push the patch\n"
+"they must come first, otherwise you won't be able to push the patch\n"
 "series.\n"
+"\n"
+"For example, a %%prep section where you first unpack a tarball, then\n"
+"apply patches, and lastly perform a tree-wide string substitution, is\n"
+"not OK. For \\\"quilt setup\\\" to work, it would have to be changed to\n"
+"unpacking the tarball, then performing the tree-wide string substitution,\n"
+"and lastly applying the patches.\n"
 msgstr ""
 "\n"
 "Инициализирует дерево исходных кодов из spec-файла rpm или файла series.\n"
@@ -1664,24 +1671,24 @@ msgstr ""
 "должны\n"
 "идти раньше, иначе вы не сможете применить серию патчей.\n"
 
-#: quilt/setup.in:397
+#: quilt/setup.in:403
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
 
-#: quilt/setup.in:400
+#: quilt/setup.in:406
 msgid "The -v option will show rpm's output\\n"
 msgstr "Опция -v покажет вывод rpm\\n"
 
-#: quilt/setup.in:461 quilt/setup.in:473 quilt/setup.in:484
+#: quilt/setup.in:467 quilt/setup.in:479 quilt/setup.in:490
 msgid "File %s not found\\n"
 msgstr "Файл %s не найден\\n"
 
-#: quilt/setup.in:464 quilt/setup.in:476 quilt/setup.in:487
+#: quilt/setup.in:470 quilt/setup.in:482 quilt/setup.in:493
 msgid "Unpacking archive %s\\n"
 msgstr "Распаковка архива %s\\n"
 
-#: quilt/setup.in:497
+#: quilt/setup.in:503
 msgid "Trying alternative patches and series names..."
 msgstr "Попытка использовать альтернативные имена для series и patches…"
 
@@ -1756,8 +1763,8 @@ msgstr ""
 
 #: quilt/upgrade.in:65
 msgid ""
-"The quilt meta-data in %s are already in the version %s format; nothing to "
-"do\\n"
+"The quilt meta-data in %s are already in the version %s format; nothing to do"
+"\\n"
 msgstr "Метаданные quilt в %s уже в формате версии %s; нечего делать\\n"
 
 #: quilt/upgrade.in:69