From 321e4c0eec6f88512934e7e5e2f7d16bc0710676 Mon Sep 17 00:00:00 2001 From: Alexander Scott-Johns Date: Thu, 27 Jan 2011 20:08:22 +0000 Subject: [PATCH] notepad: Load UTF-8 encoding name from resources instead of using GetCPInfoEx. --- po/ar.po | 7 ++++++- po/bg.po | 6 +++++- po/ca.po | 6 +++++- po/cs.po | 6 +++++- po/da.po | 7 ++++++- po/de.po | 7 ++++++- po/el.po | 6 +++++- po/en.po | 6 +++++- po/en_US.po | 6 +++++- po/eo.po | 6 +++++- po/es.po | 7 ++++++- po/fa.po | 7 ++++++- po/fi.po | 6 +++++- po/fr.po | 7 ++++++- po/he.po | 7 ++++++- po/hi.po | 6 +++++- po/hu.po | 6 +++++- po/it.po | 7 ++++++- po/ja.po | 7 ++++++- po/ko.po | 7 ++++++- po/lt.po | 7 ++++++- po/ml.po | 6 +++++- po/nb_NO.po | 7 ++++++- po/nl.po | 7 ++++++- po/or.po | 6 +++++- po/pa.po | 6 +++++- po/pl.po | 7 ++++++- po/pt_BR.po | 7 ++++++- po/pt_PT.po | 7 ++++++- po/rm.po | 6 +++++- po/ro.po | 7 ++++++- po/ru.po | 7 ++++++- po/sk.po | 6 +++++- po/sl.po | 7 ++++++- po/sr_RS@cyrillic.po | 7 ++++++- po/sr_RS@latin.po | 7 ++++++- po/sv.po | 7 ++++++- po/te.po | 6 +++++- po/th.po | 6 +++++- po/tr.po | 6 +++++- po/uk.po | 7 ++++++- po/wa.po | 6 +++++- po/wine.pot | 6 +++++- po/zh_CN.po | 7 ++++++- po/zh_TW.po | 6 +++++- programs/notepad/dialog.c | 12 ++++++++++-- programs/notepad/notepad.rc | 1 + programs/notepad/notepad_res.h | 3 ++- 48 files changed, 262 insertions(+), 48 deletions(-) diff --git a/po/ar.po b/po/ar.po index 845e9660e45..b0c3ffd0147 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8337,7 +8337,12 @@ msgstr "يونيكود (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "يونيكود (UTF-16 Big Endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "يونيكود (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/bg.po b/po/bg.po index b98fd098e5c..e661092268e 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8515,7 +8515,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ca.po b/po/ca.po index 7aa75604967..3b99d5ac00e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8253,7 +8253,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/cs.po b/po/cs.po index ae256f83c20..d0872537399 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8883,7 +8883,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/da.po b/po/da.po index c34a7b921c4..ff066128bbc 100644 --- a/po/da.po +++ b/po/da.po @@ -8939,7 +8939,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/de.po b/po/de.po index 9476a1358f4..a4cbd0c990a 100644 --- a/po/de.po +++ b/po/de.po @@ -8901,7 +8901,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 Big-Endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/el.po b/po/el.po index aa1e453108c..85931c729e2 100644 --- a/po/el.po +++ b/po/el.po @@ -8369,7 +8369,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/en.po b/po/en.po index 48cd0ea36f6..2d9cd4b8651 100644 --- a/po/en.po +++ b/po/en.po @@ -8569,7 +8569,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/en_US.po b/po/en_US.po index 291d58b3cff..b0c68fffb42 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8671,7 +8671,11 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/eo.po b/po/eo.po index 5dfcfce88fa..203bfaea6e0 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8511,7 +8511,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/es.po b/po/es.po index 32de7f1f440..83f5b26471a 100644 --- a/po/es.po +++ b/po/es.po @@ -9084,7 +9084,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/fa.po b/po/fa.po index 49c4c3a4ca2..5619e7b89be 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8340,7 +8340,12 @@ msgstr "یونی‌کد (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "یونی‌کد (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "یونی‌کد (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/fi.po b/po/fi.po index 0d74578b749..f965eece312 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8586,7 +8586,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/fr.po b/po/fr.po index 213dc473ace..0b3eacb2be8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8991,7 +8991,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/he.po b/po/he.po index 2e2f122c46c..98a5b3a7b74 100644 --- a/po/he.po +++ b/po/he.po @@ -8718,7 +8718,12 @@ msgstr "יוניקוד (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "יוניקוד (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "יוניקוד (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/hi.po b/po/hi.po index 215bef77867..2f9a222ff42 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8249,7 +8249,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/hu.po b/po/hu.po index 8dbe7221625..5c2fea2f440 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8797,7 +8797,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/it.po b/po/it.po index e94d2125e55..2a352887caf 100644 --- a/po/it.po +++ b/po/it.po @@ -9009,7 +9009,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ja.po b/po/ja.po index 7ce884b94d7..e80d70d6cb5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8710,7 +8710,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ko.po b/po/ko.po index 504e05096cc..5402e263fce 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8718,7 +8718,12 @@ msgstr "유니코드 (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "유니코드 (UTF-16 빅-엔디언)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "유니코드 (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/lt.po b/po/lt.po index 310a195d0e9..51b64540b3f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8691,7 +8691,12 @@ msgstr "Unikodas (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unikodas (UTF-16 mažėjantys baitai)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unikodas (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ml.po b/po/ml.po index aa9a92a3e58..1d7f16c6c9d 100644 --- a/po/ml.po +++ b/po/ml.po @@ -8249,7 +8249,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index 1c77345055a..ae5493f0b68 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8910,7 +8910,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/nl.po b/po/nl.po index fd680ff3001..1f59e307d98 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8796,7 +8796,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/or.po b/po/or.po index d90c7f54838..9b14041d9cf 100644 --- a/po/or.po +++ b/po/or.po @@ -8249,7 +8249,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/pa.po b/po/pa.po index 26e68686ee0..83365aded04 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8249,7 +8249,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/pl.po b/po/pl.po index fd795915bea..d62b194703c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8950,7 +8950,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index add15c122bd..ea34eda609a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8964,7 +8964,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 6e37a1fa1be..d3669b73663 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -9022,7 +9022,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/rm.po b/po/rm.po index 24dced7e450..6d8a5c7e700 100644 --- a/po/rm.po +++ b/po/rm.po @@ -8303,7 +8303,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ro.po b/po/ro.po index 0b941f5344d..84436635c1d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9265,7 +9265,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/ru.po b/po/ru.po index 5727df1f436..c7f37db7af2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8932,7 +8932,12 @@ msgstr "Юникод (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Юникод (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Юникод (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/sk.po b/po/sk.po index 112744279ca..e4fa8138cba 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8521,7 +8521,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/sl.po b/po/sl.po index b50b7a10bdf..3a1c891a48a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9050,7 +9050,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 38f496e9bfe..ee903d43faf 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -8630,7 +8630,12 @@ msgstr "Уникод (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Уникод (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Уникод (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 195ec961e4c..f0cc91c7d89 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -8702,7 +8702,12 @@ msgstr "Unikod (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unikod (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unikod (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/sv.po b/po/sv.po index 4504d24c952..77e7f85938c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8754,7 +8754,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/te.po b/po/te.po index feeabee18c2..43240230c82 100644 --- a/po/te.po +++ b/po/te.po @@ -8249,7 +8249,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/th.po b/po/th.po index 3e08d75727b..b13f3b44a19 100644 --- a/po/th.po +++ b/po/th.po @@ -8387,7 +8387,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/tr.po b/po/tr.po index 2e794f7020b..3866aaf96be 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9040,7 +9040,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/uk.po b/po/uk.po index 95141808a7d..4d41c66e374 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8885,7 +8885,12 @@ msgstr "Юнікод (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Юнікод (UTF-16 big-endian)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Юнікод (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/wa.po b/po/wa.po index cb02fbdd6b9..45ef5acb047 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8355,7 +8355,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/wine.pot b/po/wine.pot index 44e9876561f..0022de51eef 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -8225,7 +8225,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 21ac6372520..81a76433144 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8628,7 +8628,12 @@ msgstr "Unicode (UTF-16)" msgid "Unicode (UTF-16 big-endian)" msgstr "Unicode (UTF-16 大尾)" -#: notepad.rc:101 +#: notepad.rc:95 +#, fuzzy +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-16)" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index be521e72fb5..ac76d34e425 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8690,7 +8690,11 @@ msgstr "" msgid "Unicode (UTF-16 big-endian)" msgstr "" -#: notepad.rc:101 +#: notepad.rc:95 +msgid "Unicode (UTF-8)" +msgstr "" + +#: notepad.rc:102 msgid "" "%s\n" "This file contains Unicode characters which will be lost if\n" diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 4a99ec23108..2cea58d5121 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -58,13 +58,21 @@ static void load_encoding_name(ENCODING enc, WCHAR* buffer, int length) LoadStringW(Globals.hInstance, STRING_UNICODE_BE, buffer, length); break; - default: + case ENCODING_UTF8: + LoadStringW(Globals.hInstance, STRING_UTF8, buffer, length); + break; + + case ENCODING_ANSI: { CPINFOEXW cpi; - GetCPInfoExW((enc==ENCODING_UTF8) ? CP_UTF8 : CP_ACP, 0, &cpi); + GetCPInfoExW(CP_ACP, 0, &cpi); lstrcpynW(buffer, cpi.CodePageName, length); break; } + + default: + assert(0 && "bad encoding in load_encoding_name"); + break; } } diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc index 92667f4bdcf..e73a98e116f 100644 --- a/programs/notepad/notepad.rc +++ b/programs/notepad/notepad.rc @@ -92,6 +92,7 @@ task.\nClose one or more applications to increase the amount of free memory." STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" +STRING_UTF8, "Unicode (UTF-8)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ This file contains Unicode characters which will be lost if\n\ diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 5428c0dc554..553fa6d2d5b 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -87,8 +87,9 @@ #define STRING_UNICODE_LE 0x180 #define STRING_UNICODE_BE 0x181 +#define STRING_UTF8 0x182 -#define STRING_LOSS_OF_UNICODE_CHARACTERS 0x182 +#define STRING_LOSS_OF_UNICODE_CHARACTERS 0x183 /* Open/Save As dialog template */ #define IDD_OFN_TEMPLATE 0x190