diff options
| -rw-r--r-- | po/de.po | 10 | ||||
| -rw-r--r-- | po/fr.po | 10 | ||||
| -rw-r--r-- | po/ja.po | 10 | ||||
| -rw-r--r-- | po/quilt.pot | 10 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/mail.in | 29 |
6 files changed, 40 insertions, 34 deletions
@@ -781,23 +781,23 @@ msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:303 +#: quilt/mail.in:304 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:326 +#: quilt/mail.in:327 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:369 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:371 +#: quilt/mail.in:372 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:460 +#: quilt/mail.in:461 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -787,24 +787,24 @@ msgstr "" 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:303 +#: quilt/mail.in:304 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:326 +#: quilt/mail.in:327 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqués.\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:369 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:371 +#: quilt/mail.in:372 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:460 +#: quilt/mail.in:461 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegardée en tant que %s\\n" @@ -759,23 +759,23 @@ msgstr "" "エンベãƒãƒ¼ãƒ—ã®é€ä¿¡è€…アドレスを確定ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚--senderオプション\n" "を使用ã—ã¦ãã ã•ã„。" -#: quilt/mail.in:303 +#: quilt/mail.in:304 msgid "Unable to extract a subject header from %s\\n" msgstr "%s ã‹ã‚‰ä»¶åã‚’å–り出ã›ã¾ã›ã‚“。\\n" -#: quilt/mail.in:326 +#: quilt/mail.in:327 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッム%s ã®ä»¶åãŒé‡è¤‡ã—ã¦ã„ã¾ã™ã€‚\\n" -#: quilt/mail.in:368 +#: quilt/mail.in:369 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "åºæ–‡ã«ä»¶åãŒã‚ã‚Šã¾ã›ã‚“(%s ã¨ã—ã¦ä¿å˜ã•ã‚Œã¾ã—ãŸ)\\n" -#: quilt/mail.in:371 +#: quilt/mail.in:372 msgid "Introduction has no subject header\\n" msgstr "åºæ–‡ã«ä»¶åãŒã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/mail.in:460 +#: quilt/mail.in:461 msgid "Introduction saved as %s\\n" msgstr "åºæ–‡ã¯ %s ã¨ã„ã†åå‰ã§ä¿å˜ã•ã‚Œã¾ã—ãŸ\\n" diff --git a/po/quilt.pot b/po/quilt.pot index fb32dd5..41de55c 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -516,23 +516,23 @@ msgstr "" msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:303 +#: quilt/mail.in:304 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:326 +#: quilt/mail.in:327 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:368 +#: quilt/mail.in:369 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:371 +#: quilt/mail.in:372 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:460 +#: quilt/mail.in:461 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 79246e3..9a02379 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 3 10:26:36 CET 2006 - agruen@suse.de + +- quilt/mail.in: Disable broken patch header format check. + +------------------------------------------------------------------- Fri Feb 3 12:23:00 AEST 2006 - jayvdb@gmail.com - configure.ac: Add check for GNU diff and use $GREP diff --git a/quilt/mail.in b/quilt/mail.in index efcfb76..cbaaa84 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -220,20 +220,21 @@ if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]; then fi # Does the first paragraph look like a mail header? - if [ ${#mh[@]} -eq 0 ] - then - if echo "$header" | awk ' - /^$/ { exit (!mh || not_mh) } - END { exit (!mh || not_mh) } - { if ($0 ~ /^[a-z]+:[ \t]/i) - mh = 1 - else - not_mh = 1 - }' - then - return 1 - fi - fi + #if [ ${#mh[@]} -eq 0 ] + #then + # if echo "$header" | awk ' + # /^$/ { exit (!mh || not_mh) } + # END { exit (!mh || not_mh) } + # { if (tolower($0) ~ \ + # /^(from|to|reply-to|date|cc):[ \t]/) + # mh = 1 + # else + # not_mh = 1 + # }' + # then + # return 1 + # fi + #fi # Is the first paragraph short enough to be used as the subject? if [ ${#mh[@]} -eq 0 ] |