[MSCONFIG_NEW]

- Reenable the FREELDR.INI/BOOT.INI page. When boot items are added in the list, recompute its new contents width and adjust it so that we can horizontally scroll its contents (this is the only common control which does not support automatic width computation when you add contents in it...).
- Save the original FREELDR.INI/BOOT.INI in a default path (I took the one used by windows' msconfig for its INI files).
CORE-9333

svn path=/trunk/; revision=69638

diff --git a/reactos/base/applications/msconfig_new/CMakeLists.txt b/reactos/base/applications/msconfig_new/CMakeLists.txt
index 20b9760..44a5812 100644 (file)
--- a/reactos/base/applications/msconfig_new/CMakeLists.txt
+++ b/reactos/base/applications/msconfig_new/CMakeLists.txt
@@ -10,14 +10,14 @@ include_directories(
 
 list(APPEND C_SOURCE
     comctl32ex/listviewfuncs.c
-    # srvpage.c
-    # systempage.c
-    # startuppage.c
-    # freeldrpage.c
     fileextractdialog.c
     fileutils.c
+    freeldrpage.c
     generalpage.c
     msconfig.c
+    # srvpage.c
+    # systempage.c
+    # startuppage.c
     stringutils.c
     utils.c)
 
@@ -31,5 +31,5 @@ add_executable(msconfig_new ${C_SOURCE} ${CPP_SOURCE} msconfig.rc)
 add_pch(msconfig_new precomp.h CPP_SOURCE)
 set_module_type(msconfig_new win32gui UNICODE)
 target_link_libraries(msconfig_new comsupp)
-add_importlibs(msconfig_new user32 advapi32 version comctl32 comdlg32 ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32)
+add_importlibs(msconfig_new user32 gdi32 comctl32 comdlg32 advapi32 version ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32)
 add_cd_file(TARGET msconfig_new DESTINATION reactos/system32 FOR all)

diff --git a/reactos/base/applications/msconfig_new/fileextractdialog.c b/reactos/base/applications/msconfig_new/fileextractdialog.c
index 669d912..a16f847 100644 (file)
--- a/reactos/base/applications/msconfig_new/fileextractdialog.c
+++ b/reactos/base/applications/msconfig_new/fileextractdialog.c
@@ -71,10 +71,7 @@ FileExtractDialogWndProc(HWND hDlg,
             {
                 case IDOK:
                 {
-                    LPWSTR szCabPathFileName;
-                    LPWSTR szFileName;
-                    LPWSTR szDestDir;
-
+                    LPWSTR szCabPathFileName, szFileName, szDestDir;
                     size_t cabPathNum, fileNameNum, destDirNum;
 
                     cabPathNum = GetWindowTextLengthW(GetDlgItem(hDlg, IDC_DRP_CAB_FILE)) + 1;

diff --git a/reactos/base/applications/msconfig_new/fileutils.c b/reactos/base/applications/msconfig_new/fileutils.c
index c07d4ec..8164a58 100644 (file)
--- a/reactos/base/applications/msconfig_new/fileutils.c
+++ b/reactos/base/applications/msconfig_new/fileutils.c
@@ -56,7 +56,8 @@ FileQueryFiles(IN LPCWSTR Path,
     LPWSTR lpszExpandedQuery;
     HANDLE search;
 
-    lpszQuery = (LPWSTR)MemAlloc(0, (wcslen(Path) + 1 + wcslen(FileNamesQuery) + 1) * sizeof(WCHAR));
+    dwNumOfChars = wcslen(Path) + 1 + wcslen(FileNamesQuery) + 1;
+    lpszQuery = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR));
     wcscpy(lpszQuery, Path);
     wcscat(lpszQuery, L"\\");
     wcscat(lpszQuery, FileNamesQuery);
@@ -88,3 +89,35 @@ FileQueryFiles(IN LPCWSTR Path,
 
     return res;
 }
+
+BOOL BackupIniFile(IN LPCWSTR lpszIniFile)
+{
+    BOOL Success = FALSE;
+    DWORD dwNumOfChars = 0;
+    LPWSTR SourceFile, DestFile;
+    LPWSTR lpName, lpPath;
+
+    dwNumOfChars = ExpandEnvironmentStringsW(lpszIniFile, NULL, 0);
+    SourceFile = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR));
+    ExpandEnvironmentStringsW(lpszIniFile, SourceFile, dwNumOfChars);
+
+    lpName = wcsrchr(SourceFile, L'\\');
+    lpName = (lpName ? lpName + 1 : SourceFile);
+    dwNumOfChars = wcslen(L"%SystemRoot%\\pss\\") + wcslen(lpName) + 7 + 1;
+    lpPath = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR));
+    wcscpy(lpPath, L"%SystemRoot%\\pss\\");
+    wcscat(lpPath, lpName);
+    wcscat(lpPath, L".backup");
+
+    dwNumOfChars = ExpandEnvironmentStringsW(lpPath, NULL, 0);
+    DestFile = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR));
+    ExpandEnvironmentStringsW(lpPath, DestFile, dwNumOfChars);
+    MemFree(lpPath);
+
+    Success = CopyFileW(SourceFile, DestFile, TRUE /* don't overwrite */ /* FALSE */ /* overwrite */);
+
+    MemFree(DestFile);
+    MemFree(SourceFile);
+
+    return Success;
+}

diff --git a/reactos/base/applications/msconfig_new/fileutils.h b/reactos/base/applications/msconfig_new/fileutils.h
index 4fffa5f..365d2a4 100644 (file)
--- a/reactos/base/applications/msconfig_new/fileutils.h
+++ b/reactos/base/applications/msconfig_new/fileutils.h
@@ -55,6 +55,8 @@ FileQueryFiles(IN LPCWSTR Path,
 
 ////////////////////////////////////////////////////////////////////////////////
 
+BOOL BackupIniFile(IN LPCWSTR lpszIniFile);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/reactos/base/applications/msconfig_new/freeldrpage.c b/reactos/base/applications/msconfig_new/freeldrpage.c
index c314160..6c06e94 100644 (file)
--- a/reactos/base/applications/msconfig_new/freeldrpage.c
+++ b/reactos/base/applications/msconfig_new/freeldrpage.c
@@ -5,14 +5,23 @@
  * PURPOSE:     Freeloader configuration page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
  *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
+ *              Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca@sfr.fr>
  */
 
 #include "precomp.h"
+#include <share.h>
 
-HWND hFreeLdrPage;
-HWND hFreeLdrDialog;
+#include <wingdi.h>
+#include <WindowsX.h>
 
-typedef struct
+#include "utils.h"
+
+static HWND hFreeLdrPage;
+
+LPCWSTR lpszFreeLdrIni = L"%SystemDrive%\\freeldr.ini";
+LPCWSTR lpszBootIni    = L"%SystemDrive%\\boot.ini";
+
+typedef struct _FREELDR_SETTINGS
 {
     ULONG TimeOut;
     WCHAR szDefaultOS[512];
@@ -21,57 +30,61 @@ typedef struct
     BOOL  UseBootIni;
 } FREELDR_SETTINGS;
 
-static FREELDR_SETTINGS Settings = { 0, { 0, }, 0, 0, FALSE };
-
-#define BUFFER_SIZE 512
+static FREELDR_SETTINGS Settings = { 0, {0}, 0, 0, FALSE };
 
 static BOOL
-LoadBootIni(WCHAR *szDrive, HWND hDlg)
+LoadIniFile(HWND hDlg,
+            LPCWSTR lpszIniFile)
 {
-    WCHAR szBuffer[BUFFER_SIZE];
+    DWORD  dwNumOfChars;
+    LPWSTR lpszFileName;
+    FILE*  file;
+
+    WCHAR szBuffer[512];
     HWND hDlgCtrl;
-    FILE * file;
-    UINT length;
+    SIZE_T length;
     LRESULT pos;
-    HRESULT hr;
 
-    hr = StringCbCopyW(szBuffer, sizeof(szBuffer), szDrive);
-    if (FAILED(hr))
-        return FALSE;
+    SIZE size;
+    LONG horzExt;
 
-    hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"freeldr.ini");
-    if (FAILED(hr))
-        return FALSE;
+    HDC hDC;
+    HFONT hFont, hOldFont;
 
-    file = _wfopen(szBuffer, L"rt");
-    if (!file)
-    {
-        hr = StringCbCopyW(szBuffer, sizeof(szBuffer), szDrive);
-        if (FAILED(hr))
-            return FALSE;
+    /*
+     * Open for read + write (without file creation if it didn't already exist)
+     * of a read-only text stream.
+     */
+    dwNumOfChars = ExpandEnvironmentStringsW(lpszIniFile, NULL, 0);
+    lpszFileName = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR));
+    ExpandEnvironmentStringsW(lpszIniFile, lpszFileName, dwNumOfChars);
 
-        hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"boot.ini");
-        if (FAILED(hr))
-            return FALSE;
-            
-        file = _wfopen(szBuffer, L"rt");
-        if (!file)
-            return FALSE;
-    }     
+    file = _wfsopen(lpszFileName, L"rt", _SH_DENYWR); // r+t <-- read write text ; rt <-- read text
+    MemFree(lpszFileName);
+
+    if (!file) return FALSE;
 
     hDlgCtrl = GetDlgItem(hDlg, IDC_LIST_BOX);
 
-    while(!feof(file))
+    hDC      = GetDC(hDlgCtrl);
+    hFont    = (HFONT)SendMessageW(hDlgCtrl, WM_GETFONT, 0, 0);
+    hOldFont = (HFONT)SelectObject(hDC, hFont);
+
+    while (!feof(file))
     {
-        if (fgetws(szBuffer, BUFFER_SIZE, file))
+        if (fgetws(szBuffer, ARRAYSIZE(szBuffer), file))
         {
             length = wcslen(szBuffer);
             if (length > 1)
             {
-                szBuffer[length] = L'\0';
-                szBuffer[length - 1] = L'\0';
+                /* Remove \r\n */
+                szBuffer[length-1] = szBuffer[length] = L'\0';
+
+                pos = ListBox_AddString(hDlgCtrl, szBuffer);
 
-                pos = SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szBuffer);
+                GetTextExtentPoint32W(hDC, szBuffer, (int)wcslen(szBuffer), &size);
+                horzExt = max((LONG)ListBox_GetHorizontalExtent(hDlgCtrl), size.cx + 5); // 5 to have a little room between the text and the end of the list box.
+                ListBox_SetHorizontalExtent(hDlgCtrl, horzExt);
 
                 if (szBuffer[0] == L'[')
                     continue;
@@ -88,20 +101,29 @@ LoadBootIni(WCHAR *szDrive, HWND hDlg)
                     continue;
                 }
                 if (pos != LB_ERR)
-                    SendMessage(hDlgCtrl, LB_SETITEMDATA, pos, 1); // indicate that this item is an boot entry
+                    ListBox_SetItemData(hDlgCtrl, pos, 1); // indicate that this item is a boot entry
+
                 Settings.OSConfigurationCount++;
             }
         }
     }
 
+    SelectObject(hDC, hOldFont);
+    ReleaseDC(hDlgCtrl, hDC);
+
     fclose(file);
     Settings.UseBootIni = TRUE;
 
-    pos = SendMessageW(hDlgCtrl, LB_FINDSTRING, 3, (LPARAM)Settings.szDefaultOS);
+    /*
+     * Start to search for the string at the "operating systems" section
+     * (after the "boot loader" section, which takes 3 lines in the .INI file).
+     */
+    pos = ListBox_FindString(hDlgCtrl, 3, Settings.szDefaultOS);
     if (pos != LB_ERR)
     {
-       Settings.szDefaultPos = pos;
-       SendMessage(hDlgCtrl, LB_SETCURSEL, pos, 0);
+        Settings.szDefaultPos = (ULONG)pos;
+        ListBox_SetCurSel(hDlgCtrl, pos);
+        // SendMessageW(hDlgCtrl, WM_VSCROLL, SB_LINEDOWN, 0); // Or use SetScroll...()
     }
 
     SetDlgItemInt(hDlg, IDC_TXT_BOOT_TIMEOUT, Settings.TimeOut, FALSE);
@@ -111,53 +133,65 @@ LoadBootIni(WCHAR *szDrive, HWND hDlg)
         EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_UP_BOOT_OPTION), FALSE);
         EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_DOWN_BOOT_OPTION), FALSE);
     }
+
     return TRUE;
 }
 
-static BOOL
-InitializeFreeLDRDialog(HWND hDlg)
+INT_PTR CALLBACK
+FreeLdrPageWndProc(HWND   hDlg,
+                   UINT   message,
+                   WPARAM wParam,
+                   LPARAM lParam)
 {
-    WCHAR winDir[PATH_MAX];
-    WCHAR* ptr = NULL;
-
-    GetWindowsDirectoryW(winDir, PATH_MAX);
-    ptr = wcschr(winDir, L'\\');
-    if (ptr == NULL)
+    switch (message)
     {
-        return FALSE;
-    }
-    ptr[1] = L'\0';
-    return LoadBootIni(winDir, hDlg);
-}
+        case WM_INITDIALOG:
+        {
+            LPPROPSHEETPAGEW psp = (LPPROPSHEETPAGEW)lParam;
 
-INT_PTR CALLBACK
-FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    LRESULT pos;
+            hFreeLdrPage = hDlg;
+            LoadIniFile(hDlg, (LPWSTR)(psp->lParam));
+            return TRUE;
+        }
 
-    switch (message) {
-    case WM_INITDIALOG:
-        hFreeLdrDialog = hDlg;
-        SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
-        InitializeFreeLDRDialog(hDlg);
-        return TRUE;
-    case WM_COMMAND:
-        switch(HIWORD(wParam))
+        case WM_COMMAND:
         {
-            case LBN_SELCHANGE:
-                pos = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0);
-                if (pos != LB_ERR)
+            switch (LOWORD(wParam))
+            {
+                case IDC_BTN_ADVANCED_OPTIONS:
+                    // DialogBox(hInst, MAKEINTRESOURCE(IDD_FREELDR_ADVANCED_DIALOG), hDlg /* hMainWnd */, NULL /*FileExtractDialogWndProc*/);
+                    break;
+
+                // default:
+                //     return FALSE;
+            }
+
+            switch (HIWORD(wParam))
+            {
+                case LBN_SELCHANGE:
                 {
-                    LPARAM res = SendMessage((HWND)lParam, LB_GETITEMDATA, pos, 0);
-                    if (!res) /* line is not a default one */
-                        SendMessage((HWND)lParam, LB_SETCURSEL, Settings.szDefaultPos, 0);
-                    else
-                        Settings.szDefaultPos = pos;
+                    HWND hWnd = (HWND)lParam;
+                    LRESULT pos;
+
+                    pos = ListBox_GetCurSel(hWnd);
+                    if (pos != LB_ERR)
+                    {
+                        if (!ListBox_GetItemData(hWnd, pos)) // Line is not a default one
+                            ListBox_SetCurSel(hWnd, Settings.szDefaultPos);
+                        else
+                            Settings.szDefaultPos = (ULONG)pos;
 
+                        // SendMessageW((HWND)lParam, WM_VSCROLL, SB_LINEDOWN, 0); // Or use SetScroll...()
+                    }
 
+                    return TRUE;
                 }
-            break;
+            }
         }
+
+        default:
+            return FALSE;
     }
-    return 0;
+
+    // return FALSE;
 }

diff --git a/reactos/base/applications/msconfig_new/freeldrpage.h b/reactos/base/applications/msconfig_new/freeldrpage.h
index d640dd9..96a8dee 100644 (file)
--- a/reactos/base/applications/msconfig_new/freeldrpage.h
+++ b/reactos/base/applications/msconfig_new/freeldrpage.h
@@ -1,7 +1,18 @@
+/*
+ * PROJECT:     ReactOS Applications
+ * LICENSE:     LGPL - See COPYING in the top level directory
+ * FILE:        base/applications/msconfig_new/freeldrpage.h
+ * PURPOSE:     Freeloader configuration page message handler
+ * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
+ *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
+ *              Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca@sfr.fr>
+ */
+
 #ifndef _FREELDRPAGE_H_
 #define _FREELDRPAGE_H_
 
-extern HWND hFreeLdrPage;
+extern LPCWSTR lpszFreeLdrIni;
+extern LPCWSTR lpszBootIni;
 
 INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 

diff --git a/reactos/base/applications/msconfig_new/lang/bg-BG.rc b/reactos/base/applications/msconfig_new/lang/bg-BG.rc
index efef202..c00a87b 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/bg-BG.rc
+++ b/reactos/base/applications/msconfig_new/lang/bg-BG.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Изключване на всички", IDC_BTN_SERVICES_DEACTIVATE, 272, 155, 83, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Проверка на всички пускови пътища", IDC_BTN_CHECK_BOOT_PATH, 5, 65, 129, 12
-    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 "Пускови настройки", 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 "&Изчакване:", IDC_STATIC, 265, 91, 40, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "сек.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Услуги"
     IDS_TAB_STARTUP "Запуск"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/ca-ES.rc b/reactos/base/applications/msconfig_new/lang/ca-ES.rc
index cc4ba13..a4a018d 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/ca-ES.rc
+++ b/reactos/base/applications/msconfig_new/lang/ca-ES.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Deactivar-ho tot", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Prova camins d'arrencada", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Serveis"
     IDS_TAB_STARTUP "Arrencada"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/cs-CZ.rc b/reactos/base/applications/msconfig_new/lang/cs-CZ.rc
index 8d0c0c2..8c4d62e 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/cs-CZ.rc
+++ b/reactos/base/applications/msconfig_new/lang/cs-CZ.rc
@@ -92,26 +92,35 @@ BEGIN
     PUSHBUTTON "&Zakázat vše", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Kontrola cest spuštění", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 77, 12
-    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í", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sek.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -173,8 +182,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Služby"
     IDS_TAB_STARTUP "Po spuštění"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/de-DE.rc b/reactos/base/applications/msconfig_new/lang/de-DE.rc
index 0193256..73e0452 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/de-DE.rc
+++ b/reactos/base/applications/msconfig_new/lang/de-DE.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "Alle &deaktivieren", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Alle Bootpfade überprüfen", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 90, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "Sek.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Dienste"
     IDS_TAB_STARTUP "Systemstart"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/el-GR.rc b/reactos/base/applications/msconfig_new/lang/el-GR.rc
index 49f6f11..66a1a0c 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/el-GR.rc
+++ b/reactos/base/applications/msconfig_new/lang/el-GR.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Απενεργοποίηση όλων", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "δευτ.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Υπηρεσίες"
     IDS_TAB_STARTUP "Εκκίνηση"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/en-US.rc b/reactos/base/applications/msconfig_new/lang/en-US.rc
index 599c64e..9c739fa 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/en-US.rc
+++ b/reactos/base/applications/msconfig_new/lang/en-US.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Deactivate all", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Services"
     IDS_TAB_STARTUP "Startup"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/es-ES.rc b/reactos/base/applications/msconfig_new/lang/es-ES.rc
index 97aa98f..98e83aa 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/es-ES.rc
+++ b/reactos/base/applications/msconfig_new/lang/es-ES.rc
@@ -89,26 +89,35 @@ BEGIN
     PUSHBUTTON "&Desactivar todo", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Verificar las rutas de arranque", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 110, 12
-    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", 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:", IDC_STATIC, 280, 86, 30, 16
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "seg.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -170,8 +179,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Servicios"
     IDS_TAB_STARTUP "Inicio"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/fr-FR.rc b/reactos/base/applications/msconfig_new/lang/fr-FR.rc
index 0e1275c..de4dee4 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/fr-FR.rc
+++ b/reactos/base/applications/msconfig_new/lang/fr-FR.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Désactiver tout", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Vérifier les chemins de démarrage", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "secondes", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Vérifier les entrées", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Par défaut", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "&Monter", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "&Descendre", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Options de démarrage", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Démarrage sécurisé (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Autre environnement\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Réparer ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Réseau (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "Ne pas démarrer la GUI\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Journal de démarrage (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Vidéo de base (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "Infos de démarrage (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Options a&vancées...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Délai :", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "secondes", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Rendre permanents &tous les paramètres de démarrage", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Supprimer", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Services"
     IDS_TAB_STARTUP "Démarrage"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/he-IL.rc b/reactos/base/applications/msconfig_new/lang/he-IL.rc
index 31f60f0..1753473 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/he-IL.rc
+++ b/reactos/base/applications/msconfig_new/lang/he-IL.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "בטל הכל", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&בדוק את כל נתיבי האתחול", IDC_BTN_CHECK_BOOT_PATH, 114, 65, 97, 12
-    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 "אפשרויות אתחול", 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 "זמן קצוב:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 303, 90, 25, 12, ES_LEFT
-    LTEXT "שניות", IDC_STATIC, 330, 91, 21, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "שירותים"
     IDS_TAB_STARTUP "אתחול"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/hu-HU.rc b/reactos/base/applications/msconfig_new/lang/hu-HU.rc
index 48e9463..8522edc 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/hu-HU.rc
+++ b/reactos/base/applications/msconfig_new/lang/hu-HU.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "Mindet &kikapcsol", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Szolgáltatások"
     IDS_TAB_STARTUP "Automatikus indítás"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/id-ID.rc b/reactos/base/applications/msconfig_new/lang/id-ID.rc
index b234ba5..cfa53d6 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/id-ID.rc
+++ b/reactos/base/applications/msconfig_new/lang/id-ID.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Deaktivasi semua", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "Periksa Se&mua Path Boot", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "detik", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Layanan"
     IDS_TAB_STARTUP "Startup"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/it-IT.rc b/reactos/base/applications/msconfig_new/lang/it-IT.rc
index ad51adf..d7eb4a7 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/it-IT.rc
+++ b/reactos/base/applications/msconfig_new/lang/it-IT.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "Disabi&lita tutto", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 3, 2, 354, 58, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "Ve&rifica percorsi di avvio", IDC_BTN_CHECK_BOOT_PATH, 3, 64, 85, 14
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Servizi"
     IDS_TAB_STARTUP "Avvio"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/ko-KR.rc b/reactos/base/applications/msconfig_new/lang/ko-KR.rc
index 02557ac..c0c58c6 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/ko-KR.rc
+++ b/reactos/base/applications/msconfig_new/lang/ko-KR.rc
@@ -110,29 +110,35 @@ BEGIN
     LTEXT "초", IDC_STATIC, 340, 91, 15, 10
 END
 
-IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
-    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
-    CONTROL "", IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11
-    CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10
-    COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10
-    CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10
-    CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12
-    EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT
-    CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10
-    CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10
-    COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10
-    COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
-    EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
-    CONTROL "", IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
-    PUSHBUTTON "확인", IDC_OK, 20, 160, 50, 12
-    PUSHBUTTON "취소", IDC_CANCEL, 100, 160, 50, 12
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117
@@ -169,8 +175,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "서비스"
     IDS_TAB_STARTUP "시작프로그램"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/nl-NL.rc b/reactos/base/applications/msconfig_new/lang/nl-NL.rc
index e1d5bed..162829f 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/nl-NL.rc
+++ b/reactos/base/applications/msconfig_new/lang/nl-NL.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "Alles &uitschakelen", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Alle opstartpaden controleren", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Services"
     IDS_TAB_STARTUP "Opstarten"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/no-NO.rc b/reactos/base/applications/msconfig_new/lang/no-NO.rc
index 51c7785..eb78d65 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/no-NO.rc
+++ b/reactos/base/applications/msconfig_new/lang/no-NO.rc
@@ -86,26 +86,35 @@ BEGIN
     PUSHBUTTON "&Deaktivere alt", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Sjekk oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 75, 12
-    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", 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:", IDC_STATIC, 280, 91, 70, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 100, 25, 12, ES_LEFT
-    LTEXT "sekunder", IDC_STATIC, 310, 100, 85, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -167,8 +176,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Tjenester"
     IDS_TAB_STARTUP "Oppstart"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/pl-PL.rc b/reactos/base/applications/msconfig_new/lang/pl-PL.rc
index b79841f..19ce58a 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/pl-PL.rc
+++ b/reactos/base/applications/msconfig_new/lang/pl-PL.rc
@@ -94,26 +94,35 @@ BEGIN
     PUSHBUTTON "Wyłącz wszy&stkie", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Sprawdź wszystkie ścieżki rozruchu", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "s", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -175,8 +184,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Usługi"
     IDS_TAB_STARTUP "Uruchamianie"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/pt-BR.rc b/reactos/base/applications/msconfig_new/lang/pt-BR.rc
index e66ed3f..fa62802 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/pt-BR.rc
+++ b/reactos/base/applications/msconfig_new/lang/pt-BR.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "D&esativar tudo", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "Verificar camin&hos de inicialização", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "segundos", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Serviços"
     IDS_TAB_STARTUP "Inicializar"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/ro-RO.rc b/reactos/base/applications/msconfig_new/lang/ro-RO.rc
index 3aae287..0b54691 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/ro-RO.rc
+++ b/reactos/base/applications/msconfig_new/lang/ro-RO.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "&Dezactivează toate", IDC_BTN_SERVICES_DEACTIVATE, 285, 155, 76, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Verifică toate căile de pornire", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 145, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Servicii"
     IDS_TAB_STARTUP "Autolansate"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/ru-RU.rc b/reactos/base/applications/msconfig_new/lang/ru-RU.rc
index 2f81d6a..423311f 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/ru-RU.rc
+++ b/reactos/base/applications/msconfig_new/lang/ru-RU.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "В&ыключить все", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Проверить все пути загрузки", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 110, 12
-    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 "Параметры загрузки", 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 "&Таймаут:", IDC_STATIC, 280, 82, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 93, 25, 12, ES_LEFT
-    LTEXT "сек.", IDC_STATIC, 310, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Службы"
     IDS_TAB_STARTUP "Автозагрузка"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/sk-SK.rc b/reactos/base/applications/msconfig_new/lang/sk-SK.rc
index a6d677a..b47ae3c 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/sk-SK.rc
+++ b/reactos/base/applications/msconfig_new/lang/sk-SK.rc
@@ -90,26 +90,35 @@ BEGIN
     PUSHBUTTON "&Deaktivovať všetky", IDC_BTN_SERVICES_DEACTIVATE, 285, 155, 76, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "S&kontrolovať všetky cesty zavedenia", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 130, 12
-    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", 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:", IDC_STATIC, 267, 91, 45, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 315, 90, 25, 12, ES_LEFT
-    LTEXT "s", IDC_STATIC, 345, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -171,8 +180,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Služby"
     IDS_TAB_STARTUP "Po spustení"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/sq-AL.rc b/reactos/base/applications/msconfig_new/lang/sq-AL.rc
index 113c283..710e7ad 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/sq-AL.rc
+++ b/reactos/base/applications/msconfig_new/lang/sq-AL.rc
@@ -90,26 +90,35 @@ BEGIN
     PUSHBUTTON "Q'kaptivizo gjithqka", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "Kontrollo te gjith rruget e ndezjes", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "sec.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -171,8 +180,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Shërbimet"
     IDS_TAB_STARTUP "Startupi"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/sv-SE.rc b/reactos/base/applications/msconfig_new/lang/sv-SE.rc
index 814720e..410806d 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/sv-SE.rc
+++ b/reactos/base/applications/msconfig_new/lang/sv-SE.rc
@@ -93,26 +93,35 @@ BEGIN
     PUSHBUTTON "&Inaktivera allt", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Undersök alla bootvägar", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 75, 12
-    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", 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:", IDC_STATIC, 280, 91, 70, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 100, 25, 12, ES_LEFT
-    LTEXT "sekunder", IDC_STATIC, 310, 100, 85, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -174,8 +183,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Tjänster"
     IDS_TAB_STARTUP "Uppstart"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/th-TH.rc b/reactos/base/applications/msconfig_new/lang/th-TH.rc
index 8be46d1..31b4070 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/th-TH.rc
+++ b/reactos/base/applications/msconfig_new/lang/th-TH.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "&Deactivate all", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&ตรวจการปลุกเครื่องทุกเส้นทาง", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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 "ตัวเลือกการปลุกเครื่อง", 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 "&หมดเวลา:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "วินาที", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "บริการ"
     IDS_TAB_STARTUP "เริ่มงานเครื่อง"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/tr-TR.rc b/reactos/base/applications/msconfig_new/lang/tr-TR.rc
index 6cc1587..2bb8e41 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/tr-TR.rc
+++ b/reactos/base/applications/msconfig_new/lang/tr-TR.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "T&ümünü Edilginleştir", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Tüm Ön Yükleme Yollarını Denetle", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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", 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ı:", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "s", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Hizmetler"
     IDS_TAB_STARTUP "Başlangıç"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/uk-UA.rc b/reactos/base/applications/msconfig_new/lang/uk-UA.rc
index a953d13..83d8710 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/uk-UA.rc
+++ b/reactos/base/applications/msconfig_new/lang/uk-UA.rc
@@ -94,26 +94,35 @@ BEGIN
     PUSHBUTTON "&Деактивувати все", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "&Вибрати всі шляхи", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-    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 "Варіанти завантаження", 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 "&Затримка:", IDC_STATIC, 275, 91, 33, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "сек.", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -175,8 +184,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "Служби"
     IDS_TAB_STARTUP "Автозавантаження"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/zh-CN.rc b/reactos/base/applications/msconfig_new/lang/zh-CN.rc
index 60852fd..82af771 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/zh-CN.rc
+++ b/reactos/base/applications/msconfig_new/lang/zh-CN.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "全部禁用(&D)", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "检查所有启动路径(&C)", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 80, 12
-    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 "启动选项", 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):", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "秒", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "服务"
     IDS_TAB_STARTUP "启动"
 END

diff --git a/reactos/base/applications/msconfig_new/lang/zh-TW.rc b/reactos/base/applications/msconfig_new/lang/zh-TW.rc
index 3740250..67d2152 100644 (file)
--- a/reactos/base/applications/msconfig_new/lang/zh-TW.rc
+++ b/reactos/base/applications/msconfig_new/lang/zh-TW.rc
@@ -88,26 +88,35 @@ BEGIN
     PUSHBUTTON "全部禁用(&D)", IDC_BTN_SERVICES_DEACTIVATE, 295, 155, 66, 14
 END
 
-IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
+CAPTION "FREELDR.INI"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
-            LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON "檢查所有啟動路徑(&C)", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 80, 12
-    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 "啟動選項", 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):", IDC_STATIC, 280, 91, 30, 10
-    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-    LTEXT "秒", IDC_STATIC, 340, 91, 15, 10
+    LISTBOX         IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14
+    PUSHBUTTON      "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
+    GROUPBOX        "Boot Options", IDC_STATIC, 5, 84, 285, 86
+    GROUPBOX        "", IDC_STATIC, 10, 97, 143, 68
+    CHECKBOX        "Safe boot (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+    CONTROL         "Minimal (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10
+    CONTROL         "Other environment\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, 
+                    "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17
+    CONTROL         "Repair ActiveDirectory (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10
+    CONTROL         "Network (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10
+    CHECKBOX        "No GUI boot\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE
+    CHECKBOX        "Boot log (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+    CHECKBOX        "Base video (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+    CHECKBOX        "OS boot information (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12
+    PUSHBUTTON      "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
+    LTEXT           "&Timeout:", IDC_STATIC, 296, 91, 32, 10
+    EDITTEXT        IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER
+    LTEXT           "seconds", IDC_STATIC, 330, 104, 31, 10
+    CONTROL         "Make &all boot settings permanent", 292, 
+                    "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
+    PUSHBUTTON      "&Delete", 1014, 295, 68, 66, 14
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175
@@ -169,8 +178,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_TAB_SYSTEM "SYSTEM.INI"
-    IDS_TAB_FREELDR "FREELDR.INI"
     IDS_TAB_SERVICES "服務"
     IDS_TAB_STARTUP "啟動"
 END

diff --git a/reactos/base/applications/msconfig_new/msconfig.c b/reactos/base/applications/msconfig_new/msconfig.c
index cb9565f..4d2ff3e 100644 (file)
--- a/reactos/base/applications/msconfig_new/msconfig.c
+++ b/reactos/base/applications/msconfig_new/msconfig.c
@@ -7,13 +7,14 @@
  */
 
 #include "precomp.h"
+#include "fileutils.h"
 #include "utils.h"
 
 #include "toolspage.h"
-#include "srvpage.h"
-#include "startuppage.h"
+// #include "srvpage.h"
+// #include "startuppage.h"
 #include "freeldrpage.h"
-#include "systempage.h"
+// #include "systempage.h"
 #include "generalpage.h"
 
 /* Allow only for a single instance of MSConfig */
@@ -330,12 +331,13 @@ HWND CreatePropSheet(HINSTANCE hInstance, HWND hwndOwner, LPCTSTR lpszTitle)
             BackupIniFile(lpszWinIni);
         }
     }
+#endif
 
     /* FreeLdr page */
-    // TODO: Program the interface for Vista : "light" BCD editor...
+    // TODO: Program the interface for Vista: "light" BCD editor...
     if (!bIsWindows || (bIsWindows && bIsOSVersionLessThanVista))
     {
-        LPCTSTR lpszLoaderIniFile = NULL;
+        LPCWSTR lpszLoaderIniFile = NULL;
         DWORD   dwTabNameId       = 0;
         if (bIsWindows)
         {
@@ -363,6 +365,7 @@ HWND CreatePropSheet(HINSTANCE hInstance, HWND hwndOwner, LPCTSTR lpszTitle)
         }
     }
 
+#if 0
     /* Services page */
     psp[nPages].dwSize      = sizeof(PROPSHEETPAGE);
     psp[nPages].dwFlags     = PSP_HASHELP;

diff --git a/reactos/base/applications/msconfig_new/msconfig.rc b/reactos/base/applications/msconfig_new/msconfig.rc
index b7cdc63..e6b1fad 100644 (file)
--- a/reactos/base/applications/msconfig_new/msconfig.rc
+++ b/reactos/base/applications/msconfig_new/msconfig.rc
@@ -21,6 +21,14 @@ BEGIN
     VK_F1,  IDM_ABOUT,  VIRTKEY,    SHIFT,  NOINVERT
 END
 
+STRINGTABLE
+BEGIN
+    IDS_TAB_SYSTEM          "SYSTEM.INI"
+    IDS_TAB_WIN             "WIN.INI"
+    IDS_TAB_FREELDR         "FREELDR.INI"
+    IDS_TAB_BOOT            "BOOT.INI"
+END
+
 #include <reactos/manifest_exe.rc>
 
 /* UTF-8 */

diff --git a/reactos/base/applications/msconfig_new/resource.h b/reactos/base/applications/msconfig_new/resource.h
index ad50b26..ca45d45 100644 (file)
--- a/reactos/base/applications/msconfig_new/resource.h
+++ b/reactos/base/applications/msconfig_new/resource.h
@@ -32,6 +32,26 @@
 #define IDC_BTN_SYSTEM_RESTORE_START    1318
 #define IDC_BTN_FILE_EXTRACTION         1418
 
+/* FreeLdr page controls */
+#define IDS_TAB_FREELDR                 2003
+#define IDS_TAB_BOOT                    2004
+#define IDC_LIST_BOX                    1019
+#define IDC_BTN_CHECK_BOOT_PATH         1020
+#define IDC_BTN_SET_DEFAULT_BOOT        1021
+#define IDC_BTN_MOVE_UP_BOOT_OPTION     1022
+#define IDC_BTN_MOVE_DOWN_BOOT_OPTION   1023
+#define IDC_CBX_SAFE_BOOT               1024
+#define IDC_CBX_NO_GUI_BOOT             1025
+#define IDC_CBX_BOOT_LOG                1026
+#define IDC_CBX_BASE_VIDEO              1027
+#define IDC_CBX_SOS                     1028
+#define IDC_BTN_ADVANCED_OPTIONS        1029
+#define IDC_TXT_BOOT_TIMEOUT            1030
+#define IDC_RADIO1                      1077 // FIXME!
+#define IDC_RADIO2                      1078 // FIXME!
+#define IDC_RADIO3                      1079 // FIXME!
+#define IDC_RADIO4                      1080 // FIXME!
+
 /* Tools page controls */
 #define IDC_TOOLS_LIST                  1007
 #define IDC_TOOLS_CMDLINE               1004
@@ -39,7 +59,7 @@
 #define IDC_CBX_TOOLS_ADVOPT            1081
 #define IDS_TOOLS_COLUMN_NAME           2010
 #define IDS_TOOLS_COLUMN_DESCR          2011
-#define IDS_TOOLS_COLUMN_STANDARD       2006
+#define IDS_TOOLS_COLUMN_STANDARD       2009
 
 /* File extract dialog */
 #define IDD_FILE_EXTRACT_DIALOG         1500
@@ -50,18 +70,6 @@
 #define IDC_DRP_CAB_FILE                1505
 #define IDC_DRP_DEST_DIR                1506
 
-#define IDC_LIST_BOX                  1019
-#define IDC_BTN_CHECK_BOOT_PATH       1020
-#define IDC_BTN_SET_DEFAULT_BOOT      1021
-#define IDC_BTN_MOVE_UP_BOOT_OPTION   1022
-#define IDC_BTN_MOVE_DOWN_BOOT_OPTION 1023
-#define IDC_CBX_SAFE_BOOT             1024
-#define IDC_CBX_NO_GUI_BOOT           1025
-#define IDC_CBX_BOOT_LOG              1026
-#define IDC_CBX_BASE_VIDEO            1027
-#define IDC_CBX_SOS                   1028
-#define IDC_BTN_ADVANCED_OPTIONS      1029
-#define IDC_TXT_BOOT_TIMEOUT          1030
 #define IDC_CBX_MAX_MEM               1031
 #define IDC_TXT_MAX_MEM               1032
 #define IDC_SCR_MAX_MEM               1033
@@ -92,10 +100,10 @@
 #define IDC_BTN_SYSTEM_ACTIVATE       1058
 #define IDC_BTN_SYSTEM_DEACTIVATE     1059
 
-#define IDS_TAB_SYSTEM   2002
-#define IDS_TAB_FREELDR  2003
-#define IDS_TAB_STARTUP  2004
-#define IDS_TAB_SERVICES 2005
+#define IDS_TAB_SYSTEM   2005
+#define IDS_TAB_WIN      2006
+#define IDS_TAB_STARTUP  2007
+#define IDS_TAB_SERVICES 2008
 
 #define IDS_SERVICES_COLUMN_SERVICE 2012
 #define IDS_SERVICES_COLUMN_REQ     2013
@@ -107,7 +115,7 @@
 
 #define IDS_SERVICES_STATUS_STOPPED 2200
 #define IDS_SERVICES_STATUS_RUNNING 2201
-#define IDS_SERVICES_UNKNOWN        2203
+#define IDS_SERVICES_UNKNOWN        2202
 
 
 

diff --git a/reactos/base/applications/msconfig_new/toolspage.cpp b/reactos/base/applications/msconfig_new/toolspage.cpp
index bf1b894..bf442e4 100644 (file)
--- a/reactos/base/applications/msconfig_new/toolspage.cpp
+++ b/reactos/base/applications/msconfig_new/toolspage.cpp
@@ -290,7 +290,7 @@ static void Update_States(int iSelectedItem)
 
 static BOOL RunSelectedTool(VOID)
 {
-    BOOL bRetVal = FALSE;
+    BOOL Success = FALSE;
     BOOL bUseAdvParams;
 
     LVITEM item = {};
@@ -307,10 +307,10 @@ static BOOL RunSelectedTool(VOID)
             bUseAdvParams = FALSE;
 
         // Values greater (strictly) than 32 indicate success (see MSDN documentation for ShellExecute(...) API).
-        bRetVal = (reinterpret_cast<TOOL*>(item.lParam)->Run(bUseAdvParams) > 32);
+        Success = (reinterpret_cast<TOOL*>(item.lParam)->Run(bUseAdvParams) > 32);
     }
 
-    return bRetVal;
+    return Success;
 }
 
 extern "C" {