[CONSOLE.CPL]: Harmonize most of the resources (sizes of dialog controls for some...

To translators: Please check that I haven't broken any translations! :)
CORE-13182

svn path=/trunk/; revision=74465

diff --git a/reactos/dll/cpl/console/lang/bg-BG.rc b/reactos/dll/cpl/console/lang/bg-BG.rc
index 0582758..e97d9eb 100644 (file)
--- a/reactos/dll/cpl/console/lang/bg-BG.rc
+++ b/reactos/dll/cpl/console/lang/bg-BG.rc
@@ -5,27 +5,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Настройки"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Размер на показалеца", -1, 7, 7, 130, 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, 143, 7, 130, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Прозорец", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 20, 70, 10
-    CONTROL "&Цял екран", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 40, 70, 10
-    GROUPBOX "Дневник на заповедите", -1, 7, 85, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "Размер на &буфера", -1, 14, 101, 70, 12
+    GROUPBOX "Размер на показалеца", IDC_STATIC, 7, 7, 130, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Малък", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Среден", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Голям", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Настройки на екрана", IDC_STATIC, 143, 7, 130, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Прозорец", IDC_RADIO_DISPLAY_WINDOW, 152, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Цял екран", IDC_RADIO_DISPLAY_FULL, 152, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Дневник на заповедите", IDC_STATIC, 7, 85, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Размер на &буфера", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Брой буфери", -1, 14, 124, 70, 12
+    LTEXT "&Брой буфери", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "Пре&махване на старите бройки", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 120, 15
-    GROUPBOX "Промяна на настройките", -1, 143, 85, 130, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Режим &бърза обработка", IDC_CHECK_QUICK_EDIT, 150, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Режим &вмъкване", IDC_CHECK_INSERT_MODE, 150, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "Пре&махване на старите бройки", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 120, 15
+    GROUPBOX "Промяна на настройките", IDC_STATIC, 143, 85, 130, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Режим &бърза обработка", IDC_CHECK_QUICK_EDIT, 150, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Режим &вмъкване", IDC_CHECK_INSERT_MODE, 150, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -34,19 +34,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Шрифт"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Шрифт:", -1, 10, 105, 33, 10
-    CHECKBOX "&Получери шрифтове", IDC_CHECK_BOLD_FONTS, 38, 105, 85, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "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
+    LTEXT "Прозоречен преглед:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Размер:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Шрифт:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Получери шрифтове", IDC_CHECK_BOLD_FONTS, 38, 105, 85, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Всеки знак е:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "screen pixel wide\nscreen pixel high", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 273, 230
@@ -54,36 +57,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Подредба"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Прозоречен преглед", -1, 8, 6, 105, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Размер на екранния буфер", -1, 130, 12, 135, 50
-    LTEXT "&Ширина:", -1, 140, 28, 40, 10
-    LTEXT "&Височина:", -1, 140, 46, 39, 10
+    LTEXT "Прозоречен преглед:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Размер на екранния буфер", IDC_STATIC, 130, 12, 135, 50
+    LTEXT "&Ширина:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Височина:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Размер на прозореца", -1, 130, 65, 135, 47
-    LTEXT "&Ш&ирина:", -1, 140, 78, 39, 10
-    LTEXT "&Ви&сочина:", -1, 140, 95, 37, 10
+    GROUPBOX "Размер на прозореца", IDC_STATIC, 130, 65, 135, 47
+    LTEXT "&Ш&ирина:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "&Ви&сочина:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Положение на прозореца", -1, 130, 116, 135, 64
-    LTEXT "От&ляво:", -1, 140, 132, 38, 10
-    LTEXT "От&горе:", -1, 140, 149, 40, 10
+    GROUPBOX "Положение на прозореца", IDC_STATIC, 130, 116, 135, 64
+    LTEXT "От&ляво:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "От&горе:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "Уредбата на&мества прозореца", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 118, 10
+    AUTOCHECKBOX "Уредбата на&мества прозореца", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 118, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -91,24 +94,20 @@ STYLE DS_SHELLFONT | 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, 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 "Selected Color Components", -1, 129, 7, 118, 73
-    LTEXT "&Червено:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "Екранен &текст", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Екранна под&цветка", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Из&скачащ текст", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Изскачаща под&цветка", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Червено:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Зелено:", -1, 140, 42, 48, 10
+    LTEXT "&Зелено:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Синьо:", -1, 140, 60, 48, 10
+    LTEXT "&Синьо:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -128,10 +127,10 @@ BEGIN
     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 "Preview (Screen)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 265, 79
@@ -139,10 +138,8 @@ STYLE DS_SHELLFONT | 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, 12, 12, 207, 10
-    CONTROL "Прилагане на свойствата за бъдещи прозорци със същото заглавие", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 247, 10
+    AUTORADIOBUTTON "Прилагане на свойствата само за &текущия прозорец", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Прилагане на свойствата за бъдещи прозорци със същото заглавие", IDC_RADIO_APPLY_ALL, 12, 31, 247, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Добре", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Отказ", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -153,4 +150,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Настройка на конзолата."
     IDS_APPLY_SHORTCUT_ALL "Промяна на &препратката, запуснала този прозорец"
     IDS_RASTERFONTS "Решетъчни шрифтове"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/cs-CZ.rc b/reactos/dll/cpl/console/lang/cs-CZ.rc
index 289dc98..1de0de3 100644 (file)
--- a/reactos/dll/cpl/console/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/console/lang/cs-CZ.rc
@@ -11,27 +11,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Možnosti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Velikost kurzoru", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Malá", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Střední", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Velká", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Možnosti zobrazení", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Okno", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "&Celá obrazovka", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Historie příkazů", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Velikost paměti:", -1, 14, 101, 70, 12
+    GROUPBOX "Velikost kurzoru", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Malá", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Střední", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Velká", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Možnosti zobrazení", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Okno", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Celá obrazovka", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Historie příkazů", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Velikost paměti:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Počet pamětí:", -1, 14, 124, 70, 12
+    LTEXT "&Počet pamětí:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Zahodit staré duplikáty", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Možnosti úprav", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Režim &rychlých úprav", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Režim v&kládání", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Zahodit staré duplikáty", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Možnosti úprav", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Režim &rychlých úprav", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Režim v&kládání", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -40,19 +40,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Písmo"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Náhled okna:", -1, 10, 10, 94, 10
-    LTEXT "Velikost:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Písmo:", -1, 10, 105, 33, 10
-    CHECKBOX "&Tučná písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Každý znak je:", -1, 124, 166, 75, 10
-    LTEXT "obrazovkových pixelů široký\nobrazovkových pixelů vysoků", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Náhled okna:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Velikost:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Písmo:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Tučná písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Každý znak je:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "obrazovkových pixelů široký\nobrazovkových pixelů vysoký", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -60,36 +63,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Vzhled"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Náhled okna:", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Velikost paměti zobrazení", -1, 130, 12, 115, 50
-    LTEXT "&Šířka:", -1, 140, 28, 40, 10
-    LTEXT "&Výška:", -1, 140, 46, 39, 10
+    LTEXT "Náhled okna:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Velikost paměti zobrazení", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Šířka:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Výška:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Velikost okna", -1, 130, 65, 115, 47
-    LTEXT "Š&ířka:", -1, 140, 78, 39, 10
-    LTEXT "V&ýška:", -1, 140, 95, 37, 10
+    GROUPBOX "Velikost okna", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "Š&ířka:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "V&ýška:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Umístění okna", -1, 130, 116, 115, 64
-    LTEXT "&Zleva:", -1, 140, 132, 38, 10
-    LTEXT "&Shora:", -1, 140, 149, 40, 10
+    GROUPBOX "Umístění okna", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Zleva:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Shora:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Okno je umístěno systémem", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "&Okno je umístěno systémem", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -97,24 +100,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Barvy"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Text zobrazení", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
-    CONTROL "Pozadí zo&brazení", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
-    CONTROL "Text &výběru", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-    CONTROL "Pozadí vý&běru", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "Zvolené barevné složky", -1, 129, 7, 118, 73
-    LTEXT "Če&rvená:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "&Text zobrazení", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pozadí zo&brazení", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Text &výběru", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pozadí vý&běru", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Zvolené barevné složky", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "Če&rvená:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "Zele&ná:", -1, 140, 42, 48, 10
+    LTEXT "Zele&ná:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Modrá:", -1, 140, 60, 48, 10
+    LTEXT "&Modrá:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -134,10 +133,10 @@ BEGIN
     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 "Náhled (obrazovka)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Náhled (místní nabídka)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Náhled (obrazovka)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Náhled (místní nabídka)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -145,10 +144,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Použít vlastnosti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Použít vlastnosti jen pro toto okno", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Uložit vlastnosti pro každé další budoucí okno s tímto názvem", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Použít vlastnosti jen pro toto okno", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Uložit vlastnosti pro každé další budoucí okno s tímto názvem", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Storno", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -159,4 +156,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole."
     IDS_APPLY_SHORTCUT_ALL "Změnit zá&stupce, který spustil toto okno"
     IDS_RASTERFONTS "Rastrová písma"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/de-DE.rc b/reactos/dll/cpl/console/lang/de-DE.rc
index 14ad72e..0f3b68d 100644 (file)
--- a/reactos/dll/cpl/console/lang/de-DE.rc
+++ b/reactos/dll/cpl/console/lang/de-DE.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Optionen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Cursorgröße", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Klein", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-    CONTROL "&Mittel", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-    CONTROL "&Groß", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-    GROUPBOX "Anzeigeeinstellungen", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Fenster", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-    CONTROL "V&ollbild", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-    GROUPBOX "Befehlsspeicher:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Puffergröße", -1, 25, 100, 60, 15
+    GROUPBOX "Cursorgröße", IDC_STATIC, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Klein", IDC_RADIO_SMALL_CURSOR, 25, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Mittel", IDC_RADIO_MEDIUM_CURSOR, 25, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Groß", IDC_RADIO_LARGE_CURSOR, 25, 55, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Anzeigeeinstellungen", IDC_STATIC, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Fenster", IDC_RADIO_DISPLAY_WINDOW, 150, 35, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "V&ollbild", IDC_RADIO_DISPLAY_FULL, 150, 50, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Befehlsspeicher:", IDC_STATIC, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Puffergröße", IDC_STATIC, 25, 100, 60, 15
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 100, 12, 12
-    LTEXT "P&ufferanzahl:", -1, 25, 120, 80, 15
+    LTEXT "P&ufferanzahl:", IDC_STATIC, 25, 120, 80, 15
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 120, 12, 12
-    CHECKBOX "&Alte Duplikate löschen", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
-    GROUPBOX "Bearbeitungsoptionen", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "&QuickEdit-Modus", IDC_CHECK_QUICK_EDIT, 150, 100, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "&Einfügemodus", IDC_CHECK_INSERT_MODE, 150, 120, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Alte Duplikate löschen", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
+    GROUPBOX "Bearbeitungsoptionen", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&QuickEdit-Modus", IDC_CHECK_QUICK_EDIT, 150, 100, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Einfügemodus", IDC_CHECK_INSERT_MODE, 150, 120, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Schrift"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Fenstervorschau", -1, 10, 7, 65, 10
-    LTEXT "Größe", -1, 130, 10, 30, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
-    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Schrift", -1, 10, 105, 35, 10
-    CHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | 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 "Jedes Zeichen ist:", -1, 130, 165, 75, 10
-    LTEXT "Bildschirmpixel breit\nBildschirmpixel hoch", -1, 140, 180, 65, 20
-    LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+    LTEXT "Fenstervorschau:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Größe:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Schrift", IDC_STATIC, 10, 105, 35, 10
+    AUTOCHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Jedes Zeichen ist:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "Bildschirmpixel breit\nBildschirmpixel hoch", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Fenstervorschau", -1, 10, 7, 65, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70
-    GROUPBOX "Fensterpuffergröße", -1, 130, 15, 115, 40
-    LTEXT "&Breite:", -1, 135, 30, 25, 10
-    LTEXT "&Höhe:", -1, 135, 40, 25, 10
+    LTEXT "Fenstervorschau:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Fensterpuffergröße", IDC_STATIC, 130, 15, 115, 40
+    LTEXT "&Breite:", IDC_STATIC, 135, 30, 25, 10
+    LTEXT "&Höhe:", IDC_STATIC, 135, 40, 25, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Fenstergröße", -1, 130, 60, 115, 40
-    LTEXT "B&reite:", -1, 135, 70, 25, 10
-    LTEXT "H&öhe:", -1, 135, 80, 25, 10
+    GROUPBOX "Fenstergröße", IDC_STATIC, 130, 60, 115, 40
+    LTEXT "B&reite:", IDC_STATIC, 135, 70, 25, 10
+    LTEXT "H&öhe:", IDC_STATIC, 135, 80, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Fensterposition", -1, 130, 105, 115, 55
-    LTEXT "&Links:", -1, 135, 120, 25, 10
-    LTEXT "&Oben:", -1, 135, 130, 25, 10
+    GROUPBOX "Fensterposition", IDC_STATIC, 130, 105, 115, 55
+    LTEXT "&Links:", IDC_STATIC, 135, 120, 25, 10
+    LTEXT "&Oben:", IDC_STATIC, 135, 130, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    CHECKBOX "&Automatisch", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
+    AUTOCHECKBOX "&Automatisch", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Farben"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Fenster&text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-    CONTROL "Fenster&hintergrund", 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&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10
-    GROUPBOX "Farbkomponenten", -1, 120, 15, 90, 45
-    LTEXT "&Rot:", -1, 125, 25, 30, 10
+    AUTORADIOBUTTON "Fenster&text", IDC_RADIO_SCREEN_TEXT, 15, 15, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Fenster&hintergrund", IDC_RADIO_SCREEN_BACKGROUND, 15, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Text", IDC_RADIO_POPUP_TEXT, 15, 35, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, 15, 45, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Farbkomponenten", IDC_STATIC, 120, 15, 90, 45
+    LTEXT "&Rot:", IDC_STATIC, 125, 25, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10
-    LTEXT "&Grün:", -1, 125, 35, 30, 10
+    LTEXT "&Grün:", IDC_STATIC, 125, 35, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10
-    LTEXT "&Blau:", -1, 125, 45, 30, 10
+    LTEXT "&Blau:", IDC_STATIC, 125, 45, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 45, 30, 10
@@ -130,10 +129,10 @@ BEGIN
     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 "Fenstervorschau", -1, 10, 110, 200, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20
-    GROUPBOX "Popupvorschau", -1, 10, 155, 200, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20
+    GROUPBOX "Fenstervorschau", IDC_STATIC, 10, 110, 200, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Popupvorschau", IDC_STATIC, 10, 155, 200, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Eigenschaften übernehmen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Eigenschaften gelten nur für aktuelles Fenster", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 185, 10
-    CONTROL "&Eigenschaften gelten für alle Fenster mit gleichem Titel", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10
+    AUTORADIOBUTTON "&Eigenschaften gelten nur für aktuelles Fenster", IDC_RADIO_APPLY_CURRENT, 25, 25, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Eigenschaften gelten für alle Fenster mit gleichem Titel", IDC_RADIO_APPLY_ALL, 25, 40, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
     PUSHBUTTON "Abbrechen", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konfiguriert die Konsoleneigenschaften."
     IDS_APPLY_SHORTCUT_ALL "Modifiziere die &Verknüpfung, die das Fenster startete"
     IDS_RASTERFONTS "Rasterschriften"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/en-US.rc b/reactos/dll/cpl/console/lang/en-US.rc
index a20e2c6..464d862 100644 (file)
--- a/reactos/dll/cpl/console/lang/en-US.rc
+++ b/reactos/dll/cpl/console/lang/en-US.rc
@@ -5,27 +5,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Buffer Size:", -1, 14, 101, 70, 12
+    GROUPBOX "Cursor Size", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Small", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Medium", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Large", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Display Options", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Window", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "F&ull Screen", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Command History", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Buffer Size:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12
+    LTEXT "&Number of Buffers:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Edit Options", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -34,19 +34,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Font:", -1, 10, 105, 33, 10
-    CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "Window Preview:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Size:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Font:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Each character is:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "screen pixel wide\nscreen pixel high", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -54,36 +57,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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
+    LTEXT "Window Preview:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Screen Buffer Size", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Width:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Height:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
+    GROUPBOX "Window Size", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "&W&idth:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "&H&eight:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
+    GROUPBOX "Window Position", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Left:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Top:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -91,24 +94,20 @@ STYLE DS_SHELLFONT | 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, 10, 12, 90, 10
-    CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "Selected Color Components", -1, 105, 6, 140, 60
-    LTEXT "&Red:", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "Screen &Text", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Text", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "&Red:", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "&Green:", -1, 135, 34, 30, 10
+    LTEXT "&Green:", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "&Blue:", -1, 135, 50, 30, 10
+    LTEXT "&Blue:", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -128,10 +127,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "Preview (Screen)", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -139,10 +138,8 @@ STYLE DS_SHELLFONT | 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, 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
+    AUTORADIOBUTTON "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Cancel", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -153,4 +150,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configures console properties."
     IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
     IDS_RASTERFONTS "Raster Fonts"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/es-ES.rc b/reactos/dll/cpl/console/lang/es-ES.rc
index f5c0450..06e3a09 100644 (file)
--- a/reactos/dll/cpl/console/lang/es-ES.rc
+++ b/reactos/dll/cpl/console/lang/es-ES.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opciones"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Tamaño del Cursor", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Pequeño", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-    CONTROL "&Mediano", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-    CONTROL "&Grande", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-    GROUPBOX "Mostrar Opciones", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Ventana", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-    CONTROL "&Pantalla Completa", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-    GROUPBOX "Historial de Comandos:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "Tamaño del &Búfer", -1, 25, 100, 60, 15
+    GROUPBOX "Tamaño del Cursor", IDC_STATIC, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Pequeño", IDC_RADIO_SMALL_CURSOR, 25, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Mediano", IDC_RADIO_MEDIUM_CURSOR, 25, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Grande", IDC_RADIO_LARGE_CURSOR, 25, 55, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Mostrar Opciones", IDC_STATIC, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Ventana", IDC_RADIO_DISPLAY_WINDOW, 150, 35, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Pantalla Completa", IDC_RADIO_DISPLAY_FULL, 150, 50, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Historial de Comandos:", IDC_STATIC, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Tamaño del &Búfer", IDC_STATIC, 25, 100, 60, 15
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 100, 12, 12
-    LTEXT "&Númbero de Búfers:", -1, 25, 120, 80, 15
+    LTEXT "&Númbero de Búfers:", IDC_STATIC, 25, 120, 80, 15
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 120, 12, 12
-    CHECKBOX "&Descartar Viejos Duplicados", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
-    GROUPBOX "Editar Opciones", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Modo &Edición rápida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Modo &Insertar", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Descartar Viejos Duplicados", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
+    GROUPBOX "Editar Opciones", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Modo &Edición rápida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Modo &Insertar", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Fuente"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10
-    LTEXT "Tamaño", -1, 130, 10, 30, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
-    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Fuente", -1, 10, 105, 35, 10
-    CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | 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 "Cada caracter es:", -1, 130, 165, 75, 10
-    LTEXT "anchura del pixel\naltura del pixel", -1, 140, 180, 65, 20
-    LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+    LTEXT "Ventana de Previsualización:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Tamaño:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Fuente", IDC_STATIC, 10, 105, 35, 10
+    AUTOCHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Cada caracter es:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "anchura del pixel\naltura del pixel", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Disposición"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70
-    GROUPBOX "Tamaño del Búfer de Pantalla", -1, 130, 15, 115, 40
-    LTEXT "&Anchura:", -1, 135, 30, 25, 10
-    LTEXT "A&ltura:", -1, 135, 40, 25, 10
+    LTEXT "Ventana de Previsualización:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Tamaño del Búfer de Pantalla", IDC_STATIC, 130, 15, 115, 40
+    LTEXT "&Anchura:", IDC_STATIC, 135, 30, 25, 10
+    LTEXT "A&ltura:", IDC_STATIC, 135, 40, 25, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Tamaño de la Ventana", -1, 130, 60, 115, 40
-    LTEXT "&A&nchura:", -1, 135, 70, 25, 10
-    LTEXT "A&l&tura:", -1, 135, 80, 25, 10
+    GROUPBOX "Tamaño de la Ventana", IDC_STATIC, 130, 60, 115, 40
+    LTEXT "&A&nchura:", IDC_STATIC, 135, 70, 25, 10
+    LTEXT "A&l&tura:", IDC_STATIC, 135, 80, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Posición de la Ventana", -1, 130, 105, 115, 55
-    LTEXT "&Izquierda:", -1, 135, 120, 25, 10
-    LTEXT "&Arriba:", -1, 135, 130, 25, 10
+    GROUPBOX "Posición de la Ventana", IDC_STATIC, 130, 105, 115, 55
+    LTEXT "&Izquierda:", IDC_STATIC, 135, 120, 25, 10
+    LTEXT "&Arriba:", IDC_STATIC, 135, 130, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    CHECKBOX "Deje la &posición de ventana del sistema", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
+    AUTOCHECKBOX "Deje la &posición de ventana del sistema", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Colores"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Texto Pantalla", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-    CONTROL "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10
-    CONTROL "Texto &Emergente", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10
-    CONTROL "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10
-    GROUPBOX "Componentes de Color Seleccionados", -1, 120, 15, 90, 45
-    LTEXT "&Rojo:", -1, 125, 25, 30, 10
+    AUTORADIOBUTTON "&Texto Pantalla", IDC_RADIO_SCREEN_TEXT, 15, 15, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, 15, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Texto &Emergente", IDC_RADIO_POPUP_TEXT, 15, 35, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, 15, 45, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Componentes de Color Seleccionados", IDC_STATIC, 120, 15, 90, 45
+    LTEXT "&Rojo:", IDC_STATIC, 125, 25, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10
-    LTEXT "&Verde:", -1, 125, 35, 30, 10
+    LTEXT "&Verde:", IDC_STATIC, 125, 35, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10
-    LTEXT "&Azul:", -1, 125, 45, 30, 10
+    LTEXT "&Azul:", IDC_STATIC, 125, 45, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 45, 30, 10
@@ -130,10 +129,10 @@ BEGIN
     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 "Previsualización (Pantalla)", -1, 10, 110, 200, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20
-    GROUPBOX "Previsualización (Emergente)", -1, 10, 155, 200, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20
+    GROUPBOX "Previsualización (Pantalla)", IDC_STATIC, 10, 110, 200, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Previsualización (Emergente)", IDC_STATIC, 10, 155, 200, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Aplicar Propiedades"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Aplicar propiedades sólo a la ventana actual", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10
-    CONTROL "&Guardar propiedades para futuras ventanas con el mismo título", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10
+    AUTORADIOBUTTON "&Aplicar propiedades sólo a la ventana actual", IDC_RADIO_APPLY_CURRENT, 25, 25, 150, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Guardar propiedades para futuras ventanas con el mismo título", IDC_RADIO_APPLY_ALL, 25, 40, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Aceptar", IDOK, 25, 80, 40, 15, WS_VISIBLE
     PUSHBUTTON "Cancelar", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configurar propiedades de la consola."
     IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana"
     IDS_RASTERFONTS "Fuentes Raster"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/fr-FR.rc b/reactos/dll/cpl/console/lang/fr-FR.rc
index 6e64754..97a2f93 100644 (file)
--- a/reactos/dll/cpl/console/lang/fr-FR.rc
+++ b/reactos/dll/cpl/console/lang/fr-FR.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Taille du curseur", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Petit", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Moyen", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Grand", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Options d'affichage", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Fenêtre", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "P&lein écran", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Historique des commandes", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "Taille du &buffer :", -1, 14, 101, 70, 12
+    GROUPBOX "Taille du curseur", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Petit", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Moyen", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Grand", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Options d'affichage", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Fenêtre", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "P&lein écran", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Historique des commandes", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Taille du &buffer :", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Nombre de buffers :", -1, 14, 124, 70, 12
+    LTEXT "&Nombre de buffers :", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Supprimer les doublons", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Options d'édition", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "M&ode d'édition rapide", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Page de codes", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Supprimer les doublons", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Options d'édition", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "M&ode d'édition rapide", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Page de codes", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Police"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Fenêtre de Prévisualisation :", -1, 10, 10, 94, 10
-    LTEXT "Taille :", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Police :", -1, 10, 105, 33, 10
-    CHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Chaque caractère utilise :", -1, 124, 166, 85, 10
-    LTEXT "pixels en largeur\npixels en hauteur", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Fenêtre de Prévisualisation :", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Taille :", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Police :", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Chaque caractère utilise :", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "pixels en largeur\npixels en hauteur", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Disposition"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Fenêtre de Prévisualisation :", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Taille du buffer de l'écran", -1, 130, 12, 115, 50
-    LTEXT "&Largeur :", -1, 140, 28, 40, 10
-    LTEXT "&Hauteur :", -1, 140, 46, 39, 10
+    LTEXT "Fenêtre de Prévisualisation :", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Taille du buffer de l'écran", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Largeur :", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Hauteur :", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Taille de la fenêtre", -1, 130, 65, 115, 47
-    LTEXT "L&argeur :", -1, 140, 78, 39, 10
-    LTEXT "Ha&uteur :", -1, 140, 95, 37, 10
+    GROUPBOX "Taille de la fenêtre", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "L&argeur :", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "Ha&uteur :", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Position de la Fenêtre", -1, 130, 116, 115, 64
-    LTEXT "&Gauche :", -1, 140, 132, 38, 10
-    LTEXT "&En haut :", -1, 140, 149, 40, 10
+    GROUPBOX "Position de la Fenêtre", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Gauche :", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&En haut :", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Positionnée par le système", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "&Positionnée par le système", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Couleurs"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Texte (Écran)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
-    CONTROL "Arr&ière-plan (Écran)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "T&exte (Popup)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "Arrière-pla&n (Popup)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "Composantes de la couleur sélectionnée", -1, 105, 6, 140, 60
-    LTEXT "&Rouge :", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "&Texte (Écran)", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Arr&ière-plan (Écran)", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "T&exte (Popup)", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Arrière-pla&n (Popup)", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Composantes de la couleur sélectionnée", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "&Rouge :", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "&Vert :", -1, 135, 34, 30, 10
+    LTEXT "&Vert :", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "&Bleu :", -1, 135, 50, 30, 10
+    LTEXT "&Bleu :", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -130,10 +129,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "Aperçu (Écran)", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "Aperçu (Popup)", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "Aperçu (Écran)", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "Aperçu (Popup)", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Appliquer propriétés"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Appliquer les propriétés à la fenêtre actuelle seulement", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Enregistrer les propriétés pour les prochaines fenêtres avec le même titre", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Appliquer les propriétés à la fenêtre actuelle seulement", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Enregistrer les propriétés pour les prochaines fenêtres avec le même titre", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Annuler", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configurer les propriétés de la console."
     IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
     IDS_RASTERFONTS "Polices Raster"
+    IDS_GROUPBOX_FONT_NAME "Police sélectionnée : "
 END

diff --git a/reactos/dll/cpl/console/lang/he-IL.rc b/reactos/dll/cpl/console/lang/he-IL.rc
index 15cfb8b..89d1f17 100644 (file)
--- a/reactos/dll/cpl/console/lang/he-IL.rc
+++ b/reactos/dll/cpl/console/lang/he-IL.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "אפשרויות"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "גודל מתווך:", -1, 14, 101, 70, 12
+    GROUPBOX "גודל סמן", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "קטן", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "בינוני", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "גדול", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "אפשרויות תצוגה", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "חלון", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "מסך מלא", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "היסטוריית פקודות:", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "גודל מתווך:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "מספר המתווכים:", -1, 14, 124, 70, 12
+    LTEXT "מספר המתווכים:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "אפשרויות עריכה", -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
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "אפשרויות עריכה", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "גופן"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "גופן:", -1, 10, 105, 33, 10
-    CHECKBOX "גופנים מודגשים", IDC_CHECK_BOLD_FONTS, 41, 105, 33, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "תצוגה מקדימה:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "גודל:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "גופן:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "גופנים מודגשים", IDC_CHECK_BOLD_FONTS, 41, 105, 33, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Each character is:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "screen pixel wide\nscreen pixel high", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "תצורה"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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
+    LTEXT "תצוגה מקדימה:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "גודל מתווך המסך", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "רוחב:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "גובה:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "גודל חלון", -1, 130, 65, 115, 47
-    LTEXT "רוחב:", -1, 140, 78, 39, 10
-    LTEXT "גובה:", -1, 140, 95, 37, 10
+    GROUPBOX "גודל חלון", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "רוחב:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "גובה:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "מיקום החלון", -1, 130, 116, 115, 64
-    LTEXT "שמאל:", -1, 140, 132, 38, 10
-    LTEXT "עליון:", -1, 140, 149, 40, 10
+    GROUPBOX "מיקום החלון", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "שמאל:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "עליון:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "תן למערכת למקם את החלון.", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "תן למערכת למקם את החלון.", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "צבעים"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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 Components", -1, 129, 7, 118, 73
-    LTEXT "אדום:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "Screen &Text", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Text", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "אדום:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "ירוק:", -1, 140, 42, 48, 10
+    LTEXT "ירוק:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "כחול:", -1, 140, 60, 48, 10
+    LTEXT "כחול:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -130,10 +129,10 @@ BEGIN
     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 "Preview (Screen)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | 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, 12, 12, 207, 10
-    CONTROL "שמור שינויים לחלונות עם אותה כותרת", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "החל מאפיינים לחלון הנוכחי בלבד", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "שמור שינויים לחלונות עם אותה כותרת", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "אישור", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "ביטול", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configures console properties."
     IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
     IDS_RASTERFONTS "גופני מפת סיביות"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/id-ID.rc b/reactos/dll/cpl/console/lang/id-ID.rc
index 111ebff..0790425 100644 (file)
--- a/reactos/dll/cpl/console/lang/id-ID.rc
+++ b/reactos/dll/cpl/console/lang/id-ID.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opsi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Ukuran kursor", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Kecil", 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 "&Besar", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-    GROUPBOX "Opsi Tampilan", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Jendela", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-    CONTROL "Layar Pen&uh", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-    GROUPBOX "Histori Perintah:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "Ukuran Bu&fer", -1, 25, 100, 60, 15
+    GROUPBOX "Ukuran kursor", IDC_STATIC, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Kecil", IDC_RADIO_SMALL_CURSOR, 25, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Medium", IDC_RADIO_MEDIUM_CURSOR, 25, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Besar", IDC_RADIO_LARGE_CURSOR, 25, 55, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Opsi Tampilan", IDC_STATIC, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Jendela", IDC_RADIO_DISPLAY_WINDOW, 150, 35, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Layar Pen&uh", IDC_RADIO_DISPLAY_FULL, 150, 50, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Histori Perintah:", IDC_STATIC, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Ukuran Bu&fer", IDC_STATIC, 25, 100, 60, 15
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 100, 12, 12
-    LTEXT "Ju&mlah Bufer:", -1, 25, 120, 80, 15
+    LTEXT "Ju&mlah Bufer:", IDC_STATIC, 25, 120, 80, 15
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 120, 12, 12
-    CHECKBOX "Abaikan &Duplikasi Lama", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
-    GROUPBOX "Opsi Edit", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Mode Edit&Cepat", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Mode S&isip", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "Abaikan &Duplikasi Lama", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
+    GROUPBOX "Opsi Edit", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Mode Edit&Cepat", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Mode S&isip", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Tinjauan Jendela", -1, 10, 7, 65, 10
-    LTEXT "Ukuran", -1, 130, 10, 30, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
-    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Font", -1, 10, 105, 35, 10
-    CHECKBOX "Font &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | 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 "Setiap karakter adalah:", -1, 130, 165, 75, 10
-    LTEXT "lebar pixel layar\ntinggi pixel layar", -1, 140, 180, 65, 20
-    LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+    LTEXT "Tinjauan Jendela:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Ukuran:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Font", IDC_STATIC, 10, 105, 35, 10
+    AUTOCHECKBOX "Font &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Setiap karakter adalah:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "lebar pixel layar\ntinggi pixel layar", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Tata Letak"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Tinjauan Jendela", -1, 10, 7, 65, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70
-    GROUPBOX "Ukuran Bufer Layar", -1, 130, 15, 115, 40
-    LTEXT "&Panjang:", -1, 135, 30, 25, 10
-    LTEXT "&Tinggi:", -1, 135, 40, 25, 10
+    LTEXT "Tinjauan Jendela:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Ukuran Bufer Layar", IDC_STATIC, 130, 15, 115, 40
+    LTEXT "&Panjang:", IDC_STATIC, 135, 30, 25, 10
+    LTEXT "&Tinggi:", IDC_STATIC, 135, 40, 25, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Ukuran Jendela", -1, 130, 60, 115, 40
-    LTEXT "P&anjang:", -1, 135, 70, 25, 10
-    LTEXT "T&inggi:", -1, 135, 80, 25, 10
+    GROUPBOX "Ukuran Jendela", IDC_STATIC, 130, 60, 115, 40
+    LTEXT "P&anjang:", IDC_STATIC, 135, 70, 25, 10
+    LTEXT "T&inggi:", IDC_STATIC, 135, 80, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Posisi Jendela", -1, 130, 105, 115, 55
-    LTEXT "&Kiri:", -1, 135, 120, 25, 10
-    LTEXT "&Atas:", -1, 135, 130, 25, 10
+    GROUPBOX "Posisi Jendela", IDC_STATIC, 130, 105, 115, 55
+    LTEXT "&Kiri:", IDC_STATIC, 135, 120, 25, 10
+    LTEXT "&Atas:", IDC_STATIC, 135, 130, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    CHECKBOX "Biarkan jendela &posisi sistem", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
+    AUTOCHECKBOX "Biarkan jendela &posisi sistem", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Warna"
 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 Components", -1, 120, 15, 90, 45
-    LTEXT "&Merah:", -1, 125, 25, 30, 10
+    AUTORADIOBUTTON "Screen &Text", IDC_RADIO_SCREEN_TEXT, 15, 15, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, 15, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Text", IDC_RADIO_POPUP_TEXT, 15, 35, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, 15, 45, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 120, 15, 90, 45
+    LTEXT "&Merah:", IDC_STATIC, 125, 25, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10
-    LTEXT "&Hijau:", -1, 125, 35, 30, 10
+    LTEXT "&Hijau:", IDC_STATIC, 125, 35, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10
-    LTEXT "&Biru:", -1, 125, 45, 30, 10
+    LTEXT "&Biru:", IDC_STATIC, 125, 45, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 45, 30, 10
@@ -130,10 +129,10 @@ BEGIN
     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 "Preview (Screen)", -1, 10, 110, 200, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20
-    GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 10, 110, 200, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 10, 155, 200, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Terapkan Properti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Ter&apkan Properti hanya ke jendela saat ini", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10
-    CONTROL "&Simpan Properti untuk jendela nanti dengan judul sama", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10
+    AUTORADIOBUTTON "Ter&apkan Properti hanya ke jendela saat ini", IDC_RADIO_APPLY_CURRENT, 25, 25, 150, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Simpan Properti untuk jendela nanti dengan judul sama", IDC_RADIO_APPLY_ALL, 25, 40, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
     PUSHBUTTON "Batal", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konfigurasi properti konsol."
     IDS_APPLY_SHORTCUT_ALL "Modifikasi &jalan pintas yang memulai jendela ini"
     IDS_RASTERFONTS "Font Raster"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/it-IT.rc b/reactos/dll/cpl/console/lang/it-IT.rc
index 715d212..611d9a6 100644 (file)
--- a/reactos/dll/cpl/console/lang/it-IT.rc
+++ b/reactos/dll/cpl/console/lang/it-IT.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opzioni"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dimensione del cursore", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Piccolo", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-    CONTROL "&Medio", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-    CONTROL "&Largo", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-    GROUPBOX "Opzioni dello schermo", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Finestra", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-    CONTROL "&Tutto lo schermo", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-    GROUPBOX "Storia dei comandi:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Dimensione della memoria di appoggio", -1, 25, 100, 60, 15
+    GROUPBOX "Dimensione del cursore", IDC_STATIC, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Piccolo", IDC_RADIO_SMALL_CURSOR, 25, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Medio", IDC_RADIO_MEDIUM_CURSOR, 25, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Largo", IDC_RADIO_LARGE_CURSOR, 25, 55, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Opzioni dello schermo", IDC_STATIC, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Finestra", IDC_RADIO_DISPLAY_WINDOW, 150, 35, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Tutto lo schermo", IDC_RADIO_DISPLAY_FULL, 150, 50, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Storia dei comandi:", IDC_STATIC, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Dimensione della memoria di appoggio", IDC_STATIC, 25, 100, 60, 15
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 100, 12, 12
-    LTEXT "&Numerosità:", -1, 25, 120, 80, 15
+    LTEXT "&Numerosità:", IDC_STATIC, 25, 120, 80, 15
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 120, 12, 12
-    CHECKBOX "&Rimuovere i vecchi duplicati", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
-    GROUPBOX "Opzioni di modifica", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Modalità &Modifica rapida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Modalità &Inserimento", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Rimuovere i vecchi duplicati", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
+    GROUPBOX "Opzioni di modifica", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Modalità &Modifica rapida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Modalità &Inserimento", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Anteprima", -1, 10, 7, 65, 10
-    LTEXT "Dimansione", -1, 130, 10, 30, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
-    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Font", -1, 10, 105, 35, 10
-    CHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | 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 "Ogni carattere è:", -1, 130, 165, 75, 10
-    LTEXT "larghezza in pixel\naltezza in pixel", -1, 140, 180, 65, 20
-    LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+    LTEXT "Anteprima:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Dimansione:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Font", IDC_STATIC, 10, 105, 35, 10
+    AUTOCHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Ogni carattere è:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "larghezza in pixel\naltezza in pixel", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Anteprima", -1, 10, 7, 65, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70
-    GROUPBOX "Dimensione del buffer dello schermo", -1, 130, 15, 115, 40
-    LTEXT "&Larghezza:", -1, 135, 30, 25, 10
-    LTEXT "&Altezza:", -1, 135, 40, 25, 10
+    LTEXT "Anteprima:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Dimensione del buffer dello schermo", IDC_STATIC, 130, 15, 115, 40
+    LTEXT "&Larghezza:", IDC_STATIC, 135, 30, 25, 10
+    LTEXT "&Altezza:", IDC_STATIC, 135, 40, 25, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Dimensione della finestra", -1, 130, 60, 115, 40
-    LTEXT "&L&arghezza:", -1, 135, 70, 25, 10
-    LTEXT "&A&ltezza:", -1, 135, 80, 25, 10
+    GROUPBOX "Dimensione della finestra", IDC_STATIC, 130, 60, 115, 40
+    LTEXT "&L&arghezza:", IDC_STATIC, 135, 70, 25, 10
+    LTEXT "&A&ltezza:", IDC_STATIC, 135, 80, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Posizione della finestra", -1, 130, 105, 115, 55
-    LTEXT "&Sinistra:", -1, 135, 120, 25, 10
-    LTEXT "&Alto:", -1, 135, 130, 25, 10
+    GROUPBOX "Posizione della finestra", IDC_STATIC, 130, 105, 115, 55
+    LTEXT "&Sinistra:", IDC_STATIC, 135, 120, 25, 10
+    LTEXT "&Alto:", IDC_STATIC, 135, 130, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    CHECKBOX "Posizionare la finestra automaticamente", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
+    AUTOCHECKBOX "Posizionare la finestra automaticamente", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Colori"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Testo Schermo", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-    CONTROL "&Sfondo Schermo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10
-    CONTROL "T&esto Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10
-    CONTROL "S&fondo Popup", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10
-    GROUPBOX "Componenti dei colori", -1, 120, 15, 90, 45
-    LTEXT "&Rosso:", -1, 125, 25, 30, 10
+    AUTORADIOBUTTON "&Testo Schermo", IDC_RADIO_SCREEN_TEXT, 15, 15, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Sfondo Schermo", IDC_RADIO_SCREEN_BACKGROUND, 15, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "T&esto Popup", IDC_RADIO_POPUP_TEXT, 15, 35, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "S&fondo Popup", IDC_RADIO_POPUP_BACKGROUND, 15, 45, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Componenti dei colori", IDC_STATIC, 120, 15, 90, 45
+    LTEXT "&Rosso:", IDC_STATIC, 125, 25, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10
-    LTEXT "&Verde:", -1, 125, 35, 30, 10
+    LTEXT "&Verde:", IDC_STATIC, 125, 35, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10
-    LTEXT "&Blu:", -1, 125, 45, 30, 10
+    LTEXT "&Blu:", IDC_STATIC, 125, 45, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 45, 30, 10
@@ -130,10 +129,10 @@ BEGIN
     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 "Anteprima (Schermo)", -1, 10, 110, 200, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20
-    GROUPBOX "Anteprima (Popup)", -1, 10, 155, 200, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20
+    GROUPBOX "Anteprima (Schermo)", IDC_STATIC, 10, 110, 200, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Anteprima (Popup)", IDC_STATIC, 10, 155, 200, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Applicazione delle proprietà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Applicare alla sola finestra attuale", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10
-    CONTROL "&Applicare a tutte le finestre con lo stesso titolo", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10
+    AUTORADIOBUTTON "&Applicare alla sola finestra attuale", IDC_RADIO_APPLY_CURRENT, 25, 25, 150, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Applicare a tutte le finestre con lo stesso titolo", IDC_RADIO_APPLY_ALL, 25, 40, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
     PUSHBUTTON "Annulla", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configura le proprietà della console."
     IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra"
     IDS_RASTERFONTS "Raster Fonts"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/ja-JP.rc b/reactos/dll/cpl/console/lang/ja-JP.rc
index 3bb9083..99ce201 100644 (file)
--- a/reactos/dll/cpl/console/lang/ja-JP.rc
+++ b/reactos/dll/cpl/console/lang/ja-JP.rc
@@ -5,27 +5,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "オプション"
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "カーソルサイズ", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "小(&S)", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "中(&M)", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "大(&L)", 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 "ウィンドウ(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "フルスクリーン(&U)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "コマンド履歴", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "バッファーサイズ(&B):", -1, 14, 101, 70, 12
+    GROUPBOX "カーソルサイズ", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "小(&S)", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "中(&M)", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "大(&L)", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "表示オプション", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "ウィンドウ(&W)", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "フルスクリーン(&U)", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "コマンド履歴", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "バッファーサイズ(&B):", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "バッファの数(&N):", -1, 14, 124, 70, 12
+    LTEXT "バッファの数(&N):", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "古い重複分を破棄する(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "オプションの編集", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "&Quick編集モード", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "挿入モード(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "古い重複分を破棄する(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "オプションの編集", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Quick編集モード", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "挿入モード(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -34,19 +34,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "フォント"
 FONT 9, "MS UI Gothic"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "フォント(&F):", -1, 10, 105, 33, 10
-    CHECKBOX "太字のフォント(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "ウィンドウのプレビュー:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "サイズ:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "フォント(&F):", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "太字のフォント(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "各文字は:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "スクリーンピクセルの幅\nスクリーンピクセルの高さ", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -54,36 +57,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "レイアウト"
 FONT 9, "MS UI Gothic"
 BEGIN
-    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 "幅(&W):", -1, 140, 28, 40, 10
-    LTEXT "高さ(&H):", -1, 140, 46, 39, 10
+    LTEXT "ウィンドウのプレビュー:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "スクリーンバッファーのサイズ", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "幅(&W):", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "高さ(&H):", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "ウィンドウのサイズ", -1, 130, 65, 115, 47
-    LTEXT "幅(&I):", -1, 140, 78, 39, 10
-    LTEXT "高さ(&E):", -1, 140, 95, 37, 10
+    GROUPBOX "ウィンドウのサイズ", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "幅(&I):", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "高さ(&E):", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "ウィンドウの位置", -1, 130, 116, 115, 64
-    LTEXT "左から(&L):", -1, 140, 132, 38, 10
-    LTEXT "上から(&T):", -1, 140, 149, 40, 10
+    GROUPBOX "ウィンドウの位置", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "左から(&L):", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "上から(&T):", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "システム位置にする(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "システム位置にする(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -91,24 +94,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "色"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "スクリーン テキスト(&T)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
-    CONTROL "スクリーン背景色(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "ポップアップ テキスト(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "ポップアップ 背景色(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "選択した色成分", -1, 105, 6, 140, 60
-    LTEXT "赤(&R):", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "スクリーン テキスト(&T)", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "スクリーン背景色(&B)", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "ポップアップ テキスト(&P)", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "ポップアップ 背景色(&U)", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "選択した色成分", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "赤(&R):", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "緑(&G):", -1, 135, 34, 30, 10
+    LTEXT "緑(&G):", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "青(&B):", -1, 135, 50, 30, 10
+    LTEXT "青(&B):", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -128,10 +127,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "プレビュー (スクリーン)", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "プレビュー (ポップアップ)", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "プレビュー (スクリーン)", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "プレビュー (ポップアップ)", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -139,10 +138,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "プロパティを適用する"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "このウィンドウのみにプロパティを適用する(&A)", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "同じタイトルのウィンドウに対してプロパティを保存する(&S)", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "このウィンドウのみにプロパティを適用する(&A)", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "同じタイトルのウィンドウに対してプロパティを保存する(&S)", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "キャンセル", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -153,4 +150,5 @@ BEGIN
     IDS_CPLDESCRIPTION "コンソールプロパティを設定します。"
     IDS_APPLY_SHORTCUT_ALL "このウィンドウを開始したショートカットを編集します(&S)"
     IDS_RASTERFONTS "ラスターフォント"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/no-NO.rc b/reactos/dll/cpl/console/lang/no-NO.rc
index f8576db..eac7591 100644 (file)
--- a/reactos/dll/cpl/console/lang/no-NO.rc
+++ b/reactos/dll/cpl/console/lang/no-NO.rc
@@ -5,27 +5,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Valg"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Markørstørrelse", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Små", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Middels", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Store", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Skjerminnstillinger", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Vindu", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "F&ull skjerm", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Kommando historie", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Bufferstørrelse:", -1, 14, 101, 70, 12
+    GROUPBOX "Markørstørrelse", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Små", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Middels", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Store", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Skjerminnstillinger", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Vindu", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "F&ull skjerm", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Kommando historie", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Bufferstørrelse:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Antall buffere:", -1, 14, 124, 70, 12
+    LTEXT "&Antall buffere:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Fjern gamle duplikater", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Rediger valg", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "&Hurtigredigeringsmodus", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "&Innsettingsmodus", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Fjern gamle duplikater", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Rediger valg", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Hurtigredigeringsmodus", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Innsettingsmodus", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -34,19 +34,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Skrift"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Vindu forhåndsvisning:", -1, 10, 10, 94, 10
-    LTEXT "Størrelse:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Skrift:", -1, 10, 105, 33, 10
-    CHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Hver tegn er:", -1, 124, 166, 75, 10
-    LTEXT "Skjerm piksel bred\nskjerm piksel høy", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Vindu forhåndsvisning:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Størrelse:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Skrift:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Hver tegn er:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "Skjerm piksel bred\nskjerm piksel høy", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -54,36 +57,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Oppsett"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Vindu forhåndsvisning:", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Størrelse på skjermbuffer", -1, 130, 12, 115, 50
-    LTEXT "&Bredde:", -1, 140, 28, 40, 10
-    LTEXT "&Høyde:", -1, 140, 46, 39, 10
+    LTEXT "Vindu forhåndsvisning:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Størrelse på skjermbuffer", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Bredde:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Høyde:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Vindu størrelse", -1, 130, 65, 115, 47
-    LTEXT "&B&redde:", -1, 140, 78, 39, 10
-    LTEXT "&H&øyde:", -1, 140, 95, 37, 10
+    GROUPBOX "Vindu størrelse", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "&B&redde:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "&H&øyde:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Vindusplassering", -1, 130, 116, 115, 64
-    LTEXT "&Venstre:", -1, 140, 132, 38, 10
-    LTEXT "&Topp:", -1, 140, 149, 40, 10
+    GROUPBOX "Vindusplassering", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Venstre:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Topp:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "Automatisk &vindusplassering", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "Automatisk &vindusplassering", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -91,24 +94,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Farger"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Skjerm &tekst", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
-    CONTROL "Skjerm &bakgrunn", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
-    CONTROL "&Hurtigmenytekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-    CONTROL "Hurtig&menybakgrunn", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73
-    LTEXT "&Rød:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "Skjerm &tekst", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Skjerm &bakgrunn", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Hurtigmenytekst", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Hurtig&menybakgrunn", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Rød:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Grønn:", -1, 140, 42, 48, 10
+    LTEXT "&Grønn:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Blå:", -1, 140, 60, 48, 10
+    LTEXT "&Blå:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -128,10 +127,10 @@ BEGIN
     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 "Preview (Screen)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -139,10 +138,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Godta innstillinger"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Godta innstillinger for bare nåværende vindu", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Godta innstillinger for fremtidlige vinduer med samme navn", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Godta innstillinger for bare nåværende vindu", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Godta innstillinger for fremtidlige vinduer med samme navn", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Avbryt", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -153,4 +150,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konfigurere Konsoll innstillinger."
     IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
     IDS_RASTERFONTS "Raster Fonts"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/pl-PL.rc b/reactos/dll/cpl/console/lang/pl-PL.rc
index 9e7cd3c..b84c753 100644 (file)
--- a/reactos/dll/cpl/console/lang/pl-PL.rc
+++ b/reactos/dll/cpl/console/lang/pl-PL.rc
@@ -12,27 +12,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opcje"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Rozmiar kursora", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Mały", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10
-    CONTROL "&Średni", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10
-    CONTROL "&Duży", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10
-    GROUPBOX "Pokaż opcje", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Okno", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10
-    CONTROL "&Pełny ekran", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10
-    GROUPBOX "Historia poleceń:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Rozmiar bufora", -1, 25, 100, 60, 15
+    GROUPBOX "Rozmiar kursora", IDC_STATIC, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Mały", IDC_RADIO_SMALL_CURSOR, 25, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Średni", IDC_RADIO_MEDIUM_CURSOR, 25, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Duży", IDC_RADIO_LARGE_CURSOR, 25, 55, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Pokaż opcje", IDC_STATIC, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Okno", IDC_RADIO_DISPLAY_WINDOW, 150, 35, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Pełny ekran", IDC_RADIO_DISPLAY_FULL, 150, 50, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Historia poleceń:", IDC_STATIC, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Rozmiar bufora", IDC_STATIC, 25, 100, 60, 15
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 100, 12, 12
-    LTEXT "&Numery buforów:", -1, 25, 120, 80, 15
+    LTEXT "&Numery buforów:", IDC_STATIC, 25, 120, 80, 15
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 115, 120, 12, 12
-    CHECKBOX "O&drzuć stare duplikaty", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
-    GROUPBOX "Edytuj opcje", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "&Tryb szybkiej edycji", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "&Wstaw tryb", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "O&drzuć stare duplikaty", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15
+    GROUPBOX "Edytuj opcje", IDC_STATIC, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Tryb szybkiej edycji", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Wstaw tryb", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -41,19 +41,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Czcionka"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Okno podglądu", -1, 10, 7, 65, 10
-    LTEXT "Rozmiar", -1, 130, 10, 30, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
-    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Czcionka", -1, 10, 105, 35, 10
-    CHECKBOX "&Pogrubiona czcionka", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | 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 "Pogrubiona czcionka:", -1, 130, 165, 75, 10
-    LTEXT "szerokość ekranu w pikselach/nwysokość ekranu w pikselach", -1, 140, 180, 65, 20
-    LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10
+    LTEXT "Okno podglądu:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Rozmiar:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Czcionka", IDC_STATIC, 10, 105, 35, 10
+    AUTOCHECKBOX "&Pogrubiona czcionka", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Wybrana czcionka", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Rozmiar znaków:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "Szerokość w pikselach:\nWysokość w pikselach:", IDC_STATIC, 125, 180, 75, 20
+    LTEXT "", IDC_FONT_SIZE_X, 204, 180, 10, 10
+    LTEXT "", IDC_FONT_SIZE_Y, 204, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220
@@ -61,36 +64,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Układ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Okno podglądu", -1, 10, 7, 65, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70
-    GROUPBOX "Rozmiar bufora ekranu", -1, 130, 15, 115, 40
-    LTEXT "&Szerokość:", -1, 135, 30, 25, 10
-    LTEXT "&Wysokość:", -1, 135, 40, 25, 10
+    LTEXT "Okno podglądu:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Rozmiar bufora ekranu", IDC_STATIC, 130, 15, 115, 40
+    LTEXT "&Szerokość:", IDC_STATIC, 135, 30, 25, 10
+    LTEXT "&Wysokość:", IDC_STATIC, 135, 40, 25, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Rozmiar okna", -1, 130, 60, 115, 40
-    LTEXT "&Szerokość:", -1, 135, 70, 25, 10
-    LTEXT "&Wysokość:", -1, 135, 80, 25, 10
+    GROUPBOX "Rozmiar okna", IDC_STATIC, 130, 60, 115, 40
+    LTEXT "&Szerokość:", IDC_STATIC, 135, 70, 25, 10
+    LTEXT "&Wysokość:", IDC_STATIC, 135, 80, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    GROUPBOX "Pozycja okna", -1, 130, 105, 115, 55
-    LTEXT "&Lewo:", -1, 135, 120, 25, 10
-    LTEXT "&Góra:", -1, 135, 130, 25, 10
+    GROUPBOX "Pozycja okna", IDC_STATIC, 130, 105, 115, 55
+    LTEXT "&Lewo:", IDC_STATIC, 135, 120, 25, 10
+    LTEXT "&Góra:", IDC_STATIC, 135, 130, 25, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 185, 30, 30, 10
-    CHECKBOX "Wybór pozycji okna przez system", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
+    AUTOCHECKBOX "Wybór pozycji okna przez system", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220
@@ -98,24 +101,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Kolory"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Tekst ekranu", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10
-    CONTROL "Tł&o ekranu", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10
-    CONTROL "T&ekst zaznaczony", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10
-    CONTROL "Tlo te&kstu zaznaczonego", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10
-    GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45
-    LTEXT "&Czerwony:", -1, 125, 25, 30, 10
+    AUTORADIOBUTTON "&Tekst ekranu", IDC_RADIO_SCREEN_TEXT, 15, 15, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Tł&o ekranu", IDC_RADIO_SCREEN_BACKGROUND, 15, 25, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "T&ekst zaznaczony", IDC_RADIO_POPUP_TEXT, 15, 35, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Tlo te&kstu zaznaczonego", IDC_RADIO_POPUP_BACKGROUND, 15, 45, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 120, 15, 90, 45
+    LTEXT "&Czerwony:", IDC_STATIC, 125, 25, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10
-    LTEXT "&Zielony:", -1, 125, 35, 30, 10
+    LTEXT "&Zielony:", IDC_STATIC, 125, 35, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10
-    LTEXT "&Niebieski:", -1, 125, 45, 30, 10
+    LTEXT "&Niebieski:", IDC_STATIC, 125, 45, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 45, 30, 10
@@ -135,10 +134,10 @@ BEGIN
     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 "Preview (Screen)", -1, 10, 110, 200, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20
-    GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 10, 110, 200, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 10, 155, 200, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100
@@ -146,10 +145,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Zastosuj właściwości"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Zastosuj właściwości tylko do aktualnego okna", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10
-    CONTROL "Z&apisz właściwości na przyszłe okna z tym sam tytułem", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10
+    AUTORADIOBUTTON "&Zastosuj właściwości tylko do aktualnego okna", IDC_RADIO_APPLY_CURRENT, 25, 25, 150, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Z&apisz właściwości na przyszłe okna z tym sam tytułem", IDC_RADIO_APPLY_ALL, 25, 40, 185, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE
     PUSHBUTTON "Anuluj", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE
 END
@@ -160,4 +157,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konfiguruje właściwości konsoli."
     IDS_APPLY_SHORTCUT_ALL "Zmodyfikuj skrót, który wywołał to okno"
     IDS_RASTERFONTS "Czcionki rastrowe"
+    IDS_GROUPBOX_FONT_NAME "Wybrana czcionka: "
 END

diff --git a/reactos/dll/cpl/console/lang/pt-BR.rc b/reactos/dll/cpl/console/lang/pt-BR.rc
index e1689d6..15fc720 100644 (file)
--- a/reactos/dll/cpl/console/lang/pt-BR.rc
+++ b/reactos/dll/cpl/console/lang/pt-BR.rc
@@ -5,27 +5,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opções"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Tamanho do cursor", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Pequeno", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Médio", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Grande", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Opções de exibição", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Janela", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "T&ela inteira", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Histórico de comandos", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Tamanho do buffer:", -1, 14, 101, 70, 12
+    GROUPBOX "Tamanho do cursor", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Pequeno", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Médio", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Grande", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Opções de exibição", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Janela", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "T&ela inteira", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Histórico de comandos", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Tamanho do buffer:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Número de buffers:", -1, 14, 124, 70, 12
+    LTEXT "&Número de buffers:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Descartar duplicatas antigas", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Opções de edição", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Modo de edição &rápida", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Modo de &inserção", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Descartar duplicatas antigas", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Opções de edição", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Modo de edição &rápida", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Modo de &inserção", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -34,19 +34,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Fonte"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Visualização da janela", -1, 10, 10, 94, 10
-    LTEXT "&Tamanho", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Fonte", -1, 10, 105, 33, 10
-    CHECKBOX "Fontes em &negrito", IDC_CHECK_BOLD_FONTS, 46, 105, 76, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Cada caractere tem:", -1, 124, 166, 75, 10
-    LTEXT "pixels de largura\npixels de altura", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Visualização da janela:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "&Tamanho:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Fonte", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "Fontes em &negrito", IDC_CHECK_BOLD_FONTS, 46, 105, 76, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Cada caractere tem:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "pixels de largura\npixels de altura", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -54,36 +57,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Visualização da janela", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Tamanho do buffer de tela", -1, 130, 12, 115, 50
-    LTEXT "&Largura:", -1, 140, 28, 40, 10
-    LTEXT "&Altura:", -1, 140, 46, 39, 10
+    LTEXT "Visualização da janela:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Tamanho do buffer de tela", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Largura:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Altura:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Tamanho da janela", -1, 130, 65, 115, 47
-    LTEXT "Lar&gura:", -1, 140, 78, 39, 10
-    LTEXT "Altu&ra:", -1, 140, 95, 37, 10
+    GROUPBOX "Tamanho da janela", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "Lar&gura:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "Altu&ra:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Posição da janela", -1, 130, 116, 115, 64
-    LTEXT "&Esquerda:", -1, 140, 132, 38, 10
-    LTEXT "&Superior:", -1, 140, 149, 40, 10
+    GROUPBOX "Posição da janela", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Esquerda:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Superior:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Deixar o sistema posicionar a janela", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "&Deixar o sistema posicionar a janela", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -91,24 +94,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Cores"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Texto da tela", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
-    CONTROL "Plano de &fundo da tela", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "Te&xto pop-up", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "Plano de fun&do pop-up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "Valores de cor selecionados", -1, 105, 6, 140, 60
-    LTEXT "&Vermelho:", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "&Texto da tela", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Plano de &fundo da tela", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Te&xto pop-up", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Plano de fun&do pop-up", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Valores de cor selecionados", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "&Vermelho:", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "V&erde:", -1, 135, 34, 30, 10
+    LTEXT "V&erde:", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "A&zul:", -1, 135, 50, 30, 10
+    LTEXT "A&zul:", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -128,10 +127,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "Cores selecionadas para a tela", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "Cores pop-up selecionadas", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "Cores selecionadas para a tela", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "Cores pop-up selecionadas", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -139,10 +138,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Aplicar propriedades"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Aplicar as propriedades apenas à janela atual", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Salvar as propriedades para janelas futuras com o mesmo título", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Aplicar as propriedades apenas à janela atual", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Salvar as propriedades para janelas futuras com o mesmo título", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Cancelar", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -153,4 +150,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configura as propriedades do console."
     IDS_APPLY_SHORTCUT_ALL "&Modificar o atalho que iniciou esta janela"
     IDS_RASTERFONTS "Fontes de varredura"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/ro-RO.rc b/reactos/dll/cpl/console/lang/ro-RO.rc
index cb6122b..19d79d1 100644 (file)
--- a/reactos/dll/cpl/console/lang/ro-RO.rc
+++ b/reactos/dll/cpl/console/lang/ro-RO.rc
@@ -14,27 +14,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opțiuni"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dimensiune cursor", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "Red&usă", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "Me&die", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Mărită", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Mod de afișare", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "În fere&astră", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "Pe t&ot ecranul", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Istoric pentru comenzi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "Ma&xim înregistrări:", -1, 14, 101, 70, 12
+    GROUPBOX "Dimensiune cursor", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "Red&usă", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Me&die", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Mărită", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Mod de afișare", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "În fere&astră", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pe t&ot ecranul", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Istoric pentru comenzi", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Ma&xim înregistrări:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Cantitate registre:", -1, 14, 124, 70, 12
+    LTEXT "&Cantitate registre:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "Înlătură duplicatele &vechi", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Opțiuni de editare", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Mod de &editare rapidă”", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Mod de inse&rție”", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "Înlătură duplicatele &vechi", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Opțiuni de editare", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Mod de &editare rapidă”", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Mod de inse&rție”", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -43,19 +43,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Previzionare:", -1, 10, 10, 94, 10
-    LTEXT "Mărime:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "F&ont:", -1, 10, 105, 33, 10
-    CHECKBOX "&Aldin", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Fiecare caracter are:", -1, 124, 166, 75, 10
-    LTEXT "pixeli lățime\npixeli înălțime", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Previzionare:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Mărime:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "F&ont:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Aldin", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Fiecare caracter are:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "pixeli lățime\npixeli înălțime", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -63,36 +66,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Aspect"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Previzionare:", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Dimensiunea textului", -1, 130, 12, 115, 50
-    LTEXT "&Coloane:", -1, 140, 28, 40, 10
-    LTEXT "&Rânduri:", -1, 140, 46, 39, 10
+    LTEXT "Previzionare:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Dimensiunea textului", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Coloane:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Rânduri:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Dimensiunea ferestrei", -1, 130, 65, 115, 47
-    LTEXT "C&oloane:", -1, 140, 78, 39, 10
-    LTEXT "Rân&duri:", -1, 140, 95, 37, 10
+    GROUPBOX "Dimensiunea ferestrei", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "C&oloane:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "Rân&duri:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Poziția fereastrei", -1, 130, 116, 115, 64
-    LTEXT "Stâng&a:", -1, 140, 132, 38, 10
-    LTEXT "S&us:", -1, 140, 149, 40, 10
+    GROUPBOX "Poziția fereastrei", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "Stâng&a:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "S&us:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "A&mplasare automată", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "A&mplasare automată", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -100,24 +103,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Culori"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "T&ext ecran", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
-    CONTROL "F&undal ecran", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
-    CONTROL "Te&xt ferestre intempestive", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-    CONTROL "Fun&dal ferestre intempestive", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "Paleta culorii selectate:", -1, 129, 7, 118, 73
-    LTEXT "&Roșu:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "T&ext ecran", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "F&undal ecran", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Te&xt ferestre intempestive", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Fun&dal ferestre intempestive", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Paleta culorii selectate:", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Roșu:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Verde:", -1, 140, 42, 48, 10
+    LTEXT "&Verde:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Albastru:", -1, 140, 60, 48, 10
+    LTEXT "&Albastru:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -137,10 +136,10 @@ BEGIN
     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 "Previzionare (ecran)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Previzionare (ferestre intempestive)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Previzionare (ecran)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Previzionare (ferestre intempestive)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -148,10 +147,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Aplicare proprietăți"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Doar pentru această fereastră", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Pentru toate ferestrele cu acest titlu", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Doar pentru această fereastră", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Pentru toate ferestrele cu acest titlu", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Con&firmă", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "A&nulează", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -162,4 +159,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Configurarea proprietăților pentru programe linie de comandă."
     IDS_APPLY_SHORTCUT_ALL "Modifică scurtătura care a pornit aplicația"
     IDS_RASTERFONTS "Fonturi rastre"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/ru-RU.rc b/reactos/dll/cpl/console/lang/ru-RU.rc
index 5a78ed2..f057926 100644 (file)
--- a/reactos/dll/cpl/console/lang/ru-RU.rc
+++ b/reactos/dll/cpl/console/lang/ru-RU.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметры"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Размер буфера:", -1, 14, 101, 60, 12
+    GROUPBOX "Размер курсора", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Маленький", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Средний", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Большой", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Экран", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Окно", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Полный экран", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "История команд", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Размер буфера:", IDC_STATIC, 14, 101, 60, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Число буферов:", -1, 14, 124, 60, 12
+    LTEXT "&Число буферов:", IDC_STATIC, 14, 124, 60, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Убирать старые экземпляры", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Редактирование", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Быстрое редактирование", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Режим вставки", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Шрифт"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Шрифт:", -1, 10, 105, 33, 10
-    CHECKBOX "&Жирный", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "Окно предпросмотра:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Размер:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Шрифт:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Жирный", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Выбранный шрифт", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Размер знаков:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "Ширина (пиксели):\nВысота (пиксели):", IDC_STATIC, 125, 180, 55, 20
+    LTEXT "", IDC_FONT_SIZE_X, 184, 180, 10, 10
+    LTEXT "", IDC_FONT_SIZE_Y, 184, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Раскладка"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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
+    LTEXT "Окно предпросмотра:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Размер буфера экрана", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Ширина:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Высота:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Размер окна", -1, 130, 65, 115, 47
-    LTEXT "Ш&ирина:", -1, 140, 78, 39, 10
-    LTEXT "В&ысота:", -1, 140, 95, 37, 10
+    GROUPBOX "Размер окна", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "Ш&ирина:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "В&ысота:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Положение окна", -1, 130, 116, 115, 64
-    LTEXT "&Отступ:", -1, 140, 132, 38, 10
-    LTEXT "&Высота:", -1, 140, 149, 40, 10
+    GROUPBOX "Положение окна", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Отступ:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Высота:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Системная позиция окна", IDC_CHECK_SYSTEM_POS_WINDOW, 140, 165, 100, 10
+    AUTOCHECKBOX "&Системная позиция окна", IDC_CHECK_SYSTEM_POS_WINDOW, 140, 165, 100, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | 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, 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
+    AUTORADIOBUTTON "&Текст на экране", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Фон экрана", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Всплывающий текст", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "В&сплывающий фон", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Выбранные цвета компонентов", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Красный:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Зеленый:", -1, 140, 42, 48, 10
+    LTEXT "&Зеленый:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Голубой:", -1, 140, 60, 48, 10
+    LTEXT "&Голубой:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -130,10 +129,10 @@ BEGIN
     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
+    GROUPBOX "Предпросмотр (Экран)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Предпросмотр (Окно)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | 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, 12, 12, 207, 10
-    CONTROL "&Сохранить свойства для всех окон с таким заголовком", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Применить свойства только для этого окна", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Сохранить свойства для всех окон с таким заголовком", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Отмена", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Настройка командной строки."
     IDS_APPLY_SHORTCUT_ALL "&Изменить ярлык, которым было запущено это окно"
     IDS_RASTERFONTS "Растровые шрифты"
+    IDS_GROUPBOX_FONT_NAME "Выбранный шрифт: "
 END

diff --git a/reactos/dll/cpl/console/lang/sk-SK.rc b/reactos/dll/cpl/console/lang/sk-SK.rc
index 820d2d8..f00b274 100644 (file)
--- a/reactos/dll/cpl/console/lang/sk-SK.rc
+++ b/reactos/dll/cpl/console/lang/sk-SK.rc
@@ -9,27 +9,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Možnosti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Veľkosť kurzora", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Malý", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Stredný", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Veľký", 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 "História príkazov", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Buffer Size:", -1, 14, 101, 70, 12
+    GROUPBOX "Veľkosť kurzora", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Malý", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Stredný", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Veľký", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Display Options", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Window", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "F&ull Screen", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "História príkazov", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Buffer Size:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12
+    LTEXT "&Number of Buffers:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Možnosti úprav", -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
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Možnosti úprav", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -38,19 +38,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Písmo"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ukážka okna:", -1, 10, 10, 94, 10
-    LTEXT "Veľkosť:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Písmo:", -1, 10, 105, 33, 10
-    CHECKBOX "&Tučné písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Každý znak je:", -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
+    LTEXT "Ukážka okna:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Veľkosť:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Písmo:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Tučné písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Každý znak je:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "screen pixel wide\nscreen pixel high", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -58,36 +61,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Layout"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ukážka okna:", -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
+    LTEXT "Ukážka okna:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Screen Buffer Size", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Width:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Height:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
+    GROUPBOX "Window Size", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "&W&idth:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "&H&eight:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
+    GROUPBOX "Window Position", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Left:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Top:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -95,24 +98,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Farby"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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 Components", -1, 129, 7, 118, 73
-    LTEXT "&Red:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "Screen &Text", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Text", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Red:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Green:", -1, 140, 42, 48, 10
+    LTEXT "&Green:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Blue:", -1, 140, 60, 48, 10
+    LTEXT "&Blue:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -132,10 +131,10 @@ BEGIN
     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 "Preview (Screen)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -143,10 +142,8 @@ STYLE DS_SHELLFONT | 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, 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
+    AUTORADIOBUTTON "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Zrušiť", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -157,4 +154,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Nastavuje vlastnosti Konzoly."
     IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
     IDS_RASTERFONTS "Rasterové písma"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/sq-AL.rc b/reactos/dll/cpl/console/lang/sq-AL.rc
index 6e74733..0333898 100644 (file)
--- a/reactos/dll/cpl/console/lang/sq-AL.rc
+++ b/reactos/dll/cpl/console/lang/sq-AL.rc
@@ -9,27 +9,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Opsione"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Masa Kursorit", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "Vogel", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Mesem", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "Madhe", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Shfaq Opsione", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "Dritare", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "Monitor Plote", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Historiku Komandave", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Buffer Masa:", -1, 14, 101, 70, 12
+    GROUPBOX "Masa Kursorit", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "Vogel", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Mesem", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Madhe", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Shfaq Opsione", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "Dritare", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Monitor Plote", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Historiku Komandave", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Buffer Masa:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Numri i Buffers:", -1, 14, 124, 70, 12
+    LTEXT "&Numri i Buffers:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "Hiq Duplikimet e Vjetra", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Modifiko Opsione", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "Mënyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Mënyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "Hiq Duplikimet e Vjetra", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Modifiko Opsione", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "Mënyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Mënyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -38,19 +38,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dritare Preview:", -1, 10, 10, 94, 10
-    LTEXT "Masë:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Font:", -1, 10, 105, 33, 10
-    CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Çdo krarakter është:", -1, 124, 166, 75, 10
-    LTEXT "pixeli ekranit i gjerë\npixel ekranit i gjatë", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Dritare Preview:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Masë:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Font:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Çdo krarakter është:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "pixeli ekranit i gjerë\npixel ekranit i gjatë", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -58,36 +61,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Pamja"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dritare Preview:", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50
-    LTEXT "Gjerë:", -1, 140, 28, 40, 10
-    LTEXT "Gjatë:", -1, 140, 46, 39, 10
+    LTEXT "Dritare Preview:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Masa e Ekranit Buffer", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "Gjerë:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "Gjatë:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Masa Dritares", -1, 130, 65, 115, 47
-    LTEXT "&Gjerë:", -1, 140, 78, 39, 10
-    LTEXT "&Gjatë:", -1, 140, 95, 37, 10
+    GROUPBOX "Masa Dritares", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "&Gjerë:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "&Gjatë:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Pozicioni Dritares", -1, 130, 116, 115, 64
-    LTEXT "&Majtas:", -1, 140, 132, 38, 10
-    LTEXT "&Lart:", -1, 140, 149, 40, 10
+    GROUPBOX "Pozicioni Dritares", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Majtas:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "&Lart:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "Lejo sistemin e &pozicionimit dritares", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "Lejo sistemin e &pozicionimit dritares", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -95,24 +98,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Ngjyra"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Monitori &Teksti", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
-    CONTROL "Monitori &Sfond", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "&Popup Texkst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "Pop&up Sfondi", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "Përzgjidh ngjyrat e komponenteve", -1, 105, 6, 140, 60
-    LTEXT "&Kuq:", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "Monitori &Teksti", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Monitori &Sfond", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Popup Texkst", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Pop&up Sfondi", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Përzgjidh ngjyrat e komponenteve", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "&Kuq:", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "&Jeshil:", -1, 135, 34, 30, 10
+    LTEXT "&Jeshil:", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "&Blu:", -1, 135, 50, 30, 10
+    LTEXT "&Blu:", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -132,10 +131,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "Preview (monitor)", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -143,10 +142,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Apliko Konfigurimet"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Apliko Konfigurimet vetem tek dritarja aktuale", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "&Ruaj Konfigurimet per dritaret e te ardhmes me te njejtin emer", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Apliko Konfigurimet vetem tek dritarja aktuale", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Ruaj Konfigurimet per dritaret e te ardhmes me te njejtin emer", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Anulo", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -157,4 +154,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konfigurim i parametrave te konsole."
     IDS_APPLY_SHORTCUT_ALL "Modifiko &shkurtimi qe filloj kete dritare"
     IDS_RASTERFONTS "Raster Fonts"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/tr-TR.rc b/reactos/dll/cpl/console/lang/tr-TR.rc
index 144e5c8..baa09b9 100644 (file)
--- a/reactos/dll/cpl/console/lang/tr-TR.rc
+++ b/reactos/dll/cpl/console/lang/tr-TR.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Seçenekler"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "İmleç Büyüklüğü", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Küçük", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "&Orta", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "&Büyük", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-    GROUPBOX "Görünüm Seçenekleri", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "&Pencere", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "&Tüm Görüntülük", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "Komut Geçmişi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Ara Bellek Boyutu:", -1, 14, 101, 70, 12
+    GROUPBOX "İmleç Büyüklüğü", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Küçük", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Orta", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Büyük", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Görünüm Seçenekleri", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&Pencere", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Tüm Görüntülük", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Komut Geçmişi", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Ara Bellek Boyutu:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "A&ra Bellek Sayısı:", -1, 14, 124, 70, 12
+    LTEXT "A&ra Bellek Sayısı:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "&Eski Kopyaları At", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "Düzenleme Seçenekleri", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "&Hızlı Düzenleme Kipi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "Ek&leme Kipi", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "&Eski Kopyaları At", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Düzenleme Seçenekleri", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Hızlı Düzenleme Kipi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "Ek&leme Kipi", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Yazı Tipi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Pencere Ön İzlemesi:", -1, 10, 10, 94, 10
-    LTEXT "&Boyutlar:", -1, 180, 10, 36, 10
-    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
-    LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Yazı Tipi:", -1, 10, 105, 33, 10
-    CHECKBOX "&Kalın Yazı Tipleri", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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 "Tüm damgalar:", -1, 124, 166, 75, 10
-    LTEXT "nokta genişlikte.\nnokta yükseklikte.", -1, 136, 180, 101, 20
-    LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-    LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
+    LTEXT "Pencere Ön İzlemesi:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "&Boyutlar:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Yazı Tipi:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Kalın Yazı Tipleri", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Tüm damgalar:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "nokta genişlikte\nnokta yükseklikte", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Yerleşim"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Pencere Ön İzlemesi:", -1, 8, 6, 95, 10
-    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70
-    GROUPBOX "Görüntülük Arabelleği Boyutları", -1, 130, 12, 115, 50
-    LTEXT "&Genişlik:", -1, 140, 28, 40, 10
-    LTEXT "&Yükseklik:", -1, 140, 46, 39, 10
+    LTEXT "Pencere Ön İzlemesi:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Görüntülük Arabelleği Boyutları", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Genişlik:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Yükseklik:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Pencere Boyutları", -1, 130, 65, 115, 47
-    LTEXT "G&enişlik:", -1, 140, 78, 39, 10
-    LTEXT "Y&ükseklik:", -1, 140, 95, 37, 10
+    GROUPBOX "Pencere Boyutları", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "G&enişlik:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "Y&ükseklik:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Pencere Konumu", -1, 130, 116, 115, 64
-    LTEXT "S&oldan:", -1, 140, 132, 38, 10
-    LTEXT "Ü&stten:", -1, 140, 149, 40, 10
+    GROUPBOX "Pencere Konumu", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "S&oldan:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "Ü&stten:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Dizgeye Pencere Konumlandırmaya İzin Ver", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "&Dizgeye Pencere Konumlandırmaya İzin Ver", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Renkler"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Görüntülük Metni", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10
-    CONTROL "G&örüntülük Zemîni", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10
-    CONTROL "&Açılan Metin", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10
-    CONTROL "A&çılan Zemin", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10
-    GROUPBOX "Seçili Renk Bileşenleri", -1, 105, 6, 140, 60
-    LTEXT "A&l:", -1, 135, 18, 30, 10
+    AUTORADIOBUTTON "&Görüntülük Metni", IDC_RADIO_SCREEN_TEXT, 10, 12, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "G&örüntülük Zemîni", IDC_RADIO_SCREEN_BACKGROUND, 10, 24, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Açılan Metin", IDC_RADIO_POPUP_TEXT, 10, 36, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "A&çılan Zemin", IDC_RADIO_POPUP_BACKGROUND, 10, 48, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Seçili Renk Bileşenleri", IDC_STATIC, 105, 6, 140, 60
+    LTEXT "A&l:", IDC_STATIC, 135, 18, 30, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14
-    LTEXT "&Yeşil:", -1, 135, 34, 30, 10
+    LTEXT "&Yeşil:", IDC_STATIC, 135, 34, 30, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14
-    LTEXT "&Mâvi:", -1, 135, 50, 30, 10
+    LTEXT "&Mâvi:", IDC_STATIC, 135, 50, 30, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14
@@ -130,10 +129,10 @@ BEGIN
     CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12
     CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12
-    GROUPBOX "Görüntülük Ön İzlemesi", -1, 8, 100, 237, 55
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40
-    GROUPBOX "Açılan Ön İzlemesi", -1, 8, 160, 237, 55
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40
+    GROUPBOX "Görüntülük Ön İzlemesi", IDC_STATIC, 8, 100, 237, 55
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40, WS_EX_CLIENTEDGE
+    GROUPBOX "Açılan Ön İzlemesi", IDC_STATIC, 8, 160, 237, 55
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Husûsiyetleri Uygula"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Husûsiyetleri Yalnızca Şimdiki Pencereye Uygula", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "H&usûsiyetleri Aynı Başlıktaki Gelecek Pencereler İçin Sakla", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Husûsiyetleri Yalnızca Şimdiki Pencereye Uygula", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "H&usûsiyetleri Aynı Başlıktaki Gelecek Pencereler İçin Sakla", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Tamam", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "İptal", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Konsol husûsiyetlerini yapılandırır."
     IDS_APPLY_SHORTCUT_ALL "&Bu Pencereyi Başlatan Kısayolu Değiştir"
     IDS_RASTERFONTS "Taramalı Yazı Tipleri"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/uk-UA.rc b/reactos/dll/cpl/console/lang/uk-UA.rc
index 02fcc19..c8f1d82 100644 (file)
--- a/reactos/dll/cpl/console/lang/uk-UA.rc
+++ b/reactos/dll/cpl/console/lang/uk-UA.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Параметри"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "&Розмір буфера:", -1, 14, 101, 70, 12
+    GROUPBOX "Розмір курсору", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "&дрібний", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&середній", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&великий", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Параметри відображення", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "В&ікно", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&На весь екран", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Журнал команд", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "&Розмір буфера:", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "&Кількість буферів:", -1, 14, 124, 70, 12
+    LTEXT "&Кількість буферів:", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "В&ідкидати повторення", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "Параметри редагування", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "&Швидке редагування", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "&Режим вставлення", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Шрифт"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Зразок вікна", -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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&Шрифт:", -1, 10, 105, 33, 10
-    CHECKBOX "&Жирні", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "Зразок вікна:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "Size:", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Шрифт:", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "&Жирні", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "Кожен символ:", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "пікселів завширшки\nпікселів заввишки", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Розкладка"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    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
+    LTEXT "Зразок вікна:", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "Розмір буфера екрана", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "&Ширина:", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "&Висота:", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "Розмір вікна", -1, 130, 65, 115, 47
-    LTEXT "Ши&рина:", -1, 140, 78, 39, 10
-    LTEXT "В&исота:", -1, 140, 95, 37, 10
+    GROUPBOX "Розмір вікна", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "Ши&рина:", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "В&исота:", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "Позиція вікна", -1, 130, 116, 115, 64
-    LTEXT "&Зліва:", -1, 140, 132, 38, 10
-    LTEXT "З&гори:", -1, 140, 149, 40, 10
+    GROUPBOX "Позиція вікна", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "&Зліва:", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "З&гори:", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "&Автоматичний вибір", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "&Автоматичний вибір", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | 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, 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 "Selected Color Components", -1, 129, 7, 118, 73
-    LTEXT "&Червоний:", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "Т&екст на екрані", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Тло екрана", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Те&кст спливного вікна", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "Т&ло спливного вікна", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Selected Color Components", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "&Червоний:", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "&Зелений:", -1, 140, 42, 48, 10
+    LTEXT "&Зелений:", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "&Синій:", -1, 140, 60, 48, 10
+    LTEXT "&Синій:", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -130,10 +129,10 @@ BEGIN
     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 "Preview (Screen)", -1, 7, 111, 240, 40
-    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20
-    GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40
-    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20
+    GROUPBOX "Preview (Screen)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "Preview (Popup)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | 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, 12, 12, 207, 10
-    CONTROL "&Зберігти для майбутніх вікон з таким самим заголовком", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "&Змінити тільки для поточного вікна", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&Зберігти для майбутніх вікон з таким самим заголовком", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "Скасувати", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "Настроювання властивостей консолі."
     IDS_APPLY_SHORTCUT_ALL "Зміна &ярлика, який запустив це вікно"
     IDS_RASTERFONTS "Растрові шрифти"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/zh-CN.rc b/reactos/dll/cpl/console/lang/zh-CN.rc
index 08d305b..773c25f 100644 (file)
--- a/reactos/dll/cpl/console/lang/zh-CN.rc
+++ b/reactos/dll/cpl/console/lang/zh-CN.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "选项"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "光标大小", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "小(&S)", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "中(&M)", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "大(&L)", 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 "窗口(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "全屏显示(&F)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "命令记录", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "缓冲区大小(&B):", -1, 14, 101, 70, 12
+    GROUPBOX "光标大小", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "小(&S)", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "中(&M)", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "大(&L)", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "显示选项", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "窗口(&W)", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "全屏显示(&F)", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "命令记录", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "缓冲区大小(&B):", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "缓冲区数量(&N):", -1, 14, 124, 70, 12
+    LTEXT "缓冲区数量(&N):", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "丢弃旧的副本(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "编辑选项", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "快速编辑模式(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "插入模式(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "丢弃旧的副本(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "编辑选项", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "快速编辑模式(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "插入模式(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "字体"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&字体(&F)：", -1, 10, 105, 33, 10
-    CHECKBOX "粗体(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "窗口预览：", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "大小：", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&字体(&F)：", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "粗体(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "每个字符为：", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "屏幕像素宽\n屏幕像素高", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "布局"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    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 "宽(&W)：", -1, 140, 28, 40, 10
-    LTEXT "高(&H)：", -1, 140, 46, 39, 10
+    LTEXT "窗口预览：", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "屏幕缓冲区大小", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "宽(&W)：", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "高(&H)：", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "窗口大小", -1, 130, 65, 115, 47
-    LTEXT "宽(&I)", -1, 140, 78, 39, 10
-    LTEXT "高(&E)", -1, 140, 95, 37, 10
+    GROUPBOX "窗口大小", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "宽(&I)", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "高(&E)", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "窗口位置", -1, 130, 116, 115, 64
-    LTEXT "左(&L)：", -1, 140, 132, 38, 10
-    LTEXT "上(&T)：", -1, 140, 149, 40, 10
+    GROUPBOX "窗口位置", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "左(&L)：", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "上(&T)：", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "由系统定位窗口(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "由系统定位窗口(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "颜色"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "屏幕文字(&T)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
-    CONTROL "屏幕背景(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
-    CONTROL "弹出窗口文字(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-    CONTROL "弹出窗口背景(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "所选的颜色组件", -1, 129, 7, 118, 73
-    LTEXT "红(&R)：", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "屏幕文字(&T)", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "屏幕背景(&B)", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "弹出窗口文字(&P)", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "弹出窗口背景(&U)", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "所选的颜色组件", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "红(&R)：", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "绿(&G)：", -1, 140, 42, 48, 10
+    LTEXT "绿(&G)：", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "蓝(&B)：", -1, 140, 60, 48, 10
+    LTEXT "蓝(&B)：", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -130,10 +129,10 @@ BEGIN
     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
+    GROUPBOX "预览 (屏幕)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "预览 (弹出)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "应用属性"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "属性仅对当前窗口生效(&A)", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "保存属性，供以后具有相同标题的窗口使用(&S)", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "属性仅对当前窗口生效(&A)", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "保存属性，供以后具有相同标题的窗口使用(&S)", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "确定", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "取消", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "配置控制台属性。"
     IDS_APPLY_SHORTCUT_ALL "修改启动此窗口的快捷方式(&S)"
     IDS_RASTERFONTS "Raster 字体"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/lang/zh-TW.rc b/reactos/dll/cpl/console/lang/zh-TW.rc
index 2204671..964459c 100644 (file)
--- a/reactos/dll/cpl/console/lang/zh-TW.rc
+++ b/reactos/dll/cpl/console/lang/zh-TW.rc
@@ -7,27 +7,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "選項"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "游標大小", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
-    CONTROL "小(&S)", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-    CONTROL "中(&M)", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-    CONTROL "大(&L)", 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 "視窗(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-    CONTROL "全屏顯示(&F)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-    GROUPBOX "命令記錄", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
-    LTEXT "緩衝區大小(&B):", -1, 14, 101, 70, 12
+    GROUPBOX "游標大小", IDC_STATIC, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "小(&S)", IDC_RADIO_SMALL_CURSOR, 15, 20, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "中(&M)", IDC_RADIO_MEDIUM_CURSOR, 15, 40, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "大(&L)", IDC_RADIO_LARGE_CURSOR, 15, 60, 90, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "顯示選項", IDC_STATIC, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTORADIOBUTTON "視窗(&W)", IDC_RADIO_DISPLAY_WINDOW, 142, 20, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "全屏顯示(&F)", IDC_RADIO_DISPLAY_FULL, 142, 40, 70, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "命令記錄", IDC_STATIC, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "緩衝區大小(&B):", IDC_STATIC, 14, 101, 70, 12
     EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15
-    LTEXT "緩衝區數量(&N):", -1, 14, 124, 70, 12
+    LTEXT "緩衝區數量(&N):", IDC_STATIC, 14, 124, 70, 12
     EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15
-    CHECKBOX "丟棄舊的副本(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-    GROUPBOX "編輯選項", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
-    CHECKBOX "快速編輯模式(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "插入模式(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    GROUPBOX "Code Page", -1, 7, 170, 238, 31
+    AUTOCHECKBOX "丟棄舊的副本(&D)", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
+    GROUPBOX "編輯選項", IDC_STATIC, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP
+    AUTOCHECKBOX "快速編輯模式(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "插入模式(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "Code Page", IDC_STATIC, 7, 170, 238, 31
     COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -36,19 +36,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "字型"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    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_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL
-    LTEXT "&字型(&F)：", -1, 10, 105, 33, 10
-    CHECKBOX "粗體(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | 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
+    LTEXT "視窗預覽：", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    LTEXT "大小：", IDC_STATIC, 130, 7, 45, 10
+    LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 50, 86, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_CBOX_FONTSIZE, 130, 20, 30, 86, CBS_SIMPLE | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    AUTORADIOBUTTON "pi&xels", IDC_RADIO_PIXEL_UNIT, 165, 17, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "&points", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&字型(&F)：", IDC_STATIC, 10, 105, 33, 10
+    AUTOCHECKBOX "粗體(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+    LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Selected Font", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50
+    CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE
+    LTEXT "每個字元為：", IDC_STATIC, 125, 166, 85, 10
+    LTEXT "螢幕畫素寬\n螢幕畫素高", IDC_STATIC, 138, 180, 100, 20
+    RTEXT "", IDC_FONT_SIZE_X, 124, 180, 10, 10
+    RTEXT "", IDC_FONT_SIZE_Y, 124, 188, 10, 10
 END
 
 IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
@@ -56,36 +59,36 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "佈局"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    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 "寬(&W)：", -1, 140, 28, 40, 10
-    LTEXT "高(&H)：", -1, 140, 46, 39, 10
+    LTEXT "視窗預覽：", IDC_STATIC, 7, 7, 115, 10
+    CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 7, 20, 115, 70, WS_EX_CLIENTEDGE
+    GROUPBOX "螢幕緩衝區大小", IDC_STATIC, 130, 12, 115, 50
+    LTEXT "寬(&W)：", IDC_STATIC, 140, 28, 40, 10
+    LTEXT "高(&H)：", IDC_STATIC, 140, 46, 39, 10
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14
     EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14
-    GROUPBOX "視窗大小", -1, 130, 65, 115, 47
-    LTEXT "寬(&I)", -1, 140, 78, 39, 10
-    LTEXT "高(&E)", -1, 140, 95, 37, 10
+    GROUPBOX "視窗大小", IDC_STATIC, 130, 65, 115, 47
+    LTEXT "寬(&I)", IDC_STATIC, 140, 78, 39, 10
+    LTEXT "高(&E)", IDC_STATIC, 140, 95, 37, 10
     EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14
-    GROUPBOX "視窗位置", -1, 130, 116, 115, 64
-    LTEXT "左(&L)：", -1, 140, 132, 38, 10
-    LTEXT "上(&T)：", -1, 140, 149, 40, 10
+    GROUPBOX "視窗位置", IDC_STATIC, 130, 116, 115, 64
+    LTEXT "左(&L)：", IDC_STATIC, 140, 132, 38, 10
+    LTEXT "上(&T)：", IDC_STATIC, 140, 149, 40, 10
     EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14
     EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
             UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14
-    CHECKBOX "由系統定位視窗(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
+    AUTOCHECKBOX "由系統定位視窗(&P)", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
 END
 
 IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
@@ -93,24 +96,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "顏色"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "螢幕文字(&T)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10
-    CONTROL "螢幕背景(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10
-    CONTROL "彈出視窗文字(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-    CONTROL "彈出視窗背景(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-    GROUPBOX "所選的顏色元件", -1, 129, 7, 118, 73
-    LTEXT "紅(&R)：", -1, 140, 25, 48, 10
+    AUTORADIOBUTTON "螢幕文字(&T)", IDC_RADIO_SCREEN_TEXT, 10, 12, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "螢幕背景(&B)", IDC_RADIO_SCREEN_BACKGROUND, 10, 30, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "彈出視窗文字(&P)", IDC_RADIO_POPUP_TEXT, 10, 48, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "彈出視窗背景(&U)", IDC_RADIO_POPUP_BACKGROUND, 10, 67, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    GROUPBOX "所選的顏色元件", IDC_STATIC, 129, 7, 118, 73
+    LTEXT "紅(&R)：", IDC_STATIC, 140, 25, 48, 10
     EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14
-    LTEXT "綠(&G)：", -1, 140, 42, 48, 10
+    LTEXT "綠(&G)：", IDC_STATIC, 140, 42, 48, 10
     EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14
-    LTEXT "藍(&B)：", -1, 140, 60, 48, 10
+    LTEXT "藍(&B)：", IDC_STATIC, 140, 60, 48, 10
     EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14
@@ -130,10 +129,10 @@ BEGIN
     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
+    GROUPBOX "預覽 (螢幕)", IDC_STATIC, 7, 111, 240, 40
+    CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20, WS_EX_CLIENTEDGE
+    GROUPBOX "預覽 (彈出)", IDC_STATIC, 7, 162, 240, 40
+    CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20, WS_EX_CLIENTEDGE
 END
 
 IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
@@ -141,10 +140,8 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "應用屬性"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "屬性僅對當前視窗生效(&A)", IDC_RADIO_APPLY_CURRENT,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10
-    CONTROL "儲存屬性，供以後具有相同標題的視窗使用(&S)", IDC_RADIO_APPLY_ALL,
-            "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
+    AUTORADIOBUTTON "屬性僅對當前視窗生效(&A)", IDC_RADIO_APPLY_CURRENT, 12, 12, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTORADIOBUTTON "儲存屬性，供以後具有相同標題的視窗使用(&S)", IDC_RADIO_APPLY_ALL, 12, 31, 207, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "確定", IDOK, 58, 58, 50, 14, WS_VISIBLE
     PUSHBUTTON "取消", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
 END
@@ -155,4 +152,5 @@ BEGIN
     IDS_CPLDESCRIPTION "配置控制檯屬性。"
     IDS_APPLY_SHORTCUT_ALL "修改啟動此視窗的快捷方式(&S)"
     IDS_RASTERFONTS "Raster 字型"
+    IDS_GROUPBOX_FONT_NAME "Selected Font: "
 END

diff --git a/reactos/dll/cpl/console/resource.h b/reactos/dll/cpl/console/resource.h
index cf9ca0e..50fa3db 100644 (file)
--- a/reactos/dll/cpl/console/resource.h
+++ b/reactos/dll/cpl/console/resource.h
@@ -1,9 +1,13 @@
 #pragma once
 
-#define IDC_CPLICON            40
-#define IDS_CPLNAME            41
-#define IDS_CPLDESCRIPTION     42
-#define IDS_APPLY_SHORTCUT_ALL 43
+#ifndef IDC_STATIC
+#define IDC_STATIC  -1
+#endif
+
+#define IDC_CPLICON             40
+#define IDS_CPLNAME             41
+#define IDS_CPLDESCRIPTION      42
+#define IDS_APPLY_SHORTCUT_ALL  43
 
 #define IDD_PROPPAGEOPTIONS 100
 #define IDD_PROPPAGEFONT    101
@@ -12,49 +16,52 @@
 #define IDD_APPLYOPTIONS    104
 
 /* Options dialog */
-#define IDC_CHECK_QUICK_EDIT         200
-#define IDC_CHECK_INSERT_MODE        201
-#define IDC_CHECK_DISCARD_DUPLICATES 202
-#define IDC_EDIT_BUFFER_SIZE         203
-#define IDC_UPDOWN_BUFFER_SIZE       204
-#define IDC_EDIT_NUM_BUFFER          205
-#define IDC_UPDOWN_NUM_BUFFER        206
-#define IDC_RADIO_SMALL_CURSOR       207
-#define IDC_RADIO_MEDIUM_CURSOR      208
-#define IDC_RADIO_LARGE_CURSOR       209
-#define IDC_RADIO_DISPLAY_WINDOW     210
-#define IDC_RADIO_DISPLAY_FULL       211
-#define IDL_CODEPAGE                 212
+#define IDC_CHECK_QUICK_EDIT            200
+#define IDC_CHECK_INSERT_MODE           201
+#define IDC_CHECK_DISCARD_DUPLICATES    202
+#define IDC_EDIT_BUFFER_SIZE            203
+#define IDC_UPDOWN_BUFFER_SIZE          204
+#define IDC_EDIT_NUM_BUFFER             205
+#define IDC_UPDOWN_NUM_BUFFER           206
+#define IDC_RADIO_SMALL_CURSOR          207
+#define IDC_RADIO_MEDIUM_CURSOR         208
+#define IDC_RADIO_LARGE_CURSOR          209
+#define IDC_RADIO_DISPLAY_WINDOW        210
+#define IDC_RADIO_DISPLAY_FULL          211
+#define IDL_CODEPAGE                    212
 
 /* Apply dialog */
 #define IDC_RADIO_APPLY_ALL     300
 #define IDC_RADIO_APPLY_CURRENT 301
 
 /* Font dialog */
-#define IDC_CHECK_BOLD_FONTS           400
-#define IDC_STATIC_SELECT_FONT_PREVIEW 401
-#define IDC_FONT_SIZE_X                402
-#define IDC_FONT_SIZE_Y                403
-#define IDC_LBOX_FONTSIZE              404
-#define IDC_STATIC_FONT_WINDOW_PREVIEW 405
-#define IDC_LBOX_FONTTYPE              406
-#define IDC_GROUPBOX_FONT_NAME         407
+#define IDC_CHECK_BOLD_FONTS            400
+#define IDC_STATIC_SELECT_FONT_PREVIEW  401
+#define IDC_FONT_SIZE_X                 402
+#define IDC_FONT_SIZE_Y                 403
+#define IDC_LBOX_FONTSIZE               404
+#define IDC_CBOX_FONTSIZE               405
+#define IDC_RADIO_PIXEL_UNIT            406
+#define IDC_RADIO_POINT_UNIT            407
+#define IDC_STATIC_FONT_WINDOW_PREVIEW  408
+#define IDC_LBOX_FONTTYPE               409
+#define IDC_GROUPBOX_FONT_NAME          410
 
 /* Layout dialog */
-#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH   500
-#define IDC_EDIT_SCREEN_BUFFER_WIDTH     501
-#define IDC_EDIT_SCREEN_BUFFER_HEIGHT    502
-#define IDC_UPDOWN_SCREEN_BUFFER_HEIGHT  503
-#define IDC_EDIT_WINDOW_SIZE_WIDTH       504
-#define IDC_UPDOWN_WINDOW_SIZE_WIDTH     505
-#define IDC_EDIT_WINDOW_SIZE_HEIGHT      506
-#define IDC_UPDOWN_WINDOW_SIZE_HEIGHT    507
-#define IDC_EDIT_WINDOW_POS_LEFT         508
-#define IDC_UPDOWN_WINDOW_POS_LEFT       509
-#define IDC_EDIT_WINDOW_POS_TOP          510
-#define IDC_UPDOWN_WINDOW_POS_TOP        511
-#define IDC_CHECK_SYSTEM_POS_WINDOW      512
-#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513
+#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH      500
+#define IDC_EDIT_SCREEN_BUFFER_WIDTH        501
+#define IDC_EDIT_SCREEN_BUFFER_HEIGHT       502
+#define IDC_UPDOWN_SCREEN_BUFFER_HEIGHT     503
+#define IDC_EDIT_WINDOW_SIZE_WIDTH          504
+#define IDC_UPDOWN_WINDOW_SIZE_WIDTH        505
+#define IDC_EDIT_WINDOW_SIZE_HEIGHT         506
+#define IDC_UPDOWN_WINDOW_SIZE_HEIGHT       507
+#define IDC_EDIT_WINDOW_POS_LEFT            508
+#define IDC_UPDOWN_WINDOW_POS_LEFT          509
+#define IDC_EDIT_WINDOW_POS_TOP             510
+#define IDC_UPDOWN_WINDOW_POS_TOP           511
+#define IDC_CHECK_SYSTEM_POS_WINDOW         512
+#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW    513
 
 /* Color dialog */
 
@@ -71,22 +78,23 @@
 #define IDC_STATIC_SCREEN_COLOR     610
 #define IDC_STATIC_POPUP_COLOR      611
 
-#define IDC_STATIC_COLOR1  612
-#define IDC_STATIC_COLOR2  613
-#define IDC_STATIC_COLOR3  614
-#define IDC_STATIC_COLOR4  615
-#define IDC_STATIC_COLOR5  616
-#define IDC_STATIC_COLOR6  617
-#define IDC_STATIC_COLOR7  618
-#define IDC_STATIC_COLOR8  619
-#define IDC_STATIC_COLOR9  620
-#define IDC_STATIC_COLOR10 621
-#define IDC_STATIC_COLOR11 622
-#define IDC_STATIC_COLOR12 623
-#define IDC_STATIC_COLOR13 624
-#define IDC_STATIC_COLOR14 625
-#define IDC_STATIC_COLOR15 626
-#define IDC_STATIC_COLOR16 627
+#define IDC_STATIC_COLOR1   612
+#define IDC_STATIC_COLOR2   613
+#define IDC_STATIC_COLOR3   614
+#define IDC_STATIC_COLOR4   615
+#define IDC_STATIC_COLOR5   616
+#define IDC_STATIC_COLOR6   617
+#define IDC_STATIC_COLOR7   618
+#define IDC_STATIC_COLOR8   619
+#define IDC_STATIC_COLOR9   620
+#define IDC_STATIC_COLOR10  621
+#define IDC_STATIC_COLOR11  622
+#define IDC_STATIC_COLOR12  623
+#define IDC_STATIC_COLOR13  624
+#define IDC_STATIC_COLOR14  625
+#define IDC_STATIC_COLOR15  626
+#define IDC_STATIC_COLOR16  627
 
 /* String IDs */
-#define IDS_RASTERFONTS 700
+#define IDS_RASTERFONTS         700
+#define IDS_GROUPBOX_FONT_NAME  701