summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/de.po8
-rw-r--r--po/fr.po9
-rw-r--r--po/ja.po8
-rw-r--r--po/quilt.pot8
4 files changed, 13 insertions, 20 deletions
diff --git a/po/de.po b/po/de.po
index 778a0c1..8005ef0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -27,7 +27,7 @@ msgstr "Vorhandene Befehle:"
#, fuzzy
msgid ""
"\n"
-"Common options to all commands:\n"
+"Global options:\n"
"\n"
"--trace\n"
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
@@ -37,8 +37,6 @@ msgid ""
"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents.\n"
"\n"
-"Special options:\n"
-"\n"
"--version\n"
"\tPrint the version number and exit immediately."
msgstr ""
@@ -1179,7 +1177,7 @@ msgstr ""
"zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
"das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
-#: ../scripts/patchfns.in:740
+#: ../scripts/patchfns.in:751
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 "
@@ -1192,7 +1190,7 @@ msgstr ""
"quilt alle Patches mit der Version von quilt, die zur Erstellung des "
"Arbeitsverzeichnisses verwendet wurde.\\n"
-#: ../scripts/patchfns.in:817
+#: ../scripts/patchfns.in:828
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index 1332d42..daa4705 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -26,9 +26,10 @@ msgid "Commands are:"
msgstr "Les commandes sont :"
#: ../bin/quilt.in:31
+#, fuzzy
msgid ""
"\n"
-"Common options to all commands:\n"
+"Global options:\n"
"\n"
"--trace\n"
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
@@ -38,8 +39,6 @@ msgid ""
"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents.\n"
"\n"
-"Special options:\n"
-"\n"
"--version\n"
"\tPrint the version number and exit immediately."
msgstr ""
@@ -1231,7 +1230,7 @@ msgstr ""
"version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n"
"%s et rappliquez compltement vos patchs.\\n"
-#: ../scripts/patchfns.in:740
+#: ../scripts/patchfns.in:751
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 "
@@ -1243,7 +1242,7 @@ msgstr ""
"format %s (inclus). Veuillez retirer vos patches avec la version \n"
"utilise pour les appliquer avant d'installer une version plus ancienne.\\n"
-#: ../scripts/patchfns.in:817
+#: ../scripts/patchfns.in:828
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
diff --git a/po/ja.po b/po/ja.po
index 7eb4192..835e55d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -28,7 +28,7 @@ msgstr "コマンド一覧:"
#, fuzzy
msgid ""
"\n"
-"Common options to all commands:\n"
+"Global options:\n"
"\n"
"--trace\n"
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
@@ -38,8 +38,6 @@ msgid ""
"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents.\n"
"\n"
-"Special options:\n"
-"\n"
"--version\n"
"\tPrint the version number and exit immediately."
msgstr ""
@@ -1168,7 +1166,7 @@ msgstr ""
"pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
"トリを削除し、最初からパッチをあて直してください。\\n"
-#: ../scripts/patchfns.in:740
+#: ../scripts/patchfns.in:751
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 "
@@ -1180,7 +1178,7 @@ msgstr ""
"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
"すべてのパッチを pop してください。\\n"
-#: ../scripts/patchfns.in:817
+#: ../scripts/patchfns.in:828
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 868ee32..005ab4d 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -13,7 +13,7 @@ msgstr ""
#: ../bin/quilt.in:31
msgid ""
"\n"
-"Common options to all commands:\n"
+"Global options:\n"
"\n"
"--trace\n"
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
@@ -23,8 +23,6 @@ msgid ""
"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents.\n"
"\n"
-"Special options:\n"
-"\n"
"--version\n"
"\tPrint the version number and exit immediately."
msgstr ""
@@ -844,7 +842,7 @@ msgid ""
"patches from scratch.\\n"
msgstr ""
-#: ../scripts/patchfns.in:740
+#: ../scripts/patchfns.in:751
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 "
@@ -852,7 +850,7 @@ msgid ""
"downgrading.\\n"
msgstr ""
-#: ../scripts/patchfns.in:817
+#: ../scripts/patchfns.in:828
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"