summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/de.po36
-rw-r--r--po/fr.po36
-rw-r--r--po/ja.po36
-rw-r--r--po/quilt.pot28
-rw-r--r--po/ru.po36
5 files changed, 100 insertions, 72 deletions
diff --git a/po/de.po b/po/de.po
index 46e57cc..4bc7016 100644
--- a/po/de.po
+++ b/po/de.po
@@ -336,7 +336,7 @@ msgstr ""
msgid "No snapshot to diff against\\n"
msgstr "Kein Snapshot, um ein Diff zu erzeugen\\n"
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:430
msgid "Patch %s not applied before patch %s\\n"
msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
@@ -744,13 +744,16 @@ msgstr "Patch %s konnte nicht in die series-Datei eingefügt werden\\n"
msgid ""
"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
msgstr ""
"Aufruf: quilt mail {--mbox datei|--send} [-m text] [-M datei] [--prefix "
"präfix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature datei] "
+"[first_patch [last_patch]]\\n"
#: quilt/mail.in:27
+#, fuzzy
msgid ""
"\n"
"Create mail messages from a specified range of patches, or all patches in\n"
@@ -790,6 +793,9 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--charset\n"
+"\tSpecify the input charset.\n"
+"\n"
"--signature file\n"
"\tAppend the specified signature to messages (defaults to ~/.signature\n"
"\tif found; use \\`-' for no signature).\n"
@@ -844,37 +850,37 @@ msgstr ""
"\tDie entsprechenden Header hinzufügen, um auf die angegebene\n"
"\tNachricht zu antworten.\n"
-#: quilt/mail.in:204 quilt/mail.in:212
+#: quilt/mail.in:207 quilt/mail.in:215
msgid "Introduction message already specified"
msgstr "Einleitungstext bereits angegeben"
-#: quilt/mail.in:310
+#: quilt/mail.in:313
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
"Die Envelope-Adresse konnte nicht festgestellt werden. Bitte verwenden Sie --"
"sender."
-#: quilt/mail.in:455
+#: quilt/mail.in:458
msgid "Unable to extract a subject header from %s\\n"
msgstr "Es konnte keine Subject-Kopfzeile aus %s extrahiert werden\\n"
-#: quilt/mail.in:479
+#: quilt/mail.in:482
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Die Patches %s haben dieselben Subject-Kopfzeilen.\\n"
-#: quilt/mail.in:488
+#: quilt/mail.in:491
msgid "File %s does not exist\\n"
msgstr "Datei %s existiert nicht\\n"
-#: quilt/mail.in:548
+#: quilt/mail.in:551
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
-#: quilt/mail.in:551
+#: quilt/mail.in:554
msgid "Introduction has no subject header\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
-#: quilt/mail.in:665
+#: quilt/mail.in:668
msgid "Introduction saved as %s\\n"
msgstr "Einleitung gespeichert als %s\\n"
@@ -1096,11 +1102,11 @@ msgstr ""
#: quilt/push.in:24
msgid ""
-"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
msgstr ""
-"Aufruf: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Aufruf: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
#: quilt/push.in:27
msgid ""
diff --git a/po/fr.po b/po/fr.po
index 73f8619..6065904 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -331,7 +331,7 @@ msgstr ""
msgid "No snapshot to diff against\\n"
msgstr "Pas d'instantané avec lequel comparer\\n"
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:430
msgid "Patch %s not applied before patch %s\\n"
msgstr "Le patch %s n'est pas appliqué avant %s\\n."
@@ -742,13 +742,16 @@ msgstr "Impossible d'inserer %s dans le fichier de série.\\n"
msgid ""
"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
msgstr ""
"Usage : quilt mail {--mbox fichier|--send} [-m texte] [-M fichier] [--prefix "
"préfixe] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [premier_patch [dernier_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature fichier] "
+"[premier_patch [dernier_patch]]\\n"
#: quilt/mail.in:27
+#, fuzzy
msgid ""
"\n"
"Create mail messages from a specified range of patches, or all patches in\n"
@@ -788,6 +791,9 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--charset\n"
+"\tSpecify the input charset.\n"
+"\n"
"--signature file\n"
"\tAppend the specified signature to messages (defaults to ~/.signature\n"
"\tif found; use \\`-' for no signature).\n"
@@ -841,36 +847,36 @@ msgstr ""
"--reply-to message\n"
"\tAjoute les en-têtes appropriés pour répondre au message spécifié.\n"
-#: quilt/mail.in:204 quilt/mail.in:212
+#: quilt/mail.in:207 quilt/mail.in:215
msgid "Introduction message already specified"
msgstr "Message d'introduction déjà spécifié"
-#: quilt/mail.in:310
+#: quilt/mail.in:313
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Impossible de déterminer l'adresse d'expéditeur. Utilisez --sender."
-#: quilt/mail.in:455
+#: quilt/mail.in:458
msgid "Unable to extract a subject header from %s\\n"
msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
-#: quilt/mail.in:479
+#: quilt/mail.in:482
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Les patches %s ont des sujets dupliqués.\\n"
-#: quilt/mail.in:488
+#: quilt/mail.in:491
msgid "File %s does not exist\\n"
msgstr "Le fichier %s n'existe pas\\n"
-#: quilt/mail.in:548
+#: quilt/mail.in:551
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
"L'introduction n'a pas de ligne de sujet (sauvegardé en tant que %s)\\n"
-#: quilt/mail.in:551
+#: quilt/mail.in:554
msgid "Introduction has no subject header\\n"
msgstr "L'introduction ne contient pas de ligne de sujet\\n"
-#: quilt/mail.in:665
+#: quilt/mail.in:668
msgid "Introduction saved as %s\\n"
msgstr "Introduction sauvegardée en tant que %s\\n"
@@ -1095,11 +1101,11 @@ msgstr ""
#: quilt/push.in:24
msgid ""
-"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
msgstr ""
-"Usage : quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage : quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
#: quilt/push.in:27
msgid ""
diff --git a/po/ja.po b/po/ja.po
index a2132ca..216d635 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -319,7 +319,7 @@ msgstr ""
msgid "No snapshot to diff against\\n"
msgstr "diff対象のスナップショトがありません\\n"
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:430
msgid "Patch %s not applied before patch %s\\n"
msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
@@ -716,13 +716,16 @@ msgstr "seriesファイルへのパッチ %s の書き込みに失敗しまし
msgid ""
"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
msgstr ""
"使い方: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix "
"prefix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
#: quilt/mail.in:27
+#, fuzzy
msgid ""
"\n"
"Create mail messages from a specified range of patches, or all patches in\n"
@@ -762,6 +765,9 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--charset\n"
+"\tSpecify the input charset.\n"
+"\n"
"--signature file\n"
"\tAppend the specified signature to messages (defaults to ~/.signature\n"
"\tif found; use \\`-' for no signature).\n"
@@ -814,37 +820,37 @@ msgstr ""
"--reply-to メッセージ\n"
"\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n"
-#: quilt/mail.in:204 quilt/mail.in:212
+#: quilt/mail.in:207 quilt/mail.in:215
msgid "Introduction message already specified"
msgstr "概要文はすでに指定されています"
-#: quilt/mail.in:310
+#: quilt/mail.in:313
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
"エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
"を使用してください。"
-#: quilt/mail.in:455
+#: quilt/mail.in:458
msgid "Unable to extract a subject header from %s\\n"
msgstr "%s から件名を取り出せません。\\n"
-#: quilt/mail.in:479
+#: quilt/mail.in:482
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "パッチ %s の件名が重複しています。\\n"
-#: quilt/mail.in:488
+#: quilt/mail.in:491
msgid "File %s does not exist\\n"
msgstr "ファイル %s が存在しません\\n"
-#: quilt/mail.in:548
+#: quilt/mail.in:551
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "概要文に件名部分がありません(%s として保存されました)\\n"
-#: quilt/mail.in:551
+#: quilt/mail.in:554
msgid "Introduction has no subject header\\n"
msgstr "概要文に件名部分がありません\\n"
-#: quilt/mail.in:665
+#: quilt/mail.in:668
msgid "Introduction saved as %s\\n"
msgstr "概要文は %s という名前で保存されました\\n"
@@ -1059,11 +1065,11 @@ msgstr ""
#: quilt/push.in:24
msgid ""
-"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
msgstr ""
-"使い方: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"使い方: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
#: quilt/push.in:27
msgid ""
diff --git a/po/quilt.pot b/po/quilt.pot
index 3591afe..736bf0e 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -211,7 +211,7 @@ msgstr ""
msgid "No snapshot to diff against\\n"
msgstr ""
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:430
msgid "Patch %s not applied before patch %s\\n"
msgstr ""
@@ -489,7 +489,8 @@ msgstr ""
msgid ""
"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
msgstr ""
#: quilt/mail.in:27
@@ -532,6 +533,9 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--charset\n"
+"\tSpecify the input charset.\n"
+"\n"
"--signature file\n"
"\tAppend the specified signature to messages (defaults to ~/.signature\n"
"\tif found; use \\`-' for no signature).\n"
@@ -540,35 +544,35 @@ msgid ""
"\tAdd the appropriate headers to reply to the specified message.\n"
msgstr ""
-#: quilt/mail.in:204 quilt/mail.in:212
+#: quilt/mail.in:207 quilt/mail.in:215
msgid "Introduction message already specified"
msgstr ""
-#: quilt/mail.in:310
+#: quilt/mail.in:313
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
-#: quilt/mail.in:455
+#: quilt/mail.in:458
msgid "Unable to extract a subject header from %s\\n"
msgstr ""
-#: quilt/mail.in:479
+#: quilt/mail.in:482
msgid "Patches %s have duplicate subject headers.\\n"
msgstr ""
-#: quilt/mail.in:488
+#: quilt/mail.in:491
msgid "File %s does not exist\\n"
msgstr ""
-#: quilt/mail.in:548
+#: quilt/mail.in:551
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
-#: quilt/mail.in:551
+#: quilt/mail.in:554
msgid "Introduction has no subject header\\n"
msgstr ""
-#: quilt/mail.in:665
+#: quilt/mail.in:668
msgid "Introduction saved as %s\\n"
msgstr ""
@@ -725,8 +729,8 @@ msgstr ""
#: quilt/push.in:24
msgid ""
-"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
msgstr ""
#: quilt/push.in:27
diff --git a/po/ru.po b/po/ru.po
index a18ab58..0b07912 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -330,7 +330,7 @@ msgstr ""
msgid "No snapshot to diff against\\n"
msgstr "Нет снимка для вывода различий\\n"
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:430
msgid "Patch %s not applied before patch %s\\n"
msgstr "Патч %s не был применён перед патчем %s\\n"
@@ -731,13 +731,16 @@ msgstr "Не удалось вставить патч %s в файл series\\n"
msgid ""
"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
-"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
+"subject ...] [--reply-to message] [--charset ...] [--signature file] "
+"[first_patch [last_patch]]\\n"
msgstr ""
"Синтаксис: quilt mail {--mbox файл|--send} [-m текст] [-M файл] [--prefix "
"префикс] [--sender …] [--from …] [--to …] [--cc …] [--bcc …] [--subject …] "
-"[--reply-to message] [первый_патч [последний_патч]]\\n"
+"[--reply-to message] [--charset …] [--signature файл] [первый_патч "
+"[последний_патч]]\\n"
#: quilt/mail.in:27
+#, fuzzy
msgid ""
"\n"
"Create mail messages from a specified range of patches, or all patches in\n"
@@ -777,6 +780,9 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--charset\n"
+"\tSpecify the input charset.\n"
+"\n"
"--signature file\n"
"\tAppend the specified signature to messages (defaults to ~/.signature\n"
"\tif found; use \\`-' for no signature).\n"
@@ -829,35 +835,35 @@ msgstr ""
"--reply-to сообщение\n"
"\tДобавить подходящие заголовки для ответа на указанное сообщение.\n"
-#: quilt/mail.in:204 quilt/mail.in:212
+#: quilt/mail.in:207 quilt/mail.in:215
msgid "Introduction message already specified"
msgstr "Вводное сообщение уже указано"
-#: quilt/mail.in:310
+#: quilt/mail.in:313
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Не удалось определить адрес отправителя. Используйте опцию --sender."
-#: quilt/mail.in:455
+#: quilt/mail.in:458
msgid "Unable to extract a subject header from %s\\n"
msgstr "Не удалось извлечь тему письма из %s\\n"
-#: quilt/mail.in:479
+#: quilt/mail.in:482
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "У патчей %s дублируются заголовки темы.\\n"
-#: quilt/mail.in:488
+#: quilt/mail.in:491
msgid "File %s does not exist\\n"
msgstr "Файл %s не существует\\n"
-#: quilt/mail.in:548
+#: quilt/mail.in:551
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Во введении нет заголовка Subject (сохранено как %s)\\n"
-#: quilt/mail.in:551
+#: quilt/mail.in:554
msgid "Introduction has no subject header\\n"
msgstr "Во введении нет заголовка Subject\\n"
-#: quilt/mail.in:665
+#: quilt/mail.in:668
msgid "Introduction saved as %s\\n"
msgstr "Введение сохранено как %s\\n"
@@ -1072,11 +1078,11 @@ msgstr ""
#: quilt/push.in:24
msgid ""
-"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [num|patch]\\n"
+"Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
msgstr ""
-"Синтаксис: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [--refresh] [число|патч]\\n"
+"Синтаксис: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
+"rejects] [--color[=always|auto|never]] [--refresh] [число|патч]\\n"
#: quilt/push.in:27
msgid ""