From 3907b65ae16983a5fcc155fbe1b5b482a3692c85 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Sat, 24 Mar 2007 14:55:57 +0000
Subject: [PATCH] rearrange servman language files before sbs goes crazy ...

svn path=/trunk/; revision=26163
---
 .../mscutils/servman/{ => lang}/de-DE.rc      |  0
 .../mscutils/servman/{ => lang}/en-US.rc      |  0
 .../mscutils/servman/{ => lang}/id-ID.rc      |  0
 .../mscutils/servman/{ => lang}/it-IT.rc      |  0
 .../mscutils/servman/{ => lang}/ru-RU.rc      |  0
 .../mscutils/servman/manifest.xml             | 23 +++++++++++++
 .../applications/mscutils/servman/rsrc.rc     | 34 +++++++++++++++++++
 .../applications/mscutils/servman/servman.rc  | 34 ++-----------------
 8 files changed, 60 insertions(+), 31 deletions(-)
 rename reactos/base/applications/mscutils/servman/{ => lang}/de-DE.rc (100%)
 rename reactos/base/applications/mscutils/servman/{ => lang}/en-US.rc (100%)
 rename reactos/base/applications/mscutils/servman/{ => lang}/id-ID.rc (100%)
 rename reactos/base/applications/mscutils/servman/{ => lang}/it-IT.rc (100%)
 rename reactos/base/applications/mscutils/servman/{ => lang}/ru-RU.rc (100%)
 create mode 100644 reactos/base/applications/mscutils/servman/manifest.xml
 create mode 100644 reactos/base/applications/mscutils/servman/rsrc.rc

diff --git a/reactos/base/applications/mscutils/servman/de-DE.rc b/reactos/base/applications/mscutils/servman/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/mscutils/servman/de-DE.rc
rename to reactos/base/applications/mscutils/servman/lang/de-DE.rc
diff --git a/reactos/base/applications/mscutils/servman/en-US.rc b/reactos/base/applications/mscutils/servman/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/mscutils/servman/en-US.rc
rename to reactos/base/applications/mscutils/servman/lang/en-US.rc
diff --git a/reactos/base/applications/mscutils/servman/id-ID.rc b/reactos/base/applications/mscutils/servman/lang/id-ID.rc
similarity index 100%
rename from reactos/base/applications/mscutils/servman/id-ID.rc
rename to reactos/base/applications/mscutils/servman/lang/id-ID.rc
diff --git a/reactos/base/applications/mscutils/servman/it-IT.rc b/reactos/base/applications/mscutils/servman/lang/it-IT.rc
similarity index 100%
rename from reactos/base/applications/mscutils/servman/it-IT.rc
rename to reactos/base/applications/mscutils/servman/lang/it-IT.rc
diff --git a/reactos/base/applications/mscutils/servman/ru-RU.rc b/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/applications/mscutils/servman/ru-RU.rc
rename to reactos/base/applications/mscutils/servman/lang/ru-RU.rc
diff --git a/reactos/base/applications/mscutils/servman/manifest.xml b/reactos/base/applications/mscutils/servman/manifest.xml
new file mode 100644
index 00000000000..4df22534fca
--- /dev/null
+++ b/reactos/base/applications/mscutils/servman/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="Win32 Application.default.App"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Service Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/mscutils/servman/rsrc.rc b/reactos/base/applications/mscutils/servman/rsrc.rc
new file mode 100644
index 00000000000..f22fdbd0a8c
--- /dev/null
+++ b/reactos/base/applications/mscutils/servman/rsrc.rc
@@ -0,0 +1,34 @@
+#include <windows.h>
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+1 24 DISCARDABLE "manifest.xml"
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS Service Manager"
+END
+
+IDI_SM_ICON ICON "res/system.ico"
+
+/* main toolbar icons */
+IDB_PROP    BITMAP DISCARDABLE "res/properties.bmp"
+IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
+IDB_EXPORT  BITMAP DISCARDABLE "res/export.bmp"
+IDB_CREATE  BITMAP DISCARDABLE "res/create.bmp"
+IDB_DELETE  BITMAP DISCARDABLE "res/delete.bmp"
+IDB_START   BITMAP DISCARDABLE "res/start.bmp"
+IDB_STOP    BITMAP DISCARDABLE "res/stop.bmp"
+IDB_PAUSE   BITMAP DISCARDABLE "res/pause.bmp"
+IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp"
+IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
+IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
+
+
+//#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ru-RU.rc"
+
diff --git a/reactos/base/applications/mscutils/servman/servman.rc b/reactos/base/applications/mscutils/servman/servman.rc
index 22247f58b3c..bec9460d541 100644
--- a/reactos/base/applications/mscutils/servman/servman.rc
+++ b/reactos/base/applications/mscutils/servman/servman.rc
@@ -5,37 +5,9 @@
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Service Manager\0"
 #define REACTOS_STR_INTERNAL_NAME     "services\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "services.exe\0"
-//#include <reactos/version.rc>
+#define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0"
+#include <reactos/version.rc>
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-//1 24 DISCARDABLE "manifest.xml"
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_APPNAME "ReactOS Service Manager"
-END
-
-IDI_SM_ICON ICON "res/system.ico"
-
-/* main toolbar icons */
-IDB_PROP    BITMAP DISCARDABLE "res/properties.bmp"
-IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
-IDB_EXPORT  BITMAP DISCARDABLE "res/export.bmp"
-IDB_CREATE  BITMAP DISCARDABLE "res/create.bmp"
-IDB_DELETE  BITMAP DISCARDABLE "res/delete.bmp"
-IDB_START   BITMAP DISCARDABLE "res/start.bmp"
-IDB_STOP    BITMAP DISCARDABLE "res/stop.bmp"
-IDB_PAUSE   BITMAP DISCARDABLE "res/pause.bmp"
-IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp"
-IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
-IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
+#include "rsrc.rc"
 
 
-//#include "de-DE.rc"
-#include "en-US.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "ru-RU.rc"
-