- Fix a few things in po/quilt.pot generation.

- Always create the mta symlink in compat/. Replace "@MTA@" with
  "mta" in scripts. Replace mta check in configure.ac with
  QUILT_COMPAT_PROG_PATH.
- quilt/main.in: Add a User-Agent header.
- Update the German translation.

4 files changed, 119 insertions, 19 deletions

diff --git a/po/de.po b/po/de.po
index 201e054..1173f5d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -123,12 +123,10 @@ msgid "File %s added to patch %s\\n"
 msgstr "Datei %s zu Patch %s hinzugefügt\\n"
 
 #: quilt/annotate.in:22
-#, fuzzy
-msgid "Usage: quilt [-p patch] annotate {file}\\n"
-msgstr "Verwendung: quilt annotate {datei}\\n"
+msgid "Usage: quilt annotate [-p patch] {file}\\n"
+msgstr "Verwendung: quilt annotate [-p patch] {datei}\\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"
 "Erzeuge ein Listing der angegebenen Datei das anzeigt, welche\n"
-"Patches welche Zeilen verändern.\n"
+"Patches welche Zeilen verändern. Nur angewandte Patches werden\n"
+"angezeigt."
+"\n"
+"-p patch\n"
+"\tNur bis zum angegebenen Patch anstatt bis zum obersten Patch\n"
+"\tnach Änderungen suchen.\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 "Verwendung: 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\tLösche den nächsten (dem obersten folgenden) Patch statt des obersten\n"
 "\toder angegebenen.\n"
+"\n"
+"-r\tEntferne den Patch auch aus dem patches-Verzeichnis.\n"
+"\n"
+"--backup\n"
+"\tBenenne den Patch auf patch~, anstatt ihn zu löschen.\n"
+"\tHat nur in Kompination mit -r eine Wirkung.\n"
 
 #: quilt/delete.in:100
 msgid "No next patch\\n"
@@ -206,12 +214,10 @@ msgid "Failed to remove patch %s\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
 #: quilt/delete.in:138
-#, fuzzy
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
 msgstr "Konnte Datei %s nicht sichern\\n"
 
 #: quilt/delete.in:145
-#, fuzzy
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
@@ -630,7 +636,6 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n"
 
 #: quilt/import.in:25
-#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -709,7 +714,7 @@ msgid ""
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using %s.\n"
+"\tSend the messages directly.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"
@@ -729,7 +734,7 @@ msgstr ""
 "\tMailbox kann dann später mit formail o.ä. verschickt werden.\n"
 "\n"
 "--send\n"
-"\tVerschicke die Nachrichten direkt über %s.\n"
+"\tVerschicke die Nachrichten direkt.\n"
 "\n"
 "--from, --subject\n"
 "\tDie Werte für die From- und Subject-Kopfzeilen.\n"
diff --git a/po/fr.po b/po/fr.po
index 44542dd..c032690 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -124,8 +124,8 @@ msgstr "Le fichier %s a �t� ajout� au patch %s\\n"
 
 #: quilt/annotate.in:22
 #, fuzzy
-msgid "Usage: quilt [-p patch] annotate {file}\\n"
-msgstr "Usage : quilt annotate {fichier}\\n"
+msgid "Usage: quilt annotate [-p patch] {file}\\n"
+msgstr "Usage : quilt add [-p patch] {fichier} ...\\n"
 
 #: quilt/annotate.in:25
 #, fuzzy
@@ -700,6 +700,7 @@ msgstr ""
 "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"
@@ -712,7 +713,7 @@ msgid ""
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using %s.\n"
+"\tSend the messages directly.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"
@@ -1445,6 +1446,55 @@ msgstr "Suppression des espaces � la fin des lignes %s de %s\n"
 msgid "Renaming %s to %s: %s\n"
 msgstr "En renommant %s en %s : %s\n"
 
+#, fuzzy
+#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
+#~ msgstr "Usage : quilt annotate {fichier}\\n"
+
+#~ 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 using %s.\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"
+#~ "Cr�e des messages de courrier � partir de tous les patches de la s�rie.\n"
+#~ "Ces fichiers sont ensuite stock�s dans un fichier mbox ou exp�di�s\n"
+#~ "imm�diatement. Un �diteur est ouvert avec un patron pour saisir un "
+#~ "message\n"
+#~ "d'introduction. Voir le fichier %s pour plus de\n"
+#~ "d�tails.\n"
+#~ "\n"
+#~ "--mbox fichier\n"
+#~ "\tStocke les messages dans le fichier sp�cifi� au format mbox. Le\n"
+#~ "\tfichier peut �tre exp�di� plus tard en utilisant par exemple\n"
+#~ "\tformail.\n"
+#~ "\n"
+#~ "--send\n"
+#~ "\tExp�die les messages directement en utilisant %s.\n"
+#~ "\n"
+#~ "--from, --subject\n"
+#~ "\tLes valeurs pour les champs d'en-t�te De (From) et Objet (Subject),\n"
+#~ "\trespectivement.\n"
+#~ "\n"
+#~ "--to, --cc, --bcc\n"
+#~ "\tAjoute un destinataire dans le champ d'en-t�te A, Copie ou Copie\n"
+#~ "\tcach�e, respectivement.\n"
+
 #~ msgid "Cannot change into directory %s\\n"
 #~ msgstr "Impossible d'entrer dans le r�pertoire %s\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 1562283..6ca2672 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -122,8 +122,8 @@ msgstr "ファイル %s をパッチ %s に追加しました\\n"
 
 #: quilt/annotate.in:22
 #, fuzzy
-msgid "Usage: quilt [-p patch] annotate {file}\\n"
-msgstr "使い方: quilt annotate {ファイル}\\n"
+msgid "Usage: quilt annotate [-p patch] {file}\\n"
+msgstr "使い方: quilt add [-p パッチ] {file} ...\\n"
 
 #: quilt/annotate.in:25
 #, fuzzy
@@ -681,6 +681,7 @@ msgstr ""
 "[--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -693,7 +694,7 @@ msgid ""
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using %s.\n"
+"\tSend the messages directly.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"
@@ -1405,3 +1406,47 @@ msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "%s から %s へ名前を変更しました: %s\n"
+
+#, fuzzy
+#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
+#~ msgstr "使い方: quilt annotate {ファイル}\\n"
+
+#~ 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 using %s.\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"
diff --git a/po/quilt.pot b/po/quilt.pot
index e969470..cdc0f7b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -87,7 +87,7 @@ msgid "File %s added to patch %s\\n"
 msgstr ""
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt [-p patch] annotate {file}\\n"
+msgid "Usage: quilt annotate [-p patch] {file}\\n"
 msgstr ""
 
 #: quilt/annotate.in:25
@@ -492,7 +492,7 @@ msgid ""
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using %s.\n"
+"\tSend the messages directly.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"