diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-03-26 13:57:25 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-03-26 13:57:25 +0000 |
| commit | b91802032a0ab98fc306a02f6c70ccb1be0edc67 (patch) | |
| tree | 5442a481f0e575e38e30dea25b78212cd90438f0 | |
| parent | 9e5f63ad08ba959bfbbac95767e0307141c37c77 (diff) | |
| download | quilt-b91802032a0ab98fc306a02f6c70ccb1be0edc67.tar.gz | |
- test/mail.in: Test UTF-8 header encoding.
| -rw-r--r-- | po/de.po | 20 | ||||
| -rw-r--r-- | po/fr.po | 20 | ||||
| -rw-r--r-- | po/ja.po | 20 | ||||
| -rw-r--r-- | po/quilt.pot | 14 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | test/mail.test | 5 | ||||
| -rw-r--r-- | test/test.quiltrc | 1 |
7 files changed, 36 insertions, 49 deletions
@@ -1254,22 +1254,12 @@ msgstr "Fehler beim Umbenennen von Patch %s auf %s\\n" msgid "Patch %s renamed to %s\\n" msgstr "Patch %s auf %s umbenannt\\n" -#: quilt/scripts/edmail.in:81 +#: quilt/scripts/edmail.in:83 #, perl-format msgid "Display name `%s' contains unpaired parentheses\n" msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" -#: quilt/scripts/edmail.in:85 -#, perl-format -msgid "Display name `%s' contains invalid characters\n" -msgstr "Anzeigename `%s' enthält ungültige Zeichen\n" - -#: quilt/scripts/edmail.in:89 -#, perl-format -msgid "Display name `%s' contains non-printable or 8-bit characters\n" -msgstr "Anzeigename `%s' enthält nichtdruckbare or 8-Bit-Zeichen\n" - -#: quilt/scripts/edmail.in:95 +#: quilt/scripts/edmail.in:101 #, perl-format msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" @@ -1533,3 +1523,9 @@ msgstr "" "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die " "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" + +#~ msgid "Display name `%s' contains invalid characters\n" +#~ msgstr "Anzeigename `%s' enthält ungültige Zeichen\n" + +#~ msgid "Display name `%s' contains non-printable or 8-bit characters\n" +#~ msgstr "Anzeigename `%s' enthält nichtdruckbare or 8-Bit-Zeichen\n" @@ -1269,22 +1269,12 @@ msgstr "Le renommage de %s en %s a chou\\n" msgid "Patch %s renamed to %s\\n" msgstr "Patch %s renomm en %s\\n" -#: quilt/scripts/edmail.in:81 +#: quilt/scripts/edmail.in:83 #, perl-format msgid "Display name `%s' contains unpaired parentheses\n" msgstr "Le nom `%s' est mal parenths\n" -#: quilt/scripts/edmail.in:85 -#, perl-format -msgid "Display name `%s' contains invalid characters\n" -msgstr "Le nom `%s' comprend des caractres invalides\n" - -#: quilt/scripts/edmail.in:89 -#, perl-format -msgid "Display name `%s' contains non-printable or 8-bit characters\n" -msgstr "Le nom `%s' comprend des caractres non-affichables ou 8 bits\n" - -#: quilt/scripts/edmail.in:95 +#: quilt/scripts/edmail.in:101 #, perl-format msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" @@ -1547,3 +1537,9 @@ msgstr "" "Veuillez retirer tous les patchs en utilisant quilt pop -a avec la \n" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" + +#~ msgid "Display name `%s' contains invalid characters\n" +#~ msgstr "Le nom `%s' comprend des caractres invalides\n" + +#~ msgid "Display name `%s' contains non-printable or 8-bit characters\n" +#~ msgstr "Le nom `%s' comprend des caractres non-affichables ou 8 bits\n" @@ -1224,22 +1224,12 @@ msgstr "パッチ %s から %s への名前の変更に失敗しました\\n" msgid "Patch %s renamed to %s\\n" msgstr "パッチ %s から %s へ名前を変更しました\\n" -#: quilt/scripts/edmail.in:81 +#: quilt/scripts/edmail.in:83 #, perl-format msgid "Display name `%s' contains unpaired parentheses\n" msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます\n" -#: quilt/scripts/edmail.in:85 -#, perl-format -msgid "Display name `%s' contains invalid characters\n" -msgstr "表示用の名前 `%s' が不正な文字を含んでいます\n" - -#: quilt/scripts/edmail.in:89 -#, perl-format -msgid "Display name `%s' contains non-printable or 8-bit characters\n" -msgstr "表示用の名前 `%s' が非印刷文字または 8 bitの文字を含んでいます\n" - -#: quilt/scripts/edmail.in:95 +#: quilt/scripts/edmail.in:101 #, perl-format msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" @@ -1501,3 +1491,9 @@ msgstr "" "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" + +#~ msgid "Display name `%s' contains invalid characters\n" +#~ msgstr "表示用の名前 `%s' が不正な文字を含んでいます\n" + +#~ msgid "Display name `%s' contains non-printable or 8-bit characters\n" +#~ msgstr "表示用の名前 `%s' が非印刷文字または 8 bitの文字を含んでいます\n" diff --git a/po/quilt.pot b/po/quilt.pot index 541fc82..95f3fa2 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -852,22 +852,12 @@ msgstr "" msgid "Patch %s renamed to %s\\n" msgstr "" -#: quilt/scripts/edmail.in:81 +#: quilt/scripts/edmail.in:83 #, perl-format msgid "Display name `%s' contains unpaired parentheses\n" msgstr "" -#: quilt/scripts/edmail.in:85 -#, perl-format -msgid "Display name `%s' contains invalid characters\n" -msgstr "" - -#: quilt/scripts/edmail.in:89 -#, perl-format -msgid "Display name `%s' contains non-printable or 8-bit characters\n" -msgstr "" - -#: quilt/scripts/edmail.in:95 +#: quilt/scripts/edmail.in:101 #, perl-format msgid "Delivery address `%s' is invalid\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index ac98c52..4f0c3f8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Mar 26 15:56:40 CEST 2006 - agruen@suse.de + +- test/mail.in: Test UTF-8 header encoding. + +------------------------------------------------------------------- Sun Mar 26 11:45:15 CEST 2006 - khali@linux-fr.org - test/mail.in: Test for recipients with a dot in their name. diff --git a/test/mail.test b/test/mail.test index 9b00126..361c5b0 100644 --- a/test/mail.test +++ b/test/mail.test @@ -47,6 +47,7 @@ < < Signed-off-by: Joe R. Hacker <joe@foo.baz> < Cc: "John X. Doe" <jxd@some.where> + < Cc: Ü is an umlaut <used@in.german> < $ cat - no-subject > patches/5.diff @@ -76,9 +77,11 @@ > To: John X. Doe <jxd@some.where> > -- > Cc: "Joe R. Hacker" <joe@foo.baz>, - > "John X. Doe" <jxd@some.where> + > "John X. Doe" <jxd@some.where>, + > =?UTF-8?q?=C3=9C=20is=20an=20umlaut?= <used@in.german> > Subject: [test 4/5] First paragraph used as subject of 4.diff. > Cc: "John X. Doe" <jxd@some.where> + > Cc: Ü is an umlaut <used@in.german> > -- > Subject: [test 5/5] Subject of 5.diff > -- diff --git a/test/test.quiltrc b/test/test.quiltrc index b656eea..4bb4f7b 100644 --- a/test/test.quiltrc +++ b/test/test.quiltrc @@ -1,5 +1,6 @@ # Define this to generate diffs without timestamps. QUILT_DIFF_ARGS="--no-timestamps" QUILT_REFRESH_ARGS="--no-timestamps" +QUILT_MAIL_ARGS="--charset=UTF-8" QUILT_PATCHES_PREFIX=yes |