[ROSAPPS]

Add some missing german translations
Add some missing manifests
Improve some resources
Add possibility to build an application with one language

svn path=/trunk/; revision=67552

diff --git a/rosapps/applications/devutils/vgafontedit/vgafontedit.rc b/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
index f3898b9..5d91ac7 100644 (file)
--- a/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
+++ b/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
@@ -32,6 +32,8 @@ IDB_EDIT_GLYPH_TOOLBOX    BITMAP    "res/toolbox.bmp"
 IDI_MAIN                  ICON      "res/main.ico"
 IDI_DOC                   ICON      "res/doc.ico"
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/rosapps/applications/imagesoft/rsrc.rc b/rosapps/applications/imagesoft/rsrc.rc
index 619b3fd..aa83fc3 100644 (file)
--- a/rosapps/applications/imagesoft/rsrc.rc
+++ b/rosapps/applications/imagesoft/rsrc.rc
@@ -1,6 +1,8 @@
 #include <windows.h>
 #include "resource.h"
 
+#include <reactos/manifest_exe.rc>
+
 /* include localised resources */
 // UTF-8
 #pragma code_page(65001)

diff --git a/rosapps/applications/screensavers/blankscr/scrnsave.rc b/rosapps/applications/screensavers/blankscr/scrnsave.rc
index 34a1c57..9144acd 100644 (file)
--- a/rosapps/applications/screensavers/blankscr/scrnsave.rc
+++ b/rosapps/applications/screensavers/blankscr/scrnsave.rc
@@ -10,18 +10,44 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME   "scrnsave.scr\0"
 #include <reactos/version.rc>
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/lt-LT.rc"
-#include "lang/nl-NL.rc"
-#include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
-#include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.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_LT_LT
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/applications/screensavers/butterflies/rsrc.rc b/rosapps/applications/screensavers/butterflies/rsrc.rc
index 97bd02a..8194651 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/rsrc.rc
+++ b/rosapps/applications/screensavers/butterflies/rsrc.rc
@@ -1,14 +1,38 @@
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/lt-LT.rc"
-#include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
-#include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
+#include <reactos/manifest_exe.rc>
+
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.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_LT_LT
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/applications/screensavers/circles/circles.rc b/rosapps/applications/screensavers/circles/circles.rc
index 0e16564..2aa123b 100644 (file)
--- a/rosapps/applications/screensavers/circles/circles.rc
+++ b/rosapps/applications/screensavers/circles/circles.rc
@@ -11,13 +11,32 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #include <reactos/version.rc>
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/no-NO.rc"
-#include "lang/ro-RO.rc"
-#include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.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_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/applications/screensavers/circles/lang/de-DE.rc b/rosapps/applications/screensavers/circles/lang/de-DE.rc
new file mode 100644 (file)
index 0000000..227a74d
--- /dev/null
+++ b/rosapps/applications/screensavers/circles/lang/de-DE.rc
@@ -0,0 +1,7 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION "Kreise"
+    IDS_TEXT        "Keine Einstellungen notwendig."
+END

diff --git a/rosapps/applications/screensavers/matrix/rsrc.rc b/rosapps/applications/screensavers/matrix/rsrc.rc
index 808983a..14df26c 100644 (file)
--- a/rosapps/applications/screensavers/matrix/rsrc.rc
+++ b/rosapps/applications/screensavers/matrix/rsrc.rc
@@ -7,19 +7,47 @@ IDB_BITMAP1      BITMAP  DISCARDABLE  "matrix.bmp"
 IDC_BLANKCURSOR  CURSOR  DISCARDABLE  "cursor1.cur"
 IDI_ICON1        ICON    DISCARDABLE  "icon1.ico"
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/lt-LT.rc"
-#include "lang/nl-NL.rc"
-#include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
-#include "lang/sk-SK.rc"
-#include "lang/th-TH.rc"
-#include "lang/uk-UA.rc"
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.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_LT_LT
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_TH_TH
+    #include "lang/th-TH.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/applications/screensavers/ssstars/lang/de-DE.rc b/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
new file mode 100644 (file)
index 0000000..a90f387
--- /dev/null
+++ b/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
@@ -0,0 +1,52 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+// Dialog
+
+DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 292, 282
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Einstellungen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Optionen",IDC_STATIC,16,100,260,76
+    RTEXT           "Anzahl an Sternen:",IDC_STATIC,24,116,68,12,
+                    SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_SLIDER_NUM_OF_STARS,"msctls_trackbar32",
+                    TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,96,116,140,12
+    CTEXT           "Static",IDC_TEXT_NUM_OF_STARS,240,116,24,12,
+                    SS_CENTERIMAGE,WS_EX_STATICEDGE
+    RTEXT           "Geschwindigkeit:",IDC_STATIC,24,137,68,12,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_SLIDER_SPEED,"msctls_trackbar32",TBS_BOTH | 
+                    TBS_NOTICKS | WS_TABSTOP,96,137,140,12
+    CTEXT           "Static",IDC_TEXT_SPEED,240,137,24,12,SS_CENTERIMAGE,
+                    WS_EX_STATICEDGE
+    RTEXT           "Rotation:",IDC_STATIC,24,156,68,12,SS_CENTERIMAGE
+    COMBOBOX        IDC_COMBO_ROTATION,100,156,80,60,CBS_DROPDOWNLIST | 
+                    WS_TABSTOP
+    CONTROL         "",IDC_IMAGE_COSMOS,"Static",SS_BITMAP | SS_CENTERIMAGE,
+                    4,4,284,92
+    GROUPBOX        "Erweitert",IDC_STATIC,16,180,260,72
+    CONTROL         "Hintergrund-Blending aktivieren",IDC_CHECK_DOBLENDING,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
+    CONTROL         "Genaue Perspektivenkorrektur aktivieren",
+                    IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,24,208,160,10
+    CONTROL         "Texturfilterung aktivieren",IDC_CHECK_FILTERING,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
+    CONTROL         "Weiche Schattierungen aktivieren",IDC_CHECK_SHADING,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
+    PUSHBUTTON      "OK",IDOK,60,260,52,16
+    PUSHBUTTON      "Abbrechen",IDCANCEL,120,260,52,16
+    PUSHBUTTON      "Über",IDC_BUTTON_ABOUT,179,260,52,16
+END
+
+// String Tables
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_DESCRIPTION         "Starfield"
+    IDS_ROTATION_NONE       "Keine"
+    IDS_ROTATION_LINEAR     "Linear"
+    IDS_ROTATION_PERIODIC   "Periodisch"
+    IDS_LICENSE             "Starfield ist freie Software veröffentlicht unter der GNU GPL Lizenz."
+    IDS_AUTHOR              "Erstellt von Carlo Bramini"
+END

diff --git a/rosapps/applications/screensavers/ssstars/lang/en-US.rc b/rosapps/applications/screensavers/ssstars/lang/en-US.rc
index ae75a45..b0401d0 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/lang/en-US.rc
+++ b/rosapps/applications/screensavers/ssstars/lang/en-US.rc
@@ -26,14 +26,14 @@ BEGIN
                     4,4,284,92
     GROUPBOX        "Advanced",IDC_STATIC,16,180,260,72
     CONTROL         "Enable background blending",IDC_CHECK_DOBLENDING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
     CONTROL         "Enable accurate perspective correction",
                     IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,24,208,142,10
+                    WS_TABSTOP,24,208,160,10
     CONTROL         "Enable texture filtering",IDC_CHECK_FILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
     CONTROL         "Enable smooth shading",IDC_CHECK_SHADING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
     PUSHBUTTON      "OK",IDOK,60,260,52,16
     PUSHBUTTON      "Cancel",IDCANCEL,120,260,52,16
     PUSHBUTTON      "About",IDC_BUTTON_ABOUT,179,260,52,16

diff --git a/rosapps/applications/screensavers/ssstars/lang/it-IT.rc b/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
index 8707c86..4ad39fd 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
+++ b/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
@@ -26,14 +26,14 @@ BEGIN
                     4,4,284,92
     GROUPBOX        "Avanzate",IDC_STATIC,16,180,260,72
     CONTROL         "Attiva blending sullo sfondo",IDC_CHECK_DOBLENDING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,102,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
     CONTROL         "Attiva correzione prospettica accurata",
                     IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,24,208,135,10
+                    WS_TABSTOP,24,208,160,10
     CONTROL         "Attiva filtraggio delle texture",IDC_CHECK_FILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
     CONTROL         "Attiva illuminazione accurata",IDC_CHECK_SHADING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,110,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
     PUSHBUTTON      "OK",IDOK,60,260,52,16
     PUSHBUTTON      "Annulla",IDCANCEL,120,260,52,16
     PUSHBUTTON      "Info",IDC_BUTTON_ABOUT,179,260,52,16

diff --git a/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc b/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
index 2c25edf..0df8b88 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
+++ b/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
@@ -26,14 +26,14 @@ BEGIN
                     4,4,284,92
     GROUPBOX        "Zaawansowane",IDC_STATIC,16,180,260,72
     CONTROL         "Włącz łączenie tła",IDC_CHECK_DOBLENDING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
     CONTROL         "Włącz precyzyjną poprawę perspektywy",
                     IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,24,208,142,10
+                    WS_TABSTOP,24,208,160,10
     CONTROL         "Włącz filtrowanie tekstur",IDC_CHECK_FILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
     CONTROL         "Włącz wygładzanie cieni",IDC_CHECK_SHADING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
     PUSHBUTTON      "OK",IDOK,60,260,52,16
     PUSHBUTTON      "Anuluj",IDCANCEL,120,260,52,16
     PUSHBUTTON      "O wygaszaczu",IDC_BUTTON_ABOUT,179,260,52,16

diff --git a/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc b/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
index 0544a3c..9c92df7 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
+++ b/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
@@ -34,14 +34,14 @@ BEGIN
                     4,4,284,92
     GROUPBOX        "A&vansate…",IDC_STATIC,16,180,260,72
     CONTROL         "Activează &Wamestec de fundal",IDC_CHECK_DOBLENDING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
     CONTROL         "Activează &corecție fină de perspectivă",
                     IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,24,208,142,10
+                    WS_TABSTOP,24,208,160,10
     CONTROL         "Activea&ză filtrarea texturilor",IDC_CHECK_FILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
     CONTROL         "Activează umbrire omogenă",IDC_CHECK_SHADING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
     PUSHBUTTON      "Con&firmă",IDOK,60,260,52,16
     PUSHBUTTON      "A&nulează",IDCANCEL,120,260,52,16
     PUSHBUTTON      "&Despre…",IDC_BUTTON_ABOUT,179,260,52,16

diff --git a/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc b/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
index 50f73d5..153712c 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
+++ b/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
@@ -26,14 +26,14 @@ BEGIN
                     4,4,284,92
     GROUPBOX        "Дополнительные настройки",IDC_STATIC,16,180,260,72
     CONTROL         "Включить фоновое смешивание",IDC_CHECK_DOBLENDING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10
     CONTROL         "Включить точную коррекцию перспективы",
                     IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,24,208,142,10
+                    WS_TABSTOP,24,208,160,10
     CONTROL         "Включить фильтрацию текстур",IDC_CHECK_FILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10
     CONTROL         "Включить мягкие тени",IDC_CHECK_SHADING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10
     PUSHBUTTON      "OK",IDOK,60,260,52,16
     PUSHBUTTON      "Отмена",IDCANCEL,120,260,52,16
     PUSHBUTTON      "О программе",IDC_BUTTON_ABOUT,179,260,52,16

diff --git a/rosapps/applications/screensavers/ssstars/resource.rc b/rosapps/applications/screensavers/ssstars/resource.rc
index cf464a6..69eb736 100644 (file)
--- a/rosapps/applications/screensavers/ssstars/resource.rc
+++ b/rosapps/applications/screensavers/ssstars/resource.rc
@@ -39,13 +39,27 @@ IDI_STARFIELD           ICON    DISCARDABLE     "res/icon_stars.ico"
 IDB_COSMOS              BITMAP  DISCARDABLE     "res/cosmicfractal.bmp"
 IDB_STAR                BITMAP  DISCARDABLE     "res/star.bmp"
 
+#include <reactos/manifest_exe.rc>
 
 // Language resources
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/en-US.rc"
-#include "lang/it-IT.rc"
-#include "lang/ro-RO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/pl-PL.rc"
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.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

diff --git a/rosapps/applications/screensavers/starfield/starfield.rc b/rosapps/applications/screensavers/starfield/starfield.rc
index 84a6aa5..00bee10 100644 (file)
--- a/rosapps/applications/screensavers/starfield/starfield.rc
+++ b/rosapps/applications/screensavers/starfield/starfield.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
-#ifdef LANGUAGE_ES_ES
+#ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
 #ifdef LANGUAGE_LT_LT

diff --git a/rosapps/applications/sysutils/ctm/ctm.rc b/rosapps/applications/sysutils/ctm/ctm.rc
index 48837de..81c130e 100644 (file)
--- a/rosapps/applications/sysutils/ctm/ctm.rc
+++ b/rosapps/applications/sysutils/ctm/ctm.rc
@@ -11,11 +11,27 @@
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/en-US.rc"
-#include "lang/fr-FR.rc"
-#include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/no-NO.rc"
-#include "lang/ro-RO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/uk-UA.rc"
+#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_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/templates/old_wordpad/rsrc.rc b/rosapps/templates/old_wordpad/rsrc.rc
index 1f32062..0186201 100644 (file)
--- a/rosapps/templates/old_wordpad/rsrc.rc
+++ b/rosapps/templates/old_wordpad/rsrc.rc
@@ -2,20 +2,50 @@
 #include <commctrl.h>
 #include "resource.h"
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/en-US.rc"
-#include "lang/fi-FI.rc"
-#include "lang/fr-FR.rc"
-#include "lang/it-IT.rc"
-#include "lang/no-NO.rc"
-#include "lang/nl-NL.rc"
-#include "lang/pl-PL.rc"
-#include "lang/ru-RU.rc"
-#include "lang/th-TH.rc"
-#include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.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_FI_FI
+    #include "lang/fi-FI.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_TH_TH
+    #include "lang/th-TH.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif
+#ifdef LANGUAGE_ZH_CN
+    #include "lang/zh-CN.rc"
+#endif