[hbelusca] 75963: [CHCP][CMD]: Make the CHCP command a standalone executable, for backwards compatibility with Windows etc. This allows the user to be able to replace it with a 3rd-party one. CORE-...

Author: hbelusca
Date: Sun Sep 24 19:00:47 2017
New Revision: 75963

URL: http://svn.reactos.org/svn/reactos?rev=75963&view=rev
Log:
[CHCP][CMD]: Make the CHCP command a standalone executable, for backwards compatibility with Windows etc. This allows the user to be able to replace it with a 3rd-party one.
CORE-10295 #resolve
CORE-9444

Added:
    trunk/reactos/base/applications/cmdutils/chcp/
    trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/chcp.c
      - copied, changed from r75962, trunk/reactos/base/shell/cmd/chcp.c
    trunk/reactos/base/applications/cmdutils/chcp/chcp.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/
    trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc   (with props)
    trunk/reactos/base/applications/cmdutils/chcp/resource.h   (with props)
Removed:
    trunk/reactos/base/shell/cmd/chcp.c
Modified:
    trunk/reactos/base/applications/cmdutils/CMakeLists.txt
    trunk/reactos/base/shell/cmd/CMakeLists.txt
    trunk/reactos/base/shell/cmd/cmd.h
    trunk/reactos/base/shell/cmd/cmdtable.c
    trunk/reactos/base/shell/cmd/config.h
    trunk/reactos/base/shell/cmd/lang/cs-CZ.rc
    trunk/reactos/base/shell/cmd/lang/de-DE.rc
    trunk/reactos/base/shell/cmd/lang/el-GR.rc
    trunk/reactos/base/shell/cmd/lang/en-US.rc
    trunk/reactos/base/shell/cmd/lang/es-ES.rc
    trunk/reactos/base/shell/cmd/lang/fr-FR.rc
    trunk/reactos/base/shell/cmd/lang/hu-HU.rc
    trunk/reactos/base/shell/cmd/lang/id-ID.rc
    trunk/reactos/base/shell/cmd/lang/it-IT.rc
    trunk/reactos/base/shell/cmd/lang/ja-JP.rc
    trunk/reactos/base/shell/cmd/lang/no-NO.rc
    trunk/reactos/base/shell/cmd/lang/pl-PL.rc
    trunk/reactos/base/shell/cmd/lang/ro-RO.rc
    trunk/reactos/base/shell/cmd/lang/ru-RU.rc
    trunk/reactos/base/shell/cmd/lang/sk-SK.rc
    trunk/reactos/base/shell/cmd/lang/sq-AL.rc
    trunk/reactos/base/shell/cmd/lang/sv-SE.rc
    trunk/reactos/base/shell/cmd/lang/tr-TR.rc
    trunk/reactos/base/shell/cmd/lang/uk-UA.rc
    trunk/reactos/base/shell/cmd/lang/zh-CN.rc
    trunk/reactos/base/shell/cmd/lang/zh-TW.rc
    trunk/reactos/base/shell/cmd/resource.h

Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -1,4 +1,5 @@
 add_subdirectory(at)
+add_subdirectory(chcp)
 add_subdirectory(clip)
 add_subdirectory(comp)
 add_subdirectory(cscript)

Added: trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,9 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+add_executable(chcp chcp.c chcp.rc)
+set_module_type(chcp win32cui UNICODE)
+target_link_libraries(chcp conutils ${PSEH_LIB})
+add_importlibs(chcp msvcrt kernel32)
+set_target_properties(chcp PROPERTIES SUFFIX ".com")
+add_cd_file(TARGET chcp DESTINATION reactos/system32 FOR all)

Propchange: trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: trunk/reactos/base/applications/cmdutils/chcp/chcp.c (from r75962, trunk/reactos/base/shell/cmd/chcp.c)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/shell/cmd/chcp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/chcp/chcp.c	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -1,93 +1,95 @@
 /*
- *  CHCP.C - chcp internal command.
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Change CodePage Command
+ * FILE:            base/applications/cmdutils/chcp/chcp.c
+ * PURPOSE:         Displays or changes the active console input and output codepages.
+ * PROGRAMMERS:     Eric Kohl
+ *                  Hermes Belusca-Maito ([e-mail])
+ */
+/*
+ * CHCP.C - chcp internal command.
  *
+ * 23-Dec-1998 (Eric Kohl)
+ *     Started.
  *
- *  History:
- *
- *    23-Dec-1998 (Eric Kohl)
- *        Started.
- *
- *    02-Apr-2005 (Magnus Olsen [e-mail])
- *        Remove all hardcoded strings in En.rc
+ * 02-Apr-2005 (Magnus Olsen [e-mail])
+ *     Remove all hardcoded strings in En.rc
  */

-#include "precomp.h"
+#include <stdio.h>
+#include <stdlib.h>

-#ifdef INCLUDE_CMD_CHCP
+#include <windef.h>
+#include <winbase.h>
+#include <wincon.h>

-INT CommandChcp(LPTSTR param)
+#include <conutils.h>
+
+#include "resource.h"
+
+// INT CommandChcp(LPTSTR cmd, LPTSTR param)
+int wmain(int argc, WCHAR* argv[])
 {
-    LPTSTR *arg;
-    INT    args;
-    UINT uNewCodePage;
+    UINT uOldCodePage, uNewCodePage;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();

/* Print help */
-    if (!_tcsncmp(param, _T("/?"), 2))
+    if (argc > 1 && wcscmp(argv[1], L"/?") == 0)
     {
-        ConOutResPaging(TRUE,STRING_CHCP_HELP);
+        ConResPuts(StdOut, STRING_CHCP_HELP);
         return 0;
     }

-    nErrorLevel = 0;
-
-    /* Get parameters */
-    arg = split(param, &args, FALSE, FALSE);
-
-    if (args == 0)
+    if (argc == 1)
     {
         /* Display the active code page number */
-        ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage);
-        freep(arg);
+        ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP());
         return 0;
     }

-    if (args >= 2)
+    if (argc > 2)
     {
         /* Too many parameters */
-        ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, param);
-        freep(arg);
-        nErrorLevel = 1;
+        ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[2]);
         return 1;
     }

-    uNewCodePage = (UINT)_ttoi(arg[0]);
+    uNewCodePage = (UINT)_wtoi(argv[1]);

if (uNewCodePage == 0)
     {
-        ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, arg[0]);
-        freep(arg);
-        nErrorLevel = 1;
+        ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[1]);
         return 1;
     }

-    freep(arg);
-
-    // TODO: In case of failure of SetConsoleCP or SetConsoleOutputCP,
-    // restore the old code page!
+    /*
+     * Save the original console codepage to be restored in case
+     * SetConsoleCP() or SetConsoleOutputCP() fails.
+     */
+    uOldCodePage = GetConsoleCP();

/*
      * Try changing the console input codepage. If it works then also change
      * the console output codepage, and refresh our local codepage cache.
      */
-    if (!SetConsoleCP(uNewCodePage))
+    if (SetConsoleCP(uNewCodePage))
     {
-        ConErrResPuts(STRING_CHCP_ERROR4);
-    }
-    else
-    {
-        SetConsoleOutputCP(uNewCodePage);
-
-        /* Update our local codepage cache */
-        InputCodePage  = GetConsoleCP();
-        OutputCodePage = GetConsoleOutputCP();
-
-        InitLocale();
-
-        /* Display the active code page number */
-        ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage);
+        if (SetConsoleOutputCP(uNewCodePage))
+        {
+            /* Display the active code page number */
+            ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP());
+            return 0;
+        }
+        else
+        {
+            /* Failure, restore the original console codepage */
+            SetConsoleCP(uOldCodePage);
+        }
     }

-    return 0;
+    /* An error happened, display an error and bail out */
+    ConResPuts(StdErr, STRING_CHCP_ERROR4);
+    return 1;
 }
-
-#endif /* INCLUDE_CMD_CHCP */

Added: trunk/reactos/base/applications/cmdutils/chcp/chcp.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/chcp.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/chcp.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,77 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Change CodePage Command"
+#define REACTOS_STR_INTERNAL_NAME       "chcp"
+#define REACTOS_STR_ORIGINAL_FILENAME   "chcp.com"
+#include <reactos/version.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EL_GR
+    #include "lang/el-GR.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_HU_HU
+    #include "lang/hu-HU.rc"
+#endif
+#ifdef LANGUAGE_ID_ID
+    #include "lang/id-ID.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NB_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_JA_JP
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_SV_SE
+    #include "lang/sv-SE.rc"
+#endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif
+#ifdef LANGUAGE_ZH_CN
+    #include "lang/zh-CN.rc"
+#endif
+#ifdef LANGUAGE_ZH_TW
+    #include "lang/zh-TW.rc"
+#endif

Propchange: trunk/reactos/base/applications/cmdutils/chcp/chcp.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,17 @@
+/* FILE:       base/shell/cmd/lang/cs-CZ.rc
+ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:    2015-04-12
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Specifies the active code page number.\n\n\
+Type CHCP without a parameter to display the active code page number.\n"
+    STRING_CHCP_ERROR1 "Aktivní znaková stránka: %u\n"
+    STRING_CHCP_ERROR4 "Neplatná znaková stránka\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Neplatný formát parametru - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* German language file by Klemens Friedl <frik85> 2005-06-03 */
+
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Codepage angeben.\n\n\
+Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an."
+    STRING_CHCP_ERROR1 "Aktive Codepage: %u\n"
+    STRING_CHCP_ERROR4 "Ungültige Codepage\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Ungültiges Parameterformat - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,17 @@
+/*
+ * Αρχική έκδοση - Ημιτελής.
+ * Ελληνική μετάφραση - Απόστολος Αλεξιάδης
+ */
+
+LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Εμφανίζει ή ορίζει τον αριθμό της ενεργού κωδικοσελίδας.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Καθορίζει έναν αριθμό κωδικοσελίδας.\n\n\
+Πληκτρολογήστε CHCP χωρίς παράμετρο, για να εμφανιστεί ο τρέχων αριθμός κωδικοσελίδας.\n"
+    STRING_CHCP_ERROR1 "Active code page: %u\n"
+    STRING_CHCP_ERROR4 "Invalid code page\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Μη έγκυρο φορμά παραμέτρου - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,12 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Specifies the active code page number.\n\n\
+Type CHCP without a parameter to display the active code page number.\n"
+    STRING_CHCP_ERROR1 "Active code page: %u\n"
+    STRING_CHCP_ERROR4 "Invalid code page\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Spanish translation by HUMA2000, Jose Pedro Fernández Pascual e Ismael Ferreras Morezuelas (Swyter) */
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Muestra o configura el número de página de código activa.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Especifica el número de página de código activa.\n\n\
+Escribe CHCP sin ningún parámetro para mostrar el código de página activo.\n"
+    STRING_CHCP_ERROR1 "Página codificación activa: %u\n"
+    STRING_CHCP_ERROR4 "Código de página inválido\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Formato de parámetro erróneo - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* French translation by Sylvain Pétréolle, Pierre Schweitzer */
+
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Affiche ou change la page de codes active.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Indique la page de codes.\n\n\
+Taper CHCP sans paramètre pour afficher la page de codes active."
+    STRING_CHCP_ERROR1 "Page de codes actuelle : %u\n"
+    STRING_CHCP_ERROR4 "Page de codes invalide \n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramètre incorrect - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Hungarian translation by Robert Horvath (talley at cubeclub.hu) 2005 */
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Megjeleníti vagy megváltoztatja az aktív kódlapot.\n\n\
+CHCP [nnn]\n\n\
+  nnn   A használni kívánt kódlap száma.\n\n\
+Írd be a  CHCP paraméterek nélkül, hogy megjelenítse az aktív kódlapot.\n"
+    STRING_CHCP_ERROR1 "Aktív kódlap: %u\n"
+    STRING_CHCP_ERROR4 "Érvénytelen kódlap\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Érvénytelen paraméter megadás - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 */
+
+LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Menampilkan atau menyetel nomor halaman kode aktif.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Menetapkan nomor halaman kode yang aktif.\n\n\
+Ketik CHCP tanpa parameter untuk menampilkan nomor halaman kode yang aktif.\n"
+    STRING_CHCP_ERROR1 "Halaman kode aktif: %u\n"
+    STRING_CHCP_ERROR4 "Halaman kode tidak benar\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Format parameter tidak benar - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,12 @@
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Visualizza o attiva il numero di tabella dei codici.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Indica il numero di tabella dei codici.\n\n\
+Scrivi CHCP senza parametri per visualizzare il numero attuale.\n"
+    STRING_CHCP_ERROR1 "Tabella dei codici attiva: %u\n"
+    STRING_CHCP_ERROR4 "Tabella dei codici non valida\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Formato dei parametri non valido - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,12 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "現在のコード ページ番号を表示または設定します。\n\n\
+CHCP [nnn]\n\n\
+  nnn   コード ページ番号を指定します。\n\n\
+現在のコード ページ番号を表示するときは、パラメータを指定せずに CHCP と入力してください。\n"
+    STRING_CHCP_ERROR1 "現在のコード ページ: %u\n"
+    STRING_CHCP_ERROR4 "無効なコード ページです\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "無効なパラメータの書式です。 - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,12 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Viser eller velger aktive tegntabellnummer.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Spesifisere aktive tegntabellnummer.\n\n\
+Skriv CHCP uten parametrer for å vise aktiv tegntabellnummer.\n"
+    STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n"
+    STRING_CHCP_ERROR4 "Ugyldig tegntabell\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,21 @@
+/*
+ *    Translated by Caemyr - Olaf Siejka (Jan, 2008)
+ *    Updated by niski - Maciej Bialas (Mar, 2010)
+ *    Use ReactOS forum PM or IRC to contact me
+ *    http://www.reactos.org
+ *    IRC: irc.freenode.net #reactos-pl;
+ *    UTF-8 conversion by Caemyr (May, 2011)
+ */
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Wyświetla lub ustawia numer aktywnej strony kodowej.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Numer strony kodowej.\n\n\
+Wpisz CHCP bez parametru, by wyświetlić numer aktywnej strony kodowej.\n"
+    STRING_CHCP_ERROR1 "Aktywna strona kodowa nr: %u\n"
+    STRING_CHCP_ERROR4 "Niewłaściwy numer strony kodowej\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Niewłaściwy format parametru - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,13 @@
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Afișează sau stabilește numărul codificării curente de pagină.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Numărul codificării de pagină specificat.\n\n\
+Tastați CHCP fără argumente pentru a afișa numărul codificării curente.\n"
+    STRING_CHCP_ERROR1 "Codificarea curentă a paginilor: %u\n"
+    STRING_CHCP_ERROR4 "Codificare de pagină nevalidă\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Russian translation by Andrey Korotaev ([e-mail]) & Aleksey Bragin ([e-mail]) & Kudratov Olimjon ([e-mail])*/
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Вывод или смена текущего номера кодовой страницы.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Номер кодовой страницы.\n\n\
+Команда CHCP без параметра выводит текущий номер кодовой страницы.\n"
+    STRING_CHCP_ERROR1 "Текущая кодовая страница: %u\n"
+    STRING_CHCP_ERROR4 "Неверная кодовая страница\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Неверный формат параметра - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,18 @@
+/* Slovak translation for CMD
+ * TRANSLATOR: Mário Kačmár /Mario Kacmar/ aka Kario ([e-mail])
+ * DATE OF TR: 21-03-2009
+ * LastChange: 10-08-2010
+ */
+
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Specifies the active code page number.\n\n\
+Type CHCP without a parameter to display the active code page number.\n"
+    STRING_CHCP_ERROR1 "Active code page: %u\n"
+    STRING_CHCP_ERROR4 "Invalid code page\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,16 @@
+/* TRANSLATOR : Ardit Dani (Ard1t) ([e-mail]) 
+ * DATE OF TR:  29-11-2013
+*/
+
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Shfaq ose cakto kodin dhe numrin e faqes aktive.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Specifikon kodin dhe numrin aktiv te faqes.\n\n\
+Shkruaj CHCP pa anjë parameter për të shfaqur kodin dhe numrin e faqes aktive.\n"
+    STRING_CHCP_ERROR1 "Faqja Active e Kodit: %u\n"
+    STRING_CHCP_ERROR4 "Invalid code page\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Parametrat e formatit invalid - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,12 @@
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Visar eller väljer aktiv teckentabell.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Anger nummer på teckentabell.\n\n\
+Skriv CHCP utan parametrar för att visa aktiv teckentabellnummer.\n"
+    STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n"
+    STRING_CHCP_ERROR4 "Ugyldig tegntabell\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) ([e-mail]) */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Etkin kod sayfası numarasını görüntüler ya da ayarlar.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Etkin kod sayfası numarasını belirtir.\n\n\
+Etkin kod sayfası numarasını görüntülemek için bir değişken olmadan CHCP yaz.\n"
+    STRING_CHCP_ERROR1 "Etkin kod sayfası: %u\n"
+    STRING_CHCP_ERROR4 "Geçersiz kod sayfası\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Geçersiz değişken biçimi - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,20 @@
+/*
+ * PROJECT:     Command-line interface
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/shell/cmd/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for Command-line interface
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Вивiд або змiна поточного номера кодової сторiнки.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Задає номер кодової сторiнки.\n\n\
+Команда CHCP без параметра виводить поточний номер кодової сторiнки.\n"
+    STRING_CHCP_ERROR1 "Поточна кодова сторiнка: %u\n"
+    STRING_CHCP_ERROR4 "Помилкова кодова сторiнка\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Невiрний формат параметра - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Simplified Chinese translation by Song Fuchang (0xfc) [e-mail] 2011 */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "æ˜¾ç¤ºæˆ–è®¾ç½®æ´»åŠ¨çš„ä»£ç é¡µã€‚\n\n\
+CHCP [nnn]\n\n\
+  nnn   æŒ‡å®šæ´»åŠ¨çš„ä»£ç é¡µã€‚\n\n\
+不带参数执行 CHCP å°†ä¼šæ˜¾ç¤ºå½“å‰æ´»åŠ¨çš„ä»£ç é¡µã€‚\n"
+    STRING_CHCP_ERROR1 "æ´»åŠ¨ä»£ç é¡µï¼š%u\n"
+    STRING_CHCP_ERROR4 "æ— æ•ˆä»£ç é¡µ\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "æ— æ•ˆçš„å‚æ•°æ ¼å¼ - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,14 @@
+/* Traditional Chinese translation by Henry Tang Ih 2016 ([e-mail]) */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "顯示或設定活動的內碼表。\n\n\
+CHCP [nnn]\n\n\
+  nnn   指定活動的內碼表。\n\n\
+不帶參數執行 CHCP 將會顯示當前活動的內碼表。\n"
+    STRING_CHCP_ERROR1 "活動內碼表：%u\n"
+    STRING_CHCP_ERROR4 "無效內碼表\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "ç„¡æ•ˆçš„åƒæ•¸æ ¼å¼ - %s\n"
+END

Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/base/applications/cmdutils/chcp/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/chcp/resource.h	(added)
+++ trunk/reactos/base/applications/cmdutils/chcp/resource.h	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -0,0 +1,10 @@
+#pragma once
+
+#define RC_STRING_MAX_SIZE 3072
+
+#define STRING_ERROR_INVALID_PARAM_FORMAT 107
+
+#define STRING_CHCP_ERROR1         302
+#define STRING_CHCP_ERROR4         305
+
+#define STRING_CHCP_HELP   605

Propchange: trunk/reactos/base/applications/cmdutils/chcp/resource.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.t...
==============================================================================
--- trunk/reactos/base/shell/cmd/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/CMakeLists.txt	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -12,7 +12,6 @@
     batch.c
     beep.c
     call.c
-    chcp.c
     choice.c
     cls.c
     cmd.c

Removed: trunk/reactos/base/shell/cmd/chcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=7...
==============================================================================
--- trunk/reactos/base/shell/cmd/chcp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/chcp.c	(removed)
@@ -1,93 +0,0 @@
-/*
- *  CHCP.C - chcp internal command.
- *
- *
- *  History:
- *
- *    23-Dec-1998 (Eric Kohl)
- *        Started.
- *
- *    02-Apr-2005 (Magnus Olsen [e-mail])
- *        Remove all hardcoded strings in En.rc
- */
-
-#include "precomp.h"
-
-#ifdef INCLUDE_CMD_CHCP
-
-INT CommandChcp(LPTSTR param)
-{
-    LPTSTR *arg;
-    INT    args;
-    UINT uNewCodePage;
-
-    /* Print help */
-    if (!_tcsncmp(param, _T("/?"), 2))
-    {
-        ConOutResPaging(TRUE,STRING_CHCP_HELP);
-        return 0;
-    }
-
-    nErrorLevel = 0;
-
-    /* Get parameters */
-    arg = split(param, &args, FALSE, FALSE);
-
-    if (args == 0)
-    {
-        /* Display the active code page number */
-        ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage);
-        freep(arg);
-        return 0;
-    }
-
-    if (args >= 2)
-    {
-        /* Too many parameters */
-        ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, param);
-        freep(arg);
-        nErrorLevel = 1;
-        return 1;
-    }
-
-    uNewCodePage = (UINT)_ttoi(arg[0]);
-
-    if (uNewCodePage == 0)
-    {
-        ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, arg[0]);
-        freep(arg);
-        nErrorLevel = 1;
-        return 1;
-    }
-
-    freep(arg);
-
-    // TODO: In case of failure of SetConsoleCP or SetConsoleOutputCP,
-    // restore the old code page!
-
-    /*
-     * Try changing the console input codepage. If it works then also change
-     * the console output codepage, and refresh our local codepage cache.
-     */
-    if (!SetConsoleCP(uNewCodePage))
-    {
-        ConErrResPuts(STRING_CHCP_ERROR4);
-    }
-    else
-    {
-        SetConsoleOutputCP(uNewCodePage);
-
-        /* Update our local codepage cache */
-        InputCodePage  = GetConsoleCP();
-        OutputCodePage = GetConsoleOutputCP();
-
-        InitLocale();
-
-        /* Display the active code page number */
-        ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage);
-    }
-
-    return 0;
-}
-
-#endif /* INCLUDE_CMD_CHCP */

Modified: trunk/reactos/base/shell/cmd/cmd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=75...
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.h	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -85,10 +85,6 @@

/* Prototypes for CALL.C */
 INT cmd_call (LPTSTR);
-
-
-/* Prototypes for CHCP.C */
-INT CommandChcp (LPTSTR);

/* Prototypes for CHOICE.C */

Modified: trunk/reactos/base/shell/cmd/cmdtable.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?r...
==============================================================================
--- trunk/reactos/base/shell/cmd/cmdtable.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmdtable.c	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -55,10 +55,6 @@
 #ifdef INCLUDE_CMD_CHDIR
     {_T("cd"), CMD_SPECIAL, cmd_chdir},
     {_T("chdir"), CMD_SPECIAL, cmd_chdir},
-#endif
-
-#ifdef INCLUDE_CMD_CHCP
-    {_T("chcp"), 0, CommandChcp},
 #endif

#ifdef INCLUDE_CMD_CHOICE

Modified: trunk/reactos/base/shell/cmd/config.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?rev...
==============================================================================
--- trunk/reactos/base/shell/cmd/config.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/config.h	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -51,7 +51,6 @@
 #endif
 #define INCLUDE_CMD_ASSOC
 #define INCLUDE_CMD_ATTRIB
-#define INCLUDE_CMD_CHCP
 #define INCLUDE_CMD_CHDIR
 #define INCLUDE_CMD_CHOICE
 #define INCLUDE_CMD_CLS

Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -52,10 +52,6 @@
   /D   Will change current drive and current directory.\n\n\
 Type CD drive: to display the current directory on the specified drive.\n\
 Type CD without a parameter to display the current drive and directory.\n"
-    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifies the active code page number.\n\n\
-Type CHCP without a parameter to display the active code page number.\n"
     STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\
 CHOICE  [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]choices  Specifies allowable keys. Default is YN.\n\
@@ -474,8 +470,6 @@
     STRING_ALIAS_ERROR "Po rozšíření aliasů je příkaz příliš dlouhý!\n"
     STRING_ASSOC_ERROR "Pro příponu %s nebyly nalezeny žádné asociace\n"
     STRING_BATCH_ERROR "Chyba při otevírání dávkového souboru\n"
-    STRING_CHCP_ERROR1 "Aktivní znaková stránka: %u\n"
-    STRING_CHCP_ERROR4 "Neplatná znaková stránka\n"
     STRING_CHOICE_ERROR "Neplatná volba. Očekávaný formát: /C[:]volby"
     STRING_CHOICE_ERROR_TXT "Neplatná volba. Očekávaný formát: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Neplatná volba: %s"

Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/de-DE.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
 Geben Sie CD Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\
 Laufwerk anzuzeigen.\n\
 Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt."
-    STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Codepage angeben.\n\n\
-Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an."
     STRING_CHOICE_HELP "Wartet auf Auswahl einer Option durch den Benutzer.\n\n\
 CHOICE  [/C[:]optionen][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]optionen  Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\
@@ -468,8 +464,6 @@
     STRING_ALIAS_ERROR "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n"
     STRING_ASSOC_ERROR "Dateizuordnung für Erweiterung %s nicht gefunden\n"
     STRING_BATCH_ERROR "Es trat ein Fehler auf, während die Batchdatei geöffnet wurde.\n"
-    STRING_CHCP_ERROR1 "Aktive Codepage: %u\n"
-    STRING_CHCP_ERROR4 "Ungültige Codepage\n"
     STRING_CHOICE_ERROR "Ungültige Option. Erwartetes Format: /C[:]Optionen"
     STRING_CHOICE_ERROR_TXT "Ungültige Option. Erwartetes Format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Ungültige Option: %s"

Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/el-GR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -52,10 +52,6 @@
   /D   Αλλαγή της τρέχουσας μονάδας δίσκου πέραν της αλλαγής τρέχοντος καταλόγου για μια μονάδα δίσκου.\n\n\
 Πληκτρολογήστε CD δίσκος:, για να εμφανίσετε τον τρέχοντα κατάλογο στη συγκεκριμένη μονάδα δίσκου.\n\
 Πληκτρολογήστε CD χωρις παράμετρο, για να εμφανίσετε τον τρέχοντα κατάλογο στην τρέχουσα μονάδα δίσκου.\n"
-    STRING_CHCP_HELP "Εμφανίζει ή ορίζει τον αριθμό της ενεργού κωδικοσελίδας.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Καθορίζει έναν αριθμό κωδικοσελίδας.\n\n\
-Πληκτρολογήστε CHCP χωρίς παράμετρο, για να εμφανιστεί ο τρέχων αριθμός κωδικοσελίδας.\n"
     STRING_CHOICE_HELP "Αναμένει από τον χρήστη να επιλέξει μία από σετ επιλογών.\n\n\
 CHOICE  [/C[:]επιλογές][/N][/S][/T[:]c,nn][κείμενο]\n\n\
   /C[:]επιλογές  Προσδιορίζει επιτρεπόμενα κλειδιά. Το προκαθορισμένο είναι το YN.\n\
@@ -473,8 +469,6 @@
     STRING_ALIAS_ERROR "Command line too long after alias expansion!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Error opening batch file\n"
-    STRING_CHCP_ERROR1 "Active code page: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
     STRING_CHOICE_ERROR "Μη έγκυρη επιλογή. Expected format: /C[:]options"
     STRING_CHOICE_ERROR_TXT "Μη έγκυρη επιλογή. Expected format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Illegal Option: %s"

Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/en-US.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   Will change current drive and current directory.\n\n\
 Type CD drive: to display the current directory on the specified drive.\n\
 Type CD without a parameter to display the current drive and directory.\n"
-    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifies the active code page number.\n\n\
-Type CHCP without a parameter to display the active code page number.\n"
     STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\
 CHOICE  [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]choices  Specifies allowable keys. Default is YN.\n\
@@ -469,8 +465,6 @@
     STRING_ALIAS_ERROR "Command line too long after alias expansion!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Error opening batch file\n"
-    STRING_CHCP_ERROR1 "Active code page: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
     STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options"
     STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Illegal Option: %s"

Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/es-ES.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
   /D   Cambiara la unidad y el directorio actual.\n\n\
 Escribe CD unidad: para mostrar el directorio actual en la unidad especificada.\n\
 Escribe CD sin ningun parámetro para mostrar la unidad y el directorio actual.\n"
-    STRING_CHCP_HELP "Muestra o configura el número de página de código activa.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Especifica el número de página de código activa.\n\n\
-Escribe CHCP sin ningún parámetro para mostrar el código de página activo.\n"
     STRING_CHOICE_HELP "Espera a que el usuario elija entre un número de opciones.\n\n\
 CHOICE  [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]choices  Especifica las teclas admitidas. Por defecto son SN.\n\
@@ -471,8 +467,6 @@
     STRING_ALIAS_ERROR "¡Línea de comandos demasiado larga tras la expansión del alias!\n"
     STRING_ASSOC_ERROR "No se ha encontrado ninguna asociación de archivos para la extensión %s\n"
     STRING_BATCH_ERROR "Error abriendo el archivo por lotes\n"
-    STRING_CHCP_ERROR1 "Página codificación activa: %u\n"
-    STRING_CHCP_ERROR4 "Código de página inválido\n"
     STRING_CHOICE_ERROR "Opción inválida. Se esperaba el formato: /C[:]options"
     STRING_CHOICE_ERROR_TXT "Opción inválida. Se esperaba el formato: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Opción ilegal: %s"

Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
   /D   Changera le lecteur et le répertoire courant.\n\n\
 Taper CD lecteur: pour afficher le répertoire courant sur le disque indiqué.\n\
 Taper CD sans paramètre pour afficher le répertoire courant du disque actuel.\n"
-    STRING_CHCP_HELP "Affiche ou change la page de codes active.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Indique la page de codes .\n\n\
-Taper CHCP sans paramètre pour afficher la page de codes active."
     STRING_CHOICE_HELP "Demande à l'utilisateur de choisir parmi plusieurs choix.\n\n\
 CHOICE  [/C[:]choix][/N][/S][/T[:]c,nn][texte]\n\n\
   /C[:]choix    Spécifier les touches disponibles. Choix par défaut: ON.\n\
@@ -483,8 +479,6 @@
     STRING_ALIAS_ERROR "Ligne de commande trop longue après remplacement de l'alias!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Erreur à l'ouverture du fichier batch\n"
-    STRING_CHCP_ERROR1 "Page de codes actuelle : %u\n"
-    STRING_CHCP_ERROR4 "Page de codes invalide \n"
     STRING_CHOICE_ERROR "Option invalide. Format attendu : /C[:]options"
     STRING_CHOICE_ERROR_TXT "Option invalide. Format attendu : /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Option invalide : %s"

Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   Megváltoztatja az aktuális mappát és meghajtót is.\n\n\
 Írd be, hogy 'CD meghajtó:' hogy ki írja az aktuális mappát.\n\
 Írd be a CD-t paraméterek nélkül, hogy megjelenítse az aktuális meghajtót és mappát (ugyanaz mint az elõzõ).\n"
-    STRING_CHCP_HELP "Megjeleníti vagy megváltoztatja az aktív kódlapot.\n\n\
-CHCP [nnn]\n\n\
-  nnn   A használni kívánt kódlap száma.\n\n\
-Írd be a  CHCP paraméterek nélkül, hogy megjelenítse az aktív kódlapot.\n"
     STRING_CHOICE_HELP "Vár a felhasználóra, hogy válasszon a felkínált lehetõségek közül.\n\n\
 CHOICE  [/C[:]választási lehetõségek][/N][/S][/T[:]c,nn][szöveg]\n\n\
   /C[:]választási lehetõségek  Megengedett billentyûk. Alapértelmezett: YN. <-- Yes->Igen\n\
@@ -453,8 +449,6 @@
     STRING_ALIAS_ERROR "A parancssor túl hosszú az alias kibontásakor!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Hiba a batch állomány megnyitásakor\n"
-    STRING_CHCP_ERROR1 "Aktív kódlap: %u\n"
-    STRING_CHCP_ERROR4 "Érvénytelen kódlap\n"
     STRING_CHOICE_ERROR "Érvénytelen paraméter. Várt formátum: /C[:]választási lehetõségek"
     STRING_CHOICE_ERROR_TXT "Érvénytelen paraméter. Várt formátum: /T[:]v,nn"
     STRING_CHOICE_ERROR_OPTION "Érvénytelen paraméter: %s"

Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/id-ID.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/id-ID.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
   /D   Akan mengubah drive dan direktori saat ini.\n\n\
 Ketik CD drive: untuk menampilkan direktori saat ini pada drive tertentu.\n\
 Ketik CD tanpa parameter untuk menampilkan drive dan direktori saat ini.\n"
-    STRING_CHCP_HELP "Menampilkan atau menyetel nomor halaman kode aktif.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Menetapkan nomor halaman kode yang aktif.\n\n\
-Ketik CHCP tanpa parameter untuk menampilkan nomor halaman kode yang aktif.\n"
     STRING_CHOICE_HELP "Menunggu pengguna untuk memilih satu dari set pilihan.\n\n\
 CHOICE  [/C[:]pilihan][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]pilihan  Menetapkan tombol yang dibolehkan. Standarnya YT.\n\
@@ -468,8 +464,6 @@
     STRING_ALIAS_ERROR "Baris perintah terlalu panjang setelah ekspansi alias!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Kesalaham membuka file batch\n"
-    STRING_CHCP_ERROR1 "Halaman kode aktif: %u\n"
-    STRING_CHCP_ERROR4 "Halaman kode tidak benar\n"
     STRING_CHOICE_ERROR "Opsi tidak benar. Format diharapkan: /C[:]options"
     STRING_CHOICE_ERROR_TXT "Opsi tidak benar. Format diharapkan: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Opsi tidak benar: %s"

Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/it-IT.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -46,10 +46,6 @@
   /D   Cambia il disco e la cartella corrente.\n\n\
 Scrivi CD disco: per visualizzare la cartella corrente del disco indicato.\n\
 Scrivi CD senza parametri per visualizzare il disco e la cartella corrente.\n"
-    STRING_CHCP_HELP "Visualizza o attiva il numero di tabella dei codici.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Indica il numero di tabella dei codici.\n\n\
-Scrivi CHCP senza parametri per visualizzare il numero attuale.\n"
     STRING_CHOICE_HELP "Aspetta che l'utente scelga una delle scelte disponibili.\n\n\
 CHOICE  [/C[:]scelta][/N][/S][/T[:]c,nn][testo]\n\n\
   /C[:]scelta   Indica i tasti ammessi. Sono predefiniti YN.\n\
@@ -479,8 +475,6 @@
     STRING_ALIAS_ERROR "Linea di comando troppo lunga dopo l'espansione degli alias!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Errore durante l'apertura di un batch\n"
-    STRING_CHCP_ERROR1 "Tabella dei codici attiva: %u\n"
-    STRING_CHCP_ERROR4 "Tabella dei codici non valida\n"
     STRING_CHOICE_ERROR "Opzione non valida. Formato atteso: /C[:]opzioni"
     STRING_CHOICE_ERROR_TXT "Opzione non valida. Formato atteso: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Opzione non valida: %s"

Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   現在のドライブとディレクトリの両方を変更します。\n\n\
 CD ドライブ: と入力すると指定されたドライブの現在のディレクトリが表示されます。\n\
 パラメータを指定しないで CD と入力すると、現在のドライブとディレクトリが表示されます。\n"
-    STRING_CHCP_HELP "現在のコード ページ番号を表示または設定します。\n\n\
-CHCP [nnn]\n\n\
-  nnn   コード ページ番号を指定します。\n\n\
-現在のコード ページ番号を表示するときは、パラメータを指定せずに CHCP と入力してください。\n"
     STRING_CHOICE_HELP "ユーザーが選択肢から一つを選択するのを待ちます。\n\n\
 CHOICE  [/C[:]選択肢][/N][/S][/T[:]c,nn][文字列]\n\n\
   /C[:]選択肢   許されるキー入力を指定します。デフォルトは YN です。\n\
@@ -476,8 +472,6 @@
     STRING_ALIAS_ERROR "エイリアス展開後のコマンド ラインが長すぎます!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "バッチ ファイルを開くときにエラーが発生しました。\n"
-    STRING_CHCP_ERROR1 "現在のコード ページ: %u\n"
-    STRING_CHCP_ERROR4 "無効なコード ページです\n"
     STRING_CHOICE_ERROR "無効なオプションです。期待される書式: /C[:]オプション"
     STRING_CHOICE_ERROR_TXT "無効なオプションです。期待される書式: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "無効なオプションです: %s"

Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/no-NO.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   Vil endre gjeldende stasjon og gjeldende mappe.\n\n\
 Tast CD stasjon: for å vise gjeldende mappe på spesifiserte stasjon.\n\
 Tast CD uten parametere for å vise gjeldende stasjon og mappe.\n"
-    STRING_CHCP_HELP "Viser eller velger aktive tegntabellnummer.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Spesifisere aktive tegntabellnummer.\n\n\
-Skriv CHCP uten parametrer for å vise aktiv tegntabellnummer.\n"
     STRING_CHOICE_HELP "Venter på at bruker skal velge ett av alternativene.\n\n\
 CHOICE  [/C[:]valg][/N][/S][/T[:]c,nn][tekst]\n\n\
   /C[:]Valg  Spesifisere tillatte nøkler. Standard er JN.\n\
@@ -467,8 +463,6 @@
     STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n"
     STRING_ASSOC_ERROR "Fil association ble ikke funnet for utvidelsen %s\n"
     STRING_BATCH_ERROR "Feil ved åpning av satsvis fil\n"
-    STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n"
-    STRING_CHCP_ERROR4 "Ugyldig tegntabell\n"
     STRING_CHOICE_ERROR "Ugyldig  valg. Forventet format: /C[:]valg"
     STRING_CHOICE_ERROR_TXT "Ugyldig  valg. Forventet format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s"

Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -56,10 +56,6 @@
   /D   Umożliwia zmianę napędu.\n\n\
 Wpisz CD [napęd:], by wyświetlić bieżący katalog na danym napędzie.\n\
 Wpisz CD bez żadnych parametrów, by wyświetlić bieżący napęd i katalog.\n"
-    STRING_CHCP_HELP "Wyświetla lub ustawia numer aktywnej strony kodowej.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Numer strony kodowej.\n\n\
-Wpisz CHCP bez parametru, by wyświetlić numer aktywnej strony kodowej.\n"
     STRING_CHOICE_HELP "Wyświetla opcje jakimi dysponuje użytkownik i oczekuje na wybór jednej z nich.\n\n\
 CHOICE  [/C[:]opcje][/N][/S][/T[:]c,nn][tekst]\n\n\
   /C[:]opcje  Wyznacza klawisze wyświetlane jako wybór. Domyślne: TN.\n\
@@ -473,8 +469,6 @@
     STRING_ALIAS_ERROR "Linia poleceń zbyt długa po rozszerzeniu aliasa!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Błąd podczas otwierania pliku wsadowego\n"
-    STRING_CHCP_ERROR1 "Aktywna strona kodowa nr: %u\n"
-    STRING_CHCP_ERROR4 "Niewłaściwy numer strony kodowej\n"
     STRING_CHOICE_ERROR "Parametr niepoprawny. Poprawna forma: /C[:]opcja"
     STRING_CHOICE_ERROR_TXT "Parametr niepoprawny. Poprawna forma: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Zły parametr: %s"

Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
 Tastați CD fără argumente pentru a afișa unitatea și directorul curent.\n\
 Tastați CD unitate: pentru a afișa conținutul directorului curent\n\
 al unității specificate.\n"
-    STRING_CHCP_HELP "Afișează sau stabilește numărul codificării curente de pagină.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Numărul codificării de pagină specificat.\n\n\
-Tastați CHCP fără argumente pentru a afișa numărul codificării curente.\n"
     STRING_CHOICE_HELP "Cere utilizatorului să aleagă una din mai multe opțiuni.\n\n\
 CHOICE  [/C[:]opțiuni][/N][/S][/T[:]implicit,nn][text]\n\n\
   /C[:]opțiuni       Specifică tastele permise. Implicit sunt D și N.\n\
@@ -500,8 +496,6 @@
     STRING_ALIAS_ERROR "Linia de comandă devine prea lungă după extinderea alias!\n"
     STRING_ASSOC_ERROR "Nu poate fi găsită nici o aplicație asociată extensiei «%s»\n"
     STRING_BATCH_ERROR "Eroare la deschiderea fișierului de comenzi\n"
-    STRING_CHCP_ERROR1 "Codificarea curentă a paginilor: %u\n"
-    STRING_CHCP_ERROR4 "Codificare de pagină nevalidă\n"
     STRING_CHOICE_ERROR "Opțiune eronată. Vedeți formatul: /C[:]opțiuni"
     STRING_CHOICE_ERROR_TXT "Opțiune eronată. Vedeți formatul: /T[:]implicit,nn"
     STRING_CHOICE_ERROR_OPTION "Opțiune eronată: %s"

Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
   /D   Одновременная смена текущих диска и каталога.\n\n\
 Команда CD диск: отображает имя текущего каталога указанного диска.\n\
 Команда CD без параметров отображает имена текущих диска и каталога.\n"
-    STRING_CHCP_HELP "Вывод или смена текущего номера кодовой страницы.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Номер кодовой страницы.\n\n\
-Команда CHCP без параметра выводит текущий номер кодовой страницы.\n"
     STRING_CHOICE_HELP "Ждет, пока пользователь не выберет один из указанных в списке символов.\n\n\
 CHOICE  [/C[:]список_символов][/N][/S][/T[:]c,nn][текст]\n\n\
   /C[:]список_символов  Указывает допустимые символы. По умолчанию это YN.\n\
@@ -479,8 +475,6 @@
     STRING_ALIAS_ERROR "Командная строка слишком длинная после развертывания псевдонимов!\n"
     STRING_ASSOC_ERROR "Не найдено файловых ассоциаций для расширения %s\n"
     STRING_BATCH_ERROR "Ошибка открытия командного файла\n"
-    STRING_CHCP_ERROR1 "Текущая кодовая страница: %u\n"
-    STRING_CHCP_ERROR4 "Неверная кодовая страница\n"
     STRING_CHOICE_ERROR "Неверный параметр. Ожидается формат: /C[:]параметры"
     STRING_CHOICE_ERROR_TXT "Неверный параметр. Ожидается формат: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Неверный параметр: %s"

Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -53,10 +53,6 @@
   /D   Will change current drive and current directory.\n\n\
 Type CD drive: to display the current directory on the specified drive.\n\
 Type CD without a parameter to display the current drive and directory.\n"
-    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifies the active code page number.\n\n\
-Type CHCP without a parameter to display the active code page number.\n"
     STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\
 CHOICE  [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]choices  Specifies allowable keys. Default is YN.\n\
@@ -475,8 +471,6 @@
     STRING_ALIAS_ERROR "Command line too long after alias expansion!\n"
     STRING_ASSOC_ERROR "File association not found for extension %s\n"
     STRING_BATCH_ERROR "Error opening batch file\n"
-    STRING_CHCP_ERROR1 "Active code page: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
     STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options"
     STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Illegal Option: %s"

Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -51,10 +51,6 @@
   /D   Do të ndryshojë drivin aktual dhe dosjen aktuale.\n\n\
 Shkruaj CD drive: për të shfaqur dosjen aktuale në harddiskun e specifikuar.\n\
 Shkruaj CD  pa asnjë parameter për të shfaque harddikun aktual dhe dosjet e tij.\n"
-    STRING_CHCP_HELP "Shfaq ose cakto kodin dhe numrin e faqes aktive.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifikon kodin dhe numrin aktiv te faqes.\n\n\
-Shkruaj CHCP pa anjë parameter për të shfaqur kodin dhe numrin e faqes aktive.\n"
     STRING_CHOICE_HELP "Pret për përdoruesit për të zgjedhur një nga një sërë zgjedhjesh.\n\n\
 CHOICE  [/C[:]zgjedhje][/N][/S][/T[:]c,nn][tekst]\n\n\
   /C[:]zgjedhje Përcakton çelësat e lejueshme. Parazgjedhuri është YN.\n\
@@ -473,8 +469,6 @@
     STRING_ALIAS_ERROR "Rreshti i komandës shumë gjatë pas pseudonimit!\n"
     STRING_ASSOC_ERROR "Dokumentit perkates nuk u gjet për zgjatjen %s\n"
     STRING_BATCH_ERROR "Gabim gjatë hapjes së dokumentit batch\n"
-    STRING_CHCP_ERROR1 "Faqja Active e Kodit: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
     STRING_CHOICE_ERROR "Opsione invalide. Format i pritshem: /C[:]opsione"
     STRING_CHOICE_ERROR_TXT "Opsione invalide. Format i pritshem: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Illegal Option: %s"

Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   Vill ändra aktuell enhet och aktuell mapp.\n\n\
 Skriv CD enhet: för att visa aktuell mapp på specificerad enhet.\n\
 Skriv CD uten parametere för att visa aktuell enhet och mapp.\n"
-    STRING_CHCP_HELP "Visar eller väljer aktiv teckentabell.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Anger nummer på teckentabell.\n\n\
-Skriv CHCP utan parametrar för att visa aktiv teckentabellnummer.\n"
     STRING_CHOICE_HELP "Väntar på att användaren skall ange ett av alternativen.\n\n\
 CHOICE  [/C[:]val][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]Val      Anger lista med alternativ. Standard är JN.\n\
@@ -467,8 +463,6 @@
     STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n"
     STRING_ASSOC_ERROR "Fil association ble inte funnet for utvidelsen %s\n"
     STRING_BATCH_ERROR "Feil ved åpning av satsvis fil\n"
-    STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n"
-    STRING_CHCP_ERROR4 "Ugyldig tegntabell\n"
     STRING_CHOICE_ERROR "Ugyldig  val. Forventet format: /C[:]val"
     STRING_CHOICE_ERROR_TXT "Ugyldig  val. Forventet format: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s"

Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -49,10 +49,6 @@
   /D   Şimdiki sürücüyü ve şimdiki dizini değiştirecek.\n\n\
 CD sürücü yaz: Belirtilen sürücü üzerinde şimdiki dizini görüntülemek için.\n\
 Şimdiki sürücüyü ve dizini görüntülemek için bir değişken olmadan CD yaz.\n"
-    STRING_CHCP_HELP "Etkin kod sayfası numarasını görüntüler ya da ayarlar.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Etkin kod sayfası numarasını belirtir.\n\n\
-Etkin kod sayfası numarasını görüntülemek için bir değişken olmadan CHCP yaz.\n"
     STRING_CHOICE_HELP "Bir takım seçenekten birini seçmek için kullanıcıyı bekler.\n\n\
 CHOICE  [/C[:]seçenekler][/N][/S][/T[:]c,nn][metin]\n\n\
   /C[:]seçenekler  İzin verilebilir düğmeleri belirtir. Ön tanımlı YN'dir.\n\
@@ -474,8 +470,6 @@
     STRING_ALIAS_ERROR "Başka ad açılımından sonra komut yatacı çok uzun!\n"
     STRING_ASSOC_ERROR "%s uzantısı için kütük ilişkilendirmesi bulunamadı.\n"
     STRING_BATCH_ERROR "Toplu iş kütüğünü açma yanlışlığı\n"
-    STRING_CHCP_ERROR1 "Etkin kod sayfası: %u\n"
-    STRING_CHCP_ERROR4 "Geçersiz kod sayfası\n"
     STRING_CHOICE_ERROR "Geçersiz seçenek. Beklenen biçim: /C[:]seçenekler"
     STRING_CHOICE_ERROR_TXT "Geçersiz seçenek. Beklenen biçim: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Geçersiz seçenek: %s"

Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -55,10 +55,6 @@
   /D   Одночасна змiна поточного диску та каталогу.\n\n\
 Команда CD диск: вiдображає iм'я поточного каталогу вказаного диску.\n\
 Команда CD без параметрiв вiдображає iмена поточних диску та каталогу.\n"
-    STRING_CHCP_HELP "Вивiд або змiна поточного номера кодової сторiнки.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Задає номер кодової сторiнки.\n\n\
-Команда CHCP без параметра виводить поточний номер кодової сторiнки.\n"
     STRING_CHOICE_HELP "Очiкує, поки користувач не обере один з вказаних в списку символiв.\n\n\
 CHOICE  [/C[:]список_символiв][/N][/S][/T[:]c,nn][текст]\n\n\
   /C[:]список_символiв  Задає допустимi символи. По замовчуванню це YN.\n\
@@ -479,8 +475,6 @@
     STRING_ALIAS_ERROR "Командний рядок занадто довгий пiсля розгортання псевдонiмiв!\n"
     STRING_ASSOC_ERROR "Не знайдено файлової асоцiацiї для розширення %s\n"
     STRING_BATCH_ERROR "Помилка вiдкриття пакетного файлу\n"
-    STRING_CHCP_ERROR1 "Поточна кодова сторiнка: %u\n"
-    STRING_CHCP_ERROR4 "Помилкова кодова сторiнка\n"
     STRING_CHOICE_ERROR "Невiрний параметр. Очiкується формат: /C[:]параметри"
     STRING_CHOICE_ERROR_TXT "Невiрний параметр. Очiкується формат: /T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "Невiрний параметр: %s"

Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   将会改变当前驱动器和当前目录。\n\n\
 执行 CD 驱动器: 显示指定驱动器上的当前目录。\n\
 不带参数执行 CD 显示当前驱动器和目录。\n"
-    STRING_CHCP_HELP "æ˜¾ç¤ºæˆ–è®¾ç½®æ´»åŠ¨çš„ä»£ç é¡µã€‚\n\n\
-CHCP [nnn]\n\n\
-  nnn   æŒ‡å®šæ´»åŠ¨çš„ä»£ç é¡µã€‚\n\n\
-不带参数执行 CHCP å°†ä¼šæ˜¾ç¤ºå½“å‰æ´»åŠ¨çš„ä»£ç é¡µã€‚\n"
     STRING_CHOICE_HELP "等待用户在一组选项中做出一个选择。\n\n\
 CHOICE  [/C[:]选项][/N][/S][/T[:]c,nn][文本]\n\n\
   /C[:]选项     指定允许的选项。默认为 YN。\n\
@@ -438,8 +434,6 @@
     STRING_ALIAS_ERROR "别名展开后的命令行太长！\n"
     STRING_ASSOC_ERROR "扩展名 %s 的文件关联未找到！\n"
     STRING_BATCH_ERROR "打开批处理文件时出错\n"
-    STRING_CHCP_ERROR1 "æ´»åŠ¨ä»£ç é¡µï¼š%u\n"
-    STRING_CHCP_ERROR4 "æ— æ•ˆä»£ç é¡µ\n"
     STRING_CHOICE_ERROR "æ— æ•ˆé€‰é¡¹ã€‚æœŸæœ›çš„æ ¼å¼ï¼š/C[:]选项"
     STRING_CHOICE_ERROR_TXT "æ— æ•ˆé€‰é¡¹ã€‚æœŸæœ›çš„æ ¼å¼ï¼š/T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "非法选项：%s"

Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.r...
==============================================================================
--- trunk/reactos/base/shell/cmd/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -47,10 +47,6 @@
   /D   將會改變當前驅動器和當前目錄。\n\n\
 執行 CD 驅動器: 顯示指定驅動器上的當前目錄。\n\
 不帶參數執行 CD 顯示當前驅動器和目錄。\n"
-    STRING_CHCP_HELP "顯示或設定活動的內碼表。\n\n\
-CHCP [nnn]\n\n\
-  nnn   指定活動的內碼表。\n\n\
-不帶參數執行 CHCP 將會顯示當前活動的內碼表。\n"
     STRING_CHOICE_HELP "ç­‰å¾…ä½¿ç”¨è€…åœ¨ä¸€çµ„é¸é …ä¸­åšå‡ºä¸€å€‹é¸æ“‡ã€‚\n\n\
 CHOICE  [/C[:]é¸é …][/N][/S][/T[:]c,nn][文字]\n\n\
   /C[:]é¸é …     æŒ‡å®šå…è¨±çš„é¸é …ã€‚é»˜èªç‚º YN。\n\
@@ -438,8 +434,6 @@
     STRING_ALIAS_ERROR "別名展開後的命令列太長！\n"
     STRING_ASSOC_ERROR "副檔名 %s 的檔案關聯未找到！\n"
     STRING_BATCH_ERROR "開啟批處理檔案時出錯\n"
-    STRING_CHCP_ERROR1 "活動內碼表：%u\n"
-    STRING_CHCP_ERROR4 "無效內碼表\n"
     STRING_CHOICE_ERROR "ç„¡æ•ˆé¸é …ã€‚æœŸæœ›çš„æ ¼å¼ï¼š/C[:]é¸é …"
     STRING_CHOICE_ERROR_TXT "ç„¡æ•ˆé¸é …ã€‚æœŸæœ›çš„æ ¼å¼ï¼š/T[:]c,nn"
     STRING_CHOICE_ERROR_OPTION "éžæ³•é¸é …ï¼š%s"

Modified: trunk/reactos/base/shell/cmd/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?r...
==============================================================================
--- trunk/reactos/base/shell/cmd/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/resource.h	[iso-8859-1] Sun Sep 24 19:00:47 2017
@@ -21,8 +21,6 @@

#define STRING_ALIAS_ERROR         300
 #define STRING_BATCH_ERROR         301
-#define STRING_CHCP_ERROR1         302
-#define STRING_CHCP_ERROR4         305
 #define STRING_CHOICE_ERROR        306
 #define STRING_CHOICE_ERROR_TXT    307
 #define STRING_CHOICE_ERROR_OPTION 308
@@ -74,7 +72,6 @@
 #define STRING_BEEP_HELP   602
 #define STRING_CALL_HELP   603
 #define STRING_CD_HELP     604
-#define STRING_CHCP_HELP   605
 #define STRING_CHOICE_HELP 606
 #define STRING_CLS_HELP    607
 #define STRING_CMD_HELP1   608