From 837b567bc2fb4deb1a2b0ddb2ebd8b3303e75774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Fri, 21 Dec 2012 23:48:23 +0000
Subject: [PATCH] [REG] - Upgrade the files architecture to the classic one :
 lang-directory for language resource files, rsrc.rc and <app_name>.rc for
 main resource files. - Convert remaining language resource files to UTF-8
 without BOM. - Add version information to the program - Patch by Lee
 Schroeder.

CORE-6821 #resolve #comment Committed in r57963. Thanks :)

svn path=/trunk/; revision=57963
---
 .../applications/cmdutils/reg/CMakeLists.txt  |  2 +-
 .../cmdutils/reg/{Bg.rc => lang/bg-BG.rc}     |  0
 .../cmdutils/reg/{Da.rc => lang/da-DK.rc}     |  0
 .../cmdutils/reg/{De.rc => lang/de-DE.rc}     |  0
 .../cmdutils/reg/{En.rc => lang/en-US.rc}     |  0
 .../cmdutils/reg/{Es.rc => lang/es-ES.rc}     |  0
 .../cmdutils/reg/{Fr.rc => lang/fr-FR.rc}     |  0
 .../cmdutils/reg/{It.rc => lang/it-IT.rc}     |  0
 .../cmdutils/reg/{Ja.rc => lang/ja-JP.rc}     |  0
 .../cmdutils/reg/{Ko.rc => lang/ko-KR.rc}     | 18 +++---
 .../cmdutils/reg/{Lt.rc => lang/lt-LT.rc}     |  0
 .../cmdutils/reg/{Nl.rc => lang/nl-NL.rc}     |  0
 .../cmdutils/reg/{No.rc => lang/no-NO.rc}     |  0
 .../cmdutils/reg/{Pl.rc => lang/pl-PL.rc}     | 20 +++----
 .../cmdutils/reg/{Pt.rc => lang/pt-PT.rc}     |  0
 .../cmdutils/reg/{Ro.rc => lang/ro-RO.rc}     |  0
 .../cmdutils/reg/{Ru.rc => lang/ru-RU.rc}     |  0
 .../cmdutils/reg/{Si.rc => lang/sl-SI.rc}     |  0
 .../cmdutils/reg/{Sv.rc => lang/sv-SE.rc}     |  0
 .../cmdutils/reg/{Uk.rc => lang/uk-UA.rc}     |  0
 reactos/base/applications/cmdutils/reg/reg.rc | 13 ++++
 .../base/applications/cmdutils/reg/rsrc.rc    | 60 ++++++++++---------
 22 files changed, 65 insertions(+), 48 deletions(-)
 rename reactos/base/applications/cmdutils/reg/{Bg.rc => lang/bg-BG.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Da.rc => lang/da-DK.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{De.rc => lang/de-DE.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{En.rc => lang/en-US.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Es.rc => lang/es-ES.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Fr.rc => lang/fr-FR.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{It.rc => lang/it-IT.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Ja.rc => lang/ja-JP.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Ko.rc => lang/ko-KR.rc} (55%)
 rename reactos/base/applications/cmdutils/reg/{Lt.rc => lang/lt-LT.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Nl.rc => lang/nl-NL.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{No.rc => lang/no-NO.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Pl.rc => lang/pl-PL.rc} (58%)
 rename reactos/base/applications/cmdutils/reg/{Pt.rc => lang/pt-PT.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Ro.rc => lang/ro-RO.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Ru.rc => lang/ru-RU.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Si.rc => lang/sl-SI.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Sv.rc => lang/sv-SE.rc} (100%)
 rename reactos/base/applications/cmdutils/reg/{Uk.rc => lang/uk-UA.rc} (100%)
 create mode 100644 reactos/base/applications/cmdutils/reg/reg.rc

diff --git a/reactos/base/applications/cmdutils/reg/CMakeLists.txt b/reactos/base/applications/cmdutils/reg/CMakeLists.txt
index 594b6221530..1b1d22161a4 100644
--- a/reactos/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/reg/CMakeLists.txt
@@ -4,7 +4,7 @@ set_rc_compiler()
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-add_executable(reg reg.c rsrc.rc)
+add_executable(reg reg.c reg.rc)
 
 set_module_type(reg win32cui UNICODE)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)
diff --git a/reactos/base/applications/cmdutils/reg/Bg.rc b/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Bg.rc
rename to reactos/base/applications/cmdutils/reg/lang/bg-BG.rc
diff --git a/reactos/base/applications/cmdutils/reg/Da.rc b/reactos/base/applications/cmdutils/reg/lang/da-DK.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Da.rc
rename to reactos/base/applications/cmdutils/reg/lang/da-DK.rc
diff --git a/reactos/base/applications/cmdutils/reg/De.rc b/reactos/base/applications/cmdutils/reg/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/De.rc
rename to reactos/base/applications/cmdutils/reg/lang/de-DE.rc
diff --git a/reactos/base/applications/cmdutils/reg/En.rc b/reactos/base/applications/cmdutils/reg/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/En.rc
rename to reactos/base/applications/cmdutils/reg/lang/en-US.rc
diff --git a/reactos/base/applications/cmdutils/reg/Es.rc b/reactos/base/applications/cmdutils/reg/lang/es-ES.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Es.rc
rename to reactos/base/applications/cmdutils/reg/lang/es-ES.rc
diff --git a/reactos/base/applications/cmdutils/reg/Fr.rc b/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Fr.rc
rename to reactos/base/applications/cmdutils/reg/lang/fr-FR.rc
diff --git a/reactos/base/applications/cmdutils/reg/It.rc b/reactos/base/applications/cmdutils/reg/lang/it-IT.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/It.rc
rename to reactos/base/applications/cmdutils/reg/lang/it-IT.rc
diff --git a/reactos/base/applications/cmdutils/reg/Ja.rc b/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Ja.rc
rename to reactos/base/applications/cmdutils/reg/lang/ja-JP.rc
diff --git a/reactos/base/applications/cmdutils/reg/Ko.rc b/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc
similarity index 55%
rename from reactos/base/applications/cmdutils/reg/Ko.rc
rename to reactos/base/applications/cmdutils/reg/lang/ko-KR.rc
index 46efd9165f4..57d719fc3f8 100644
--- a/reactos/base/applications/cmdutils/reg/Ko.rc
+++ b/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc
@@ -26,13 +26,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "���ɾ� ����:\n\nREG [ ADD | DELETE | QUERY ]\nREG ���ɾ� /?\n"
-    STRING_ADD_USAGE, "REG ADD �� [/v �� | /ve] [/t ����] [/s �и���ȣ] [/d ����Ÿ] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE Ű �̸� [/v �� | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY Ű �̸� [/v ��| /ve] [/s]\n"
-    STRING_SUCCESS, "�۾��� ���������� �������ϴ�\n"
-    STRING_INVALID_KEY, "����: �ùٸ��� ���� Ű �̸�\n"
-    STRING_INVALID_CMDLINE, "����:�ùٸ��� ���� ���ɶ��� �Ű�����\n"
-    STRING_NO_REMOTE, "����: ���� �ӽſ�  Ű�� ���ϴ� ���� �������� �ʽ��ϴ�\n"
-    STRING_CANNOT_FIND, "����: �� �ý��ۿ��� ������ ������Ʈ�� Ű�� ���� ã���� �����ϴ�\n"
+    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
+    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
+    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
+    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
+    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
+    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
+    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
 }
diff --git a/reactos/base/applications/cmdutils/reg/Lt.rc b/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Lt.rc
rename to reactos/base/applications/cmdutils/reg/lang/lt-LT.rc
diff --git a/reactos/base/applications/cmdutils/reg/Nl.rc b/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Nl.rc
rename to reactos/base/applications/cmdutils/reg/lang/nl-NL.rc
diff --git a/reactos/base/applications/cmdutils/reg/No.rc b/reactos/base/applications/cmdutils/reg/lang/no-NO.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/No.rc
rename to reactos/base/applications/cmdutils/reg/lang/no-NO.rc
diff --git a/reactos/base/applications/cmdutils/reg/Pl.rc b/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc
similarity index 58%
rename from reactos/base/applications/cmdutils/reg/Pl.rc
rename to reactos/base/applications/cmdutils/reg/lang/pl-PL.rc
index ce6e64fb754..f4e327dec54 100644
--- a/reactos/base/applications/cmdutils/reg/Pl.rc
+++ b/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc
@@ -4,7 +4,7 @@
  *
  * Copyright 2008 Andrew Riedi
  * Copyright 2008 Mikolaj Zalewski
- * Copyright 2010 �ukasz Wojni�owicz
+ * Copyright 2010 Łukasz Wojniłowicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,13 +27,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Sk�adnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
-    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_warto�ci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_warto�ci | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_warto�ci | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacja zako�czona pomy�lnie\n"
-    STRING_INVALID_KEY, "B��d: Niew�a�ciwa nazwa klucza\n"
-    STRING_INVALID_CMDLINE, "B��d: Niew�a�ciwe parametry wiersza polece�\n"
-    STRING_NO_REMOTE, "B��d: Nie mo�na doda� kluczy do zdalnej maszyny\n"
-    STRING_CANNOT_FIND, "B��d: System nie m�g� znale�� podanej warto�ci lub klucza rejestru\n"
+    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
+    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
 }
diff --git a/reactos/base/applications/cmdutils/reg/Pt.rc b/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Pt.rc
rename to reactos/base/applications/cmdutils/reg/lang/pt-PT.rc
diff --git a/reactos/base/applications/cmdutils/reg/Ro.rc b/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Ro.rc
rename to reactos/base/applications/cmdutils/reg/lang/ro-RO.rc
diff --git a/reactos/base/applications/cmdutils/reg/Ru.rc b/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Ru.rc
rename to reactos/base/applications/cmdutils/reg/lang/ru-RU.rc
diff --git a/reactos/base/applications/cmdutils/reg/Si.rc b/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Si.rc
rename to reactos/base/applications/cmdutils/reg/lang/sl-SI.rc
diff --git a/reactos/base/applications/cmdutils/reg/Sv.rc b/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Sv.rc
rename to reactos/base/applications/cmdutils/reg/lang/sv-SE.rc
diff --git a/reactos/base/applications/cmdutils/reg/Uk.rc b/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/reg/Uk.rc
rename to reactos/base/applications/cmdutils/reg/lang/uk-UA.rc
diff --git a/reactos/base/applications/cmdutils/reg/reg.rc b/reactos/base/applications/cmdutils/reg/reg.rc
new file mode 100644
index 00000000000..0ba9b4d1d52
--- /dev/null
+++ b/reactos/base/applications/cmdutils/reg/reg.rc
@@ -0,0 +1,13 @@
+#include <windows.h>
+#include <commctrl.h>
+#include "reg.h"
+
+/* Define language neutral resources */
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Registry Console Tool"
+#define REACTOS_STR_INTERNAL_NAME       "reg"
+#define REACTOS_STR_ORIGINAL_FILENAME   "reg.exe"
+#include <reactos/version.rc>
+
+#include "rsrc.rc"
diff --git a/reactos/base/applications/cmdutils/reg/rsrc.rc b/reactos/base/applications/cmdutils/reg/rsrc.rc
index 7af579b4842..c8d3f846131 100644
--- a/reactos/base/applications/cmdutils/reg/rsrc.rc
+++ b/reactos/base/applications/cmdutils/reg/rsrc.rc
@@ -1,59 +1,63 @@
-#ifdef LANGUAGE_EN_US
-    #include "En.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "Ko.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "Nl.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "Pl.rc"
-#endif
+#include <windows.h>
+#include "reg.h"
 
-/* UTF-8 */
+/* Include localised resources */
+// UTF-8
+#pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG
-    #include "Bg.rc"
+    #include "lang/bg-BG.rc"
 #endif
 #ifdef LANGUAGE_DA_DK
-    #include "Da.rc"
+    #include "lang/da-DK.rc"
 #endif
 #ifdef LANGUAGE_DE_DE
-    #include "De.rc"
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
 #endif
 #ifdef LANGUAGE_ES_ES
-    #include "Es.rc"
+    #include "lang/es-ES.rc"
 #endif
 #ifdef LANGUAGE_FR_FR
-    #include "Fr.rc"
+    #include "lang/fr-FR.rc"
 #endif
 #ifdef LANGUAGE_IT_IT
-    #include "It.rc"
+    #include "lang/it-IT.rc"
 #endif
 #ifdef LANGUAGE_JA_JP
-    #include "Ja.rc"
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_KO_KR
+    #include "lang/ko-KR.rc"
 #endif
 #ifdef LANGUAGE_LT_LT
-    #include "Lt.rc"
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
 #endif
 #ifdef LANGUAGE_NO_NO
-    #include "No.rc"
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
 #endif
 #ifdef LANGUAGE_PT_PT
-    #include "Pt.rc"
+    #include "lang/pt-PT.rc"
 #endif
 #ifdef LANGUAGE_RO_RO
-    #include "Ro.rc"
+    #include "lang/ro-RO.rc"
 #endif
 #ifdef LANGUAGE_RU_RU
-    #include "Ru.rc"
+    #include "lang/ru-RU.rc"
 #endif
 #ifdef LANGUAGE_SL_SI
-    #include "Si.rc"
+    #include "lang/sl-SI.rc"
 #endif
 #ifdef LANGUAGE_SV_SE
-    #include "Sv.rc"
+    #include "lang/sv-SE.rc"
 #endif
 #ifdef LANGUAGE_UK_UA
-    #include "Uk.rc"
+    #include "lang/uk-UA.rc"
 #endif