- 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.

1 files changed, 53 insertions, 3 deletions

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"