diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c
index e1c7c16dba8..b5849c282a4 100644
--- a/base/shell/cmd/cmdinput.c
+++ b/base/shell/cmd/cmdinput.c
@@ -218,8 +218,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         curx = orgx;
                         cury = orgy;
                         //bContinue=TRUE;
-                        break;
                     }
+                    break;
 
                 case _T('D'):
                     /* delete current history entry */
@@ -232,8 +232,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         ConOutPrintf (_T("%s"), str);
                         GetCursorXY (&curx, &cury);
                         //bContinue=TRUE;
-                        break;
                     }
+                    break;
 #endif /*FEATURE_HISTORY*/
 
                 case _T('M'):
@@ -251,8 +251,16 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         str[charcount] = _T('\0');
                         ConOutChar (_T('\n'));
                         bReturn = TRUE;
-                        break;
                     }
+                    break;
+
+                case _T('H'): /* ^H does the same as VK_BACK */
+                    if (dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
+                    {
+                        bCharInput = FALSE;
+                        goto DoBackSpace;
+                    }
+                    break;
             }
         }
 
@@ -261,6 +269,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
         switch (ir.Event.KeyEvent.wVirtualKeyCode)
         {
             case VK_BACK:
+            DoBackSpace:
                 /* <BACKSPACE> - delete character to left of cursor */
                 if (current > 0 && charcount > 0)
                 {
diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h
index 168a455bfa1..01a194ac6e4 100644
--- a/base/shell/rshell/CQuickLaunchBand.h
+++ b/base/shell/rshell/CQuickLaunchBand.h
@@ -32,127 +32,96 @@ class CQuickLaunchBand :
     CQuickLaunchBand();
     virtual ~CQuickLaunchBand();
 
+    STDMETHOD(ContainsWindow)(IN HWND hWnd);
+
 // ATL construct
 
     HRESULT FinalConstruct();
 
 // IObjectWithSite
 
-    virtual STDMETHODIMP GetSite(
+    STDMETHOD(GetSite)(
         IN  REFIID riid,
-        OUT void   **ppvSite
-    );
+        OUT void   **ppvSite) override;
 
-    virtual STDMETHODIMP SetSite(
-        IN IUnknown *pUnkSite
-    );
+    STDMETHOD(SetSite)(IN IUnknown *pUnkSite) override;
 
 // IDeskBand
 
-    virtual STDMETHODIMP GetWindow(
-        OUT HWND *phwnd
-    );
+    STDMETHOD(GetWindow)(OUT HWND *phwnd) override;
 
-    virtual STDMETHODIMP ContextSensitiveHelp(
-        IN BOOL fEnterMode
-    );
+    STDMETHOD(ContextSensitiveHelp)(IN BOOL fEnterMode) override;
 
-    virtual STDMETHODIMP ShowDW(
-        IN BOOL bShow
-    );
+    STDMETHOD(ShowDW)(IN BOOL bShow) override;
 
-    virtual STDMETHODIMP CloseDW(
-        IN DWORD dwReserved
-    );
+    STDMETHOD(CloseDW)(IN DWORD dwReserved) override;
 
-    virtual STDMETHODIMP ResizeBorderDW(
+    STDMETHOD(ResizeBorderDW)(
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
-        BOOL fReserved
-    );
+        BOOL fReserved) override;
 
-    virtual STDMETHODIMP GetBandInfo(
+    STDMETHOD(GetBandInfo)(
         IN DWORD dwBandID,
         IN DWORD dwViewMode,
-        IN OUT DESKBANDINFO *pdbi
-    );
+        IN OUT DESKBANDINFO *pdbi) override;
 
 // IPersistStream
 
-    virtual STDMETHODIMP GetClassID(
-        OUT CLSID *pClassID
-    );
+    STDMETHOD(GetClassID)(OUT CLSID *pClassID) override;
 
-    virtual STDMETHODIMP GetSizeMax(
-        OUT ULARGE_INTEGER *pcbSize
-    );
+    STDMETHOD(GetSizeMax)(OUT ULARGE_INTEGER *pcbSize) override;
 
-    virtual STDMETHODIMP IsDirty();
+    STDMETHOD(IsDirty)() override;
 
-    virtual STDMETHODIMP Load(
-        IN IStream *pStm
-    );
+    STDMETHOD(Load)(IN IStream *pStm) override;
 
-    virtual STDMETHODIMP Save(
+    STDMETHOD(Save)(
         IN IStream *pStm,
-        IN BOOL    fClearDirty
-    );
+        IN BOOL    fClearDirty) override;
 
 // IWinEventHandler
 
-    virtual STDMETHODIMP ContainsWindow(
-        IN HWND hWnd
-    );
-
-    virtual STDMETHODIMP OnWinEvent(
+    STDMETHOD(OnWinEvent)(
         HWND hWnd,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam,
-        LRESULT *theResult
-    );
+        LRESULT *theResult) override;
 
-    virtual STDMETHODIMP IsWindowOwner(
-        HWND hWnd
-    );
+    STDMETHOD(IsWindowOwner)(HWND hWnd) override;
 
 // IOleCommandTarget
 
-    virtual STDMETHODIMP Exec(
+    STDMETHOD(Exec)(
         IN const GUID *pguidCmdGroup,
         IN DWORD nCmdID,
         IN DWORD nCmdexecopt,
         IN VARIANT *pvaIn,
-        IN OUT VARIANT *pvaOut
-    );
+        IN OUT VARIANT *pvaOut) override;
 
-    virtual STDMETHODIMP QueryStatus(
+    STDMETHOD(QueryStatus)(
         IN const GUID *pguidCmdGroup,
         IN ULONG cCmds,
         IN OUT OLECMD prgCmds[],
-        IN OUT OLECMDTEXT *pCmdText
-    );
+        IN OUT OLECMDTEXT *pCmdText) override;
 
 // IContextMenu
-    virtual STDMETHODIMP GetCommandString(
+    STDMETHOD(GetCommandString)(
         UINT_PTR idCmd,
         UINT uFlags,
         UINT *pwReserved,
         LPSTR pszName,
-        UINT cchMax
-    );
+        UINT cchMax) override;
 
-    virtual STDMETHODIMP InvokeCommand(
-        LPCMINVOKECOMMANDINFO pici
-    );
+    STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO pici) override;
 
-    virtual STDMETHODIMP QueryContextMenu(
+    STDMETHOD(QueryContextMenu)(
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
         UINT idCmdLast,
-        UINT uFlags
-    );
+        UINT uFlags) override;
 
 //*****************************************************************************************************
 
@@ -170,4 +139,4 @@ class CQuickLaunchBand :
         COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
         COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
     END_COM_MAP()
-};
\ No newline at end of file
+};
diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c
index 6a9f5f38a5b..acce1443d3d 100644
--- a/dll/cpl/appwiz/createlink.c
+++ b/dll/cpl/appwiz/createlink.c
@@ -15,6 +15,7 @@
 #include <shellapi.h>
 #include <strsafe.h>
 #include <shlwapi_undoc.h> // for PathFindOnPathExW
+#include "../../win32/shell32/shresdef.h" // for IDS_NEWITEMFORMAT and IDS_LNK_FILE
 
 BOOL
 IsShortcut(HKEY hKey)
@@ -75,83 +76,45 @@ IsExtensionAShortcut(LPWSTR lpExtension)
 BOOL
 CreateShortcut(PCREATE_LINK_CONTEXT pContext)
 {
-    IShellLinkW *pShellLink, *pSourceShellLink;
+    IShellLinkW *pShellLink;
     IPersistFile *pPersistFile;
     HRESULT hr;
-    WCHAR Path[MAX_PATH];
-    LPWSTR lpExtension;
 
-    /* get the extension */
-    lpExtension = PathFindExtensionW(pContext->szTarget);
+    hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLinkW, (void**)&pShellLink);
+    if (FAILED(hr))
+        return FALSE;
 
-    if (pContext->pidlTarget)
+    hr = IUnknown_QueryInterface(pShellLink, &IID_IPersistFile, (void**)&pPersistFile);
+    if (FAILED(hr))
     {
-        Path[0] = UNICODE_NULL;
+        IUnknown_Release(pShellLink);
+        return FALSE;
     }
-    else if (IsExtensionAShortcut(lpExtension))
-    {
-        hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLinkW, (void**)&pSourceShellLink);
-
-        if (FAILED(hr))
-            return FALSE;
-
-        hr = IUnknown_QueryInterface(pSourceShellLink, &IID_IPersistFile, (void**)&pPersistFile);
-        if (FAILED(hr))
-        {
-            IUnknown_Release(pSourceShellLink);
-            return FALSE;
-        }
 
+    if (IsExtensionAShortcut(PathFindExtensionW(pContext->szTarget)))
+    {
         hr = pPersistFile->lpVtbl->Load(pPersistFile, (LPCOLESTR)pContext->szTarget, STGM_READ);
-        IUnknown_Release(pPersistFile);
-
-        if (FAILED(hr))
-        {
-            IUnknown_Release(pSourceShellLink);
-            return FALSE;
-        }
-
-        hr = IShellLinkW_GetPath(pSourceShellLink, Path, _countof(Path), NULL, 0);
-        IUnknown_Release(pSourceShellLink);
-
-        if (FAILED(hr))
-        {
-            return FALSE;
-        }
     }
     else
     {
-        StringCchCopyW(Path, _countof(Path), pContext->szTarget);
-    }
+        if (pContext->pidlTarget)
+            pShellLink->lpVtbl->SetIDList(pShellLink, pContext->pidlTarget);
+        else
+            pShellLink->lpVtbl->SetPath(pShellLink, pContext->szTarget);
 
-    hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL,
-                          &IID_IShellLinkW, (void**)&pShellLink);
+        if (pContext->szArguments[0])
+            pShellLink->lpVtbl->SetArguments(pShellLink, pContext->szArguments);
 
-    if (hr != S_OK)
-        return FALSE;
-
-    if (pContext->pidlTarget)
-        pShellLink->lpVtbl->SetIDList(pShellLink, pContext->pidlTarget);
-    else
-        pShellLink->lpVtbl->SetPath(pShellLink, Path);
-
-    if (pContext->szArguments[0])
-        pShellLink->lpVtbl->SetArguments(pShellLink, pContext->szArguments);
-
-    if (pContext->szDescription[0])
-        pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription);
-
-    hr = IUnknown_QueryInterface(pShellLink, &IID_IPersistFile, (void**)&pPersistFile);
-    if (hr != S_OK)
-    {
-        IUnknown_Release(pShellLink);
-        return FALSE;
+        if (pContext->szDescription[0])
+            pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription);
     }
 
-    hr = pPersistFile->lpVtbl->Save(pPersistFile, pContext->szLinkName, TRUE);
+    if (SUCCEEDED(hr))
+        hr = pPersistFile->lpVtbl->Save(pPersistFile, pContext->szLinkName, TRUE);
+
     IUnknown_Release(pPersistFile);
     IUnknown_Release(pShellLink);
-    return (hr == S_OK);
+    return SUCCEEDED(hr);
 }
 
 BOOL
@@ -258,13 +221,13 @@ WelcomeDlgProc(HWND hwndDlg,
             pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext);
             PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
-            SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION), SHACF_DEFAULT);
+            SHAutoComplete(GetDlgItem(hwndDlg, IDC_LINK_LOCATION), SHACF_DEFAULT);
             break;
         case WM_COMMAND:
         {
             switch (LOWORD(wParam))
             {
-                case IDC_SHORTCUT_LOCATION:
+                case IDC_LINK_LOCATION:
                 {
                     if (HIWORD(wParam) == EN_CHANGE)
                     {
@@ -275,7 +238,7 @@ WelcomeDlgProc(HWND hwndDlg,
                             pContext->pidlTarget = NULL;
                         }
 
-                        if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXTLENGTH, 0, 0))
+                        if (SendDlgItemMessage(hwndDlg, IDC_LINK_LOCATION, WM_GETTEXTLENGTH, 0, 0))
                             PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
                         else
                             PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
@@ -302,11 +265,11 @@ WelcomeDlgProc(HWND hwndDlg,
                     SHGetPathFromIDListW(pidllist, szPath);
 
                     if (PathFileExistsW(szPath) && !PathIsRelativeW(szPath))
-                        SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, szPath);
+                        SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, szPath);
                     else
-                        SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, szDisplayName);
+                        SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, szDisplayName);
 
-                    SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1);
+                    SendDlgItemMessageW(hwndDlg, IDC_LINK_LOCATION, EM_SETSEL, 0, -1);
 
                     if (pContext->pidlTarget)
                         CoTaskMemFree(pContext->pidlTarget);
@@ -319,11 +282,11 @@ WelcomeDlgProc(HWND hwndDlg,
             lppsn  = (LPPSHNOTIFY) lParam;
             if (lppsn->hdr.code == PSN_SETACTIVE)
             {
-                SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget);
+                SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, pContext->szTarget);
             }
             else if (lppsn->hdr.code == PSN_WIZNEXT)
             {
-                GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget));
+                GetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, pContext->szTarget, _countof(pContext->szTarget));
                 StrTrimW(pContext->szTarget, L" \t");
                 ExpandEnvironmentStringsW(pContext->szTarget, szPath, _countof(szPath));
 
@@ -362,7 +325,7 @@ WelcomeDlgProc(HWND hwndDlg,
                     !PathFileExistsW(szPath))
                 {
                     /* Not found */
-                    SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1);
+                    SendDlgItemMessageW(hwndDlg, IDC_LINK_LOCATION, EM_SETSEL, 0, -1);
 
                     LoadStringW(hApplet, IDS_CREATE_SHORTCUT, szDesc, _countof(szDesc));
                     LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, _countof(szPath));
@@ -411,7 +374,7 @@ FinishDlgProc(HWND hwndDlg,
     LPPROPSHEETPAGEW ppsp;
     PCREATE_LINK_CONTEXT pContext;
     LPPSHNOTIFY lppsn;
-    WCHAR szText[MAX_PATH];
+    WCHAR szText[MAX_PATH], szPath[MAX_PATH];
     WCHAR szMessage[128];
 
     switch(uMsg)
@@ -447,8 +410,32 @@ FinishDlgProc(HWND hwndDlg,
             pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER);
             if (lppsn->hdr.code == PSN_SETACTIVE)
             {
-                /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */
+                /* Remove invalid characters */
                 DoConvertNameForFileSystem(pContext->szDescription);
+                PathCleanupSpec(NULL, pContext->szDescription);
+
+                /* Is it empty? (rare case) */
+                if (!pContext->szDescription[0])
+                {
+                    HMODULE hShell32 = GetModuleHandleW(L"shell32.dll");
+                    LoadStringW(hShell32, IDS_NEWITEMFORMAT, szText, _countof(szText));
+                    LoadStringW(hShell32, IDS_LNK_FILE, szMessage, _countof(szMessage));
+                    StringCchPrintfW(pContext->szDescription, _countof(pContext->szDescription),
+                                     szText, szMessage);
+                }
+
+                /* Build a path from szOldFile */
+                StringCchCopyW(szText, _countof(szText), pContext->szOldFile);
+                PathRemoveFileSpecW(szText);
+
+                /* Rename duplicate if necessary */
+                PathAddExtensionW(pContext->szDescription,
+                                  (IsInternetLocation(pContext->szTarget) ? L".url" : L".lnk"));
+                PathYetAnotherMakeUniqueName(szPath, szText, NULL, pContext->szDescription);
+                StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription),
+                               PathFindFileNameW(szPath));
+                PathRemoveExtensionW(pContext->szDescription);
+
                 SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription);
                 SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_NAME, EM_SETSEL, 0, -1);
                 SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_NAME));
@@ -483,7 +470,7 @@ FinishDlgProc(HWND hwndDlg,
 
                     /* change extension if any */
                     PathRemoveExtensionW(pContext->szLinkName);
-                    StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".url");
+                    PathAddExtensionW(pContext->szLinkName, L".url");
 
                     if (!CreateInternetShortcut(pContext))
                     {
@@ -500,7 +487,7 @@ FinishDlgProc(HWND hwndDlg,
 
                     /* change extension if any */
                     PathRemoveExtensionW(pContext->szLinkName);
-                    StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".lnk");
+                    PathAddExtensionW(pContext->szLinkName, L".lnk");
 
                     if (!CreateShortcut(pContext))
                     {
diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc
index 5cb93daa660..74e4c91aecb 100644
--- a/dll/cpl/appwiz/lang/bg-BG.rc
+++ b/dll/cpl/appwiz/lang/bg-BG.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Вълшебникът ви помага за създаването на препратки към местни или мрежови приложения, файлове, папки, компютри или адреси в интернет.", -1, 120, 15, 200, 32
     LTEXT "Напишете местоположението на предмета:", -1, 120, 50, 160, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT
     LTEXT "Натиснете ""Напред"" за продължаване.", -1, 120, 100, 160, 10
 END
diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc
index e03f52666b2..bef33a26d21 100644
--- a/dll/cpl/appwiz/lang/cs-CZ.rc
+++ b/dll/cpl/appwiz/lang/cs-CZ.rc
@@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Tento průvodce pomůže s vytvořením zástupců na místní\nnebo síťové programy, soubory, složky, počítače nebo\ninternetové adresy.", -1, 120, 15, 200, 30
     LTEXT "Zadejte umístění položky:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Procházet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Pokračujte kliknutím na Další.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc
index 07f78bc33f5..92ae5bb21cf 100644
--- a/dll/cpl/appwiz/lang/de-DE.rc
+++ b/dll/cpl/appwiz/lang/de-DE.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30
     LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc
index 6d1b0fcb7d8..f5ace98c0f2 100644
--- a/dll/cpl/appwiz/lang/el-GR.rc
+++ b/dll/cpl/appwiz/lang/el-GR.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Αυτός ο οδηγός σας βοηθάει να δημιουργήσετε συντομεύσεις σε τοπικά προγράμματα ή προγράμματα δικτύου, αρχεία, φακέλους, υπολογιστές ή διευθύνσεις στο διαδίκτυο.", -1, 120, 15, 200, 30
     LTEXT "Εισάγετε την θέση του στοιχείου:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Αναζήτηση...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc
index 1c4be80aef3..a1380332eb4 100644
--- a/dll/cpl/appwiz/lang/en-US.rc
+++ b/dll/cpl/appwiz/lang/en-US.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30
     LTEXT "Type the location of the item:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Click Next to continue.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc
index 5f59afb626c..f064698d1ae 100644
--- a/dll/cpl/appwiz/lang/es-ES.rc
+++ b/dll/cpl/appwiz/lang/es-ES.rc
@@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, equipos, o direcciones de Internet.", -1, 120, 15, 200, 30
     LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc
index a17534fb4e8..423fea89bd7 100644
--- a/dll/cpl/appwiz/lang/et-EE.rc
+++ b/dll/cpl/appwiz/lang/et-EE.rc
@@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Selle viisardi abil saate luua otseteid kohalike või\nvõrguprogrammide, failide, kaustada, arvutite või\nInterneti-aadresside juurde.", -1, 120, 15, 200, 30
     LTEXT "Tippige üksuse asukoht:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Sirvi...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Jätkamiseks klõpsake nuppu Edasi.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc
index 731283c04f2..fa3d4459117 100644
--- a/dll/cpl/appwiz/lang/fr-FR.rc
+++ b/dll/cpl/appwiz/lang/fr-FR.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30
     LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT
     LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc
index 01a4ce72301..2883d5c91ab 100644
--- a/dll/cpl/appwiz/lang/he-IL.rc
+++ b/dll/cpl/appwiz/lang/he-IL.rc
@@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30
     LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc
index 665869289d0..184f2277c6a 100644
--- a/dll/cpl/appwiz/lang/hu-HU.rc
+++ b/dll/cpl/appwiz/lang/hu-HU.rc
@@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Ez a varázsló parancsikonok létrehozásában nyújt segítséget,\nhelyi vagy hálózati programokhoz, fájlokhoz, mappákhoz,\nszámítógépekhez vagy internetes címekhez.", -1, 120, 15, 200, 30
     LTEXT "Írja be az elem helyét:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Tallózás...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Kattintson a tovább gombra a folytatáshoz.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc
index 83e4a0f7931..7b2feff397c 100644
--- a/dll/cpl/appwiz/lang/id-ID.rc
+++ b/dll/cpl/appwiz/lang/id-ID.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Penuntun ini membantu membuat pintasan pada lokal atau\njaringan berupa program, berkas, folder, Komputer, atau Alamat Internet.", -1, 120, 15, 200, 30
     LTEXT "Ketik lokasi butir:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Cari...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Klik Lanjut untuk meneruskan.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc
index ab8e9cddf4c..9bffef82c36 100644
--- a/dll/cpl/appwiz/lang/it-IT.rc
+++ b/dll/cpl/appwiz/lang/it-IT.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o\nindirizzi Internet.", -1, 120, 15, 200, 30
     LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc
index 6455621ba13..0070e2f4706 100644
--- a/dll/cpl/appwiz/lang/ja-JP.rc
+++ b/dll/cpl/appwiz/lang/ja-JP.rc
@@ -26,7 +26,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
     LTEXT "このウィザードは、ローカルまたはネットワークプログラム、ファイル、フォルダー、コンピューター、またはインターネット アドレスへのショートカットを作成するのを助けます。", -1, 120, 15, 200, 30
     LTEXT "項目の位置を入力して下さい:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "参照...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "次へをクリックすると続行します。", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc
index dc5c660ba6d..21498c093b8 100644
--- a/dll/cpl/appwiz/lang/no-NO.rc
+++ b/dll/cpl/appwiz/lang/no-NO.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller\nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30
     LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc
index 248269f30a8..25e6b1fb2f3 100644
--- a/dll/cpl/appwiz/lang/pl-PL.rc
+++ b/dll/cpl/appwiz/lang/pl-PL.rc
@@ -1,12 +1,11 @@
 /*
- *         translated by Caemyr - Olaf Siejka (Jan, 2008)
- *         Use ReactOS forum PM or IRC to contact me
- *         https://reactos.org
- *         IRC: irc.freenode.net #reactos-pl;
- *         UTF-8 conversion by Caemyr (May, 2011)
- *         Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (April, 2014)
- *         Updated by Zcooger - M. St. Ciuńczyk (October, 2018)
- *         Updated by pithwz - Piotr Hetnarowicz <piotrhwz@gmail.com> (May, 2020)
+ * PROJECT:     ReactOS Software Control Panel
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Polish resource file
+ * TRANSLATORS: Copyright 2008 Olaf Siejka <caemyr@gmail.com>
+ *              Copyright 2014 Adam Stachowicz <saibamenppl@gmail.com>
+ *              Copyright 2018 M. St. Ciuńczyk (Zcooger)
+ *              Copyright 2020-2024 Piotr Hetnarowicz <piotrhwz@gmail.com>
  */
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -37,7 +36,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30
     LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 274, 65, 55, 15, ES_LEFT
     LTEXT "Kliknij Dalej, aby kontynuować.", -1, 120, 97, 162, 10
 END
@@ -97,5 +96,5 @@ BEGIN
     IDS_NO_DIRECTORY "Nie podano ścieżki!"
     IDS_INVALID_PATH "Podana ścieżka jest niepoprawna!"
     IDS_INVALID_NAME "Wprowadzona nazwa skrótu zawiera nieprawidłowe znaki lub jest za długa."
-    IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:"
+    IDS_BROWSE_FOR_TARGET "Wybierz element docelowy dla poniższego skrótu:"
 END
diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc
index c21d9eaeb58..de75e4f5071 100644
--- a/dll/cpl/appwiz/lang/pt-BR.rc
+++ b/dll/cpl/appwiz/lang/pt-BR.rc
@@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30
     LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc
index d0cf672158a..8ceefaa08db 100644
--- a/dll/cpl/appwiz/lang/pt-PT.rc
+++ b/dll/cpl/appwiz/lang/pt-PT.rc
@@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30
     LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc
index b53505b72b5..fb9a5d7b447 100644
--- a/dll/cpl/appwiz/lang/ro-RO.rc
+++ b/dll/cpl/appwiz/lang/ro-RO.rc
@@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Acest expert vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30
     LTEXT "Scrieți adresa elementului:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Spe&cificare…",  IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Apăsați Înainte pentru a continua.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc
index 75fafc51b51..74fa9a81297 100644
--- a/dll/cpl/appwiz/lang/ru-RU.rc
+++ b/dll/cpl/appwiz/lang/ru-RU.rc
@@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Этот мастер поможет создать ярлык для локальных или\nсетевых программ, файлов, папок, компьютеров или\nИнтернет-адресов.", -1, 120, 15, 200, 30
     LTEXT "Выберите местоположение элемента:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Щелкните ""Далее"" для продолжения.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc
index aaca7a01487..3a702948d73 100644
--- a/dll/cpl/appwiz/lang/sk-SK.rc
+++ b/dll/cpl/appwiz/lang/sk-SK.rc
@@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Tento sprievodca Vám pomôže vytvoriť odkazy na miestne alebo\nsieťové programy, súbory, priečinky, počítače, alebo internetové\nadresy.", -1, 120, 15, 200, 30
     LTEXT "Zadajte umiestnenie položky:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "&Prehľadávať...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc
index b6dbbc3aa5d..067b4ea4a72 100644
--- a/dll/cpl/appwiz/lang/sq-AL.rc
+++ b/dll/cpl/appwiz/lang/sq-AL.rc
@@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Ky magjistar ju ndihmon për të krijuar shkurtesat për të lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30
     LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Klikoni Next për të vazhduar.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc
index 745f690df08..e6906621acf 100644
--- a/dll/cpl/appwiz/lang/tr-TR.rc
+++ b/dll/cpl/appwiz/lang/tr-TR.rc
@@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Bu sihirbaz, yerel ya da ağdaki programlara, dosyalara,\ndizinlere, bilgisayarlara ve İnternet adreslerine\nkısayollar oluşturmanıza yardımcı olur.", -1, 120, 15, 200, 30
     LTEXT "Ögenin konumunu yazınız:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Devam etmek için ""İleri""ye tıklayınız.", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc
index bebed612638..00c5a7d5c47 100644
--- a/dll/cpl/appwiz/lang/uk-UA.rc
+++ b/dll/cpl/appwiz/lang/uk-UA.rc
@@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Цей майстер допомагає створити ярлик, який указує на\nлокальні або мережні програми, файли, папки, комп'ютери\nабо адреси в Інтернеті.", -1, 120, 15, 200, 30
     LTEXT "Укажіть розташування об'єкта:", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "Огляд...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "Щоб продовжити установку, натисніть кнопку ""Далі"".", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc
index c3b99c5dc7a..555cfb87ded 100644
--- a/dll/cpl/appwiz/lang/zh-CN.rc
+++ b/dll/cpl/appwiz/lang/zh-CN.rc
@@ -35,7 +35,7 @@ FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     LTEXT "此向导可帮助您创建本地或网络程序、文件、文件夹、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30
     LTEXT "请输入项目位置：", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc
index 1baeb03850c..c10cfe121d1 100644
--- a/dll/cpl/appwiz/lang/zh-HK.rc
+++ b/dll/cpl/appwiz/lang/zh-HK.rc
@@ -34,7 +34,7 @@ FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     LTEXT "這個精靈協助您建立本地或網路程式、檔案、目錄、電腦或互聯網地址的捷徑。", -1, 120, 15, 200, 30
     LTEXT "輸入項目位置：", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "按［下一步］繼續。", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc
index a4bd7485c1f..be25b82d3be 100644
--- a/dll/cpl/appwiz/lang/zh-TW.rc
+++ b/dll/cpl/appwiz/lang/zh-TW.rc
@@ -35,7 +35,7 @@ FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     LTEXT "此精靈幫助您建立本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30
     LTEXT "輸入項目位置：", -1, 120, 50, 120, 10
-    EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
+    EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL
     PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
     LTEXT "按［下一步］繼續。", -1, 120, 97, 162, 10
 END
diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h
index 9b780c71867..e7be45b3ef7 100644
--- a/dll/cpl/appwiz/resource.h
+++ b/dll/cpl/appwiz/resource.h
@@ -37,9 +37,9 @@
 #define IDS_DWL_FAILED         17
 
 /* Controls */
-#define IDC_SHORTCUT_LOCATION	107
-#define IDC_SHORTCUT_BROWSE		108
-#define IDC_SHORTCUT_NAME		109
+#define IDC_LINK_LOCATION       107
+#define IDC_SHORTCUT_BROWSE     108
+#define IDC_SHORTCUT_NAME       109
 #define IDC_STARTMENU_TREE      110
 #define IDC_REMOVE_ENTRIES      111
 
diff --git a/dll/shellext/acppage/CLayerStringList.hpp b/dll/shellext/acppage/CLayerStringList.hpp
index 2a0f5bfcf11..d2515991e3d 100644
--- a/dll/shellext/acppage/CLayerStringList.hpp
+++ b/dll/shellext/acppage/CLayerStringList.hpp
@@ -28,7 +28,7 @@ class CLayerStringList :
         SdbCloseDatabase(m_db);
     }
 
-    virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched)
+    STDMETHOD(Next)(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) override
     {
         if (pceltFetched)
             *pceltFetched = 0;
@@ -58,7 +58,7 @@ class CLayerStringList :
         return celt ? S_FALSE : S_OK;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt)
+    STDMETHOD(Skip)(ULONG celt) override
     {
         while (m_layer && celt)
         {
@@ -68,7 +68,7 @@ class CLayerStringList :
         return celt ? S_FALSE : S_OK;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE Reset()
+    STDMETHOD(Reset)() override
     {
         m_root = m_layer = TAGID_NULL;
         if (m_db)
@@ -83,7 +83,7 @@ class CLayerStringList :
         return E_FAIL;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppenum)
+    STDMETHOD(Clone)(IEnumString **ppenum) override
     {
         return E_NOTIMPL;
     }
diff --git a/dll/shellext/netshell/connectmanager.h b/dll/shellext/netshell/connectmanager.h
index a4a83296b4c..7bf6a8b785c 100644
--- a/dll/shellext/netshell/connectmanager.h
+++ b/dll/shellext/netshell/connectmanager.h
@@ -18,13 +18,13 @@ class CNetConnectionManager:
         HRESULT EnumerateINetConnections();
 
         // INetConnectionManager
-        virtual HRESULT WINAPI EnumConnections(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum);
+        STDMETHOD(EnumConnections)(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum) override;
 
         // IEnumNetConnection
-        virtual HRESULT WINAPI Next(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched);
-        virtual HRESULT WINAPI Skip(ULONG celt);
-        virtual HRESULT WINAPI Reset();
-        virtual HRESULT WINAPI Clone(IEnumNetConnection **ppenum);
+        STDMETHOD(Next)(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched) override;
+        STDMETHOD(Skip)(ULONG celt) override;
+        STDMETHOD(Reset)() override;
+        STDMETHOD(Clone)(IEnumNetConnection **ppenum) override;
 
     private:
         PINetConnectionItem m_pHead;
@@ -54,13 +54,13 @@ class CNetConnection:
         HRESULT WINAPI Initialize(PINetConnectionItem pItem);
 
         // INetConnection
-        HRESULT WINAPI Connect();
-        HRESULT WINAPI Disconnect();
-        HRESULT WINAPI Delete();
-        HRESULT WINAPI Duplicate(LPCWSTR pszwDuplicateName, INetConnection **ppCon);
-        HRESULT WINAPI GetProperties(NETCON_PROPERTIES **ppProps);
-        HRESULT WINAPI GetUiObjectClassId(CLSID *pclsid);
-        HRESULT WINAPI Rename(LPCWSTR pszwDuplicateName);
+        STDMETHOD(Connect)() override;
+        STDMETHOD(Disconnect)() override;
+        STDMETHOD(Delete)() override;
+        STDMETHOD(Duplicate)(LPCWSTR pszwDuplicateName, INetConnection **ppCon) override;
+        STDMETHOD(GetProperties)(NETCON_PROPERTIES **ppProps) override;
+        STDMETHOD(GetUiObjectClassId)(CLSID *pclsid) override;
+        STDMETHOD(Rename)(LPCWSTR pszwDuplicateName) override;
 
         DECLARE_NOT_AGGREGATABLE(CNetConnection)
         DECLARE_PROTECT_FINAL_CONSTRUCT()
diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp
index 9369663f708..5f4b0fbef11 100644
--- a/dll/shellext/netshell/enumlist.cpp
+++ b/dll/shellext/netshell/enumlist.cpp
@@ -137,10 +137,10 @@ class CEnumIDList:
         HRESULT Initialize();
 
         // IEnumIDList
-        virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched);
-        virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt);
-        virtual HRESULT STDMETHODCALLTYPE Reset();
-        virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum);
+        STDMETHOD(Next)(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched) override;
+        STDMETHOD(Skip)(ULONG celt) override;
+        STDMETHOD(Reset)() override;
+        STDMETHOD(Clone)(IEnumIDList **ppenum) override;
 
     private:
         BOOL AddToEnumList(PITEMID_CHILD pidl);
diff --git a/dll/shellext/netshell/lanconnectui.h b/dll/shellext/netshell/lanconnectui.h
index 964435b05fe..c523e706095 100644
--- a/dll/shellext/netshell/lanconnectui.h
+++ b/dll/shellext/netshell/lanconnectui.h
@@ -31,16 +31,16 @@ class CNetConnectionPropertyUi:
         ~CNetConnectionPropertyUi();
 
         // INetConnectionPropertyUi2
-        virtual HRESULT WINAPI AddPages(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
-        virtual HRESULT WINAPI GetIcon(DWORD dwSize, HICON *phIcon);
+        STDMETHOD(AddPages)(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) override;
+        STDMETHOD(GetIcon)(DWORD dwSize, HICON *phIcon) override;
 
         // INetLanConnectionUiInfo
-        virtual HRESULT WINAPI GetDeviceGuid(GUID *pGuid);
+        STDMETHOD(GetDeviceGuid)(GUID *pGuid) override;
 
         // INetConnectionConnectUi
-        virtual HRESULT WINAPI SetConnection(INetConnection* pCon);
-        virtual HRESULT WINAPI Connect(HWND hwndParent, DWORD dwFlags);
-        virtual HRESULT WINAPI Disconnect(HWND hwndParent, DWORD dwFlags);
+        STDMETHOD(SetConnection)(INetConnection* pCon) override;
+        STDMETHOD(Connect)(HWND hwndParent, DWORD dwFlags) override;
+        STDMETHOD(Disconnect)(HWND hwndParent, DWORD dwFlags) override;
 
     private:
         BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut);
diff --git a/dll/shellext/netshell/lanstatusui.h b/dll/shellext/netshell/lanstatusui.h
index 339db30d179..819558498aa 100644
--- a/dll/shellext/netshell/lanstatusui.h
+++ b/dll/shellext/netshell/lanstatusui.h
@@ -40,8 +40,8 @@ class CLanStatus:
         CLanStatus();
 
         // IOleCommandTarget
-        virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText);
-        virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+        STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) override;
+        STDMETHOD(Exec)(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override;
 
     private:
         HRESULT InitializeNetTaskbarNotifications();
diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h
index 9326fdad141..c96fbb7d519 100644
--- a/dll/shellext/netshell/shfldr_netconnect.h
+++ b/dll/shellext/netshell/shfldr_netconnect.h
@@ -22,43 +22,43 @@ class CNetworkConnections:
         ~CNetworkConnections();
 
         // IPersistFolder2
-        virtual HRESULT WINAPI GetClassID(CLSID *lpClassId);
-        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl);
-        virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl);
+        STDMETHOD(GetClassID)(CLSID *lpClassId) override;
+        STDMETHOD(Initialize)(PCIDLIST_ABSOLUTE pidl) override;
+        STDMETHOD(GetCurFolder)(PIDLIST_ABSOLUTE *pidl) override;
 
         // IShellFolder
-        virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes);
-        virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList);
-        virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut);
-        virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut);
-        virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2);
-        virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut);
-        virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut);
-        virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut);
-        virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet);
-        virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut);
+        STDMETHOD(ParseDisplayName)(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) override;
+        STDMETHOD(EnumObjects)(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) override;
+        STDMETHOD(BindToObject)(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) override;
+        STDMETHOD(BindToStorage)(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) override;
+        STDMETHOD(CompareIDs)(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) override;
+        STDMETHOD(CreateViewObject)(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) override;
+        STDMETHOD(GetAttributesOf)(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) override;
+        STDMETHOD(GetUIObjectOf)(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) override;
+        STDMETHOD(GetDisplayNameOf)(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) override;
+        STDMETHOD(SetNameOf)(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) override;
 
         // IShellFolder2
-        virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid);
-        virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum);
-        virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay);
-        virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags);
-        virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv);
-        virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd);
-        virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid);
+        STDMETHOD(GetDefaultSearchGUID)(GUID *pguid) override;
+        STDMETHOD(EnumSearches)(IEnumExtraSearch **ppenum) override;
+        STDMETHOD(GetDefaultColumn)(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) override;
+        STDMETHOD(GetDefaultColumnState)(UINT iColumn, DWORD *pcsFlags) override;
+        STDMETHOD(GetDetailsEx)(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) override;
+        STDMETHOD(GetDetailsOf)(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) override;
+        STDMETHOD(MapColumnToSCID)(UINT column, SHCOLUMNID *pscid) override;
 
         // IShellExtInit
-        virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
+        STDMETHOD(Initialize)(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) override;
 
         // IOleCommandTarget
-        virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
-        virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText);
+        STDMETHOD(Exec)(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override;
+        STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) override;
 
         // IShellFolderViewCB
-        virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
+        STDMETHOD(MessageSFVCB)(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
 
         // IShellExecuteHookW
-        virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei);
+        STDMETHOD(Execute)(LPSHELLEXECUTEINFOW pei) override;
 
     private:
 
@@ -103,23 +103,23 @@ class CNetConUiObject:
         HRESULT WINAPI Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd);
 
         // IContextMenu3
-        virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
-        virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
-        virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax);
-        virtual HRESULT WINAPI HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam);
-        virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult);
+        STDMETHOD(QueryContextMenu)(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) override;
+        STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO lpici) override;
+        STDMETHOD(GetCommandString)(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) override;
+        STDMETHOD(HandleMenuMsg)( UINT uMsg, WPARAM wParam, LPARAM lParam) override;
+        STDMETHOD(HandleMenuMsg2)(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) override;
 
         // IObjectWithSite
-        virtual HRESULT WINAPI SetSite(IUnknown *punk);
-        virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
+        STDMETHOD(SetSite)(IUnknown *punk) override;
+        STDMETHOD(GetSite)(REFIID iid, void **ppvSite) override;
 
         // IQueryInfo
-        virtual HRESULT WINAPI GetInfoFlags(DWORD *pdwFlags);
-        virtual HRESULT WINAPI GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip);
+        STDMETHOD(GetInfoFlags)(DWORD *pdwFlags) override;
+        STDMETHOD(GetInfoTip)(DWORD dwFlags, WCHAR **ppwszTip) override;
 
         // IExtractIconW
-        virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags);
-        virtual HRESULT STDMETHODCALLTYPE Extract(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);
+        STDMETHOD(GetIconLocation)(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) override;
+        STDMETHOD(Extract)(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) override;
 
         BEGIN_COM_MAP(CNetConUiObject)
             COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu3)
diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc
index 2a21a94e116..fa211f661b0 100644
--- a/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/dll/win32/netcfgx/lang/bg-BG.rc
@@ -76,8 +76,8 @@ BEGIN
     LTEXT "Адреси на DNS, по реда на използване:", -1, 5, 5, 180, 12
     PUSHBUTTON "Нагоре", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Надолу", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Добавяне...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Обработка...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Добавяне...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &Д
+    PUSHBUTTON "&Обработка...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &О
     PUSHBUTTON "Пре&махване", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
     LTEXT "Следните три настройки се прилагат на всички свързвания, за които е позволен TCP/IP. За разрешаване на негодни имена:", -1, 5, 70, 220, 24
     CONTROL "Наставяне на &първичните и обособените за връзките DNS наставки", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
@@ -86,8 +86,8 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Нагоре", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Надолу", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Добавяне...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Обработка...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Добавяне...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &Д
+    PUSHBUTTON "&Обработка...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &О
     PUSHBUTTON "Пре&махване", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
     LTEXT "DNS &наставка за това свързване:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc
index cbb5a3a5870..01ecbda31af 100644
--- a/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -11,7 +11,7 @@ BEGIN
     LTEXT "Konfigurace IP adres může proběhnout automaticky, pokud to síť dovoluje. V opačném případě kontaktujte správce sítě pro správné nastavení.", -1, 9, 9, 228, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Získat IP adresu automaticky", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Použít následující IP adresu:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Použít následující IP adresu:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &P
     LTEXT "IP adresa:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Maska podsítě:", -1, 14, 90, 135, 8
@@ -20,7 +20,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &P
     LTEXT "Upřednostňovaný DNS server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Záložní DNS server:", -1, 14, 176, 135, 8
@@ -79,9 +79,9 @@ BEGIN
     LTEXT "&Adresy DNS serverů v pořadí využití:", -1, 5, 5, 180, 12
     PUSHBUTTON "Nahoru", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Dolů", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Přidat...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Upravit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Odebrat", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Přidat...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &P
+    PUSHBUTTON "&Upravit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &U
+    PUSHBUTTON "&Odebrat", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &O
     LTEXT "Následující tři nastavení jsou aplikována na všechna připojení s povoleným TCP/IP. Při překladu nekvalifikovaných jmen:", -1, 5, 70, 220, 24
     CONTROL "Připojit p&rimární a připojením dané DNS přípony", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Připojit rodičovské přípony primární DNS přípony", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -89,13 +89,13 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Nahoru", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Dolů", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Přidat...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Upravit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Odebrat", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Přidat...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &P
+    PUSHBUTTON "&Upravit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &U
+    PUSHBUTTON "&Odebrat", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &O
     LTEXT "DNS přípo&na tohoto připojení:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
     CHECKBOX "Registrovat &adresy tohoto připojení v DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "P&oužít DNS příponu tohoto připojení při DNS registraci", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "P&oužít DNS příponu tohoto připojení při DNS registraci", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &O
 END
 
 IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc
index 82fe35d148d..8eb5d58d771 100644
--- a/dll/win32/netcfgx/lang/da-DK.rc
+++ b/dll/win32/netcfgx/lang/da-DK.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "Du kan få din IP opsætning indstillet automatisk, hvis dit Netværkskort understøtter denne mulighed. Ellers, er du nød til at spørge din 'Netværks Administrator' omkring din IP opsætning.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Brug følge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Brug følge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &B
     LTEXT "IP Adresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Subnet maske:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Tildel automatisk en DNS server adresse", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &B
     LTEXT "Fortrukket DNS server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternativ DNS server:", -1, 14, 176, 135, 8
diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc
index 5fc8047dced..181ac4470cf 100644
--- a/dll/win32/netcfgx/lang/de-DE.rc
+++ b/dll/win32/netcfgx/lang/de-DE.rc
@@ -51,19 +51,19 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP-Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP-Adressen", -1, 5, 5, 240, 83
+    GROUPBOX "&IP-Adressen", -1, 5, 5, 240, 83
     CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
-    PUSHBUTTON "Hinzufügen...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
-    GROUPBOX "Standardgateways", -1, 5, 93, 240, 83
+    PUSHBUTTON "&Hinzufügen...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Bearbeiten...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ent&fernen", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "S&tandardgateways", -1, 5, 93, 240, 83
     CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
-    PUSHBUTTON "Hinzufügen...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Hin&zufügen...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bea&rbeiten...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Entfernen", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 5, 181, 240, 30
     CHECKBOX "A&utomatische Metrik", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Schnittstellenmetrik:", -1, 15, 195, 90, 12
+    LTEXT "&Schnittstellenmetrik:", -1, 15, 195, 90, 12
     EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
@@ -76,23 +76,23 @@ BEGIN
     LTEXT "D&NS-Serveradressen in Verwendungsreihenfolge:", -1, 5, 5, 180, 12
     PUSHBUTTON "Aufwärts", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abwärts", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Hinzufügen...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbeiten...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Hinzufügen...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bearbe&iten...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "En&tfernen", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
     LTEXT "Die folgenden drei Einstellungen gelten für alle Verbindungen, für die TCP/IP aktiviert ist: Für die Auflösung unvollständiger Namen:", -1, 5, 70, 220, 24
-    CONTROL "Primäre und verbindungspezifische DNS-Suffixe anhängen", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
+    CONTROL "&Primäre und verbindungspezifische DNS-Suffixe anhängen", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Übergeor&dnete Suffixe des primären DNS-Suffixes anhängen", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Diese DNS-Suffixe anhängen (in Reihenfolge):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
+    CONTROL "Diese DNS-&Suffixe anhängen (in Reihenfolge):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Aufwärts", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abwärts", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Hinzufügen...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Bearbe&iten...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
-    LTEXT "DNS-Suffix für diese Verbindung:", -1, 5, 183, 110, 14
+    PUSHBUTTON "Hin&zufügen...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Bea&rbeiten...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Entfernen", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    LTEXT "DNS-S&uffix für diese Verbindung:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
-    CHECKBOX "Adressen dieser Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "DNS-Suffix dieser Verbindung in DNS-Registrierung verwenden", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Adressen dieser &Verbindung in DNS registrieren", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "DNS-Suffi&x dieser Verbindung in DNS-Registrierung verwenden", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
 IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 220
@@ -113,8 +113,8 @@ CAPTION "TCP/IP-Adresse"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
-    LTEXT "IP-Adresse:", -1, 5, 15, 70, 12
-    LTEXT "Subnetzmaske:", -1, 5, 30, 70, 12
+    LTEXT "&IP-Adresse:", -1, 5, 15, 70, 12
+    LTEXT "&Subnetzmaske:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
     DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
@@ -126,8 +126,8 @@ CAPTION "TCP/IP-Gateway"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
-    LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Gateway:", -1, 5, 15, 70, 12
+    CHECKBOX "A&utomatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
@@ -140,7 +140,7 @@ CAPTION "TCP/IP-DNS-Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
-    LTEXT "DNS-Server:", -1, 5, 10, 120, 12
+    LTEXT "&DNS-Server:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -151,7 +151,7 @@ CAPTION "TCP/IP-Domänensuffix"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
-    LTEXT "Domänensuffix:", -1, 5, 10, 120, 12
+    LTEXT "&Domänensuffix:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -161,25 +161,25 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP-Filterung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CHECKBOX "TCP/IP-Filterung aktivieren (alle Adapter)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "TC&P/IP-Filterung aktivieren (alle Adapter)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
-    CONTROL "Alle zulassen", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
-    CONTROL "Nur zulassen", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "&Alle zulassen", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
+    CONTROL "&Nur zulassen", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
     CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75
     PUSHBUTTON "Hinzufügen...", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Entfernen", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
-    CONTROL "Alle zulassen", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
+    CONTROL "A&lle zulassen", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
     CONTROL "Nur zulassen", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
     PUSHBUTTON "Hinzufügen...", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "En&tfernen", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 205, 30, 90, 150
-    CONTROL "Alle zulassen", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
+    CONTROL "Alle &zulassen", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
     CONTROL "Nur zulassen", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75
     PUSHBUTTON "Hinzufügen...", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Entfernen", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Entfe&rnen", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
     PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc
index acbc0f2b70c..3da96e6676c 100644
--- a/dll/win32/netcfgx/lang/en-US.rc
+++ b/dll/win32/netcfgx/lang/en-US.rc
@@ -7,22 +7,22 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
-    CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
-    LTEXT "IP address:", -1, 14, 75, 135, 8
+    CONTROL "&Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
+    CONTROL "U&se the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    LTEXT "&IP address:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
-    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
+    LTEXT "S&ubnet mask:", -1, 14, 90, 135, 8
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
-    LTEXT "Default gateway:", -1, 14, 105, 135, 8
+    LTEXT "&Default gateway:", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
-    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Use the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
-    LTEXT "Preferred DNS server:", -1, 14, 161, 135, 8
+    CONTROL "O&btain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "Us&e the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "&Preferred DNS server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
-    LTEXT "Alternate DNS server:", -1, 14, 176, 135, 8
+    LTEXT "&Alternate DNS server:", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
-    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ad&vanced", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
@@ -51,19 +51,19 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "IP Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addresses", -1, 5, 5, 240, 83
+    GROUPBOX "IP add&resses", -1, 5, 5, 240, 83
     CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 50
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 93, 240, 83
+    PUSHBUTTON "&Add...", IDC_IPADD, 60, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edit...", IDC_IPMOD, 120, 67, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_IPDEL, 180, 67, 50, 14, WS_TABSTOP
+    GROUPBOX "De&fault gateways:", -1, 5, 93, 240, 83
     CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 103, 215, 50
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "A&dd...", IDC_GWADD, 60, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edi&t...", IDC_GWMOD, 120, 155, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Re&move", IDC_GWDEL, 180, 155, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 5, 181, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 195, 90, 12
+    CHECKBOX "A&utomatic metric", IDC_AUTOMETRIC, 9, 179, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "I&nterface metric:", -1, 15, 195, 90, 12
     EDITTEXT IDC_METRIC, 110, 193, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
@@ -113,8 +113,8 @@ CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
-    LTEXT "IP address:", -1, 5, 15, 70, 12
-    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
+    LTEXT "&IP address:", -1, 5, 15, 70, 12
+    LTEXT "&Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
     DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
@@ -127,7 +127,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
     LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "A&utomatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
@@ -140,7 +140,7 @@ CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
-    LTEXT "DNS server:", -1, 5, 10, 120, 12
+    LTEXT "&DNS server:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -151,7 +151,7 @@ CAPTION "TCP/IP Domain Suffix"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
-    LTEXT "Domain suffix:", -1, 5, 10, 120, 12
+    LTEXT "&Domain suffix:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -161,25 +161,25 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Filtering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
-    CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
-    CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "&Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
+    CONTROL "Permit Onl&y", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
     CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75
-    PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
-    CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
-    CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
+    CONTROL "Per&mit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
+    CONTROL "Permit O&nly", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
     PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 205, 30, 90, 150
-    CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
-    CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
+    CONTROL "Perm&it All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
+    CONTROL "Permit On&ly", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Remo&ve", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
     PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc
index 3be8b462101..f7be1c3ae80 100644
--- a/dll/win32/netcfgx/lang/es-ES.rc
+++ b/dll/win32/netcfgx/lang/es-ES.rc
@@ -16,7 +16,7 @@ BEGIN
     LTEXT "Se pueden asignar las propiedades de IP automáticamente si su red soporta esta capacidad. Si no, debe contactar a su administrador de red para obtener los ajustes necesarios.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obtener dirección IP automáticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Usar la siguiente dirección IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 110, 12
+    CONTROL "&Usar la siguiente dirección IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 110, 12 //FIXME: accelerator collision &U
     LTEXT "Dirección IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75 - 2, 85, 12
     LTEXT "Máscara de subred:", -1, 14, 90, 135, 8
@@ -25,7 +25,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 140, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Obtener dirección del servidor DNS automáticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Usar las siguientes direcciones DNS:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 130, 12
+    CONTROL "&Usar las siguientes direcciones DNS:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 130, 12 //FIXME: accelerator collision &U
     LTEXT "Servidor DNS preferido:", -1, 14, 161, 160, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 140, 161 - 2, 85, 12
     LTEXT "Servidor DNS alternativo:", -1, 14, 176, 160, 8
diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc
index ae68a925cd5..a319f63cc2b 100644
--- a/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/dll/win32/netcfgx/lang/fr-FR.rc
@@ -7,20 +7,20 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
-    CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
+    CONTROL "&Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
     CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
-    LTEXT "Adresse IP :", -1, 14, 75, 135, 8
+    LTEXT "Adresse &IP :", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
-    LTEXT "Masque de sous réseau :", -1, 14, 90, 135, 8
+    LTEXT "&Masque de sous-réseau :", -1, 14, 90, 135, 8
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
-    LTEXT "Passerelle par défaut :", -1, 14, 105, 135, 8
+    LTEXT "Passerelle par &défaut :", -1, 14, 105, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
-    CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
-    LTEXT "Serveur DNS primaire :", -1, 14, 161, 135, 8
+    CONTROL "O&btenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
+    CONTROL "U&tiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    LTEXT "Serveur DNS &primaire :", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
-    LTEXT "Serveur DNS secondaire :", -1, 14, 176, 135, 8
+    LTEXT "Serveur DNS &secondaire :", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
     PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
@@ -32,11 +32,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Si cet ordinateur est utilisé sur plusieurs réseaux, entrez les paramètres alternatifs IP ci-dessous", -1, 9, 9, 220, 20
     GROUPBOX "", -1, 9, 57, 228, 125, BS_GROUPBOX
-    CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
+    CONTROL "&Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12
     CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12
     LTEXT "Adresse &IP :", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
-    LTEXT "Masque de so&us-réseau :", -1, 14, 95, 135, 8
+    LTEXT "&Masque de sous-réseau :", -1, 14, 95, 135, 8
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "Passerelle par &défaut :", -1, 14, 115, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc
index a3d52f63f6e..ad1b0a78218 100644
--- a/dll/win32/netcfgx/lang/id-ID.rc
+++ b/dll/win32/netcfgx/lang/id-ID.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "Anda bisa mendapatkan setelan IP terisi secara otomatis ika jaringan anda mendukung kemampuan ini. Sebaliknya, anda perlu untuk meminta administrator jaringan anda setelan IP yang benar.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Peroleh alamat IP secara otomatis", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Gunakan alamat IP berikut:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Gunakan alamat IP berikut:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &G
     LTEXT "Alamat IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Subnet mask:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &G
     LTEXT "Server DNS Disukai:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Server DNS alternatif:", -1, 14, 176, 135, 8
diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc
index 18894b76442..de68f5136c2 100644
--- a/dll/win32/netcfgx/lang/it-IT.rc
+++ b/dll/win32/netcfgx/lang/it-IT.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "Puoi ottenere automaticamente la configurazione IP se la vostra rete lo supporta. Altrimenti è necessario contattare l'amministratore di rete per farsi dare le impostazioni appropriate.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Ottieni automaticamente l'indirizzo IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Usa il seguente indirizzo IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Usa il seguente indirizzo IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "Indirizzo IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Subnet mask:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "Server DNS preferito:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Server DNS alternativo:", -1, 14, 176, 135, 8
@@ -76,9 +76,9 @@ BEGIN
     LTEXT "Indirizzi D&NS server in ordine di utilizzo:", -1, 5, 5, 180, 12
     PUSHBUTTON "&Su", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Giù", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Aggiungi...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifica...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rimuovi", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Aggiungi...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Modifica...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &M
+    PUSHBUTTON "&Rimuovi", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &R
     LTEXT "Le tre impostazioni seguenti sono applicate a tutte le connessioni dotate di TCP/IP abilitato. Per la risoluzione di nomi non qualificati:", -1, 5, 70, 220, 24
     CONTROL "Aggiungere suffissi DNS principali e specifici della connessione", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -86,12 +86,12 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Su", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Giù", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifica...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Modifica...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &M
     PUSHBUTTON "Rimuovi", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
     LTEXT "Suffisso DNS per questa connessione:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
-    CHECKBOX "&Registrare nel DNS gli indirizzi di questa connessione", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Registrare nel DNS gli indirizzi di questa connessione", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &R
     CHECKBOX "&Usare i suffissi DNS di questa connessione nella registrazione DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc
index ea6cad0353b..80612406fdb 100644
--- a/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/dll/win32/netcfgx/lang/ja-JP.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "ネットワークでこの機能がサポートされている場合は、IP 設定を自動的に取得することができます。サポートされていない場合は、ネットワーク管理者に適切な IP 設定を問い合わせてください。", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "IP アドレスを自動的に取得する", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "次の IP アドレスを使う(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "次の IP アドレスを使う(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "IP アドレス:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "サブネット マスク:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "優先 DNS サーバー:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "代替 DNS サーバー:", -1, 14, 176, 135, 8
diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc
index 9e21f57a876..ebf52c35141 100644
--- a/dll/win32/netcfgx/lang/no-NO.rc
+++ b/dll/win32/netcfgx/lang/no-NO.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "Du kan få IP innstillinger automatisk hvis ditt nettverk støtter denne muligheten. Ellers, trenger du å spørre din nettverk administrator for å få IP innstillingene.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Motta IP addressen automatisk", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Bruk følgende IP addresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Bruk følgende IP addresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &B
     LTEXT "IP addresse:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Subnet maske:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &B
     LTEXT "Forvalgt DNS server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternativ DNS server:", -1, 14, 176, 135, 8
@@ -76,22 +76,22 @@ BEGIN
     LTEXT "D&NS server addresser, i system etter bruk:", -1, 5, 5, 180, 12
     PUSHBUTTON "Opp", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Ned", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Legg til...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rediger...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Legg til...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &L
+    PUSHBUTTON "&Rediger...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &R
     PUSHBUTTON "&Fjern", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
     LTEXT "Følgende tre innstillinger er brukt til alle tilkoblinger med TCP/IP aktivert. For beslutning av ukvalifisert navn:", -1, 5, 70, 220, 24
     CONTROL "Legg til &primær og tilkobling spesifikt DNS suffikser", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
-    CHECKBOX "Legg til forelder  suffi&kser for primær DNS suffikser", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "Legg til forelder suffi&kser for primær DNS suffikser", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     CONTROL "Vis d&isse DNS suffikser (i system):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Opp", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Ned", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Legg til...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Rediger...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Legg til...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &L
+    PUSHBUTTON "&Rediger...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &R
     PUSHBUTTON "F&jern", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
     LTEXT "DNS &suffiks for denne tilkoblingen:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register denne tilkoblings addressen i DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Register denne tilkoblings addressen i DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &R
     CHECKBOX "&Bruk denne tilkoblingens DNS suffiks i DNS registrasjon", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc
index 0480786687f..ef7e0e1003c 100644
--- a/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/dll/win32/netcfgx/lang/pl-PL.rc
@@ -10,7 +10,7 @@ BEGIN
     LTEXT "Możesz automatycznie pobrać ustawienia sieciowe protokołu IP, jeżeli Twoja sieć obsługuje te funkcje. W innym przypadku musisz skontaktować się z administratorem sieci w celu zdobycia odpowiednich ustawień.", -1, 9, 7, 235, 34
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Pobierz adres IP automatycznie", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Użyj następującego adresu IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Użyj następującego adresu IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "Adres IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Maska podsieci:", -1, 14, 90, 135, 8
@@ -19,7 +19,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "Pierwszy serwer DNS:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternatywny serwer DNS:", -1, 14, 176, 135, 8
diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc
index 503c5fa4995..0c174daa52f 100644
--- a/dll/win32/netcfgx/lang/pt-PT.rc
+++ b/dll/win32/netcfgx/lang/pt-PT.rc
@@ -10,7 +10,7 @@ BEGIN
     LTEXT "Pode obter as configurações de IP atribuídas automaticamente se a sua rede suportar esse recurso. Caso contrário, precisará solicitar ao administrador da rede as configurações de IP apropriadas.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obter o endereço IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "Endereço IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Máscara Sub-rede:", -1, 14, 90, 135, 8
@@ -19,7 +19,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Obter o endereço DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "Servidor DNS perferido:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternar servidor DNS:", -1, 14, 176, 135, 8
@@ -42,9 +42,9 @@ BEGIN
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
     LTEXT "&Gateway padrão:", -1, 14, 115, 135, 8
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
-    LTEXT "&Servidor DNS perferido:", -1, 14, 150, 135, 8
+    LTEXT "&Servidor DNS perferido:", -1, 14, 150, 135, 8 //FIXME: accelerator collision &S
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
-    LTEXT "&Servidor DNS alternativo:", -1, 14, 165, 180, 8
+    LTEXT "&Servidor DNS alternativo:", -1, 14, 165, 180, 8 //FIXME: accelerator collision &S
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END
 
@@ -78,9 +78,9 @@ BEGIN
     LTEXT "Endereços do servidor &DNS, em uso:", -1, 5, 5, 180, 12
     PUSHBUTTON "A&cima", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "A&baixo", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Adicionar", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Editar", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Remover", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Adicionar", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Editar", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "&Remover", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &R
     LTEXT "As três configurações seguintes, são aplicaveis a todas as ligações com o TCP / IP activo. Para resolução de nomes não qualificados:", -1, 5, 70, 220, 24
     CONTROL "Anexar sufixos DNS específicos e primários à ligação", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Anexar sufixo pai ao sufixo DNS principal", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -88,12 +88,12 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Cima", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "baixo", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Adicionar", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Editar.", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Adicionar", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Editar.", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
     PUSHBUTTON "Remo&ver", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
     LTEXT "DNS e &sufixo para esta ligação:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
-    CHECKBOX "&Registe os endereços desta ligação no DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Registe os endereços desta ligação no DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &R
     CHECKBOX "&Use o sufixo DNS desta ligação no registo DNS", IDC_USESUFFIX, 15, 207, 227, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc
index f87bdcd46bf..37700d0322b 100644
--- a/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/dll/win32/netcfgx/lang/ro-RO.rc
@@ -82,8 +82,8 @@ BEGIN
     PUSHBUTTON "&Modificare…", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Elimină", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
     LTEXT "Următoarele opțiuni sunt aplicate tuturor conexiunilor cu TCP/IP active. Pentru rezoluția numelor necalificate:", -1, 5, 70, 220, 24
-    CONTROL "In&clude sufixul DNS primar și de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
-    CHECKBOX "In&clude sufixul părinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "In&clude sufixul DNS primar și de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12 //FIXME: accelerator collision &C
+    CHECKBOX "In&clude sufixul părinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &C
     CONTROL "In&clude următoarele sufixe DNS (în ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 115, 220, 12
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "S&us", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
@@ -166,19 +166,19 @@ BEGIN
     CHECKBOX "A&ctivează filtrarea TCP/IP (pentru toate adaptoarele)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
     CONTROL "Permite tot TC&P", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
-    CONTROL "Pe&rmite doar:", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "Pe&rmite doar:", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 //FIXME: accelerator collision &R
     CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75
     PUSHBUTTON "&Adaugă", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Elimină", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
     CONTROL "Permite tot UD&P", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
-    CONTROL "Pe&rmite doar:", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
+    CONTROL "Pe&rmite doar:", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 //FIXME: accelerator collision &R
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
     PUSHBUTTON "A&daugă", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "E&limină", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 205, 30, 90, 150
     CONTROL "Permite tot I&P", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
-    CONTROL "Pe&rmite doar:", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
+    CONTROL "Pe&rmite doar:", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 //FIXME: accelerator collision &R
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75
     PUSHBUTTON "Ada&ugă", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Eli&mină", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc
index 070e64dd0b1..691bebf837f 100644
--- a/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/dll/win32/netcfgx/lang/sk-SK.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "Adresa IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Maska podsiete:", -1, 14, 90, 135, 8
@@ -17,7 +17,7 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "Preferovaný DNS server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternatívny DNS server:", -1, 14, 176, 135, 8
@@ -76,9 +76,9 @@ BEGIN
     LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
     PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 70, 220, 24
     CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -86,9 +86,9 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "DNS &suffix for this connection:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
     CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc
index ce9a3936a30..a35d4baa069 100644
--- a/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/dll/win32/netcfgx/lang/sq-AL.rc
@@ -10,7 +10,7 @@ BEGIN
     LTEXT "Ju mund të merrni cilësimet e IP've të caktuara automatikisht në qoftë se rrjeti juaj mbështet këtë aftësi. Përndryshe, ju duhet të pyesni administratorin e rrjetit tuaj për cilësimet e duhura të IP've.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Marrë adresë IP'sh automatikisht", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Përdor adresën e mëposhtme IP'së:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Përdor adresën e mëposhtme IP'së:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &P
     LTEXT "Adresa IP:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Subnet mask:", -1, 14, 90, 135, 8
@@ -19,12 +19,12 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &P
     LTEXT "DNS'ja serverit e preferuar:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alterno DNS'në e server-it:", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
-    PUSHBUTTON "&Përparuar", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Përparuar", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP //FIXME: accelerator collision &P
 END
 
 IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
@@ -78,8 +78,8 @@ BEGIN
     LTEXT "Adresa D&NS server, në rend përdorimi:", -1, 5, 5, 180, 12
     PUSHBUTTON "Lart", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Poshtë", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Shto...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifiko...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &S
+    PUSHBUTTON "&Modifiko...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &M
     PUSHBUTTON "Heq", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
     LTEXT "Tre cilësimet e mëposhtme zbatohen për të gjitha lidhjeve me TCP/IP të aktivizuara. Për zgjidhjen e emrave të pakualifikuar:", -1, 5, 70, 220, 24
     CONTROL "Shto lidhjen primare dhe specifike suffixes për DNS'në", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
@@ -88,8 +88,8 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Lart", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Poshtë", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Modifiko...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Shto...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &S
+    PUSHBUTTON "&Modifiko...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &M
     PUSHBUTTON "Heq", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
     LTEXT "Prapashtesa DNS'së për këtë lidhje:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc
index 99bcc589d99..d7aff0d2d7f 100644
--- a/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/dll/win32/netcfgx/lang/sv-SE.rc
@@ -8,7 +8,7 @@ BEGIN
     LTEXT "Du kan erhålla en IP-adress automatiskt om ditt nätverk stödjer detta. Annars måste du kontakta nätverksadministratören för att få de korrekta inställningarna.", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "Erhåll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "&Använd följande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "&Använd följande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &A
     LTEXT "IP-adress:", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "Nätmask:", -1, 14, 90, 135, 8
@@ -17,12 +17,12 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &A
     LTEXT "Önskad DNS-server:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
     LTEXT "Alternativ DNS-server:", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
-    PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
 END
 
 IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 216
diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc
index 85b940910a5..18cc88cfcd0 100644
--- a/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/dll/win32/netcfgx/lang/tr-TR.rc
@@ -1,4 +1,10 @@
-// COPYRIGHT: 2014 Erdem Ersoy
+/*
+ * PROJECT:     ReactOS Configuration of network devices
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Turkish resource file
+ * TRANSLATORS: Copytight 2014-2018 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net>
+ *              Copytight 2021 Süleyman Poyraz <zaryob.dev@gmail.com>
+ */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -75,12 +81,12 @@ CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
-    LTEXT "&Kullanım sırasıyla DNS sunucusu adresleri:", -1, 5, 5, 180, 12
+    LTEXT "&Kullanım sırasıyla DNS sunucusu adresleri:", -1, 5, 5, 180, 12 //FIXME: accelerator collision K
     PUSHBUTTON "Yukarı", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Aşağı", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Ekle...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Düzenle...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Kaldır", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Kaldır", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision K
     LTEXT "Aşağıdaki üç ayar, TCP/IP'nin etkin olduğu tüm bağlantılara uygulanır. Nitelenmemiş adların çözümü için:", -1, 5, 70, 220, 24
     CONTROL "&Birinci ve bağlantıya özgü DNS son eklerini ekle", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Bi&rinci DNS son ekinin ana son eklerini ekle", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc
index 5f76b6f3928..029064e2df6 100644
--- a/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/dll/win32/netcfgx/lang/uk-UA.rc
@@ -76,9 +76,9 @@ BEGIN
     LTEXT "Адреси D&NS серверів в порядку використання:", -1, 5, 5, 180, 12
     PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Додати...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Редагувати...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Видалити", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Додати...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &Д
+    PUSHBUTTON "&Редагувати...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &P
+    PUSHBUTTON "&Видалити", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &B
     LTEXT "Наступні три параметри застосовуються для всіх підключень, що використовують TCP/IP. Для дозволу невідомих імен:", -1, 5, 70, 220, 24
     CONTROL "Додавати &основний DNS-суфікс і суфікс підключення", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "Додавати &батьківські суфікси основного DNS-суфікса", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -86,9 +86,9 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Додати...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Редагувати...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Видалити", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Додати...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &Д
+    PUSHBUTTON "&Редагувати...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &P
+    PUSHBUTTON "&Видалити", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &B
     LTEXT "DNS-&суфікс цього підключення:", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
     CHECKBOX "&Зареєструвати адреси цього підключення в DNS", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc
index 4d9be5fa3b1..0f9c6ee6a63 100644
--- a/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/dll/win32/netcfgx/lang/zh-CN.rc
@@ -17,7 +17,7 @@ BEGIN
     LTEXT "如果您的网络支持自动分配 IP 地址，则可以自动获取 IP 地址。 否则，您需要询问网络管理员来获得合适的 IP 设置。", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "自动取得IP 地址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "使用下列的IP 地址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "使用下列的IP 地址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "IP 地址：", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "子网掩码：", -1, 14, 90, 135, 8
@@ -26,10 +26,10 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "使用以下的 DNS 服务器地址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "使用以下的 DNS 服务器地址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "首选的 DNS 服务器：", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
-    LTEXT " DNS 服务器：", -1, 14, 176, 135, 8
+    LTEXT "DNS 服务器：", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
     PUSHBUTTON "高级(&A)", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
@@ -85,9 +85,9 @@ BEGIN
     LTEXT "DNS 服务器地址,按使用顺序排列(&N)：", -1, 5, 5, 180, 12
     PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...(&E)", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "编辑...(&E)", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "删除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "以下三种设置被应用到所有连接启用 TCP/IP。解析不合格的名称：", -1, 5, 70, 220, 24
     CONTROL "附加主要的和连接特定的 DNS 后缀(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "附加主 DNS 后缀的父后缀(&X)", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -95,9 +95,9 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "编辑...(&E)", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "删除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "添加...(&A)", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "编辑...(&E)", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "删除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "用于此连接的 DNS 后缀(&S)：", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
     CHECKBOX "在 DNS 中注册此连接的地址(&R)", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc
index d7ae82700a1..b23d6942979 100644
--- a/dll/win32/netcfgx/lang/zh-TW.rc
+++ b/dll/win32/netcfgx/lang/zh-TW.rc
@@ -16,7 +16,7 @@ BEGIN
     LTEXT "如果您的網路支援這項功能，您可以取得自動指派的 IP 設定。否則就需要詢問網路系統管理員以獲取正確的 IP 設定。", -1, 9, 9, 235, 27
     GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX
     CONTROL "自動取得 IP 位址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
-    CONTROL "使用下列的 IP 位址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
+    CONTROL "使用下列的 IP 位址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 //FIXME: accelerator collision &U
     LTEXT "IP 位址：", -1, 14, 75, 135, 8
     CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
     LTEXT "子網路遮罩：", -1, 14, 90, 135, 8
@@ -25,10 +25,10 @@ BEGIN
     CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
     GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX
     CONTROL "自動獲得 DNS 伺服器位址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12
-    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12
+    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 //FIXME: accelerator collision &U
     LTEXT "首選的 DNS 伺服器:", -1, 14, 161, 135, 8
     CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12
-    LTEXT " DNS 伺服器：", -1, 14, 176, 135, 8
+    LTEXT "DNS 伺服器：", -1, 14, 176, 135, 8
     CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 176 - 2, 85, 12
     PUSHBUTTON "進階(&A)", IDC_ADVANCED, 186, 199, 50, 14, WS_TABSTOP
 END
@@ -84,9 +84,9 @@ BEGIN
     LTEXT "DNS 伺服器位址，按使用順序排列(&N)：", -1, 5, 5, 180, 12
     PUSHBUTTON "向上", IDC_DNSADDRUP, 190, 18, 50, 14, WS_TABSTOP
     PUSHBUTTON "向下", IDC_DNSADDRDOWN, 190, 35, 50, 14, WS_TABSTOP
-    PUSHBUTTON "新增(&A)...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯(&E)...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP
+    PUSHBUTTON "新增(&A)...", IDC_DNSADDRADD, 15, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "編輯(&E)...", IDC_DNSADDRMOD, 75, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "刪除(&V)", IDC_DNSADDRDEL, 135, 53, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "以下三種設定可套用到所有啟用 TCP/IP 的連線。在解析不合格的名稱時：", -1, 5, 70, 220, 24
     CONTROL "附加主要的和連線特定的 DNS 尾碼(&P)", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 90, 220, 12
     CHECKBOX "附加主要 DNS 尾碼的父系尾碼(&X)", IDC_TOPPRIMSUFFIX, 15, 102, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -94,9 +94,9 @@ BEGIN
     LISTBOX IDC_DNSSUFFIXLIST, 5, 127, 180, 34, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT
     PUSHBUTTON "上", IDC_DNSSUFFIXUP, 190, 128, 50, 14, WS_TABSTOP
     PUSHBUTTON "下", IDC_DNSSUFFIXDOWN, 190, 145, 50, 14, WS_TABSTOP
-    PUSHBUTTON "新增(&A)...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "編輯(&E)...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP
-    PUSHBUTTON "刪除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP
+    PUSHBUTTON "新增(&A)...", IDC_DNSSUFFIXADD, 15, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &A
+    PUSHBUTTON "編輯(&E)...", IDC_DNSSUFFIXMOD, 75, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &E
+    PUSHBUTTON "刪除(&V)", IDC_DNSSUFFIXDEL, 135, 163, 50, 14, WS_TABSTOP //FIXME: accelerator collision &V
     LTEXT "用於這個連線的 DNS 尾碼(&S)：", -1, 5, 183, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 180, 100, 12, WS_TABSTOP
     CHECKBOX "在 DNS 中註冊這個連線的位址(&R)", IDC_REGSUFFIX, 15, 195, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
diff --git a/dll/win32/rasdlg/lang/de-DE.rc b/dll/win32/rasdlg/lang/de-DE.rc
index d034afcd8e5..b1c0310014d 100644
--- a/dll/win32/rasdlg/lang/de-DE.rc
+++ b/dll/win32/rasdlg/lang/de-DE.rc
@@ -703,7 +703,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Assistent für neue Verbindungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Telefonnummer unten eingeben. ", -1, 7, 4, 306, 14
+    LTEXT "Telefonnummer unten eingeben.", -1, 7, 4, 306, 14
     LTEXT "&Telefonnummer:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Sie müssen eventuell eine ""1"", eine Vorwahl oder beides einbeziehen. Wenn Sie nicht sicher sind, ob zusätzliche Nummern erforderlich sind, wählen Sie die Telefonnummer auf Ihrem Telefon. Wenn Sie ein Modem hören, ist die gewählte Nummer richtig.", -1, 20, 50, 291, 53
@@ -1849,7 +1849,7 @@ BEGIN
     206 "Von %1 trennen?"
     207 "Eine Datei %1 ist bereits vorhanden. Soll Sie überschrieben werden?"
     208 "Syntaxfehler im Skript. Möchten Sie das Fehlerprotokoll ansehen?"
-    209 "Die Verbindung mit %1 wurde hergestellt. "
+    209 "Die Verbindung mit %1 wurde hergestellt."
     210 "Klicken Sie mit der rechten Maustaste auf den DFÜ-Monitor in der Taskleiste, um die Verbindung zu unterbrechen oder deren Status zu überprüfen."
     212 "Verbindung hergestellt."
     213 "Die benutzerdefinierte Authentifizierungsmethode wird initialisiert, indem Sie auf Eigenschaften klicken."
@@ -2288,7 +2288,7 @@ BEGIN
     7321 "Sie müssen einen Anmeldenamen für den neuen Benutzer eingeben oder auf Abbrechen klicken."
     7322 "Das eingegebene Passwort ist zu kurz."
     7323 "Die eingegebenen Kennwörter stimmen nicht überein. Geben Sie diese erneut ein."
-    7324 "Ein interner Fehler ist aufgetreten. "
+    7324 "Ein interner Fehler ist aufgetreten."
     7325 "Listenansicht"
     7326 "Beim Übertragen der Änderungen, die Sie an der lokalen Benutzerdatenbank durchgeführt haben, ist ein Fehler aufgetreten."
     7327 "Sie haben keine ausreichenden Benutzerrechte, um einen Benutzer zu der lokalen Systemdatenbank hinzufügen zu können."
@@ -2314,11 +2314,11 @@ BEGIN
     7347 "Die IPX-Eigenschaften können nicht vom System geladen werden."
     7348 "Eingehende Verbindungen erfordern den Routing- und RAS-Dienst, der nicht gestartet werden konnte. Weitere Information erhalten Sie im Ereignisprotokoll des Systems."
     7349 "Das System gestattet momentan nicht das Bearbeiten von Netzwerkkomponenten, da diese gerade von einer anderen Anwendung geändert werden."
-    7350 "Der neue Benutzer, den Sie eingegeben haben, wurde nicht zu der lokalen Benutzerdatenbank hinzugefügt, da der Name oder das Passwort die Systemrichtlinien verletzt hat (entweder zu lang, zu kurz oder ein sonstiges falsches Format). "
+    7350 "Der neue Benutzer, den Sie eingegeben haben, wurde nicht zu der lokalen Benutzerdatenbank hinzugefügt, da der Name oder das Passwort die Systemrichtlinien verletzt hat (entweder zu lang, zu kurz oder ein sonstiges falsches Format)."
     7351 "Das System kann den angeforderten Benutzer nicht löschen."
     7352 "Die ausgewählte Netzwerkkomponente kann nicht entfernt werden, da Sie verwendet wird."
     7353 "Warnung bei eingehender Verbindung"
-    7354 "Alle Benutzer, die Sie löschen, werden unwiderruflich vom System entfernt, auch wenn Sie auf Abbrechen klicken. Möchten Sie %s löschen? "
+    7354 "Alle Benutzer, die Sie löschen, werden unwiderruflich vom System entfernt, auch wenn Sie auf Abbrechen klicken. Möchten Sie %s löschen?"
     7355 "Sie sind im Begriff zur Systemverwaltungskonsole zu wechseln. Die Eigenschaftenseite für eingehende Verbindungen wird geschlossen und alle Änderungen werden an das System übertragen. Möchten Sie den Vorgang fortsetzen?"
     7356 "Der Wert der Netzwerkmaske hat sich geändert. Auf ein Nullbit können nur weitere Nullbits folgen. Zum Beispiel ist ein Netzwerkmaskenwert von 255.255.0.0 gültig, aber 255.0.255.0 ist ungültig.\n"
     7357 "Benutzerberechtigungen"
diff --git a/dll/win32/rasdlg/lang/en-US.rc b/dll/win32/rasdlg/lang/en-US.rc
index 3db89ff34ab..3479bd31e6c 100644
--- a/dll/win32/rasdlg/lang/en-US.rc
+++ b/dll/win32/rasdlg/lang/en-US.rc
@@ -39,12 +39,12 @@ CAPTION "Line Bundling Errors"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "One or more additional lines did not connect. ", 1033, 37, 8, 216, 20
+    LTEXT "One or more additional lines did not connect.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "&Do not attempt failed lines in the future", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "&Accept", 1, 135, 242, 60, 14
     PUSHBUTTON "&Hang Up", 2, 201, 242, 60, 14
-    LTEXT "If only a single line connected, the server may not be configured to accept multi-link calls.  Check 'Do not attempt failed lines' to avoid unnecessary connection charges in such a case.", -1, 37, 36, 224, 44
+    LTEXT "If only a single line connected, the server may not be configured to accept multi-link calls. Check 'Do not attempt failed lines' to avoid unnecessary connection charges in such a case.", -1, 37, 36, 224, 44
 END
 
 105 DIALOGEX 0, 0, 261, 253
@@ -137,7 +137,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You have 'Set By Caller' callback privilege on the server.  Press OK and the server will call you back at the number below.  Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "You have 'Set By Caller' callback privilege on the server. Press OK and the server will call you back at the number below. Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX
     LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP
     EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP
@@ -194,7 +194,7 @@ CAPTION "Dial-Up Networking"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 563, 1098, 7, 6, 20, 20, WS_GROUP
-    LTEXT "The autodial attempt failed.  Do you want to disable autodial from this location?", 1099, 40, 6, 181, 34, NOT WS_GROUP
+    LTEXT "The autodial attempt failed. Do you want to disable autodial from this location?", 1099, 40, 6, 181, 34, NOT WS_GROUP
     PUSHBUTTON "&Yes", 1, 60, 42, 50, 14
     DEFPUSHBUTTON "&No", 2, 115, 42, 50, 14
 END
@@ -403,7 +403,7 @@ CAPTION "NetWare or Compatible Connections"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32515, 1278, 7, 7, 21, 20, WS_GROUP
-    LTEXT "You have connections to a NetWare compatible network.  These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37
+    LTEXT "You have connections to a NetWare compatible network. These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37
     LTEXT "Before dialing, to avoid data loss, either close all files using these connections or uncheck IPX on this entry's Network Protocol settings.", 1280, 42, 46, 215, 38, NOT WS_GROUP
     AUTOCHECKBOX "&Do not display this message in the future", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     DEFPUSHBUTTON "OK", 1, 65, 112, 60, 14, WS_GROUP
@@ -415,7 +415,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Manual Dial"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Pick up the handset and dial (or ask the operator to dial).  After dialing is complete, click OK.  Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32
+    LTEXT "Pick up the handset and dial (or ask the operator to dial). After dialing is complete, click OK. Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32
     LTEXT "Phone number:", 1282, 8, 46, 91, 8
     LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP
     DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP
@@ -470,7 +470,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Dialing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login.  You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP
+    LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login. You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP
     LTEXT "&Number of redial attempts:", 1005, 7, 55, 154, 8
     EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL
     LTEXT "&Seconds between redial attempts:", 1009, 7, 73, 156, 8, NOT WS_GROUP
@@ -484,7 +484,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges.  Specify whether you want callback.  (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43
+    LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges. Specify whether you want callback. (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43
     AUTORADIOBUTTON "&No callback", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "A&sk me during dialing when the server offers", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
     AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
@@ -510,7 +510,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router.  These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33
+    LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router. These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33
     LTEXT "&User name:", 1096, 8, 43, 130, 8, NOT WS_GROUP
     EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL
     LTEXT "&Domain:", 1093, 8, 63, 130, 8, NOT WS_GROUP
@@ -608,7 +608,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Select a name for this demand dial interface.  A common practice is to name interfaces after the network or router to which they connect.", 1158, 7, 5, 309, 29
+    LTEXT "Select a name for this demand dial interface. A common practice is to name interfaces after the network or router to which they connect.", 1158, 7, 5, 309, 29
     LTEXT "&Interface name:", 1159, 17, 41, 285, 8, NOT WS_GROUP
     EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL
     AUTOCHECKBOX "I &know all about demand-dial interfaces and would rather edit the properties directly", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
@@ -624,7 +624,7 @@ BEGIN
     AUTORADIOBUTTON "A&dvanced (custom settings)", 1541, 14, 102, 198, 8, BS_NOTIFY
     LTEXT "&Validate my identity as follows:", 1537, 26, 29, 187, 8, NOT WS_GROUP
     COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
-    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and  password (and domain if any)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and password (and domain if any)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "Requ&ire data encryption (disconnect if none)", 1169, 26, 82, 183, 10, BS_TOP | BS_MULTILINE
     LTEXT "Using these settings requires a knowledge of security protocols.", 1539, 15, 114, 134, 20
     PUSHBUTTON "&Settings...", 1180, 151, 115, 60, 14
@@ -703,7 +703,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "New Connection Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Type the phone number below. ", -1, 7, 4, 306, 14
+    LTEXT "Type the phone number below.", -1, 7, 4, 306, 14
     LTEXT "&Phone number:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "You might need to include a ""1"" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53
@@ -902,7 +902,7 @@ BEGIN
     EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT "&Domain:", 1395, 7, 108, 53, 8, NOT WS_GROUP
     EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL
-    AUTOCHECKBOX "&Save user name and  password", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Save user name and password", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE
     DEFPUSHBUTTON "OK", 1, 87, 146, 60, 14, WS_GROUP
     PUSHBUTTON "Cancel", 2, 151, 146, 60, 14
     CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1
@@ -956,7 +956,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Router Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "When you dial into a router, it may offer to call you back to reduce your phone charges or to increase security.  Specify whether you want callback or not.", 1043, 7, 5, 253, 24
+    LTEXT "When you dial into a router, it may offer to call you back to reduce your phone charges or to increase security. Specify whether you want callback or not.", 1043, 7, 5, 253, 24
     AUTORADIOBUTTON "&No callback", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
     CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
@@ -1050,7 +1050,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Internet Connection Sharing allows other computers on your local network to access external resources through this connection.", -1, 10, 5, 300, 22
     AUTOCHECKBOX "&Enable Internet Connection Sharing for this connection", 1512, 21, 31, 272, 10
-    LTEXT "To dial this connection automatically  when a computer on your local network attempts to access external resources, select the following check box.", 1514, 10, 56, 294, 22
+    LTEXT "To dial this connection automatically when a computer on your local network attempts to access external resources, select the following check box.", 1514, 10, 56, 294, 22
     AUTOCHECKBOX "Enab&le on-demand dialing", 1513, 21, 86, 260, 10
 END
 
@@ -1068,7 +1068,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You can configure this connection to use your smart card to log you into the remote network.  Select whether to use your smart card with this connection.", -1, 10, 5, 303, 22
+    LTEXT "You can configure this connection to use your smart card to log you into the remote network. Select whether to use your smart card with this connection.", -1, 10, 5, 303, 22
     AUTORADIOBUTTON "&Use my smart card ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "&Do not use my smart card ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1297,7 +1297,7 @@ BEGIN
     AUTORADIOBUTTON "A&dvanced (custom settings)", 1541, 14, 100, 197, 8, BS_NOTIFY
     LTEXT "&Validate my identity as follows:", 1537, 26, 29, 183, 8, NOT WS_GROUP
     COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
-    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and  password (and domain if any)", 1174, 26, 59, 182, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and password (and domain if any)", 1174, 26, 59, 182, 20, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "Requ&ire data encryption (disconnect if none)", 1169, 26, 83, 182, 10, BS_TOP | BS_MULTILINE
     LTEXT "Using these settings requires a knowledge of security protocols.", 1539, 26, 111, 136, 20
     PUSHBUTTON "&Settings...", 1180, 151, 134, 60, 14
@@ -1615,7 +1615,7 @@ BEGIN
     EDITTEXT 1615, 115, 54, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT "&Confirm password:", 1638, 23, 74, 88, 13
     EDITTEXT 1616, 115, 73, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
-    AUTOCHECKBOX "U&se this account  name and password when anyone connects to the Internet from this computer", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "U&se this account name and password when anyone connects to the Internet from this computer", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "&Make this the default Internet connection", 1595, 23, 112, 288, 14
     AUTOCHECKBOX "&Turn on Internet Connection Firewall for this connection", 1682, 23, 133, 290, 14
 END
@@ -1757,7 +1757,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Select the check box next to each user who should be allowed a connection to this computer.  Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
+    LTEXT "Select the check box next to each user who should be allowed a connection to this computer. Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
     LTEXT "&Users allowed to connect:", -1, 10, 28, 275, 8
     CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
     PUSHBUTTON "&Add...", 7044, 10, 122, 65, 14, WS_GROUP
@@ -1836,20 +1836,20 @@ BEGIN
     193 "Enter a user name and password with access to the remote network domain.\0"
     194 "Network Address Translation (NAT) is currently installed as a routing protocol,\nand must be removed before enabling Internet Connection Sharing.\nTo remove Network Address Translation, open the Routing and Remote Access Manager\nsnapin and expand the router's entry in the left pane.\nDelete the Network Address Translation routing protocol from the list of IP\nrouting protocols.\0"
     195 "The area code must contain only the digits 0 to 9.\0"
-    196 "The entry name must contain at least one non-blank character and cannot begin with a period.  Choose a different name.\0"
+    196 "The entry name must contain at least one non-blank character and cannot begin with a period. Choose a different name.\0"
     197 "You must choose a value from %1 to %2 for this field.\0"
-    198 "The custom authentication configuration DLL could not be loaded.  Make sure the custom authentication package is correctly installed.\0"
+    198 "The custom authentication configuration DLL could not be loaded. Make sure the custom authentication package is correctly installed.\0"
     199 "The connection selected was established by the Multiprotocol router.\nPlease use the 'Routing and RAS Admin' tool to hang up the connection.\0"
     200 "Comment\0"
     201 "The custom authentication package configuration failed.\0"
-    202 "TCP/IP is not installed or is disabled for Routing and Remote Access.  In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0"
-    203 "IPX is not installed or is disabled for Routing and Remote Access.  You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0"
+    202 "TCP/IP is not installed or is disabled for Routing and Remote Access. In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0"
+    203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0"
     204 "Remove the selected device(s) from the list?\0"
     205 "Delete %1 from the phonebook?\0"
     206 "Disconnect from %1?\0"
-    207 "A file named %1 already exists.  Overwrite it?\0"
+    207 "A file named %1 already exists. Overwrite it?\0"
     208 "Syntax errors were found in the script. Do you wish to view the error log?\0"
-    209 "'%1' is now connected.  \0"
+    209 "'%1' is now connected.\0"
     210 "Right-click the Dial-Up Networking Monitor on the task bar to hang up or check the status of your connection.\0"
     212 "Connected successfully.\0"
     213 "The custom authentication method selected must be initialized by pressing Properties.\0"
@@ -1857,7 +1857,7 @@ BEGIN
     215 "Dial-up shortcut files (*.rnk)\0"
     216 "*.rnk\0"
     217 "Create Dial-Up Shortcut\0"
-    218 "Link to %1 failed.  Reconnect pending...\0"
+    218 "Link to %1 failed. Reconnect pending...\0"
     219 "Cannot retrieve framing information.\0"
     220 "Cannot retrieve port information.\0"
     221 "Cannot retrieve projection information.\0"
@@ -1875,7 +1875,7 @@ BEGIN
     233 "Remote Router\0"
     234 "Modem or device\0"
     235 "Please enter a username for this interface's account on the remote router.\0"
-    236 "An entry named %1 already exists.  Choose a different name.\0"
+    236 "An entry named %1 already exists. Choose a different name.\0"
     237 "You may want to allow sending your password without encryption.\0"
     238 "Password Encryption\0"
     239 "The wizard is ready to create your connection.\0"
@@ -1884,7 +1884,7 @@ BEGIN
     242 "Call Me Back At\0"
     243 "Edit Alternate Phone Number\0"
     244 "Since this connection is currently active, some settings will not take effect until the next time you dial it.\0"
-    245 "There are no connections available to all users.  You must logon before dialing.\0"
+    245 "There are no connections available to all users. You must logon before dialing.\0"
     246 "The phonebook is empty.\n\nPress OK to add an entry.\0"
     247 "Due to import/export restrictions, data encryption is not available in this version of ReactOS.\0"
     248 "Please enter an X.25 address on the next screen.\0"
@@ -1910,7 +1910,7 @@ BEGIN
     268 "Phone Numbers\0"
     269 "You may enter a fixed IP address.\0"
     270 "IP Address\0"
-    271 "The Internet protocols (TCP/IP), are not installed or are disabled for Remote Access.  In Control Panel, start Network, go to the Services page, choose 'Remote Access Service' Properties, and press the Network button.\0"
+    271 "The Internet protocols (TCP/IP), are not installed or are disabled for Remote Access. In Control Panel, start Network, go to the Services page, choose 'Remote Access Service' Properties, and press the Network button.\0"
     272 "TCP/IP\0"
     273 "IPSec, default policy\0"
     274 "IPX/SPX or compatible\0"
@@ -1947,13 +1947,13 @@ BEGIN
     305 "No alternate phonebook is selected.\0"
     306 "That device cannot be dynamically configured.\0"
     307 "The entry cannot be deleted because it is connected.\0"
-    308 "No entry is selected.  Press the New button to create an entry.\0"
+    308 "No entry is selected. Press the New button to create an entry.\0"
     309 "A non-zero IP address must be supplied when 'specify an IP address' is selected.\0"
     310 "An X.25 Address is required when an X.25 dial-up network or X.25 device is selected.\0"
     311 "(none)\0"
     312 "'%1' is already in the list.\0"
     313 "Secure my password and my data\0"
-    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access.  To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
+    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access. To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
     315 "Cannot save password.\0"
     316 "Cannot display data.\0"
     317 "Cannot get auto-dial information.\0"
@@ -2011,7 +2011,7 @@ BEGIN
     369 "Point-to-point protocol settings to use when %1 initiates a demand dial connection on interface %2:\0"
     370 "[To change the saved password, click here]\0"
     405 "NetBEUI protocol is required to call older RAS servers.\0"
-    406 "Before you can call older RAS servers you must install the NetBEUI protocol.  NetBEUI can be installed with the Control Panel Network applet.\0"
+    406 "Before you can call older RAS servers you must install the NetBEUI protocol. NetBEUI can be installed with the Control Panel Network applet.\0"
     407 "&Redial\0"
     408 "You have chosen to disable one or more transports. Doing so requires the routing managers and routing protocols for the disabled transports to be removed from this demand-dial interface.\nClick Yes if you want to continue, or No if you want to re-enable the transports.\0"
     409 "Internet Connection Sharing\0"
@@ -2068,7 +2068,7 @@ BEGIN
     460 "You must check at least one modem or adapter.\0"
     461 "Phone number\0"
     462 "TCP/IP protocol is required to call SLIP servers.\0"
-    463 "Before you can call SLIP servers you must install the TCP/IP protocol.  TCP/IP can be installed with the Control Panel Network applet.\0"
+    463 "Before you can call SLIP servers you must install the TCP/IP protocol. TCP/IP can be installed with the Control Panel Network applet.\0"
     464 "Status\0"
     465 "&New suffix:\0"
     466 "&Suffixes:\0"
@@ -2114,9 +2114,9 @@ BEGIN
     506 "Internet Connection Sharing\0"
     507 "You can let a local network access resources through this dial-up connection.\0"
     508 "Host or Guest?\0"
-    509 "Internet Connection Sharing  is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
+    509 "Internet Connection Sharing is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
     510 "To connect two computers, your computer must be identified as either a host or a guest.\0"
-    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically.  Are you sure you want to enable Internet Connection Sharing?\0"
+    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically. Are you sure you want to enable Internet Connection Sharing?\0"
     512 "Select a Device\0"
     513 "This is the device that will be used to make the connection.\0"
     514 "&Connect\0"
@@ -2135,13 +2135,13 @@ BEGIN
     527 "Type of Connection\0"
     528 "hh.exe netcfg.chm::/trouble_all.htm\0"
     529 "Virtual Private Connection\0"
-    530 "Use any form of authentication required including clear text.  Do not encrypt data.\0"
-    531 "Use any form of authentication that requires passwords to be encrypted.  Do not encrypt data.\0"
+    530 "Use any form of authentication required including clear text. Do not encrypt data.\0"
+    531 "Use any form of authentication that requires passwords to be encrypted. Do not encrypt data.\0"
     532 "Please type a name for the entry.\0"
     533 "Encrypt passwords and data.\0"
     534 "Please type a port number between 1 and 65535.\0"
     535 "Specify custom authentication and data encryption with the Settings button.\0"
-    536 "Use any form of authentication that requires encrypted passwords.  Do not encrypt data.\0"
+    536 "Use any form of authentication that requires encrypted passwords. Do not encrypt data.\0"
     537 "Encrypt passwords and data.\0"
     538 "Specify custom authentication and data encryption with the Settings button.\0"
     539 "The port number is already used by another entry.\nPlease enter a unique port number.\0"
@@ -2192,7 +2192,7 @@ BEGIN
     1554 "Interface Name\0"
     1555 "Select the name by which this new interface will be known.\0"
     1556 "No available devices\0"
-    1557 "A user account named %1 already exists on the local computer.  Should the demand dial interface be configured to use this user account?\0"
+    1557 "A user account named %1 already exists on the local computer. Should the demand dial interface be configured to use this user account?\0"
     1558 "There are no security protocol settings for SLIP server connections.\0"
     1559 "Allow unsecured password\0"
     1560 "Require secured password\0"
@@ -2205,20 +2205,20 @@ BEGIN
     1567 " (encryption enabled)\0"
     1568 "Internet Account Information\0"
     1569 "You will need an account name and password to sign in to your Internet account.\0"
-    1570 "The selected EAP package does not provide encryption keys.  Select an EAP package that does provide keys or select not to encrypt.\0"
+    1570 "The selected EAP package does not provide encryption keys. Select an EAP package that does provide keys or select not to encrypt.\0"
     1571 "The current encryption selection requires EAP or some version of MS-CHAP logon security methods.\0"
     1572 "Protocols and Security\0"
     1573 "Select transports and security options for this connection.\0"
-    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP.  If one of these is negotiated, data encryption will not occur.  Do you want to keep these settings?\0"
-    1575 "To connect to '%1', you must first be connected to '%2'.  Do you want  to connect to '%2' now?\0"
+    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP. If one of these is negotiated, data encryption will not occur. Do you want to keep these settings?\0"
+    1575 "To connect to '%1', you must first be connected to '%2'. Do you want to connect to '%2' now?\0"
     1576 "Connecting over parallel cable...\0"
     1577 "Connecting over infrared...\0"
     1578 "Parallel cable connected.\0"
     1579 "Infrared connected.\0"
-    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software.  The security properties of this connection have been reset to the available encryption strengths.\0"
+    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software. The security properties of this connection have been reset to the available encryption strengths.\0"
     1581 "Typ&e of VPN:\0"
     1582 "Please enter a user name.\0"
-    1583 "This user name and password will be saved for your own use.  There is already a user name and password saved for all other users of this connection.  Do you want to delete the user name and password saved for all other users?\0"
+    1583 "This user name and password will be saved for your own use. There is already a user name and password saved for all other users of this connection. Do you want to delete the user name and password saved for all other users?\0"
     1584 "For example, you could type the name of your workplace or the name of a server you will connect to.\0"
     1585 "Account Information\0"
     1586 "The controls on this property sheet are disabled because the system must first be rebooted before any configuration changes can be made.\0"
@@ -2262,7 +2262,7 @@ BEGIN
     1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0"
     1673 "Data sent from this computer will be rerouted if the default path changes.\0"
     1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0"
-    1685 "Your user account does not have permission to use this connection.  Usually, this is because you are logged in as Guest.\0"
+    1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0"
     1686 "Type an account name and password. (If you have forgotten an existing account name or password, contact your network administrator.)\0"
     1687 "Computer N&ame\0"
     1688 "ISP N&ame\0"
@@ -2287,40 +2287,40 @@ BEGIN
     7320 "Protocol Database\0"
     7321 "You must enter a logon name for the new user or press cancel.\0"
     7322 "The password you entered was too short.\0"
-    7323 "The passwords entered are not the same.  Please re-enter them.\0"
-    7324 "An internal error has occured.  \0"
+    7323 "The passwords entered are not the same. Please re-enter them.\0"
+    7324 "An internal error has occured.\0"
     7325 "Listview\0"
-    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.  \0"
-    7327 "You have insufficient privileges to add a user to the local system database.  \0"
+    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.\0"
+    7327 "You have insufficient privileges to add a user to the local system database.\0"
     7328 "The user you are trying create already exists in the local user database.\0"
     7329 "The user was not added to the local user database because the password you entered was rejected.\0"
     7330 "Unable to reload the system user database because of an internal error.\0"
-    7331 "An internal error has occurred:  The local user database handle is corrupt.\0"
+    7331 "An internal error has occurred: The local user database handle is corrupt.\0"
     7332 "Unable to load the resources necessary to display the user tab.\0"
-    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.  \0"
+    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.\0"
     7334 "The device database handle is corrupt.\0"
     7335 "Unable to load the resources necessary to display the general tab.\0"
-    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.  \0"
+    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.\0"
     7337 "An internal error occured.\0"
     7338 "An internal error occurred: The networking component database handle is corrupt.\0"
-    7339 "An internal error has occurred.  \0"
+    7339 "An internal error has occurred.\0"
     7340 "An error has occurred while attempting to commit the changes you have made to the networking components.\0"
     7341 "An internal error occured.\0"
-    7342 "Unable to commit the changes you made to the TCP/IP protocol to the system.  \0"
-    7343 "Unable to save the changes you made to the IPX protocol to the system.  \0"
+    7342 "Unable to commit the changes you made to the TCP/IP protocol to the system.\0"
+    7343 "Unable to save the changes you made to the IPX protocol to the system.\0"
     7344 "Unable to display the TCP/IP properties.\0"
     7345 "Unable to display the IPX properties.\0"
-    7346 "Unable to load TCP/IP properties from the system.  \0"
-    7347 "Unable to load IPX properties from the system.  \0"
-    7348 "Incoming Connections depend on the Routing and Remote Access service which was unable to start.  For more information, check the system event log.\0"
+    7346 "Unable to load TCP/IP properties from the system.\0"
+    7347 "Unable to load IPX properties from the system.\0"
+    7348 "Incoming Connections depend on the Routing and Remote Access service which was unable to start. For more information, check the system event log.\0"
     7349 "Unable to allow the editing of networking components at this time because they are currently being modified elsewhere.\0"
-    7350 "The new user you entered was not added to the local user database because  the name or password entered violated a system policy (it was too large, too small, or ill-formed).  \0"
-    7351 "The system is unable to delete the requested user.  \0"
+    7350 "The new user you entered was not added to the local user database because the name or password entered violated a system policy (it was too large, too small, or ill-formed).\0"
+    7351 "The system is unable to delete the requested user.\0"
     7352 "Unable to remove the selected network component because it is in use.\0"
     7353 "Incoming Connections Warning\0"
-    7354 "Any users that you delete will be permanently removed from the system even if cancel is pressed.  Are you sure you want to permanently remove %s? \0"
-    7355 "You are about to switch to a system management console.  This Incoming Connections property sheet will be closed and any changes you may have made will be committed to the system.  Is it ok to continue?\0"
-    7356 "Your Network Mask value has been changed.  A zero bit in a mask can only be followed by other zero bits.  For example, a Network Mask value, expressed in decimal dotted notation, of 255.255.0.0, is valid, but 255.0.255.0 is not.\n\0"
+    7354 "Any users that you delete will be permanently removed from the system even if cancel is pressed. Are you sure you want to permanently remove %s?\0"
+    7355 "You are about to switch to a system management console. This Incoming Connections property sheet will be closed and any changes you may have made will be committed to the system. Is it ok to continue?\0"
+    7356 "Your Network Mask value has been changed. A zero bit in a mask can only be followed by other zero bits. For example, a Network Mask value, expressed in decimal dotted notation, of 255.255.0.0, is valid, but 255.0.255.0 is not.\n\0"
     7357 "User Permissions\0"
     7358 "You can specify the users who can connect to this computer.\0"
     7359 "Devices for Incoming Connections\0"
@@ -2341,26 +2341,26 @@ BEGIN
     7377 "What device do you want to use to make this connection?\0"
     7378 "No devices capable of accepting direct connections are currently installed.\0"
     7379 "New Incoming Connection Warning\0"
-    7380 "Because this Win 2000 Server belongs to or controls a domain, you must use the Routing and Remote Access system console to configure this machine to receive incoming connections.  Cancel changes and switch to this console?\n\0"
+    7380 "Because this Win 2000 Server belongs to or controls a domain, you must use the Routing and Remote Access system console to configure this machine to receive incoming connections. Cancel changes and switch to this console?\n\0"
     7381 "A&ssign network number automatically\0"
     7382 "A&ssign network numbers automatically\0"
-    7383 "Incoming Connections can not issue the ipx network numbers 00000000 or FFFFFFFF.  Please either change the assigned network numbers or use automatic network number assignment.\0"
+    7383 "Incoming Connections can not issue the ipx network numbers 00000000 or FFFFFFFF. Please either change the assigned network numbers or use automatic network number assignment.\0"
     7384 "to\0"
     7385 "Communications Port (%s)\0"
-    7386 "Network Connections does not display some specialized options for inbound connections that have been set using the Local User Manager or Remote Access Policy consoles.  For complete and correct information on incoming connections, you will need to use these consoles.\0"
+    7386 "Network Connections does not display some specialized options for inbound connections that have been set using the Local User Manager or Remote Access Policy consoles. For complete and correct information on incoming connections, you will need to use these consoles.\0"
     7387 "The user callback mode you have selected requires you to enter a valid callback number.\0"
-    7388 "ReactOS must reboot to complete the operation.  Is it ok to reboot now?\0"
+    7388 "ReactOS must reboot to complete the operation. Is it ok to reboot now?\0"
     7389 "The currently selected device has no configuration options available.\0"
     7390 "Invalid Range\0"
-    7391 "You have requested that '%1' be disabled for Incoming Connections.  In order to disable this, you must stop the 'Server' service.  Once stopped, any shared directories or printers on this computer will no longer be available to any other computer.  Do you want to bring up a system console that will allow you to stop the 'Server' service?\r\n\nUnder Computer Management, click System Tools and then click Services.  In the right pane, right-click Server and click stop.\0"
-    7392 "This serial port is not enabled for use in a direct connection to another computer.  It will be enabled after you complete this wizard.  You can then configure the port speed and other properties by right-clicking the icon for this connection and selecting Properties.\n\0"
+    7391 "You have requested that '%1' be disabled for Incoming Connections. In order to disable this, you must stop the 'Server' service. Once stopped, any shared directories or printers on this computer will no longer be available to any other computer. Do you want to bring up a system console that will allow you to stop the 'Server' service?\r\n\nUnder Computer Management, click System Tools and then click Services. In the right pane, right-click Server and click stop.\0"
+    7392 "This serial port is not enabled for use in a direct connection to another computer. It will be enabled after you complete this wizard. You can then configure the port speed and other properties by right-clicking the icon for this connection and selecting Properties.\n\0"
     7393 "Incoming Connections\0"
     7394 "The IP address pool you've entered is invalid.\0"
     7395 "The mask provided is invalid.\0"
-    7396 "The start address entered for the TCP/IP pool is invalid.  It must lie between 1.0.0.0 and 224.0.0.0 and it must not be in the form 127.x.x.x.\0"
+    7396 "The start address entered for the TCP/IP pool is invalid. It must lie between 1.0.0.0 and 224.0.0.0 and it must not be in the form 127.x.x.x.\0"
     7397 "The TCP/IP pool entered is invalid because the address is more specific than the mask.\0"
     7398 "The start address must be less than the end address.\0"
-    7399 "The Routing and Remote Access Service is in the process of stopping.  Until it stops, the Incoming Connections option is not available.  Please wait a few moments and retry.\0"
+    7399 "The Routing and Remote Access Service is in the process of stopping. Until it stops, the Incoming Connections option is not available. Please wait a few moments and retry.\0"
     7400 "%s (%s)\0"
     7401 "%s (%d channels)\0"
     7402 "Incoming Connection VPN (PPTP)\0"
diff --git a/dll/win32/rasdlg/lang/he-IL.rc b/dll/win32/rasdlg/lang/he-IL.rc
index a9144ac937e..8c6e2f1ae8d 100644
--- a/dll/win32/rasdlg/lang/he-IL.rc
+++ b/dll/win32/rasdlg/lang/he-IL.rc
@@ -13,7 +13,7 @@ BEGIN
     PUSHBUTTON "הוסף...", 1013, 7, 187, 70, 14
     PUSHBUTTON "ערוך...", 1016, 81, 187, 70, 14
     PUSHBUTTON "מחק", 1014, 154, 187, 70, 14
-    AUTOCHECKBOX "אם המספר זה  נכשל, עבור למספר הבא", 1011, 8, 210, 243, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "אם המספר זה נכשל, עבור למספר הבא", 1011, 8, 210, 243, 10, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "העבר מספר מוצלח לראש הרשימה", 1010, 8, 228, 243, 10, BS_TOP | BS_MULTILINE
     DEFPUSHBUTTON "אישור", 1, 122, 245, 60, 14
     PUSHBUTTON "ביטול", 2, 188, 245, 60, 14
@@ -39,12 +39,12 @@ CAPTION "Line Bundling Errors"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "One or more additional lines did not connect. ", 1033, 37, 8, 216, 20
+    LTEXT "One or more additional lines did not connect.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "&Do not attempt failed lines in the future", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "מסכים", 1, 135, 242, 60, 14
     PUSHBUTTON "נתק", 2, 201, 242, 60, 14
-    LTEXT "If only a single line connected, the server may not be configured to accept multi-link calls.  Check 'Do not attempt failed lines' to avoid unnecessary connection charges in such a case.", -1, 37, 36, 224, 44
+    LTEXT "If only a single line connected, the server may not be configured to accept multi-link calls. Check 'Do not attempt failed lines' to avoid unnecessary connection charges in such a case.", -1, 37, 36, 224, 44
 END
 
 105 DIALOGEX 0, 0, 261, 253
@@ -137,7 +137,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You have 'Set By Caller' callback privilege on the server.  Press OK and the server will call you back at the number below.  Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "You have 'Set By Caller' callback privilege on the server. Press OK and the server will call you back at the number below. Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX
     LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP
     EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
     DEFPUSHBUTTON "אישור", 1, 100, 85, 60, 14, WS_GROUP
@@ -194,7 +194,7 @@ CAPTION "חיבור בחיוג"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 563, 1098, 7, 6, 20, 20, WS_GROUP
-    LTEXT "The autodial attempt failed.  Do you want to disable autodial from this location?", 1099, 40, 6, 181, 34, NOT WS_GROUP
+    LTEXT "The autodial attempt failed. Do you want to disable autodial from this location?", 1099, 40, 6, 181, 34, NOT WS_GROUP
     PUSHBUTTON "כן", 1, 60, 42, 50, 14
     DEFPUSHBUTTON "לא", 2, 115, 42, 50, 14
 END
@@ -403,7 +403,7 @@ CAPTION "NetWare or Compatible Connections"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32515, 1278, 7, 7, 21, 20, WS_GROUP
-    LTEXT "You have connections to a NetWare compatible network.  These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37
+    LTEXT "You have connections to a NetWare compatible network. These connections will be closed when the PPP IPX connection is established.", 1279, 42, 7, 215, 37
     LTEXT "Before dialing, to avoid data loss, either close all files using these connections or uncheck IPX on this entry's Network Protocol settings.", 1280, 42, 46, 215, 38, NOT WS_GROUP
     AUTOCHECKBOX "&Do not display this message in the future", 1277, 42, 86, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     DEFPUSHBUTTON "אישור", 1, 65, 112, 60, 14, WS_GROUP
@@ -415,7 +415,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "חיוג ידני"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Pick up the handset and dial (or ask the operator to dial).  After dialing is complete, click OK.  Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32
+    LTEXT "Pick up the handset and dial (or ask the operator to dial). After dialing is complete, click OK. Listen to handset until silent, and then hang up.", 1281, 8, 8, 219, 32
     LTEXT "מספר טלפון:", 1282, 8, 46, 91, 8
     LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP
     DEFPUSHBUTTON "אישור", 1, 104, 70, 60, 14, WS_GROUP
@@ -470,7 +470,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "חיוג"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login.  You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP
+    LTEXT "These preferences apply to 'Login using Dial-Up Networking' at Ctrl-Alt-Del login. You, as an administrator, have access to this sheet.", 1007, 7, 4, 221, 40, NOT WS_GROUP
     LTEXT "&Number of redial attempts:", 1005, 7, 55, 154, 8
     EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL
     LTEXT "&Seconds between redial attempts:", 1009, 7, 73, 156, 8, NOT WS_GROUP
@@ -484,7 +484,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges.  Specify whether you want callback.  (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43
+    LTEXT "When you dial into a server, it may offer to call you back to reduce your phone charges. Specify whether you want callback. (Callback is not supported for virtual private network (VPN) connections.)", 1043, 8, 4, 219, 43
     AUTORADIOBUTTON "&No callback", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "A&sk me during dialing when the server offers", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
     AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
@@ -510,7 +510,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router.  These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33
+    LTEXT "You need to set the dial out credentials that this interface will use when connecting to the remote router. These credentials must match the dial in credentials configured on the remote router.", 1094, 8, 5, 308, 33
     LTEXT "שם משתמש:", 1096, 8, 43, 130, 8, NOT WS_GROUP
     EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL
     LTEXT "שם מתחם:", 1093, 8, 63, 130, 8, NOT WS_GROUP
@@ -608,7 +608,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Select a name for this demand dial interface.  A common practice is to name interfaces after the network or router to which they connect.", 1158, 7, 5, 309, 29
+    LTEXT "Select a name for this demand dial interface. A common practice is to name interfaces after the network or router to which they connect.", 1158, 7, 5, 309, 29
     LTEXT "&Interface name:", 1159, 17, 41, 285, 8, NOT WS_GROUP
     EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL
     AUTOCHECKBOX "I &know all about demand-dial interfaces and would rather edit the properties directly", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
@@ -624,7 +624,7 @@ BEGIN
     AUTORADIOBUTTON "A&dvanced (custom settings)", 1541, 14, 102, 198, 8, BS_NOTIFY
     LTEXT "&Validate my identity as follows:", 1537, 26, 29, 187, 8, NOT WS_GROUP
     COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
-    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and  password (and domain if any)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and password (and domain if any)", 1174, 26, 58, 184, 20, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "Requ&ire data encryption (disconnect if none)", 1169, 26, 82, 183, 10, BS_TOP | BS_MULTILINE
     LTEXT "Using these settings requires a knowledge of security protocols.", 1539, 15, 114, 134, 20
     PUSHBUTTON "&Settings...", 1180, 151, 115, 60, 14
@@ -703,7 +703,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "New Connection Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Type the phone number below. ", -1, 7, 4, 306, 14
+    LTEXT "Type the phone number below.", -1, 7, 4, 306, 14
     LTEXT "&Phone number:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "You might need to include a ""1"" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53
@@ -902,7 +902,7 @@ BEGIN
     EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT "&Domain:", 1395, 7, 108, 53, 8, NOT WS_GROUP
     EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL
-    AUTOCHECKBOX "&Save user name and  password", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "&Save user name and password", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE
     DEFPUSHBUTTON "OK", 1, 87, 146, 60, 14, WS_GROUP
     PUSHBUTTON "Cancel", 2, 151, 146, 60, 14
     CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1
@@ -956,7 +956,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Router Callback"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "When you dial into a router, it may offer to call you back to reduce your phone charges or to increase security.  Specify whether you want callback or not.", 1043, 7, 5, 253, 24
+    LTEXT "When you dial into a router, it may offer to call you back to reduce your phone charges or to increase security. Specify whether you want callback or not.", 1043, 7, 5, 253, 24
     AUTORADIOBUTTON "&No callback", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
     CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
@@ -1050,7 +1050,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Internet Connection Sharing allows other computers on your local network to access external resources through this connection.", -1, 10, 5, 300, 22
     AUTOCHECKBOX "&Enable Internet Connection Sharing for this connection", 1512, 21, 31, 272, 10
-    LTEXT "To dial this connection automatically  when a computer on your local network attempts to access external resources, select the following check box.", 1514, 10, 56, 294, 22
+    LTEXT "To dial this connection automatically when a computer on your local network attempts to access external resources, select the following check box.", 1514, 10, 56, 294, 22
     AUTOCHECKBOX "Enab&le on-demand dialing", 1513, 21, 86, 260, 10
 END
 
@@ -1068,7 +1068,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "You can configure this connection to use your smart card to log you into the remote network.  Select whether to use your smart card with this connection.", -1, 10, 5, 303, 22
+    LTEXT "You can configure this connection to use your smart card to log you into the remote network. Select whether to use your smart card with this connection.", -1, 10, 5, 303, 22
     AUTORADIOBUTTON "&Use my smart card ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "&Do not use my smart card ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1297,7 +1297,7 @@ BEGIN
     AUTORADIOBUTTON "A&dvanced (custom settings)", 1541, 14, 100, 197, 8, BS_NOTIFY
     LTEXT "&Validate my identity as follows:", 1537, 26, 29, 183, 8, NOT WS_GROUP
     COMBOBOX 1178, 26, 40, 184, 78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP
-    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and  password (and domain if any)", 1174, 26, 59, 182, 20, BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "A&utomatically use my ReactOS logon name and password (and domain if any)", 1174, 26, 59, 182, 20, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "Requ&ire data encryption (disconnect if none)", 1169, 26, 83, 182, 10, BS_TOP | BS_MULTILINE
     LTEXT "Using these settings requires a knowledge of security protocols.", 1539, 26, 111, 136, 20
     PUSHBUTTON "&Settings...", 1180, 151, 134, 60, 14
@@ -1615,7 +1615,7 @@ BEGIN
     EDITTEXT 1615, 115, 54, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT "&Confirm password:", 1638, 23, 74, 88, 13
     EDITTEXT 1616, 115, 73, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
-    AUTOCHECKBOX "U&se this account  name and password when anyone connects to the Internet from this computer", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "U&se this account name and password when anyone connects to the Internet from this computer", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "&Make this the default Internet connection", 1595, 23, 112, 288, 14
     AUTOCHECKBOX "&Turn on Internet Connection Firewall for this connection", 1682, 23, 133, 290, 14
 END
@@ -1757,7 +1757,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Select the check box next to each user who should be allowed a connection to this computer.  Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
+    LTEXT "Select the check box next to each user who should be allowed a connection to this computer. Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
     LTEXT "&Users allowed to connect:", -1, 10, 28, 275, 8
     CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
     PUSHBUTTON "&Add...", 7044, 10, 122, 65, 14, WS_GROUP
@@ -1836,20 +1836,20 @@ BEGIN
     193 "Enter a user name and password with access to the remote network domain.\0"
     194 "Network Address Translation (NAT) is currently installed as a routing protocol,\nand must be removed before enabling Internet Connection Sharing.\nTo remove Network Address Translation, open the Routing and Remote Access Manager\nsnapin and expand the router's entry in the left pane.\nDelete the Network Address Translation routing protocol from the list of IP\nrouting protocols.\0"
     195 "The area code must contain only the digits 0 to 9.\0"
-    196 "The entry name must contain at least one non-blank character and cannot begin with a period.  Choose a different name.\0"
+    196 "The entry name must contain at least one non-blank character and cannot begin with a period. Choose a different name.\0"
     197 "You must choose a value from %1 to %2 for this field.\0"
-    198 "The custom authentication configuration DLL could not be loaded.  Make sure the custom authentication package is correctly installed.\0"
+    198 "The custom authentication configuration DLL could not be loaded. Make sure the custom authentication package is correctly installed.\0"
     199 "The connection selected was established by the Multiprotocol router.\nPlease use the 'Routing and RAS Admin' tool to hang up the connection.\0"
     200 "Comment\0"
     201 "The custom authentication package configuration failed.\0"
-    202 "TCP/IP is not installed or is disabled for Routing and Remote Access.  In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0"
-    203 "IPX is not installed or is disabled for Routing and Remote Access.  You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0"
+    202 "TCP/IP is not installed or is disabled for Routing and Remote Access. In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0"
+    203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0"
     204 "Remove the selected device(s) from the list?\0"
     205 "Delete %1 from the phonebook?\0"
     206 "Disconnect from %1?\0"
-    207 "A file named %1 already exists.  Overwrite it?\0"
+    207 "A file named %1 already exists. Overwrite it?\0"
     208 "Syntax errors were found in the script. Do you wish to view the error log?\0"
-    209 "'%1' is now connected.  \0"
+    209 "'%1' is now connected.\0"
     210 "Right-click the Dial-Up Networking Monitor on the task bar to hang up or check the status of your connection.\0"
     212 "Connected successfully.\0"
     213 "The custom authentication method selected must be initialized by pressing Properties.\0"
@@ -1857,7 +1857,7 @@ BEGIN
     215 "Dial-up shortcut files (*.rnk)\0"
     216 "*.rnk\0"
     217 "Create Dial-Up Shortcut\0"
-    218 "Link to %1 failed.  Reconnect pending...\0"
+    218 "Link to %1 failed. Reconnect pending...\0"
     219 "Cannot retrieve framing information.\0"
     220 "Cannot retrieve port information.\0"
     221 "Cannot retrieve projection information.\0"
@@ -1875,7 +1875,7 @@ BEGIN
     233 "Remote Router\0"
     234 "Modem or device\0"
     235 "Please enter a username for this interface's account on the remote router.\0"
-    236 "An entry named %1 already exists.  Choose a different name.\0"
+    236 "An entry named %1 already exists. Choose a different name.\0"
     237 "You may want to allow sending your password without encryption.\0"
     238 "Password Encryption\0"
     239 "The wizard is ready to create your connection.\0"
@@ -1884,7 +1884,7 @@ BEGIN
     242 "Call Me Back At\0"
     243 "Edit Alternate Phone Number\0"
     244 "Since this connection is currently active, some settings will not take effect until the next time you dial it.\0"
-    245 "There are no connections available to all users.  You must logon before dialing.\0"
+    245 "There are no connections available to all users. You must logon before dialing.\0"
     246 "The phonebook is empty.\n\nPress OK to add an entry.\0"
     247 "Due to import/export restrictions, data encryption is not available in this version of ReactOS.\0"
     248 "Please enter an X.25 address on the next screen.\0"
@@ -1910,7 +1910,7 @@ BEGIN
     268 "Phone Numbers\0"
     269 "You may enter a fixed IP address.\0"
     270 "IP Address\0"
-    271 "The Internet protocols (TCP/IP), are not installed or are disabled for Remote Access.  In Control Panel, start Network, go to the Services page, choose 'Remote Access Service' Properties, and press the Network button.\0"
+    271 "The Internet protocols (TCP/IP), are not installed or are disabled for Remote Access. In Control Panel, start Network, go to the Services page, choose 'Remote Access Service' Properties, and press the Network button.\0"
     272 "TCP/IP\0"
     273 "IPSec, default policy\0"
     274 "IPX/SPX or compatible\0"
@@ -1947,13 +1947,13 @@ BEGIN
     305 "No alternate phonebook is selected.\0"
     306 "That device cannot be dynamically configured.\0"
     307 "The entry cannot be deleted because it is connected.\0"
-    308 "No entry is selected.  Press the New button to create an entry.\0"
+    308 "No entry is selected. Press the New button to create an entry.\0"
     309 "A non-zero IP address must be supplied when 'specify an IP address' is selected.\0"
     310 "An X.25 Address is required when an X.25 dial-up network or X.25 device is selected.\0"
     311 "(none)\0"
     312 "'%1' is already in the list.\0"
     313 "Secure my password and my data\0"
-    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access.  To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
+    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access. To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
     315 "Cannot save password.\0"
     316 "Cannot display data.\0"
     317 "Cannot get auto-dial information.\0"
@@ -2011,7 +2011,7 @@ BEGIN
     369 "Point-to-point protocol settings to use when %1 initiates a demand dial connection on interface %2:\0"
     370 "[To change the saved password, click here]\0"
     405 "NetBEUI protocol is required to call older RAS servers.\0"
-    406 "Before you can call older RAS servers you must install the NetBEUI protocol.  NetBEUI can be installed with the Control Panel Network applet.\0"
+    406 "Before you can call older RAS servers you must install the NetBEUI protocol. NetBEUI can be installed with the Control Panel Network applet.\0"
     407 "&Redial\0"
     408 "You have chosen to disable one or more transports. Doing so requires the routing managers and routing protocols for the disabled transports to be removed from this demand-dial interface.\nClick Yes if you want to continue, or No if you want to re-enable the transports.\0"
     409 "Internet Connection Sharing\0"
@@ -2068,7 +2068,7 @@ BEGIN
     460 "You must check at least one modem or adapter.\0"
     461 "Phone number\0"
     462 "TCP/IP protocol is required to call SLIP servers.\0"
-    463 "Before you can call SLIP servers you must install the TCP/IP protocol.  TCP/IP can be installed with the Control Panel Network applet.\0"
+    463 "Before you can call SLIP servers you must install the TCP/IP protocol. TCP/IP can be installed with the Control Panel Network applet.\0"
     464 "Status\0"
     465 "&New suffix:\0"
     466 "&Suffixes:\0"
@@ -2114,9 +2114,9 @@ BEGIN
     506 "Internet Connection Sharing\0"
     507 "You can let a local network access resources through this dial-up connection.\0"
     508 "Host or Guest?\0"
-    509 "Internet Connection Sharing  is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
+    509 "Internet Connection Sharing is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
     510 "To connect two computers, your computer must be identified as either a host or a guest.\0"
-    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically.  Are you sure you want to enable Internet Connection Sharing?\0"
+    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically. Are you sure you want to enable Internet Connection Sharing?\0"
     512 "Select a Device\0"
     513 "This is the device that will be used to make the connection.\0"
     514 "&Connect\0"
@@ -2135,13 +2135,13 @@ BEGIN
     527 "Type of Connection\0"
     528 "hh.exe netcfg.chm::/trouble_all.htm\0"
     529 "Virtual Private Connection\0"
-    530 "Use any form of authentication required including clear text.  Do not encrypt data.\0"
-    531 "Use any form of authentication that requires passwords to be encrypted.  Do not encrypt data.\0"
+    530 "Use any form of authentication required including clear text. Do not encrypt data.\0"
+    531 "Use any form of authentication that requires passwords to be encrypted. Do not encrypt data.\0"
     532 "Please type a name for the entry.\0"
     533 "Encrypt passwords and data.\0"
     534 "Please type a port number between 1 and 65535.\0"
     535 "Specify custom authentication and data encryption with the Settings button.\0"
-    536 "Use any form of authentication that requires encrypted passwords.  Do not encrypt data.\0"
+    536 "Use any form of authentication that requires encrypted passwords. Do not encrypt data.\0"
     537 "Encrypt passwords and data.\0"
     538 "Specify custom authentication and data encryption with the Settings button.\0"
     539 "The port number is already used by another entry.\nPlease enter a unique port number.\0"
@@ -2192,7 +2192,7 @@ BEGIN
     1554 "Interface Name\0"
     1555 "Select the name by which this new interface will be known.\0"
     1556 "No available devices\0"
-    1557 "A user account named %1 already exists on the local computer.  Should the demand dial interface be configured to use this user account?\0"
+    1557 "A user account named %1 already exists on the local computer. Should the demand dial interface be configured to use this user account?\0"
     1558 "There are no security protocol settings for SLIP server connections.\0"
     1559 "Allow unsecured password\0"
     1560 "Require secured password\0"
@@ -2205,20 +2205,20 @@ BEGIN
     1567 " (encryption enabled)\0"
     1568 "Internet Account Information\0"
     1569 "You will need an account name and password to sign in to your Internet account.\0"
-    1570 "The selected EAP package does not provide encryption keys.  Select an EAP package that does provide keys or select not to encrypt.\0"
+    1570 "The selected EAP package does not provide encryption keys. Select an EAP package that does provide keys or select not to encrypt.\0"
     1571 "The current encryption selection requires EAP or some version of MS-CHAP logon security methods.\0"
     1572 "Protocols and Security\0"
     1573 "Select transports and security options for this connection.\0"
-    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP.  If one of these is negotiated, data encryption will not occur.  Do you want to keep these settings?\0"
-    1575 "To connect to '%1', you must first be connected to '%2'.  Do you want  to connect to '%2' now?\0"
+    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP. If one of these is negotiated, data encryption will not occur. Do you want to keep these settings?\0"
+    1575 "To connect to '%1', you must first be connected to '%2'. Do you want to connect to '%2' now?\0"
     1576 "Connecting over parallel cable...\0"
     1577 "Connecting over infrared...\0"
     1578 "Parallel cable connected.\0"
     1579 "Infrared connected.\0"
-    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software.  The security properties of this connection have been reset to the available encryption strengths.\0"
+    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software. The security properties of this connection have been reset to the available encryption strengths.\0"
     1581 "Typ&e of VPN:\0"
     1582 "Please enter a user name.\0"
-    1583 "This user name and password will be saved for your own use.  There is already a user name and password saved for all other users of this connection.  Do you want to delete the user name and password saved for all other users?\0"
+    1583 "This user name and password will be saved for your own use. There is already a user name and password saved for all other users of this connection. Do you want to delete the user name and password saved for all other users?\0"
     1584 "For example, you could type the name of your workplace or the name of a server you will connect to.\0"
     1585 "Account Information\0"
     1586 "The controls on this property sheet are disabled because the system must first be rebooted before any configuration changes can be made.\0"
@@ -2262,7 +2262,7 @@ BEGIN
     1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0"
     1673 "Data sent from this computer will be rerouted if the default path changes.\0"
     1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0"
-    1685 "Your user account does not have permission to use this connection.  Usually, this is because you are logged in as Guest.\0"
+    1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0"
     1686 "Type an account name and password. (If you have forgotten an existing account name or password, contact your network administrator.)\0"
     1687 "Computer N&ame\0"
     1688 "ISP N&ame\0"
@@ -2287,40 +2287,40 @@ BEGIN
     7320 "Protocol Database\0"
     7321 "You must enter a logon name for the new user or press cancel.\0"
     7322 "The password you entered was too short.\0"
-    7323 "The passwords entered are not the same.  Please re-enter them.\0"
-    7324 "An internal error has occured.  \0"
+    7323 "The passwords entered are not the same. Please re-enter them.\0"
+    7324 "An internal error has occured.\0"
     7325 "Listview\0"
-    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.  \0"
-    7327 "You have insufficient priveleges to add a user to the local system database.  \0"
+    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.\0"
+    7327 "You have insufficient priveleges to add a user to the local system database.\0"
     7328 "The user you are trying create already exists in the local user database.\0"
     7329 "The user was not added to the local user database because the password you entered was rejected.\0"
     7330 "Unable to reload the system user database because of an internal error.\0"
-    7331 "An internal error has occurred:  The local user database handle is corrupt.\0"
+    7331 "An internal error has occurred: The local user database handle is corrupt.\0"
     7332 "Unable to load the resources neccessary to display the user tab.\0"
-    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.  \0"
+    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.\0"
     7334 "The device database handle is corrupt.\0"
     7335 "Unable to load the resources neccessary to display the general tab.\0"
-    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.  \0"
+    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.\0"
     7337 "An internal error occured.\0"
     7338 "An internal error occurred: The networking component database handle is corrupt.\0"
-    7339 "An internal error has occurred.  \0"
+    7339 "An internal error has occurred.\0"
     7340 "An error has occurred while attempting to commit the changes you have made to the networking components.\0"
     7341 "An internal error occured.\0"
-    7342 "Unable to commit the changes you made to the TCP/IP protocol to the system.  \0"
-    7343 "Unable to save the changes you made to the IPX protocol to the system.  \0"
+    7342 "Unable to commit the changes you made to the TCP/IP protocol to the system.\0"
+    7343 "Unable to save the changes you made to the IPX protocol to the system.\0"
     7344 "Unable to display the TCP/IP properties.\0"
     7345 "Unable to display the IPX properties.\0"
-    7346 "Unable to load TCP/IP properties from the system.  \0"
-    7347 "Unable to load IPX properties from the system.  \0"
-    7348 "Incoming Connections depend on the Routing and Remote Access service which was unable to start.  For more information, check the system event log.\0"
+    7346 "Unable to load TCP/IP properties from the system.\0"
+    7347 "Unable to load IPX properties from the system.\0"
+    7348 "Incoming Connections depend on the Routing and Remote Access service which was unable to start. For more information, check the system event log.\0"
     7349 "Unable to allow the editing of networking components at this time because they are currently being modified elsewhere.\0"
-    7350 "The new user you entered was not added to the local user database because  the name or password entered violated a system policy (it was too large, too small, or ill-formed).  \0"
-    7351 "The system is unable to delete the requested user.  \0"
+    7350 "The new user you entered was not added to the local user database because the name or password entered violated a system policy (it was too large, too small, or ill-formed).\0"
+    7351 "The system is unable to delete the requested user.\0"
     7352 "Unable to remove the selected network component because it is in use.\0"
     7353 "Incoming Connections Warning\0"
-    7354 "Any users that you delete will be permanently removed from the system even if cancel is pressed.  Are you sure you want to permanently remove %s? \0"
-    7355 "You are about to switch to a system management console.  This Incoming Connections property sheet will be closed and any changes you may have made will be committed to the system.  Is it ok to continue?\0"
-    7356 "Your Network Mask value has been changed.  A zero bit in a mask can only be followed by other zero bits.  For example, a Network Mask value, expressed in decimal dotted notation, of 255.255.0.0, is valid, but 255.0.255.0 is not.\n\0"
+    7354 "Any users that you delete will be permanently removed from the system even if cancel is pressed. Are you sure you want to permanently remove %s?\0"
+    7355 "You are about to switch to a system management console. This Incoming Connections property sheet will be closed and any changes you may have made will be committed to the system. Is it ok to continue?\0"
+    7356 "Your Network Mask value has been changed. A zero bit in a mask can only be followed by other zero bits. For example, a Network Mask value, expressed in decimal dotted notation, of 255.255.0.0, is valid, but 255.0.255.0 is not.\n\0"
     7357 "User Permissions\0"
     7358 "You can specify the users who can connect to this computer.\0"
     7359 "Devices for Incoming Connections\0"
@@ -2341,26 +2341,26 @@ BEGIN
     7377 "What device do you want to use to make this connection?\0"
     7378 "No devices capable of accepting direct connections are currently installed.\0"
     7379 "New Incoming Connection Warning\0"
-    7380 "Because this Win 2000 Server belongs to or controls a domain, you must use the Routing and Remote Access system console to configure this machine to receive incoming connections.  Cancel changes and switch to this console?\n\0"
+    7380 "Because this Win 2000 Server belongs to or controls a domain, you must use the Routing and Remote Access system console to configure this machine to receive incoming connections. Cancel changes and switch to this console?\n\0"
     7381 "A&ssign network number automatically\0"
     7382 "A&ssign network numbers automatically\0"
-    7383 "Incoming Connections can not issue the ipx network numbers 00000000 or FFFFFFFF.  Please either change the assigned network numbers or use automatic network number assignment.\0"
+    7383 "Incoming Connections can not issue the ipx network numbers 00000000 or FFFFFFFF. Please either change the assigned network numbers or use automatic network number assignment.\0"
     7384 "to\0"
     7385 "Communications Port (%s)\0"
-    7386 "Network Connections does not display some specialized options for inbound connections that have been set using the Local User Manager or Remote Access Policy consoles.  For complete and correct information on incoming connections, you will need to use these consoles.\0"
+    7386 "Network Connections does not display some specialized options for inbound connections that have been set using the Local User Manager or Remote Access Policy consoles. For complete and correct information on incoming connections, you will need to use these consoles.\0"
     7387 "The user callback mode you have selected requires you to enter a valid callback number.\0"
-    7388 "ReactOS must reboot to complete the operation.  Is it ok to reboot now?\0"
+    7388 "ReactOS must reboot to complete the operation. Is it ok to reboot now?\0"
     7389 "The currently selected device has no configuration options available.\0"
     7390 "Invalid Range\0"
-    7391 "You have requested that '%1' be disabled for Incoming Connections.  In order to disable this, you must stop the 'Server' service.  Once stopped, any shared directories or printers on this computer will no longer be available to any other computer.  Do you want to bring up a system console that will allow you to stop the 'Server' service?\r\n\nUnder Computer Management, click System Tools and then click Services.  In the right pane, right-click Server and click stop.\0"
-    7392 "This serial port is not enabled for use in a direct connection to another computer.  It will be enabled after you complete this wizard.  You can then configure the port speed and other properties by right-clicking the icon for this connection and selecting Properties.\n\0"
+    7391 "You have requested that '%1' be disabled for Incoming Connections. In order to disable this, you must stop the 'Server' service. Once stopped, any shared directories or printers on this computer will no longer be available to any other computer. Do you want to bring up a system console that will allow you to stop the 'Server' service?\r\n\nUnder Computer Management, click System Tools and then click Services. In the right pane, right-click Server and click stop.\0"
+    7392 "This serial port is not enabled for use in a direct connection to another computer. It will be enabled after you complete this wizard. You can then configure the port speed and other properties by right-clicking the icon for this connection and selecting Properties.\n\0"
     7393 "Incoming Connections\0"
     7394 "The IP address pool you've entered is invalid.\0"
     7395 "The mask provided is invalid.\0"
-    7396 "The start address entered for the TCP/IP pool is invalid.  It must lie between 1.0.0.0 and 224.0.0.0 and it must not be in the form 127.x.x.x.\0"
+    7396 "The start address entered for the TCP/IP pool is invalid. It must lie between 1.0.0.0 and 224.0.0.0 and it must not be in the form 127.x.x.x.\0"
     7397 "The TCP/IP pool entered is invalid because the address is more specific than the mask.\0"
     7398 "The start address must be less than the end address.\0"
-    7399 "The Routing and Remote Access Service is in the process of stopping.  Until it stops, the Incoming Connections option is not available.  Please wait a few moments and retry.\0"
+    7399 "The Routing and Remote Access Service is in the process of stopping. Until it stops, the Incoming Connections option is not available. Please wait a few moments and retry.\0"
     7400 "%s (%s)\0"
     7401 "%s (%d channels)\0"
     7402 "Incoming Connection VPN (PPTP)\0"
diff --git a/dll/win32/rasdlg/lang/no-NO.rc b/dll/win32/rasdlg/lang/no-NO.rc
index e802d08689b..c522414ced5 100644
--- a/dll/win32/rasdlg/lang/no-NO.rc
+++ b/dll/win32/rasdlg/lang/no-NO.rc
@@ -39,12 +39,12 @@ CAPTION "Linje bundling feil"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "En eller flere tilleggs linjer ville ikke koble til. ", 1033, 37, 8, 216, 20
+    LTEXT "En eller flere tilleggs linjer ville ikke koble til.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "&Ikke koble til mislykket linjer i fremtiden", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "&Godta", 1, 135, 242, 60, 14
     PUSHBUTTON "&Legg på", 2, 201, 242, 60, 14
-    LTEXT "Hvis det er bare en enkelt linje tilkoblet, serveren kan ikke ha blitt konfigurert til å godta multi-linke samtaler.  Sjekk 'Ikke koble til mislykket linjer' for å unngå unødvendig tilkobling endringer i slike saker.", -1, 37, 36, 224, 44
+    LTEXT "Hvis det er bare en enkelt linje tilkoblet, serveren kan ikke ha blitt konfigurert til å godta multi-linke samtaler. Sjekk 'Ikke koble til mislykket linjer' for å unngå unødvendig tilkobling endringer i slike saker.", -1, 37, 36, 224, 44
 END
 
 105 DIALOGEX 0, 0, 261, 253
@@ -137,7 +137,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "Tilbakeringing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Du har 'Slått av innringer' tilbakeringing privilegium på serveren.  Trykk på OK og serveren vil tilbakeringe nummeret under.  Trykk på Avbryt for å droppe tilbakeringing.", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "Du har 'Slått av innringer' tilbakeringing privilegium på serveren. Trykk på OK og serveren vil tilbakeringe nummeret under. Trykk på Avbryt for å droppe tilbakeringing.", 1066, 5, 5, 221, 39, SS_NOPREFIX
     LTEXT "&Skriv inn modem telefonnummer:", 1067, 5, 46, 222, 8, NOT WS_GROUP
     EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP
@@ -194,7 +194,7 @@ CAPTION "Tilkobler nettverk"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 563, 1098, 7, 6, 20, 20, WS_GROUP
-    LTEXT "Autooppringing forsøket mislykkes.  Vil du deaktivere autooppringing fra denne plasseringen?", 1099, 40, 6, 181, 34, NOT WS_GROUP
+    LTEXT "Autooppringing forsøket mislykkes. Vil du deaktivere autooppringing fra denne plasseringen?", 1099, 40, 6, 181, 34, NOT WS_GROUP
     PUSHBUTTON "&Ja", 1, 60, 42, 50, 14
     DEFPUSHBUTTON "&Nei", 2, 115, 42, 50, 14
 END
@@ -415,7 +415,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Manuelt nummerslåing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Plukk opp handset og ring (eller spør operatør om å ringe).  Etter at ringingen er fullført, trykk på OK.  Hør på handset inntil det blir stille, og så legge på telefonrøret .", 1281, 8, 8, 219, 32
+    LTEXT "Plukk opp handset og ring (eller spør operatør om å ringe). Etter at ringingen er fullført, trykk på OK. Hør på handset inntil det blir stille, og så legge på telefonrøret .", 1281, 8, 8, 219, 32
     LTEXT "Telefonnummer:", 1282, 8, 46, 91, 8
     LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP
     DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP
@@ -470,7 +470,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Nummerslåing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Disse innstillinger brukes for å 'Logge på ved å bruke tilkoblet nettverk' når du bruker Ctrl-Alt-Del pålogging.  Du, som en administrator, har tilgang til dette.", 1007, 7, 4, 221, 40, NOT WS_GROUP
+    LTEXT "Disse innstillinger brukes for å 'Logge på ved å bruke tilkoblet nettverk' når du bruker Ctrl-Alt-Del pålogging. Du, som en administrator, har tilgang til dette.", 1007, 7, 4, 221, 40, NOT WS_GROUP
     LTEXT "&Nummer av slå nummeret igjen forsøk:", 1005, 7, 55, 154, 8
     EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL
     LTEXT "&Sekunder mellom ringe opp på nytt forsøk:", 1009, 7, 73, 156, 8, NOT WS_GROUP
@@ -484,7 +484,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Tilbakeringing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Når du ringer til serveren, kan det tilby å ringe deg tilbake for å redusere din telefon omkostninger.  Spessielt hvis du ønsker tilbakeringing.  (Tilbakeringing er ikke støttet for virtuelt privat nettverk (VPN) tilkoblinger.)", 1043, 8, 4, 219, 43
+    LTEXT "Når du ringer til serveren, kan det tilby å ringe deg tilbake for å redusere din telefon omkostninger. Spessielt hvis du ønsker tilbakeringing. (Tilbakeringing er ikke støttet for virtuelt privat nettverk (VPN) tilkoblinger.)", 1043, 8, 4, 219, 43
     AUTORADIOBUTTON "&Ingen tilbakeringing", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "S&pør meg under nummerslåing når serveren spør", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
     AUTORADIOBUTTON "All&tid ring meg tilbake til nummer(et) under:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
@@ -510,7 +510,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Du trenger å sette opp ringe ut credentials slik at dette grensesnittet vil bruke det når tilkoblet til ekstern router.  Disse credentials må passe for at ringingen i credentials konfigurert på eksternt router.", 1094, 8, 5, 308, 33
+    LTEXT "Du trenger å sette opp ringe ut credentials slik at dette grensesnittet vil bruke det når tilkoblet til ekstern router. Disse credentials må passe for at ringingen i credentials konfigurert på eksternt router.", 1094, 8, 5, 308, 33
     LTEXT "&Brukernavn:", 1096, 8, 43, 130, 8, NOT WS_GROUP
     EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL
     LTEXT "&Domene:", 1093, 8, 63, 130, 8, NOT WS_GROUP
@@ -527,7 +527,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Velg et navn som du ønsker for denne tilkoblingen:", -1, 8, 4, 190, 8
     EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL
-    LTEXT "Trykk på fullført for å lagre det  i nettverk tilkobling mappen.", -1, 8, 38, 193, 8
+    LTEXT "Trykk på fullført for å lagre det i nettverk tilkobling mappen.", -1, 8, 38, 193, 8
     LTEXT "For å redigere denne tilkoblingen senere, velg denne, trykk på Fil meny, og så trykk på Egenskaper.", -1, 8, 58, 193, 16
 END
 
@@ -608,7 +608,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Velg et navn for denne demand dial interface.  En common practice er for å gi navn på grensensitt etter nettverket eller router for å velge hvem som er tilkoblet.", 1158, 7, 5, 309, 29
+    LTEXT "Velg et navn for denne demand dial interface. En common practice er for å gi navn på grensensitt etter nettverket eller router for å velge hvem som er tilkoblet.", 1158, 7, 5, 309, 29
     LTEXT "&Grensesnitt navn:", 1159, 17, 41, 285, 8, NOT WS_GROUP
     EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL
     AUTOCHECKBOX "Jeg &vet alt om demand-dial grensesnitt og vil heller redigere egenskapene direkte", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
@@ -703,7 +703,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ny tilkobling veiviser"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Velg telefonummer under. ", -1, 7, 4, 306, 14
+    LTEXT "Velg telefonummer under.", -1, 7, 4, 306, 14
     LTEXT "&Telefonnummer:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Du skulle kanskje trenge å inkludere en ""1"" eller område, eller begge. Hvis du ikke er sikker på om du trenger ekstra nummer, ring telefonnummer til din telefon. Hvis du hører en modem lyd, nummeret oppringt som er riktig.", -1, 20, 50, 291, 53
@@ -956,7 +956,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Router tilbakeringing"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Når du ringer til en router, kan det tilby deg å ringe tilbake for å redusere din telefon omkostninger eller å øke sikkerheten.  Spessielt om du ønsker tilbakeringing eller ikke.", 1043, 7, 5, 253, 24
+    LTEXT "Når du ringer til en router, kan det tilby deg å ringe tilbake for å redusere din telefon omkostninger eller å øke sikkerheten. Spessielt om du ønsker tilbakeringing eller ikke.", 1043, 7, 5, 253, 24
     AUTORADIOBUTTON "&Ingen tilbakeringing", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "Al&ltid ring meg tilbake til nummer(et) under:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
     CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
@@ -1050,7 +1050,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Internett tilkobling deling godtar andre datamaskiner på din lokale nettverk å få tilgang til eksterne ressurser gjennom denne tilkoblingen.", -1, 10, 5, 300, 22
     AUTOCHECKBOX "&Aktiver internett tilkobling deling for denne tilkoblingen", 1512, 21, 31, 272, 10
-    LTEXT "For å ringe denne tilkoblingen automatisk  når en datamaskin på ditt lokale nettverk forsøker å få tilgang til eksterne ressurser, velg følgende markeringsbokser.", 1514, 10, 56, 294, 22
+    LTEXT "For å ringe denne tilkoblingen automatisk når en datamaskin på ditt lokale nettverk forsøker å få tilgang til eksterne ressurser, velg følgende markeringsbokser.", 1514, 10, 56, 294, 22
     AUTOCHECKBOX "akti&vere on-demand nummerslåing", 1513, 21, 86, 260, 10
 END
 
@@ -1068,7 +1068,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Du kan konfigurere denne tilkoblingen for å bruke ditt smartkort for å logge deg til et eksternt nettverk.  Velg for å bruke ditt smartkort for denne tilkoblingen.", -1, 10, 5, 303, 22
+    LTEXT "Du kan konfigurere denne tilkoblingen for å bruke ditt smartkort for å logge deg til et eksternt nettverk. Velg for å bruke ditt smartkort for denne tilkoblingen.", -1, 10, 5, 303, 22
     AUTORADIOBUTTON "&Bruk mitt smartkort ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "&Ikke bruk mitt smartkort ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1615,7 +1615,7 @@ BEGIN
     EDITTEXT 1615, 115, 54, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT "&Bekreft passord:", 1638, 23, 74, 88, 13
     EDITTEXT 1616, 115, 73, 190, 15, ES_PASSWORD | ES_AUTOHSCROLL
-    AUTOCHECKBOX "B&ruk dette konto  navnet og passord når noen kobler til internett fra denne datamaskinen", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
+    AUTOCHECKBOX "B&ruk dette konto navnet og passord når noen kobler til internett fra denne datamaskinen", 1596, 23, 91, 291, 17, BS_LEFT | BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "&Gjør denne som standard internett tilkobling", 1595, 23, 112, 288, 14
     AUTOCHECKBOX "&Skru på internett tilkobling brannmur for denne tilkoblingen", 1682, 23, 133, 290, 14
 END
@@ -1757,7 +1757,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Velg i markering boksen neste for hver bruker som skal bli godtatt å koble til denne datamaskinen.  Vær oppmerksom på at andre faktorer, som å deaktivert brukerkonto, kan påvirke brukerens evne å koble til.", -1, 10, 1, 275, 27
+    LTEXT "Velg i markering boksen neste for hver bruker som skal bli godtatt å koble til denne datamaskinen. Vær oppmerksom på at andre faktorer, som å deaktivert brukerkonto, kan påvirke brukerens evne å koble til.", -1, 10, 1, 275, 27
     LTEXT "&Brukere som er tilatt å koble til:", -1, 10, 28, 275, 8
     CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
     PUSHBUTTON "&Legg til...", 7044, 10, 122, 65, 14, WS_GROUP
@@ -1769,7 +1769,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Velg i markering boksene neste for hver enhet som du ønsker å bruke  for innkommene tilkoblinger.", -1, 10, 4, 299, 10
+    LTEXT "Velg i markering boksene neste for hver enhet som du ønsker å bruke for innkommene tilkoblinger.", -1, 10, 4, 299, 10
     LTEXT "&Tilkobling enhet:", -1, 10, 16, 275, 8
     CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 26, 297, 87
     PUSHBUTTON "E&genskaper", 7013, 243, 120, 65, 14, WS_GROUP
@@ -1836,20 +1836,20 @@ BEGIN
     193 "Skriv inn et brukernavn og passord med tilgang til ekstern nettverk domene.\0"
     194 "Nettverk Adresse Oversetting (NAO) er for øyeblikket installert som en router protokoll,\nog må bli fjernet før aktivering av Internett tilkobling deling.\nFor å fjerne Nettverk Adresse Oversetting, åpne Routing og Fjern tilgang behandling\nsnapin and expand the router's entry in the left pane.\nSlett Nettverk Adresse oversetting routing protokoll fra listen av IP\nrouting protokoller.\0"
     195 "Området koden må inneholde bare digitale siffer fra 0 til 9.\0"
-    196 "Enhetsnavnet må inneholde minst en ikke-blank bokstav og kan ikke begynne med et punktum.  Velg et annet navn.\0"
+    196 "Enhetsnavnet må inneholde minst en ikke-blank bokstav og kan ikke begynne med et punktum. Velg et annet navn.\0"
     197 "Du må velge en verdi fra %1 til %2 for dette feltet.\0"
-    198 "Tilpasset authentication konfigurasjon DLL kunne ikke lastes.  Vær sikker på at tilpasset authentication pakken er riktig installert.\0"
+    198 "Tilpasset authentication konfigurasjon DLL kunne ikke lastes. Vær sikker på at tilpasset authentication pakken er riktig installert.\0"
     199 "Tilkobling valgt var etablert av flere protokoll router.\nVenligst bruk 'Routing og RAS Admin' verktøy for å avslutte tilkoblingen.\0"
     200 "Kommentarer\0"
     201 "Tilpasset authentication pakke konfigurasjon mislykkes.\0"
-    202 "TCP/IP er ikke installert eller er deaktivert for Routing og fjern tilgang.  I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Routing og fjern tilgang tjeneste' Egenskaper, og trykk på Nettverk knappen.\0"
-    203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang.  Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i ""Tilkoblinger"" mappen.\0"
+    202 "TCP/IP er ikke installert eller er deaktivert for Routing og fjern tilgang. I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Routing og fjern tilgang tjeneste' Egenskaper, og trykk på Nettverk knappen.\0"
+    203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang. Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i ""Tilkoblinger"" mappen.\0"
     204 "Fjern valgte enhet(er) fra listen?\0"
     205 "Slett %1 fra telefonboken?\0"
     206 "Koble fra %1?\0"
-    207 "En fil som heter %1 finnes allerede.  Overskrive denne?\0"
+    207 "En fil som heter %1 finnes allerede. Overskrive denne?\0"
     208 "Syntaks feil er funnet i skriptet. Ønsker du å vise feil loggen?\0"
-    209 "'%1' er nå tilkoblet.  \0"
+    209 "'%1' er nå tilkoblet.\0"
     210 "Høyre-klikk Dial-Up Nettverk Monitor på oppgavelinjen for å avslutte eller sjekke statusen for din tilkobling.\0"
     212 "Tilkobling fullført.\0"
     213 "Tilpass authentication metoden som er valgt må bli initialisert ved å trykke på egenskaper.\0"
@@ -1857,7 +1857,7 @@ BEGIN
     215 "Dial-up snarvei filer (*.rnk)\0"
     216 "*.rnk\0"
     217 "Opprett Dial-Up snarvei\0"
-    218 "Lenke til %1 mislykkes.  Gjentilkobling pågår...\0"
+    218 "Lenke til %1 mislykkes. Gjentilkobling pågår...\0"
     219 "Kan ikke gjenopprette montering informasjon.\0"
     220 "Kan ikke gjenopprette port informasjon.\0"
     221 "Kan ikke gjenopprette planlegging informasjon.\0"
@@ -1875,7 +1875,7 @@ BEGIN
     233 "Ekstern Router\0"
     234 "Modem eller enhet\0"
     235 "Venligst sett inn et brukernavn for denne grensesnitt kontoen på ekstern router.\0"
-    236 "En enhet som heter %1 finnes allerede.  Velg et annet navn.\0"
+    236 "En enhet som heter %1 finnes allerede. Velg et annet navn.\0"
     237 "Du kan velge å godta å sende ditt passord uten kryptering.\0"
     238 "Passord kryptering\0"
     239 "Veiviseren er klar for å opprette din tilkobling.\0"
@@ -1884,7 +1884,7 @@ BEGIN
     242 "Kontakt meg tilbake ved\0"
     243 "Rediger alternativer telefonnummer\0"
     244 "Siden denne tilkoblingen er nå aktiv, noen innstillinger vil ikke ta effekt til neste gangen du ringer denne.\0"
-    245 "Det er ingen tilkoblinger tilgjengelig for alle brukere.  Du må logge på før du ringer.\0"
+    245 "Det er ingen tilkoblinger tilgjengelig for alle brukere. Du må logge på før du ringer.\0"
     246 "Telefonboken er tom.\n\nTrykk OK for å legge til enheter.\0"
     247 "Direkte å importere/ekportere restriksjoner, data kryptering er ikke tilgjengelig for denne versjonen av ReactOS.\0"
     248 "Venligst sett inn en X.25 addresse på neste skjermbildet.\0"
@@ -1910,7 +1910,7 @@ BEGIN
     268 "Telefonnummere\0"
     269 "Du kan skrive inn en fikset IP addresse.\0"
     270 "IP Addresse\0"
-    271 "Internett protokoller (TCP/IP), er ikke installert eller er deaktivert for Fjern tilgang.  I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Fjern tilgang tjenste' Egenskaper, og trykk på Nettverk knappen.\0"
+    271 "Internett protokoller (TCP/IP), er ikke installert eller er deaktivert for Fjern tilgang. I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Fjern tilgang tjenste' Egenskaper, og trykk på Nettverk knappen.\0"
     272 "TCP/IP\0"
     273 "IPSec, standard policy\0"
     274 "IPX/SPX eller kompatibelt\0"
@@ -1953,7 +1953,7 @@ BEGIN
     311 "(ingen)\0"
     312 "'%1' er allerede i listen.\0"
     313 "Sikre mitt passord og min data\0"
-    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access.  To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
+    314 "The %1 protocol cannot be selected because it is not installed or is disabled for Remote Access. To change, in Control Panel start Network, choose Services page, Remote Access Properties, and press the Network button.\0"
     315 "Kan ikke lagre vise data.\0"
     316 "Cannot display data.\0"
     317 "Kan ikke få auto-dial informasjon.\0"
@@ -2011,7 +2011,7 @@ BEGIN
     369 "Point-to-point protocol settings to use when %1 initiates a demand dial connection on interface %2:\0"
     370 "[For å endre lagret passord, trykk her]\0"
     405 "NetBEUI protocol is required to call older RAS servers.\0"
-    406 "Before you can call older RAS servers you must install the NetBEUI protocol.  NetBEUI can be installed with the Control Panel Network applet.\0"
+    406 "Before you can call older RAS servers you must install the NetBEUI protocol. NetBEUI can be installed with the Control Panel Network applet.\0"
     407 "&Redial\0"
     408 "You have chosen to disable one or more transports. Doing so requires the routing managers and routing protocols for the disabled transports to be removed from this demand-dial interface.\nClick Yes if you want to continue, or No if you want to re-enable the transports.\0"
     409 "Internett tilkobling deling\0"
@@ -2068,7 +2068,7 @@ BEGIN
     460 "You must check at least one modem or adapter.\0"
     461 "Telefonnummer\0"
     462 "TCP/IP protocol is required to call SLIP servers.\0"
-    463 "Before you can call SLIP servers you must install the TCP/IP protocol.  TCP/IP can be installed with the Control Panel Network applet.\0"
+    463 "Before you can call SLIP servers you must install the TCP/IP protocol. TCP/IP can be installed with the Control Panel Network applet.\0"
     464 "Status\0"
     465 "&Ny suffiks:\0"
     466 "&Suffiks:\0"
@@ -2114,9 +2114,9 @@ BEGIN
     506 "Internett tilkobling deling\0"
     507 "You can let a local network access resources through this dial-up connection.\0"
     508 "Host eller Gjest?\0"
-    509 "Internet Connection Sharing  is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
+    509 "Internet Connection Sharing is currently enabled for connection '%1'.\n\nIt will now be enabled for connection '%2' instead.\0"
     510 "To connect two computers, your computer must be identified as either a host or a guest.\0"
-    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically.  Are you sure you want to enable Internet Connection Sharing?\0"
+    511 "When Internet Connection Sharing is enabled, your LAN adapter will be set to use IP address 192.168.0.1. Your computer may lose connectivity with other computers on your network. If these other computers have static IP addresses, you should set them to obtain their IP addresses automatically. Are you sure you want to enable Internet Connection Sharing?\0"
     512 "Velg en enhet\0"
     513 "Dette er enheten som vil bli brukt for å lage tilkoblingen.\0"
     514 "&Koble til\0"
@@ -2135,13 +2135,13 @@ BEGIN
     527 "Typen av tilkoblingen\0"
     528 "hh.exe netcfg.chm::/trouble_all.htm\0"
     529 "Virtual Private Connection\0"
-    530 "Use any form of authentication required including clear text.  Do not encrypt data.\0"
-    531 "Use any form of authentication that requires passwords to be encrypted.  Do not encrypt data.\0"
+    530 "Use any form of authentication required including clear text. Do not encrypt data.\0"
+    531 "Use any form of authentication that requires passwords to be encrypted. Do not encrypt data.\0"
     532 "Please type a name for the entry.\0"
     533 "Encrypt passwords and data.\0"
     534 "Please type a port number between 1 and 65535.\0"
     535 "Specify custom authentication and data encryption with the Settings button.\0"
-    536 "Use any form of authentication that requires encrypted passwords.  Do not encrypt data.\0"
+    536 "Use any form of authentication that requires encrypted passwords. Do not encrypt data.\0"
     537 "Krypter passordet og data.\0"
     538 "Specify custom authentication and data encryption with the Settings button.\0"
     539 "The port number is already used by another entry.\nPlease enter a unique port number.\0"
@@ -2192,7 +2192,7 @@ BEGIN
     1554 "Interface Navn\0"
     1555 "velg navnet etter hvem denne nye interface vil bli kjent som.\0"
     1556 "Ingen tilgjengelig enheter\0"
-    1557 "En brukerkonto som heter %1 finnes allerede på lokal datamaskin.  skal demand dial interface bli konfigurert for å bruke denne brukerkontoen?\0"
+    1557 "En brukerkonto som heter %1 finnes allerede på lokal datamaskin. skal demand dial interface bli konfigurert for å bruke denne brukerkontoen?\0"
     1558 "Det er ingen sikkerhet protokoll instillinger for SLIP server tilkoblinger.\0"
     1559 "Godta usikkert passord\0"
     1560 "Krev sikkert passord\0"
@@ -2205,20 +2205,20 @@ BEGIN
     1567 " (kryptering aktivert)\0"
     1568 "Internett konto Informasjon\0"
     1569 "Du vil trenge et konto navn og passord for å logge på din Internett konto.\0"
-    1570 "The selected EAP package does not provide encryption keys.  Select an EAP package that does provide keys or select not to encrypt.\0"
+    1570 "The selected EAP package does not provide encryption keys. Select an EAP package that does provide keys or select not to encrypt.\0"
     1571 "The current encryption selection requires EAP or some version of MS-CHAP logon security methods.\0"
     1572 "Protokoller og Sikkerhet\0"
     1573 "Select transports and security options for this connection.\0"
-    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP.  If one of these is negotiated, data encryption will not occur.  Do you want to keep these settings?\0"
-    1575 "For å koble til '%1', må du først være koblet til '%2'.  Vil du  koble til '%2' nå?\0"
+    1574 "The protocols you have selected include PAP, SPAP, and/or CHAP. If one of these is negotiated, data encryption will not occur. Do you want to keep these settings?\0"
+    1575 "For å koble til '%1', må du først være koblet til '%2'. Vil du  koble til '%2' nå?\0"
     1576 "Koble til med paraell kabel...\0"
     1577 "Koble til med infrarød...\0"
     1578 "Parallel kabel tilkoblet.\0"
     1579 "Infrarød tilkoblet.\0"
-    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software.  The security properties of this connection have been reset to the available encryption strengths.\0"
+    1580 "This connection was configured to use a data encryption strength that is not supported by the installed software. The security properties of this connection have been reset to the available encryption strengths.\0"
     1581 "Typ&en av VPN:\0"
     1582 "Venligst skriv inn et brukernavn.\0"
-    1583 "This user name and password will be saved for your own use.  There is already a user name and password saved for all other users of this connection.  Do you want to delete the user name and password saved for all other users?\0"
+    1583 "This user name and password will be saved for your own use. There is already a user name and password saved for all other users of this connection. Do you want to delete the user name and password saved for all other users?\0"
     1584 "For example, you could type the name of your workplace or the name of a server you will connect to.\0"
     1585 "Konto informajon\0"
     1586 "The controls on this property sheet are disabled because the system must first be rebooted before any configuration changes can be made.\0"
@@ -2262,7 +2262,7 @@ BEGIN
     1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0"
     1673 "Data sent from this computer will be rerouted if the default path changes.\0"
     1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0"
-    1685 "Your user account does not have permission to use this connection.  Usually, this is because you are logged in as Guest.\0"
+    1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0"
     1686 "Skriv inn kontonavn og passord. (Hvis du har glemt en eksistende kontonavn eller passord, kontakt din nettverk administrator.)\0"
     1687 "Datamaskin Na&vn\0"
     1688 "ISP N&avn\0"
@@ -2287,40 +2287,40 @@ BEGIN
     7320 "Protokoll database\0"
     7321 "Du må sette inn påloggings navn for nye brukeren eller trykke på avbryt.\0"
     7322 "Passordet som du skrev var for kort.\0"
-    7323 "Passordet du skrev er ikke det samme.  Venligst skriv passordet på nytt.\0"
-    7324 "En internal feil har oppstått.  \0"
+    7323 "Passordet du skrev er ikke det samme. Venligst skriv passordet på nytt.\0"
+    7324 "En internal feil har oppstått.\0"
     7325 "Listview\0"
-    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.  \0"
-    7327 "You have insufficient priveleges to add a user to the local system database.  \0"
+    7326 "An error has occurred while attempting to commit the changes you have made to the local user database.\0"
+    7327 "You have insufficient priveleges to add a user to the local system database.\0"
     7328 "The user you are trying create already exists in the local user database.\0"
     7329 "The user was not added to the local user database because the password you entered was rejected.\0"
     7330 "Unable to reload the system user database because of an internal error.\0"
-    7331 "An internal error has occurred:  The local user database handle is corrupt.\0"
+    7331 "An internal error has occurred: The local user database handle is corrupt.\0"
     7332 "Unable to load the resources neccessary to display the user tab.\0"
-    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.  \0"
+    7333 "An internal error occured while attempting to rollback the changes you made to the local user database.\0"
     7334 "Enhet database håndtere er korrupt.\0"
     7335 "Unable to load the resources neccessary to display the general tab.\0"
-    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.  \0"
+    7336 "An error has occurred while attempting to commit some of the device/vpn related changes you have made.\0"
     7337 "En internal feil har oppstått.\0"
     7338 "En internal feil har oppstått: Nettverk komponent database håndtere er korrupt.\0"
-    7339 "En internal feil har oppstått.  \0"
+    7339 "En internal feil har oppstått.\0"
     7340 "En feil har oppstått mens forsøket på å gjøre endringer du har gjort til nettverk komponenter.\0"
     7341 "En internal feil har oppstått.\0"
-    7342 "Ikke mulig å gjøre endringen du har gjort på TCP/IP protokollen til systemet.  \0"
-    7343 "Ikke mulig å lagre endringene du har gjort på IPX protokoll til systemet.  \0"
+    7342 "Ikke mulig å gjøre endringen du har gjort på TCP/IP protokollen til systemet.\0"
+    7343 "Ikke mulig å lagre endringene du har gjort på IPX protokoll til systemet.\0"
     7344 "Ikke mulig å vise TCP/IP egenskaper.\0"
     7345 "Ikke mulig å vise IPX egenskaper.\0"
-    7346 "Ikke mulig å laste TCP/IP egenskaper fra systemet.  \0"
-    7347 "Ikke mulig å laste IPX egenskaper fra systemet.  \0"
-    7348 "Innkommende kommer ann på Routing og fjern tilgang tjeneste som ikke var mulig å starte.  For mere informasjon, sjekk systemets logg.\0"
+    7346 "Ikke mulig å laste TCP/IP egenskaper fra systemet.\0"
+    7347 "Ikke mulig å laste IPX egenskaper fra systemet.\0"
+    7348 "Innkommende kommer ann på Routing og fjern tilgang tjeneste som ikke var mulig å starte. For mere informasjon, sjekk systemets logg.\0"
     7349 "Ikke mulig å godta å redigere på nettverk komponeneter på dette tidspunktet fordi det var for øyeblikket blitt endret et annet sted.\0"
-    7350 "Nye brukeren du skrev inn ble ikke lagret til lokal bruker database fordi  navnet eller passord som du skrev inn er et brudd på system policy (det var for langt, eller dårlig-formet).  \0"
-    7351 "Systemet er ikke stand til å slette valgte bruker.  \0"
+    7350 "Nye brukeren du skrev inn ble ikke lagret til lokal bruker database fordi navnet eller passord som du skrev inn er et brudd på system policy (det var for langt, eller dårlig-formet).\0"
+    7351 "Systemet er ikke stand til å slette valgte bruker.\0"
     7352 "Ikke mulig å fjerne valgte nettverk komponent fordi det er i bruk.\0"
     7353 "Innkommende tilkobling advarsel\0"
-    7354 "Alle brukere som deg  vil bli sletter fullstendig og fjernet fra systemet nettopp hvis avbryt er trykket.  Er du sikker på at du ønsker å fullstendig fjerne %s? \0"
-    7355 "Du er cirka til å bytte til et system behandling konsoll.  Denne innkommende tilkobling egenskap sheet vil bli lukket og andre endringer du har gjort vil bli committed til systemet.  Er det greit å fortsette?\0"
-    7356 "Din nettverk maske verdi har blitt endret.  Et null bit i en maske kan bare bli følgt etter andre null bits.  For eksempel, et Nettverk Mask verdi, uttrykt i desimal prikket notation, av 255.255.0.0, er gyldig, men 255.0.255.0 er ikke gyldig.\n\0"
+    7354 "Alle brukere som deg vil bli sletter fullstendig og fjernet fra systemet nettopp hvis avbryt er trykket. Er du sikker på at du ønsker å fullstendig fjerne %s?\0"
+    7355 "Du er cirka til å bytte til et system behandling konsoll. Denne innkommende tilkobling egenskap sheet vil bli lukket og andre endringer du har gjort vil bli committed til systemet. Er det greit å fortsette?\0"
+    7356 "Din nettverk maske verdi har blitt endret. Et null bit i en maske kan bare bli følgt etter andre null bits. For eksempel, et Nettverk Mask verdi, uttrykt i desimal prikket notation, av 255.255.0.0, er gyldig, men 255.0.255.0 er ikke gyldig.\n\0"
     7357 "Bruker rettigheter\0"
     7358 "Du kan bestemme brukere som kan koble til denne datamaskinen.\0"
     7359 "Enheter for Innkommende tilkoblinger\0"
@@ -2335,32 +2335,32 @@ BEGIN
     7371 "Ingen maskinvare kabel av godtatt samtaler er installert.\0"
     7372 " \0"
     7373 "Bestem spesifisert &nettverk nummer:\0"
-    7374 "Bestem  &nettverk nummer sekvensiell fra:\0"
+    7374 "Bestem &nettverk nummer sekvensiell fra:\0"
     7375 "Ny bruker\0"
     7376 "Tilkobling enhet\0"
     7377 "Hvilken enheter ønsker du å bruke for å lage denne tilkoblingen?\0"
     7378 "Ingen enhets kabel som er godtatt direkte tilkobling er for øyeblikket installert.\0"
     7379 "Nye innkommende tilkobling advarsel\0"
-    7380 "Fordi dette er Win 2000 Server høre til eller kontrollere et domene, må du bruke Routing og fjern tilgang system konsoll for å konfigurere denne datamaskinen å motta innkommene tilkoblinger.  Avbryt endringer og bytt til denne Konsoll?\n\0"
+    7380 "Fordi dette er Win 2000 Server høre til eller kontrollere et domene, må du bruke Routing og fjern tilgang system konsoll for å konfigurere denne datamaskinen å motta innkommene tilkoblinger. Avbryt endringer og bytt til denne Konsoll?\n\0"
     7381 "G&i nettverk nummer automatisk\0"
     7382 "G&i nettverk nummer automatisk\0"
-    7383 "Innkommene tilkoblinger kan ikke levere ipx nettverk nummere 00000000 eller FFFFFFFF.  Venligst heller endre utpekt nettverk nummere eller bruk automatisk nettverk nummer tildeling.\0"
+    7383 "Innkommene tilkoblinger kan ikke levere ipx nettverk nummere 00000000 eller FFFFFFFF. Venligst heller endre utpekt nettverk nummere eller bruk automatisk nettverk nummer tildeling.\0"
     7384 "Til\0"
     7385 "Komminikasjon Port (%s)\0"
-    7386 "Nettverk tilkoblinger viser ikke noen spesielle valg for inngående tilkoblinger som har blitt satt ved å bruke Lokal bruker behandling eller Fjern tilgang Policy konsoll.  For riktig og rette informasjon på innkommende tilkoblinger, trenger du å bruke disse konsollene.\0"
+    7386 "Nettverk tilkoblinger viser ikke noen spesielle valg for inngående tilkoblinger som har blitt satt ved å bruke Lokal bruker behandling eller Fjern tilgang Policy konsoll. For riktig og rette informasjon på innkommende tilkoblinger, trenger du å bruke disse konsollene.\0"
     7387 "Brukeren tilbakeringing modus som du har valg trenger at du skriver inn et gyldig tilbakeringing nummer.\0"
-    7388 "ReactOS må starte på nytt for å fullføre oppgaven.  Er det greit å starte på nytt?\0"
+    7388 "ReactOS må starte på nytt for å fullføre oppgaven. Er det greit å starte på nytt?\0"
     7389 "Nåværende valgte enhet har ingen konfigurasjon valg tilgjengelig.\0"
     7390 "Ugyldig rekke\0"
-    7391 "Du har spurt om at '%1' skal være deaktivert for innkommende tilkoblinger.  For å deaktivere denne, må du stoppe 'Server' tjenesten.  Mens den er stoppet, alle delte mapper eller skrivere på denne datamaskinen vil ikke lenger bli tilgjengelig for alle andre datamaskiner.  Ønsker du å bringe opp en system konsoll slik at det vil la deg stoppe 'Server' tjenesten?\r\n\nUnder datamaskin behandling, trykk på Systemverktøy også trykk på tjenester.  På høyre side, høyre-klikk Server også trykk på stopp knappen.\0"
-    7392 "Denne serial port er ikke aktivert for bruk i en direkte tilkobling til en annen datamaskin. Det vil bli aktivert etter du fullfører denne veiviseren.  Du kan så konfigurere port hastigheten og andre egenskaper ved å høyre-klikke ikonet for denne tilkoblingen og velge egenskaper.\n\0"
+    7391 "Du har spurt om at '%1' skal være deaktivert for innkommende tilkoblinger. For å deaktivere denne, må du stoppe 'Server' tjenesten. Mens den er stoppet, alle delte mapper eller skrivere på denne datamaskinen vil ikke lenger bli tilgjengelig for alle andre datamaskiner. Ønsker du å bringe opp en system konsoll slik at det vil la deg stoppe 'Server' tjenesten?\r\n\nUnder datamaskin behandling, trykk på Systemverktøy også trykk på tjenester. På høyre side, høyre-klikk Server også trykk på stopp knappen.\0"
+    7392 "Denne serial port er ikke aktivert for bruk i en direkte tilkobling til en annen datamaskin. Det vil bli aktivert etter du fullfører denne veiviseren. Du kan så konfigurere port hastigheten og andre egenskaper ved å høyre-klikke ikonet for denne tilkoblingen og velge egenskaper.\n\0"
     7393 "Innkommende tilkoblinger\0"
     7394 "IP addressen pool som du skrev inn er ugyldig.\0"
     7395 "Masken som er gitt er ugyldig.\0"
-    7396 "Start addressen som er skrevet for TCP/IP pool er ugyldig.  Det må være mellom 1.0.0.0 og 224.0.0.0 og det må ikke være i formen 127.x.x.x.\0"
+    7396 "Start addressen som er skrevet for TCP/IP pool er ugyldig. Det må være mellom 1.0.0.0 og 224.0.0.0 og det må ikke være i formen 127.x.x.x.\0"
     7397 "TCP/IP pool som er skrevet er ugyldig fordi adressen er mere spesiell enn masken.\0"
     7398 "Start addressen må være mindre enn slutt adressen.\0"
-    7399 "Routing og Fjern tilgang tjeneste er i prosess for å stoppe.  Til det stopper, innkommende tilkobling valg er ikke tilgjenlig.  Vennligst vent et øyeblikk eller prøv igjen.\0"
+    7399 "Routing og Fjern tilgang tjeneste er i prosess for å stoppe. Til det stopper, innkommende tilkobling valg er ikke tilgjenlig. Vennligst vent et øyeblikk eller prøv igjen.\0"
     7400 "%s (%s)\0"
     7401 "%s (%d kanaler)\0"
     7402 "Innkommende tilkoblinger VPN (PPTP)\0"
diff --git a/dll/win32/rasdlg/lang/pl-PL.rc b/dll/win32/rasdlg/lang/pl-PL.rc
index 94f84ec966b..934103dae12 100644
--- a/dll/win32/rasdlg/lang/pl-PL.rc
+++ b/dll/win32/rasdlg/lang/pl-PL.rc
@@ -47,7 +47,7 @@ CAPTION "Błędy grupowania linii"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "Jedna lub więcej dodatkowych linii nie została połączona. ", 1033, 37, 8, 216, 20
+    LTEXT "Jedna lub więcej dodatkowych linii nie została połączona.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "&Nie używaj tej/tych linii w przyszłości", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "&Akceptuj", 1, 135, 242, 60, 14
@@ -492,7 +492,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Oddzwanianie"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Niektóre serwery oferują możliwość oddzwonienia do ciebie, w celu redukcji twoich opłat za połączenie. Określ czy chcesz skorzystać z Oddzwaniania.  (Oddzwanianie nie działa w przypadku połączeń z Wirtualnymi Sieciami Prywatnymi (VPN).)", 1043, 8, 4, 219, 43
+    LTEXT "Niektóre serwery oferują możliwość oddzwonienia do ciebie, w celu redukcji twoich opłat za połączenie. Określ czy chcesz skorzystać z Oddzwaniania. (Oddzwanianie nie działa w przypadku połączeń z Wirtualnymi Sieciami Prywatnymi (VPN).)", 1043, 8, 4, 219, 43
     AUTORADIOBUTTON "&Bez Oddzwaniania", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "&Pytaj mnie podczas próby połączenia, gdy serwer oferuje odddzwanianie", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
     AUTORADIOBUTTON "&Oddzwanianie zawsze włączone, w przypadku połączeń z numerami z listy:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
@@ -711,7 +711,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kreator konfiguracji połaczenia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Wpisz numer telefoniczny poniżej. ", -1, 7, 4, 306, 14
+    LTEXT "Wpisz numer telefoniczny poniżej.", -1, 7, 4, 306, 14
     LTEXT "&Numer telefoniczny:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Prawdopodobnie będzie trzeba użyć cyfry ""1"", numeru kierunkowego, albo obydwu. Jeśli nie jesteś pewien, wypróbuj żądany numer na swoim telefonie. Jeśli usłyszysz sygnał modemu, numer jest poprawny.", -1, 20, 50, 291, 53
@@ -1765,7 +1765,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Wybierz użytkowników, którym chcesz zezwolić na łączenie się z tym komputerem.  Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
+    LTEXT "Wybierz użytkowników, którym chcesz zezwolić na łączenie się z tym komputerem. Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27
     LTEXT "&Użytkownicy, którzy mogą się połączyć:", -1, 10, 28, 275, 8
     CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
     PUSHBUTTON "&Dodaj", 7044, 10, 122, 65, 14, WS_GROUP
@@ -1857,7 +1857,7 @@ BEGIN
     206 "Czy rozłączyć z %1?\0"
     207 "Plik o nazwie %1 już istnieje. Czy chcesz go nadpisać?\0"
     208 "W skrypcie znajdują się błędy składni. Czy chcesz przejrzeć komunikaty o błędach?\0"
-    209 "'%1' jest teraz połączony.  \0"
+    209 "'%1' jest teraz połączony.\0"
     210 "Naciśnij prawy przycisk myszki na Monitorze Sieci Dial-Up w zasobniku systemowym, aby rozłączyć się lub sprawdzić stan twojego połączenia.\0"
     212 "Połączenie udane.\0"
     213 "Wybrana metoda uwierzytelniania własnego musi zostać uaktywniona we Właściwościach.\0"
@@ -1865,7 +1865,7 @@ BEGIN
     215 "Skrót połączenia Dial-up(*.rnk)\0"
     216 "*.rnk\0"
     217 "Utwórz skrót połączenia Dial-Up\0"
-    218 "Połączenie z %1 nieudane.  Ponowne połączenie w toku...\0"
+    218 "Połączenie z %1 nieudane. Ponowne połączenie w toku...\0"
     219 "Nie można uzyskać informacji o ramkach.\0"
     220 "Nie można uzyskać informacji o portach.\0"
     221 "Nie można uzyskać informacji o projekcji.\0"
@@ -2296,37 +2296,37 @@ BEGIN
     7321 "Musisz wprowadzić nazwę logowania nowego użytkownika albo nacisnąć Anuluj.\0"
     7322 "Wprowadzone hasło jest zbyt krótkie.\0"
     7323 "Oba wprowadzone hasła nie są identyczne. Proszę je poprawić.\0"
-    7324 "Wystąpił błąd wewnętrzny.  \0"
+    7324 "Wystąpił błąd wewnętrzny.\0"
     7325 "Widok listy\0"
-    7326 "Wystąpił błąd podczas przesyłania wprowadzonych zmian do bazy danych użytkownika lokalnego.  \0"
-    7327 "Nie masz dostatecznych przywilejów by dodać użytkownika do lokalnej systemowej bazy danych.  \0"
+    7326 "Wystąpił błąd podczas przesyłania wprowadzonych zmian do bazy danych użytkownika lokalnego.\0"
+    7327 "Nie masz dostatecznych przywilejów by dodać użytkownika do lokalnej systemowej bazy danych.\0"
     7328 "Użytkownik, którego chcesz stworzyć, już istnieje w lokalnej bazie danych użytkowników.\0"
     7329 "Użytkownik nie został dodany do lokalnej bazy danych użytkowników, dlatego, że jego hasło zostało odrzucone.\0"
     7330 "Nie można przeładować systemowej bazy danych użytkowników z powodu błędu wewnętrznego.\0"
-    7331 "Wystąpił błąd wewnętrzny:  Handle lokalnej bazy danych użytkowników jest uszkodzony.\0"
+    7331 "Wystąpił błąd wewnętrzny: Handle lokalnej bazy danych użytkowników jest uszkodzony.\0"
     7332 "Nie można załadować zasobów potrzebnych do wyświetlenia zakładki Użytkownicy.\0"
-    7333 "Wystąpił błąd wewnęytrzny podczas odwracania zmian, uczynionych w lokalnej bazie danych użytkowników.  \0"
+    7333 "Wystąpił błąd wewnęytrzny podczas odwracania zmian, uczynionych w lokalnej bazie danych użytkowników.\0"
     7334 "Dojście do bazy danych urządzeniach jest uszkodzone.\0"
     7335 "Nie udało się załadować zasobów, niezbędnych do wyświetlenia zakładki Ogólne.\0"
-    7336 "Wystąpił błąd podczas zapisywania zmian jakie dokonane zostały w Urządzeniach/VPN.  \0"
+    7336 "Wystąpił błąd podczas zapisywania zmian jakie dokonane zostały w Urządzeniach/VPN.\0"
     7337 "Wystąpił błąd wewnętrzny.\0"
     7338 "Wystąpił błąd wewnętrzny: dojście do bazy danych komponentów sieci jest uszkodzone.\0"
-    7339 "Wystąpił błąd wewnętrzny.  \0"
+    7339 "Wystąpił błąd wewnętrzny.\0"
     7340 "Wystąpił błąd pocdczas zapisywania zmian, uczynionych w komponentach sieci.\0"
     7341 "Wystąpił błąd wewnętrzny.\0"
-    7342 "Nie można zapisać zmian dokonanych w protokole TCP/IP.  \0"
-    7343 "Nie można zapisać zmian dokonanych w protokole IPX.  \0"
+    7342 "Nie można zapisać zmian dokonanych w protokole TCP/IP.\0"
+    7343 "Nie można zapisać zmian dokonanych w protokole IPX.\0"
     7344 "Nie można wyświetlić właściwości protokołu TCP/IP.\0"
     7345 "Nie można wyświetlić właściwości protokołu IPX.\0"
-    7346 "Nie można załadować właściwości TCP/IP z systemu.  \0"
-    7347 "Nie można załadować właściwości protokołu IPX z systemu.  \0"
+    7346 "Nie można załadować właściwości TCP/IP z systemu.\0"
+    7347 "Nie można załadować właściwości protokołu IPX z systemu.\0"
     7348 "Usługa płączenia przychodzące jest zależna od usługi Routing i dostęp zdalny, której nie można uruchomić. Więcej informacji znajdziesz w logach Zdarzeń Systemowych.\0"
     7349 "Nie można zezwolić na edycję komponentów sieci w danej chwili, gdyż właśnie są modyfikowane przez kogoś innego.\0"
-    7350 "Nowo wprowadzony użytkownik nie został dodany do lokalnej bazy danych użytkowników dlatego, że jego nazwa albo hasło nie było zgodne z wymaganiami systemu (było zbyt duże, za małe, albo źle sformułowane).  \0"
-    7351 "System nie może usunąć wybranego użytkownika.  \0"
+    7350 "Nowo wprowadzony użytkownik nie został dodany do lokalnej bazy danych użytkowników dlatego, że jego nazwa albo hasło nie było zgodne z wymaganiami systemu (było zbyt duże, za małe, albo źle sformułowane).\0"
+    7351 "System nie może usunąć wybranego użytkownika.\0"
     7352 "Nie można usunąć wybranego komponentu sieci, ponieważ jest on obecnie używany.\0"
     7353 "Ostrzeżenie o połączeniu przychodzącym\0"
-    7354 "Każdy skasowany użytkownik zostanie trwale usunięty z systemu, nawet jeśli naciśniesz później Anuluj. Czy na pewno chcesz trwale usunąć %s? \0"
+    7354 "Każdy skasowany użytkownik zostanie trwale usunięty z systemu, nawet jeśli naciśniesz później Anuluj. Czy na pewno chcesz trwale usunąć %s?\0"
     7355 "Masz zamiar się przełączyć na konsolę zarządzania systemem. Te okno właściwości Połączeń przychodzących zostanie zamknięte a wszystkie dokonane zmiany - zapisane w systemie. Czy kontynuować?\0"
     7356 "Twoja Maska Podsieci uległa zmianie. Po bicie zerowym w Masce mogą nastąpić wyłącznie bity zerowe. Na przykład, Maska, wyrażona w zapisie dziesiętnym jako 255.255.0.0, jest prawidłowa, ale 255.0.255.0 już nie.\n\0"
     7357 "Uprawnienia Użytkowników\0"
@@ -2349,7 +2349,7 @@ BEGIN
     7377 "Którego urządzenia chcesz użyć w tym połączeniu?\0"
     7378 "Nie ma obecnie żadnych urządzeń zainstalowanych, które byłyby w stanie przyjąć połączenia przychodzące.\0"
     7379 "Ostrzeżenie o nowym połączeniu przychodzącym\0"
-    7380 "Ponieważ ten Serwer Win 2000 należy do, albo kontroluje domenę, musisz użyć konsoli Routingu i Dostępu Zdalnego by skonfigurować tę maszynę tak by akceptowała połączenia przychodzące.  Anulować zmiany i włączyć tę konsolę?\n\0"
+    7380 "Ponieważ ten Serwer Win 2000 należy do, albo kontroluje domenę, musisz użyć konsoli Routingu i Dostępu Zdalnego by skonfigurować tę maszynę tak by akceptowała połączenia przychodzące. Anulować zmiany i włączyć tę konsolę?\n\0"
     7381 "Przydziel &numer adresu automagicznie\0"
     7382 "Przydziel n&umer adresu automagicznie\0"
     7383 "Połączenia przychodzące nie mogą używać adresów IPX o numerach 00000000 lub FFFFFFFF. Proszę zmienić przydzielone numery adresów albo ustawić automagiczne przydzielanie numerów.\0"
diff --git a/dll/win32/rasdlg/lang/ro-RO.rc b/dll/win32/rasdlg/lang/ro-RO.rc
index 2b38e2bd382..822056a2d2a 100644
--- a/dll/win32/rasdlg/lang/ro-RO.rc
+++ b/dll/win32/rasdlg/lang/ro-RO.rc
@@ -68,7 +68,7 @@ BEGIN
     COMBOBOX 1034, 63, 62, 181, 42, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP
     PUSHBUTTON "P&roprietăți", 1035, 184, 77, 60, 14
     AUTORADIOBUTTON "P&ermite aceste protocoale", 1545, 17, 92, 224, 10
-    AUTOCHECKBOX "&Parolă necriptată  (PAP)", 1491, 28, 105, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
+    AUTOCHECKBOX "&Parolă necriptată (PAP)", 1491, 28, 105, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTOCHECKBOX "Protocolul S&hiva de Autentificare a Parolei (SPAP)", 1496, 28, 119, 214, 10, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "Protocolul de &Autentificare Challenge Handshake (CHAP)", 1494, 28, 133, 215, 10, BS_TOP | BS_MULTILINE
     AUTOCHECKBOX "&MS CHAP (MS-CHAP)", 1493, 28, 148, 212, 10, BS_TOP | BS_MULTILINE
@@ -711,7 +711,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Creare conexiune nouă"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Introduceți mai jos numărul de telefon. ", -1, 7, 4, 306, 14
+    LTEXT "Introduceți mai jos numărul de telefon.", -1, 7, 4, 306, 14
     LTEXT "N&umărul de telefon:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Aici poate fi necesară introducerea unui prefix sau cod de regiune. Dacă nu aveți certitudinea necesității unui prefix, apelați numărul de la telefonul dumneavoastră. Dacă auziți un sunet de modem, atunci numărul apelat este corect.", -1, 20, 50, 291, 53
@@ -964,7 +964,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Retroapelare pentru server de redirecționare"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "La apelarea unui server de redirecționare, vă poate fi oferit un apel de răspuns pentru a vă reduce costurile de telefonie sau pentru a spori securitatea.  Specificați dacă acceptați sau nu acest lucru.", 1043, 7, 5, 253, 24
+    LTEXT "La apelarea unui server de redirecționare, vă poate fi oferit un apel de răspuns pentru a vă reduce costurile de telefonie sau pentru a spori securitatea. Specificați dacă acceptați sau nu acest lucru.", 1043, 7, 5, 253, 24
     AUTORADIOBUTTON "N&u doresc retroapel", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "Doresc &retroapelare la aceste numere:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
     CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
@@ -1076,7 +1076,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Puteți configura această conexiune pentru utilizarea unui smart card în autentificarea la rețea.  Specificați dacă doriți utilizarea de smart card pentru această conexiune.", -1, 10, 5, 303, 22
+    LTEXT "Puteți configura această conexiune pentru utilizarea unui smart card în autentificarea la rețea. Specificați dacă doriți utilizarea de smart card pentru această conexiune.", -1, 10, 5, 303, 22
     AUTORADIOBUTTON "&Utilizează smart card", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "Fă&ră smart card", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1855,7 +1855,7 @@ BEGIN
     204 "Eliminați acest(e) dispozitiv(e) din listă?\0"
     205 "Eliminați %1 din agendă?\0"
     206 "Doriți deconectarea de la %1?\0"
-    207 "Deja există un fișier numit %1.  Suprascrieți?\0"
+    207 "Deja există un fișier numit %1. Suprascrieți?\0"
     208 "Au fost depistate erori de sintaxă în script. Doriți un raport al erorilor?\0"
     209 "Conectarea la '%1' a fost realizată.\0"
     210 "Pentru a închide sau a verifica starea conexiunii, faceți clic pe Monitorul de rețea al liniei comutate din bara de activități.\0"
@@ -1865,7 +1865,7 @@ BEGIN
     215 "Fișiere scurtătură de linie comutată (*.rnk)\0"
     216 "*.rnk\0"
     217 "Crearea scurtăturii de linie comutată\0"
-    218 "Legătura la %1 a căzut.  În curs de reconectare…\0"
+    218 "Legătura la %1 a căzut. În curs de reconectare…\0"
     219 "Informațiile de încadrare nu poat fi obținute.\0"
     220 "Informațiile despre porturi nu pot fi obținute.\0"
     221 "Informațiile de proiectare nu pot fi obținute.\0"
@@ -1883,7 +1883,7 @@ BEGIN
     233 "Server de redirecționare\0"
     234 "Modem sau dispozitiv\0"
     235 "Introduceți un nume pentru contul din serverului de redirecționare al acestei interfețe.\0"
-    236 "Există deja o înregistrare %1.  Alegeți un alt nume.\0"
+    236 "Există deja o înregistrare %1. Alegeți un alt nume.\0"
     237 "Puteți permite trimiterea parolei fără criptare.\0"
     238 "Criptarea parolei\0"
     239 "Expertul este pregătit pentru crearea conexiunii.\0"
@@ -1892,7 +1892,7 @@ BEGIN
     242 "Retroapel la\0"
     243 "Editează numărul alternativ de telefon\0"
     244 "Deoarece această conexiune este activă în prezent, unele setări nu vor intra în vigoare decât data viitoare când îl formați.\0"
-    245 "Nu există conexiuni disponibile pentru toți utilizatorii.  Înainte de apelare este necesar să vă autentificați.\0"
+    245 "Nu există conexiuni disponibile pentru toți utilizatorii. Înainte de apelare este necesar să vă autentificați.\0"
     246 "Agenda de telefoane este goală.\n\nApăsați Închide și adăugați o înregistrare.\0"
     247 "Din cauza restricțiilor de importare/exportare, criptarea datelor nu este disponibilă în această versiune ReactOS.\0"
     248 "Introduceți o adresă X.25 în următoarea pagină.\0"
@@ -1961,7 +1961,7 @@ BEGIN
     311 "(nespecificat)\0"
     312 "În listă deja există „%1”.\0"
     313 "Securizează parola și datele\0"
-    314 "Protocolul %1 nu poate fi selectat, deoarece fie nu este instalat, fie este dezactivat pentru accesul la distanță.  Pentru a activa, mergeți în Panoul de control, deschideți Rețea, apoi în pagina Servicii, alegeți Proprietăți pentru accesul în rețea și apăsați butonul Rețea.\0"
+    314 "Protocolul %1 nu poate fi selectat, deoarece fie nu este instalat, fie este dezactivat pentru accesul la distanță. Pentru a activa, mergeți în Panoul de control, deschideți Rețea, apoi în pagina Servicii, alegeți Proprietăți pentru accesul în rețea și apăsați butonul Rețea.\0"
     315 "Parola nu poate fi salvată.\0"
     316 "Datele nu pot fi afișate.\0"
     317 "Informațiile de autoapelare nu au putut fi preluate.\0"
@@ -2019,7 +2019,7 @@ BEGIN
     369 "Setări ale protocolului Punct-la-Punct de folosit atunci când %1 inițiază un apel pentru conexiune către interfața %2:\0"
     370 "[Pentru a modifica parola salvată, apăsați aici]\0"
     405 "Protocolul NetBEUI este necesar pentru a apela vechile servere RAS.\0"
-    406 "Înainte de a apela un server RAS, este necesară instalarea protocolului NetBEUI.  NetBEUI poate fi instalat în Panoul de control, la Rețea.\0"
+    406 "Înainte de a apela un server RAS, este necesară instalarea protocolului NetBEUI. NetBEUI poate fi instalat în Panoul de control, la Rețea.\0"
     407 "&Reapelează\0"
     408 "Ați ales să dezactivați unul sau mai multe transporturi. Aceasta solicită managerilor și protocoalelor de redirecționare să elimine transporturile dezactivate din această interfață de apel la cerere.\nApăsați Da dacă doriți să continuați, sau No dacă preferați reactivarea transporturilor.\0"
     409 "Partajarea conexiunii de Internet\0"
@@ -2076,7 +2076,7 @@ BEGIN
     460 "Trebuie să selectați cel puțin un modem sau adaptor.\0"
     461 "Număr de telefon\0"
     462 "Pentru a apela servere SLIP este necesar protocolul TCP/IP.\0"
-    463 "Înainte de a apela servere SLIP este necesară instalarea protocolului TCP/IP.  TCP/IP poate fi instalat în Panoul de control, la Rețea.\0"
+    463 "Înainte de a apela servere SLIP este necesară instalarea protocolului TCP/IP. TCP/IP poate fi instalat în Panoul de control, la Rețea.\0"
     464 "Stare\0"
     465 "Sufix n&ou:\0"
     466 "Sufi&xuri:\0"
@@ -2124,7 +2124,7 @@ BEGIN
     508 "Gazdă sau oaspete?\0"
     509 "Partajarea conexiunii de Internet este momentan activată pentru conexiunea „%1”.\n\nÎn cele ce urmează va fi activată pentru conexiunea „%2”.\0"
     510 "La conectarea a două calculatoare, unul va trebui identificat fie ca gazdă, fie ca oaspete.\0"
-    511 "Când veți activa partajarea conexiunii de Internet, adaptorul de rețea va fi configurat să utilizeze adresa 192.168.0.1. Calculatorul poate pierde legătura cu celelalte calculatoare din rețea. Dacă acele calculatoare au adrese IP statice, vor trebui reconfigurate pentru a obține adresă IP dinamică.  Sigur doriți activarea partajării conexiunii de Internet?\0"
+    511 "Când veți activa partajarea conexiunii de Internet, adaptorul de rețea va fi configurat să utilizeze adresa 192.168.0.1. Calculatorul poate pierde legătura cu celelalte calculatoare din rețea. Dacă acele calculatoare au adrese IP statice, vor trebui reconfigurate pentru a obține adresă IP dinamică. Sigur doriți activarea partajării conexiunii de Internet?\0"
     512 "Alegeți un dispozitiv\0"
     513 "Acest dispozitiv va fi utilizat pentru stabilirea conexiunii.\0"
     514 "&Conectează\0"
@@ -2143,8 +2143,8 @@ BEGIN
     527 "Tipul conexiunii\0"
     528 "hh.exe netcfg.chm::/trouble_all.htm\0"
     529 "Conexiune virtuală privată\0"
-    530 "Utilizează orice formă solicitată de autentificare, inclusiv fără criptare.  Fără criptarea datelor.\0"
-    531 "Utilizează orice formă de autentificare care necesită criptarea parolei.  Fără criptarea datelor.\0"
+    530 "Utilizează orice formă solicitată de autentificare, inclusiv fără criptare. Fără criptarea datelor.\0"
+    531 "Utilizează orice formă de autentificare care necesită criptarea parolei. Fără criptarea datelor.\0"
     532 "Dați un nume înregistrării.\0"
     533 "Criptază parolele și datele.\0"
     534 "Introduceți un număr de port între 1 și 65535.\0"
@@ -2213,17 +2213,17 @@ BEGIN
     1567 " (criptare activată)\0"
     1568 "Informații ale contului de Internet\0"
     1569 "Vor fi necesare un nume de cont și o parolă pentru autentificarea la contul de Internet.\0"
-    1570 "Pachetul EAP selectat nu oferă chei de criptare.  Alegeți un pachet EAP care oferă chei sau optați pentru necriptare.\0"
+    1570 "Pachetul EAP selectat nu oferă chei de criptare. Alegeți un pachet EAP care oferă chei sau optați pentru necriptare.\0"
     1571 "Opțiunea curentă de criptare cere EAP sau o careva versiune de autentificare securizată MS-CHAP.\0"
     1572 "Protocoale și securitate\0"
     1573 "Alegeți transporturi și opțiuni de securitate pentru conexiune.\0"
     1574 "Protocoalele selectate includ PAP, SPAP și/sau CHAP. Dacă unul dintre acestea este negociat, criptarea datelor nu va avea loc. Doriți să păstrați aceste setări?\0"
-    1575 "Pentru conectarea la „%1”, este necesară mai întâi conectarea la „%2”.  Doriți conectarea la „%2”?\0"
+    1575 "Pentru conectarea la „%1”, este necesară mai întâi conectarea la „%2”. Doriți conectarea la „%2”?\0"
     1576 "Conectarea prin cablu paralel…\0"
     1577 "Conectarea prin infraroșu…\0"
     1578 "Cablul paralel este conectat.\0"
     1579 "Infraroșu este conectat.\0"
-    1580 "Această conexiune a fost configurată cu un nivel de securitate nesusținut de infrastructura programelor instalate.  Opțiunile de securitate ale acestei conexiuni au fost ajustate la nivelul de securitate disponibil.\0"
+    1580 "Această conexiune a fost configurată cu un nivel de securitate nesusținut de infrastructura programelor instalate. Opțiunile de securitate ale acestei conexiuni au fost ajustate la nivelul de securitate disponibil.\0"
     1581 "Tip&ul de VPN:\0"
     1582 "Introduceți un nume de utilizator.\0"
     1583 "Aceste date de autentificare sunt salvate pentru propria dumneavoastră utilizare. Totuși deja există un nume de utilizator disponibil pentru toți utilizatorii acestei conexiuni. Doriți înlăturarea datelor de autentificare disponibile pentru toți ceilalți utilizatori?\0"
@@ -2270,7 +2270,7 @@ BEGIN
     1672 "Când acest calculator va suprima o transmisie incompletă de date din cauză că întreaga transmisie depășea timpul permis, expeditorului i se va răspunde cu mesajul „timp expirat”.\0"
     1673 "Datele transmise de pe acest calculator vor fi redirecționate în caz că traseul cunoscut va suferi modificări.\0"
     1675 "Valoarea introdusă pentru dimensiunea fișierului jurnal nu este validă. Introduceți o valoare între 1 și 32767 k.\0"
-    1685 "Contul dumneavoastră de utilizator nu deține permisiunea de a utiliza această conexiune.  De obicei, acest lucru se întâmplă deoarece sunteți autentificat ca Oaspete.\0"
+    1685 "Contul dumneavoastră de utilizator nu deține permisiunea de a utiliza această conexiune. De obicei, acest lucru se întâmplă deoarece sunteți autentificat ca Oaspete.\0"
     1686 "Introduceți un nume și parolă de cont. (Dacă ați uitat un nume sau o parolă existentă, contactați-vă administratorul de rețea.)\0"
     1687 "N&umele calculatorului\0"
     1688 "N&umele ISP\0"
@@ -2320,13 +2320,13 @@ BEGIN
     7345 "Proprietățile IPX nu au putut fi afișate.\0"
     7346 "Proprietățile TCP/IP nu au putut fi încărcate din sistem.\0"
     7347 "Proprietățile IPX nu au putut fi încărcate din sistem.\0"
-    7348 "Conexiunile de intrare depind de serviciul de Redirecționare și acces în rețea, care nu a putut fi pornit.  Pentru informații adăugătoare, consultați jurnalul de evenimente al sistemului.\0"
+    7348 "Conexiunile de intrare depind de serviciul de Redirecționare și acces în rețea, care nu a putut fi pornit. Pentru informații adăugătoare, consultați jurnalul de evenimente al sistemului.\0"
     7349 "Modificarea componentelor de rețea nu este permisă la moment, deoarece sunt în curs de modificare altundeva.\0"
     7350 "Noul utilizator introdus nu a fost adăugat la baza de date locală deoarece numele sau parola introdusă încalcă o politică a sistemului (este fie prea mare, fie prea mică, fie prost formată).\0"
     7351 "Sistemul nu poate șterge utilizatorul cerut.\0"
     7352 "Componenta selectată de rețea nu poate fi eliminată, deoarece încă este în uz.\0"
     7353 "Avertisment al conexiunilor de intrare\0"
-    7354 "Un utilizator șters va fi eliminat definitiv din sistem, chiar dacă va fi apăsat Anulează. Sigur doriți eliminarea irevocabilă a utilizatorului %s? \0"
+    7354 "Un utilizator șters va fi eliminat definitiv din sistem, chiar dacă va fi apăsat Anulează. Sigur doriți eliminarea irevocabilă a utilizatorului %s?\0"
     7355 "Sunteți pe cale să treceți la o consolă de gestionare a sistemului. Această foaie de proprietăți Conexiuni primite va fi închisă și orice modificări pe care le-ați făcut vor fi trimise în sistem. Sunteți de acord să continuați?\0"
     7356 "Valoarea măștii de rețea s-a schimbat. În mască, un bit de zero poate fi urmat doar de alți biți de zero. De exemplu, pentru Masca de Rețea, în notația cu punct, valoarea 255.255.0.0 este validă, pe când 255.0.255.0 nu este.\n\0"
     7357 "Permisiuni de utilizator\0"
@@ -2357,10 +2357,10 @@ BEGIN
     7385 "Portul de conexiune (%s)\0"
     7386 "Conexiunile de rețea nu pot reprezenta unele opțiuni specializate ale conexiunilor de intrare care au fost stabilite utilizând Managerul utilizatorului local sau consola Politici de acces în rețea. Pentru a completa sau corecta informații ale conexiunilor de intrare, va trebui să utilizați acele console.\0"
     7387 "Opțiunea de retroapelare a utilizatorului necesită introducerea unui număr valid de retroapelare.\0"
-    7388 "ReactOS trebuie să se repornească pentru a completa această acțiune.  Permiteți această repornire acum?\0"
+    7388 "ReactOS trebuie să se repornească pentru a completa această acțiune. Permiteți această repornire acum?\0"
     7389 "Dispozitivul ales nu are disponibile opțiuni de configurare.\0"
     7390 "Domeniu nevalid\0"
-    7391 "Ați cerut ca „%1” să fie dezactivat pentru conexiunile de intrare. Pentru a dezactiva aceasta, e necesară oprirea serviciului Server.  Odată oprit, nici un director partajat sau imprimantă din acest calculator nu vor mai fi disponibile altor calculatoare. Doriți scoaterea unei console sistem care va permite oprirea serviciului Server?\r\n\nÎn Managerea calculatorului, apăsați pe Instrumente de sistem, apoi apăsați pe Servicii. În panoul din dreapta, clic dreapta pe Server, apoi alegeți oprirea lui.\0"
+    7391 "Ați cerut ca „%1” să fie dezactivat pentru conexiunile de intrare. Pentru a dezactiva aceasta, e necesară oprirea serviciului Server. Odată oprit, nici un director partajat sau imprimantă din acest calculator nu vor mai fi disponibile altor calculatoare. Doriți scoaterea unei console sistem care va permite oprirea serviciului Server?\r\n\nÎn Managerea calculatorului, apăsați pe Instrumente de sistem, apoi apăsați pe Servicii. În panoul din dreapta, clic dreapta pe Server, apoi alegeți oprirea lui.\0"
     7392 "Acest port serial nu este activat pentru utilizarea într-o conexiune directă cu un alt calculator. Acest expert îl va activa. Îi veți putea configura după asta viteza portului și alte proprietăți prin executarea unui clic-dreapta pe pictograma conexiunii, apoi alegând Proprietăți.\n\0"
     7393 "Conexiuni de intrare\0"
     7394 "Fondul de adrese IP introdus este nevalid.\0"
@@ -2368,7 +2368,7 @@ BEGIN
     7396 "Valoarea de început a fondului de adrese TCP/IP nu este validă. Trebuie să se încadreze între 1.0.0.0 și 224.0.0.0 și trebuie să excludă forma 127.x.x.x.\0"
     7397 "Fondul de adrese TCP/IP introdus este nevalid, deoarece adresa este mai bine definită decât masca.\0"
     7398 "Adresa de început trebuie să fie mai mică decât adresa de sfârșit.\0"
-    7399 "Serviciul de redirecționare și acces în rețea este în procesul de oprire.  Până nu se oprește (de tot), opțiunea Conexiuni de intrare nu va fi disponibilă. Așteptați câteva momente, apoi încercați din nou.\0"
+    7399 "Serviciul de redirecționare și acces în rețea este în procesul de oprire. Până nu se oprește (de tot), opțiunea Conexiuni de intrare nu va fi disponibilă. Așteptați câteva momente, apoi încercați din nou.\0"
     7400 "%s (%s)\0"
     7401 "%s (%d canale)\0"
     7402 "Conexiuni de intrare VPN (PPTP)\0"
diff --git a/dll/win32/rasdlg/lang/ru-RU.rc b/dll/win32/rasdlg/lang/ru-RU.rc
index 585ead1191a..a0e8691d000 100644
--- a/dll/win32/rasdlg/lang/ru-RU.rc
+++ b/dll/win32/rasdlg/lang/ru-RU.rc
@@ -39,7 +39,7 @@ CAPTION "Ошибки группы линий"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "Некоторые из дополнительных линий не подключены. ", 1033, 37, 8, 216, 20
+    LTEXT "Некоторые из дополнительных линий не подключены.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "Н&е использовать отказавшие линии", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "&Принять", 1, 135, 242, 60, 14
@@ -703,7 +703,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Мастер новых подключений"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Введите номер телефона. ", -1, 7, 4, 306, 14
+    LTEXT "Введите номер телефона.", -1, 7, 4, 306, 14
     LTEXT "Номер &телефона:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Возможно потребуется добавить ""1"", код региона или оба числа вместе. Для проверки наберите комбинацию номера и кода на своем телефоне. Комбинация подобрана правильно, если слышен звук модема.", -1, 20, 50, 291, 53
@@ -1068,7 +1068,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Вы можете настроить это подключение для использования смарт-карты для входа в удаленную сеть.  Укажите, следует ли использовать смарт-карту для этого подключения.", -1, 10, 5, 303, 27
+    LTEXT "Вы можете настроить это подключение для использования смарт-карты для входа в удаленную сеть. Укажите, следует ли использовать смарт-карту для этого подключения.", -1, 10, 5, 303, 27
     AUTORADIOBUTTON "&Использовать мою смарт-карту ", 1524, 26, 36, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "&Не использовать мою смарт-карту ", 1525, 26, 52, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1485,7 +1485,7 @@ END
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Введите имя узла или IP-адрес компьютера, к  которому осуществляется подключение.", -1, 10, 6, 275, 16
+    LTEXT "Введите имя узла или IP-адрес компьютера, к которому осуществляется подключение.", -1, 10, 6, 275, 16
     LTEXT "&Имя компьютера или IP-адрес (например, reactos.org или 145.52.0.1):", -1, 21, 28, 277, 11
     EDITTEXT 1433, 21, 42, 275, 14, ES_AUTOHSCROLL
 END
@@ -1847,9 +1847,9 @@ BEGIN
     204 "Удалить выбранные устройства из этого списка?"
     205 "Удалить %1 из телефонной книги?"
     206 "Отключиться от %1?"
-    207 "Файл ""%1"" уже существует.  Перезаписать этот файл?"
+    207 "Файл ""%1"" уже существует. Перезаписать этот файл?"
     208 "В сценарии обнаружены синтаксические ошибки. Вывести на экран журнал ошибок?"
-    209 "Установлено соединение с %1.  "
+    209 "Установлено соединение с %1."
     210 "Сделайте правый щелчок по значку ""Монитора удаленного доступа"" для завершения связи или проверки состояния текущего подключения."
     212 "Успешное подключение."
     213 "Выбранный специальный метод проверки должен быть инициализирован, нажмите кнопку ""Свойства""."
@@ -1987,7 +1987,7 @@ BEGIN
     345 "Права на запись в реестр"
     346 "Не удалось записать файл ярлыка."
     347 "ОК"
-    348 "Укажите телефонный  ISP номер."
+    348 "Укажите телефонный ISP номер."
     349 "Введите телефонный номер"
     350 "Пароль и подтверждение пароля не совпадают."
     351 "Новый пароль и подтверждение нового пароля не совпадают."
@@ -2032,7 +2032,7 @@ BEGIN
     424 "Определение скорости связи..."
     425 "Проверка личных данных..."
     426 "Регистрация компьютера в сети..."
-    427 "Повторная проверка  подлинности..."
+    427 "Повторная проверка подлинности..."
     428 "Проверка имени и пароля..."
     429 "Проверка выполнена."
     430 "Подключение через %1..."
@@ -2114,7 +2114,7 @@ BEGIN
     506 "Общий доступ к подключению Интернета"
     507 "Можно предоставить доступ внешним ресурсам компьютерам в локальной сети с использованием этого подключения."
     508 "Ведомый или ведущий?"
-    509 "Был разрешен общий доступ к подключению Интернета для ""%1"".\n\nВместо этого будет разрешен  общий доступ для подключения Интернета ""%2""."
+    509 "Был разрешен общий доступ к подключению Интернета для ""%1"".\n\nВместо этого будет разрешен общий доступ для подключения Интернета ""%2""."
     510 "Чтобы подключить два компьютера, ваш компьютер должен быть либо ведомым, либо ведущим."
     511 "Когда общий доступ к подключению к Интернету будет разрешен, сетевой плате локальной сети будет назначен IP-адрес 192.168.0.1. При этом связь с компьютерами сети может быть потеряна. Если другие компьютеры используют статические IP-адреса, следует настроить их на использование динамических адресов. Разрешить общий доступ к подключению Интернета?"
     512 "Выберите устройство"
@@ -2210,7 +2210,7 @@ BEGIN
     1572 "Протоколы и безопасность"
     1573 "Выберите транспортные протоколы и параметры безопасности для этого подключения."
     1574 "Выбранные протоколы включают PAP, SPAP, и CHAP. Если будет произведено согласование одного из них, шифрование данных использоваться не будет. Использовать эти параметры?"
-    1575 "Для подключения '%1', требуется сначала подключиться к '%2'.  Произвести подключение к '%2' сейчас?"
+    1575 "Для подключения '%1', требуется сначала подключиться к '%2'. Произвести подключение к '%2' сейчас?"
     1576 "Подключение через параллельный кабель..."
     1577 "Подключение через ИК-связь..."
     1578 "Подключено через параллельный кабель."
@@ -2218,7 +2218,7 @@ BEGIN
     1580 "Это подключение было настроено на использование шифрования данных, не поддерживаемого установленным программным обеспечением. Параметры безопасности этого подключения будут изменены на использование наиболее сильного из поддерживаемых методов шифрования."
     1581 "Т&ип VPN:"
     1582 "Введите имя пользователя."
-    1583 "Это имя и пароль будут сохранены для вас. Уже существуют сохраненные имя и пароль для всех других пользователей этого подключения.  Удалить имя и пароль, сохраненные для всех других пользователей подключения?"
+    1583 "Это имя и пароль будут сохранены для вас. Уже существуют сохраненные имя и пароль для всех других пользователей этого подключения. Удалить имя и пароль, сохраненные для всех других пользователей подключения?"
     1584 "Например, можно ввести имя рабочего места или имя сервера, к которому будет выполняться подключение."
     1585 "Сведения об учетной записи"
     1586 "Элементы управления на этой странице свойств отключены, поскольку надо выполнить перезагрузку системы, прежде чем изменять параметры настройки."
@@ -2262,7 +2262,7 @@ BEGIN
     1672 "Когда этот компьютер прервет передачу неполного набора данных из-за того, что передача полного набора потребует время, превышающее допустимое, он ответит отправителю сообщением об ошибке ""время истекло"" (time expired)."
     1673 "Данные, отправленные с этого компьютера, будут отправлены по другому маршруту в соответствии с изменениями пути по умолчанию."
     1675 "Введено недопустимое значение размера файла журнала. Введите значение от 1 до 32767KB."
-    1685 "В вашей учетной записи отсутствует разрешение на использование этого подключения.  Обычно причиной этого является вход с учетной записью гостя (Guest)."
+    1685 "В вашей учетной записи отсутствует разрешение на использование этого подключения. Обычно причиной этого является вход с учетной записью гостя (Guest)."
     1686 "Введите имя учетной записи и пароль. (Если вы забыли имя существующей учетной записи или пароль, обратитесь к администратору сети.)"
     1687 "&Имя компьютера"
     1688 "Им&я поставщика услуг"
@@ -2293,7 +2293,7 @@ BEGIN
     7326 "Произошла ошибка при внесении изменений в локальную базу данных пользователей."
     7327 "У вас нет прав на добавление пользователей в локальную базу данных."
     7328 "Такой пользователь уже существует в локальной базе данных пользователей."
-    7329 "Введенный пароль отвергнут системой и пользователь не был добавлен в локальную базу. "
+    7329 "Введенный пароль отвергнут системой и пользователь не был добавлен в локальную базу."
     7330 "Не удалось перезагрузить локальную базу пользователей из-за внутренней ошибки."
     7331 "Произошла внутренняя ошибка: испорченный дескриптор локальной базы данных пользователей."
     7332 "Не удалось загрузить ресурсы, необходимые для отображения вкладки пользователей."
@@ -2318,7 +2318,7 @@ BEGIN
     7351 "Не удалось удалить указанного пользователя."
     7352 "Не удалось удалить указанный сетевой компонент, поскольку он используется в данный момент."
     7353 "Предупреждение входящих подключений"
-    7354 "Пользователи, которых вы удалите, будут удалены окончательно, даже если затем будет нажата кнопка ""Отмена"".  Подтверждаете окончательное удаление %s? "
+    7354 "Пользователи, которых вы удалите, будут удалены окончательно, даже если затем будет нажата кнопка ""Отмена"". Подтверждаете окончательное удаление %s?"
     7355 "Вы собираетесь переключиться на работу с системной консолью управления. Страница свойств входящих подключений будет закрыта и сделанные изменения вступят в силу. Подтверждаете продолжение?"
     7356 "Было изменено значение сетевой маски. За первым же нулевым битом маски могут следовать только нулевые биты. Например, значение сетевой маски, записанное в десятичной нотации как 255.255.0.0, допустимо, а 255.0.255.0 - нет.\n"
     7357 "Разрешения пользователей"
@@ -2344,7 +2344,7 @@ BEGIN
     7380 "Поскольку этот сервер принадлежит домену, необходимо использовать консоль ""Маршрутизация и удаленный доступ"" для настройки этого компьютера на прием входящих подключений. Отменить изменения и переключиться на эту консоль?\n"
     7381 "&Назначить номер сети автоматически"
     7382 "&Назначать номера сети автоматически"
-    7383 "Входящие подключения не могут использовать номера сетей IPX 00000000 или FFFFFFFF.  Либо измените назначенный номер сети, либо используйте автоматическое назначение номеров сетей."
+    7383 "Входящие подключения не могут использовать номера сетей IPX 00000000 или FFFFFFFF. Либо измените назначенный номер сети, либо используйте автоматическое назначение номеров сетей."
     7384 "на"
     7385 "Последовательный порт (%s)"
     7386 "В окне ""Сетевые подключения"" не отображаются некоторые параметры входящих подключений, установленные с использованием консолей диспетчера локальных пользователей или политики удаленного доступа. Для получения полных сведений о входящих подключениях необходимо воспользоваться этими консолями."
diff --git a/dll/win32/rasdlg/lang/sq-AL.rc b/dll/win32/rasdlg/lang/sq-AL.rc
index 2b349cabacb..2477d5a71de 100644
--- a/dll/win32/rasdlg/lang/sq-AL.rc
+++ b/dll/win32/rasdlg/lang/sq-AL.rc
@@ -1,5 +1,5 @@
 /* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
- * DATE OF TRANSLATION:  23-01-2014
+ * DATE OF TRANSLATION: 23-01-2014
 */
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
@@ -43,7 +43,7 @@ CAPTION "Gabimet bundling Linje"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "Një ose më shumë linja të tjera nuk e lidhën. ", 1033, 37, 8, 216, 20
+    LTEXT "Një ose më shumë linja të tjera nuk e lidhën.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "&Mos u përpjek me linja të dështuara në të ardhmen", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "&Prano", 1, 135, 242, 60, 14
@@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "ThirreMbrapa "
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ju keni 'Vendoset nga telefonuesi'  privilegjet e thirre mbrapa në server. Shtypni OK dhe serveri do t'ju thirrë mbrapa në numrin e mëposhtëm. Shtypni Anulo për të kaluar së thirruri mbrapa.", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "Ju keni 'Vendoset nga telefonuesi' privilegjet e thirre mbrapa në server. Shtypni OK dhe serveri do t'ju thirrë mbrapa në numrin e mëposhtëm. Shtypni Anulo për të kaluar së thirruri mbrapa.", 1066, 5, 5, 221, 39, SS_NOPREFIX
     LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP
     EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP
@@ -707,7 +707,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Magjistari Lidhjes T're"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Shkruaj numrin e telefonit poshtë. ", -1, 7, 4, 306, 14
+    LTEXT "Shkruaj numrin e telefonit poshtë.", -1, 7, 4, 306, 14
     LTEXT "&Numri telefonit:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Ju mund të kenë nevojë për të përfshirë një ""1"" ose kodin e zonës, ose të dyja. Nëse ju nuk jeni të sigurt që ju duhen numra shtesë, thirrni numrin e telefonit në telefonin tuaj. Nëse ju dëgjoni një tingull modemi, numri i thirrur është e saktë.", -1, 20, 50, 291, 53
@@ -1851,9 +1851,9 @@ BEGIN
     204 "Hiq pajisjes e zgjedhura nga lista?\0"
     205 "Fshi %1 nga libri i numrave?\0"
     206 "Shkëput nga %1?\0"
-    207 "Një dokument me emrin %1 tashmë ekziston.  Mbi-shkruaje atë?\0"
+    207 "Një dokument me emrin %1 tashmë ekziston. Mbi-shkruaje atë?\0"
     208 "Gabime sintakse u gjendën në skripte. A doni të shihni shënimet e gabimit?\0"
-    209 "'%1' është i lidhur tani.  \0"
+    209 "'%1' është i lidhur tani.\0"
     210 "kliko-djathtas Monitorimin e Formuesit të Rrjetit në tabelën e punëve për ta mbyllur ose kontrolluar statusin e lidhjes suaj.\0"
     212 "Lidhja me sukses.\0"
     213 "Metoda vërtetimi e parazgjedhur duhet të niset duke shtypur Cilësime.\0"
@@ -1861,7 +1861,7 @@ BEGIN
     215 "Thirr ikona dokumenteve (*.rnk)\0"
     216 "*.rnk\0"
     217 "Krijo ikona thirrjes\0"
-    218 "Lidhja me %1 dështoi.  Rilidhja në pritje...\0"
+    218 "Lidhja me %1 dështoi. Rilidhja në pritje...\0"
     219 "Nuk mund të marrim informacion inkuadrim.\0"
     220 "Nuk mund të marrë informacione të portit.\0"
     221 "Nuk mund të marrë informacione në projektim.\0"
@@ -1879,7 +1879,7 @@ BEGIN
     233 "Router në distancë\0"
     234 "Modemi ose pajisje\0"
     235 "Ju lutem shkruani një emër përdoruesi për llogarinë e ndër-faqes në router'in e largët.\0"
-    236 "Një hyrje me emrin %1 tashmë ekziston.  Zgjidhni një emër tjetër.\0"
+    236 "Një hyrje me emrin %1 tashmë ekziston. Zgjidhni një emër tjetër.\0"
     237 "Ju mund të dëshironi të lejoni dërgimin e fjalëkalimin tuaj pa kryptim.\0"
     238 "Kryptimi Fjalëkalimit\0"
     239 "Magjistar është i gatshëm për të krijuar lidhjen tuaj.\0"
@@ -1888,7 +1888,7 @@ BEGIN
     242 "Më Thirr Mbrapa Tel\0"
     243 "Modifiko Alternativat e Numrave Telefonik\0"
     244 "Me që kjo lidhje është aktualisht aktive, disa konfigurime nuk do të hyjë në fuqi deri në herën tjetër që ju thirrni atë.\0"
-    245 "Nuk ka lidhje në dispozicion për të gjithë përdoruesit.  Ju duhet të futeni para se të thirrni.\0"
+    245 "Nuk ka lidhje në dispozicion për të gjithë përdoruesit. Ju duhet të futeni para se të thirrni.\0"
     246 "Libri Telefonit është bosh.\n\nShtypni OK për të shtuar një shënim.\0"
     247 "Për shkak të kufizimeve të import/eksportit, të dhënat e kryptimit nuk janë në dispozicion në këtë version të ReactOS.\0"
     248 "Ju lutem fusni një X.25 adresë në ekranin tjetër.\0"
@@ -1951,13 +1951,13 @@ BEGIN
     305 "Nuk ka LiberKontakti alternativ që është zgjedhur.\0"
     306 "Ajo pajisje nuk mund të konfigurohet dinamike.\0"
     307 "Hyrja nuk mund të fshihet sepse është e lidhur.\0"
-    308 "Nuk ka hyrje të zgjedhur.  Shtypni butonin e Ri për të krijuar një hyrje.\0"
+    308 "Nuk ka hyrje të zgjedhur. Shtypni butonin e Ri për të krijuar një hyrje.\0"
     309 "Një adresë IP jo-zero duhet furnizuar kur 'specifiko një adresë IP' është zgjedhur.\0"
     310 "Një X.25 Adresë kërkohet kur një X.25 rrjet thirrës apo X.25 pajisje është zgjedhur.\0"
     311 "(asnjë)\0"
     312 "'%1' është tashmë në listë.\0"
     313 "Siguro fjalëkalimin tim dhe të dhënat e mia\0"
-    314 "Protokolli %1 nuk mund të përzgjidhet sepse nuk është instaluar ose është i gjymtuar Akses në Distancë.  Për ndryshim, në Panelin e Kontrollit fillo Rrjetin, zgjidhni faqen Shebimëve, Cilësimet Aksesit në Distancë, dhe shtypni butonin Rrjeti.\0"
+    314 "Protokolli %1 nuk mund të përzgjidhet sepse nuk është instaluar ose është i gjymtuar Akses në Distancë. Për ndryshim, në Panelin e Kontrollit fillo Rrjetin, zgjidhni faqen Shebimëve, Cilësimet Aksesit në Distancë, dhe shtypni butonin Rrjeti.\0"
     315 "Nuk mund te ruaj fjalëkalimin.\0"
     316 "Nuk mund të shfaq data.\0"
     317 "Nuk mund të marrë informacion thirrje-automa.\0"
@@ -1971,9 +1971,9 @@ BEGIN
     325 "Nuk mund të vëzhgojë script.log me notepad.exe\0"
     326 "Nuk mund të modifikojë switch.inf me notepad.exe\0"
     327 "Nuk mund të ngarkojë informacionet TAPI.\0"
-    328 "Nuk mund të ngarkojë informacionet  X.25.\0"
+    328 "Nuk mund të ngarkojë informacionet X.25.\0"
     329 "Nuk mund të krijojë një LibërKontaktesh të ri.\0"
-    330 "Nuk mund të  mundësojë akses shpërndarës.\0"
+    330 "Nuk mund të mundësojë akses shpërndarës.\0"
     331 "Nuk mund të lidhet me hyrjen e LibritKontakteve.\0"
     332 "Nuk mund të marrë dërgo/merr buffer.\0"
     333 "Nuk mund të marrë status informacioni për një port.\0"
@@ -2101,7 +2101,7 @@ BEGIN
     489 "kurr\0"
     490 "Ju mund të bëni lidhje e re në dispozicion për çdo përdorues ose vetëm për veten tuaj.\0"
     491 "Disponueshmëria Lidhjes\0"
-    492 "Hedh cilësimet e shumta të linjës  për hyrjen?\0"
+    492 "Hedh cilësimet e shumta të linjës për hyrjen?\0"
     493 "Pajisja pa-disponueshëm\0"
     494 "Preferencat Hyrëse\0"
     495 "Preferencat Formo-numrin\0"
@@ -2140,12 +2140,12 @@ BEGIN
     528 "hh.exe netcfg.chm::/trouble_all.htm\0"
     529 "Lidhja Private Virtuale\0"
     530 "Përdorni çdo formë të vërtetimit të kërkuar përfshirë tekst të qartë. Mos kriptoni të dhëna të.\0"
-    531 "Përdorni çdo formë të vërtetimi që kërkon fjalëkalimet për të koduara.  Mos kriptoni të dhëna të.\0"
+    531 "Përdorni çdo formë të vërtetimi që kërkon fjalëkalimet për të koduara. Mos kriptoni të dhëna të.\0"
     532 "Ju lutem shkruani një emër për hyrjen.\0"
     533 "Krypto fjalëkalimin dhe të dhënat.\0"
     534 "Ju lutem shkruani një numër porti ndërmjet 1 dhe 65535.\0"
     535 "Specifikoni vërtetimin doganore e të dhënave kryptume me butonin Konfiguro.\0"
-    536 "Përdorni çdo formë vërtetimi që kërkon fjalëkalimet e kriptuara.  Mos kriptoni të dhëna.\0"
+    536 "Përdorni çdo formë vërtetimi që kërkon fjalëkalimet e kriptuara. Mos kriptoni të dhëna.\0"
     537 "Kripto fjalëkalimin dhe të dhënat.\0"
     538 "Specifikoni vertetimin parapërgjedhës dhe të dhënat e kriptimit me butonin Konfiguro.\0"
     539 "Numrin e portit është përdorur tashmë nga një tjetër hyrje.\nJu lutemi shkruani një numër unik portit.\0"
@@ -2292,37 +2292,37 @@ BEGIN
     7321 "Ju duhet të shkruani një emër Hyrës për përdoruesin e ri ose shtypni anuloj.\0"
     7322 "Fjalëkalimi që dhatë është shumë e shkurtër.\0"
     7323 "Fjalëkalimet e futura nuk janë të njëjta. Ju lutem ri-shkruani ato.\0"
-    7324 "Një gabim i brendshëm ka ndodhur.  \0"
+    7324 "Një gabim i brendshëm ka ndodhur.\0"
     7325 "Listo\0"
-    7326 "Një gabim ka ndodhur gjatë përpjekjes për të kryer ndryshimet që keni bërë në bazën e të dhënave lokale e përdoruesit.  \0"
-    7327 "Ju duhet privelegje të pamjaftueshme për të shtuar një përdorues që bazën e të dhënave të sistemit lokal.  \0"
+    7326 "Një gabim ka ndodhur gjatë përpjekjes për të kryer ndryshimet që keni bërë në bazën e të dhënave lokale e përdoruesit.\0"
+    7327 "Ju duhet privelegje të pamjaftueshme për të shtuar një përdorues që bazën e të dhënave të sistemit lokal.\0"
     7328 "Përdoruesin që ju jeni duke u përpjekur për të krijuar tashmë ekziston në bazën e të dhënave lokale e përdoruesit.\0"
     7329 "Shfrytëzuesi nuk është shtuar në bazën e të dhënave lokale përdoruesit, sepse fjalëkalimi që dhatë është refuzuar.\0"
     7330 "Në pamundësi për të rifreskuar bazën e të dhënave të përdoruesit të sistemit për shkak të një gabimi të brendshëm.\0"
     7331 "Një gabim i brendshëm ka ndodhur: Baza e të dhënave lokale të përdoruesve është e korruptuar.\0"
     7332 "Në pamundësi për të ngarkuar burime të nevojshme për të shfaqur tab'in e përdoruesit.\0"
-    7333 "Ndodhi një gabim i brendshëm gjatë përpjekjes për të rikthyer ndryshimet që keni bërë në bazën e të dhënave lokale e përdoruesit.  \0"
+    7333 "Ndodhi një gabim i brendshëm gjatë përpjekjes për të rikthyer ndryshimet që keni bërë në bazën e të dhënave lokale e përdoruesit.\0"
     7334 "Pajisja trajtimit së Bazës e të dhënave është i korruptuar.\0"
     7335 "Në pamundësi për të ngarkuar burimet e nevojshme për të shfaqur tab'in e përgjithshëm.\0"
-    7336 "Një gabim ka ndodhur gjatë përpjekjes për të kryer disa nga ndryshimet tek pajisjet/VPN të bëra.  \0"
+    7336 "Një gabim ka ndodhur gjatë përpjekjes për të kryer disa nga ndryshimet tek pajisjet/VPN të bëra.\0"
     7337 "Ndodhi një gabim i brendshëm.\0"
     7338 "Një gabim i brendshëm ndodhi: Baza e të dhënave Komponenti rrjeteve trajtuar është i korruptuar.\0"
-    7339 "Një gabim i brendshëm ka ndodhur.  \0"
+    7339 "Një gabim i brendshëm ka ndodhur.\0"
     7340 "Një gabim ka ndodhur gjatë përpjekjes për të kryer ndryshimet që keni bërë për të komponentëve të rrjetit.\0"
     7341 "Një gabim i brendshëm ka ndodhur.\0"
-    7342 "Në pamundësi për të kryer ndryshimet që keni bërë për të TCP/IP protokollit të sistemit.  \0"
-    7343 "Në pamundësi për të ruajtur ndryshimet që keni bërë për të protokollit IPX me sistemin.  \0"
+    7342 "Në pamundësi për të kryer ndryshimet që keni bërë për të TCP/IP protokollit të sistemit.\0"
+    7343 "Në pamundësi për të ruajtur ndryshimet që keni bërë për të protokollit IPX me sistemin.\0"
     7344 "Në pamundësi për të shfaqur TCP/IP cilësimet.\0"
     7345 "Në pamundësi për të shfaqur vetitë IPX.\0"
-    7346 "Në pamundësi për të ngarkuar TCP/IP cilësimet nga sistemi.  \0"
-    7347 "Në pamundësi për të ngarkuar cilësimet IPX nga sistemi.  \0"
+    7346 "Në pamundësi për të ngarkuar TCP/IP cilësimet nga sistemi.\0"
+    7347 "Në pamundësi për të ngarkuar cilësimet IPX nga sistemi.\0"
     7348 "Lidhjet në hyrje të varet nga Routime dhe Shërbimin Aksesit Largët i cili nuk ishte në gjendje për të filluar. Për më shumë informacion, shikoni shënimet e ngjarjes të sistemit.\0"
     7349 "Në pamundësi për të lejuar modifikimin e komponentëve të rrjetit në këtë kohë, sepse ata janë duke u modifikuar diku tjetër.\0"
-    7350 "Përdorues të ri që dhatë nuk është shtuar në bazën e të dhënave lokale të përdoruesve, sepse emri ose fjalëkalimi futur shkel politikën e sistemit (kjo ishte shumë e madhe, shumë e vogël, apo keq-formuar).  \0"
-    7351 "Sistemi nuk është në gjendje të fshi përdoruesit e kërkuar.  \0"
+    7350 "Përdorues të ri që dhatë nuk është shtuar në bazën e të dhënave lokale të përdoruesve, sepse emri ose fjalëkalimi futur shkel politikën e sistemit (kjo ishte shumë e madhe, shumë e vogël, apo keq-formuar).\0"
+    7351 "Sistemi nuk është në gjendje të fshi përdoruesit e kërkuar.\0"
     7352 "Në pamundësi për të hequr komponentin e zgjedhur të rrjetit për shkak se ajo është në përdorim.\0"
     7353 "Paralajmërim Lidhjet Hyrëse\0"
-    7354 "Çdo përdoruesit që ju fshini do të hiqet përgjithmonë nga sistemi edhe nëse anulo është shtypur. Jeni te sigurte qe doni ta hiqni përherë %s? \0"
+    7354 "Çdo përdoruesit që ju fshini do të hiqet përgjithmonë nga sistemi edhe nëse anulo është shtypur. Jeni te sigurte qe doni ta hiqni përherë %s?\0"
     7355 "Ju jeni gati për të kaluar në një sistem menaxhimi konsol. Kjo lidhje e cilësuar do të mbyllet dhe çdo ndryshim që mund të keni bërë do të angazhohen në sistemin. A jeni dakord për të vazhduar?\0"
     7356 "Vlera juaj Maskës Rrjetit ka ndryshuar. Një zero bit në një maskë mund të ndiqet vetëm nga zero copa të tjera. Për shembull, një vlerë Rrjeti maskë, e shprehur në simbol dhjetore me pika, e 255.255.0.0, është i vlefshëm, por nuk është 255.0.255.0.\n\0"
     7357 "Lejet Përdoruesi\0"
diff --git a/dll/win32/rasdlg/lang/tr-TR.rc b/dll/win32/rasdlg/lang/tr-TR.rc
index 19f865339f2..0dc2383d532 100644
--- a/dll/win32/rasdlg/lang/tr-TR.rc
+++ b/dll/win32/rasdlg/lang/tr-TR.rc
@@ -2354,7 +2354,7 @@ BEGIN
     7388 "ReactOS işlemi bitirmek için yeniden başlamalıdır. Şimdi yeniden başlatılsın mı?\0"
     7389 "Şimdi seçilen aygıtın var olan yapılandırma seçenekleri yok.\0"
     7390 "Geçersiz Aralık\0"
-    7391 "%1'in Gelen Bağlantılar için devre dışı bırakılmasını istediniz. Bunu devre dışı bırakmak için 'Sunucu' hizmetini durdurmalısınız. Durdurulduğunda, bu bilgisayardaki tüm paylaşılan dizinler ve yazıcılar bir başka bilgisayar için artık kullanılabilir olmayacaktır. ""Sunucu"" hizmetini durdurmanızı sağlayacak bir sistem konsolu getirmek ister misiniz?\r\n\nBilgisayar Yönetimi altında Sistem Araçları'na tıklayınız ve sonra Hizmetler'e tıklayınız. Sağ bölmede Sunucu'ya sağ tıklayınız ve Durdur'u tıklayınız.\0"
+    7391 "%1'in Gelen Bağlantılar için devre dışı bırakılmasını istediniz. Bunu devre dışı bırakmak için 'Sunucu' hizmetini durdurmalısınız. Durdurulduğunda, bu bilgisayardaki tüm paylaşılan dizinler ve yazıcılar bir başka bilgisayar için artık kullanılabilir olmayacaktır. 'Sunucu' hizmetini durdurmanızı sağlayacak bir sistem konsolu getirmek ister misiniz?\r\n\nBilgisayar Yönetimi altında Sistem Araçları'na tıklayınız ve sonra Hizmetler'e tıklayınız. Sağ bölmede Sunucu'ya sağ tıklayınız ve Durdur'u tıklayınız.\0"
     7392 "Bu seri bağlantı noktası, bir başka bilgisayara doğrudan bağlantıda kullanım için etkin değil. Bağlantı noktası, bu sihirbazı bitirdiğinizden sonra etkinleştirilecektir. Sonra bu bağlantı için simgeye sağ tıklayarak ve Özellikler'i seçerek bağlantı noktası hızını ve diğer özellikleri yapılandırabilirsiniz.\n\0"
     7393 "Gelen Bağlantılar\0"
     7394 "Girdiğiniz IP adresi havuzu geçersiz.\0"
diff --git a/dll/win32/rasdlg/lang/uk-UA.rc b/dll/win32/rasdlg/lang/uk-UA.rc
index 58bbb2ccdec..8af7c6acdde 100644
--- a/dll/win32/rasdlg/lang/uk-UA.rc
+++ b/dll/win32/rasdlg/lang/uk-UA.rc
@@ -1,8 +1,7 @@
 /*
  * PROJECT:    Remote Access Common Dialog API
  * LICENSE:    GPL - See COPYING in the top level directory
- * FILE:       dll/win32/rasdlg/lang/uk-UA.rc
- * PURPOSE:    Ukraianian Language File for rasdlg
+ * PURPOSE:    Ukrainian Language File for rasdlg
  * TRANSLATOR: Artem Reznikov
  */
 
@@ -47,12 +46,12 @@ CAPTION "Помилки групи ліній"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 32516, 1031, 7, 7, 20, 20
-    LTEXT "Деякі додаткові лінії не підключені. ", 1033, 37, 8, 216, 20
+    LTEXT "Деякі додаткові лінії не підключені.", 1033, 37, 8, 216, 20
     CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136
     AUTOCHECKBOX "Більш&е не використовувати невдалі лінії", 1030, 38, 226, 222, 10
     DEFPUSHBUTTON "Прий&мати", 1, 135, 242, 60, 14
     PUSHBUTTON "&Завершити", 2, 201, 242, 60, 14
-    LTEXT "Якщо вдалося з'єднатися лише по одній лінії, можливо, сервер не налаштовано на багатоканальний зв'язок.  У такому разі установіть прапорець ""Більше не використовувати невдалі лінії"".", -1, 37, 36, 224, 44
+    LTEXT "Якщо вдалося з'єднатися лише по одній лінії, можливо, сервер не налаштовано на багатоканальний зв'язок. У такому разі установіть прапорець ""Більше не використовувати невдалі лінії"".", -1, 37, 36, 224, 44
 END
 
 105 DIALOGEX 0, 0, 261, 253
@@ -145,7 +144,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "Відповідний виклик"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ви маєте право на зворотний виклик із боку сервера.  Якщо натиснути кнопку ""OK"", сервер зробить зворотний виклик за вказаним нижче номером.  Щоб відмовитися від зворотного виклику, натисніть кнопку ""Скасувати"".", 1066, 5, 5, 221, 39, SS_NOPREFIX
+    LTEXT "Ви маєте право на зворотний виклик із боку сервера. Якщо натиснути кнопку ""OK"", сервер зробить зворотний виклик за вказаним нижче номером. Щоб відмовитися від зворотного виклику, натисніть кнопку ""Скасувати"".", 1066, 5, 5, 221, 39, SS_NOPREFIX
     LTEXT "&Введіть номер телефону вашого модема:", 1067, 5, 46, 222, 8, NOT WS_GROUP
     EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP
@@ -202,7 +201,7 @@ CAPTION "Віддалений доступ до мережі"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 563, 1098, 7, 6, 20, 20, WS_GROUP
-    LTEXT "Спроба автоматичного набору номера не вдалася.  Вимкнути автоматичний набір номера для цього розташування?", 1099, 40, 6, 181, 34, NOT WS_GROUP
+    LTEXT "Спроба автоматичного набору номера не вдалася. Вимкнути автоматичний набір номера для цього розташування?", 1099, 40, 6, 181, 34, NOT WS_GROUP
     PUSHBUTTON "&Так", 1, 60, 42, 50, 14
     DEFPUSHBUTTON "&Ні", 2, 115, 42, 50, 14
 END
@@ -423,7 +422,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Набір номера вручну"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Зніміть слухавку і наберіть номер (або попросіть оператора зробити цю дію).  Після закінчення набору натисніть кнопку ""OK"".  Почекайте, поки сигнал у слухавці не зникне, а потім покладіть її.", 1281, 8, 8, 219, 32
+    LTEXT "Зніміть слухавку і наберіть номер (або попросіть оператора зробити цю дію). Після закінчення набору натисніть кнопку ""OK"". Почекайте, поки сигнал у слухавці не зникне, а потім покладіть її.", 1281, 8, 8, 219, 32
     LTEXT "Номер телефону:", 1282, 8, 46, 91, 8
     LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP
     DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP
@@ -478,7 +477,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Набір номера"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Параметри входу до системи через віддалений доступ після натиснення клавіш Ctrl-Alt-Delete.  Ви, як адміністратор, маєте доступ до цієї вкладки.", 1007, 7, 4, 221, 40, NOT WS_GROUP
+    LTEXT "Параметри входу до системи через віддалений доступ після натиснення клавіш Ctrl-Alt-Delete. Ви, як адміністратор, маєте доступ до цієї вкладки.", 1007, 7, 4, 221, 40, NOT WS_GROUP
     LTEXT "&Кількість спроб повторного набору:", 1005, 7, 55, 154, 8
     EDITTEXT 1001, 164, 52, 60, 14, ES_AUTOHSCROLL
     LTEXT "Інтервал між спробам&и набору (с):", 1009, 7, 73, 156, 8, NOT WS_GROUP
@@ -492,7 +491,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Відповідний виклик"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Після установки зв'язку із сервером він може зробити виклик у відповідь, що зменшить ваші витрати на телефонування.  Використовувати зворотний виклик?  (Зворотний виклик не підтримується для VPN-підключень.)", 1043, 8, 4, 219, 43
+    LTEXT "Після установки зв'язку із сервером він може зробити виклик у відповідь, що зменшить ваші витрати на телефонування. Використовувати зворотний виклик? (Зворотний виклик не підтримується для VPN-підключень.)", 1043, 8, 4, 219, 43
     AUTORADIOBUTTON "&Відповідний виклик не виконується", 1041, 7, 48, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "&Запитувати, коли це пропонує сервер", 1040, 7, 61, 219, 10, BS_TOP | BS_MULTILINE
     AUTORADIOBUTTON "Зав&жди робити зворотний виклик за вказаними номерами:", 1042, 7, 74, 219, 10, BS_TOP | BS_MULTILINE
@@ -518,7 +517,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Слід указати облікові дані вихідного підключення, які використовуватимуться цим інтерфейсом для підключення до віддаленого маршрутизатора.  Ці облікові дані мусять співпадати з обліковими даними вхідного підключення на цьому віддаленому маршрутизаторі.", 1094, 8, 5, 308, 33
+    LTEXT "Слід указати облікові дані вихідного підключення, які використовуватимуться цим інтерфейсом для підключення до віддаленого маршрутизатора. Ці облікові дані мусять співпадати з обліковими даними вхідного підключення на цьому віддаленому маршрутизаторі.", 1094, 8, 5, 308, 33
     LTEXT "&Користувач:", 1096, 8, 43, 130, 8, NOT WS_GROUP
     EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL
     LTEXT "До&мен:", 1093, 8, 63, 130, 8, NOT WS_GROUP
@@ -616,7 +615,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CHILD | WS_VISIBLE | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Виберіть ім'я для інтерфейсу виклику на вимогу.  Звичайно інтерфейсам призначаються імена мережі або інтерфейсу, до якого вони підключені.", 1158, 7, 5, 309, 29
+    LTEXT "Виберіть ім'я для інтерфейсу виклику на вимогу. Звичайно інтерфейсам призначаються імена мережі або інтерфейсу, до якого вони підключені.", 1158, 7, 5, 309, 29
     LTEXT "&Ім'я інтерфейсу:", 1159, 17, 41, 285, 8, NOT WS_GROUP
     EDITTEXT 1157, 17, 53, 284, 12, ES_AUTOHSCROLL
     AUTOCHECKBOX "Мені добре відомі інтерфейси виклику на вимогу, &я хочу налаштувати властивості вручну", 1156, 24, 100, 258, 31, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED
@@ -711,7 +710,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Майстер нових підключень"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Введіть номер телефону. ", -1, 7, 4, 306, 14
+    LTEXT "Введіть номер телефону.", -1, 7, 4, 306, 14
     LTEXT "Номер &телефону:", 1308, 7, 19, 130, 8
     EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL
     LTEXT "Можливо, знадобиться додати ""1"", код міста або обидва значення. Щоб визначити, чи це потрібно, наберіть комбінацію номера й коду на своєму телефоні. Якщо чутно звук модема, комбінацію вибрано правильно.", -1, 20, 50, 291, 53
@@ -964,7 +963,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Відповідний виклик маршрутизатора"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Після установки зв'язку з маршрутизатором він може зробити виклик у відповідь, що зменшить ваші витрати на телефонування та підвищить безпеку з'єднання.  Використовувати зворотний виклик?", 1043, 7, 5, 253, 24
+    LTEXT "Після установки зв'язку з маршрутизатором він може зробити виклик у відповідь, що зменшить ваші витрати на телефонування та підвищить безпеку з'єднання. Використовувати зворотний виклик?", 1043, 7, 5, 253, 24
     AUTORADIOBUTTON "&Відповідний виклик не виконується", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP
     AUTORADIOBUTTON "Зав&жди робити зворотний виклик за вказаними номерами:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT
     CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143
@@ -1076,7 +1075,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Можна налаштувати це підключення для використання смарт-картки для входу до віддаленої мережі.  Використовувати смарт-картку для цього підключення?", -1, 10, 5, 303, 22
+    LTEXT "Можна налаштувати це підключення для використання смарт-картки для входу до віддаленої мережі. Використовувати смарт-картку для цього підключення?", -1, 10, 5, 303, 22
     AUTORADIOBUTTON "&Використовувати мою смарт-картку ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP
     AUTORADIOBUTTON "&Не використовувати мою смарт-картку ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP
 END
@@ -1765,7 +1764,7 @@ END
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Установіть прапорці поруч із користувачами, яким слід дозволити підключатися до цього комп'ютера.  Інші фактори, такі як вимкнення облікового запису, можуть перешкодити підключенню користувача.", -1, 10, 1, 275, 27
+    LTEXT "Установіть прапорці поруч із користувачами, яким слід дозволити підключатися до цього комп'ютера. Інші фактори, такі як вимкнення облікового запису, можуть перешкодити підключенню користувача.", -1, 10, 1, 275, 27
     LTEXT "Користувачі, яким дозволено &підключатися:", -1, 10, 28, 275, 8
     CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73
     PUSHBUTTON "&Додати...", 7044, 10, 122, 65, 14, WS_GROUP
@@ -1844,20 +1843,20 @@ BEGIN
     193 "Введіть ім'я користувача й пароль для віддаленого доступу до мережного домену.\0"
     194 "На цей час як протокол маршрутизації установлено протокол перетворення\nмережних адрес (NAT). Його слід вимкнути перед увімкненням спільного доступу\nдо підключення до Інтернету. Щоб видалити перетворення мережних адрес, відкрийте\nоснащення диспетчера маршрутизації й віддаленого доступу та виберіть\nмаршрутизатор у лівій області. Видаліть протокол перетворення мережних адрес\nзі списку протоколів IP-маршрутизації.\0"
     195 "Код міста повинен складатися лише з цифр від 0 до 9.\0"
-    196 "Ім'я елемента повинно містити принаймні один непустий знак і не може починатися із крапки.  Виберіть інше ім'я.\0"
+    196 "Ім'я елемента повинно містити принаймні один непустий знак і не може починатися із крапки. Виберіть інше ім'я.\0"
     197 "Для цього поля слід вибрати значення в межах від %1 до %2.\0"
-    198 "Не вдалося завантажити бібліотеку DLL спеціальної перевірки.  Перевірте, чи правильно установлено пакет спеціальної перевірки.\0"
+    198 "Не вдалося завантажити бібліотеку DLL спеціальної перевірки. Перевірте, чи правильно установлено пакет спеціальної перевірки.\0"
     199 "Вибране підключення було установлено багатопротокольним маршрутизатором.\nСкористайтеся засобом адміністрування маршрутизації та віддаленого доступу, щоб завершити зв'язок.\0"
     200 "Примітка\0"
     201 "Не вдалося налаштувати пакет спеціальної перевірки.\0"
-    202 "Протокол TCP/IP не установлено або вимкнуто для маршрутизації та віддаленого доступу.  Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби маршрутизації та віддаленого доступу й натисніть кнопку ""Мережа"".\0"
-    203 "Протокол IPX не установлено або вимкнуто для маршрутизації та віддаленого доступу.  Щоб установити або ввімкнути IPX, відкрийте сторінку властивостей будь-якого підключення в папці ""Підключення"".\0"
+    202 "Протокол TCP/IP не установлено або вимкнуто для маршрутизації та віддаленого доступу. Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби маршрутизації та віддаленого доступу й натисніть кнопку ""Мережа"".\0"
+    203 "Протокол IPX не установлено або вимкнуто для маршрутизації та віддаленого доступу. Щоб установити або ввімкнути IPX, відкрийте сторінку властивостей будь-якого підключення в папці ""Підключення"".\0"
     204 "Видалити вибрані пристрої з цього списку?\0"
     205 "Видалити %1 із телефонної книги?\0"
     206 "Відключитися від %1?\0"
-    207 "Файл ""%1"" уже існує.  Перезаписати його?\0"
+    207 "Файл ""%1"" уже існує. Перезаписати його?\0"
     208 "У сценарії знайдено синтаксичні помилки. Показати журнал помилок?\0"
-    209 "Установлено з'єднання з ""%1"".  \0"
+    209 "Установлено з'єднання з ""%1"".\0"
     210 "Щоб завершити зв'язок або перевірити стан поточного підключення, клацніть правою кнопкою миші значок ""Монітор віддаленого доступу"" на панелі завдань.\0"
     212 "Успішне підключення.\0"
     213 "Вибраний метод спеціальної перевірки слід ініціалізувати, натиснувши кнопку ""Властивості"".\0"
@@ -1865,7 +1864,7 @@ BEGIN
     215 "Ярлики віддаленого доступу (*.rnk)\0"
     216 "*.rnk\0"
     217 "Створити ярлик віддаленого доступу\0"
-    218 "Не вдалося зв'язатися з %1.  Очікується повторне підключення...\0"
+    218 "Не вдалося зв'язатися з %1. Очікується повторне підключення...\0"
     219 "Не вдалося отримати дані про формування пакетів.\0"
     220 "Не вдалося отримати дані про порти.\0"
     221 "Не вдалося отримати дані про проекцію.\0"
@@ -1883,7 +1882,7 @@ BEGIN
     233 "Віддалений маршрутизатор\0"
     234 "Модем або інший пристрій\0"
     235 "Введіть ім'я облікового запису для цього інтерфейсу на віддаленому маршрутизаторі.\0"
-    236 "Елемент з ім'ям %1 уже існує.  Виберіть інше ім'я.\0"
+    236 "Елемент з ім'ям %1 уже існує. Виберіть інше ім'я.\0"
     237 "Ви можете дозволити надсилання вашого пароля без шифрування.\0"
     238 "Шифрування пароля\0"
     239 "Майстер готовий створити нове підключення.\0"
@@ -1892,7 +1891,7 @@ BEGIN
     242 "Час зворотного виклику\0"
     243 "Змінити додатковий номер телефону\0"
     244 "Оскільки це підключення зараз активне, зміни деяких параметрів наберуть сили лише за наступного набору номера.\0"
-    245 "Немає підключень, доступних для всіх користувачів.  Перед набором номера слід ввійти до системи.\0"
+    245 "Немає підключень, доступних для всіх користувачів. Перед набором номера слід ввійти до системи.\0"
     246 "Телефонна книга пуста.\n\nНатисніть кнопку ""OK"", щоб додати елемент.\0"
     247 "Внаслідок обмежень на імпорт/експорт шифрування даних у цій версії ReactOS не підтримується.\0"
     248 "Введіть адресу X.25 на наступному екрані.\0"
@@ -1918,7 +1917,7 @@ BEGIN
     268 "Номери телефонів\0"
     269 "Можна ввести фіксовану IP-адресу.\0"
     270 "IP-адреса\0"
-    271 "Протоколи TCP/IP не установлені або вимкнуті для віддаленого доступу.  Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби віддаленого доступу й натисніть кнопку ""Мережа"".\0"
+    271 "Протоколи TCP/IP не установлені або вимкнуті для віддаленого доступу. Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби віддаленого доступу й натисніть кнопку ""Мережа"".\0"
     272 "TCP/IP\0"
     273 "IPSec, політика за замовчуванням\0"
     274 "IPX/SPX або сумісний\0"
@@ -1955,13 +1954,13 @@ BEGIN
     305 "Не вибрано жодної іншої телефонної книги.\0"
     306 "Цей пристрій неможливо налаштувати динамічно.\0"
     307 "Цей елемент неможливо видалити, оскільки він зараз підключений.\0"
-    308 "Не вибрано жодного елемента.  Натисніть кнопку ""Створити"", щоб створити новий елемент.\0"
+    308 "Не вибрано жодного елемента. Натисніть кнопку ""Створити"", щоб створити новий елемент.\0"
     309 "Якщо вибрано параметр ""укажіть IP-адресу"", слід указати ненульову IP-адресу.\0"
     310 "Якщо вибрано віддалене підключення до мережі X.25 або до пристрою X.25, слід указати адресу X.25.\0"
     311 "(немає)\0"
     312 "%1 уже є в списку.\0"
     313 "Захищати мої пароль і дані\0"
-    314 "Протокол %1 неможливо вибрати, оскільки він не установлений або вимкнутий для віддаленого доступу.  Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби віддаленого доступу й натисніть кнопку ""Мережа"".\0"
+    314 "Протокол %1 неможливо вибрати, оскільки він не установлений або вимкнутий для віддаленого доступу. Відкрийте на панелі керування значок ""Мережа"", перейдіть на сторінку ""Служби"", виберіть властивості служби віддаленого доступу й натисніть кнопку ""Мережа"".\0"
     315 "Не вдалося зберегти пароль.\0"
     316 "Не вдалося показати дані.\0"
     317 "Не вдалося отримати дані про автоматичний набір номера.\0"
@@ -2019,7 +2018,7 @@ BEGIN
     369 "Коли %1 установлює підключення на вимогу через інтерфейс %2, використовувати такі параметри протоколу PPP:\0"
     370 "[Щоб змінити збережений пароль, клацніть тут]\0"
     405 "Для виклику старих серверів RAS потрібен протокол NetBEUI.\0"
-    406 "Щоб мати змогу підключатися до старих серверів RAS, слід установити  протокол NetBEUI.  Цей протокол можна установити за допомогою значка ""Мережа"" на панелі керування.\0"
+    406 "Щоб мати змогу підключатися до старих серверів RAS, слід установити протокол NetBEUI. Цей протокол можна установити за допомогою значка ""Мережа"" на панелі керування.\0"
     407 "&Повторний дзвінок\0"
     408 "Ви заборонили використання одного або декількох транспортних протоколів. Таким чином, диспетчери маршрутизації та протоколи маршрутизації для заборонених транспортних протоколів будуть видалені із цього інтерфейсу виклику на вимогу.\nНатисніть кнопку ""Так"", щоб підтвердити видалення, або кнопку ""Ні"",\nщоб дозволити транспорти.\0"
     409 "Спільний доступ до підключення до Інтернету\0"
@@ -2076,7 +2075,7 @@ BEGIN
     460 "Слід позначити принаймні один модем або адаптер.\0"
     461 "Номер телефону\0"
     462 "Для виклику старих серверів SLIP потрібен протокол TCP/IP.\0"
-    463 "Щоб мати змогу підключатися до старих серверів SLIP, слід установити  протокол TCP/IP.  Цей протокол можна установити за допомогою значка ""Мережа"" на панелі керування.\0"
+    463 "Щоб мати змогу підключатися до старих серверів SLIP, слід установити протокол TCP/IP. Цей протокол можна установити за допомогою значка ""Мережа"" на панелі керування.\0"
     464 "Стан\0"
     465 "&Новий суфікс:\0"
     466 "&Суфікси:\0"
@@ -2200,7 +2199,7 @@ BEGIN
     1554 "Ім'я інтерфейсу\0"
     1555 "Виберіть ім'я для цього нового інтерфейсу.\0"
     1556 "Немає доступних пристроїв\0"
-    1557 "Обліковий запис користувача %1 уже існує на локальному комп'ютері.  Чи повинен інтерфейс виклику на вимогу використовувати цей обліковий запис?\0"
+    1557 "Обліковий запис користувача %1 уже існує на локальному комп'ютері. Чи повинен інтерфейс виклику на вимогу використовувати цей обліковий запис?\0"
     1558 "Параметри безпеки для підключень до серверів SLIP.\0"
     1559 "Незахищений пароль\0"
     1560 "Безпечний пароль\0"
@@ -2213,20 +2212,20 @@ BEGIN
     1567 " (шифрування ввімкнуто)\0"
     1568 "Відомості про обліковий запис Інтернету\0"
     1569 "Для облікового запису Інтернету буде потрібне ім'я облікового запису та пароль.\0"
-    1570 "Вибраний пакет EAP не надає ключів шифрування.  Виберіть пакет EAP, який надає ключі, або взагалі відмовтеся від шифрування.\0"
+    1570 "Вибраний пакет EAP не надає ключів шифрування. Виберіть пакет EAP, який надає ключі, або взагалі відмовтеся від шифрування.\0"
     1571 "Вибране шифрування потребує методів перевірки EAP або будь-якої версії MS-CHAP.\0"
     1572 "Протоколи та безпека\0"
     1573 "Виберіть транспортні протоколи та параметри безпеки для цього підключення.\0"
-    1574 "Вибрані протоколи включають PAP, SPAP та/або CHAP.  Якщо буде узгоджено використання одного з них, шифрування даних не виконуватиметься.  Залишити ці параметри?\0"
-    1575 "Щоб підключитися до ""%1"", спочатку слід підключитися до ""%2"".  Підключитися до ""%2"" зараз?\0"
+    1574 "Вибрані протоколи включають PAP, SPAP та/або CHAP. Якщо буде узгоджено використання одного з них, шифрування даних не виконуватиметься. Залишити ці параметри?\0"
+    1575 "Щоб підключитися до ""%1"", спочатку слід підключитися до ""%2"". Підключитися до ""%2"" зараз?\0"
     1576 "Підключення через паралельний кабель...\0"
     1577 "Підключення через інфрачервоний канал...\0"
     1578 "Підключено через паралельний кабель.\0"
     1579 "Підключено через інфрачервоний канал.\0"
-    1580 "Це підключення було налаштовано на використання шифрування даних зі стійкістю, яка не підтримується установленим програмним забезпеченням.  Параметри безпеки цього підключення змінено на використання шифрування з доступним ступенем стійкості.\0"
+    1580 "Це підключення було налаштовано на використання шифрування даних зі стійкістю, яка не підтримується установленим програмним забезпеченням. Параметри безпеки цього підключення змінено на використання шифрування з доступним ступенем стійкості.\0"
     1581 "&Тип віртуальної приватної мережі:\0"
     1582 "Введіть ім'я користувача.\0"
-    1583 "Ці ім'я та пароль будуть збережені для вас.  Уже існують ім'я та пароль, збережені для всіх інших користувачів цього підключення.  Видалити ім'я та пароль, збережені для всіх інших користувачів?\0"
+    1583 "Ці ім'я та пароль будуть збережені для вас. Уже існують ім'я та пароль, збережені для всіх інших користувачів цього підключення. Видалити ім'я та пароль, збережені для всіх інших користувачів?\0"
     1584 "Наприклад, можна ввести ім'я робочого місця або ім'я сервера, до якого ви будете підключатися.\0"
     1585 "Відомості про обліковий запис\0"
     1586 "Елементи керування в цьому вікні властивостей вимкнуті, оскільки слід перезавантажити систему, перед тим як вносити будь-які зміни до настройки.\0"
@@ -2270,7 +2269,7 @@ BEGIN
     1672 "Коли цей комп'ютер відкине незакінчену передачу даних через перевищення дозволеного часу передачі, він відповість відправникові повідомленням про помилку ""час минув"".\0"
     1673 "Дані, надіслані з цього комп'ютера, будуть переспрямовані, якщо маршрут за замовчуванням зміниться.\0"
     1675 "Введене значення розміру файлу журналу неприпустиме. Укажіть значення від 1 до 32767 КБ.\0"
-    1685 "Ваш обліковий запис не має дозволу на використання цього підключення.  Звичайно причиною цього буває вхід з обліковим записом гостя.\0"
+    1685 "Ваш обліковий запис не має дозволу на використання цього підключення. Звичайно причиною цього буває вхід з обліковим записом гостя.\0"
     1686 "Введіть ім'я облікового запису й пароль. (Якщо ви забули існуючі ім'я облікового запису або пароль, зверніться до адміністратора мережі.)\0"
     1687 "&Ім'я комп'ютера\0"
     1688 "Ім&я постачальника послуг Інтернету\0"
@@ -2295,40 +2294,40 @@ BEGIN
     7320 "База даних протоколів\0"
     7321 "Слід ввести ім'я входу до системи для нового користувача або натиснути кнопку ""Скасувати"".\0"
     7322 "Введений пароль занадто короткий.\0"
-    7323 "Введені паролі неоднакові.  Введіть їх знову.\0"
-    7324 "Сталася внутрішня помилка.  \0"
+    7323 "Введені паролі неоднакові. Введіть їх знову.\0"
+    7324 "Сталася внутрішня помилка.\0"
     7325 "Просмотр списка\0"
-    7326 "Сталася помилка при спробі зафіксувати внесені зміни в базі даних локальних користувачів.  \0"
-    7327 "Ви не маєте достатніх прав на додання користувачів до бази даних локальної системи.  \0"
+    7326 "Сталася помилка при спробі зафіксувати внесені зміни в базі даних локальних користувачів.\0"
+    7327 "Ви не маєте достатніх прав на додання користувачів до бази даних локальної системи.\0"
     7328 "Такий користувач уже існує в базі даних локальних користувачів.\0"
     7329 "Користувача не додано до бази даних локальних користувачів, оскільки система відкинула введений пароль.\0"
     7330 "Не вдалося перезавантажити базу даних користувачів через внутрішню помилку.\0"
-    7331 "Сталася внутрішня помилка:  пошкоджено дескриптор бази даних локальних користувачів.\0"
+    7331 "Сталася внутрішня помилка: пошкоджено дескриптор бази даних локальних користувачів.\0"
     7332 "Неможливо завантажити ресурси, потрібні для показу вкладки користувачів.\0"
-    7333 "Сталася внутрішня помилка при спробі відкоту внесених змін в базі даних локальних користувачів.  \0"
+    7333 "Сталася внутрішня помилка при спробі відкоту внесених змін в базі даних локальних користувачів.\0"
     7334 "Дескриптор бази даних пристроїв пошкоджено.\0"
     7335 "Неможливо завантажити ресурси, потрібні для показу вкладки ""Загальні"".\0"
-    7336 "Сталася помилка при спробі зафіксувати деякі внесені зміни настройки пристроїв або віртуальної приватної мережі.  \0"
+    7336 "Сталася помилка при спробі зафіксувати деякі внесені зміни настройки пристроїв або віртуальної приватної мережі.\0"
     7337 "Сталася внутрішня помилка.\0"
     7338 "Сталася внутрішня помилка: пошкоджено дескриптор бази даних мережних компонентів.\0"
-    7339 "Сталася внутрішня помилка.  \0"
+    7339 "Сталася внутрішня помилка.\0"
     7340 "Сталася помилка при спробі зафіксувати внесені зміни настройки мережних компонентів.\0"
     7341 "Сталася внутрішня помилка.\0"
-    7342 "Не вдалося зафіксувати внесені зміни настройки протоколу TCP/IP.  \0"
-    7343 "Не вдалося зафіксувати внесені зміни настройки протоколу IPX.  \0"
+    7342 "Не вдалося зафіксувати внесені зміни настройки протоколу TCP/IP.\0"
+    7343 "Не вдалося зафіксувати внесені зміни настройки протоколу IPX.\0"
     7344 "Неможливо показати вікно властивостей TCP/IP.\0"
     7345 "Неможливо показати вікно властивостей IPX.\0"
-    7346 "Неможливо завантажити властивості TCP/IP із цієї системи.  \0"
-    7347 "Неможливо завантажити властивості IPX із цієї системи.  \0"
-    7348 "Вхідні підключення залежать від служби маршрутизації та віддаленого доступу, яку не вдалося запустити.  Додаткові відомості містяться в журналі системних подій.\0"
+    7346 "Неможливо завантажити властивості TCP/IP із цієї системи.\0"
+    7347 "Неможливо завантажити властивості IPX із цієї системи.\0"
+    7348 "Вхідні підключення залежать від служби маршрутизації та віддаленого доступу, яку не вдалося запустити. Додаткові відомості містяться в журналі системних подій.\0"
     7349 "Зараз неможливо дозволити редагування мережних компонентів, оскільки вони вже змінюються ще кимсь.\0"
-    7350 "Указаного нового користувача не додано до бази даних локальних користувачів, оскільки введені ім'я або пароль порушують системну політику (неправильний розмір або формат).  \0"
-    7351 "Неможливо видалити вказаного користувача.  \0"
+    7350 "Указаного нового користувача не додано до бази даних локальних користувачів, оскільки введені ім'я або пароль порушують системну політику (неправильний розмір або формат).\0"
+    7351 "Неможливо видалити вказаного користувача.\0"
     7352 "Неможливо видалити вибраний мережний компонент, оскільки він зараз використовується.\0"
     7353 "Попередження вхідних підключень\0"
-    7354 "Користувачі, яких ви видалите, будуть необоротно видалені із системи, навіть якщо потім натиснути кнопку ""Скасувати"".  Ви дійсно бажаєте остаточно видалити %s? \0"
-    7355 "Ви збираєтеся переключитися на консоль керування системою.  Вікно властивостей вхідних підключень буде закрито, і усі внесені зміни наберуть сили.  Продовжити?\0"
-    7356 "Значення мережної маски було змінено.  Після нульового біта в масці можуть стояти лише інші нульові біти.  Наприклад, значення нульової маски 255.255.0.0 (у десятковій нотації) є припустимим, а значення 255.0.255.0 - ні.\n\0"
+    7354 "Користувачі, яких ви видалите, будуть необоротно видалені із системи, навіть якщо потім натиснути кнопку ""Скасувати"". Ви дійсно бажаєте остаточно видалити %s?\0"
+    7355 "Ви збираєтеся переключитися на консоль керування системою. Вікно властивостей вхідних підключень буде закрито, і усі внесені зміни наберуть сили. Продовжити?\0"
+    7356 "Значення мережної маски було змінено. Після нульового біта в масці можуть стояти лише інші нульові біти. Наприклад, значення нульової маски 255.255.0.0 (у десятковій нотації) є припустимим, а значення 255.0.255.0 - ні.\n\0"
     7357 "Дозволи користувачів\0"
     7358 "Можна вказати користувачів, яким дозволено підключатися до цього комп'ютера.\0"
     7359 "Пристрої для вхідних підключень\0"
@@ -2349,26 +2348,26 @@ BEGIN
     7377 "Який пристрій слід використовувати для цього підключення?\0"
     7378 "Не установлено устаткування, здатного приймати прямі підключення.\0"
     7379 "Попередження нового вхідного підключення\0"
-    7380 "Оскільки цей сервер Win 2000 Server належить до домену або керує ним, слід налаштувати цей комп'ютер на приймання вхідних підключень за допомогою консолі ""Маршрутизація та віддалений доступ"".  Скасувати зміни та перейти до цієї консолі?\n\0"
+    7380 "Оскільки цей сервер Win 2000 Server належить до домену або керує ним, слід налаштувати цей комп'ютер на приймання вхідних підключень за допомогою консолі ""Маршрутизація та віддалений доступ"". Скасувати зміни та перейти до цієї консолі?\n\0"
     7381 "Приз&начити номер мережі автоматично\0"
     7382 "Приз&начати номери мереж автоматично\0"
-    7383 "Вхідні підключення не можуть видавати номери мереж IPX 00000000 або FFFFFFFF.  Змініть призначений номер мережі або застосуйте автоматичне призначення номерів.\0"
+    7383 "Вхідні підключення не можуть видавати номери мереж IPX 00000000 або FFFFFFFF. Змініть призначений номер мережі або застосуйте автоматичне призначення номерів.\0"
     7384 "на\0"
     7385 "Послідовний порт (%s)\0"
-    7386 "У вікні ""Мережні підключення"" не показані деякі спеціальні параметри вхідних підключень, установлені за допомогою консолей диспетчера локальних користувачів або політики віддаленого доступу.  Щоб отримати вичерпні та правильні відомості про вхідні підключення, скористайтеся цими консолями.\0"
+    7386 "У вікні ""Мережні підключення"" не показані деякі спеціальні параметри вхідних підключень, установлені за допомогою консолей диспетчера локальних користувачів або політики віддаленого доступу. Щоб отримати вичерпні та правильні відомості про вхідні підключення, скористайтеся цими консолями.\0"
     7387 "Вибраний режим зворотного виклику користувача потребує введення правильного номера для зворотного виклику.\0"
-    7388 "Для завершення операції необхідно перезавантажити ReactOS.  Перезавантажити зараз?\0"
+    7388 "Для завершення операції необхідно перезавантажити ReactOS. Перезавантажити зараз?\0"
     7389 "Вибраний пристрій не має параметрів для настройки.\0"
     7390 "Неприпустимий діапазон\0"
-    7391 "Ви вимагаєте заборонити вхідні підключення для ""%1"".  Для цього слід зупинити службу ""Сервер"".  Коли її буде зупинено, спільні папки або принтери цього комп'ютера будуть недоступні з будь-якого іншого комп'ютера.  Викликати системну консоль, яка дає змогу зупинити службу ""Сервер""?\r\n\nВиберіть меню ""Керування комп'ютером"", потім ""Службові"" та ""Служби"".  У правій області клацніть правою кнопкою миші значок ""Сервер"" і виберіть пункт ""Зупинити"".\0"
-    7392 "Цей послідовний порт заборонено використовувати для прямого підключення до іншого комп'ютера.  Його можна буде використовувати після завершення цього майстра.  Потім можна буде налаштувати швидкість та інші параметри порту, клацнувши правою кнопкою миші значок цього підключення й вибравши пункт ""Властивості"".\n\0"
+    7391 "Ви вимагаєте заборонити вхідні підключення для ""%1"". Для цього слід зупинити службу ""Сервер"". Коли її буде зупинено, спільні папки або принтери цього комп'ютера будуть недоступні з будь-якого іншого комп'ютера. Викликати системну консоль, яка дає змогу зупинити службу ""Сервер""?\r\n\nВиберіть меню ""Керування комп'ютером"", потім ""Службові"" та ""Служби"". У правій області клацніть правою кнопкою миші значок ""Сервер"" і виберіть пункт ""Зупинити"".\0"
+    7392 "Цей послідовний порт заборонено використовувати для прямого підключення до іншого комп'ютера. Його можна буде використовувати після завершення цього майстра. Потім можна буде налаштувати швидкість та інші параметри порту, клацнувши правою кнопкою миші значок цього підключення й вибравши пункт ""Властивості"".\n\0"
     7393 "Вхідні підключення\0"
     7394 "Указаний пул IP-адрес неправильний.\0"
     7395 "Указана маска підмережі неправильна.\0"
-    7396 "Указана початкова адреса пула адрес неправильна.  Вона повинна лежати в межах від 1.0.0.0 до 224.0.0.0 за винятком діапазону 127.x.x.x.\0"
+    7396 "Указана початкова адреса пула адрес неправильна. Вона повинна лежати в межах від 1.0.0.0 до 224.0.0.0 за винятком діапазону 127.x.x.x.\0"
     7397 "Указаний пул адрес TCP/IP неправильний, оскільки адреса виходить за межі маски.\0"
     7398 "Початкова адреса повинна бути меншою за кінцеву адресу.\0"
-    7399 "Триває зупинення служби ""Маршрутизація та віддалений доступ"".  Поки зупинення не буде остаточно виконане, параметр ""Вхідні підключення"" буде недоступним.  Трохи зачекайте й повторіть спробу.\0"
+    7399 "Триває зупинення служби ""Маршрутизація та віддалений доступ"". Поки зупинення не буде остаточно виконане, параметр ""Вхідні підключення"" буде недоступним. Трохи зачекайте й повторіть спробу.\0"
     7400 "%s (%s)\0"
     7401 "%s (каналів: %d)\0"
     7402 "Вхідне VPN-підключення (PPTP)\0"
diff --git a/dll/win32/rasdlg/lang/zh-CN.rc b/dll/win32/rasdlg/lang/zh-CN.rc
index a4ea5277f24..4df5453ac23 100644
--- a/dll/win32/rasdlg/lang/zh-CN.rc
+++ b/dll/win32/rasdlg/lang/zh-CN.rc
@@ -2292,28 +2292,28 @@ BEGIN
     7323 "输入的密码不同的。请重新输入。\0"
     7324 "发生了内部错误。\0"
     7325 "列表视图\0"
-    7326 "尝试提交对本地用户数据库所做的更改时出错。  \0"
-    7327 "权限不足，无法将用户添加到本地系统数据库。  \0"
+    7326 "尝试提交对本地用户数据库所做的更改时出错。\0"
+    7327 "权限不足，无法将用户添加到本地系统数据库。\0"
     7328 "正在创建的用户已经存在于本地用户数据库中。\0"
     7329 "因为您输入的密码被拒绝，用户没有添加到本地用户数据库。\0"
     7330 "由于内部错误，无法重新加载系统用户数据库。\0"
     7331 "发生内部错误: 本地用户数据库句柄已损坏。\0"
     7332 "无法加载显示用户选项卡必要的资源。\0"
-    7333 "正在试图回滚到本地用户数据库所做的更改时发生内部错误。  \0"
+    7333 "正在试图回滚到本地用户数据库所做的更改时发生内部错误。\0"
     7334 "设备数据库句柄已损坏。\0"
     7335 "无法加载显示常规选项卡所需的资源。\0"
-    7336 "尝试提交对某些设备/VPN 相关所做的更改时出错。  \0"
+    7336 "尝试提交对某些设备/VPN 相关所做的更改时出错。\0"
     7337 "出现内部错误。\0"
     7338 "发生内部错误: 通讯网络组件数据库句柄已损坏。\0"
     7339 "发生了内部错误。\0"
     7340 "尝试提交对网络组件所做的更改时出错。\0"
     7341 "出现内部错误。\0"
-    7342 "无法提交到 TCP/IP 协议对系统所做的更改。  \0"
-    7343 "无法保存对 IPX 协议对系统所做的更改。  \0"
+    7342 "无法提交到 TCP/IP 协议对系统所做的更改。\0"
+    7343 "无法保存对 IPX 协议对系统所做的更改。\0"
     7344 "无法显示 TCP/IP 属性。\0"
     7345 "无法显示 IPX 属性。\0"
-    7346 "无法从系统加载 TCP/IP 属性。  \0"
-    7347 "无法从系统加载 IPX 属性。  \0"
+    7346 "无法从系统加载 TCP/IP 属性。\0"
+    7347 "无法从系统加载 IPX 属性。\0"
     7348 "传入连接依赖的路由和远程访问服务无法启动。有关详细信息，请检查系统事件日志。\0"
     7349 "不能编辑网络组件，因为他们正在别处被修改。\0"
     7350 "您输入的新用户未添加到本地用户数据库，因为用户名或输入违反了系统策略（太大、 太小，或格式不正确）。\0"
diff --git a/dll/win32/rasdlg/lang/zh-TW.rc b/dll/win32/rasdlg/lang/zh-TW.rc
index 3b300a20c8c..a18cf69db79 100644
--- a/dll/win32/rasdlg/lang/zh-TW.rc
+++ b/dll/win32/rasdlg/lang/zh-TW.rc
@@ -2299,32 +2299,32 @@ BEGIN
     7323 "輸入的密碼不相符。請重新輸入。\0"
     7324 "發生了內部錯誤。\0"
     7325 "列表視圖\0"
-    7326 "嘗試提交對本地使用者資料庫所做的更改時出錯。  \0"
+    7326 "嘗試提交對本地使用者資料庫所做的更改時出錯。\0"
     7327 "您沒有足夠的權限，無法將使用者新增到本地系統資料庫。\0"
     7328 "使用者正在建立已經存在本地使用者資料庫中。\0"
     7329 "由於您輸入的密碼被拒絕，使用者沒有新增到本地使用者資料庫。\0"
     7330 "由於無法重新載入系統使用者資料庫內部錯誤。\0"
     7331 "發生內部錯誤：本地使用者資料庫控制代碼已損毀。\0"
     7332 "無法載入必要的資源，顯示使用者選項卡。\0"
-    7333 "正在試圖回退到本地使用者資料庫所做的更改時發生內部錯誤。  \0"
+    7333 "正在試圖回退到本地使用者資料庫所做的更改時發生內部錯誤。\0"
     7334 "設備資料庫控制代碼已損毀。\0"
     7335 "無法載入顯示一般選項卡所需的資源。\0"
-    7336 "嘗試對某些設備／VPN 相關設定作出更改時發出錯誤。  \0"
+    7336 "嘗試對某些設備／VPN 相關設定作出更改時發出錯誤。\0"
     7337 "發生內部錯誤。\0"
     7338 "發生內部錯誤：網路元件資料庫控制代碼已損毀。\0"
-    7339 "發生了內部錯誤。  \0"
+    7339 "發生了內部錯誤。\0"
     7340 "嘗試提交對網路組件所做的更改時出錯。\0"
     7341 "發生內部錯誤。\0"
-    7342 "無法提交到 TCP/IP 協定對系統所做的更改。  \0"
-    7343 "無法儲存對 IPX 協定對系統所做的更改。  \0"
+    7342 "無法提交到 TCP/IP 協定對系統所做的更改。\0"
+    7343 "無法儲存對 IPX 協定對系統所做的更改。\0"
     7344 "無法顯示 TCP/IP 內容。\0"
     7345 "無法顯示 IPX 內容。\0"
-    7346 "無法從系統載入 TCP/IP 內容。  \0"
-    7347 "無法從系統載入 IPX 內容。  \0"
+    7346 "無法從系統載入 TCP/IP 內容。\0"
+    7347 "無法從系統載入 IPX 內容。\0"
     7348 "傳入連線取決於路由和遠端存取服務無法啟動。有關詳細訊息，請檢查系統事件記錄。\0"
     7349 "不能允許編輯的網路組件，這一次因為他們目前在别處被修改。\0"
     7350 "您輸入的新使用者未新增到本地使用者資料庫因為名稱或輸入密碼違反了系統策略（太大、太小、或格式不正確）。 \0"
-    7351 "該系統是無法刪除請求的使用者。  \0"
+    7351 "該系統是無法刪除請求的使用者。\0"
     7352 "無法刪除所選的網路組件，因為它正在使用中。\0"
     7353 "傳入的連線警告\0"
     7354 "即使按下取消，使用者也會從系統中將永久刪除。您確定您想要永久刪除 %s？ \0"
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
index cf76b47392d..ba1a3d10160 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -511,15 +511,48 @@ HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl
         DriveType = DRIVE_FIXED;
 
     WCHAR wTemp[MAX_PATH];
-    int icon_idx;
+    int icon_idx, reg_idx;
     UINT flags = 0;
-    if ((DriveType == DRIVE_FIXED || DriveType == DRIVE_UNKNOWN) &&
-        (HCR_GetIconW(L"Drive", wTemp, NULL, MAX_PATH, &icon_idx)))
+
+    switch (DriveType)
+    {
+        case DRIVE_FIXED:
+        case DRIVE_UNKNOWN:
+            reg_idx = IDI_SHELL_DRIVE;
+            break;
+        case DRIVE_CDROM:
+            reg_idx = IDI_SHELL_CDROM;
+            break;
+        case DRIVE_REMOTE:
+            reg_idx = IDI_SHELL_NETDRIVE;
+            break;
+        case DRIVE_REMOVABLE:
+            if (!IsDriveFloppyA(pszDrive))
+                reg_idx = IDI_SHELL_REMOVEABLE;
+            else
+                reg_idx = IDI_SHELL_3_14_FLOPPY;
+            break;
+        case DRIVE_RAMDISK:
+            reg_idx = IDI_SHELL_RAMDISK;
+            break;
+        case DRIVE_NO_ROOT_DIR:
+        default:
+            reg_idx = IDI_SHELL_DOCUMENT;
+            break;
+    }
+
+    hr = getIconLocationForDrive(psf, pidl, 0, wTemp, _countof(wTemp),
+                                 &icon_idx, &flags);
+    if (SUCCEEDED(hr))
+    {
+        initIcon->SetNormalIcon(wTemp, icon_idx);
+    }
+    else if (HLM_GetIconW(reg_idx - 1, wTemp, _countof(wTemp), &icon_idx))
     {
         initIcon->SetNormalIcon(wTemp, icon_idx);
     }
-    else if (SUCCEEDED(getIconLocationForDrive(psf, pidl, 0, wTemp, _countof(wTemp),
-                                               &icon_idx, &flags)))
+    else if ((DriveType == DRIVE_FIXED || DriveType == DRIVE_UNKNOWN) &&
+             (HCR_GetIconW(L"Drive", wTemp, NULL, _countof(wTemp), &icon_idx)))
     {
         initIcon->SetNormalIcon(wTemp, icon_idx);
     }
diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp
index 93cacdd1e2f..4f26b4eb864 100644
--- a/dll/win32/shell32/folders/CFSFolder.cpp
+++ b/dll/win32/shell32/folders/CFSFolder.cpp
@@ -136,10 +136,13 @@ HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pcl
 static HRESULT
 getDefaultIconLocation(LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT uFlags)
 {
-    if (!HCR_GetIconW(L"Folder", szIconFile, NULL, cchMax, piIndex))
+    if (!HLM_GetIconW(IDI_SHELL_FOLDER - 1, szIconFile, cchMax, piIndex))
     {
-        lstrcpynW(szIconFile, swShell32Name, cchMax);
-        *piIndex = -IDI_SHELL_FOLDER;
+        if (!HCR_GetIconW(L"Folder", szIconFile, NULL, cchMax, piIndex))
+        {
+            StringCchCopyW(szIconFile, cchMax, swShell32Name);
+            *piIndex = -IDI_SHELL_FOLDER;
+        }
     }
 
     if (uFlags & GIL_OPENICON)
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index 6c5c3f7f3cb..489731638fd 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -123,6 +123,16 @@ HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder,
     return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, RegFolderContextMenuCallback, cKeys, hKeys, ppcm);
 }
 
+HRESULT FormatGUIDKey(LPWSTR KeyName, SIZE_T KeySize, LPCWSTR RegPath, const GUID* riid)
+{
+    WCHAR xriid[40];
+
+    if (!StringFromGUID2(*riid, xriid, _countof(xriid) - 1))
+        return E_FAIL;
+
+    return StringCchPrintfW(KeyName, KeySize, RegPath, xriid);
+}
+
 HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut)
 {
     CComPtr<IDefaultExtractIconInit>    initIcon;
@@ -145,14 +155,7 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO
     if (!riid)
         return E_FAIL;
 
-    /* my computer and other shell extensions */
-    WCHAR xriid[50];
-
-    swprintf(xriid, L"CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-             riid->Data1, riid->Data2, riid->Data3,
-             riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
-             riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]);
-
+    /* Choose a correct icon for Recycle Bin (full or empty) */
     const WCHAR* iconname = NULL;
     if (_ILIsBitBucket(pidl))
     {
@@ -179,23 +182,37 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO
         }
     }
 
-    if (HCR_GetIconW(xriid, wTemp, iconname, MAX_PATH, &icon_idx))
+    /* Prepare registry path for loading icons of My Computer and other shell extensions */
+    WCHAR KeyName[MAX_PATH];
+
+    hr = FormatGUIDKey(KeyName, _countof(KeyName),
+                       L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\%s",
+                       riid);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    /* Load icon for the current user */
+    BOOL ret = HCU_GetIconW(KeyName, wTemp, iconname, _countof(wTemp), &icon_idx);
+    if (!ret)
+    {
+        /* Failed, load default system-wide icon */
+        hr = FormatGUIDKey(KeyName, _countof(KeyName), L"CLSID\\%s", riid);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        ret = HCR_GetIconW(KeyName, wTemp, iconname, _countof(wTemp), &icon_idx);
+    }
+
+    if (ret)
     {
+        /* Success, set loaded icon */
         initIcon->SetNormalIcon(wTemp, icon_idx);
     }
     else
     {
-        // FIXME: Delete these hacks and make HCR_GetIconW and registry working
-        if (IsEqualGUID(*riid, CLSID_MyComputer))
-            initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_COMPUTER);
-        else if (IsEqualGUID(*riid, CLSID_MyDocuments))
-            initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_DOCUMENTS);
-        else if (IsEqualGUID(*riid, CLSID_NetworkPlaces))
-            initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_NETWORK_PLACES);
-        else if (IsEqualGUID(*riid, CLSID_Internet))
-            initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_WEB_BROWSER);
-        else
-            initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_FOLDER);
+        /* Everything has failed, set blank paper icon */
+        WARN("Failed to load an icon for the item, setting blank icon\n");
+        initIcon->SetNormalIcon(swShell32Name, IDI_SHELL_DOCUMENT - 1);
     }
 
     return initIcon->QueryInterface(iid, ppvOut);
diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp
index 9a55f0f9fc0..4af8d2a5c0d 100644
--- a/dll/win32/shell32/iconcache.cpp
+++ b/dll/win32/shell32/iconcache.cpp
@@ -654,34 +654,20 @@ void SIC_Destroy(void)
  */
 static int SIC_LoadOverlayIcon(int icon_idx)
 {
-    WCHAR buffer[1024], wszIdx[8];
-    HKEY hKeyShellIcons;
-    LPCWSTR iconPath;
+    WCHAR buffer[1024];
+    LPWSTR iconPath;
     int iconIdx;
 
     iconPath = swShell32Name;    /* default: load icon from shell32.dll */
     iconIdx = icon_idx;
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Icons",
-                      0, KEY_READ, &hKeyShellIcons) == ERROR_SUCCESS)
+    if (HLM_GetIconW(icon_idx, buffer, _countof(buffer), &iconIdx))
     {
-        DWORD count = sizeof(buffer);
-
-        swprintf(wszIdx, L"%d", icon_idx);
-
-        /* read icon path and index */
-        if (RegQueryValueExW(hKeyShellIcons, wszIdx, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS)
-        {
-            LPWSTR p = wcschr(buffer, ',');
-
-            if (p)
-                *p++ = 0;
-
-            iconPath = buffer;
-            iconIdx = _wtoi(p);
-        }
-
-        RegCloseKey(hKeyShellIcons);
+        iconPath = buffer;
+    }
+    else
+    {
+        WARN("Failed to load icon with index %d, using default one\n", icon_idx);
     }
 
     if (!sic_hdpa)
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index d58dcde0183..3ec9aa07552 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -1009,10 +1009,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "マイ コンピュータでコントロール パネルを表示する"
     IDS_ADVANCED_SHOW_COMP_COLOR "暗号化または圧縮されたNTFSファイルを色付きで表示する"
     IDS_ADVANCED_SHOW_INFO_TIP "フォルダとデスクトップの項目にポップアップ式の説明を表示する"
-    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
-    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
-    IDS_ADVANCED_DISPLAY_RUN "Display Run"
-    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
+    IDS_ADVANCED_DISPLAY_FAVORITES "「お気に入り」を表示"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "「ログオフ」を表示"
+    IDS_ADVANCED_DISPLAY_RUN "「ファイル名を指定して実行」を表示"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "「管理者ツール」を表示"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< 高度な設定(&V)"
     IDS_NEWEXT_ADVANCED_RIGHT "高度な設定(&V) >>"
diff --git a/dll/win32/shell32/shell32_version.h b/dll/win32/shell32/shell32_version.h
index 92a0baf9bf9..f24ca3220df 100644
--- a/dll/win32/shell32/shell32_version.h
+++ b/dll/win32/shell32/shell32_version.h
@@ -20,11 +20,30 @@
 
 #pragma once
 
-#define WINE_FILEVERSION_MAJOR         5
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+
+/* Version from Windows Server 2003 SP2 */
+
+#define WINE_FILEVERSION_MAJOR         6
+#define WINE_FILEVERSION_MINOR         0
+#define WINE_FILEVERSION_BUILD      3790
+#define WINE_FILEVERSION_PLATFORMID 3959
+
+/* FIXME: when libs/wpp gets fixed to support concatenation we can remove
+ * this and define it in version.rc */
+#define WINE_FILEVERSION_STR "6.0.3790.3959"
+
+#else
+
+/* Version from Windows Vista RTM */
+
+#define WINE_FILEVERSION_MAJOR         6
 #define WINE_FILEVERSION_MINOR         0
-#define WINE_FILEVERSION_BUILD      3900
-#define WINE_FILEVERSION_PLATFORMID 6975
+#define WINE_FILEVERSION_BUILD      6000
+#define WINE_FILEVERSION_PLATFORMID 16386
 
 /* FIXME: when libs/wpp gets fixed to support concatenation we can remove
  * this and define it in version.rc */
-#define WINE_FILEVERSION_STR "5.0.3900.6975"
+#define WINE_FILEVERSION_STR "6.0.6000.16386"
+
+#endif // NTDDI_VERSION
diff --git a/dll/win32/shell32/wine/appbar.c b/dll/win32/shell32/wine/appbar.c
index 78ca967b238..3bcaf085cde 100644
--- a/dll/win32/shell32/wine/appbar.c
+++ b/dll/win32/shell32/wine/appbar.c
@@ -36,12 +36,13 @@
 #include <winuser.h>
 #include <shlobj.h>
 #include <shlwapi.h>
-
-#include "undocshell.h"
+#include <undocshell.h>
 
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
+#include "shell32_main.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(appbar);
 
 struct appbar_cmd
diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c
index b44d5d20b38..03a99ae8c3a 100644
--- a/dll/win32/shell32/wine/brsfolder.c
+++ b/dll/win32/shell32/wine/brsfolder.c
@@ -38,6 +38,7 @@
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shresdef.h"
+
 #ifdef __REACTOS__
     #include <shlwapi.h>
     #include "ui/layout.h" /* Resizable window */
diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c
index ede060044c4..0247add2710 100644
--- a/dll/win32/shell32/wine/classes.c
+++ b/dll/win32/shell32/wine/classes.c
@@ -34,6 +34,9 @@
 #include <shlwapi.h>
 #include <wine/debug.h>
 #include <wine/unicode.h>
+#ifdef __REACTOS__
+#include <strsafe.h>
+#endif
 
 #include "pidl.h"
 #include "shell32_main.h"
@@ -334,6 +337,60 @@ BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* p
 	return ret;
 }
 
+#ifdef __REACTOS__
+BOOL HCU_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx)
+{
+    HKEY hkey;
+    WCHAR sTemp[MAX_PATH];
+    BOOL ret = FALSE;
+
+    TRACE("%s\n", debugstr_w(szClass));
+
+    StringCchPrintfW(sTemp, _countof(sTemp), L"%s\\DefaultIcon", szClass);
+
+    if (!RegOpenKeyExW(HKEY_CURRENT_USER, sTemp, 0, KEY_READ, &hkey))
+    {
+        ret = HCR_RegGetIconW(hkey, szDest, szName, len, picon_idx);
+        RegCloseKey(hkey);
+	}
+
+    if (ret)
+        TRACE("-- %s %i\n", debugstr_w(szDest), *picon_idx);
+    else
+        TRACE("-- not found\n");
+
+    return ret;
+}
+
+BOOL HLM_GetIconW(int reg_idx, LPWSTR szDest, DWORD len, int* picon_idx)
+{
+    HKEY hkey;
+    WCHAR sTemp[5];
+    BOOL ret = FALSE;
+
+    TRACE("%d\n", reg_idx);
+
+    StringCchPrintfW(sTemp, _countof(sTemp), L"%d", reg_idx);
+
+    if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                       L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Icons",
+                       0,
+                       KEY_READ,
+                       &hkey))
+    {
+        ret = HCR_RegGetIconW(hkey, szDest, sTemp, len, picon_idx);
+        RegCloseKey(hkey);
+    }
+
+    if (ret)
+        TRACE("-- %s %i\n", debugstr_w(szDest), *picon_idx);
+    else
+        TRACE("-- not found\n");
+
+    return ret;
+}
+#endif
+
 /***************************************************************************************
 *	HCR_GetClassName	[internal]
 *
diff --git a/dll/win32/shell32/wine/clipboard.c b/dll/win32/shell32/wine/clipboard.c
index fc91d077ae8..908949efc6d 100644
--- a/dll/win32/shell32/wine/clipboard.c
+++ b/dll/win32/shell32/wine/clipboard.c
@@ -44,6 +44,8 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
+#include "shell32_main.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c
index 82768d2971c..4acbc31ae0a 100644
--- a/dll/win32/shell32/wine/control.c
+++ b/dll/win32/shell32/wine/control.c
@@ -30,13 +30,15 @@
 #include <shlwapi.h>
 #include <shellapi.h>
 #define COBJMACROS
+#include <shlobj.h>
 #include <shobjidl.h>
 #include <wine/debug.h>
+#include <wine/unicode.h>
 
 #include <strsafe.h>
 
 #include "cpanel.h"
-#include "wine/unicode.h"
+#include "shell32_main.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shlctrl);
 
diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h
index a9da0b2e10f..db03e2ad794 100644
--- a/dll/win32/shell32/wine/shell32_main.h
+++ b/dll/win32/shell32/wine/shell32_main.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include "shell32_version.h"
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
 
 /*******************************************
@@ -50,6 +52,14 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP
 BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx);
 BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) DECLSPEC_HIDDEN;
 
+#ifdef __REACTOS__
+/* Current User */
+BOOL HCU_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx) DECLSPEC_HIDDEN;
+
+/* Local Machine */
+BOOL HLM_GetIconW(int reg_idx, LPWSTR szDest, DWORD len, int* picon_idx) DECLSPEC_HIDDEN;
+#endif
+
 /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */
 BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot) DECLSPEC_HIDDEN;
 BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR sName, DWORD len, int* picon_idx);
diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c
index f000f9030e7..3779b2e7e56 100644
--- a/dll/win32/shell32/wine/shellord.c
+++ b/dll/win32/shell32/wine/shellord.c
@@ -631,6 +631,8 @@ SignalFileOpen (PCIDLIST_ABSOLUTE pidl)
     return FALSE;
 }
 
+#ifndef __REACTOS__
+
 /*************************************************************************
  * SHADD_get_policy - helper function for SHAddToRecentDocs
  *
@@ -672,6 +674,7 @@ static INT SHADD_get_policy(LPCSTR policy, LPDWORD type, LPVOID buffer, LPDWORD
     return ret;
 }
 
+#endif // __REACTOS__
 
 /*************************************************************************
  * SHADD_compare_mru - helper function for SHAddToRecentDocs
@@ -813,7 +816,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
     INT ret;
     WCHAR szTargetPath[MAX_PATH], szLinkDir[MAX_PATH], szLinkFile[MAX_PATH], szDescription[80];
     WCHAR szPath[MAX_PATH];
-    DWORD cbBuffer, data[64], datalen, type;
+    DWORD cbBuffer;
     HANDLE hFind;
     WIN32_FIND_DATAW find;
     HKEY hExplorerKey;
@@ -829,25 +832,10 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
     TRACE("%04x %p\n", uFlags, pv);
 
     /* check policy */
-    ret = SHADD_get_policy("NoRecentDocsHistory", &type, data, &datalen);
-    if (ret > 0 && ret != ERROR_FILE_NOT_FOUND)
-    {
-        ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret);
-    }
-    else if (ret == ERROR_SUCCESS)
-    {
-        if (!(type == REG_DWORD || (type == REG_BINARY && datalen == 4)))
-        {
-            ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%d, len=%d\n",
-                type, datalen);
-            return;
-        }
-
-        TRACE("policy value for NoRecentDocsHistory = %08x\n", data[0]);
-        /* now test the actual policy value */
-        if (data[0] != 0)
-            return;
-    }
+    ret = SHRestricted(REST_NORECENTDOCSHISTORY);
+    TRACE("policy value for NoRecentDocsHistory = %08x\n", ret);
+    if (ret != 0)
+        return;
 
     /* store to szTargetPath */
     szTargetPath[0] = 0;
diff --git a/dll/win32/shell32/wine/shellreg.c b/dll/win32/shell32/wine/shellreg.c
index 807a94e5cc8..044d71e8c22 100644
--- a/dll/win32/shell32/wine/shellreg.c
+++ b/dll/win32/shell32/wine/shellreg.c
@@ -29,9 +29,10 @@
 #include <winbase.h>
 #include <shlobj.h>
 #include <shlwapi.h>
-
 #include <wine/debug.h>
 
+#include "shell32_main.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*************************************************************************
diff --git a/dll/win32/shell32/wine/shellstring.c b/dll/win32/shell32/wine/shellstring.c
index 6099325559c..78e25390fe8 100644
--- a/dll/win32/shell32/wine/shellstring.c
+++ b/dll/win32/shell32/wine/shellstring.c
@@ -25,12 +25,12 @@
 #include <winbase.h>
 #include <shlobj.h>
 #include <shlwapi.h>
+#include <undocshell.h>
+#include <shlwapi_undoc.h>
 #include <wine/unicode.h>
 #include <wine/debug.h>
 
 #include "shell32_main.h"
-#include "undocshell.h"
-#include "shlwapi_undoc.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dll/win32/shell32/wine/shpolicy.c b/dll/win32/shell32/wine/shpolicy.c
index 84086318853..1300a2e7aa9 100644
--- a/dll/win32/shell32/wine/shpolicy.c
+++ b/dll/win32/shell32/wine/shpolicy.c
@@ -2,6 +2,7 @@
  * shpolicy.c - Data for shell/system policies.
  *
  * Copyright 1999 Ian Schmidt <ischmidt@cfl.rr.com>
+ * Copyright 2022 Hermes Belusca-Maito
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,7 +27,10 @@
  * You could easily write one with the information in
  * this file...
  *
- * Up to date as of SHELL32 v5.00 (W2K)
+ * Up to date as of SHELL32 v6.00 (Win2k3)
+ * References:
+ * https://www.geoffchappell.com/studies/windows/shell/shell32/api/util/restrictions.htm
+ * https://docs.microsoft.com/en-us/windows/win32/api/shlobj_core/ne-shlobj_core-restrictions
  */
 
 #include <stdarg.h>
@@ -60,17 +64,29 @@ typedef struct tagPOLICYDAT
 static const char strExplorer[] = {"Explorer"};
 static const char strActiveDesk[] = {"ActiveDesktop"};
 static const char strWinOldApp[] = {"WinOldApp"};
+#if (WINE_FILEVERSION_MAJOR < 6)
+/* Windows 2000/Me SHELL32 uses "AddRemoveProgs" */
 static const char strAddRemoveProgs[] = {"AddRemoveProgs"};
+#else
+static const char strAddRemoveProgs[] = {"Uninstall"};
+#endif
+#ifdef __REACTOS__
+static const char strSystem[] = {"System"};
+#endif
 
 /* key strings */
 
+#ifndef __REACTOS__
 static const char strNoFileURL[] = {"NoFileUrl"};
+#endif
 static const char strNoFolderOptions[] = {"NoFolderOptions"};
 static const char strNoChangeStartMenu[] = {"NoChangeStartMenu"};
 static const char strNoWindowsUpdate[] = {"NoWindowsUpdate"};
 static const char strNoSetActiveDesktop[] = {"NoSetActiveDesktop"};
 static const char strNoForgetSoftwareUpdate[] = {"NoForgetSoftwareUpdate"};
-//static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
+static const char strNoMSAppLogo[] = {"NoMSAppLogo5ChannelNotify"};
+#endif
 static const char strForceCopyACLW[] = {"ForceCopyACLWithFile"};
 static const char strNoResolveTrk[] = {"NoResolveTrack"};
 static const char strNoResolveSearch[] = {"NoResolveSearch"};
@@ -93,7 +109,14 @@ static const char strNoRecentDocMenu[] = {"NoRecentDocsMenu"};
 static const char strNoRecentDocHistory[] = {"NoRecentDocsHistory"};
 static const char strNoInetIcon[] = {"NoInternetIcon"};
 static const char strNoSettingsWizard[] = {"NoSettingsWizards"};
+#if (WINE_FILEVERSION_MAJOR < 5)
+// NOTE: This value now only controls the LogOff capability in the TaskMgr.
 static const char strNoLogoff[] = {"NoLogoff"};
+#else
+// NOTE: This is the new value that controls the presence/absence
+// of the LogOff item in the Start Menu.
+static const char strNoLogoff[] = {"StartMenuLogoff"};
+#endif
 static const char strNoNetConDis[] = {"NoNetConnectDisconnect"};
 static const char strNoViewContextMenu[] = {"NoViewContextMenu"};
 static const char strNoTrayContextMenu[] = {"NoTrayContextMenu"};
@@ -101,13 +124,13 @@ static const char strNoWebMenu[] = {"NoWebMenu"};
 static const char strLnkResolveIgnoreLnkInfo[] = {"LinkResolveIgnoreLinkInfo"};
 static const char strNoCommonGroups[] = {"NoCommonGroups"};
 static const char strEnforceShlExtSecurity[] = {"EnforceShellExtensionSecurity"};
-static const char strNoRealMode[] = {"NoRealMode"};
+static const char strNoRealMode[] = {"NoRealMode"};             // REGSTR_VAL_WINOLDAPP_NOREALMODE
 static const char strMyDocsOnNet[] = {"MyDocsOnNet"};
 static const char strNoStartMenuSubfolder[] = {"NoStartMenuSubFolders"};
-static const char strNoAddPrinters[] = {"NoAddPrinter"};
-static const char strNoDeletePrinters[] = {"NoDeletePrinter"};
-static const char strNoPrintTab[] = {"NoPrinterTabs"};
-static const char strRestrictRun[] = {"RestrictRun"};
+static const char strNoAddPrinters[] = {"NoAddPrinter"};        // REGSTR_VAL_PRINTERS_NOADD
+static const char strNoDeletePrinters[] = {"NoDeletePrinter"};  // REGSTR_VAL_PRINTERS_NODELETE
+static const char strNoPrintTab[] = {"NoPrinterTabs"};          // REGSTR_VAL_PRINTERS_HIDETABS
+static const char strRestrictRun[] = {"RestrictRun"};           // REGSTR_VAL_RESTRICTRUN
 static const char strNoStartBanner[] = {"NoStartBanner"};
 static const char strNoNetworkNeighborhood[] = {"NoNetHood"};
 static const char strNoDriveTypeAtRun[] = {"NoDriveTypeAutoRun"};
@@ -122,9 +145,6 @@ static const char strNoFileMenu[] = {"NoFileMenu"};
 static const char strNoSaveSetting[] = {"NoSaveSettings"};
 static const char strNoClose[] = {"NoClose"};
 static const char strNoRun[] = {"NoRun"};
-#ifdef __REACTOS__
-static const char strNoSimpleStartMenu[] = {"NoSimpleStartMenu"};
-#endif
 
 /* policy data array */
 static POLICYDATA sh32_policy_table[] =
@@ -401,13 +421,21 @@ static POLICYDATA sh32_policy_table[] =
   },
   {
     REST_NOCLOSE_DRAGDROPBAND,
+#if (WINE_FILEVERSION_MAJOR < 5)
     strActiveDesk,
+#else
+    strExplorer,
+#endif
     strNoCloseDragDrop,
     SHELL_NO_POLICY
   },
   {
     REST_NOMOVINGBAND,
+#if (WINE_FILEVERSION_MAJOR < 5)
     strActiveDesk,
+#else
+    strExplorer,
+#endif
     strNoMovingBand,
     SHELL_NO_POLICY
   },
@@ -435,7 +463,7 @@ static POLICYDATA sh32_policy_table[] =
     strForceCopyACLW,
     SHELL_NO_POLICY
   },
-#if (NTDDI_VERSION < NTDDI_LONGHORN)
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
   {
     REST_NOLOGO3CHANNELNOTIFY,
     strExplorer,
@@ -542,7 +570,12 @@ static POLICYDATA sh32_policy_table[] =
   {
     REST_GREYMSIADS,
     strExplorer,
+#ifndef __REACTOS__
+// NOTE: Wine buggy
     "",
+#else
+    "GreyMSIAds",
+#endif
     SHELL_NO_POLICY
   },
   {
@@ -593,12 +626,14 @@ static POLICYDATA sh32_policy_table[] =
     "NoEncryption",
     SHELL_NO_POLICY
   },
+#if (WINE_FILEVERSION_MAJOR == 5) && (NTDDI_VERSION < NTDDI_LONGHORN)
   {
     REST_ALLOWFRENCHENCRYPTION,
     strExplorer,
     "AllowFrenchEncryption",
     SHELL_NO_POLICY
   },
+#endif
   {
     REST_DONTSHOWSUPERHIDDEN,
     strExplorer,
@@ -617,6 +652,7 @@ static POLICYDATA sh32_policy_table[] =
     "NoHardwareTab",
     SHELL_NO_POLICY
   },
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
   {
     REST_NORUNASINSTALLPROMPT,
     strExplorer,
@@ -629,18 +665,21 @@ static POLICYDATA sh32_policy_table[] =
     "PromptRunasInstallNetPath",
     SHELL_NO_POLICY
   },
+#endif
   {
     REST_NOMANAGEMYCOMPUTERVERB,
     strExplorer,
     "NoManageMyComputerVerb",
     SHELL_NO_POLICY
   },
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
   {
     REST_NORECENTDOCSNETHOOD,
     strExplorer,
     "NoRecentDocsNetHood",
     SHELL_NO_POLICY
   },
+#endif
   {
     REST_DISALLOWRUN,
     strExplorer,
@@ -719,12 +758,14 @@ static POLICYDATA sh32_policy_table[] =
     "ForceActiveDesktopOn",
     SHELL_NO_POLICY
   },
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
   {
     REST_NOCOMPUTERSNEARME,
     strExplorer,
     "NoComputersNearMe",
     SHELL_NO_POLICY
   },
+#endif
   {
     REST_NOVIEWONDRIVE,
     strExplorer,
@@ -734,13 +775,23 @@ static POLICYDATA sh32_policy_table[] =
   {
     REST_NONETCRAWL,
     strExplorer,
+#ifndef __REACTOS__
+// NOTE: Wine buggy
     "NoNetCrawl",
+#else
+    "NoNetCrawling",
+#endif
     SHELL_NO_POLICY
   },
   {
     REST_NOSHAREDDOCUMENTS,
     strExplorer,
+#ifndef __REACTOS__
+// NOTE: Wine buggy
     "NoSharedDocs",
+#else
+    "NoSharedDocuments",
+#endif
     SHELL_NO_POLICY
   },
   {
@@ -749,27 +800,455 @@ static POLICYDATA sh32_policy_table[] =
     "NoSMMyDocs",
     SHELL_NO_POLICY
   },
+
+#ifdef __REACTOS__
+  {
+    REST_NOSMMYPICS,
+    strExplorer,
+    "NoSMMyPictures",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_ALLOWBITBUCKDRIVES,
+    strExplorer,
+    "RecycleBinDrives",
+    SHELL_NO_POLICY
+  },
+#endif
+
 /* 0x4000050 - 0x4000060 */
+#if (WINE_FILEVERSION_MAJOR >= 6)
   {
     REST_NONLEGACYSHELLMODE,
     strExplorer,
     "NoneLegacyShellMode",
     SHELL_NO_POLICY
   },
+#endif
+
 #ifdef __REACTOS__
+
+  {
+    REST_NOCONTROLPANELBARRICADE,
+    strExplorer,
+    "NoControlPanelBarricade",
+    SHELL_NO_POLICY
+  },
+
+// NOTE: REST_NOSTARTPAGE never really existed.
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+  {
+    REST_NOAUTOTRAYNOTIFY,
+    strExplorer,
+    "NoAutoTrayNotify",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOTASKGROUPING,
+    strExplorer,
+    "NoTaskGrouping",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOCDBURNING,
+    strExplorer,
+    "NoCDBurning",
+    SHELL_NO_POLICY
+  },
+#endif // WINE_FILEVERSION_MAJOR
+  {
+    REST_MYCOMPNOPROP,
+    strExplorer,
+    "NoPropertiesMyComputer",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_MYDOCSNOPROP,
+    strExplorer,
+    "NoPropertiesMyDocuments",
+    SHELL_NO_POLICY
+  },
+#if (WINE_FILEVERSION_MAJOR >= 6)
   {
     REST_NOSTARTPANEL,
     strExplorer,
-    strNoSimpleStartMenu,
+    "NoSimpleStartMenu",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPLAYAPPEARANCEPAGE,
+    strSystem,
+    "NoDispAppearancePage", // REGSTR_VAL_DISPCPL_NOAPPEARANCEPAGE
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOTHEMESTAB,
+    strExplorer,
+    "NoThemesTab",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOVISUALSTYLECHOICE,
+    strSystem,
+    "NoVisualStyleChoice",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSIZECHOICE,
+    strSystem,
+    "NoSizeChoice",
     SHELL_NO_POLICY
   },
-#endif
+  {
+    REST_NOCOLORCHOICE,
+    strSystem,
+    "NoColorChoice",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_SETVISUALSTYLE,
+    strSystem,
+    "SetVisualStyle",
+    SHELL_NO_POLICY
+  },
+#endif // WINE_FILEVERSION_MAJOR
+
+#endif // __REACTOS__
+
   {
     REST_STARTRUNNOHOMEPATH,
     strExplorer,
     "StartRunNoHOMEPATH",
     SHELL_NO_POLICY
   },
+
+#ifdef __REACTOS__
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+  {
+    REST_NOUSERNAMEINSTARTPANEL,
+    strExplorer,
+    "NoUserNameInStartMenu",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOMYCOMPUTERICON,
+    "NonEnum",
+    "{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMNETWORKPLACES,
+    strExplorer,
+    "NoStartMenuNetworkPlaces",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMPINNEDLIST,
+    strExplorer,
+    "NoStartMenuPinnedList",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMMYMUSIC,
+    strExplorer,
+    "NoStartMenuMyMusic",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMEJECTPC,
+    strExplorer,
+    "NoStartMenuEjectPC",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMMOREPROGRAMS,
+    strExplorer,
+    "NoStartMenuMorePrograms",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSMMFUPROGRAMS,
+    strExplorer,
+    "NoStartMenuMFUprogramsList",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOTRAYITEMSDISPLAY,
+    strExplorer,
+    "NoTrayItemsDisplay",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOTOOLBARSONTASKBAR,
+    strExplorer,
+    "NoToolbarsOnTaskbar",
+    SHELL_NO_POLICY
+  },
+#endif // WINE_FILEVERSION_MAJOR
+
+  {
+    REST_NOSMCONFIGUREPROGRAMS,
+    strExplorer,
+    "NoSMConfigurePrograms",
+    SHELL_NO_POLICY
+  },
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+  {
+    REST_HIDECLOCK,
+    strExplorer,
+    "HideClock",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOLOWDISKSPACECHECKS,
+    strExplorer,
+    "NoLowDiskSpaceChecks",
+    SHELL_NO_POLICY
+  },
+#endif
+
+#if (WINE_FILEVERSION_MAJOR <= 6) && (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_NOENTIRENETWORK,
+    "Network",
+    "NoEntireNetwork",      // REGSTR_VAL_NOENTIRENETWORK
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODESKTOPCLEANUP,
+    strExplorer,
+    "NoDesktopCleanupWizard",
+    SHELL_NO_POLICY
+  },
+#endif
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+  {
+    REST_BITBUCKNUKEONDELETE,
+    strExplorer,
+    "NoRecycleFiles",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_BITBUCKCONFIRMDELETE,
+    strExplorer,
+    "ConfirmFileDelete",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_BITBUCKNOPROP,
+    strExplorer,
+    "NoPropertiesRecycleBin",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPBACKGROUND,
+    strSystem,
+    "NoDispBackgroundPage", // REGSTR_VAL_DISPCPL_NOBACKGROUNDPAGE
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPSCREENSAVEPG,
+    strSystem,
+    "NoDispScrSavPage",     // REGSTR_VAL_DISPCPL_NOSCRSAVPAGE
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPSETTINGSPG,
+    strSystem,
+    "NoDispSettingsPage",   // REGSTR_VAL_DISPCPL_NOSETTINGSPAGE
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPSCREENSAVEPREVIEW,
+    strSystem,
+    "NoScreenSavePreview",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NODISPLAYCPL,
+    strSystem,
+    "NoDispCPL",            // REGSTR_VAL_DISPCPL_NODISPCPL
+    SHELL_NO_POLICY
+  },
+  {
+    REST_HIDERUNASVERB,
+    strExplorer,
+    "HideRunAsVerb",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOTHUMBNAILCACHE,
+    strExplorer,
+    "NoThumbnailCache",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOSTRCMPLOGICAL,
+    strExplorer,
+    "NoStrCmpLogical",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOPUBLISHWIZARD,
+    strExplorer,
+    "NoPublishingWizard",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOONLINEPRINTSWIZARD,
+    strExplorer,
+    "NoOnlinePrintsWizard",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOWEBSERVICES,
+    strExplorer,
+    "NoWebServices",
+    SHELL_NO_POLICY
+  },
+#endif // WINE_FILEVERSION_MAJOR
+
+  {
+    REST_ALLOWUNHASHEDWEBVIEW,
+    strExplorer,
+    "AllowUnhashedWebView",
+    SHELL_NO_POLICY
+  },
+#if (WINE_FILEVERSION_MAJOR >= 6)
+  {
+    REST_ALLOWLEGACYWEBVIEW,
+    strExplorer,
+    "AllowLegacyWebView",
+    SHELL_NO_POLICY
+  },
+#endif
+  {
+    REST_REVERTWEBVIEWSECURITY,
+    strExplorer,
+    "RevertWebViewSecurity",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_INHERITCONSOLEHANDLES,
+    strExplorer,
+    "InheritConsoleHandles",
+    SHELL_NO_POLICY
+  },
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_SORTMAXITEMCOUNT,
+    strExplorer,
+    "SortMaxItemCount",
+    SHELL_NO_POLICY
+  },
+#endif
+  {
+    REST_NOREMOTERECURSIVEEVENTS,
+    strExplorer,
+    "NoRemoteRecursiveEvents",
+    SHELL_NO_POLICY
+  },
+
+#endif // WINE_FILEVERSION_MAJOR
+
+  {
+    REST_NOREMOTECHANGENOTIFY,
+    strExplorer,
+    "NoRemoteChangeNotify",
+    SHELL_NO_POLICY
+  },
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_NOSIMPLENETIDLIST,
+    strExplorer,
+    "NoSimpleNetIDList",
+    SHELL_NO_POLICY
+  },
+#endif
+// #if (NTDDI_VERSION < NTDDI_LONGHORN)
+// NOTE: Geoff Chappell is inacurrate here.
+  {
+    REST_NOENUMENTIRENETWORK,
+    strExplorer,
+    "NoEnumEntireNetwork",
+    SHELL_NO_POLICY
+  },
+// #endif
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_NODETAILSTHUMBNAILONNETWORK,
+    strExplorer,
+    "NoDetailsThumbnailOnNetwork",
+    SHELL_NO_POLICY
+  },
+#endif
+  {
+    REST_NOINTERNETOPENWITH,
+    strExplorer,
+    "NoInternetOpenWith",
+    SHELL_NO_POLICY
+  },
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_ALLOWLEGACYLMZBEHAVIOR,
+    strExplorer,
+    "AllowLegacyLMZBehavior",
+    SHELL_NO_POLICY
+  },
+#endif
+  {
+    REST_DONTRETRYBADNETNAME,
+    strExplorer,
+    "DontRetryBadNetName",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_ALLOWFILECLSIDJUNCTIONS,
+    strExplorer,
+    "AllowFileCLSIDJunctions",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_NOUPNPINSTALL,
+    strExplorer,
+    "NoUPnPInstallTask",
+    SHELL_NO_POLICY
+  },
+
+// "NormalizeLinkNetPidls" only in version 6.0 from Windows XP SP3.
+
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+  {
+    REST_ARP_DONTGROUPPATCHES,
+    strAddRemoveProgs,
+    "DontGroupPatches",
+    SHELL_NO_POLICY
+  },
+  {
+    REST_ARP_NOCHOOSEPROGRAMSPAGE,
+    strAddRemoveProgs,
+    "NoChooseProgramsPage",
+    SHELL_NO_POLICY
+  },
+#endif
+
+// "AllowCLSIDPROGIDMapping" in Windows XP SP3 and Windows Server 2003 SP2 only.
+// Maybe in Vista+ too?
+
+#endif // WINE_FILEVERSION_MAJOR
+
+#endif // __REACTOS__
+
 /* 0x4000061 - 0x4000086 */
   {
     REST_NODISCONNECT,
@@ -789,12 +1268,44 @@ static POLICYDATA sh32_policy_table[] =
     "NoFileAssociate",
     SHELL_NO_POLICY
   },
+
+#ifdef __REACTOS__
+
+#if (WINE_FILEVERSION_MAJOR >= 6)
+// #if (NTDDI_VERSION < NTDDI_LONGHORN)
+// NOTE: Either Geoff Chappell or MSDN is inacurrate here.
+  {
+    REST_ALLOWCOMMENTTOGGLE,
+    strExplorer,
+    "ToggleCommentPosition",
+    SHELL_NO_POLICY
+  },
+// #endif
+#if (NTDDI_VERSION < NTDDI_LONGHORN)
+  {
+    REST_USEDESKTOPINICACHE,
+    strExplorer,
+    "UseDesktopIniCache",
+    SHELL_NO_POLICY
+  },
+#endif
+
+// "NoNetFolderInfoTip" only in version 6.0 from Windows XP SP3.
+
+#endif // WINE_FILEVERSION_MAJOR
+
+#endif // __REACTOS__
+
+#ifndef __REACTOS__
+// NOTE: This is a SHDOCVW-only policy.
   {
     0x50000024,
     strExplorer,
     strNoFileURL,
     SHELL_NO_POLICY
   },
+#endif
+
   {
     0,
     0,
@@ -866,10 +1377,10 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy)
 	if (RegOpenKeyA(HKEY_CURRENT_USER, regstr, &xhkey) == ERROR_SUCCESS)
 #else // FIXME: Actually this *MUST* use shlwapi!SHRestrictionLookup()
       // See http://www.geoffchappell.com/studies/windows/shell/shell32/api/util/shrestricted.htm
-    retval = RegOpenKeyA(HKEY_LOCAL_MACHINE, regstr, &xhkey);
+    retval = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regstr, 0, KEY_READ, &xhkey);
     if (retval != ERROR_SUCCESS)
     {
-        retval = RegOpenKeyA(HKEY_CURRENT_USER, regstr, &xhkey);
+        retval = RegOpenKeyExA(HKEY_CURRENT_USER, regstr, 0, KEY_READ, &xhkey);
         if (retval != ERROR_SUCCESS)
             return 0;
     }
diff --git a/hal/halx86/apic.cmake b/hal/halx86/apic.cmake
index 8868f40c1a2..10857eeea8f 100644
--- a/hal/halx86/apic.cmake
+++ b/hal/halx86/apic.cmake
@@ -6,7 +6,6 @@ list(APPEND HAL_APIC_ASM_SOURCE
 list(APPEND HAL_APIC_SOURCE
     apic/apic.c
     apic/apictimer.c
-    apic/apicsmp.c
     apic/halinit.c
     apic/processor.c
     apic/rtctimer.c
diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c
index 0c563c335d5..8ab184e917c 100644
--- a/hal/halx86/apic/apic.c
+++ b/hal/halx86/apic/apic.c
@@ -528,10 +528,12 @@ HalpInitializePICs(IN BOOLEAN EnableInterrupts)
     HalpVectorToIndex[APC_VECTOR] = APIC_RESERVED_VECTOR;
     HalpVectorToIndex[DISPATCH_VECTOR] = APIC_RESERVED_VECTOR;
     HalpVectorToIndex[APIC_CLOCK_VECTOR] = 8;
+    HalpVectorToIndex[CLOCK_IPI_VECTOR] = APIC_RESERVED_VECTOR;
     HalpVectorToIndex[APIC_SPURIOUS_VECTOR] = APIC_RESERVED_VECTOR;
 
     /* Set interrupt handlers in the IDT */
     KeRegisterInterruptHandler(APIC_CLOCK_VECTOR, HalpClockInterrupt);
+    KeRegisterInterruptHandler(CLOCK_IPI_VECTOR, HalpClockIpi);
 #ifndef _M_AMD64
     KeRegisterInterruptHandler(APC_VECTOR, HalpApcInterrupt);
     KeRegisterInterruptHandler(DISPATCH_VECTOR, HalpDispatchInterrupt);
diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h
index e723a4f0696..e794fa9131b 100644
--- a/hal/halx86/apic/apicp.h
+++ b/hal/halx86/apic/apicp.h
@@ -43,6 +43,7 @@
     #define APIC_GENERIC_VECTOR  0xC1 // IRQL 27
     #define APIC_CLOCK_VECTOR    0xD1 // IRQL 28
     #define APIC_SYNCH_VECTOR    0xD1 // IRQL 28
+    #define CLOCK_IPI_VECTOR     0xD2 // IRQL 28
     #define APIC_IPI_VECTOR      0xE1 // IRQL 29
     #define APIC_ERROR_VECTOR    0xE3
     #define POWERFAIL_VECTOR     0xEF // IRQL 30
diff --git a/hal/halx86/apic/apictrap.S b/hal/halx86/apic/apictrap.S
index 381f5492023..e62ffc0b471 100644
--- a/hal/halx86/apic/apictrap.S
+++ b/hal/halx86/apic/apictrap.S
@@ -16,6 +16,7 @@
 .code
 
 TRAP_ENTRY HalpClockInterrupt, (TF_VOLATILES OR TF_SEND_EOI)
+TRAP_ENTRY HalpClockIpi, (TF_VOLATILES OR TF_SEND_EOI)
 TRAP_ENTRY HalpProfileInterrupt, (TF_VOLATILES OR TF_SEND_EOI)
 
 PUBLIC ApicSpuriousService
@@ -28,6 +29,7 @@ ApicSpuriousService:
 .code
 
 TRAP_ENTRY HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE
+TRAP_ENTRY HalpClockIpi, KI_PUSH_FAKE_ERROR_CODE
 TRAP_ENTRY HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE
 TRAP_ENTRY HalpTrap0D, 0
 TRAP_ENTRY HalpApcInterrupt, KI_PUSH_FAKE_ERROR_CODE
diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c
index 50b50248366..30058baebdd 100644
--- a/hal/halx86/apic/rtctimer.c
+++ b/hal/halx86/apic/rtctimer.c
@@ -13,6 +13,7 @@
 
 #include <hal.h>
 #include "apicp.h"
+#include <smp.h>
 #define NDEBUG
 #include <debug.h>
 
@@ -182,10 +183,40 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame)
         HalpSetClockRate = FALSE;
     }
 
+    /* Send the clock IPI to all other CPUs */
+    HalpBroadcastClockIpi(CLOCK_IPI_VECTOR);
+
     /* Update the system time -- on x86 the kernel will exit this trap  */
     KeUpdateSystemTime(TrapFrame, LastIncrement, Irql);
 }
 
+VOID
+FASTCALL
+HalpClockIpiHandler(IN PKTRAP_FRAME TrapFrame)
+{
+    KIRQL Irql;
+
+    /* Enter trap */
+    KiEnterInterruptTrap(TrapFrame);
+#ifdef _M_AMD64
+    /* This is for debugging */
+    TrapFrame->ErrorCode = 0xc10c4;
+#endif
+
+    /* Start the interrupt */
+    if (!HalBeginSystemInterrupt(CLOCK_LEVEL, CLOCK_IPI_VECTOR, &Irql))
+    {
+        /* Spurious, just end the interrupt */
+        KiEoiHelper(TrapFrame);
+    }
+
+    /* Call the kernel to update runtimes */
+    KeUpdateRunTime(TrapFrame, Irql);
+
+    /* End the interrupt */
+    KiEndInterrupt(Irql, TrapFrame);
+}
+
 ULONG
 NTAPI
 HalSetTimeIncrement(IN ULONG Increment)
diff --git a/hal/halx86/generic/up.c b/hal/halx86/generic/up.c
index 9e42e6f786b..6ea91e32edd 100644
--- a/hal/halx86/generic/up.c
+++ b/hal/halx86/generic/up.c
@@ -40,6 +40,14 @@ HalpSetupProcessorsTable(
     NOTHING;
 }
 
+VOID
+FASTCALL
+HalpBroadcastClockIpi(
+    _In_ UCHAR Vector)
+{
+    NOTHING;
+}
+
 #ifdef _M_AMD64
 
 VOID
diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h
index 72e09fdb28f..c1ee6a67cae 100644
--- a/hal/halx86/include/halp.h
+++ b/hal/halx86/include/halp.h
@@ -235,6 +235,7 @@ extern BOOLEAN HalpProfilingStopped;
 /* timer.c */
 CODE_SEG("INIT") VOID NTAPI HalpInitializeClock(VOID);
 VOID __cdecl HalpClockInterrupt(VOID);
+VOID __cdecl HalpClockIpi(VOID);
 VOID __cdecl HalpProfileInterrupt(VOID);
 
 typedef struct _HALP_ROLLOVER
@@ -513,6 +514,12 @@ KeUpdateSystemTime(
     IN KIRQL OldIrql
 );
 
+VOID
+NTAPI
+KeUpdateRunTime(
+    _In_ PKTRAP_FRAME TrapFrame,
+    _In_ KIRQL Irql);
+
 CODE_SEG("INIT")
 VOID
 NTAPI
diff --git a/hal/halx86/include/smp.h b/hal/halx86/include/smp.h
index 3b98c788ab9..7efa12afc39 100644
--- a/hal/halx86/include/smp.h
+++ b/hal/halx86/include/smp.h
@@ -42,6 +42,11 @@ HalpSetupProcessorsTable(
 VOID
 HalpPrintApicTables(VOID);
 
+VOID
+FASTCALL
+HalpBroadcastClockIpi(
+    _In_ UCHAR Vector);
+
 /* APIC specific functions inside apic/apicsmp.c */
 
 VOID
diff --git a/hal/halx86/smp.cmake b/hal/halx86/smp.cmake
index 73d9fe5879e..859dd68684d 100644
--- a/hal/halx86/smp.cmake
+++ b/hal/halx86/smp.cmake
@@ -1,5 +1,6 @@
 
 list(APPEND HAL_SMP_SOURCE
+    apic/apicsmp.c
     generic/buildtype.c
     generic/spinlock.c
     smp/ipi.c
diff --git a/hal/halx86/smp/smp.c b/hal/halx86/smp/smp.c
index 780de6ab53a..433e65470ed 100644
--- a/hal/halx86/smp/smp.c
+++ b/hal/halx86/smp/smp.c
@@ -33,3 +33,12 @@ HalpSetupProcessorsTable(
     CurrentPrcb = KeGetCurrentPrcb();
     HalpProcessorIdentity[NTProcessorNumber].ProcessorPrcb = CurrentPrcb;
 }
+
+VOID
+FASTCALL
+HalpBroadcastClockIpi(
+    _In_ UCHAR Vector)
+{
+    /* Send a clock IPI to all processors */
+    HalpBroadcastIpiSpecifyVector(Vector, FALSE);
+}
diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt
index 0c62b2ed6a0..da5c512640e 100644
--- a/modules/rostests/apitests/shell32/CMakeLists.txt
+++ b/modules/rostests/apitests/shell32/CMakeLists.txt
@@ -28,6 +28,7 @@ list(APPEND SOURCE
     SHCreateFileDataObject.cpp
     SHCreateFileExtractIconW.cpp
     SHParseDisplayName.cpp
+    SHRestricted.cpp
     She.cpp
     ShellExecCmdLine.cpp
     ShellExecuteEx.cpp
diff --git a/modules/rostests/apitests/shell32/SHRestricted.cpp b/modules/rostests/apitests/shell32/SHRestricted.cpp
new file mode 100644
index 00000000000..3a3f18081c0
--- /dev/null
+++ b/modules/rostests/apitests/shell32/SHRestricted.cpp
@@ -0,0 +1,108 @@
+/*
+ * PROJECT:     ReactOS API tests
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Test for SHRestricted
+ * COPYRIGHT:   Copyright 2024 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
+ */
+
+#include "shelltest.h"
+#include <versionhelpers.h>
+
+#define REGKEY_POLICIES L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies"
+#define REGKEY_POLICIES_EXPLORER REGKEY_POLICIES L"\\Explorer"
+
+typedef DWORD (WINAPI *FN_SHRestricted)(RESTRICTIONS rest);
+typedef BOOL (WINAPI *FN_SHSettingsChanged)(LPCVOID unused, LPCVOID inpRegKey);
+
+#define DELETE_VALUE(hBaseKey) \
+    SHDeleteValueW((hBaseKey), REGKEY_POLICIES_EXPLORER, L"NoRun")
+
+#define SET_VALUE(hBaseKey, value) do { \
+    dwValue = (value); \
+    SHSetValueW((hBaseKey), REGKEY_POLICIES_EXPLORER, L"NoRun", \
+                REG_DWORD, &dwValue, sizeof(dwValue)); \
+} while (0)
+
+static VOID
+TEST_SHRestricted(FN_SHRestricted fnGetValue, FN_SHSettingsChanged fnRefresh)
+{
+    DWORD dwValue;
+
+    DELETE_VALUE(HKEY_CURRENT_USER);
+    DELETE_VALUE(HKEY_LOCAL_MACHINE);
+
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 0);
+
+    SET_VALUE(HKEY_CURRENT_USER, 0);
+    DELETE_VALUE(HKEY_LOCAL_MACHINE);
+
+    ok_long(fnGetValue(REST_NORUN), 0);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 0);
+
+    SET_VALUE(HKEY_CURRENT_USER, 1);
+    DELETE_VALUE(HKEY_LOCAL_MACHINE);
+
+    ok_long(fnGetValue(REST_NORUN), 0);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 1);
+
+    DELETE_VALUE(HKEY_CURRENT_USER);
+    SET_VALUE(HKEY_LOCAL_MACHINE, 0);
+
+    ok_long(fnGetValue(REST_NORUN), 1);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 0);
+
+    DELETE_VALUE(HKEY_CURRENT_USER);
+    SET_VALUE(HKEY_LOCAL_MACHINE, 1);
+
+    ok_long(fnGetValue(REST_NORUN), 0);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 1);
+
+    SET_VALUE(HKEY_CURRENT_USER, 2);
+    SET_VALUE(HKEY_LOCAL_MACHINE, 1);
+
+    ok_long(fnGetValue(REST_NORUN), 1);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 1);
+
+    DELETE_VALUE(HKEY_CURRENT_USER);
+    DELETE_VALUE(HKEY_LOCAL_MACHINE);
+
+    ok_long(fnGetValue(REST_NORUN), 1);
+    fnRefresh(NULL, NULL);
+    ok_long(fnGetValue(REST_NORUN), 0);
+}
+
+START_TEST(SHRestricted)
+{
+    if (IsWindowsVistaOrGreater())
+    {
+        skip("Vista+");
+        return;
+    }
+
+    HMODULE hSHELL32 = LoadLibraryW(L"shell32.dll");
+    FN_SHRestricted fnGetValue;
+    FN_SHSettingsChanged fnRefresh;
+
+    fnGetValue = (FN_SHRestricted)GetProcAddress(hSHELL32, MAKEINTRESOURCEA(100));
+    fnRefresh = (FN_SHSettingsChanged)GetProcAddress(hSHELL32, MAKEINTRESOURCEA(244));
+
+    if (fnGetValue && fnRefresh)
+    {
+        TEST_SHRestricted(fnGetValue, fnRefresh);
+    }
+    else
+    {
+        if (!fnGetValue)
+            skip("SHRestricted not found\n");
+        if (!fnRefresh)
+            skip("SHSettingsChanged not found\n");
+    }
+
+    FreeLibrary(hSHELL32);
+}
diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c
index 265f58a5e83..8e9d64cf5f6 100644
--- a/modules/rostests/apitests/shell32/testlist.c
+++ b/modules/rostests/apitests/shell32/testlist.c
@@ -38,6 +38,7 @@ extern void func_ShellState(void);
 extern void func_SHGetAttributesFromDataObject(void);
 extern void func_SHLimitInputEdit(void);
 extern void func_SHParseDisplayName(void);
+extern void func_SHRestricted(void);
 
 const struct test winetest_testlist[] =
 {
@@ -76,5 +77,7 @@ const struct test winetest_testlist[] =
     { "SHGetAttributesFromDataObject", func_SHGetAttributesFromDataObject },
     { "SHLimitInputEdit", func_SHLimitInputEdit },
     { "SHParseDisplayName", func_SHParseDisplayName },
+    { "SHRestricted", func_SHRestricted },
+
     { 0, 0 }
 };
diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt
index 8eeb818902c..adba1083be0 100644
--- a/modules/rostests/apitests/shlwapi/CMakeLists.txt
+++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt
@@ -12,6 +12,7 @@ list(APPEND SOURCE
     PathUnExpandEnvStrings.c
     PathUnExpandEnvStringsForUser.c
     SHAreIconsEqual.c
+    SHGetRestriction.c
     SHLoadIndirectString.c
     SHLoadRegUIString.c
     SHPropertyBag.cpp
diff --git a/modules/rostests/apitests/shlwapi/SHGetRestriction.c b/modules/rostests/apitests/shlwapi/SHGetRestriction.c
new file mode 100644
index 00000000000..316b007eda2
--- /dev/null
+++ b/modules/rostests/apitests/shlwapi/SHGetRestriction.c
@@ -0,0 +1,143 @@
+/*
+ * PROJECT:     ReactOS api tests
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Tests for SHGetRestriction
+ * COPYRIGHT:   Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+ */
+
+#include <apitest.h>
+#include <shlwapi.h>
+
+#define REGKEY_POLICIES L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies"
+#define REGKEY_POLICIES_EXPLORER  REGKEY_POLICIES L"\\Explorer"
+
+typedef DWORD (WINAPI *FN_SHGetRestriction)(LPCWSTR lpSubKey, LPCWSTR lpSubName, LPCWSTR lpValue);
+typedef BOOL (WINAPI *FN_SHSettingsChanged)(LPCVOID unused, LPCVOID inpRegKey);
+
+static DWORD
+Candidate_SHGetRestriction(LPCWSTR lpSubKey, LPCWSTR lpSubName, LPCWSTR lpValue)
+{
+    WCHAR szPath[MAX_PATH];
+    DWORD cbValue, dwValue = 0;
+
+    if (!lpSubKey)
+        lpSubKey = REGKEY_POLICIES;
+
+    PathCombineW(szPath, lpSubKey, lpSubName);
+
+    cbValue = sizeof(dwValue);
+    if (SHGetValueW(HKEY_LOCAL_MACHINE, szPath, lpValue, NULL, &dwValue, &cbValue) == ERROR_SUCCESS)
+        return dwValue;
+
+    cbValue = sizeof(dwValue);
+    SHGetValueW(HKEY_CURRENT_USER, szPath, lpValue, NULL, &dwValue, &cbValue);
+    return dwValue;
+}
+
+typedef struct tagTEST_ENTRY
+{
+    LPCWSTR lpSubName;
+    LPCWSTR lpValue;
+} TEST_ENTRY, *PTEST_ENTRY;
+
+static const TEST_ENTRY s_Entries[] =
+{
+    { L"Explorer", L"NoRun" },
+    { L"Explorer", L"ForceActiveDesktopOn" },
+    { L"Explorer", L"NoActiveDesktop" },
+    { L"Explorer", L"NoDisconnect" },
+    { L"Explorer", L"NoRecentDocsHistory" },
+    { L"Explorer", L"NoDriveTypeAutoRun" },
+    { L"Explorer", L"NoSimpleStartMenu" },
+    { L"System", L"DontDisplayLastUserName" },
+    { L"System", L"ShutdownWithoutLogon" },
+    { L"System", L"UndockWithoutLogon" },
+};
+
+static void
+TEST_DoEntry(const TEST_ENTRY *entry, FN_SHGetRestriction fnSHGetRestriction)
+{
+    DWORD value1 = fnSHGetRestriction(NULL, entry->lpSubName, entry->lpValue);
+    DWORD value2 = Candidate_SHGetRestriction(NULL, entry->lpSubName, entry->lpValue);
+    //trace("%ld vs %ld\n", value1, value2);
+    ok_long(value1, value2);
+}
+
+#define DELETE_VALUE(hBaseKey) \
+    SHDeleteValueW((hBaseKey), REGKEY_POLICIES_EXPLORER, L"NoRun")
+
+#define SET_VALUE(hBaseKey, value) do { \
+    dwValue = (value); \
+    SHSetValueW((hBaseKey), REGKEY_POLICIES_EXPLORER, L"NoRun", \
+                REG_DWORD, &dwValue, sizeof(dwValue)); \
+} while (0)
+
+static void
+TEST_SHGetRestriction_Stage(
+    INT iStage,
+    FN_SHGetRestriction fnSHGetRestriction)
+{
+    size_t iItem;
+    DWORD dwValue;
+
+    trace("Stage #%d\n", iStage);
+
+    switch (iStage)
+    {
+        case 0:
+            DELETE_VALUE(HKEY_CURRENT_USER);
+            DELETE_VALUE(HKEY_LOCAL_MACHINE);
+            break;
+        case 1:
+            SET_VALUE(HKEY_CURRENT_USER, 0);
+            DELETE_VALUE(HKEY_LOCAL_MACHINE);
+            break;
+        case 2:
+            SET_VALUE(HKEY_CURRENT_USER, 1);
+            DELETE_VALUE(HKEY_LOCAL_MACHINE);
+            break;
+        case 3:
+            DELETE_VALUE(HKEY_CURRENT_USER);
+            SET_VALUE(HKEY_LOCAL_MACHINE, 0);
+            break;
+        case 4:
+            DELETE_VALUE(HKEY_CURRENT_USER);
+            SET_VALUE(HKEY_LOCAL_MACHINE, 1);
+            break;
+        case 5:
+            SET_VALUE(HKEY_CURRENT_USER, 0);
+            SET_VALUE(HKEY_LOCAL_MACHINE, 1);
+            break;
+        case 6:
+            SET_VALUE(HKEY_CURRENT_USER, 1);
+            SET_VALUE(HKEY_LOCAL_MACHINE, 0);
+            break;
+    }
+
+    for (iItem = 0; iItem < _countof(s_Entries); ++iItem)
+    {
+        TEST_DoEntry(&s_Entries[iItem], fnSHGetRestriction);
+    }
+}
+
+START_TEST(SHGetRestriction)
+{
+    HMODULE hSHLWAPI = LoadLibraryW(L"shlwapi.dll");
+    FN_SHGetRestriction fn = (FN_SHGetRestriction)GetProcAddress(hSHLWAPI, MAKEINTRESOURCEA(271));
+    INT iStage;
+
+    if (fn)
+    {
+        for (iStage = 0; iStage < 7; ++iStage)
+            TEST_SHGetRestriction_Stage(iStage, fn);
+
+        DELETE_VALUE(HKEY_CURRENT_USER);
+        DELETE_VALUE(HKEY_LOCAL_MACHINE);
+    }
+    else
+    {
+        skip("SHGetRestriction not found\n");
+    }
+
+    FreeLibrary(hSHLWAPI);
+}
diff --git a/modules/rostests/apitests/shlwapi/testlist.c b/modules/rostests/apitests/shlwapi/testlist.c
index 08fd3c8e2be..9ec57ee2686 100644
--- a/modules/rostests/apitests/shlwapi/testlist.c
+++ b/modules/rostests/apitests/shlwapi/testlist.c
@@ -8,6 +8,7 @@ extern void func_isuncpathservershare(void);
 extern void func_PathUnExpandEnvStrings(void);
 extern void func_PathUnExpandEnvStringsForUser(void);
 extern void func_SHAreIconsEqual(void);
+extern void func_SHGetRestriction(void);
 extern void func_SHLoadIndirectString(void);
 extern void func_SHLoadRegUIString(void);
 extern void func_SHPropertyBag(void);
@@ -22,6 +23,7 @@ const struct test winetest_testlist[] =
     { "PathUnExpandEnvStrings", func_PathUnExpandEnvStrings },
     { "PathUnExpandEnvStringsForUser", func_PathUnExpandEnvStringsForUser },
     { "SHAreIconsEqual", func_SHAreIconsEqual },
+    { "SHGetRestriction", func_SHGetRestriction },
     { "SHLoadIndirectString", func_SHLoadIndirectString },
     { "SHLoadRegUIString", func_SHLoadRegUIString },
     { "SHPropertyBag", func_SHPropertyBag },
diff --git a/ntoskrnl/ke/amd64/interrupt.c b/ntoskrnl/ke/amd64/interrupt.c
index bf74eb2722c..d12902b4fb9 100644
--- a/ntoskrnl/ke/amd64/interrupt.c
+++ b/ntoskrnl/ke/amd64/interrupt.c
@@ -84,8 +84,14 @@ KeConnectInterrupt(IN PKINTERRUPT Interrupt)
     PKINTERRUPT ConnectedInterrupt;
     KIRQL OldIrql;
 
-    ASSERT(Interrupt->Vector >= PRIMARY_VECTOR_BASE);
-    ASSERT(Interrupt->Vector <= MAXIMUM_IDTVECTOR);
+    /* Validate the vector */
+    if ((Interrupt->Vector < PRIMARY_VECTOR_BASE) ||
+        (Interrupt->Vector > MAXIMUM_IDTVECTOR))
+    {
+        DPRINT1("Invalid interrupt vector: %lu\n", Interrupt->Vector);
+        return FALSE;
+    }
+
     ASSERT(Interrupt->Number < KeNumberProcessors);
     ASSERT(Interrupt->Irql <= HIGH_LEVEL);
     ASSERT(Interrupt->SynchronizeIrql >= Interrupt->Irql);
diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c
index 3e5630bd1ac..301c5057de4 100644
--- a/ntoskrnl/mm/ARM3/expool.c
+++ b/ntoskrnl/mm/ARM3/expool.c
@@ -877,7 +877,6 @@ ExpInsertPoolTracker(IN ULONG Key,
     // ASSERT on ReactOS features not yet supported
     //
     ASSERT(!(PoolType & SESSION_POOL_MASK));
-    ASSERT(KeGetCurrentProcessorNumber() == 0);
 
     //
     // Why the double indirection? Because normally this function is also used
diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h
index 629d9f4a827..ba9f05b4878 100644
--- a/sdk/include/psdk/shlobj.h
+++ b/sdk/include/psdk/shlobj.h
@@ -1677,7 +1677,7 @@ typedef enum RESTRICTIONS
 	REST_NORESOLVESEARCH,
 	REST_NORESOLVETRACK,
 	REST_FORCECOPYACLWITHFILE,
-#if (NTDDI_VERSION < NTDDI_LONGHORN)
+#if (NTDDI_VERSION < NTDDI_VISTA)
 	REST_NOLOGO3CHANNELNOTIFY	= 0x4000001C,
 #endif
 	REST_NOFORGETSOFTWAREUPDATE	= 0x4000001D,
@@ -1705,17 +1705,19 @@ typedef enum RESTRICTIONS
 	REST_NOWEBVIEW,
 	REST_NOCUSTOMIZETHISFOLDER,
 	REST_NOENCRYPTION,
-
-	REST_ALLOWFRENCHENCRYPTION,	/* not documented */
-
-	REST_DONTSHOWSUPERHIDDEN,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+	REST_ALLOWFRENCHENCRYPTION = 0x40000036,	/* not documented */
+#endif
+	REST_DONTSHOWSUPERHIDDEN = 0x40000037,
 	REST_NOSHELLSEARCHBUTTON,
 	REST_NOHARDWARETAB,
 	REST_NORUNASINSTALLPROMPT,
 	REST_PROMPTRUNASINSTALLNETPATH,
 	REST_NOMANAGEMYCOMPUTERVERB,
-	REST_NORECENTDOCSNETHOOD,
-	REST_DISALLOWRUN,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+	REST_NORECENTDOCSNETHOOD = 0x4000003D,	/* not documented */
+#endif
+	REST_DISALLOWRUN = 0x4000003E,
 	REST_NOWELCOMESCREEN,
 	REST_RESTRICTCPL,		/* 0x40000040 */
 	REST_DISALLOWCPL,
@@ -1728,12 +1730,17 @@ typedef enum RESTRICTIONS
 	REST_NOLOCALMACHINERUNONCE,
 	REST_NOCURRENTUSERRUNONCE,
 	REST_FORCEACTIVEDESKTOPON,
-	REST_NOCOMPUTERSNEARME,
-	REST_NOVIEWONDRIVE,
-	REST_NONETCRAWL,
-	REST_NOSHAREDDOCUMENTS,
-	REST_NOSMMYDOCS,
-	REST_NOSMMYPICS,		/* 0x40000050 */
+#if (NTDDI_VERSION < NTDDI_VISTA)
+	REST_NOCOMPUTERSNEARME = 0x4000004B,	/* not documented */
+#endif
+	REST_NOVIEWONDRIVE = 0x4000004C,
+#if (NTDDI_VERSION >= NTDDI_WINXP) || defined(IE_BACKCOMPAT_VERSION)
+	REST_NONETCRAWL = 0x4000004D,
+	REST_NOSHAREDDOCUMENTS = 0x4000004E,
+#endif
+	REST_NOSMMYDOCS = 0x4000004F,
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+	REST_NOSMMYPICS = 0x40000050,
 	REST_ALLOWBITBUCKDRIVES,
 	REST_NONLEGACYSHELLMODE,
 	REST_NOCONTROLPANELBARRICADE,
@@ -1741,17 +1748,25 @@ typedef enum RESTRICTIONS
 	REST_NOAUTOTRAYNOTIFY,
 	REST_NOTASKGROUPING,
 	REST_NOCDBURNING,
-	REST_MYCOMPNOPROP,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN2KSP3)
+	REST_MYCOMPNOPROP = 0x40000058,
 	REST_MYDOCSNOPROP,
-	REST_NOSTARTPANEL,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+	REST_NOSTARTPANEL = 0x4000005A,
 	REST_NODISPLAYAPPEARANCEPAGE,
 	REST_NOTHEMESTAB,
 	REST_NOVISUALSTYLECHOICE,
 	REST_NOSIZECHOICE,
 	REST_NOCOLORCHOICE,
 	REST_SETVISUALSTYLE,		/* 0x40000060 */
-	REST_STARTRUNNOHOMEPATH,
-	REST_NOUSERNAMEINSTARTPANEL,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN2KSP3)
+	REST_STARTRUNNOHOMEPATH = 0x40000061,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+	REST_NOUSERNAMEINSTARTPANEL = 0x40000062,
 	REST_NOMYCOMPUTERICON,
 	REST_NOSMNETWORKPLACES,
 	REST_NOSMPINNEDLIST,
@@ -1761,14 +1776,20 @@ typedef enum RESTRICTIONS
 	REST_NOSMMFUPROGRAMS,
 	REST_NOTRAYITEMSDISPLAY,
 	REST_NOTOOLBARSONTASKBAR,
+#endif
 	/* 0x4000006C
 	   0x4000006D
 	   0x4000006E */
+#if (NTDDI_VERSION >= NTDDI_WIN2KSP3)
 	REST_NOSMCONFIGUREPROGRAMS	= 0x4000006F,
-	REST_HIDECLOCK,			/* 0x40000070 */
+#endif
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+	REST_HIDECLOCK = 0x40000070,
 	REST_NOLOWDISKSPACECHECKS,
-	REST_NOENTIRENETWORK,
-	REST_NODESKTOPCLEANUP,
+#endif
+	REST_NOENTIRENETWORK = 0x40000072,
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+	REST_NODESKTOPCLEANUP = 0x40000073,
 	REST_BITBUCKNUKEONDELETE,
 	REST_BITBUCKCONFIRMDELETE,
 	REST_BITBUCKNOPROP,
@@ -1779,19 +1800,65 @@ typedef enum RESTRICTIONS
 	REST_NODISPLAYCPL,
 	REST_HIDERUNASVERB,
 	REST_NOTHUMBNAILCACHE,
-	REST_NOSTRCMPLOGICAL,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WINXPSP1) || defined(IE_BACKCOMPAT_VERSION)
+	REST_NOSTRCMPLOGICAL = 0x4000007E,
 	REST_NOPUBLISHWIZARD,
 	REST_NOONLINEPRINTSWIZARD,	/* 0x40000080 */
 	REST_NOWEBSERVICES,
-	REST_ALLOWUNHASHEDWEBVIEW,
-	REST_ALLOWLEGACYWEBVIEW,
-	REST_REVERTWEBVIEWSECURITY,
-
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN2KSP3)
+	REST_ALLOWUNHASHEDWEBVIEW = 0x40000082,
+#endif
+	REST_ALLOWLEGACYWEBVIEW = 0x40000083,
+#if (NTDDI_VERSION >= NTDDI_WIN2KSP3)
+	REST_REVERTWEBVIEWSECURITY = 0x40000084,
+#endif
+    /* 0x40000085 */
 	REST_INHERITCONSOLEHANDLES	= 0x40000086,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+	REST_SORTMAXITEMCOUNT = 0x40000087,
+#endif
+    /* 0x40000088 */
+    REST_NOREMOTERECURSIVEEVENTS = 0x40000089,
+    /* 0x4000008A - 0x40000090 */
+#if (NTDDI_VERSION >= NTDDI_WINXPSP2)
+	REST_NOREMOTECHANGENOTIFY	= 0x40000091,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+    REST_NOSIMPLENETIDLIST = 0x40000092,
+#endif
+    REST_NOENUMENTIRENETWORK = 0x40000093,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+    REST_NODETAILSTHUMBNAILONNETWORK = 0x40000094,
+#endif
+    REST_NOINTERNETOPENWITH = 0x40000095,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+	REST_ALLOWLEGACYLMZBEHAVIOR = 0x40000096,	/* not documented */
+#endif
+#endif
+#if (NTDDI_VERSION >= NTDDI_WINXPSP2)
+    REST_DONTRETRYBADNETNAME = 0x4000009B,
+    REST_ALLOWFILECLSIDJUNCTIONS,
+    REST_NOUPNPINSTALL,
+#endif
+    /* 0x4000009E - "NormalizeLinkNetPidls" */
+
+    REST_ARP_DONTGROUPPATCHES = 0x400000AC,
+    REST_ARP_NOCHOOSEPROGRAMSPAGE,
+
+    /* 0x400000FF - "AllowCLSIDPROGIDMapping" */
 
 	REST_NODISCONNECT		= 0x41000001,
 	REST_NOSECURITY,
 	REST_NOFILEASSOCIATE,		/* 0x41000003 */
+
+#if (NTDDI_VERSION >= NTDDI_WINXPSP2)
+    REST_ALLOWCOMMENTTOGGLE = 0x41000004,
+#if (NTDDI_VERSION < NTDDI_VISTA)
+    REST_USEDESKTOPINICACHE = 0x41000005,
+    /* 0x41000006 - "NoNetFolderInfoTip" */
+#endif
+#endif
 } RESTRICTIONS;
 
 DWORD WINAPI SHRestricted(RESTRICTIONS rest);