From 3e4ab62ccacd424324d07c00dc243e384d493a70 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 14 Sep 2006 17:17:51 +0000
Subject: [PATCH] 1. move all languages to own folder 2. accepted LMH1
 languages patch (with small modification) 3. fixed right sublang on few
 languages rc files See issue #1685 for more details.

svn path=/trunk/; revision=24117
---
 reactos/base/system/userinit/{ => lang}/De.rc |  0
 reactos/base/system/userinit/{ => lang}/En.rc |  0
 reactos/base/system/userinit/{ => lang}/Es.rc |  0
 reactos/base/system/userinit/{ => lang}/Gr.rc |  0
 reactos/base/system/userinit/{ => lang}/Hu.rc |  2 +-
 reactos/base/system/userinit/{ => lang}/Ja.rc |  0
 reactos/base/system/userinit/lang/No.rc       | 12 ++++++++++++
 reactos/base/system/userinit/{ => lang}/Ru.rc |  2 +-
 reactos/base/system/userinit/{ => lang}/Sv.rc |  0
 reactos/base/system/userinit/{ => lang}/Uk.rc |  2 +-
 reactos/base/system/userinit/userinit.rc      | 10 +---------
 11 files changed, 16 insertions(+), 12 deletions(-)
 rename reactos/base/system/userinit/{ => lang}/De.rc (100%)
 rename reactos/base/system/userinit/{ => lang}/En.rc (100%)
 rename reactos/base/system/userinit/{ => lang}/Es.rc (100%)
 rename reactos/base/system/userinit/{ => lang}/Gr.rc (100%)
 rename reactos/base/system/userinit/{ => lang}/Hu.rc (83%)
 rename reactos/base/system/userinit/{ => lang}/Ja.rc (100%)
 create mode 100644 reactos/base/system/userinit/lang/No.rc
 rename reactos/base/system/userinit/{ => lang}/Ru.rc (85%)
 rename reactos/base/system/userinit/{ => lang}/Sv.rc (100%)
 rename reactos/base/system/userinit/{ => lang}/Uk.rc (89%)

diff --git a/reactos/base/system/userinit/De.rc b/reactos/base/system/userinit/lang/De.rc
similarity index 100%
rename from reactos/base/system/userinit/De.rc
rename to reactos/base/system/userinit/lang/De.rc
diff --git a/reactos/base/system/userinit/En.rc b/reactos/base/system/userinit/lang/En.rc
similarity index 100%
rename from reactos/base/system/userinit/En.rc
rename to reactos/base/system/userinit/lang/En.rc
diff --git a/reactos/base/system/userinit/Es.rc b/reactos/base/system/userinit/lang/Es.rc
similarity index 100%
rename from reactos/base/system/userinit/Es.rc
rename to reactos/base/system/userinit/lang/Es.rc
diff --git a/reactos/base/system/userinit/Gr.rc b/reactos/base/system/userinit/lang/Gr.rc
similarity index 100%
rename from reactos/base/system/userinit/Gr.rc
rename to reactos/base/system/userinit/lang/Gr.rc
diff --git a/reactos/base/system/userinit/Hu.rc b/reactos/base/system/userinit/lang/Hu.rc
similarity index 83%
rename from reactos/base/system/userinit/Hu.rc
rename to reactos/base/system/userinit/lang/Hu.rc
index 35a4f7873b8..cb698d1554e 100644
--- a/reactos/base/system/userinit/Hu.rc
+++ b/reactos/base/system/userinit/lang/Hu.rc
@@ -4,7 +4,7 @@
  * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas@gmail.com>
  */
 
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 {
 
diff --git a/reactos/base/system/userinit/Ja.rc b/reactos/base/system/userinit/lang/Ja.rc
similarity index 100%
rename from reactos/base/system/userinit/Ja.rc
rename to reactos/base/system/userinit/lang/Ja.rc
diff --git a/reactos/base/system/userinit/lang/No.rc b/reactos/base/system/userinit/lang/No.rc
new file mode 100644
index 00000000000..e7960894134
--- /dev/null
+++ b/reactos/base/system/userinit/lang/No.rc
@@ -0,0 +1,12 @@
+#include "resource.h"
+/* Start move all hard code string to En.rc 
+ * By Magnus Olsen  2005
+ */
+
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
+{
+
+STRING_USERINIT_FAIL, "Userinit mislykket å starte skall!\n"
+
+}
diff --git a/reactos/base/system/userinit/Ru.rc b/reactos/base/system/userinit/lang/Ru.rc
similarity index 85%
rename from reactos/base/system/userinit/Ru.rc
rename to reactos/base/system/userinit/lang/Ru.rc
index fe0d6793e57..a06133fee6b 100644
--- a/reactos/base/system/userinit/Ru.rc
+++ b/reactos/base/system/userinit/lang/Ru.rc
@@ -3,7 +3,7 @@
  * By Magnus Olsen  2005
  */
 
-LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 {
 
diff --git a/reactos/base/system/userinit/Sv.rc b/reactos/base/system/userinit/lang/Sv.rc
similarity index 100%
rename from reactos/base/system/userinit/Sv.rc
rename to reactos/base/system/userinit/lang/Sv.rc
diff --git a/reactos/base/system/userinit/Uk.rc b/reactos/base/system/userinit/lang/Uk.rc
similarity index 89%
rename from reactos/base/system/userinit/Uk.rc
rename to reactos/base/system/userinit/lang/Uk.rc
index 757593b03ec..95aa27d836b 100644
--- a/reactos/base/system/userinit/Uk.rc
+++ b/reactos/base/system/userinit/lang/Uk.rc
@@ -8,7 +8,7 @@
 
 #include "resource.h"
 
-LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
diff --git a/reactos/base/system/userinit/userinit.rc b/reactos/base/system/userinit/userinit.rc
index 4d40f3ada07..a3d1cac4be1 100644
--- a/reactos/base/system/userinit/userinit.rc
+++ b/reactos/base/system/userinit/userinit.rc
@@ -6,12 +6,4 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"userinit.dll\0"
 #include <reactos/version.rc>
 
-#include "De.rc"
-#include "En.rc"
-#include "Ja.rc"
-#include "Sv.rc"
-#include "Hu.rc"
-#include "Es.rc"
-#include "Ru.rc"
-#include "Gr.rc"
-#include "Uk.rc"
+#include "rsrc.rc"