notepad: Load UTF-8 encoding name from resources instead of using GetCPInfoEx.

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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;
     }
 }
 

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\

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