diff --git a/reactos/base/applications/msconfig_new/CMakeLists.txt b/reactos/base/applications/msconfig_new/CMakeLists.txt index d379c224685..9a903e4f004 100644 --- a/reactos/base/applications/msconfig_new/CMakeLists.txt +++ b/reactos/base/applications/msconfig_new/CMakeLists.txt @@ -2,11 +2,11 @@ PROJECT(msconfig_new) list(APPEND SOURCE - toolspage.c - srvpage.c - systempage.c - startuppage.c - freeldrpage.c + # toolspage.c + # srvpage.c + # systempage.c + # startuppage.c + # freeldrpage.c generalpage.c msconfig.c stringutils.c diff --git a/reactos/base/applications/msconfig_new/generalpage.c b/reactos/base/applications/msconfig_new/generalpage.c index 468f68eee63..a5fd5393758 100644 --- a/reactos/base/applications/msconfig_new/generalpage.c +++ b/reactos/base/applications/msconfig_new/generalpage.c @@ -9,17 +9,43 @@ #include "precomp.h" -HWND hGeneralPage; -HWND hGeneralDialog; +static LPCWSTR lpszRestoreProgPath1 = L"%SystemRoot%\\System32\\rstrui.exe"; +static LPCWSTR lpszRestoreProgPath2 = L"%SystemRoot%\\System32\\restore\\rstrui.exe"; -VOID -EnableCheckboxControls(HWND hDlg, BOOL bEnable) +HWND hGeneralPage; + +#if 0 // TODO: Will be used later on... +static VOID EnableSelectiveStartupControls(BOOL bEnable) { - EnableWindow(GetDlgItem(hDlg, IDC_CBX_SYSTEM_INI), bEnable); - EnableWindow(GetDlgItem(hDlg, IDC_CBX_SYSTEM_SERVICE), bEnable); - EnableWindow(GetDlgItem(hDlg, IDC_CBX_STARTUP_ITEM), bEnable); + assert(hGeneralPage); + + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_LOAD_SYSTEM_SERVICES), bEnable); + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_LOAD_STARTUP_ITEMS) , bEnable); + + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_USE_ORIGINAL_BOOTCFG), bEnable); + + // EnableWindow(GetDlgItem(hGeneralPage, IDC_RB_USE_ORIGINAL_BOOTCAT), bEnable); + // EnableWindow(GetDlgItem(hGeneralPage, IDC_RB_USE_MODIFIED_BOOTCAT), (bEnable ? !bIsOriginalBootIni : FALSE)); + + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_SYSTEM_INI), bEnable); + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_WIN_INI) , bEnable); + + return; } +static VOID CheckSelectiveStartupControls(BOOL bCheck) +{ + assert(hGeneralPage); + + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_LOAD_SYSTEM_SERVICES), (bCheck ? BST_CHECKED : BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_LOAD_STARTUP_ITEMS) , (bCheck ? BST_CHECKED : BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_USE_ORIGINAL_BOOTCFG), (bCheck ? BST_CHECKED : BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_SYSTEM_INI) , (bCheck ? BST_CHECKED : BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_WIN_INI) , (bCheck ? BST_CHECKED : BST_UNCHECKED)); + + return; +} +#endif INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -28,26 +54,20 @@ GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { - case WM_INITDIALOG: - hGeneralDialog = hDlg; - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - /* FIXME */ - SendDlgItemMessage(hDlg, IDC_CBX_NORMAL_START, BM_SETCHECK, BST_CHECKED, 0); - EnableCheckboxControls(hDlg, FALSE); - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) + case WM_INITDIALOG: { - case IDC_CBX_NORMAL_START: - case IDC_CBX_DIAGNOSTIC_START: - EnableCheckboxControls(hDlg, FALSE); - break; - case IDC_CBX_SELECTIVE_STARTUP: - EnableCheckboxControls(hDlg, TRUE); - break; - default: - break; + hGeneralPage = hDlg; + PropSheet_UnChanged(hMainWnd, hGeneralPage); + +#if 0 + /* FIXME */ + SendDlgItemMessage(hDlg, IDC_RB_NORMAL_STARTUP, BM_SETCHECK, BST_CHECKED, 0); + EnableCheckboxControls(hDlg, FALSE); +#endif + + return TRUE; } } - return 0; + + return FALSE; } diff --git a/reactos/base/applications/msconfig_new/lang/bg-BG.rc b/reactos/base/applications/msconfig_new/lang/bg-BG.rc index 87fc1724c64..83a1d52b9cd 100644 --- a/reactos/base/applications/msconfig_new/lang/bg-BG.rc +++ b/reactos/base/applications/msconfig_new/lang/bg-BG.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Приложение за настройка на системата" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "Добре", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Помощ", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Отказ", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Прилагане", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Общи" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Нормално пускане", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Разследващо пускане", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Избираемо пускане", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Зареждане на файл S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Зареждане на файл &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Зареждане на системните услуги", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "З&ареждане на пусковите предмети", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Избор на пусканията", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Зареждане на всички водачи (драйвери) и услуги", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Зареждане само на основните водачи и услуги", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Изключване на всички", IDC_BTN_SERVICES_DEACTIVATE, 272, 155, 83, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Избор на пусканията", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Нормално пускане – зареждане на всички водачи (драйвери) и услуги", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Разследващо пускане- зареждане само на основните водачи и услуги ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Избираемо пускане", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "Зареждане на файл SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Зареждане на системните услуги", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Зареждане на пусковите предмети", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Направи подразбрано", IDC_BTN_SET_DEFAULT_BOOT, 135, 65, 78, 12 PUSHBUTTON "Премести на&горе", IDC_BTN_MOVE_UP_BOOT_OPTION, 213, 65, 66, 12 PUSHBUTTON "Премести на&долу", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Пускови настройки", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Пускови настройки", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Раз&ширени настройки...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 - LTEXT "&Изчакване:", -1, 265, 91, 40, 10 + LTEXT "&Изчакване:", IDC_STATIC, 265, 91, 40, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "сек.", -1, 340, 91, 15, 10 + LTEXT "сек.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Приложение за настройка на системата" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Общи" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Услуги" diff --git a/reactos/base/applications/msconfig_new/lang/ca-ES.rc b/reactos/base/applications/msconfig_new/lang/ca-ES.rc index d4926e068b7..187786ef8ff 100644 --- a/reactos/base/applications/msconfig_new/lang/ca-ES.rc +++ b/reactos/base/applications/msconfig_new/lang/ca-ES.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Progrma de configuracio del sistema" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "Acceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel·lar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Arrencada &Normal", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Arrencada de &Diagnostic", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Seleccio &Manual", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Processos del fitxer S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Processos del fitxer &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Serveis del sistema", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "P&rogrames del menu inici", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Seleccio d'arrencada", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Carrega tots els serveis i controladors", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Nomes carrega els seveis i controladors basics", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Deactivar-ho tot", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Seleccio d'arrencada", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Fes-ho per defecte", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "P&uja", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Baixa", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "&Opcions d'arrencada", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "&Opcions d'arrencada", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/&SAFEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Op&cions Avançades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "Temps:", -1, 280, 91, 30, 10 + LTEXT "Temps:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -123,13 +133,13 @@ END STRINGTABLE BEGIN - IDS_MSCONFIG "Programa de configuracio de sistema" + IDS_MSCONFIG "Programa de configuracio del sistema" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Serveis" diff --git a/reactos/base/applications/msconfig_new/lang/cs-CZ.rc b/reactos/base/applications/msconfig_new/lang/cs-CZ.rc index 6fd2cb512e6..946e5d07ac7 100644 --- a/reactos/base/applications/msconfig_new/lang/cs-CZ.rc +++ b/reactos/base/applications/msconfig_new/lang/cs-CZ.rc @@ -6,17 +6,40 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Nástroj pro konfiguraci systému" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Nápověda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Storno", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Použít", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Obecné" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Nor&mální spuštění", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostické spuštění", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Výběrové spuštění", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Zpracovat soubor S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Zpracovat soubor &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Načíst systémové služby", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "N&ačíst položky Po spuštění", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Výběr spuštění", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Načíst všechny ovladače zařízení a služby", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Načíst jen základní ovladače zařízení a služby", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -67,19 +90,6 @@ BEGIN PUSHBUTTON "&Zakázat vše", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Výběr spuštění", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Nor&mální spuštění - načíst všechny ovladače zařízení a služby", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostické spuštění - načíst jen základní ovladače zařízení a služby", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "&Výběrové spuštění", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Načíst systémové služby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "N&ačíst položky Po spuštění", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -90,16 +100,16 @@ BEGIN PUSHBUTTON "&Nastavit jako výchozí", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 75, 12 PUSHBUTTON "Posunout N&ahoru", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Posunout &Dolu", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Možnosti spuštění", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + GROUPBOX "Možnosti spuštění", IDC_STATIC, 10, 80, 250, 90,0,WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Upřesnit možnosti...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Limit:", -1, 280, 91, 30, 10 + LTEXT "&Limit:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sek.", -1, 340, 91, 15, 10 + LTEXT "sek.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -131,11 +141,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Nástroj pro konfiguraci systému" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Obecné" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Služby" diff --git a/reactos/base/applications/msconfig_new/lang/de-DE.rc b/reactos/base/applications/msconfig_new/lang/de-DE.rc index 21dd28e687a..859673cadaf 100644 --- a/reactos/base/applications/msconfig_new/lang/de-DE.rc +++ b/reactos/base/applications/msconfig_new/lang/de-DE.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Systemkonfiguration" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Hilfe", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Ü&bernehmen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normaler Systemstart", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnosesystemstart", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "B&enutzerdefinierter Systemstart", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Datei &WIN.INI verarbeiten", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Systemdienste laden", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "S&ystemstartelemente laden", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Systemstartauswahl", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Alle Gerätetreiber und Dienste laden", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Nur grundlegende Geräte und Dienste laden", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "Alle &deaktivieren", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Systemstartauswahl", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normaler Systemstart - Alle Gerätetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnosesystemstart - Nur grundlegende Geräte und Dienste laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "B&enutzerdefinierter Systemstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "A&ls Standard", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12 PUSHBUTTON "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12 PUSHBUTTON "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12 - GROUPBOX "Bootoptionen", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Bootoptionen", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "E&rweiterte Optionen...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 - LTEXT "&Zeitlimit:", -1, 280, 91, 30, 10 + LTEXT "&Zeitlimit:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "Sek.", -1, 340, 91, 15, 10 + LTEXT "Sek.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfiguration" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Allgemein" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Dienste" diff --git a/reactos/base/applications/msconfig_new/lang/el-GR.rc b/reactos/base/applications/msconfig_new/lang/el-GR.rc index ab3346ec8df..cad6f5019b7 100644 --- a/reactos/base/applications/msconfig_new/lang/el-GR.rc +++ b/reactos/base/applications/msconfig_new/lang/el-GR.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Πρόγραμμα παραμετροποίησης συστήματος" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Βοήθεια", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Ακύρωση", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Εφαρμογή", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Γενικά" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selective Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Process S&YSTEM.INI File", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Process &WIN.INI File", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Φόρτωση υπηρεσιών συστήματων", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Φό&ρτωση Startup αντικειμένων", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Επιλογή εκκίνησης", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Load all device drivers and services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Load basic devices and services only", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Απενεργοποίηση όλων", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Επιλογή εκκίνησης", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Φόρτωση υπηρεσιών συστήματων", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Φό&ρτωση Startup αντικειμένων", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Boot Options", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Boot Options", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Επιλογές για &προχωρημένους...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Timeout:", -1, 280, 91, 30, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "δευτ.", -1, 340, 91, 15, 10 + LTEXT "δευτ.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Πρόγραμμα παραμετροποίησης συστήματος" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Γενικά" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Υπηρεσίες" diff --git a/reactos/base/applications/msconfig_new/lang/en-US.rc b/reactos/base/applications/msconfig_new/lang/en-US.rc index 32333ae1de7..25107a3b9c9 100644 --- a/reactos/base/applications/msconfig_new/lang/en-US.rc +++ b/reactos/base/applications/msconfig_new/lang/en-US.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "System configuration program" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Help", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Apply", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Herms BLUSCA - MATO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selective Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Process S&YSTEM.INI File", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Process &WIN.INI File", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Load System Services", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "L&oad Startup Items", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Startup Selection", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Load all device drivers and services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Load basic devices and services only", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Deactivate all", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Boot Options", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Boot Options", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Timeout:", -1, 280, 91, 30, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "System configuration program" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Services" diff --git a/reactos/base/applications/msconfig_new/lang/es-ES.rc b/reactos/base/applications/msconfig_new/lang/es-ES.rc index 88bd8dabc8f..e9f3eb06686 100644 --- a/reactos/base/applications/msconfig_new/lang/es-ES.rc +++ b/reactos/base/applications/msconfig_new/lang/es-ES.rc @@ -1,19 +1,42 @@ /* Spanish Language resource file. - * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */ + * Translated by: ?? and Ismael Ferreras Morezuelas <2014IDC_STATIC1-07> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Utilidad de configuración del sistema" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "Aceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ayuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Inicio &normal", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Inicio de &diagnóstico", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Inicio s&electivo", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Procesar archivo S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Procesar archivo &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Cargar servicios del sistema", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "C&argar elementos de inicio", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Selección de inicio", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Cargar todos los controladores de unidades y servicios", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Cargar sólo los controladores y servicios básicos", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -64,19 +87,6 @@ BEGIN PUSHBUTTON "&Desactivar todo", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Selección de inicio ", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Inicio &normal - Cargar todos los controladores de unidades y servicios", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Inicio de &diagnóstico - Cargar sólo los controladores y servicios básicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Inicio s&electivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Cargar servicios del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "C&argar elementos de inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -87,16 +97,16 @@ BEGIN PUSHBUTTON "&Configurar por defecto", IDC_BTN_SET_DEFAULT_BOOT, 130, 65, 80, 12 PUSHBUTTON "&Subir", IDC_BTN_MOVE_UP_BOOT_OPTION, 220, 65, 60, 12 PUSHBUTTON "&Bajar", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 290, 65, 60, 12 - GROUPBOX "Opciones de arranque", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Opciones de arranque", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Opciones a&vanzadas...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 80, 12 - LTEXT "&Tiempo máx:", -1, 280, 86, 30, 16 + LTEXT "&Tiempo máx:", IDC_STATIC, 280, 86, 30, 16 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "seg.", -1, 340, 91, 15, 10 + LTEXT "seg.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -128,11 +138,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Utilidad de configuración del sistema" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Servicios" diff --git a/reactos/base/applications/msconfig_new/lang/fr-FR.rc b/reactos/base/applications/msconfig_new/lang/fr-FR.rc index ea16619e88b..e95887e9f2b 100644 --- a/reactos/base/applications/msconfig_new/lang/fr-FR.rc +++ b/reactos/base/applications/msconfig_new/lang/fr-FR.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Utilitaire de configuration système" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "À propos de l'Utilitaire de configuration système" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Aide", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Annuler", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "A&ppliquer", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "Utilitaire de configuration système\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Démarrage &normal", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Démarrage en mode &diagnostic", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Démarrage &sélectif", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Exécuter le fichier S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Exécuter le fichier &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "C&harger les services système", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "&Charger les éléments de démarrage", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Utiliser la configuration de démarrage d’origine", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Exéc&uter la restauration du système", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "E&xtraire le fichier...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Sélection du mode de démarrage ", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Charger tous les pilotes de périphériques et tous les services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Charger seulement les pilotes de périphérique et les services de base", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Désactiver tout", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Sélection du mode de démarrage ", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Démarrage &normal - charge tous les pilotes et tous les services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Démarrage en mode &diagnostic - charge les périphériques de base et les services seulement", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Démarrage &sélectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "T&raiter le fichier System.ini", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Charger les Services Système", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Charger les éléments de démarrage", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Par Défaut", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "&Monter", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Descendre", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Options de démarrage", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Options de démarrage", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Options A&vancées...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Délai:", -1, 280, 91, 30, 10 + LTEXT "&Délai:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "secondes", -1, 340, 91, 15, 10 + LTEXT "secondes", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Utilitaire de configuration système" IDS_MSCONFIG_2 "Configuration du système" + IDS_ABOUT "À &propos de...\tMaj+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Général" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Services" diff --git a/reactos/base/applications/msconfig_new/lang/he-IL.rc b/reactos/base/applications/msconfig_new/lang/he-IL.rc index 311e2ac3223..71755f79537 100644 --- a/reactos/base/applications/msconfig_new/lang/he-IL.rc +++ b/reactos/base/applications/msconfig_new/lang/he-IL.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "כלי שירות לקביעת תצורת המערכת" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "אישור", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&עזרה", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ביטול", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "החל", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selective Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "עבד את הקובץ SYSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "עבד את הקובץ WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&טען שירותי מערכת", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "טען פריטי אתחול", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "בחירת אתחול", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Load all device drivers and services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Load basic devices and services only", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "בטל הכל", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "בחירת אתחול", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "אתחול רגיל - טען את כל מנהלי ההתקנים והשירותים", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "אתחול מאבחן - טען התקנים ושירותים בסיסיים בלבד", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "אתחול סלקטיבי", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "עבד את הקובץ SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&טען שירותי מערכת", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "טען פריטי אתחול", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&קבע כברירת מחדל", IDC_BTN_SET_DEFAULT_BOOT, 198, 65, 70, 12 PUSHBUTTON "הזז למעלה", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "הזז למטה", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "אפשרויות אתחול", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "אפשרויות אתחול", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&אפשרויות מתקדמות", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "זמן קצוב:", -1, 280, 91, 30, 10 + LTEXT "זמן קצוב:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 303, 90, 25, 12, ES_LEFT - LTEXT "שניות", -1, 330, 91, 21, 10 + LTEXT "שניות", IDC_STATIC, 330, 91, 21, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "כלי שירות לקביעת תצורת המערכת" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "כללי" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "שירותים" diff --git a/reactos/base/applications/msconfig_new/lang/hu-HU.rc b/reactos/base/applications/msconfig_new/lang/hu-HU.rc index 043b258b726..e733d9f3bb9 100644 --- a/reactos/base/applications/msconfig_new/lang/hu-HU.rc +++ b/reactos/base/applications/msconfig_new/lang/hu-HU.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Rendszerbeállítások" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Súgó", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Mégse", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Alkalmaz", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Általános" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selective Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Process S&YSTEM.INI File", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Process &WIN.INI File", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Load System Services", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "L&oad Startup Items", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Startup Selection", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Load all device drivers and services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Load basic devices and services only", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "Mindet &kikapcsol", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Boot Options", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Boot Options", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Timeout:", -1, 280, 91, 30, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -126,12 +136,12 @@ END STRINGTABLE BEGIN IDS_MSCONFIG "Rendszerkonfiguráciüs segédprogram" - IDS_MSCONFIG_2 "System Configuration" + IDS_MSCONFIG_2 "Rendszerkonfiguráció" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Általános" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Szolgáltatások" diff --git a/reactos/base/applications/msconfig_new/lang/id-ID.rc b/reactos/base/applications/msconfig_new/lang/id-ID.rc index 243e089b047..e774740a654 100644 --- a/reactos/base/applications/msconfig_new/lang/id-ID.rc +++ b/reactos/base/applications/msconfig_new/lang/id-ID.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Program konfigurasi sistem" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Bantuan", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Batal", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Terapkan", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Herms BLUSCA - MATO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Umum" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostik Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "S&elektif Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Proses File S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Proses File &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Ambil Layanan Sistem", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Amb&il Item Startup", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Pilihan Startup", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Mengambil semua device drivers dan layanan", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Mengambil hanya devices dan layanan dasar", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Deaktivasi semua", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Pilihan Startup", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startup - mengambil semua device drivers dan layanan", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostik Startup - mengambil hanya devices dan layanan dasar", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elektif Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&roses File SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Ambil Layanan Sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Amb&il Item Startup", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Set sebagai Standar", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "&Naik", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Turun", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Opsi Boot", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Opsi Boot", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Opsi &Lanjutan...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Berakhir:", -1, 280, 91, 30, 10 + LTEXT "&Berakhir:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "detik", -1, 340, 91, 15, 10 + LTEXT "detik", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Program konfigurasi sistem" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Umum" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Layanan" diff --git a/reactos/base/applications/msconfig_new/lang/it-IT.rc b/reactos/base/applications/msconfig_new/lang/it-IT.rc index b67be6446bc..74b8e6ec800 100644 --- a/reactos/base/applications/msconfig_new/lang/it-IT.rc +++ b/reactos/base/applications/msconfig_new/lang/it-IT.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Utilità di Configurazione del Sistema" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&?", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Annulla", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Applica", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Avvio &normale", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Avvio &diagnostico", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Avvio &selettivo", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Elabora il file S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Elabora il file &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Carica servizi di sistema", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Carica elemen&ti di avvio", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Selezione avvio", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Carica tutti i driver di periferica e i servizi", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Carica soltanto le periferiche e i servizi di base", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "Disabi&lita tutto", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Selezione avvio", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Imposta come predefinito", IDC_BTN_SET_DEFAULT_BOOT, 93, 64, 85, 14 PUSHBUTTON "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 183, 64, 85, 14 PUSHBUTTON "S&posta giù", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 273, 64, 85, 14 - GROUPBOX "Opzioni di Avvio", -1, 3, 80, 250, 90,0,WS_EX_TRANSPARENT + GROUPBOX "Opzioni di Avvio", IDC_STATIC, 3, 80, 250, 90,0,WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 148, 70, 16 - LTEXT "&Timeout:", -1, 280, 91, 30, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,6 +135,7 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Utilità di configurazione del sistema" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE diff --git a/reactos/base/applications/msconfig_new/lang/ko-KR.rc b/reactos/base/applications/msconfig_new/lang/ko-KR.rc index 4430eec9e7a..32dd0c1c6cb 100644 --- a/reactos/base/applications/msconfig_new/lang/ko-KR.rc +++ b/reactos/base/applications/msconfig_new/lang/ko-KR.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "시스템 설정 프로그램" -FONT 9, "MS Shell Dlg" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" +FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "확인", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "도움말(&H)", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "취소", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "적용", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "일반" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "보통 시작(&N)", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "진단 시작(&D)", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "선택적 시작(&S)", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "SYSTEM.INI 파일 처리(&Y)", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "WIN.INI 파일 처리(&W)", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "시스템 서비스 로드(&L)", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "시작프로그램 로드(&O)", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "사작 옵션", IDC_STATIC, 5, 5, 356, 145 + LTEXT "모든 드라이버와 서비스 로드", IDC_STATIC, 25, 30, 322, 10 + LTEXT "기본적 드라이버와 서비스만 로드", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "모두 비활성화(&D)", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "사작 옵션", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "보통 시작(&N) - 모든 드라이버와 서비스 로드", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "진단 시작(&D) - 기본적 드라이버와 서비스만 로드", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "선택적 시작(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "SYSTEM.INI 파일 처리(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "시스템 서비스 로드(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "시작프로그램 로드(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "기본값으로 설정(&S)", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "위로 움직이기(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "밑으로 움직이기(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "부트 옵션", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "부트 옵션", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "더 많은 옵션...(&V)", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "시간제한(&T)", -1, 280, 91, 30, 10 + LTEXT "시간제한(&T)", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "초", -1, 340, 91, 15, 10 + LTEXT "초", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,13 +135,13 @@ END STRINGTABLE BEGIN - IDS_MSCONFIG "System 설정 프로그램" + IDS_MSCONFIG "시스템 설정 프로그램" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "일반" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "서비스" diff --git a/reactos/base/applications/msconfig_new/lang/nl-NL.rc b/reactos/base/applications/msconfig_new/lang/nl-NL.rc index 20b68d5d51f..491ac6ffaf2 100644 --- a/reactos/base/applications/msconfig_new/lang/nl-NL.rc +++ b/reactos/base/applications/msconfig_new/lang/nl-NL.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Hulpprogramma voor systeemconfiguratie" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Help", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Annuleren", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Toepassen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Herms BLUSCA - MATO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Algemeen" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normaal opstarten", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostisch opstarten", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Se&lectief opstarten", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Het S&YSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Het &WIN.INI-bestand verwerken", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "Systeemservices &in het geheugen laden", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "&Opstartonderdelen in het geheugen laden", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Type opstartprocedure", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Alleen elementaire stuurprogramma's en services in het geheugen laden", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "Alles &uitschakelen", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Type opstartprocedure", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostisch opstarten - alleen elementaire stuurprogramma's en services in het geheugen laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Se&lectief opstarten", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Het SYSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Systeemservices &in het geheugen laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "&Opstartonderdelen in het geheugen laden", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "Als stan&daard instellen", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "&Omhoog", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Om&laag", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Opstartopties", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Opstartopties", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Geavanceerde opties...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "Time-&out:", -1, 280, 91, 30, 10 + LTEXT "Time-&out:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Algemeen" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Services" diff --git a/reactos/base/applications/msconfig_new/lang/no-NO.rc b/reactos/base/applications/msconfig_new/lang/no-NO.rc index 1f8c7477cb9..466f995c5c7 100644 --- a/reactos/base/applications/msconfig_new/lang/no-NO.rc +++ b/reactos/base/applications/msconfig_new/lang/no-NO.rc @@ -1,16 +1,39 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Systemkonfigurasjon" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Hjelp", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Bruk", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal oppstart", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnose oppstart", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selektiv oppstart", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Last inn S&YSTEM.INI Filen", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Last inn &WIN.INI Filen", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Last inn Systemtjenester", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Las&t inn oppstartselementet", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Oppstarts valg", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Last inn alle enhetsdrivere og tjenester", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Last bare inn grunnleggende enheter og tjenester", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -61,19 +84,6 @@ BEGIN PUSHBUTTON "&Deaktivere alt", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Oppstarts valg", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal oppstart - last inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Last inn Systemtjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -84,16 +94,16 @@ BEGIN PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Flytt &opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Flytt &ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 95, 0, WS_EX_TRANSPARENT + GROUPBOX "Oppstarts alternativer", IDC_STATIC, 10, 80, 250, 95, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 93, 12 - LTEXT "&Tidsavbrudd:", -1, 280, 91, 70, 10 + LTEXT "&Tidsavbrudd:", IDC_STATIC, 280, 91, 70, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 100, 25, 12, ES_LEFT - LTEXT "sekunder", -1, 310, 100, 85, 10 + LTEXT "sekunder", IDC_STATIC, 310, 100, 85, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,11 +135,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfigurasjon" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Generelt" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Tjenester" diff --git a/reactos/base/applications/msconfig_new/lang/pl-PL.rc b/reactos/base/applications/msconfig_new/lang/pl-PL.rc index 904de1443d0..415020c4274 100644 --- a/reactos/base/applications/msconfig_new/lang/pl-PL.rc +++ b/reactos/base/applications/msconfig_new/lang/pl-PL.rc @@ -8,17 +8,40 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Program konfiguracji systemu" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Pomo&c", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Zastosuj", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Uruchamianie &normalne", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Uruchamianie &diagnostyczne", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Uruchamianie &selektywne", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Przetwarzaj plik S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Przetwarzaj plik &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "Załaduj &usługi systemowe", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Załaduj &elementy startowe", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Wybór uruchamiania", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Załaduj wszystkie sterowniki urządzeń i usługi", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Załaduj tylko podstawowe urządzenia i usługi", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -69,19 +92,6 @@ BEGIN PUSHBUTTON "Wyłącz wszy&stkie", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Wybór uruchamiania", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Uruchamianie &normalne - załaduj wszystkie sterowniki urządzeń i usługi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Uruchamianie &diagnostyczne - załaduj tylko podstawowe urządzenia i usługi", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Uruchamianie &selektywne", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Przetwarzaj plik SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Załaduj &usługi systemowe", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Załaduj &elementy startowe", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -92,16 +102,16 @@ BEGIN PUSHBUTTON "&Ustaw jako domyślne", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Przenieś w &górę", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Przenieś w &dół", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Opcje rozruchu", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + GROUPBOX "Opcje rozruchu", IDC_STATIC, 10, 80, 250, 90,0,WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Opcje zaawansowane...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Limit czasu:", -1, 280, 91, 30, 10 + LTEXT "&Limit czasu:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "s", -1, 340, 91, 15, 10 + LTEXT "s", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -133,11 +143,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Program konfiguracji systemu" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Ogólne" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Usługi" diff --git a/reactos/base/applications/msconfig_new/lang/pt-BR.rc b/reactos/base/applications/msconfig_new/lang/pt-BR.rc index 8a09f47c367..df5d0c76373 100644 --- a/reactos/base/applications/msconfig_new/lang/pt-BR.rc +++ b/reactos/base/applications/msconfig_new/lang/pt-BR.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Programa de configuração do sistema" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Inicialização normal", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "I&nicialização de diagnóstico", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Ini&cialização seletiva", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Processar o arquivo S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Processar o arquivo &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "Carr&egar serviços do sistema", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Carregar i&tens de inicialização", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Seleção de inicialização", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Carregar todos os drivers de dispositivo e serviços", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Carregar apenas dispositivos e serviços básicos", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "D&esativar tudo", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Seleção de inicialização", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Inicialização normal - carregar todos os drivers de dispositivo e serviços", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "I&nicialização de diagnóstico - carregar apenas dispositivos e serviços básicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Ini&cialização seletiva", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Processar o arquivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Carr&egar serviços do sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Carregar i&tens de inicialização", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&Definir como padrão", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Mo&ver para cima", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Mover para bai&xo", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Opções de inicialização", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Opções de inicialização", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Opçõe&s avançadas...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Tempo limite:", -1, 280, 91, 30, 10 + LTEXT "&Tempo limite:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "segundos", -1, 340, 91, 15, 10 + LTEXT "segundos", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Programa de configuração do sistema" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Geral" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Serviços" diff --git a/reactos/base/applications/msconfig_new/lang/ro-RO.rc b/reactos/base/applications/msconfig_new/lang/ro-RO.rc index 223629477b4..1b9b4719746 100644 --- a/reactos/base/applications/msconfig_new/lang/ro-RO.rc +++ b/reactos/base/applications/msconfig_new/lang/ro-RO.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Program de configurare sistem" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "Con&firmă", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Manual…", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "A&nulează", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Aplică", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Pornire normală", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "Pornire de &diagnostic", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Pornire &selectivă", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Procesează fișierul S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Procesează fișierul &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "În&carcă serviciile de sistem", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Încarcă &elementele autolansate", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Moduri de pornire sistem", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Încarcă toate serviciile și modulele-pilot", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Încarcă doar modulele-pilot de bază", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "&Dezactivează toate", IDC_BTN_SERVICES_DEACTIVATE, 285, 155, 76, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Moduri de pornire sistem", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Pornire normală - încarcă toate serviciile și modulele-pilot", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Pornire de &diagnostic - încarcă doar modulele-pilot de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Pornire &selectivă", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocesează fișierul SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "În&carcă serviciile de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Încarcă &elementele autolansate", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&Implicite", IDC_BTN_SET_DEFAULT_BOOT, 165, 65, 55, 12 PUSHBUTTON "Mută &sus", IDC_BTN_MOVE_UP_BOOT_OPTION, 230, 65, 55, 12 PUSHBUTTON "Mută j&os", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 295, 65, 55, 12 - GROUPBOX "Parametri de pornire", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Parametri de pornire", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SAFE&BOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/NO&GUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/BOOT&LOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BASEVI&DEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/&SOS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Opți&uni avansate…", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 80, 12 - LTEXT "&Expirare:", -1, 280, 91, 30, 10 + LTEXT "&Expirare:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,13 +135,13 @@ END STRINGTABLE BEGIN - IDS_MSCONFIG "Configuratorul de sistem" + IDS_MSCONFIG "Configuratorul de sistem" // "Program de configurare sistem" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Generale" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Servicii" diff --git a/reactos/base/applications/msconfig_new/lang/ru-RU.rc b/reactos/base/applications/msconfig_new/lang/ru-RU.rc index e3814d3f778..556babd51e0 100644 --- a/reactos/base/applications/msconfig_new/lang/ru-RU.rc +++ b/reactos/base/applications/msconfig_new/lang/ru-RU.rc @@ -1,18 +1,41 @@ -/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */ +/* Russian language resource file (Dmitry Chapyshev, 2007-06IDC_STATIC0) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Настройки системы" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Справка", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Отмена", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Применить", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Общие" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Обычный запуск", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Диагностический запуск", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Выборочный запуск", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Обрабатывать файл S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Обрабатывать файл &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Загружать системные службы", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "З&агружать элементы автозагрузки", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Варианты запуска", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Загрузка всех драйверов устройств и запуск всех служб", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Загрузка только основных драйверов и запуск основных служб", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "В&ыключить все", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Варианты запуска", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Обычный запуск - загрузка всех драйверов устройств и запуск всех служб", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 280, 10 - CONTROL "&Диагностический запуск - загрузка только основных драйверов и запуск основных служб", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 325, 10 - CONTROL "&Выборочный запуск:", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "О&брабатывать файл SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Загружать системные службы", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "З&агружать элементы автозагрузки", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "П&о умолчанию", IDC_BTN_SET_DEFAULT_BOOT, 125, 65, 70, 12 PUSHBUTTON "&Вверх", IDC_BTN_MOVE_UP_BOOT_OPTION, 200, 65, 70, 12 PUSHBUTTON "В&низ", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 275, 65, 70, 12 - GROUPBOX "Параметры загрузки", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Параметры загрузки", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Дополнительно...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Таймаут:", -1, 280, 82, 30, 10 + LTEXT "&Таймаут:", IDC_STATIC, 280, 82, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 93, 25, 12, ES_LEFT - LTEXT "сек.", -1, 310, 91, 15, 10 + LTEXT "сек.", IDC_STATIC, 310, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -125,13 +135,13 @@ END STRINGTABLE BEGIN - IDS_MSCONFIG "Настройка системы" - IDS_MSCONFIG_2 "System Configuration" + IDS_MSCONFIG "Настройки системы" + IDS_MSCONFIG_2 "Конфигурация системы" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Общие" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Службы" diff --git a/reactos/base/applications/msconfig_new/lang/sk-SK.rc b/reactos/base/applications/msconfig_new/lang/sk-SK.rc index b2d93f3f9a4..bf7054b3f43 100644 --- a/reactos/base/applications/msconfig_new/lang/sk-SK.rc +++ b/reactos/base/applications/msconfig_new/lang/sk-SK.rc @@ -4,17 +4,40 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Program na konfiguráciu systému" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Pomocník", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Zrušiť", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "P&oužiť", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Všeobecné" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normálne spustenie", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostické spustenie", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Sele&ktívne spustenie", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Spracovať súbor S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Spracovať súbor &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "N&ačítať systé&mové služby", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Načí&tať položky Po spustení", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Výber spustenia", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Načítať všetky ovládače zariadení a služby", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Načítať iba základné zariadenia a služby", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -65,19 +88,6 @@ BEGIN PUSHBUTTON "&Deaktivovať všetky", IDC_BTN_SERVICES_DEACTIVATE, 285, 155, 76, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Výber spustenia", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normálne spustenie - načítať všetky ovládače zariadení a služby", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostické spustenie - načítať iba základné zariadenia a služby", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Sele&ktívne spustenie", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Spracovať súbor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Načítať systé&mové služby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "N&ačítať položky Po spustení", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -88,16 +98,16 @@ BEGIN PUSHBUTTON "&Predvoliť", IDC_BTN_SET_DEFAULT_BOOT, 145, 65, 60, 12 PUSHBUTTON "Posunúť na&hor", IDC_BTN_MOVE_UP_BOOT_OPTION, 210, 65, 70, 12 PUSHBUTTON "Posunúť na&dol", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 285, 65, 70, 12 - GROUPBOX "Možnosti zavedenia", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Možnosti zavedenia", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Rozšírené možnosti...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 80, 12 - LTEXT "Časový limi&t:", -1, 267, 91, 45, 10 + LTEXT "Časový limi&t:", IDC_STATIC, 267, 91, 45, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 315, 90, 25, 12, ES_LEFT - LTEXT "s", -1, 345, 91, 15, 10 + LTEXT "s", IDC_STATIC, 345, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -129,11 +139,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Program na konfiguráciu systému" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Všeobecné" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Služby" diff --git a/reactos/base/applications/msconfig_new/lang/sq-AL.rc b/reactos/base/applications/msconfig_new/lang/sq-AL.rc index 33c9a9cee20..f037c60fd17 100644 --- a/reactos/base/applications/msconfig_new/lang/sq-AL.rc +++ b/reactos/base/applications/msconfig_new/lang/sq-AL.rc @@ -1,20 +1,43 @@ /* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) - * DATE OF TR: 29-11-2013 -*/ + * DATE OF TR: 29IDC_STATIC1-2013 + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Programi konfigurues i Sistemit" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ndihmë", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Anulo", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Apliko", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startupi", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startupi", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "S&elective Startupi", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Process S&YSTEM.INI File", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Process &WIN.INI File", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "N&garko sherbimet e sistemit", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Ng&arko sendet e fillimit", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Përzgjedhje Startupi", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Ngarko te gjitha pajisjet dhe sherbimet", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Ngarko pajisjet baze dhe vetem sherbimet", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -65,19 +88,6 @@ BEGIN PUSHBUTTON "Q'kaptivizo gjithqka", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Përzgjedhje Startupi", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startupi - ngarko te gjitha pajisjet dhe sherbimet", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostic Startup - ngarko pajisjet baze dhe vetem sherbimet", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elective Startupi", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Ngarko sherbimet e sistemit", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Ngarko sendet e fillimit", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -88,16 +98,16 @@ BEGIN PUSHBUTTON "Vere te perzgjedhur", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Leviz lart", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Leviz poshte", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Opsionet e ndezjes", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Opsionet e ndezjes", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Timeout:", -1, 280, 91, 30, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -129,11 +139,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Programi i konfigurimit te sistemit" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Shërbimet" diff --git a/reactos/base/applications/msconfig_new/lang/sv-SE.rc b/reactos/base/applications/msconfig_new/lang/sv-SE.rc index a3cd754bbdb..ac7cef47428 100644 --- a/reactos/base/applications/msconfig_new/lang/sv-SE.rc +++ b/reactos/base/applications/msconfig_new/lang/sv-SE.rc @@ -7,17 +7,40 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Systemkonfigurastion" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Hjälp", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Verkställ", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Generellt" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal uppstart", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostisk uppstart", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selektiv uppstart", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Ladda in S&YSTEM.INI Filen", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Ladda in &WIN.INI Filen", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Ladda in Systemtjänster", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "L&adda in uppstartsprylar", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Uppstartsval", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Ladda in alla drivrutiner och tjänster", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Ladda bara in grundläggande drivrutiner och tjänster", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -68,19 +91,6 @@ BEGIN PUSHBUTTON "&Inaktivera allt", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Uppstartsval", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal uppstart - ladda in alla drivrutiner och tjänster", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostisk uppstart - ladda bara in grundläggande drivrutiner och tjänster", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "&Selektiv uppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "L&adda in SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Ladda in Systemtjänster", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "La&dda in uppstartsprylar", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -91,16 +101,16 @@ BEGIN PUSHBUTTON "&Sätt som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Flytta &upp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Flytta &ner", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Uppstarts alternativ", -1, 10, 80, 250, 95, 0, WS_EX_TRANSPARENT + GROUPBOX "Uppstarts alternativ", IDC_STATIC, 10, 80, 250, 95, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Av&ancerade alternativ...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 93, 12 - LTEXT "&Timeout:", -1, 280, 91, 70, 10 + LTEXT "&Timeout:", IDC_STATIC, 280, 91, 70, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 100, 25, 12, ES_LEFT - LTEXT "sekunder", -1, 310, 100, 85, 10 + LTEXT "sekunder", IDC_STATIC, 310, 100, 85, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -131,12 +141,12 @@ END STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfiguration" - IDS_MSCONFIG_2 "System Configuration" + IDS_MSCONFIG_2 "Systemkonfiguration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Generellt" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Tjänster" diff --git a/reactos/base/applications/msconfig_new/lang/th-TH.rc b/reactos/base/applications/msconfig_new/lang/th-TH.rc index f232448da2b..5b3a2eb2ea8 100644 --- a/reactos/base/applications/msconfig_new/lang/th-TH.rc +++ b/reactos/base/applications/msconfig_new/lang/th-TH.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "โปรแกรมโครงแบบระบบ" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "ตกลง", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&ช่วยเหลือ", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ยกเลิก", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ใช้ทันที", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "ทั่วไป" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Normal Startup", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Diagnostic Startup", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Selective Startup", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Process S&YSTEM.INI File", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Process &WIN.INI File", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "&Load System Services", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "L&oad Startup Items", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Startup Selection", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Load all device drivers and services", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Load basic devices and services only", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "&Deactivate all", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Startup Selection", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&ตั้งค่าโดยปริยาย", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "เคลื่อนที่ &ขึ้น", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "เคลื่อนที่ &ลง", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "ตัวเลือกการปลุกเครื่อง", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "ตัวเลือกการปลุกเครื่อง", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&ตัวเลือกระดับสูง...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&หมดเวลา:", -1, 280, 91, 30, 10 + LTEXT "&หมดเวลา:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "วินาที", -1, 340, 91, 15, 10 + LTEXT "วินาที", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "โปรแกรมโครงแบบระบบ" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "ทั่วไป" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "บริการ" diff --git a/reactos/base/applications/msconfig_new/lang/tr-TR.rc b/reactos/base/applications/msconfig_new/lang/tr-TR.rc index 8873a3b75e2..9bf817dd888 100644 --- a/reactos/base/applications/msconfig_new/lang/tr-TR.rc +++ b/reactos/base/applications/msconfig_new/lang/tr-TR.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Dizge Yapılandırma İzlencesi" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "Tamam", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Yardım", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "İptal", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Uygula", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Umûmî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Düzgülü Başlangıç", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Tanılama Başlangıcı", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "&Seçmeli Başlangıç", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "S&YSTEM.INI Kütüğünü İşle", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "&WIN.INI Kütüğünü İşle", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "D&izge Hizmetlerini Yükle", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "&Başlangıç Öğelerini Yükle", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Başlangıç Seçimi", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Tüm aygıt sürücülerini ve hizmetleri yükle.", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Yalnızca ana aygıtları ve ana hizmetleri yükle.", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "T&ümünü Edilginleştir", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Başlangıç Seçimi", -1, 10, 10, 340, 150,0, WS_EX_TRANSPARENT - CONTROL "&Düzgülü Başlangıç - Tüm aygıt sürücülerini ve hizmetleri yükle.", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Tanılama Başlangıcı - Yalnızca ana aygıtları ve ana hizmetleri yükle.", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "&Seçmeli Başlangıç", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "S&YSTEM.INI Kütüğünü İşle", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "D&izge Hizmetlerini Yükle", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "&Başlangıç Öğelerini Yükle", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "&Ön Tanımlı Olarak Ayarla", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "&Yukarı Taşı", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Aşağı Taşı", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Ön Yükleme Seçenekleri", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Ön Yükleme Seçenekleri", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Gelişmiş Seçenekler...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Süre Aşımı:", -1, 280, 91, 30, 10 + LTEXT "&Süre Aşımı:", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "s", -1, 340, 91, 15, 10 + LTEXT "s", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Dizge Yapılandırma İzlencesi" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Umûmî" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Hizmetler" diff --git a/reactos/base/applications/msconfig_new/lang/uk-UA.rc b/reactos/base/applications/msconfig_new/lang/uk-UA.rc index f53e92df0dd..ecb916bdf7b 100644 --- a/reactos/base/applications/msconfig_new/lang/uk-UA.rc +++ b/reactos/base/applications/msconfig_new/lang/uk-UA.rc @@ -8,17 +8,40 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Програма налаштування системи" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Довідка", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Скасувати", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Заст&осувати", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "Загальні" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Звичайне завантаження", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "&Скорочене завантаження", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "Ви&біркове завантаження", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "Обробляти файл S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Обробляти файл &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "За&вантажувати системні служби", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Завантажувати елементи &автозавантаження", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "Варіанти завантаження", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Завантажувати всі драйвери і служби", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Зувантажувати тільки основні драйвери і служби", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -69,19 +92,6 @@ BEGIN PUSHBUTTON "&Деактивувати все", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Варіанти завантаження", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "&Звичайне завантаження - завантажувати всі драйвери і служби", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "&Скорочене завантаження - зувантажувати тільки основні драйвери і служби", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Ви&біркове завантаження", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "Об&робляти файл SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "За&вантажувати системні служби", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Завантажувати елементи &автозавантаження", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -92,16 +102,16 @@ BEGIN PUSHBUTTON "&Встановити стандартно", IDC_BTN_SET_DEFAULT_BOOT, 92, 65, 88, 12 PUSHBUTTON "Перемістити Вв&ерх", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Перемістити В&низ", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Варіанти завантаження", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "Варіанти завантаження", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Д&одатково...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Затримка:", -1, 275, 91, 33, 10 + LTEXT "&Затримка:", IDC_STATIC, 275, 91, 33, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "сек.", -1, 340, 91, 15, 10 + LTEXT "сек.", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -133,11 +143,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "Програма налаштування системи" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "Загальні" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Служби" diff --git a/reactos/base/applications/msconfig_new/lang/zh-CN.rc b/reactos/base/applications/msconfig_new/lang/zh-CN.rc index ee84a27cffd..237ee1a8092 100644 --- a/reactos/base/applications/msconfig_new/lang/zh-CN.rc +++ b/reactos/base/applications/msconfig_new/lang/zh-CN.rc @@ -2,17 +2,53 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "系统配置实用程序" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "确定", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "帮助(&H)", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "应用", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "启动选择", IDC_STATIC, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT + CONTROL "正常启动 - 加载所有设备驱动程序和服务(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 + CONTROL "诊断启动 - 仅加载基本设备驱动程序和服务(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 + CONTROL "有选择的启动(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 + AUTOCHECKBOX "处理 SYSTEM.INI 文件(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 + AUTOCHECKBOX "加载系统服务(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 + AUTOCHECKBOX "加载启动项(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "一般" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "正常启动(&N)", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "诊断启动(&D)", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "有选择的启动(&E)", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "处理 SYSTEM.INI 文件(&Y)", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "处理 WIN.INI 文件(&W)", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "加载系统服务(&L)", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "加载启动项(&O)", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "启动选择", IDC_STATIC, 5, 5, 356, 145 + LTEXT "加载所有设备驱动程序和服务", IDC_STATIC, 25, 30, 322, 10 + LTEXT "仅加载基本设备驱动程序和服务", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +99,6 @@ BEGIN PUSHBUTTON "全部禁用(&D)", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "启动选择", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "正常启动 - 加载所有设备驱动程序和服务(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "诊断启动 - 仅加载基本设备驱动程序和服务(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "有选择的启动(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "处理 SYSTEM.INI 文件(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "加载系统服务(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "加载启动项(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -86,16 +109,16 @@ BEGIN PUSHBUTTON "设为默认(&S)", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "上移(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "下移(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "启动选项", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "启动选项", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "高级选项(&V)...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "超时(&T):", -1, 280, 91, 30, 10 + LTEXT "超时(&T):", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "秒", -1, 340, 91, 15, 10 + LTEXT "秒", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +150,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "系统配置实用程序" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "一般" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "服务" diff --git a/reactos/base/applications/msconfig_new/lang/zh-TW.rc b/reactos/base/applications/msconfig_new/lang/zh-TW.rc index f0403c6357a..6baed27b542 100644 --- a/reactos/base/applications/msconfig_new/lang/zh-TW.rc +++ b/reactos/base/applications/msconfig_new/lang/zh-TW.rc @@ -2,17 +2,40 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "系統設定" -FONT 9, "MS Shell Dlg" +IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About the System configuration program" +FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 - DEFPUSHBUTTON "確定", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "說明(&H)", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "套用", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 + LTEXT "System configuration program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX +// "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" + LTEXT "Copyright (C) ReactOS Team 2005-2015\n\ +Christoph von Wittich (Christoph@ApiViewer.de)\n\ +Gregor Schneider (Gregor.Schneider@reactos.org)\n\ +Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)", + IDC_STATIC, 41, 34, 183, 34 + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP +END + +IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION +CAPTION "一般" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "正常啟動(&N)", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 + CONTROL "診斷啟動(&D)", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 + CONTROL "有選擇的啟動(&E)", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 + CONTROL "處理 SYSTEM.INI 文件(&Y)", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "處理 WIN.INI 文件(&W)", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "載入系统服務(&L)", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "載入啟動項目(&O)", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Use original boot configuration", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Laun&ch System Restore", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + PUSHBUTTON "&Expand File...", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 + GROUPBOX "啟動選擇", IDC_STATIC, 5, 5, 356, 145 + LTEXT "載入所有裝置驅動程式和服務", IDC_STATIC, 25, 30, 322, 10 + LTEXT "僅載入基本裝置驅動程式和服務", IDC_STATIC, 25, 58, 322, 10 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -63,19 +86,6 @@ BEGIN PUSHBUTTON "全部禁用(&D)", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14 END -IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "啟動選擇", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "正常啟動 - 載入所有裝置驅動程式和服務(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "診斷啟動 - 僅載入基本裝置驅動程式和服務(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "有選擇的啟動(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "處理 SYSTEM.INI 文件(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "載入系统服務(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "載入啟動項目(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 -END - IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -86,16 +96,16 @@ BEGIN PUSHBUTTON "設為默認(&S)", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "上移(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "下移(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "啟動選項", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT + GROUPBOX "啟動選項", IDC_STATIC, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "進階選項(&V)...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "等候時間(&T):", -1, 280, 91, 30, 10 + LTEXT "等候時間(&T):", IDC_STATIC, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "秒", -1, 340, 91, 15, 10 + LTEXT "秒", IDC_STATIC, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 @@ -127,11 +137,11 @@ STRINGTABLE BEGIN IDS_MSCONFIG "系統設定" IDS_MSCONFIG_2 "System Configuration" + IDS_ABOUT "&About...\tShift+F1" END STRINGTABLE BEGIN - IDS_TAB_GENERAL "一般" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "服務" diff --git a/reactos/base/applications/msconfig_new/msconfig.c b/reactos/base/applications/msconfig_new/msconfig.c index 700f90dc17a..8f96ad582a6 100644 --- a/reactos/base/applications/msconfig_new/msconfig.c +++ b/reactos/base/applications/msconfig_new/msconfig.c @@ -36,10 +36,10 @@ LPWSTR szAppName = NULL; HWND hMainWnd; /* Main Window */ HWND hTabWnd; /* Tab Control Window */ -UINT uXIcon = 0, uYIcon = 0; /* Icon sizes */ -HICON hDialogIcon = NULL; +// HICON hDialogIcon = NULL; +HICON hIcon = NULL; +WNDPROC wpOrigEditProc = NULL; -void MsConfig_OnTabWndSelChange(void); //////////////////////////////////////////////////////////////////////////////// // Taken from WinSpy++ 1.7 @@ -95,228 +95,316 @@ BOOL EnableDialogTheme(HWND hwnd) return FALSE; } } -BOOL OnCreate(HWND hWnd) + +/* About Box dialog */ +INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - TCHAR szTemp[256]; - TCITEM item; + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; - hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); EnableDialogTheme(hGeneralPage); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); EnableDialogTheme(hSystemPage); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); EnableDialogTheme(hFreeLdrPage); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); EnableDialogTheme(hServicesPage); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); EnableDialogTheme(hStartupPage); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); EnableDialogTheme(hToolsPage); - - LoadString(hInst, IDS_MSCONFIG, szTemp, 256); - SetWindowText(hWnd, szTemp); - - // Insert Tab Pages - LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 0, &item); - - LoadString(hInst, IDS_TAB_SYSTEM, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 1, &item); - - LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 2, &item); - - LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 3, &item); - - LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 4, &item); - - LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); - memset(&item, 0, sizeof(TCITEM)); - item.mask = TCIF_TEXT; - item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 5, &item); - - MsConfig_OnTabWndSelChange(); - - return TRUE; -} - - -void MsConfig_OnTabWndSelChange(void) -{ - switch (TabCtrl_GetCurSel(hTabWnd)) { - case 0: //General - ShowWindow(hGeneralPage, SW_SHOW); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hToolsPage, SW_HIDE); - BringWindowToTop(hGeneralPage); - break; - case 1: //SYSTEM.INI - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_SHOW); - ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - BringWindowToTop(hSystemPage); - break; - case 2: //Freeldr - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_SHOW); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hToolsPage, SW_HIDE); - BringWindowToTop(hFreeLdrPage); - break; - case 3: //Services - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_SHOW); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hToolsPage, SW_HIDE); - BringWindowToTop(hServicesPage); - break; - case 4: //startup - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_SHOW); - ShowWindow(hToolsPage, SW_HIDE); - BringWindowToTop(hStartupPage); - break; - case 5: //Tools - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hToolsPage, SW_SHOW); - BringWindowToTop(hToolsPage); - break; + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; } -} - - -static -VOID -SetDialogIcon(HWND hDlg) -{ - if (hDialogIcon) DestroyIcon(hDialogIcon); - - hDialogIcon = LoadImage(GetModuleHandle(NULL), - MAKEINTRESOURCE(IDI_APPICON), - IMAGE_ICON, - uXIcon, - uYIcon, - 0); - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hDialogIcon); + return (INT_PTR)FALSE; } /* Message handler for dialog box. */ -INT_PTR CALLBACK -MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - LPNMHDR pnmh; - UINT uXIconNew, uYIconNew; - - switch (message) + switch (uMessage) { - case WM_INITDIALOG: - hMainWnd = hDlg; - - uXIcon = GetSystemMetrics(SM_CXSMICON); - uYIcon = GetSystemMetrics(SM_CYSMICON); - - SetDialogIcon(hDlg); - - return OnCreate(hDlg); - - case WM_SETTINGCHANGE: - uXIconNew = GetSystemMetrics(SM_CXSMICON); - uYIconNew = GetSystemMetrics(SM_CYSMICON); - - if ((uXIcon != uXIconNew) || (uYIcon != uYIconNew)) + case WM_SYSCOMMAND: + { + switch (LOWORD(wParam) /*GET_WM_COMMAND_ID(wParam, lParam)*/) { - uXIcon = uXIconNew; - uYIcon = uYIconNew; - SetDialogIcon(hDlg); + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + // break; + return TRUE; } - break; + + // break; + return FALSE; + } case WM_COMMAND: - - if (LOWORD(wParam) == IDOK) + { + switch (LOWORD(wParam) /*GET_WM_COMMAND_ID(wParam, lParam)*/) { - //MsConfig_OnSaveChanges(); + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + // break; + return TRUE; } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - - case WM_NOTIFY: - pnmh = (LPNMHDR)lParam; - if ((pnmh->hwndFrom == hTabWnd) && - (pnmh->idFrom == IDC_TAB) && - (pnmh->code == TCN_SELCHANGE)) - { - MsConfig_OnTabWndSelChange(); - } break; + // return FALSE; + } +#if 0 case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ SendMessage(hServicesListCtrl, WM_SYSCOLORCHANGE, 0, 0); SendMessage(hStartupListCtrl, WM_SYSCOLORCHANGE, 0, 0); SendMessage(hToolsListCtrl, WM_SYSCOLORCHANGE, 0, 0); break; +#endif case WM_DESTROY: - if (hToolsPage) - DestroyWindow(hToolsPage); - if (hGeneralPage) - DestroyWindow(hGeneralPage); - if (hServicesPage) - DestroyWindow(hServicesPage); - if (hStartupPage) - DestroyWindow(hStartupPage); - if (hFreeLdrPage) - DestroyWindow(hFreeLdrPage); - if (hSystemPage) - DestroyWindow(hSystemPage); - if (hDialogIcon) - DestroyIcon(hDialogIcon); - return DefWindowProc(hDlg, message, wParam, lParam); + { + if (hIcon) + DestroyIcon(hIcon); + + if (wpOrigEditProc) + SetWindowLongPtr(hWnd, DWLP_DLGPROC, (LONG_PTR)wpOrigEditProc); + } + + default: + break; } - return 0; + /* Return */ + if (wpOrigEditProc) + return CallWindowProc(wpOrigEditProc, hWnd, uMessage, wParam, lParam); + else + return FALSE; } +#include +typedef struct DLGTEMPLATEEX +{ + WORD dlgVer; + WORD signature; + DWORD helpID; + DWORD exStyle; + DWORD style; + WORD cDlgItems; + short x; + short y; + short cx; + short cy; +} DLGTEMPLATEEX, *LPDLGTEMPLATEEX; +#include + + +VOID ModifySystemMenu(HWND hWnd) +{ + WCHAR szMenuString[255]; + + /* Customize the window's system menu, add items before the "Close" item */ + HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); + assert(hSysMenu); + + /* New entries... */ + if (LoadStringW(hInst, + IDS_ABOUT, + szMenuString, + ARRAYSIZE(szMenuString)) > 0) + { + /* "About" menu */ + InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED | MF_STRING, IDM_ABOUT, szMenuString); + /* Separator */ + InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR , 0 , NULL); + } + + DrawMenuBar(hWnd); + return; +} + +int CALLBACK PropSheetCallback(HWND hDlg, UINT message, LPARAM lParam) +{ + switch (message) + { + case PSCB_PRECREATE: + { + LPDLGTEMPLATE dlgTemplate = (LPDLGTEMPLATE)lParam; + LPDLGTEMPLATEEX dlgTemplateEx = (LPDLGTEMPLATEEX)lParam; + + /* Set the styles of the property sheet dialog */ + if (dlgTemplateEx->signature == 0xFFFF) + { + //// MFC : DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION; + + dlgTemplateEx->style = DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU; + // dlgTemplateEx->style = DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; + dlgTemplateEx->exStyle = WS_EX_CONTROLPARENT | WS_EX_APPWINDOW; + } + else + { + dlgTemplate->style = DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU; + // dlgTemplate->style = DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; + dlgTemplate->dwExtendedStyle = WS_EX_CONTROLPARENT | WS_EX_APPWINDOW; + } + + break; + } + + case PSCB_INITIALIZED: + { + /* Modify the system menu of the property sheet dialog */ + ModifySystemMenu(hDlg); + + /* Set the dialog icons */ + hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + + /* Sub-class the property sheet window procedure */ + wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc); + + break; + } + + default: + break; + } + + return FALSE; +} + +HWND CreatePropSheet(HINSTANCE hInstance, HWND hwndOwner, LPCTSTR lpszTitle) +{ + HWND hPropSheet; + PROPSHEETHEADER psh; + PROPSHEETPAGE psp[7]; + unsigned int nPages = 0; + + /* Header */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS | /*PSH_USEICONID |*/ PSH_HASHELP | /*PSH_NOCONTEXTHELP |*/ PSH_USECALLBACK; + psh.hInstance = hInstance; + psh.hwndParent = hwndOwner; + //psh.pszIcon = MAKEINTRESOURCE(IDI_APPICON); // It's crap... Only works for the small icon and not the big... + psh.pszCaption = lpszTitle; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = (PFNPROPSHEETCALLBACK)PropSheetCallback; + + /* General page */ + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_GENERAL_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)GeneralPageWndProc; + ++nPages; + +#if 0 + if (bIsWindows && bIsOSVersionLessThanVista) + { + /* SYSTEM.INI page */ + if (MyFileExists(lpszSystemIni, NULL)) + { + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTitle = MAKEINTRESOURCE(IDS_TAB_SYSTEM); + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SYSTEM_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)SystemPageWndProc; + psp[nPages].lParam = (LPARAM)lpszSystemIni; + ++nPages; + + BackupIniFile(lpszSystemIni); + } + + /* WIN.INI page */ + if (MyFileExists(lpszWinIni, NULL)) + { + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTitle = MAKEINTRESOURCE(IDS_TAB_WIN); + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SYSTEM_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)WinPageWndProc; + psp[nPages].lParam = (LPARAM)lpszWinIni; + ++nPages; + + BackupIniFile(lpszWinIni); + } + } + + /* FreeLdr page */ + // TODO: Program the interface for Vista : "light" BCD editor... + if (!bIsWindows || (bIsWindows && bIsOSVersionLessThanVista)) + { + LPCTSTR lpszLoaderIniFile = NULL; + DWORD dwTabNameId = 0; + if (bIsWindows) + { + lpszLoaderIniFile = lpszBootIni; + dwTabNameId = IDS_TAB_BOOT; + } + else + { + lpszLoaderIniFile = lpszFreeLdrIni; + dwTabNameId = IDS_TAB_FREELDR; + } + + if (MyFileExists(lpszLoaderIniFile, NULL)) + { + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTitle = MAKEINTRESOURCE(dwTabNameId); + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_FREELDR_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)FreeLdrPageWndProc; + psp[nPages].lParam = (LPARAM)lpszLoaderIniFile; + ++nPages; + + BackupIniFile(lpszLoaderIniFile); + } + } + + /* Services page */ + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SERVICES_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)ServicesPageWndProc; + ++nPages; + + /* Startup page */ + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_STARTUP_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)StartupPageWndProc; + ++nPages; + + /* Tools page */ + psp[nPages].dwSize = sizeof(PROPSHEETPAGE); + psp[nPages].dwFlags = PSP_HASHELP; + psp[nPages].hInstance = hInstance; + psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_TOOLS_PAGE); + psp[nPages].pfnDlgProc = (DLGPROC)ToolsPageWndProc; + ++nPages; +#endif + + /* Set the total number of created pages */ + psh.nPages = nPages; + + /* Create the property sheet */ + hPropSheet = (HWND)PropertySheet(&psh); + if (hPropSheet) + { + /* Center the property sheet on the desktop */ + //ShowWindow(hPropSheet, SW_HIDE); + ClipOrCenterWindowToMonitor(hPropSheet, MONITOR_WORKAREA | MONITOR_CENTER); + //ShowWindow(hPropSheet, SW_SHOWNORMAL); + } + + return hPropSheet; +} + BOOL Initialize(HINSTANCE hInstance) { BOOL Success = TRUE; @@ -388,6 +476,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, LPTSTR lpCmdLine, int nCmdShow) { + MSG msg; + HACCEL hAccelTable; + UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow); @@ -401,11 +492,55 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + hMainWnd = CreatePropSheet(hInstance, NULL, szAppName); + if (!hMainWnd) + { + /* We failed, cleanup and bail out */ + Cleanup(); + return -1; + } + + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDR_MSCONFIG)); + + /* Message loop */ + while (IsWindow(hMainWnd) && GetMessage(&msg, NULL, 0, 0)) + { + /* + * PropSheet_GetCurrentPageHwnd returns NULL when the user clicks the OK or Cancel button + * and after all of the pages have been notified. Apply button doesn't cause this to happen. + * We can then use the DestroyWindow function to destroy the property sheet. + */ + if (PropSheet_GetCurrentPageHwnd(hMainWnd) == NULL) + break; + + /* Process the accelerator table */ + if (!TranslateAccelerator(hMainWnd, hAccelTable, &msg)) + { + /* + * If e.g. an item on the tree view is being edited, + * we cannot pass the event to PropSheet_IsDialogMessage. + * Doing so causes the property sheet to be closed at Enter press + * (instead of completing edit operation). + */ + if (/*g_bDisableDialogDispatch ||*/ !PropSheet_IsDialogMessage(hMainWnd, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + + // FIXME: Process the results of MSConfig !! + + /* Destroy the accelerator table and the window */ + if (hAccelTable != NULL) + DestroyAcceleratorTable(hAccelTable); + + DestroyWindow(hMainWnd); /* Finish cleanup and return */ Cleanup(); - return 0; + return (int)msg.wParam; } /* EOF */ diff --git a/reactos/base/applications/msconfig_new/msconfig.h b/reactos/base/applications/msconfig_new/msconfig.h index d36e41c62ae..e5486f4056c 100644 --- a/reactos/base/applications/msconfig_new/msconfig.h +++ b/reactos/base/applications/msconfig_new/msconfig.h @@ -1,3 +1,8 @@ #pragma once +extern BOOL bIsWindows; +extern BOOL bIsOSVersionLessThanVista; + extern HINSTANCE hInst; +extern LPWSTR szAppName; +extern HWND hMainWnd; diff --git a/reactos/base/applications/msconfig_new/msconfig.rc b/reactos/base/applications/msconfig_new/msconfig.rc index df7d1839e5b..269faca61bb 100644 --- a/reactos/base/applications/msconfig_new/msconfig.rc +++ b/reactos/base/applications/msconfig_new/msconfig.rc @@ -13,6 +13,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_APPICON ICON "res/msconfig.ico" +IDR_MSCONFIG ACCELERATORS +BEGIN +// "?", IDM_ABOUT, ASCII, ALT, NOINVERT + VK_F1, IDM_ABOUT, VIRTKEY, SHIFT, NOINVERT +END + #include /* UTF-8 */ diff --git a/reactos/base/applications/msconfig_new/precomp.h b/reactos/base/applications/msconfig_new/precomp.h index 58d7f29af9a..899826ea244 100644 --- a/reactos/base/applications/msconfig_new/precomp.h +++ b/reactos/base/applications/msconfig_new/precomp.h @@ -6,6 +6,8 @@ // directly available without further tricks. #define MINGW_HAS_SECURE_API 1 +#include + #include #include diff --git a/reactos/base/applications/msconfig_new/resource.h b/reactos/base/applications/msconfig_new/resource.h index 7c4e3dcc11a..ddd4ce5ba6a 100644 --- a/reactos/base/applications/msconfig_new/resource.h +++ b/reactos/base/applications/msconfig_new/resource.h @@ -1,6 +1,7 @@ #pragma once -#define IDD_MSCONFIG_DIALOG 101 +#define IDC_STATIC -1 + #define IDD_TOOLS_PAGE 102 #define IDD_SERVICES_PAGE 103 #define IDD_GENERAL_PAGE 104 @@ -21,12 +22,19 @@ #define IDC_BTN_SERVICES_DEACTIVATE 1010 #define IDC_BTN_STARTUP_ACTIVATE 1011 #define IDC_BTN_STARTUP_DEACTIVATE 1012 -#define IDC_CBX_NORMAL_START 1013 -#define IDC_CBX_DIAGNOSTIC_START 1014 -#define IDC_CBX_SELECTIVE_STARTUP 1015 -#define IDC_CBX_SYSTEM_INI 1016 -#define IDC_CBX_SYSTEM_SERVICE 1017 -#define IDC_CBX_STARTUP_ITEM 1018 + +/* General page controls */ +#define IDC_RB_NORMAL_STARTUP 1013 +#define IDC_RB_DIAGNOSTIC_STARTUP 1014 +#define IDC_RB_SELECTIVE_STARTUP 1015 +#define IDC_CBX_SYSTEM_INI 1016 +#define IDC_CBX_WIN_INI 1218 +#define IDC_CBX_LOAD_SYSTEM_SERVICES 1017 +#define IDC_CBX_LOAD_STARTUP_ITEMS 1018 +#define IDC_CBX_USE_ORIGINAL_BOOTCFG 1118 +#define IDC_BTN_SYSTEM_RESTORE_START 1318 +#define IDC_BTN_FILE_EXTRACTION 1418 + #define IDC_LIST_BOX 1019 #define IDC_BTN_CHECK_BOOT_PATH 1020 #define IDC_BTN_SET_DEFAULT_BOOT 1021 @@ -74,7 +82,6 @@ #define IDS_TAB_FREELDR 2003 #define IDS_TAB_STARTUP 2004 #define IDS_TAB_SERVICES 2005 -#define IDS_TAB_GENERAL 2006 #define IDS_TOOLS_COLUMN_NAME 2010 #define IDS_TOOLS_COLUMN_DESCR 2011 @@ -111,7 +118,19 @@ #define IDS_SERVICES_YES 2202 #define IDS_SERVICES_UNKNOWN 2203 + + + + + + #define IDS_MSCONFIG 3000 #define IDS_MSCONFIG_2 3001 #define IDI_APPICON 3010 + +#define IDR_MSCONFIG 3020 + +#define IDM_ABOUT 3030 +#define IDS_ABOUT 3031 +#define IDD_ABOUTBOX 3032 diff --git a/reactos/base/applications/msconfig_new/utils.c b/reactos/base/applications/msconfig_new/utils.c index 8204e8989f0..738985c015b 100644 --- a/reactos/base/applications/msconfig_new/utils.c +++ b/reactos/base/applications/msconfig_new/utils.c @@ -122,6 +122,76 @@ LoadConditionalResourceStringEx(IN HINSTANCE hInstance, pSize); } + +//////////////////// The following comes from MSDN samples /////////////////// +// https://msdn.microsoft.com/en-us/library/windows/desktop/dd162826(v=vs.85).aspx +// + +// +// ClipOrCenterRectToMonitor +// +// The most common problem apps have when running on a +// multimonitor system is that they "clip" or "pin" windows +// based on the SM_CXSCREEN and SM_CYSCREEN system metrics. +// Because of app compatibility reasons these system metrics +// return the size of the primary monitor. +// +// This shows how you use the multi-monitor functions +// to do the same thing. +// +VOID ClipOrCenterRectToMonitor(LPRECT prc, UINT flags) +{ + HMONITOR hMonitor; + MONITORINFO mi; + RECT rc; + int w = prc->right - prc->left; + int h = prc->bottom - prc->top; + + // + // Get the nearest monitor to the passed rect. + // + hMonitor = MonitorFromRect(prc, MONITOR_DEFAULTTONEAREST); + + // + // Get the work area or entire monitor rect. + // + mi.cbSize = sizeof(mi); + GetMonitorInfo(hMonitor, &mi); + + if (flags & MONITOR_WORKAREA) + rc = mi.rcWork; + else + rc = mi.rcMonitor; + + // + // Center or clip the passed rect to the monitor rect. + // + if (flags & MONITOR_CENTER) + { + prc->left = rc.left + (rc.right - rc.left - w) / 2; + prc->top = rc.top + (rc.bottom - rc.top - h) / 2; + prc->right = prc->left + w; + prc->bottom = prc->top + h; + } + else + { + prc->left = max(rc.left, min(rc.right-w, prc->left)); + prc->top = max(rc.top, min(rc.bottom-h, prc->top)); + prc->right = prc->left + w; + prc->bottom = prc->top + h; + } +} + +VOID ClipOrCenterWindowToMonitor(HWND hWnd, UINT flags) +{ + RECT rc; + GetWindowRect(hWnd, &rc); + ClipOrCenterRectToMonitor(&rc, flags); + SetWindowPos(hWnd, NULL, rc.left, rc.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); +} +//////////////////////////////////////////////////////////////////////////////// + + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename) { diff --git a/reactos/base/applications/msconfig_new/utils.h b/reactos/base/applications/msconfig_new/utils.h index 54bcdb69f66..ee6be6bf041 100644 --- a/reactos/base/applications/msconfig_new/utils.h +++ b/reactos/base/applications/msconfig_new/utils.h @@ -43,6 +43,24 @@ LoadConditionalResourceStringEx(IN HINSTANCE hInstance, #define LoadConditionalResourceString(hInst, bCond, uIDifT, uIDifF) \ LoadConditionalResourceStringEx((hInst), (bCond), (uIDifT), (uIDifF), NULL) + +//////////////////// The following comes from MSDN samples /////////////////// +// https://msdn.microsoft.com/en-us/library/windows/desktop/dd162826(v=vs.85).aspx +// + +// +// Available control flags. +// +#define MONITOR_CENTER 0x0001 // center rect to monitor +#define MONITOR_CLIP 0x0000 // clip rect to monitor +#define MONITOR_WORKAREA 0x0002 // use monitor work area +#define MONITOR_AREA 0x0000 // use monitor entire area + +VOID ClipOrCenterRectToMonitor(LPRECT prc, UINT flags); +VOID ClipOrCenterWindowToMonitor(HWND hWnd, UINT flags); +//////////////////////////////////////////////////////////////////////////////// + + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename);