[ros-diffs] [dchapyshev] 31058: - Update Russian Translation for servman - Add rasdlg to bootcd - Delete unused icons for main.cpl - Update English and Russian Translation for console.dll - Small fix Russian Translation for kernel32 - Update Russian Translation for shell32

Author: dchapyshev
Date: Fri Dec  7 20:05:46 2007
New Revision: 31058

URL: http://svn.reactos.org/svn/reactos?rev=31058&view=rev
Log:
- Update Russian Translation for servman
- Add rasdlg to bootcd
- Delete unused icons for main.cpl
- Update English and Russian Translation for console.dll
- Small fix Russian Translation for kernel32
- Update Russian Translation for shell32

Modified:
    trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/cpl/main/resources/folder_closed.ico
    trunk/reactos/dll/cpl/main/resources/folder_open.ico
    trunk/reactos/dll/win32/console/lang/en-US.rc
    trunk/reactos/dll/win32/console/lang/ru-RU.rc
    trunk/reactos/dll/win32/kernel32/nls/rus.nls
    trunk/reactos/dll/win32/shell32/lang/ru-RU.rc

Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Dec  7 20:05:46
2007
@@ -117,19 +117,19 @@
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP |
WS_TABSTOP
 BEGIN
-  EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE |
WS_EX_CLIENTEDGE
-  EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE
-  LTEXT "*Èìÿ ñëóæáû :", IDC_STATIC, 12, 12, 54, 9
-  LTEXT "*Îòîáðàæàåìîå èìÿ :", IDC_STATIC, 12, 33, 54, 9
-  LTEXT "*Èñïîëíÿåìûé ôàéë :", IDC_STATIC, 10, 51, 68, 9
-  LTEXT "Îïèñàíèå :", IDC_STATIC, 12, 86, 44, 9
-  PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
-  PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 13
-  LTEXT "Äîïîëíèòåëüíûå îïöèè (íàæìèòå ñïðàâêó äëÿ óòî÷íåíèÿ)", IDC_STATIC, 10,
151, 134, 9
-  PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 6, 192, 44, 13
+  EDITTEXT IDC_CREATE_SERVNAME, 71, 9, 150, 14, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE
+  EDITTEXT IDC_CREATE_DISPNAME, 87, 29, 134, 14, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 14, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_DESC, 8, 97, 210, 48, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_OPTIONS, 8, 162, 210, 14, WS_CHILD | WS_VISIBLE
+  LTEXT "*Èìÿ ñëóæáû:", IDC_STATIC, 8, 12, 59, 9
+  LTEXT "*Îòîáðàæàåìîå èìÿ:", IDC_STATIC, 8, 33, 78, 9
+  LTEXT "*Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 8, 51, 96, 9
+  LTEXT "Îïèñàíèå:", IDC_STATIC, 8, 86, 58, 9
+  PUSHBUTTON "OK", IDOK, 126, 192, 44, 14
+  PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 14
+  LTEXT "Äîïîëíèòåëíî (íàæìèòå ""Ñïðàâêà"" äëÿ óòî÷íåíèÿ)",
IDC_STATIC, 8, 151, 206, 9
+  PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 8, 192, 44, 14
 END
 
 IDD_DLG_DELETE DIALOGEX 6,6,185,148

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Dec  7 20:05:46 2007
@@ -224,6 +224,7 @@
 dll\win32\psapi\psapi.dll                           1
 dll\win32\powrprof\powrprof.dll                     1
 dll\win32\rasapi32\rasapi32.dll                     1
+dll\win32\rasdlg\rasdlg.dll                         1
 dll\win32\riched20\riched20.dll                     1
 dll\win32\riched32\riched32.dll                     1
 dll\win32\rpcrt4\rpcrt4.dll                         1

Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol…
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/cpl/main/resources/folder_open.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol…
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/dll/win32/console/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/console/lang/en-US.rc (original)
+++ trunk/reactos/dll/win32/console/lang/en-US.rc Fri Dec  7 20:05:46 2007
@@ -2,7 +2,7 @@
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            dll/win32/console/en.rc
+ * FILE:            dll/win32/console/lang/en-US.rc
  * PURPOSE:         English resource file
  * PROGRAMMERS:     Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
  */
@@ -11,141 +11,139 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-GROUPBOX "Cursor Size", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-GROUPBOX "Display Options", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
-CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-GROUPBOX "Command History:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
-LTEXT "&Buffer Size", -1, 25, 100, 60, 15
-EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12
-LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15
-EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12
-CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140,
100, 15
-
-
-GROUPBOX "Edit Options", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD |
WS_VISIBLE | WS_GROUP
-CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD
| WS_VISIBLE | WS_TABSTOP
+	GROUPBOX "Cursor Size", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
+	CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
+	CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
+	GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
+	CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
+	CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
+	GROUPBOX "Command History", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE |
WS_GROUP
+	LTEXT "&Buffer Size:", -1, 14, 101, 70, 12
+	EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15
+	LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12
+	EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15
+	CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140,
110, 15
+	GROUPBOX "Edit Options", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD |
WS_VISIBLE | WS_GROUP
+	CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD
| WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-LTEXT "Window Preview", -1, 10, 7, 65, 10
-LTEXT "Size", -1, 130, 10, 30, 10
-CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 10, 20, 115, 70
-LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
-LTEXT "&Font", -1, 10, 105, 35, 10
-CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
-GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
-CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 165, 95, 35
-LTEXT "Each character is:", -1, 130, 165, 75, 10
-LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20
-LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+	LTEXT "Window Preview:", -1, 10, 10, 94, 10
+	LTEXT "Size:", -1, 180, 10, 36, 10
+	CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 10, 20, 163, 74
+	LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+	LTEXT "&Font:", -1, 10, 105, 33, 10
+	CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+	LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+	GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
+	CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 16, 165, 95, 35
+	LTEXT "Each character is:", -1, 124, 166, 75, 10
+	LTEXT "screen pixel wide\nscreen pixel high", -1, 136, 180, 101, 20
+	LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
+	LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
 END
 
-IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-LTEXT "Window Preview", -1, 10, 7, 65, 10
-CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN |
SS_OWNERDRAW, 10, 20, 115, 70
-GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40
-LTEXT "&Width:", -1, 135, 30, 25, 10
-LTEXT "&Height:", -1, 135, 40, 25, 10
-EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-GROUPBOX "Window Size", -1, 130, 60, 115, 40
-LTEXT "&W&idth:", -1, 135, 70, 25, 10
-LTEXT "&H&eight:", -1, 135, 80, 25, 10
-EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-GROUPBOX "Window Position", -1, 130, 105, 115, 55
-LTEXT "&Left:", -1, 135, 120, 25, 10
-LTEXT "&Top:", -1, 135, 130, 25, 10
-EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135,
145, 100, 10
+	LTEXT "Window Preview:", -1, 8, 6, 95, 10
+	CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN |
SS_OWNERDRAW, 8, 16, 115, 70
+	GROUPBOX "Screen Buffer Size", -1, 130, 12, 115, 50
+	LTEXT "&Width:", -1, 140, 28, 40, 10
+	LTEXT "&Height:", -1, 140, 46, 39, 10
+	EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 25, 13, 14
+	EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 42, 13, 14
+	GROUPBOX "Window Size", -1, 130, 65, 115, 47
+	LTEXT "&W&idth:", -1, 140, 78, 39, 10
+	LTEXT "&H&eight:", -1, 140, 95, 37, 10
+	EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 75, 13, 14
+	EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 92, 13, 14
+	GROUPBOX "Window Position", -1, 130, 116, 115, 64
+	LTEXT "&Left:", -1, 140, 132, 38, 10
+	LTEXT "&Top:", -1, 140, 149, 40, 10
+	EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 128, 13, 14
+	EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 146, 13, 14
+	CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137,
165, 104, 10
 END
 
-IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Colors"
 FONT 8, "MS Shell Dlg"
 BEGIN
-CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90,
10
-CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10
-CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90,
10
-GROUPBOX "Selected Color Values", -1, 120, 15, 90, 45
-LTEXT "&Red:", -1, 125, 25, 30, 10
-EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10
-LTEXT "&Green:", -1, 125, 35, 30, 10
-EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10
-LTEXT "&Blue:", -1, 125, 45, 30, 10
-EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10
-CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 15, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 27, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 39, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 51, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 63, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 75, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 87, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 99, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 111, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 123, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 135, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 147, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 159, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 171, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 183, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 195, 90, 10, 10
-GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40
-CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 120, 180, 20
-GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40
-CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 165, 180, 20
+	CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
+	CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112,
10
+	CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
+	CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112,
10
+	GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73
+	LTEXT "&Red:", -1, 140, 25, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14
+	LTEXT "&Green:", -1, 140, 42, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14
+	LTEXT "&Blue:", -1, 140, 60, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14
+	CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 17, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 31, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 45, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 59, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 73, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 87, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 101, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 115, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 129, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 143, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 157, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 171, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 185, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 199, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 213, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 227, 90, 12, 12
+	GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40
+	CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 124, 224, 20
+	GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40
+	CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 176, 224, 20
 END
 
-IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
+IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Apply Properties"
 FONT 8, "MS Shell Dlg"
 BEGIN
-CONTROL "&Apply Properties to current window only",
IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 25, 25, 150, 10
-CONTROL "&Save Properties for future windows with same title",
IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 25, 40, 185, 10
-PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
-PUSHBUTTON "Cancel", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
+	CONTROL "&Apply Properties to current window only",
IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 12, 12, 207, 10
+	CONTROL "&Save Properties for future windows with same title",
IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 12, 31, 207, 10
+	PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
+	PUSHBUTTON "Cancel", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
 
 STRINGTABLE
 BEGIN
-  IDS_CPLNAME "Console"
-  IDS_CPLDESCRIPTION "Configures console properties."
-  IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-  IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM          <DIR>     10-01-99    
5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
-  IDS_RASTERFONTS "Raster Fonts"
+	IDS_CPLNAME "Console"
+	IDS_CPLDESCRIPTION "Configures console properties."
+	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
+	IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM          <DIR>     10-01-99    
5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
+	IDS_RASTERFONTS "Raster Fonts"
 END

Modified: trunk/reactos/dll/win32/console/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/console/lang/ru-RU.rc (original)
+++ trunk/reactos/dll/win32/console/lang/ru-RU.rc Fri Dec  7 20:05:46 2007
@@ -1,152 +1,143 @@
 // Russian language resource file (Dmitry Chapyshev, 2007-06-11)
-/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $
- *
- * PROJECT:         ReactOS Console Configuration DLL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            dll/win32/console/en.rc
- * PURPOSE:         English resource file
- * PROGRAMMERS:     Johannes Anderwald (johannes.anderwald(a)student.tugraz.at)
- */
+/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ */
 
 #include <commctrl.h>
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
-CAPTION "Íàñòðîéêà"
+CAPTION "Ïàðàìåòðû"
 FONT 8, "MS Shell Dlg"
 BEGIN
-GROUPBOX "Ðàçìåð êóðñîðà", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
-CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-GROUPBOX "Ýêðàí", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-GROUPBOX "Èñòîðèÿ êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
-LTEXT "&Ðàçìåð áóôåðà", -1, 25, 100, 60, 15
-EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12
-LTEXT "&×èñëî áóôåðîâ:", -1, 25, 120, 80, 15
-EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12
-CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 25,
140, 100, 15
-
-
-GROUPBOX "Ðåäàêòèðîâàíèå", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD |
WS_VISIBLE | WS_GROUP
-CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	GROUPBOX "Ðàçìåð êóðñîðà", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
+	CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
+	CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
+	CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
+	GROUPBOX "Ýêðàí", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
+	CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
+	GROUPBOX "Èñòîðèÿ êîìàíä", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE |
WS_GROUP
+	LTEXT "&Ðàçìåð áóôåðà:", -1, 14, 101, 60, 12
+	EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15
+	LTEXT "&×èñëî áóôåðîâ:", -1, 14, 124, 60, 12
+	EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15
+	CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 12,
140, 110, 15
+	GROUPBOX "Ðåäàêòèðîâàíèå", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD |
WS_VISIBLE | WS_GROUP
+	CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 140, 97, 102,
15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Øðèôò"
 FONT 8, "MS Shell Dlg"
 BEGIN
-LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10
-LTEXT "Ðàçìåð", -1, 130, 10, 30, 10
-CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 10, 20, 115, 70
-LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
-LTEXT "&Øðèôò", -1, 10, 105, 35, 10
-CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
-GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
-CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 165, 95, 35
-LTEXT "Êàæäûé ñèìâîë:", -1, 130, 165, 75, 10
-LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 140, 180, 65,
20
-LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+	LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 10, 10, 94, 10
+	LTEXT "Ðàçìåð:", -1, 180, 10, 36, 10
+	CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 10, 20, 163, 74
+	LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+	LTEXT "&Øðèôò:", -1, 10, 105, 33, 10
+	CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+	LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+	GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
+	CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 16, 165, 95, 35
+	LTEXT "Êàæäûé ñèìâîë:", -1, 124, 166, 75, 10
+	LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 136, 180,
101, 20
+	LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
+	LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
 END
 
-IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Ðàñêëàäêà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10
-CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN |
SS_OWNERDRAW, 10, 20, 115, 70
-GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 15, 115, 40
-LTEXT "&Øèðèíà:", -1, 135, 30, 25, 10
-LTEXT "&Âûñîòà:", -1, 135, 40, 25, 10
-EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-GROUPBOX "Ðàçìåð îêíà", -1, 130, 60, 115, 40
-LTEXT "Ø&èðèíà:", -1, 135, 70, 25, 10
-LTEXT "Â&ûñîòà:", -1, 135, 80, 25, 10
-EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-GROUPBOX "Window Position", -1, 130, 105, 115, 55
-LTEXT "&Îòñòóï:", -1, 135, 120, 25, 10
-LTEXT "&Âûñîòà:", -1, 135, 130, 25, 10
-EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
185, 30, 30, 10
-CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145,
100, 10
+	LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 8, 6, 95, 10
+	CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN |
SS_OWNERDRAW, 8, 16, 115, 70
+	GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 12, 115, 50
+	LTEXT "&Øèðèíà:", -1, 140, 28, 40, 10
+	LTEXT "&Âûñîòà:", -1, 140, 46, 39, 10
+	EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 25, 13, 14
+	EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 42, 13, 14
+	GROUPBOX "Ðàçìåð îêíà", -1, 130, 65, 115, 47
+	LTEXT "Ø&èðèíà:", -1, 140, 78, 39, 10
+	LTEXT "Â&ûñîòà:", -1, 140, 95, 37, 10
+	EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 75, 13, 14
+	EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 92, 13, 14
+	GROUPBOX "Ïîëîæåíèå îêíà", -1, 130, 116, 115, 64
+	LTEXT "&Îòñòóï:", -1, 140, 132, 38, 10
+	LTEXT "&Âûñîòà:", -1, 140, 149, 40, 10
+	EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 128, 13, 14
+	EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 146, 13, 14
+	CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 140, 165,
100, 10
 END
 
-IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
 CAPTION "Öâåòà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10
-CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10
-CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10
-GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 120, 15, 90, 45
-LTEXT "&Êðàñíûé:", -1, 125, 25, 30, 10
-EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10
-LTEXT "&Çåëåíûé:", -1, 125, 35, 30, 10
-EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10
-LTEXT "&Ãîëóáîé:", -1, 125, 45, 30, 10
-EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP
-CONTROL  "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10
-CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 15, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 27, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 39, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 51, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 63, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 75, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 87, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 99, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 111, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 123, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 135, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 147, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 159, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 171, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 183, 90, 10, 10
-CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 195, 90, 10, 10
-GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 10, 110, 200, 40
-CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 120, 180, 20
-GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 10, 155, 200, 40
-CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 165, 180, 20
+	CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
+	CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
+	CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
+	CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112,
10
+	GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 129, 7, 118, 73
+	LTEXT "&Êðàñíûé:", -1, 140, 25, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14
+	LTEXT "&Çåëåíûé:", -1, 140, 42, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14
+	LTEXT "&Ãîëóáîé:", -1, 140, 60, 48, 10
+	EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP
+	CONTROL  "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14
+	CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 17, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 31, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 45, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 59, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 73, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 87, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 101, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 115, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 129, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 143, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 157, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 171, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 185, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 199, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 213, 90, 12, 12
+	CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 227, 90, 12, 12
+	GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 7, 111, 240, 40
+	CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 124, 224, 20
+	GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 7, 162, 240, 40
+	CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 176, 224, 20
 END
 
-IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
+IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Ïðèìåíèòü ñâîéñòâà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà",
IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 25, 25, 150, 10
-CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì",
IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 25, 40, 185, 10
-PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
-PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
+	CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà",
IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 12, 12, 207, 10
+	CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì",
IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 12, 31, 207, 10
+	PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
+	PUSHBUTTON "Îòìåíà", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
 
 STRINGTABLE
 BEGIN
-  IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà"
-  IDS_CPLDESCRIPTION "Íàñòðîéêà Êîìàíäíîé ñòðîêè."
-  IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî"
-  IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM          <DIR>     10-01-99    
5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
-  IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû"
+	IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà"
+	IDS_CPLDESCRIPTION "Íàñòðîéêà êîìàíäíîé ñòðîêè."
+	IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî"
+	IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM          <DIR>     10-01-07    
5:00\nSYSTEM32      <DIR>     10-01-07     5:00"
+	IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû"
 END

Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/nls/rus.nls (original)
+++ trunk/reactos/dll/win32/kernel32/nls/rus.nls Fri Dec  7 20:05:46 2007
@@ -143,7 +143,7 @@
   LGRPID_JAPANESE+LGRPID_RES_BASE "ßïîíñêèé"
   LGRPID_KOREAN+LGRPID_RES_BASE "Êîðåéñêèé"
   LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé òðàäèöèîííûé"
-  LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîù¸ííûé"
+  LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîùåííûé"
   LGRPID_THAI+LGRPID_RES_BASE "Òàéñêèé"
   LGRPID_HEBREW+LGRPID_RES_BASE "Èâðèò"
   LGRPID_ARABIC+LGRPID_RES_BASE "Àðàáñêèé" 

Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Fri Dec  7 20:05:46 2007
@@ -72,7 +72,7 @@
 		MENUITEM "&Êîïèðîâàòü",         FCIDM_SHVIEW_COPY
 		MENUITEM SEPARATOR
 		MENUITEM "Ñîçäàòü &ÿðëûê",      FCIDM_SHVIEW_CREATELINK
-		MENUITEM "&Óäàëìòü",            FCIDM_SHVIEW_DELETE
+		MENUITEM "&Óäàëèòü",            FCIDM_SHVIEW_DELETE
 		MENUITEM "Ïåðåè&ìåíîâàòü",      FCIDM_SHVIEW_RENAME
 		MENUITEM SEPARATOR
 		MENUITEM "Ñâî&éñòâà",           FCIDM_SHVIEW_PROPERTIES
@@ -239,7 +239,7 @@
 	LTEXT "Àâòîðñêèå ïðàâà: ", 14004, 10, 46, 66, 10
 	LTEXT "", 14005, 77, 46, 152, 10
 	GROUPBOX "Äîïîëíèòåëüíûå ñâåäåíèÿ: ", 14006, 6, 70, 222, 115
-	LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 50, 10
+	LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 63, 10
 	LTEXT "Çíà÷åíèå: ", 14008, 112, 82, 45, 10
 	LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
 	EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP |
ES_MULTILINE | ES_READONLY