summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-01-23 05:01:00 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-01-23 05:01:00 +0000
commit0ae231e732db3af8de72ec7c846ed72a7f9c9fd3 (patch)
tree4e677efe26a93898d32a0f1741163f2dd39d312d /po
parentcaf1482275106e47eefe58669156def40acadae3 (diff)
downloadquilt-0ae231e732db3af8de72ec7c846ed72a7f9c9fd3.tar.gz
- Add mail command, doc/README.MAIL and example ``mail'' command
filter in quilt.quiltrc. - Bump version to 0.38.
Diffstat (limited to 'po')
-rw-r--r--po/de.po38
-rw-r--r--po/fr.po36
-rw-r--r--po/ja.po38
-rw-r--r--po/quilt.pot37
4 files changed, 78 insertions, 71 deletions
diff --git a/po/de.po b/po/de.po
index 142fdc5..924d561 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,15 +11,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../bin/quilt.in:20
+#: ../bin/quilt.in:23
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..."
-#: ../bin/quilt.in:22
+#: ../bin/quilt.in:25
msgid "Commands are:"
msgstr "Vorhandene Befehle:"
-#: ../bin/quilt.in:27
+#: ../bin/quilt.in:30
+#, fuzzy
msgid ""
"\n"
"Common options to all commands:\n"
@@ -28,8 +29,9 @@ msgid ""
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
"\n"
"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc. \n"
-"\tSee pdf documentation for details about its possible content."
+"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
+"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n"
+"\tdocumentation for details about its possible content."
msgstr ""
"\n"
"Gemeinsame Optionen für alle Befehle:\n"
@@ -66,7 +68,7 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
@@ -78,7 +80,7 @@ msgstr "Patch %s ist nicht angewandt\\n"
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143
+#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143
#: ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr "Keine Patches angewandt\\n"
@@ -575,7 +577,7 @@ msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
msgid "No patch removed\\n"
msgstr "Kein Patch entfernt\\n"
-#: ../quilt/pop.in:293 ../quilt/push.in:321
+#: ../quilt/pop.in:293 ../quilt/push.in:328
msgid "Now at patch %s\\n"
msgstr "Jetzt in Patch %s\\n"
@@ -655,35 +657,35 @@ msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
msgid "Patch %s appears to be empty\\n"
msgstr "Patch %s scheint leer zu sein\\n"
-#: ../quilt/push.in:109
+#: ../quilt/push.in:135
msgid "Applying patch %s\\n"
msgstr "Wende Patch %s an\\n"
-#: ../quilt/push.in:159
+#: ../quilt/push.in:166
msgid "Patch %s appears to be empty, applied\\n"
msgstr "Patch %s scheint leer zu sein, angewandt\\n"
-#: ../quilt/push.in:163
+#: ../quilt/push.in:170
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n"
-#: ../quilt/push.in:168
+#: ../quilt/push.in:175
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n"
-#: ../quilt/push.in:207
+#: ../quilt/push.in:214
msgid "Patch %s not found in file series\\n"
msgstr "Patch %s nicht in series-Datei gefunden\\n"
-#: ../quilt/push.in:282
+#: ../quilt/push.in:289
msgid "Patch %s is already applied\\n"
msgstr "Patch %s ist bereits angewandt\\n"
-#: ../quilt/push.in:291
+#: ../quilt/push.in:298
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
-#: ../quilt/push.in:305
+#: ../quilt/push.in:312
msgid "File series fully applied, ends at patch %s\\n"
msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
@@ -982,7 +984,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:703
+#: ../scripts/patchfns.in:750
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 "
@@ -995,7 +997,7 @@ msgstr ""
"quilt alle Patches mit der Version von quilt, die zur Erstellung des "
"Arbeitsverzeichnisses verwendet wurde.\\n"
-#: ../scripts/patchfns.in:770
+#: ../scripts/patchfns.in:817
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 f4dc6cf..6c04571 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,15 +12,16 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../bin/quilt.in:20
+#: ../bin/quilt.in:23
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-h] ..."
-#: ../bin/quilt.in:22
+#: ../bin/quilt.in:25
msgid "Commands are:"
msgstr "Les commandes sont :"
-#: ../bin/quilt.in:27
+#: ../bin/quilt.in:30
+#, fuzzy
msgid ""
"\n"
"Common options to all commands:\n"
@@ -29,8 +30,9 @@ msgid ""
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
"\n"
"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc. \n"
-"\tSee pdf documentation for details about its possible content."
+"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
+"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n"
+"\tdocumentation for details about its possible content."
msgstr ""
"\n"
"Options communes toutes les commandes :\n"
@@ -68,7 +70,7 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:273
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr "Le patch %s n'est pas dans la srie\\n"
@@ -80,7 +82,7 @@ msgstr "Le patch %s n'est pas appliqu\\n"
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:286 ../quilt/push.in:311 ../quilt/refresh.in:143
+#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143
#: ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqu\\n"
@@ -589,7 +591,7 @@ msgstr "Le patch %s doit tre rafraichi au pralable.\\n"
msgid "No patch removed\\n"
msgstr "Aucun patch retir\\n"
-#: ../quilt/pop.in:293 ../quilt/push.in:329
+#: ../quilt/pop.in:293 ../quilt/push.in:328
msgid "Now at patch %s\\n"
msgstr "Le patch %s est maintenant au sommet\\n"
@@ -679,32 +681,32 @@ msgstr "Le patch %s semble vide.\\n"
msgid "Applying patch %s\\n"
msgstr "Application de %s\\n"
-#: ../quilt/push.in:167
+#: ../quilt/push.in:166
msgid "Patch %s appears to be empty, applied\\n"
msgstr "Le patch %s semble vide. Il a t appliqu.\\n"
-#: ../quilt/push.in:171
+#: ../quilt/push.in:170
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n"
-#: ../quilt/push.in:176
+#: ../quilt/push.in:175
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
-#: ../quilt/push.in:215
+#: ../quilt/push.in:214
msgid "Patch %s not found in file series\\n"
msgstr "Le patch %s est introuvable dans le fichier de srie\\n"
-#: ../quilt/push.in:290
+#: ../quilt/push.in:289
msgid "Patch %s is already applied\\n"
msgstr "Le patch %s est dj appliqu.\\n"
-#: ../quilt/push.in:299
+#: ../quilt/push.in:298
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n"
-#: ../quilt/push.in:313
+#: ../quilt/push.in:312
msgid "File series fully applied, ends at patch %s\\n"
msgstr "La srie est compltement applique. Le dernier patch est %s.\\n"
@@ -1003,7 +1005,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:703
+#: ../scripts/patchfns.in:750
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 "
@@ -1015,7 +1017,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:770
+#: ../scripts/patchfns.in:817
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 295c402..9dcbd36 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,15 +12,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../bin/quilt.in:20
+#: ../bin/quilt.in:23
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
-#: ../bin/quilt.in:22
+#: ../bin/quilt.in:25
msgid "Commands are:"
msgstr "コマンド一覧:"
-#: ../bin/quilt.in:27
+#: ../bin/quilt.in:30
+#, fuzzy
msgid ""
"\n"
"Common options to all commands:\n"
@@ -29,8 +30,9 @@ msgid ""
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
"\n"
"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc. \n"
-"\tSee pdf documentation for details about its possible content."
+"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
+"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n"
+"\tdocumentation for details about its possible content."
msgstr ""
"\n"
"全コマンド共通オプション:\n"
@@ -66,7 +68,7 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr "パッチ %s は seriesの中にありません\\n"
@@ -78,7 +80,7 @@ msgstr "パッチ %s は適用されていません\\n"
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143
+#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143
#: ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr "適用されているパッチはありません\\n"
@@ -566,7 +568,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
msgid "No patch removed\\n"
msgstr "適用されているパッチはありません\\n"
-#: ../quilt/pop.in:293 ../quilt/push.in:321
+#: ../quilt/pop.in:293 ../quilt/push.in:328
msgid "Now at patch %s\\n"
msgstr "現在位置はパッチ %s です"
@@ -643,36 +645,36 @@ msgstr "ユーザによって中断されました。パッチ % は適用され
msgid "Patch %s appears to be empty\\n"
msgstr "パッチ %sは、空のようです\\n"
-#: ../quilt/push.in:109
+#: ../quilt/push.in:135
msgid "Applying patch %s\\n"
msgstr "パッチ %s を適用しています\\n"
-#: ../quilt/push.in:159
+#: ../quilt/push.in:166
msgid "Patch %s appears to be empty, applied\\n"
msgstr "パッチ %s は、空のようですが、適用しました\\n"
-#: ../quilt/push.in:163
+#: ../quilt/push.in:170
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n"
-#: ../quilt/push.in:168
+#: ../quilt/push.in:175
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n"
-#: ../quilt/push.in:207
+#: ../quilt/push.in:214
msgid "Patch %s not found in file series\\n"
msgstr "パッチ %s が seriesファイル内で見つかりません。\\n"
-#: ../quilt/push.in:282
+#: ../quilt/push.in:289
msgid "Patch %s is already applied\\n"
msgstr "パッチ %s は、すでに適用済です\\n"
-#: ../quilt/push.in:291
+#: ../quilt/push.in:298
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
-#: ../quilt/push.in:305
+#: ../quilt/push.in:312
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
"seriesファイルのパッチはすべて適用されています。\n"
@@ -967,7 +969,7 @@ msgstr ""
"pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
"トリを削除し、最初からパッチをあて直してください。\\n"
-#: ../scripts/patchfns.in:703
+#: ../scripts/patchfns.in:750
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 "
@@ -979,7 +981,7 @@ msgstr ""
"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
"すべてのパッチを pop してください。\\n"
-#: ../scripts/patchfns.in:770
+#: ../scripts/patchfns.in:817
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 f2e0a53..3e586df 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1,12 +1,12 @@
-#: ../bin/quilt.in:20
+#: ../bin/quilt.in:23
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr ""
-#: ../bin/quilt.in:22
+#: ../bin/quilt.in:25
msgid "Commands are:"
msgstr ""
-#: ../bin/quilt.in:27
+#: ../bin/quilt.in:30
msgid ""
"\n"
"Common options to all commands:\n"
@@ -15,8 +15,9 @@ msgid ""
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
"\n"
"--quiltrc file\n"
-"\tUse the specified configuration file instead of ~/.quiltrc. \n"
-"\tSee pdf documentation for details about its possible content."
+"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
+"\t/etc/quilt.quiltrc if ~/.quiltrc is missing). See the pdf\n"
+"\tdocumentation for details about its possible content."
msgstr ""
#: ../quilt/add.in:22
@@ -36,7 +37,7 @@ msgstr ""
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
-#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265
+#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
msgid "Patch %s is not in series\\n"
msgstr ""
@@ -48,7 +49,7 @@ msgstr ""
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143
+#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143
#: ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr ""
@@ -417,7 +418,7 @@ msgstr ""
msgid "No patch removed\\n"
msgstr ""
-#: ../quilt/pop.in:293 ../quilt/push.in:321
+#: ../quilt/pop.in:293 ../quilt/push.in:328
msgid "Now at patch %s\\n"
msgstr ""
@@ -472,35 +473,35 @@ msgstr ""
msgid "Patch %s appears to be empty\\n"
msgstr ""
-#: ../quilt/push.in:109
+#: ../quilt/push.in:135
msgid "Applying patch %s\\n"
msgstr ""
-#: ../quilt/push.in:159
+#: ../quilt/push.in:166
msgid "Patch %s appears to be empty, applied\\n"
msgstr ""
-#: ../quilt/push.in:163
+#: ../quilt/push.in:170
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
-#: ../quilt/push.in:168
+#: ../quilt/push.in:175
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
-#: ../quilt/push.in:207
+#: ../quilt/push.in:214
msgid "Patch %s not found in file series\\n"
msgstr ""
-#: ../quilt/push.in:282
+#: ../quilt/push.in:289
msgid "Patch %s is already applied\\n"
msgstr ""
-#: ../quilt/push.in:291
+#: ../quilt/push.in:298
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr ""
-#: ../quilt/push.in:305
+#: ../quilt/push.in:312
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
@@ -712,7 +713,7 @@ msgid ""
"patches from scratch.\\n"
msgstr ""
-#: ../scripts/patchfns.in:703
+#: ../scripts/patchfns.in:750
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 "
@@ -720,7 +721,7 @@ msgid ""
"downgrading.\\n"
msgstr ""
-#: ../scripts/patchfns.in:770
+#: ../scripts/patchfns.in:817
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"