Translation updates:

- po/quilt.pot, po/de.po: Resync with code.
- po/ja.po: Update from Yasushi Shoji.
- po/fr.po: Update from Jean Delvare.

4 files changed, 52 insertions, 86 deletions

diff --git a/po/de.po b/po/de.po
index cc00b1c..ef7191f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -355,8 +355,8 @@ msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
 #: quilt/diff.in:414
-msgid "More recent patches modify files in patch %s\\n"
-msgstr "Später angewandte Patches verändern Dateien von %s\\n"
+msgid "Warning: more recent patches modify files in patch %s\\n"
+msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n"
 
 #: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
diff --git a/po/fr.po b/po/fr.po
index 0b87ada..db5f933 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: quilt 0.42\n"
-"PO-Revision-Date: 2005-07-19 16:05+0200\n"
+"Project-Id-Version: quilt 0.43\n"
+"PO-Revision-Date: 2006-01-04 17:30+0100\n"
 "Last-Translator: Jean Delvare <khali@linux-fr.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -123,12 +123,10 @@ msgid "File %s added to patch %s\\n"
 msgstr "Le fichier %s a été ajouté au patch %s\\n"
 
 #: quilt/annotate.in:22
-#, fuzzy
 msgid "Usage: quilt annotate [-p patch] {file}\\n"
-msgstr "Usage : quilt add [-p patch] {fichier} ...\\n"
+msgstr "Usage : quilt annotate [-p patch] {fichier}\\n"
 
 #: quilt/annotate.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
@@ -140,7 +138,12 @@ msgid ""
 msgstr ""
 "\n"
 "Affiche une version annotée du fichier spécifié, montrant quel\n"
-"patch modifie chaque ligne.\n"
+"patch modifie chaque ligne. Seuls les patches appliqués sont\n"
+"pris en compte.\n"
+"\n"
+"-p patch\n"
+"\tAnnote le fichier tel qu'il se trouve après application du patch\n"
+"\tspécifié plutôt que d'aller jusqu'au patch au sommet.\n"
 
 #: quilt/applied.in:22
 msgid "Usage: quilt applied [patch]\\n"
@@ -165,7 +168,6 @@ msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n"
 msgstr "Usage : quilt delete [-r] [--backup] [patch|-n]\\n"
 
 #: quilt/delete.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -188,6 +190,12 @@ msgstr ""
 "\n"
 "-n\tEfface le patch qui suit celui qui est au sommet, au lieu du\n"
 "\tpatch spécifié ou de celui qui est au sommet.\n"
+"\n"
+"-r\tSupprime également le patch enlevé du répertoire patches.\n"
+"\n"
+"--backup\n"
+"\tRenomme le fichier en patch~ au lieu de le supprimer.\n"
+"\tIgnoré si \\\"-r\\\" n'est pas également utilisé.\n"
 
 #: quilt/delete.in:100
 msgid "No next patch\\n"
@@ -206,14 +214,12 @@ msgid "Failed to remove patch %s\\n"
 msgstr "Impossible de retirer le patch %s\\n"
 
 #: quilt/delete.in:138
-#, fuzzy
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
-msgstr "Impossible de faire une copie de sécurité de %s\\n"
+msgstr "Impossible de faire une copie de sécurité du fichier \\\"%s\\\"\\n"
 
 #: quilt/delete.in:145
-#, fuzzy
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
-msgstr "Impossible de retirer le patch %s\\n"
+msgstr "Impossible de retirer le patch \\\"%s\\\"\\n"
 
 #: quilt/diff.in:24
 msgid ""
@@ -351,8 +357,8 @@ msgid "Diff failed, aborting\\n"
 msgstr "Le diff a échoué. Abandon.\\n"
 
 #: quilt/diff.in:414
-msgid "More recent patches modify files in patch %s\\n"
-msgstr "Un patch plus recent modifie des fichiers communs à %s.\\n"
+msgid "Warning: more recent patches modify files in patch %s\\n"
+msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n"
 
 #: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
@@ -634,7 +640,6 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n"
 
 #: quilt/import.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -650,7 +655,9 @@ msgid ""
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
-"Importe des patchs externes.\n"
+"Importe des patchs externes.  Ces patches sont insérés juste après\n"
+"le patch au sommet, et doivent ensuite être appliqués (utiliser\n"
+"« quilt push »).\n"
 "\n"
 "-p num\n"
 "\tNombre de niveaux de répertoires à retirer lors de l'application du \n"
@@ -692,16 +699,14 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de série.\\n"
 
 #: quilt/mail.in:24
-#, fuzzy
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
 "to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
-"Usage : quilt mail {--mbox fichier|--send} [--from ...] [--to ...] [--"
-"cc ...] [--bcc ...] [--subject ...]\\n"
+"Usage : quilt mail {--mbox fichier|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
-#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -752,7 +757,7 @@ msgstr ""
 
 #: quilt/mail.in:145
 msgid "Could not determine the envelope sender address. Please use --sender."
-msgstr ""
+msgstr "Impossible de déterminer l'adresse d'expéditeur. Utilisez --sender."
 
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
diff --git a/po/ja.po b/po/ja.po
index 55d4dbf..890f159 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quilt 0.33\n"
-"PO-Revision-Date: 2005-09-06 09:43+0900\n"
+"PO-Revision-Date: 2006-01-04 05:35+0900\n"
 "Last-Translator: Yasushi SHOJI <yashi@atmark-techno.com>\n"
 "Language-Team: Quilt\n"
 "MIME-Version: 1.0\n"
@@ -121,12 +121,10 @@ msgid "File %s added to patch %s\\n"
 msgstr "ファイル %s をパッ� %s �追加����\\n"
 
 #: quilt/annotate.in:22
-#, fuzzy
 msgid "Usage: quilt annotate [-p patch] {file}\\n"
-msgstr "使�方: quilt add [-p パッ�] {file} ...\\n"
+msgstr "使�方: quilt annotate [-p パッ�] {file}\\n"
 
 #: quilt/annotate.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
@@ -137,8 +135,11 @@ msgid ""
 "\ttopmost patch.\n"
 msgstr ""
 "\n"
-"指定�れ�ファイルを���パッ����行を変更������註釈付��出力��"
-"�\n"
+"パッ��変更��行�註釈を付��表示。�応�れる�����られ��るパッ\n"
+"���。\n"
+"\n"
+"-p パッ�\n"
+"\t最上��パッ���処�を行����指定�れ�パッ��処�を終了\n"
 
 #: quilt/applied.in:22
 msgid "Usage: quilt applied [patch]\\n"
@@ -345,8 +346,8 @@ msgid "Diff failed, aborting\\n"
 msgstr "差分�失敗����。異常終了���\\n"
 
 #: quilt/diff.in:414
-msgid "More recent patches modify files in patch %s\\n"
-msgstr "最近�パッ���パッ� %s 内�ファイルを変更�����\\n"
+msgid "Warning: more recent patches modify files in patch %s\\n"
+msgstr "警告: 最近�パッ���パッ� %s 内�ファイルを変更�����\\n"
 
 #: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
@@ -673,16 +674,14 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイル��パッ� %s �書�込��失敗����\\n"
 
 #: quilt/mail.in:24
-#, fuzzy
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
 "to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
-"使�方: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] "
-"[--bcc ...] [--subject ...]\\n"
+"使�方: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
-#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -709,20 +708,25 @@ msgid ""
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
 msgstr ""
 "\n"
-"シリーズファイル内��る����パッ��らメールを作��る。\n"
-"mailboxファイル����存�������り出������る。\n"
-"説明文�テンプレート作�����エディタ�実行�れる。\n"
-"詳細����� %sを�照。\n"
+"シリーズファイル内��る����パッ��らメールを作���mailboxファ\n"
+"イル����存�る������り出������る。説明文作�用�テンプ\n"
+"レート付��エディタ�実行�れる。詳細����� %sを�照。\n"
 "\n"
 "--mbox ファイル\n"
 "\t全メッセージを指定�れ�ファイル� mbox形���存。後�例��\n"
 "\tformail��を使���信�る�����る。\n"
 "\n"
 "--send\n"
-"\t%s を使���直接メッセージを�信�る。\n"
+"\t直接メッセージを�信�る。\n"
+"\n"
+"--sender\n"
+"\tエンベロープ用�信者アドレス�指定。アドレス�必� \n"
+"\t\\`\\`user@domain.name''���形�������れ��ら��。表示用\n"
+"\t����使用��。\n"
 "\n"
 "--from, --subject\n"
-"\t使用�る From�Subjectヘッダ�値。\n"
+"\t使用�る From�Subjectヘッダ�値。--formオプション�与�られ�\n"
+"\t�場�� --senderオプション�使用�れる。\n"
 "\n"
 "--to, --cc, --bcc\n"
 "\tToやCC�BCC���信者�追加。\n"
@@ -730,6 +734,8 @@ msgstr ""
 #: quilt/mail.in:145
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
+"エンベロープ��信者アドレスを確定����ん���。--senderオプション\n"
+"を使用������。"
 
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
@@ -1416,48 +1422,3 @@ msgstr "%2$s � %1$s 行目末尾��る空白文字を削除���\n"
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "%s �ら %s ���を変更����: %s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Create mail messages from all patches in the series file, and either "
-#~ "store\n"
-#~ "them in a mailbox file, or send them immediately. The editor is opened\n"
-#~ "with a template for the introductory message. Please see the file\n"
-#~ "%s for details.\n"
-#~ "\n"
-#~ "--mbox file\n"
-#~ "\tStore all messages in the specified file in mbox format. The mbox\n"
-#~ "\tcan later be sent using formail, for example.\n"
-#~ "\n"
-#~ "--send\n"
-#~ "\tSend the messages directly.\n"
-#~ "\n"
-#~ "--from, --subject\n"
-#~ "\tThe values for the From and Subject headers to use.\n"
-#~ "\n"
-#~ "--to, --cc, --bcc\n"
-#~ "\tAppend a recipient to the To, Cc, or Bcc header.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "シリーズファイル内��る����パッ��らメールを作��る。\n"
-#~ "mailboxファイル����存�������り出������る。\n"
-#~ "説明文�テンプレート作�����エディタ�実行�れる。\n"
-#~ "詳細����� %sを�照。\n"
-#~ "\n"
-#~ "--mbox ファイル\n"
-#~ "\t全メッセージを指定�れ�ファイル� mbox形���存。後�例��\n"
-#~ "\tformail��を使���信�る�����る。\n"
-#~ "\n"
-#~ "--send\n"
-#~ "\t%s を使���直接メッセージを�信�る。\n"
-#~ "\n"
-#~ "--from, --subject\n"
-#~ "\t使用�る From�Subjectヘッダ�値。\n"
-#~ "\n"
-#~ "--to, --cc, --bcc\n"
-#~ "\tToやCC�BCC���信者�追加。\n"
-
-#, fuzzy
-#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
-#~ msgstr "使�方: quilt annotate {ファイル}\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index aad45f3..ca44b9b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -245,7 +245,7 @@ msgid "Diff failed, aborting\\n"
 msgstr ""
 
 #: quilt/diff.in:414
-msgid "More recent patches modify files in patch %s\\n"
+msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
 #: quilt/edit.in:24