diff --git a/po/ar.po b/po/ar.po
index db949ae3c06..f16ad1231d1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13898,6 +13898,16 @@ msgstr ""
 "مطابقة السمات لهذا المجلد و مجلداته الفرعية.  /S  \n"
 "تحسين الإجراءات مع المجلدات.  /D  \n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "رسالة غير سليمة.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "تما&ثلية"
diff --git a/po/ast.po b/po/ast.po
index 290e08ab480..194df791b5b 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -13277,6 +13277,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "El mensaxe nun ye válidu.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&lóxicu"
diff --git a/po/bg.po b/po/bg.po
index 8fb8f888700..1096c267ba0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13444,6 +13444,15 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+msgid "Invalid code page\n"
+msgstr "Невалидни знаци в пътя.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index eabc3dbcccf..b9149bed9cd 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13497,6 +13497,16 @@ msgstr ""
 "      subcarpetes.\n"
 "  /D  Processa les carpetes també.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "El missatge no és vàlid.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&lògic"
diff --git a/po/cs.po b/po/cs.po
index c2a9d71bfad..0e7a7735075 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13710,6 +13710,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Neplatná zpráva.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logové"
diff --git a/po/da.po b/po/da.po
index 0f424c0cc01..b0d94c4e78f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14017,6 +14017,16 @@ msgstr ""
 "  /S  Processer matchende filer i den nuværende mappe og undermapper.\n"
 "  /D  Processer også mapper.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Ugyldig besked.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analog"
diff --git a/po/de.po b/po/de.po
index 66b00494aac..2e013ce9421 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13276,6 +13276,16 @@ msgstr ""
 "verarbeiten.\n"
 "  /D  Auch Verzeichnisse verarbeiten.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Ungültige Nachricht.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&log"
diff --git a/po/el.po b/po/el.po
index de7887e137b..77cf28e8b5a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13213,6 +13213,15 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+msgid "Invalid code page\n"
+msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index d321f26fb2b..1817bba648a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -13220,6 +13220,14 @@ msgstr ""
 "  /S  Processes matching files in the current folder and all subfolders.\n"
 "  /D  Processes folders as well.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr "Active code page: %1!u!\n"
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr "Invalid code page\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logue"
diff --git a/po/en_US.po b/po/en_US.po
index 16c1bf93f64..e0951a62275 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -13220,6 +13220,14 @@ msgstr ""
 "  /S  Processes matching files in the current folder and all subfolders.\n"
 "  /D  Processes folders as well.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr "Active code page: %1!u!\n"
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr "Invalid code page\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&log"
diff --git a/po/eo.po b/po/eo.po
index 974fd7f59ca..f6b16a90c24 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13424,6 +13424,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid computer name.\n"
+msgid "Invalid code page\n"
+msgstr "Nevalida komputilnomo.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&loga"
diff --git a/po/es.po b/po/es.po
index 20fc2cd1d55..b1fadaf6c7e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13709,6 +13709,16 @@ msgstr ""
 "      sus subcarpetas.\n"
 "  /D  Aplicar también sobre carpetas.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Mensaje inválido.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analógico"
diff --git a/po/fa.po b/po/fa.po
index 5d6e2e45aa6..0b74452444e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -13205,6 +13205,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a026c03e207..85329970694 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13196,6 +13196,16 @@ msgstr ""
 "alikansioissa.\n"
 "  /D  Käsittelee myös kansiot.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Viesti ei kelpaa.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analoginen"
diff --git a/po/fr.po b/po/fr.po
index 193ad981082..2cb688b5d5c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13950,6 +13950,16 @@ msgstr ""
 "      et tous les sous-dossiers.\n"
 "  /D  Traite également les dossiers.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Message invalide.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logique"
diff --git a/po/he.po b/po/he.po
index 9fc47b92820..8175af737f7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13821,6 +13821,15 @@ msgstr ""
 "  /S  Processes matching files in the current folder and all subfolders.\n"
 "  /D  Processes folders as well.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+msgid "Invalid code page\n"
+msgstr "Error: Invalid key name.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&אנלוגי"
diff --git a/po/hi.po b/po/hi.po
index e7e09d92730..748c5e3cef2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -12959,6 +12959,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "एनालॉग (&l)"
diff --git a/po/hr.po b/po/hr.po
index f4f313943e7..75688051cc3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -13804,6 +13804,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Neispravna poruka.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analogni"
diff --git a/po/hu.po b/po/hu.po
index 482c3e11e84..17935ef917a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13997,6 +13997,16 @@ msgstr ""
 "alkönytárában.\n"
 "  /D  Beállítja a mappákat is.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Érvénytelen üzenet.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&lóg"
diff --git a/po/it.po b/po/it.po
index 24e2aad50a1..af04492abe1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14076,6 +14076,16 @@ msgstr ""
 "sottocartelle.\n"
 "  /D  Elabora anche le cartelle.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Messaggio non valido.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logico"
diff --git a/po/ja.po b/po/ja.po
index 7483d0df90e..71f3749587a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13222,6 +13222,16 @@ msgstr ""
 "す。\n"
 "  /D  フォルダーも同様に処理します。\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "メッセージが正しくありません。\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "アナログ(&L)"
diff --git a/po/ko.po b/po/ko.po
index a7994623673..3b2ef3f384d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -13176,6 +13176,16 @@ msgstr ""
 "  /S  현재 폴더와 모든 하위 폴더에서 일치하는 파일을 처리합니다.\n"
 "  /D  폴더를 처리합니다.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "잘못된 메시지입니다.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "아날로그(&L)"
diff --git a/po/lt.po b/po/lt.po
index d0532e095f1..7e60c4ea0e7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -13221,6 +13221,16 @@ msgstr ""
 "  /S  Apdoroja atitinkančius failus dabartiniame aplanke ir poaplankiuose.\n"
 "  /D  Taip pat apdoroja aplankus.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Neteisingas pranešimas.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&loginis"
diff --git a/po/ml.po b/po/ml.po
index 28f92cd743f..fbf83d52b3b 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -12958,6 +12958,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "_അനലോഗ്"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ce214eac6c8..1d2922bd28e 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -13621,6 +13621,16 @@ msgstr ""
 "  /S  Behandle oppgitte filer i gjeldende katalog og alle underkataloger.\n"
 "  /D  Behandle kataloger i tillegg.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Ugyldig melding.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&log"
diff --git a/po/nl.po b/po/nl.po
index c9be849321c..5751f47e849 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13261,6 +13261,16 @@ msgstr ""
 "  /S  Verwerk passende bestanden in de huidige map en alle submappen.\n"
 "  /D  Verwerk ook de mappen zelf.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Ongeldig bericht.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analoog"
diff --git a/po/or.po b/po/or.po
index bd399213c8b..91404942046 100644
--- a/po/or.po
+++ b/po/or.po
@@ -12944,6 +12944,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "ଆନାଲଗ ‍‌(&l)"
diff --git a/po/pa.po b/po/pa.po
index d80f212ad6e..526eca931f8 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -12944,6 +12944,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "ਐਨਾਲਾਗ(&l)"
diff --git a/po/pl.po b/po/pl.po
index 824d5ad6f6a..55a077010ae 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13254,6 +13254,16 @@ msgstr ""
 "podkatalogach.\n"
 "  /D  Przetwarza także katalogi.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Niepoprawna wiadomość.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logowy"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e91f063c065..1349e511267 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13270,6 +13270,16 @@ msgstr ""
 "  /S  Processa os arquivos correspondentes na pasta atual e  nas subpastas.\n"
 "  /D  Processa também as pastas.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Mensagem inválida.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analógico"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b90420c8e1d..fdf72e2cc28 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -13812,6 +13812,16 @@ msgstr ""
 "  /S  Processa ficheiros correspondentes na pasta actual e suas sub-pastas.\n"
 "  /D  Processa também pastas.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Mensagem inválida.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analógico"
diff --git a/po/rm.po b/po/rm.po
index 836b46f0f63..2a037893aff 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -13030,6 +13030,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 1fcd79ac119..6b52e3096f6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13899,6 +13899,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Mesaj nevalid.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logic"
diff --git a/po/ru.po b/po/ru.po
index 56fcf6340a8..412ca268d64 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13439,6 +13439,16 @@ msgstr ""
 "  /S  Обрабатывает подходящие файлы в текущей папке и всех подпапках.\n"
 "  /D  Обрабатывает также папки.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Неверное сообщение.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Аналоговые"
diff --git a/po/si.po b/po/si.po
index 5e39765b07d..9ef8f014268 100644
--- a/po/si.po
+++ b/po/si.po
@@ -13362,6 +13362,16 @@ msgstr ""
 "  /S  මේ ෆෝල්ඩරය හා යට ෆෝල්ඩර් වල ඇතුලේ ගැලපෙන ගොනු සකසනවා.\n"
 "  /D  ෆෝල්ඩර් උත් සකසනවා.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "අවලංගු පණිවිඩය.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "ප්‍රතිසම (&L)"
diff --git a/po/sk.po b/po/sk.po
index c4f0f78239c..03120e95cff 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13572,6 +13572,16 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid data.\n"
+msgid "Invalid code page\n"
+msgstr "Nesprávne údaje.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&lógové"
diff --git a/po/sl.po b/po/sl.po
index ad8061a5869..be2dee62e35 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -14031,6 +14031,16 @@ msgstr ""
 "  /S  Obdela ujemajoče se datoteke v trenutni mapi in vseh podmapah.\n"
 "  /D  Obdela tudi mape.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Neveljavno sporočilo.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&logna ura"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 22eb07694f0..7040a34c230 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -13769,6 +13769,15 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+msgid "Invalid code page\n"
+msgstr "Неисправна синтакса.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Аналогни"
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 36df528dffb..283070297aa 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -13904,6 +13904,15 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+msgid "Invalid code page\n"
+msgstr "Neispravna sintaksa.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analogni"
diff --git a/po/sv.po b/po/sv.po
index 48e6dd16305..c24d22f8d28 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13743,6 +13743,16 @@ msgstr ""
 "  /S  Behandlar matchande filer i aktuell mapp och alla undermappar.\n"
 "  /D  Behandlar även mappar.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Ogiltigt meddelande.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&log"
diff --git a/po/ta.po b/po/ta.po
index 7a79f0690c9..5a832045f79 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -12882,6 +12882,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index ac7549caa83..066b00062c0 100644
--- a/po/te.po
+++ b/po/te.po
@@ -12944,6 +12944,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "ఎనలాగ్ (&l)"
diff --git a/po/th.po b/po/th.po
index 62dfda98e82..26b4e55baee 100644
--- a/po/th.po
+++ b/po/th.po
@@ -13290,6 +13290,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "ธรรมดา"
diff --git a/po/tr.po b/po/tr.po
index 3b319160dad..d1decb7a55b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13416,6 +13416,16 @@ msgstr ""
 "  /S  Geçerli klasör ve alt klasörlerinde eşleşen dosyaları işler.\n"
 "  /D  Klasörleri de işler.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Geçersiz mesaj.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "Ana&log"
diff --git a/po/uk.po b/po/uk.po
index e629d66c393..78ef97050f1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13493,6 +13493,16 @@ msgstr ""
 "  /S  Обробляє відповідні файли в поточній теці та всіх підтеках.\n"
 "  /D  Обробляє також теки.\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "Невірне повідомлення.\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Анало&говий"
diff --git a/po/wa.po b/po/wa.po
index 32260f9f6b8..ae03aa0b8dd 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -13185,6 +13185,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "&Analodjike"
diff --git a/po/wine.pot b/po/wine.pot
index c16f8838e4e..e1713839d6e 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -12861,6 +12861,14 @@ msgid ""
 "  /D  Processes folders as well.\n"
 msgstr ""
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+msgid "Invalid code page\n"
+msgstr ""
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2657cafb492..d30b27160a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13242,6 +13242,16 @@ msgstr ""
 "  /S  处理当前目录和其所有子目录下的文件。\n"
 "  /D  同时也处理目录的属性。\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "无效消息。\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "模拟时钟(&L)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 67c973cb091..301685d0fff 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13074,6 +13074,16 @@ msgstr ""
 "  /S  處理在目前資料夾和所有子資料夾中的匹配檔案。\n"
 "  /D  同樣處理資料夾。\n"
 
+#: programs/chcp.com/chcp.rc:28
+msgid "Active code page: %1!u!\n"
+msgstr ""
+
+#: programs/chcp.com/chcp.rc:29
+#, fuzzy
+#| msgid "Invalid message.\n"
+msgid "Invalid code page\n"
+msgstr "無效的訊息。\n"
+
 #: programs/clock/clock.rc:32
 msgid "Ana&log"
 msgstr "類比時鐘(&L)"
diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in
index 46ed25f3cea..c7037abb10f 100644
--- a/programs/chcp.com/Makefile.in
+++ b/programs/chcp.com/Makefile.in
@@ -1,6 +1,9 @@
 MODULE    = chcp.com
+IMPORTS   = kernelbase
 
 EXTRADLLFLAGS = -mconsole -municode
 
 C_SRCS = \
 	main.c
+
+RC_SRCS = chcp.rc
diff --git a/programs/chcp.com/chcp.rc b/programs/chcp.com/chcp.rc
new file mode 100644
index 00000000000..04d90d05942
--- /dev/null
+++ b/programs/chcp.com/chcp.rc
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Hugh McMaster
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "resource.h"
+
+#pragma makedep po
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_ACTIVE_CODE_PAGE, "Active code page: %1!u!\n"
+    STRING_INVALID_CODE_PAGE, "Invalid code page\n"
+}
diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c
index 6ace10cf93e..5b3486a4366 100644
--- a/programs/chcp.com/main.c
+++ b/programs/chcp.com/main.c
@@ -16,20 +16,85 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+
 #include "wine/debug.h"
 
-#include "wincon.h"
-#include "stdlib.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(chcp);
 
+static void output_writeconsole(const WCHAR *str, DWORD wlen)
+{
+    DWORD count, ret;
+
+    ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL);
+    if (!ret)
+    {
+        DWORD len;
+        char  *msgA;
+
+        /* On Windows WriteConsoleW() fails if the output is redirected. So fall
+         * back to WriteFile(), assuming the console encoding is still the right
+         * one in that case.
+         */
+        len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL);
+        msgA = malloc(len);
+
+        WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL);
+        WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE);
+        free(msgA);
+    }
+}
+
+static void output_formatstring(const WCHAR *fmt, va_list va_args)
+{
+    WCHAR *str;
+    DWORD len;
+
+    len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
+                         fmt, 0, 0, (WCHAR *)&str, 0, &va_args);
+    if (!len && GetLastError() != ERROR_NO_WORK_DONE)
+    {
+        WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
+        return;
+    }
+    output_writeconsole(str, len);
+    LocalFree(str);
+}
+
+static void WINAPIV output_message(unsigned int id, ...)
+{
+    WCHAR *fmt = NULL;
+    int len;
+    va_list va_args;
+
+    if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0)))
+    {
+        WINE_FIXME("LoadString failed with %d\n", GetLastError());
+        return;
+    }
+
+    len++;
+    fmt = malloc(len * sizeof(WCHAR));
+    if (!fmt) return;
+
+    LoadStringW(GetModuleHandleW(NULL), id, fmt, len);
+
+    va_start(va_args, id);
+    output_formatstring(fmt, va_args);
+    va_end(va_args);
+
+    free(fmt);
+}
+
 int __cdecl wmain(int argc, WCHAR *argv[])
 {
     int i;
 
     if (argc == 1)
     {
-        printf("Active code page: %d\n", GetConsoleCP());
+        output_message(STRING_ACTIVE_CODE_PAGE, GetConsoleCP());
         return 0;
     }
     else if (argc == 2)
@@ -39,7 +104,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
 
         if (!success)
         {
-            printf("Invalid code page\n");
+            output_message(STRING_INVALID_CODE_PAGE);
         }
         return !success;
     }
diff --git a/programs/chcp.com/resource.h b/programs/chcp.com/resource.h
new file mode 100644
index 00000000000..200cbb11d18
--- /dev/null
+++ b/programs/chcp.com/resource.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Hugh McMaster
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windef.h>
+
+/* Translation IDs */
+
+#define STRING_ACTIVE_CODE_PAGE   100
+#define STRING_INVALID_CODE_PAGE  101