[ros-diffs] [gvg] 18663: Revert r18662, trunk and branch already diverged

Revert r18662, trunk and branch already diverged
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc
Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,85 +1,85 @@

LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "PozadÝ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
     CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
     LTEXT           "Vyberte obrßzek, kter² chcete pou×Ýt jako
pozadÝ:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Vybrat...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Barva...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "UmÝstýnÝ:",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
| 
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Vybrat...",IDC_BROWSE_BUTTON,187,175,50,14
+    PUSHBUTTON      "&Barva...",IDC_COLOR_BUTTON,187,195,50,14
+    LTEXT           "UmÝstýnÝ:",IDC_STATIC,187,138,36,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST
| 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END

-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Spo°iÞ obrazovky"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238,
136
+    GROUPBOX        "&Spo°iÞ obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238,
176

LTEXT           "Seznam spo°iÞ¨:",IDC_STATIC,13, 24, 71, 9
     CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "&Odebrat",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&P°idat",IDC_SCREENS_ADD_BUTTON,    190,34,39,10
+                    WS_BORDER | WS_TABSTOP,13, 34, 171, 109
+    PUSHBUTTON      "&Odebrat",IDC_SCREENS_DELETE, 189,47,39,10
+    PUSHBUTTON      "&P°idat",IDC_SCREENS_POWER_BUTTON,    190,34,39,10

-    PUSHBUTTON      "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 124, 48,
12,WS_GROUP
-    PUSHBUTTON      "&Ukßzka",IDC_SCREENS_TESTSC,192, 124, 43, 12
+    PUSHBUTTON      "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 164, 48,
12,WS_GROUP
+    PUSHBUTTON      "&Ukßzka",IDC_SCREENS_TESTSC,192, 164, 43, 12

CONTROL         "P°i obnovenÝ po×adovat
&heslo.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18

-    LTEXT           "&?ekat:",IDC_STATIC,13, 110, 17, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT |
WS_GROUP
+    LTEXT           "&?ekat:",IDC_STATIC,13, 150, 17, 9
+    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT |
WS_GROUP
     CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,52, 109, 12, 12
-    LTEXT           "Minut ne× se spustÝ spo°iÞ
obrazovky.",IDC_STATIC,70, 111, 147, 9
+                    WS_BORDER | WS_GROUP,52, 149, 12, 12
+    LTEXT           "Minut ne× se spustÝ spo°iÞ
obrazovky.",IDC_STATIC,70, 151, 147, 9

-    GROUPBOX        "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5,
146, 238, 35
+    GROUPBOX        "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY,5,
186, 238, 35
     LTEXT           "Pro mo×nosti napßjenÝ monitoru klepnýta na
tlaÞÝtko Mo×nosti napßjenÝ.",
-                    IDC_STATIC,16, 159, 155, 19
-    PUSHBUTTON      "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180,
162, 57, 12
+                    IDC_STATIC,16, 199, 155, 19
+    PUSHBUTTON      "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180,
202, 57, 12
 END

-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Vzhled"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
-                    90,112,8
+                    110,112,8
 END

-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "NastavenÝ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Displej:",1820,3,100,30,8
-    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "&Velikost obrazovky",1818,3,120,115,43
+    LTEXT           "&Displej:",1820,3,140,30,8
+    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "&Velikost obrazovky",1818,3,160,115,43
     CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    30,130,58,17
-    LTEXT           "MÚný",1815,9,130,15,8,NOT WS_GROUP
-    LTEXT           "VÝce",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&PoÞet barev",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
+                    30,170,58,17
+    LTEXT           "MÚný",1815,9,170,15,8,NOT WS_GROUP
+    LTEXT           "VÝce",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&PoÞet barev",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON      "R&ozÜÝ°enÚ
nastavenÝ...",IDC_SETTINGS_ADVANCED,306,165,56,14
+                    131,188,103,9
+    PUSHBUTTON      "R&ozÜÝ°enÚ
nastavenÝ...",IDC_SETTINGS_ADVANCED,306,205,56,14
 END

STRINGTABLE 
Property changes on:
branches/ros-branch-0_2_8/reactos/lib/cpl/desk/cz.rc
___________________________________________________________________
Name: svn:eol-style
   - native
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/de.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,86 +1,80 @@

-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Desktop"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
-    CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
-                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
-    LTEXT           "Hintergrundbild:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Durchsuchen...",IDC_BROWSE_BUTTON,186,135,56,14
-    PUSHBUTTON      "&Farbe...",IDC_COLOR_BUTTON,186,155,56,14
-    LTEXT           "Ausrichtung:",IDC_STATIC,186,98,43,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,186,108,50,90,CBS_DROPDOWNLIST
|
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Bildschrimschoner"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
-                    90,112,8
-END
-
-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Darstellung"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
-                    90,112,8
-END
-
-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Einstellungen"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "&Anzeige:",1820,3,100,30,8
-    LTEXT           "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "Bi&ldschirmaufl÷sung",1818,3,120,115,43
-    CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    32,130,60,17
-    LTEXT           "Niedrig",1815,9,130,25,8,NOT WS_GROUP
-    LTEXT           "Hoch",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&Farbqualitõt",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON      "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14
-END
-
-STRINGTABLE
-BEGIN
-    IDS_CPLNAME "Anzeige"
-    IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und
des Bildschirmschoners an."
-
-    IDS_NONE "(Keine)"
-    IDS_CENTER "Zentriert"
-    IDS_STRETCH "Gestreckt"
-    IDS_TILE "Nebeneinander"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_COLOR_4BIT "16 Farben"
-    IDS_COLOR_8BIT "256 Farben"
-    IDS_COLOR_16BIT "High Color (16 Bit)"
-    IDS_COLOR_24BIT "True Color (24 Bit)"
-    IDS_COLOR_32BIT "True Color (32 Bit)"
-    IDS_PIXEL "%lux%lu Pixel"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_BACKGROUND_COMDLG_FILTER "Bilddateien
(*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0"
-    IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png"
-END
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Desktop"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
+    CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
+                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
+    LTEXT           "Hintergrundbild:",
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Durchsuchen...",IDC_BROWSE_BUTTON,186,175,56,14
+    PUSHBUTTON      "&Farbe...",IDC_COLOR_BUTTON,186,195,56,14
+    LTEXT           "Ausrichtung:",IDC_STATIC,186,138,43,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,186,148,50,90,CBS_DROPDOWNLIST
|
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Bildschrimschoner"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
+                    110,112,8
+END
+
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Darstellung"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
+                    110,112,8
+END
+
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Einstellungen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Anzeige:",1820,3,140,30,8
+    LTEXT           "<kein>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "Bi&ldschirmaufl÷sung",1818,3,160,115,43
+    CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
+                    32,170,60,17
+    LTEXT           "Niedrig",1815,9,170,25,8,NOT WS_GROUP
+    LTEXT           "Hoch",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&Farbqualitõt",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
+                    WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
+                    131,188,103,9
+    PUSHBUTTON      "&Erweitert",IDC_SETTINGS_ADVANCED,306,205,56,14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Anzeige"
+    IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und
des Bildschirmschoners an."
+
+    IDS_NONE "(Keine)"
+    IDS_CENTER "Zentriert"
+    IDS_STRETCH "Gestreckt"
+    IDS_TILE "Nebeneinander"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_COLOR_4BIT "16 Farben"
+    IDS_COLOR_8BIT "256 Farben"
+    IDS_COLOR_16BIT "High Color (16 Bit)"
+    IDS_COLOR_24BIT "True Color (24 Bit)"
+    IDS_COLOR_32BIT "True Color (32 Bit)"
+    IDS_PIXEL "%lux%lu Pixel"
+END
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/desk.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,5 +1,4 @@

#include <windows.h>
-#include <commctrl.h>
 #include "resource.h"

LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -16,8 +15,7 @@
 #include "en.rc"
 #include "cz.rc"
 #include "de.rc"
-#include "es.rc"
-#include "Ja.rc"
 #include "nl.rc"
 #include "pl.rc"
 #include "sv.rc"
+#include "es.rc"
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/en.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,85 +1,85 @@

LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Background"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
     CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
     LTEXT           "Select an image to use as your desktop
wallpaper:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Browse...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Color...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "Placement:",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
| 
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_BUTTON,187,175,50,14
+    PUSHBUTTON      "&Color...",IDC_COLOR_BUTTON,187,195,50,14
+    LTEXT           "Placement:",IDC_STATIC,187,138,36,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST
| 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END

-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Screen Saver"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136
+    GROUPBOX        "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 176

LTEXT           "List of Screensavers:",IDC_STATIC,13, 24, 71, 9
     CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "&Delete",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&Add",IDC_SCREENS_ADD_BUTTON,    190,34,39,10
+                    WS_BORDER | WS_TABSTOP,13, 34, 171, 109
+    PUSHBUTTON      "&Delete",IDC_SCREENS_DELETE, 189,47,39,10
+    PUSHBUTTON      "&Add",IDC_SCREENS_POWER_BUTTON,    190,34,39,10

-    PUSHBUTTON      "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48,
12,WS_GROUP
-    PUSHBUTTON      "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12
+    PUSHBUTTON      "Se&ttings...",IDC_SCREENS_SETTINGS,140, 164, 48,
12,WS_GROUP
+    PUSHBUTTON      "Pre&view",IDC_SCREENS_TESTSC,192, 164, 43, 12

CONTROL         "On Resume, &Password
Protect.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18

-    LTEXT           "&Wait:",IDC_STATIC,13, 110, 17, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT |
WS_GROUP
+    LTEXT           "&Wait:",IDC_STATIC,13, 150, 17, 9
+    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT |
WS_GROUP
     CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,52, 109, 12, 12
-    LTEXT           "Minutes before showing
Screensaver.",IDC_STATIC,70, 111, 147, 9
+                    WS_BORDER | WS_GROUP,52, 149, 12, 12
+    LTEXT           "Minutes before showing
Screensaver.",IDC_STATIC,70, 151, 147, 9

-    GROUPBOX        "&Energy Saving features of
monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35
+    GROUPBOX        "&Energy Saving features of
monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35
     LTEXT           "To adjust the power settings for your monitor,
click on Power Settings.",
-                    IDC_STATIC,16, 159, 155, 19
-    PUSHBUTTON      "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180,
162, 57, 12
+                    IDC_STATIC,16, 199, 155, 19
+    PUSHBUTTON      "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180,
202, 57, 12
 END

-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Appearance"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
-                    90,112,8
+                    110,112,8
 END

-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Display:",1820,3,100,30,8
-    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "&Screen area",1818,3,120,115,43
+    LTEXT           "&Display:",1820,3,140,30,8
+    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "&Screen area",1818,3,160,115,43
     CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    30,130,58,17
-    LTEXT           "Less",1815,9,130,15,8,NOT WS_GROUP
-    LTEXT           "More",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&Colors",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
+                    30,170,58,17
+    LTEXT           "Less",1815,9,170,15,8,NOT WS_GROUP
+    LTEXT           "More",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&Colors",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON      "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14
+                    131,188,103,9
+    PUSHBUTTON      "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,205,56,14
 END

STRINGTABLE 
@@ -102,9 +102,3 @@
     IDS_COLOR_32BIT "True Color (32 Bit)"
     IDS_PIXEL "%lux%lu Pixel"
 END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_BACKGROUND_COMDLG_FILTER "Pictures
(*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0"
-    IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png"
-END
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/es.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,111 +1,111 @@

-/*
- * desk (Spanish resources)
- *
- * Copyright 2005 Patricio MartÝnez Ros
- *
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
-
-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Escritorio"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
-    CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
-                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
-    LTEXT           "Fondo:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Examinar...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Color...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "Posici¾n",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
|
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Protector de pantalla"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX        "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7,
238, 136
-
-    LTEXT           "Lista de protectores de pantalla:",IDC_STATIC,13,
24, 108, 9
-    CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
-                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "Eliminar",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&A±adir",IDC_SCREENS_ADD_BUTTON,    190,34,39,10
-
-    PUSHBUTTON      "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 124,
56, 12,WS_GROUP
-    PUSHBUTTON      "&Vista previa",IDC_SCREENS_TESTSC,192, 124, 43, 12
-
-    CONTROL         "Protecci¾n con
&password.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
-
-    LTEXT           "&Esperar:",IDC_STATIC,13, 110, 31, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,44, 108, 31, 12,ES_RIGHT |
WS_GROUP
-    CONTROL         "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT
|
-                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,62, 108, 12, 12
-    LTEXT           "Minutos antes de mostrar el protector de
pantalla.",IDC_STATIC,79, 110, 161, 9
-
-    GROUPBOX        "Ahorro de energÝa del
monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35
-    LTEXT           "Para ajustar la configuraci¾n de energÝa del
monitor, haga click en EnergÝa.",
-                    IDC_STATIC,16, 159, 155, 19
-    PUSHBUTTON      "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 162, 57,
12
-END
-
-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Apariencia"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "Este espacio se ha dejado en blanco
intencionadamente",IDC_STATIC,33,
-                    89,181,10
-END
-
-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Configuraci¾n"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "Monitor",1820,3,100,30,8
-    LTEXT           "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "Resoluci¾n de &pantalla",1818,3,120,115,43
-    CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    30,130,58,17
-    LTEXT           "Menos",1815,8,130,21,8,NOT WS_GROUP
-    LTEXT           "Mßs",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&Calidad de color",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL |
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON      "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14
-END
-
-STRINGTABLE
-BEGIN
-    IDS_CPLNAME "Pantalla"
-    IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el
protector de pantalla."
-
-    IDS_NONE "(Ninguno)"
-    IDS_CENTER "Centrada"
-    IDS_STRETCH "Expandida"
-    IDS_TILE "En mosaico"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_COLOR_4BIT "Muy baja (4 bits)"
-    IDS_COLOR_8BIT "Baja (8 bits)"
-    IDS_COLOR_16BIT "Media (16 bits)"
-    IDS_COLOR_24BIT "Alta (24 bits)"
-    IDS_COLOR_32BIT "La mßs alta (32 bits)"
-    IDS_PIXEL "%lu por %lu pÝxeles"
-END
+/*
+ * desk (Spanish resources)
+ *
+ * Copyright 2005 Patricio MartÝnez Ros
+ *
+ */
+
+LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
+
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Escritorio"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
+    CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
+                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
+    LTEXT           "Fondo:",
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Examinar...",IDC_BROWSE_BUTTON,187,175,50,14
+    PUSHBUTTON      "&Color...",IDC_COLOR_BUTTON,187,195,50,14
+    LTEXT           "Posici¾n",IDC_STATIC,187,138,36,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST
|
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Protector de pantalla"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7,
238, 176
+
+    LTEXT           "Lista de protectores de pantalla:",IDC_STATIC,13,
24, 108, 9
+    CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
+                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
+                    WS_BORDER | WS_TABSTOP,13, 34, 171, 109
+    PUSHBUTTON      "Eliminar",IDC_SCREENS_DELETE, 189,47,39,10
+    PUSHBUTTON      "&A±adir",IDC_SCREENS_POWER_BUTTON,    190,34,39,10
+
+    PUSHBUTTON      "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 164,
56, 12,WS_GROUP
+    PUSHBUTTON      "&Vista previa",IDC_SCREENS_TESTSC,192, 164, 43, 12
+
+    CONTROL         "Protecci¾n con
&password.",IDC_SCREENS_USEPASSCHK,"button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18
+
+    LTEXT           "&Esperar:",IDC_STATIC,13, 150, 31, 9
+    EDITTEXT        IDC_SCREENS_TIMEDELAY,44, 148, 31, 12,ES_RIGHT |
WS_GROUP
+    CONTROL         "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT
|
+                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
+                    WS_BORDER | WS_GROUP,62, 148, 12, 12
+    LTEXT           "Minutos antes de mostrar el protector de
pantalla.",IDC_STATIC,79, 150, 161, 9
+
+    GROUPBOX        "Ahorro de energÝa del
monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35
+    LTEXT           "Para ajustar la configuraci¾n de energÝa del
monitor, haga click en EnergÝa.",
+                    IDC_STATIC,16, 199, 155, 19
+    PUSHBUTTON      "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 202, 57,
12
+END
+
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Apariencia"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Este espacio se ha dejado en blanco
intencionadamente",IDC_STATIC,33,
+                    109,181,10
+END
+
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Configuraci¾n"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Monitor",1820,3,140,30,8
+    LTEXT           "<ninguno>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "Resoluci¾n de &pantalla",1818,3,160,115,43
+    CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
+                    30,170,58,17
+    LTEXT           "Menos",1815,8,170,21,8,NOT WS_GROUP
+    LTEXT           "Mßs",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&Calidad de color",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL |
+                    WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
+                    131,188,103,9
+    PUSHBUTTON      "A&vanzado...",IDC_SETTINGS_ADVANCED,306,205,56,14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CPLNAME "Pantalla"
+    IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el
protector de pantalla."
+
+    IDS_NONE "(Ninguno)"
+    IDS_CENTER "Centrada"
+    IDS_STRETCH "Expandida"
+    IDS_TILE "En mosaico"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_COLOR_4BIT "Muy baja (4 bits)"
+    IDS_COLOR_8BIT "Baja (8 bits)"
+    IDS_COLOR_16BIT "Media (16 bits)"
+    IDS_COLOR_24BIT "Alta (24 bits)"
+    IDS_COLOR_32BIT "La mßs alta (32 bits)"
+    IDS_PIXEL "%lu por %lu pÝxeles"
+END
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/nl.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,85 +1,85 @@

LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT //Vertaald door Lionel Lowie

-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Achtergrond"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
     CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
     LTEXT           "Select an image to use as your desktop
wallpaper:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Bladeren...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Kleur...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "&Weergave:",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
| 
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Bladeren...",IDC_BROWSE_BUTTON,187,175,50,14
+    PUSHBUTTON      "&Kleur...",IDC_COLOR_BUTTON,187,195,50,14
+    LTEXT           "&Weergave:",IDC_STATIC,187,138,36,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST
| 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END

-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schermbeveiliging"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238,
136
+    GROUPBOX        "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238,
176

LTEXT           "Lijst van de schermbeveiligingen:",IDC_STATIC,13,
24, 71, 9
     CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "&Wissen",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&Toevoegen",IDC_SCREENS_ADD_BUTTON,
190,34,39,10
+                    WS_BORDER | WS_TABSTOP,13, 34, 171, 109
+    PUSHBUTTON      "&Wissen",IDC_SCREENS_DELETE, 189,47,39,10
+    PUSHBUTTON      "&Toevoegen",IDC_SCREENS_POWER_BUTTON,
190,34,39,10

-    PUSHBUTTON      "&Instellingen...",IDC_SCREENS_SETTINGS,140, 124,
48, 12,WS_GROUP
-    PUSHBUTTON      "V&oorbeeld",IDC_SCREENS_TESTSC,192, 124, 43, 12
+    PUSHBUTTON      "&Instellingen...",IDC_SCREENS_SETTINGS,140, 164,
48, 12,WS_GROUP
+    PUSHBUTTON      "V&oorbeeld",IDC_SCREENS_TESTSC,192, 164, 43, 12

CONTROL         "&Beveiligd met
wachtwoord.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18

-    LTEXT           "W&acht:",IDC_STATIC,13, 110, 17, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT |
WS_GROUP
+    LTEXT           "W&acht:",IDC_STATIC,13, 150, 17, 9
+    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT |
WS_GROUP
     CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,52, 109, 12, 12
-    LTEXT           "minuten.",IDC_STATIC,70, 111, 147, 9
+                    WS_BORDER | WS_GROUP,52, 149, 12, 12
+    LTEXT           "minuten.",IDC_STATIC,70, 151, 147, 9

-    GROUPBOX        "&Energiebesparende functies van de
monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35
+    GROUPBOX        "&Energiebesparende functies van de
monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35
     LTEXT           "Klik op Instellingen om de energiebesparende
mogelijkheden van de monitor in te stellen.",
-                    IDC_STATIC,16, 159, 155, 19
-    PUSHBUTTON      "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 162,
57, 12
+                    IDC_STATIC,16, 199, 155, 19
+    PUSHBUTTON      "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 202,
57, 12
 END

-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Appearance"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "This space is intentionally left
blank",IDC_STATIC,66,
-                    90,112,8
+                    110,112,8
 END

-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Instellingen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Scherm:",1820,3,100,30,8
-    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "&Screen area",1818,3,120,115,43
+    LTEXT           "&Scherm:",1820,3,140,30,8
+    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "&Screen area",1818,3,160,115,43
     CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    30,130,58,17
-    LTEXT           "Minder",1815,9,130,15,8,NOT WS_GROUP
-    LTEXT           "Meer",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&Kleuren",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
+                    30,170,58,17
+    LTEXT           "Minder",1815,9,170,15,8,NOT WS_GROUP
+    LTEXT           "Meer",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&Kleuren",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON
"&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14
+                    131,188,103,9
+    PUSHBUTTON
"&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,205,56,14
 END

STRINGTABLE 
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/pl.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,86 +1,86 @@

// Polish language resource file (Sebastian Gasiorek, 2005-07-07)
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
+IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Pulpit"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
+    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10,
+                    150,105,WS_EX_STATICEDGE
     CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
+                    WS_BORDER | WS_TABSTOP,7,139,173,71
     LTEXT           "Wybierz obraz do u?ycia jako tapeta pulpitu:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Przegl?daj...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Kolor...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "Po?o?enie:",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
| 
+                    IDC_STATIC,8,127,180,8
+    PUSHBUTTON      "&Przegl?daj...",IDC_BROWSE_BUTTON,187,175,50,14
+    PUSHBUTTON      "&Kolor...",IDC_COLOR_BUTTON,187,195,50,14
+    LTEXT           "Po?o?enie:",IDC_STATIC,187,138,36,8
+    COMBOBOX        IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST
| 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END

-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Wygaszacz ekranu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238,
136
+    GROUPBOX        "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238,
176

LTEXT           "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9
     CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "&Usu±",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&Dodaj",IDC_SCREENS_ADD_BUTTON,    190,34,39,10
+                    WS_BORDER | WS_TABSTOP,13, 34, 171, 109
+    PUSHBUTTON      "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10
+    PUSHBUTTON      "&Dodaj",IDC_SCREENS_POWER_BUTTON,    190,34,39,10

-    PUSHBUTTON      "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 124, 48,
12,WS_GROUP
-    PUSHBUTTON      "&Podgl?d",IDC_SCREENS_TESTSC,192, 124, 43, 12
+    PUSHBUTTON      "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48,
12,WS_GROUP
+    PUSHBUTTON      "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12

CONTROL         "Po wznowieniu wy£wietl &ekran
powitalny.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 141, 119, 18
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18

-    LTEXT           "&Czekaj:",IDC_STATIC,13, 110, 17, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT |
WS_GROUP
+    LTEXT           "&Czekaj:",IDC_STATIC,13, 150, 17, 9
+    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT |
WS_GROUP
     CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,52, 109, 12, 12
-    LTEXT           "minut przed pokazaniem wygaszacza
ekranu.",IDC_STATIC,70, 111, 147, 9
+                    WS_BORDER | WS_GROUP,52, 149, 12, 12
+    LTEXT           "minut przed pokazaniem wygaszacza
ekranu.",IDC_STATIC,70, 151, 147, 9

-    GROUPBOX        "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146,
238, 35
+    GROUPBOX        "&Zasilanie monitora",IDC_SCREENS_DUMMY,5, 186,
238, 35
     LTEXT           "Kliknij przycisk Zasilanie, aby dopasowaµ
ustawienia zasilania dla monitora.",
-                    IDC_STATIC,16, 159, 155, 19
-    PUSHBUTTON      "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 162, 57,
12
+                    IDC_STATIC,16, 199, 155, 19
+    PUSHBUTTON      "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57,
12
 END

-IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_APPEARANCE DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Wygl?d"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "To miejsce pozosta?o celowo puste",IDC_STATIC,66,
-                    90,112,8
+                    110,112,8
 END

-IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 188
+IDD_SETTINGS DIALOGEX DISCARDABLE  0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ustawienia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Ekran:",1820,3,100,30,8
-    LTEXT           "<brak>",IDC_SETTINGS_DEVICE,9,109,224,8
-    GROUPBOX        "&Rozdzielczo£µ ekranu",1818,3,120,115,43
+    LTEXT           "&Ekran:",1820,3,140,30,8
+    LTEXT           "<brak>",IDC_SETTINGS_DEVICE,9,149,224,8
+    GROUPBOX        "&Rozdzielczo£µ ekranu",1818,3,160,115,43
     CONTROL
"",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS |
WS_TABSTOP,
-                    30,130,58,17
-    LTEXT           "Mniej",1815,9,130,15,8,NOT WS_GROUP
-    LTEXT           "WiÛcej",1816,93,130,21,8,NOT WS_GROUP
-    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT
WS_GROUP | SS_CENTER
-    GROUPBOX        "&Jako£µ kolor¾w",1817,125,120,115,43
-    COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
+                    30,170,58,17
+    LTEXT           "Mniej",1815,9,170,15,8,NOT WS_GROUP
+    LTEXT           "WiÛcej",1816,93,170,21,8,NOT WS_GROUP
+    LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT
WS_GROUP | SS_CENTER
+    GROUPBOX        "&Jako£µ kolor¾w",1817,125,160,115,43
+    COMBOBOX        IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | 
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE |
SS_SUNKEN,
-                    131,148,103,9
-    PUSHBUTTON
"Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14
+                    131,188,103,9
+    PUSHBUTTON
"Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,205,56,14
 END

STRINGTABLE 
  _____

Modified: branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc
--- branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc
2005-10-21 19:33:16 UTC (rev 18662)
+++ branches/ros-branch-0_2_8/reactos/lib/cpl/desk/sv.rc
2005-10-21 19:45:28 UTC (rev 18663)
@@ -1,107 +1,107 @@

-/* Swedish resources by David Nordenberg 
-   Updated 2005-07-09 by Andreas Bjerkeholt */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Bakgrund"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL
"",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,
-                    90,65,WS_EX_STATICEDGE
-    CONTROL         "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT |
-                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,7,99,173,71
-    LTEXT           "Võlj en bild du vill ha som skrivbordsunderlõgg:",
-                    IDC_STATIC,8,87,180,8
-    PUSHBUTTON      "&Blõddra...",IDC_BROWSE_BUTTON,187,135,50,14
-    PUSHBUTTON      "&Fõrg...",IDC_COLOR_BUTTON,187,155,50,14
-    LTEXT           "Placering:",IDC_STATIC,187,98,36,8
-    COMBOBOX        IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST
| 
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SCREENSAVER DIALOGEX DISCARDABLE  0, 0, 246, 188
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Skõrmslõckare"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX        "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 136
-    
-    LTEXT           "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9
-    CONTROL         "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
-                    LVS_SINGLESEL | LVS_NOCOLUMNHEADER |
LVS_SHAREIMAGELISTS |
-                    WS_BORDER | WS_TABSTOP,13, 34, 171, 69
-    PUSHBUTTON      "&Ta bort",IDC_SCREENS_DELETE, 190,47,39,10
-    PUSHBUTTON      "&Lõgg till",IDC_SCREENS_ADD_BUTTON,
190,34,39,10
-
-    PUSHBUTTON      "&Instõllningar",IDC_SCREENS_SETTINGS,138, 124, 48,
12,WS_GROUP
-    PUSHBUTTON      "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 124, 48, 12
-
-    CONTROL         "&Krõv l÷senord f÷r att
Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
-
-    LTEXT           "&Võnta:",IDC_STATIC,13, 110, 17, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT |
WS_GROUP
-    CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
-                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
-                    WS_BORDER | WS_GROUP,52, 109, 12, 12
-    LTEXT           "minuter innan skõrmslõckaren
visas.",IDC_STATIC,70, 111, 147, 9
[truncated at 1000 lines; 164 more skipped]