diff options
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | po/de.po | 27 | ||||
| -rw-r--r-- | po/fr.po | 56 | ||||
| -rw-r--r-- | po/ja.po | 51 | ||||
| -rw-r--r-- | po/quilt.pot | 4 | ||||
| -rw-r--r-- | quilt.changes | 10 | ||||
| -rw-r--r-- | quilt/annotate.in | 2 | ||||
| -rw-r--r-- | quilt/mail.in | 9 |
9 files changed, 149 insertions, 47 deletions
diff --git a/Makefile.in b/Makefile.in index e3dc5b2..6fcee0c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,8 +35,8 @@ DIFFSTAT := @DIFFSTAT@ RPMBUILD := @RPMBUILD@ MTA := @MTA@ -COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ -COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ +COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ +COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ default: all @@ -145,15 +145,16 @@ rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz po/quilt.pot: $(filter-out debian/control.in doc/quilt.1.in doc/README.in, \ $(wildcard */*.in)) - rm -f quilt.pot; touch quilt.pot + rm -f po/quilt.pot; touch po/quilt.pot for file in $+ ; do \ - if head $$file | grep -q '@BASH@'; then \ + if test -n "`$(SED) -ne '1{ /@BASH''@/p }' $$file`"; then \ bash --dump-po-strings $$file ; \ - elif head $$file | grep -q '@PERL@'; then \ + elif test -n "`$(SED) -ne '1{ /@PERL''@/p }' $$file`"; then \ xgettext --from-code=UTF-8 --omit-header --language=Perl \ --keyword=_ -o - $$file; \ else \ echo "Don't know how to handle $$file" >&2 ; \ + exit 1; \ fi \ done \ |msguniq \ diff --git a/configure.ac b/configure.ac index 093f923..b0dc555 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.49 $) +AC_REVISION ($Revision: 1.50 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -173,23 +173,13 @@ will not work correctly until a newer version (>= 1.32) is installed. fi dnl Check for sendmail -AC_ARG_WITH(mta, AC_HELP_STRING( - [--with-mta], [mail transfer agent to use]), - [ - MTA="$withval" - AC_SUBST(MTA) - AC_MSG_NOTICE([Using mail transfer executable $MTA]) - ],[ - AC_PATH_PROG(MTA, sendmail, [], [$PATH:/usr/sbin]) - ]) -if test -z "$MTA"; then - AC_MSG_WARN([ -Mail transfer executable not found; the --send option of the mail command -will not work correctly. If you have a mail transfer agent in a directory -that is not in the search path you can specify its location using the -'--with-mta' option. -]) - MTA="sendmail" +old_PATH=$PATH +PATH="$PATH:/usr/sbin" +QUILT_COMPAT_PROG_PATH(MTA, mta, [sendmail]) +PATH=$old_PATH + +if ! echo $COMPAT_PROGRAMS $COMPAT_SYMLINKS | grep -q mta; then + COMPAT_SYMLINKS="$COMPAT_SYMLINKS mta" fi AC_ARG_ENABLE(nls, AC_HELP_STRING( @@ -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" @@ -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" +#~ "Cre des messages de courrier partir de tous les patches de la srie.\n" +#~ "Ces fichiers sont ensuite stocks dans un fichier mbox ou expdis\n" +#~ "immdiatement. Un diteur est ouvert avec un patron pour saisir un " +#~ "message\n" +#~ "d'introduction. Voir le fichier %s pour plus de\n" +#~ "dtails.\n" +#~ "\n" +#~ "--mbox fichier\n" +#~ "\tStocke les messages dans le fichier spcifi au format mbox. Le\n" +#~ "\tfichier peut tre expdi plus tard en utilisant par exemple\n" +#~ "\tformail.\n" +#~ "\n" +#~ "--send\n" +#~ "\tExpdie les messages directement en utilisant %s.\n" +#~ "\n" +#~ "--from, --subject\n" +#~ "\tLes valeurs pour les champs d'en-tte De (From) et Objet (Subject),\n" +#~ "\trespectivement.\n" +#~ "\n" +#~ "--to, --cc, --bcc\n" +#~ "\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n" +#~ "\tcache, respectivement.\n" + #~ msgid "Cannot change into directory %s\\n" #~ msgstr "Impossible d'entrer dans le rpertoire %s\\n" @@ -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" diff --git a/quilt.changes b/quilt.changes index 780a492..0ccb3c0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Sun Sep 18 17:41:56 CEST 2005 - agruen@suse.de + +- 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. + +------------------------------------------------------------------- Sun Sep 18 16:28:14 CEST 2005 - agruen@suse.de - Makefile.in: remove obsolete substitutions. diff --git a/quilt/annotate.in b/quilt/annotate.in index 7113d94..c1917e4 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -19,7 +19,7 @@ fi usage() { - printf $"Usage: quilt [-p patch] annotate {file}\n" + printf $"Usage: quilt annotate [-p patch] {file}\n" if [ x$1 = x-h ] then printf $" diff --git a/quilt/mail.in b/quilt/mail.in index 709a6f7..3530acb 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -35,14 +35,14 @@ with a template for the introductory message. Please see the file can later be sent using formail, for example. --send - Send the messages directly using %s. + Send the messages directly. --from, --subject The values for the From and Subject headers to use. --to, --cc, --bcc Append a recipient to the To, Cc, or Bcc header. -" "@DOCSUBDIR@/README.MAIL" "@MTA@" +" "@DOCSUBDIR@/README.MAIL" exit 0 else exit 1 @@ -66,10 +66,10 @@ process_mail() --extract-recipients Bcc \ < $tmpfile) if [ -n "$opt_send" ]; then - echo @MTA@ "$@" + echo mta "$@" @SCRIPTS@/edmail --charset $opt_charset \ --remove-header Bcc "$@" < $tmpfile \ - | @MTA@ "$@" + | mta "$@" else local from_date=$(date "+%a %b %e %H:%M:%S %Y") echo "From ${LOGNAME:-$(whoami)}@$(hostname -f) $from_date" @@ -153,6 +153,7 @@ introduction=$(gen_tempfile) ( cat <<-EOF Message-Id: <$(msgid)> + User-Agent: quilt/@VERSION@-@RELEASE@ Date: $(date --rfc-822) From: $opt_from To: $(IFS=,; echo "${opt_to[*]}") |