From 8fbc22c640781451ea801181c28acbc9e9086191 Mon Sep 17 00:00:00 2001
From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Wed, 27 Mar 2024 21:44:38 +0100
Subject: [PATCH] [0.4.9][SHELL32] RC-backports 2024-03-27

This backport covers tons of improvements within the Shell32-RCs.
E.g. It improves the IDD_FILE_PROPERTIES and IDD_FOLDER_PROPERTIES significantly in the older releases for all langs, but also the Run-Dlg and IDD_OPEN_WITH.

The following master commits are part of it:

0.4.15-dev-7838-g e3bfcdf9e2a35aeb8571781c3128d1ffcb479a4a [SHELL32] pl-PL.rc: Fix IDD_FILE_PROPERTIES & IDD_FOLDER_PROPERTIES (#6678)

Some 100%-safe parts of the yet uncommitted PR6657 [SHELL32] Update Romanian (ro-RO) translation. I didn't pick all of that yet, as most parts are still WIP.

0.4.15-dev-7833-g ee0329e0e21d30851b78a8d509c32b831cf89ff8 [SHELL32] *.rc: accelerator fixes, drive-properties bg-BG and fr-FR (#6591).
   I addressed many of the FIXMEs already in the backport so this state is superior to master even.

0.4.15-dev-7216-g d387c799ed1669052483dc67affeaca5c139ff74 [SHELL32] 640x480-ify four dialogs (#6004) IDD_DRIVE_PROPERTIES, IDD_DRIVE_TOOLS, IDD_DRIVE_HARDWARE, IDD_FOLDER_CUSTOMIZE

0.4.15-dev-6333-g fa429c8e2ffbba5338307166479553faa9cb23c7 [SHELL32] *.rc: Use 1996 as birth year in IDD_ABOUT for consistency (this leaves now only the cmd-part left to be done in this context)

0.4.15-dev-5993-g a5bff2457a1014c266ce9c808d22a9967a4baca2 [SHELL32] Improve disk properties pie chart (#5239) CORE-18906
(I picked only the rc changes for that, but left the code changes out of the backport, the result is still appealing to my eyes)

0.4.14-dev-1492-g 4af7888b29d072157fed46e0d221da238d5c5542 [SHELL32] CORE-16895 RC IDD_OPEN_WITH All langs

Important for me is also:
0.4.11-dev-30-g 39dc3cdaf6dbd5bbb9187f5b407300be1a9803a2 [SHELL32] height of pickicon (#824) CORE-14974
I ported that back into 0.4.10-RC-21-g 38462453e2ed3ea5245609ea08c7c0783224d4b7 already, because in releases/0.4.10 it fixed a regression (which isn't the case for the older branches)
Because that is an important preparation-step for when I will port back Katayamas font-metrics-fixes from 0.4.10-dev'ing later. It doesn't fix anything in the older branches until then.

In releases/0.4.14 and lower I stripped the en-GB.rc,
because that was (aside from 3-4 lines of forgotten sync) the same content to en-US.rc still. Real intended changes reached en-GB.rc not before 0.4.15-dev.
Furthermore this translation does not exist in 2k3sp2 afaik.
Also strip GUI-controls for some other features that are yet unimplemented in older ros versions, and that I won't port back, namely:
- drive-indexing/compression-checkboxes and "Disk Cleanup"-button in IDD_DRIVE_PROPERTIES
- controls for GUI-versions of "Backup" and "Defragmentation" in IDD_DRIVE_TOOLS DIALOGEX
- and the related icons for the above

In releases/0.4.9 and lower I additionally stripped the IDD_FOLDER_OPTIONS_GENERAL tab, because it is a 100% dummy there without any functionality.
First bits of its functionality was implemented only during 0.4.10-dev'ing, and I don't intend to port that back further.
It's not worth wasting my time with tweaking its appearance further in those older versions.
We can use those freed bytes to port back more helpful stuff instead later.

Binary size of shell32.dll shrinks for all branches:

shell32.dll master          RosBEWin2.2.2 GCC8.4.0 dbg x86               10.579.968 (0.4.15-dev-7836-g72a27e6)
shell32.dll releases/0.4.14 RosBEWin2.2.2 GCC8.4.0 dbg x86  9.316.684 ->  9.201.664
shell32.dll releases/0.4.14 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.345.024 ->  9.230.336
shell32.dll releases/0.4.13 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.199.616 ->  9.086.976
shell32.dll releases/0.4.12 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.146.368 ->  9.031.680
shell32.dll releases/0.4.11 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.077.248 ->  8.954.880
shell32.dll releases/0.4.10 RosBEWin2.1.6 GCC4.7.2 dbg x86  9.069.568 ->  8.945.152
shell32.dll releases/0.4. 9 RosBEWin2.1.6 GCC4.7.2 dbg x86  8.821.760 ->  8.618.496
shell32.dll releases/0.4. 8 RosBEWin2.1.6 GCC4.7.2 dbg x86  8.736.256 ->  8.536.576
shell32.dll releases/0.4. 7 RosBEWin2.1.6 GCC4.7.2 dbg x86  8.663.040 ->  8.466.944
---
 dll/win32/shell32/CFolderOptions.cpp         |  13 +-
 dll/win32/shell32/dialogs/folder_options.cpp | 161 +---
 dll/win32/shell32/icon_res.rc                |  11 -
 dll/win32/shell32/lang/bg-BG.rc              |  88 +-
 dll/win32/shell32/lang/ca-ES.rc              |  82 +-
 dll/win32/shell32/lang/cs-CZ.rc              |  89 +-
 dll/win32/shell32/lang/da-DK.rc              |  84 +-
 dll/win32/shell32/lang/de-DE.rc              |  78 +-
 dll/win32/shell32/lang/el-GR.rc              |  86 +-
 dll/win32/shell32/lang/en-GB.rc              | 902 -------------------
 dll/win32/shell32/lang/en-US.rc              |  76 +-
 dll/win32/shell32/lang/es-ES.rc              | 116 +--
 dll/win32/shell32/lang/et-EE.rc              | 102 +--
 dll/win32/shell32/lang/fi-FI.rc              |  78 +-
 dll/win32/shell32/lang/fr-FR.rc              | 102 +--
 dll/win32/shell32/lang/he-IL.rc              | 322 +++----
 dll/win32/shell32/lang/hu-HU.rc              | 281 +++---
 dll/win32/shell32/lang/it-IT.rc              |  94 +-
 dll/win32/shell32/lang/ja-JP.rc              | 146 ++-
 dll/win32/shell32/lang/ko-KR.rc              | 236 +++--
 dll/win32/shell32/lang/nl-NL.rc              |  82 +-
 dll/win32/shell32/lang/no-NO.rc              |  86 +-
 dll/win32/shell32/lang/pl-PL.rc              | 172 ++--
 dll/win32/shell32/lang/pt-BR.rc              |  86 +-
 dll/win32/shell32/lang/pt-PT.rc              | 188 ++--
 dll/win32/shell32/lang/ro-RO.rc              | 148 ++-
 dll/win32/shell32/lang/ru-RU.rc              |  94 +-
 dll/win32/shell32/lang/sk-SK.rc              |  80 +-
 dll/win32/shell32/lang/sl-SI.rc              |  82 +-
 dll/win32/shell32/lang/sq-AL.rc              |  86 +-
 dll/win32/shell32/lang/sv-SE.rc              |  78 +-
 dll/win32/shell32/lang/tr-TR.rc              | 376 ++++----
 dll/win32/shell32/lang/uk-UA.rc              | 160 ++--
 dll/win32/shell32/lang/zh-CN.rc              | 275 +++---
 dll/win32/shell32/lang/zh-TW.rc              | 747 ++++++++-------
 dll/win32/shell32/res/icons/165.ico          | Bin 25214 -> 0 bytes
 dll/win32/shell32/res/icons/167.ico          | Bin 6518 -> 0 bytes
 dll/win32/shell32/res/icons/182.ico          | Bin 7278 -> 0 bytes
 dll/win32/shell32/res/icons/183.ico          | Bin 7278 -> 0 bytes
 dll/win32/shell32/res/icons/184.ico          | Bin 6518 -> 0 bytes
 dll/win32/shell32/res/icons/185.ico          | Bin 6518 -> 0 bytes
 dll/win32/shell32/res/icons/186.ico          | Bin 6518 -> 0 bytes
 dll/win32/shell32/res/icons/187.ico          | Bin 6518 -> 0 bytes
 dll/win32/shell32/shell32.rc                 |   3 -
 dll/win32/shell32/shresdef.h                 |  23 -
 45 files changed, 1860 insertions(+), 4053 deletions(-)
 delete mode 100644 dll/win32/shell32/lang/en-GB.rc
 delete mode 100644 dll/win32/shell32/res/icons/165.ico
 delete mode 100644 dll/win32/shell32/res/icons/167.ico
 delete mode 100644 dll/win32/shell32/res/icons/182.ico
 delete mode 100644 dll/win32/shell32/res/icons/183.ico
 delete mode 100644 dll/win32/shell32/res/icons/184.ico
 delete mode 100644 dll/win32/shell32/res/icons/185.ico
 delete mode 100644 dll/win32/shell32/res/icons/186.ico
 delete mode 100644 dll/win32/shell32/res/icons/187.ico

diff --git a/dll/win32/shell32/CFolderOptions.cpp b/dll/win32/shell32/CFolderOptions.cpp
index 3abb2555c77..6387b36f6e0 100644
--- a/dll/win32/shell32/CFolderOptions.cpp
+++ b/dll/win32/shell32/CFolderOptions.cpp
@@ -36,23 +36,12 @@ CFolderOptions::~CFolderOptions()
  * FolderOptions IShellPropSheetExt interface
  */
 
-INT_PTR CALLBACK FolderOptionsGeneralDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK FolderOptionsViewDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK FolderOptionsFileTypesDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 HRESULT STDMETHODCALLTYPE CFolderOptions::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam)
 {
-    HPROPSHEETPAGE hPage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_GENERAL, FolderOptionsGeneralDlg, 0, NULL);
-
-    if (hPage == NULL)
-    {
-        ERR("Failed to create property sheet page FolderOptionsGeneral\n");
-        return E_FAIL;
-    }
-    if (!pfnAddPage(hPage, lParam))
-        return E_FAIL;
-
-    hPage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_VIEW, FolderOptionsViewDlg, 0, NULL);
+    HPROPSHEETPAGE hPage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_VIEW, FolderOptionsViewDlg, 0, NULL);
     if (hPage == NULL)
     {
         ERR("Failed to create property sheet page FolderOptionsView\n");
diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp
index d8dcd593e39..6d31e20fc3c 100644
--- a/dll/win32/shell32/dialogs/folder_options.cpp
+++ b/dll/win32/shell32/dialogs/folder_options.cpp
@@ -761,161 +761,6 @@ Advanced_SortAll(VOID)
 
 EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj);
 
-static VOID
-UpdateGeneralIcons(HWND hDlg)
-{
-    HWND hwndTaskIcon, hwndFolderIcon, hwndClickIcon;
-    HICON hTaskIcon = NULL, hFolderIcon = NULL, hClickIcon = NULL;
-    LPTSTR lpTaskIconName = NULL, lpFolderIconName = NULL, lpClickIconName = NULL;
-
-    // show task setting icon
-    if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_COMMONTASKS) == BST_CHECKED)
-        lpTaskIconName = MAKEINTRESOURCE(IDI_SHELL_SHOW_COMMON_TASKS);
-    else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_CLASSICFOLDERS) == BST_CHECKED)
-        lpTaskIconName = MAKEINTRESOURCE(IDI_SHELL_CLASSIC_FOLDERS);
-
-    if (lpTaskIconName)
-    {
-        hTaskIcon = (HICON)LoadImage(shell32_hInstance,
-                                     lpTaskIconName,
-                                     IMAGE_ICON,
-                                     0,
-                                     0,
-                                     LR_DEFAULTCOLOR);
-        if (hTaskIcon)
-        {
-            hwndTaskIcon = GetDlgItem(hDlg,
-                                    IDC_FOLDER_OPTIONS_TASKICON);
-            if (hwndTaskIcon)
-            {
-                SendMessage(hwndTaskIcon,
-                            STM_SETIMAGE,
-                            IMAGE_ICON,
-                            (LPARAM)hTaskIcon);
-            }
-        }
-    }
-
-    // show Folder setting icons
-    if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW) == BST_CHECKED)
-        lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_SOME_WINDOW);
-    else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_OWNWINDOW) == BST_CHECKED)
-        lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_NEW_WINDOW);
-
-    if (lpFolderIconName)
-    {
-        hFolderIcon = (HICON)LoadImage(shell32_hInstance,
-                                       lpFolderIconName,
-                                       IMAGE_ICON,
-                                       0,
-                                       0,
-                                       LR_DEFAULTCOLOR);
-        if (hFolderIcon)
-        {
-            hwndFolderIcon = GetDlgItem(hDlg,
-                                    IDC_FOLDER_OPTIONS_FOLDERICON);
-            if (hwndFolderIcon)
-            {
-                SendMessage(hwndFolderIcon,
-                            STM_SETIMAGE,
-                            IMAGE_ICON,
-                            (LPARAM)hFolderIcon);
-            }
-        }
-    }
-
-    // Show click setting icon
-    if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_SINGLECLICK) == BST_CHECKED)
-        lpClickIconName = MAKEINTRESOURCE(IDI_SHELL_SINGLE_CLICK_TO_OPEN);
-    else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_DOUBLECLICK) == BST_CHECKED)
-        lpClickIconName = MAKEINTRESOURCE(IDI_SHELL_DOUBLE_CLICK_TO_OPEN);
-
-    if (lpClickIconName)
-    {
-        hClickIcon = (HICON)LoadImage(shell32_hInstance,
-                                      lpClickIconName,
-                                      IMAGE_ICON,
-                                      0,
-                                      0,
-                                      LR_DEFAULTCOLOR);
-        if (hClickIcon)
-        {
-            hwndClickIcon = GetDlgItem(hDlg,
-                                    IDC_FOLDER_OPTIONS_CLICKICON);
-            if (hwndClickIcon)
-            {
-                SendMessage(hwndClickIcon,
-                            STM_SETIMAGE,
-                            IMAGE_ICON,
-                            (LPARAM)hClickIcon);
-            }
-        }
-    }
-
-    // Clean up
-    if(hTaskIcon)
-        DeleteObject(hTaskIcon);
-    if(hFolderIcon)
-        DeleteObject(hFolderIcon);
-    if(hClickIcon)
-        DeleteObject(hClickIcon);
-}
-
-INT_PTR
-CALLBACK
-FolderOptionsGeneralDlg(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam
-)
-{
-    switch(uMsg)
-    {
-        case WM_INITDIALOG:
-            // FIXME
-            break;
-        case WM_COMMAND:
-            switch (LOWORD(wParam))
-            {
-                case IDC_FOLDER_OPTIONS_COMMONTASKS:
-                case IDC_FOLDER_OPTIONS_CLASSICFOLDERS:
-                case IDC_FOLDER_OPTIONS_SAMEWINDOW:
-                case IDC_FOLDER_OPTIONS_OWNWINDOW:
-                case IDC_FOLDER_OPTIONS_SINGLECLICK:
-                case IDC_FOLDER_OPTIONS_DOUBLECLICK:
-                    if (HIWORD(wParam) == BN_CLICKED)
-                    {
-                        UpdateGeneralIcons(hwndDlg);
-
-                        /* Enable the 'Apply' button */
-                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                    }
-                    break;
-            }
-            break;
-        case WM_NOTIFY:
-        {
-            LPNMHDR pnmh = (LPNMHDR)lParam;
-
-            switch (pnmh->code)
-            {
-                case PSN_SETACTIVE:
-                    break;
-
-                case PSN_APPLY:
-                    break;
-            }
-            break;
-        }
-        case WM_DESTROY:
-            break;
-        default:
-            return FALSE;
-    }
-    return FALSE;
-}
-
 static BOOL
 ViewDlg_OnInitDialog(HWND hwndDlg)
 {
@@ -2039,15 +1884,11 @@ VOID
 ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst)
 {
     PROPSHEETHEADERW pinfo;
-    HPROPSHEETPAGE hppages[3];
+    HPROPSHEETPAGE hppages[2];
     HPROPSHEETPAGE hpage;
     UINT num_pages = 0;
     WCHAR szOptions[100];
 
-    hpage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_GENERAL, FolderOptionsGeneralDlg, 0, NULL);
-    if (hpage)
-        hppages[num_pages++] = hpage;
-
     hpage = SH_CreatePropertySheetPage(IDD_FOLDER_OPTIONS_VIEW, FolderOptionsViewDlg, 0, NULL);
     if (hpage)
         hppages[num_pages++] = hpage;
diff --git a/dll/win32/shell32/icon_res.rc b/dll/win32/shell32/icon_res.rc
index 31326738158..d7951c4ead3 100644
--- a/dll/win32/shell32/icon_res.rc
+++ b/dll/win32/shell32/icon_res.rc
@@ -72,9 +72,7 @@ IDI_SHELL_TT_FONT_FILE ICON "res/icons/156.ico"
 IDI_SHELL_FONT_FILE2 ICON "res/icons/157.ico"
 IDI_SHELL_RUN2 ICON "res/icons/160.ico"
 IDI_SHELL_CONFIRM_DELETE ICON "res/icons/161.ico"
-IDI_SHELL_TOOLS_BACKUP ICON "res/icons/165.ico"
 IDI_SHELL_TOOLS_CHKDSK ICON "res/icons/166.ico"
-IDI_SHELL_TOOLS_DEFRAG ICON "res/icons/167.ico"
 IDI_SHELL_PRINTER_OK ICON "res/icons/168.ico"
 IDI_SHELL_NET_PRINTER_OK ICON "res/icons/169.ico"
 IDI_SHELL_FILE_PRINTER_OK ICON "res/icons/170.ico"
@@ -89,15 +87,6 @@ IDI_SHELL_INTERNET_CHART ICON "res/icons/178.ico"
 IDI_SHELL_COMPUTER_SYNC ICON "res/icons/179.ico"
 IDI_SHELL_COMPUTER_WINDOW ICON "res/icons/180.ico"
 IDI_SHELL_COMPUTER_DESKTOP ICON "res/icons/181.ico"
-
-/* Folder Options, General dialog */
-IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico"
-IDI_SHELL_CLASSIC_FOLDERS ICON "res/icons/183.ico"
-IDI_SHELL_OPEN_IN_SOME_WINDOW ICON "res/icons/184.ico"
-IDI_SHELL_OPEN_IN_NEW_WINDOW ICON "res/icons/185.ico"
-IDI_SHELL_SINGLE_CLICK_TO_OPEN ICON "res/icons/186.ico"
-IDI_SHELL_DOUBLE_CLICK_TO_OPEN ICON "res/icons/187.ico"
-
 IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico"
 IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico"
 IDI_SHELL_WEB_FOLDERS ICON "res/icons/193.ico"
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 56f01c1cb3f..c33c7a8f88d 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Напишете името на приложение, папка, документ или интернет източник и РеактОС ще го отвори.", 12289, 36, 11, 182, 18
-    LTEXT "&Отваряне:", 12305, 7, 39, 40, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 174, 100
+    LTEXT "Напишете името на приложение, папка, документ или интернет източник.", 12289, 36, 11, 182, 18
+    LTEXT "&Open:", 12305, 7, 39, 24, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "Добре", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Отказ", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Обзор...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -233,9 +233,9 @@ BEGIN
     LTEXT "Създадено:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Принадлежности", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Само за четене", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Скрит", 14022, 126, 151, 70, 10
+    LTEXT "Attributes:", 14020, 8, 152, 46, 10
+    AUTOCHECKBOX "Само за &четене", 14021, 58, 151, 70, 10
+    AUTOCHECKBOX "С&крит", 14022, 126, 151, 70, 10
     AUTOCHECKBOX "&Сбит", 14023, 181, 151, 70, 10
     PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
@@ -255,7 +255,7 @@ BEGIN
     PUSHBUTTON "C&hange...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Местоположение:", 14008, 8, 75, 61, 10
+    LTEXT "Location:", 14008, 8, 75, 45, 10
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Размер:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
@@ -269,7 +269,7 @@ BEGIN
     LTEXT "Използван:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 173, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Принадлежности", 14020, 8, 189, 60, 10
+    LTEXT "Attributes:", 14020, 8, 189, 45, 10
     AUTOCHECKBOX "Само за &четене", 14021, 61, 188, 67, 10
     AUTOCHECKBOX "С&крит", 14022, 129, 188, 50, 10
     AUTOCHECKBOX "&Сбит", 14023, 181, 188, 49, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Издание"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Издание на файла: ", 14000, 10, 10, 67, 10
+    LTEXT "Издание на файла:", 14000, 10, 10, 67, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Описание: ", 14002, 10, 27, 45, 10
+    LTEXT "Описание:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Възпроизводствено право: ", 14004, 10, 46, 68, 16
+    LTEXT "Възпроизводствено право:", 14004, 10, 46, 68, 16
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
     GROUPBOX "Други сведения за изданието", 14006, 6, 70, 222, 115
-    LTEXT "Име на предмета: ", 14007, 13, 82, 90, 10
-    LTEXT "Стойност: ", 14008, 112, 82, 45, 10
+    LTEXT "Име на предмета:", 14007, 13, 82, 90, 10
+    LTEXT "Стойност:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Вид:", -1, 8, 38, 95, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "Обем:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Устройство %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Почистване на &диска", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Диск %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Средства"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Този избор ще провери тома за грешки.", -1, 40, 25, 160, 20
     PUSHBUTTON "Провери веднага...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Подреждане", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Този избор ще подреди (дефрагментира) файловете на тома", -1, 40, 85, 160, 20
-    PUSHBUTTON "Подреди веднага...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Запасяване", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Този избор ще направи запасно съхранение на файловете на диска.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Запаси веднага", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 130
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Оборудване"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Файл:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Приложения", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Винаги избраното приложение да отваря този вид файлове.", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Обзор...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Винаги избраното приложение да отваря този вид файлове.", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Обзор...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "Добре", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Отказ", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Общи"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Задачи", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Показване на общите задачи в папките", IDC_FOLDER_OPTIONS_COMMONTASKS, 20, 25, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Използване на обичайните папки на ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10
-    GROUPBOX "Обзор на папките", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Отваряне на всички папки в &един прозорец", IDC_FOLDER_OPTIONS_SAMEWINDOW, 20, 70, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Отваряне на всяка папка в от&делен прозорец", IDC_FOLDER_OPTIONS_OWNWINDOW, 20, 82, 210, 10
-    GROUPBOX "Цъкането действа така:", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Отваряне с единично цъкане (избор с посочване)", IDC_FOLDER_OPTIONS_SINGLECLICK, 20, 120, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Подчертаване заглавията на значетата съгласно &обзорника ми", IDC_FOLDER_OPTIONS_ULBROWSER, 30, 220, 170, 10
-    AUTORADIOBUTTON "Подчертаване на заглавията на значетата при &посочване", IDC_FOLDER_OPTIONS_ULPOINT, 30, 144, 220, 10
-    AUTORADIOBUTTON "&Отваряне с двойно цъкане (избиране с единично)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 20, 156, 170, 10
-    PUSHBUTTON "От под&разбираните", 14011, 160, 180, 75, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Изглед"
@@ -601,8 +567,8 @@ BEGIN
     DEFPUSHBUTTON "Начало", IDOK, 63, 95, 60, 14
     GROUPBOX "Настройки за проверката", -1, 7, 6, 229, 50
     PUSHBUTTON "Отказ", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Самопоправяне на системните грешки на файловете", 14000, 16, 15, 210, 10
-    AUTOCHECKBOX "Об&хождане и опит за възстановяване на лошите сектори", 14001, 16, 30, 210, 10
+    AUTOCHECKBOX "Самопоправяне на системните грешки на файловете", 14000, 12, 15, 210, 10
+    AUTOCHECKBOX "Об&хождане и опит за възстановяване на лошите сектори", 14001, 12, 30, 210, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 42, 60, 170, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Добре", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Отказ", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Пусков изборник\\Приложения"
     IDS_PERSONAL "Книжа"
     IDS_FAVORITES "Любимки"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 5a304b8f555..77260cb41d0 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
+        MENUITEM "Cu&t", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18
+    LTEXT "Type the name of a program, folder, document, or Internet resource.", 12289, 36, 11, 182, 18
     LTEXT "&Open:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -658,7 +624,7 @@ BEGIN
     IDS_SHV_COLUMN_MODIFIED "Modified"
     IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
     IDS_SHV_COLUMN_DISK_CAPACITY "Size"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+    IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
     IDS_SHV_COLUMN_OWNER "Owner"
     IDS_SHV_COLUMN_GROUP "Group"
     IDS_SHV_COLUMN_FILENAME "Filename"
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index c5d0679a505..c0c1ac64487 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -1,8 +1,5 @@
-/* FILE:       dll/win32/shell32/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2015-04-12
- * THANKS TO:  navaraf, who translated major part of this file
- */
+// COPYRIGHT: 2003 navaraf
+//            2015 Radek Liska (Black_Fox) <radekliska@gmail.com>
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
@@ -139,7 +136,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -167,9 +164,9 @@ CAPTION "Spustit"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevře.", 12289, 36, 11, 182, 18
+    LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Otevřít:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Storno", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Procházet...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -231,7 +228,7 @@ BEGIN
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Velikost:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Velikost na disku:", 140101, 8, 88, 55, 10
+    LTEXT "Na disku:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Obsahuje:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -265,7 +262,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Velikost:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Velikost na disku:", 140112, 8, 107, 55, 10
+    LTEXT "Na disku:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Vytvořeno:", 14014, 8, 131, 45, 10
@@ -287,25 +284,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Verze"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Verze souboru: ", 14000, 10, 10, 55, 10
+    LTEXT "Verze souboru:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Popis: ", 14002, 10, 27, 45, 10
+    LTEXT "Popis:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Další informace o verzi: ", 14006, 6, 70, 222, 115
-    LTEXT "Název položky: ", 14007, 13, 82, 50, 10
-    LTEXT "Hodnota: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Další informace o verzi", 14006, 6, 70, 222, 115
+    LTEXT "Název položky:", 14007, 13, 82, 50, 10
+    LTEXT "Hodnota:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ:", -1, 8, 38, 95, 10
@@ -325,15 +322,11 @@ BEGIN
     LTEXT "Kapacita:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Disk %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Vyčištění &disku", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Disk %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Nástroje"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -342,17 +335,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Tento nástroj otestuje svazek na chyby.", -1, 40, 25, 160, 20
     PUSHBUTTON "Zkontrolovat...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentace", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Tento nástroj zdefragmentuje soubory na svazku.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmentovat...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Záloha", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Tento nástroj zazálohuje soubory na svazku.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Zálohovat...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -399,38 +384,16 @@ CAPTION "Otevřít v..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
-    LTEXT "Vyberte program, ve kterém chcete otevřít tento soubor: ", -1, 44, 12, 211, 10
+    LTEXT "Vyberte program, ve kterém chcete otevřít tento soubor:", -1, 44, 12, 211, 10
     LTEXT "Soubor:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programy", -1, 7, 42, 249, 187
     CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Vždy použít vybraný program k otevření tohoto typu souboru", 14003, 20, 193, 225, 10
-    PUSHBUTTON "P&rocházet...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Vždy použít vybraný program k otevření tohoto typu souboru", 14003, 16, 193, 232, 10
+    PUSHBUTTON "P&rocházet...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Obecné"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Úkoly", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "&Zobrazit běžné operace ve složkách", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Použít klas&ické složky ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Procházení složek", -1, 7, 60, 249, 45, WS_TABSTOP | WS_GROUP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Otevírat každou složku ve stejné&m okně", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Ote&vírat každou složku ve svém vlastním okně", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Klikání na položky", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Jedno kliknutí k &otevření položky (vybrat ukázáním)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Podtrhávat názvy ikon podle &nastavení prohlížeče", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Podtrhávat názvy ikon jen &při ukázání na ně", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Dvojkliknutí k otevření položky (vybrat kliknutím)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "O&bnovit výchozí", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Zobrazení"
@@ -608,7 +571,7 @@ BEGIN
     GROUPBOX "Možnosti kontroly disku", -1, 7, 6, 179, 40
     PUSHBUTTON "Storno", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automaticky opravovat chyby", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Vyhledat a pokusit se obnovit vadné sektory", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Vyhledat a pokusit se obnovit vadné sektory", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -622,7 +585,7 @@ BEGIN
     PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Vyberte ikonu z následujícího seznamu:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 135, 179, 50, 14
 END
@@ -749,7 +712,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Procházet"
     IDS_RUNDLG_BROWSE_FILTER "Spustitelné soubory (*.exe)\0*.exe\0Všechnysoubory (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Nabídka Start\\Programy"
     IDS_PERSONAL "Dokumenty"
     IDS_FAVORITES "Oblíbené"
@@ -880,7 +843,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 57e284a83f2..8e17828a484 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -1,9 +1,3 @@
-/* PROJECT: ReactOS Shell Library
- * FILE:    dll/win32/shell32/lang/da-DK.rc
- * PURPOSE: Danish resource file
- * UPDATED: 01 May 2009
- */
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 MENU_001 MENUEX
@@ -139,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -167,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 4, 182, 26
+    LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer.", 12289, 36, 11, 182, 18
     LTEXT "&Åbn:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Fortryd", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Gennemse...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -287,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -325,34 +319,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -403,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -608,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -622,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -749,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programmer"
     IDS_PERSONAL "Mine Dokumenter"
     IDS_FAVORITES "Favoritter"
@@ -900,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index aa42a19cee9..04b33e07349 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -163,7 +163,7 @@ BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
     LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18
     LTEXT "&Öffnen:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Durchsuchen...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -225,7 +225,7 @@ BEGIN
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Größe:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Größe auf Datenträger:", 140101, 8, 83, 55, 20
+    LTEXT "Auf Disk:", 140101, 8, 88, 45, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Inhalt:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -259,7 +259,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Größe:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Größe auf Datenträger:", 140112, 8, 102, 55, 20
+    LTEXT "Auf Disk:", 140112, 8, 107, 45, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Erstellt:", 14014, 8, 131, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Dateiversion: ", 14000, 10, 10, 55, 10
+    LTEXT "Dateiversion:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Beschreibung: ", 14002, 10, 27, 45, 10
+    LTEXT "Beschreibung:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Weitere Versionsinformationen: ", 14006, 6, 70, 222, 115
-    LTEXT "Elementname: ", 14007, 13, 82, 50, 10
-    LTEXT "Wert: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Weitere Versionsinformationen", 14006, 6, 70, 222, 115
+    LTEXT "Elementname:", 14007, 13, 82, 50, 10
+    LTEXT "Wert:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Speicherkapazität:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Laufwerk %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Bereinigen", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Laufwerk %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Extras"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Fehlerüberprüfung", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Bei Wahl dieser Option wird der Datenträger\nauf Fehler überprüft.", -1, 40, 25, 160, 20
+    LTEXT "Bei Wahl dieser Option wird der Datenträger auf Fehler überprüft.", -1, 40, 25, 160, 20
     PUSHBUTTON "Jetzt &prüfen...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem Datenträger defragmentiert.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Jetzt &defragmentieren...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Sicherung", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Bei Wahl dieser Option werden die auf dem\nDatenträger gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -403,28 +391,6 @@ BEGIN
     PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Allgemein"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Aufgaben", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "&Allgemeine Aufgaben in Ordnern anzeigen", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 150, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "ReactOS Klassisc&he Ansicht verwenden", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 150, 10
-    GROUPBOX "Ordner durchsuchen", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Jeden Ordner im &selben Fenster öffnen", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "&Jeden Ordner im eigenen Fenster öffnen", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 150, 10
-    GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Öffnen durch &einfachen Klick (Markieren durch zeigen)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10
-    AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
-    AUTORADIOBUTTON "&Öffnen durch &Doppelklick (Markieren durch einfachen Klick)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
-    PUSHBUTTON "&Wiederherstellen", 14011, 191, 175, 65, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Ansicht"
@@ -601,8 +567,8 @@ BEGIN
     DEFPUSHBUTTON "&Starten", IDOK, 63, 95, 60, 14
     GROUPBOX "Optionen für die Datenträgerprüfung", -1, 7, 6, 179, 40
     PUSHBUTTON "S&chließen", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "&Dateisystemfehler automatisch korrigieren", 14000, 16, 15, 165, 10
-    AUTOCHECKBOX "&Fehlerhafte Sektoren suchen/wiederherstellen", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Dateisystemfehler automatisch korrigieren", 14000, 12, 15, 165, 10
+    AUTOCHECKBOX "&Fehlerhafte Sektoren suchen/wiederherstellen", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL
     LTEXT "Wählen Sie ein Symbol aus der folgenden Liste:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Abbrechen", IDCANCEL, 135, 179, 50, 14
 END
@@ -744,7 +710,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Durchsuchen"
     IDS_RUNDLG_BROWSE_FILTER "Ausführbare Dateien (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Startmenü\\Programme"
     IDS_PERSONAL "Eigene Dateien"
     IDS_FAVORITES "Favoriten"
@@ -820,7 +786,7 @@ BEGIN
     IDS_DRV_FILE "Gerätetreiber"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
     IDS_EXE_FILE "Anwendung"
-    IDS_NLS_FILE "National Language Support File"
+    IDS_NLS_FILE "Sprachenunterstützungsdatei"
     IDS_OCX_FILE "ActiveX Control"
     IDS_TLB_FILE "Type Library"
     IDS_FON_FILE "Schriftartendatei"
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index dfa4d418367..0f492e65a63 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου, και το ReactOS θα το ανοίξει.", 12289, 36, 4, 182, 25
+    LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου.", 12289, 36, 11, 182, 18
     LTEXT "Ά&νοιγμα:", 12305, 5, 39, 31, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Άκυρο", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Αναζήτηση...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -233,7 +233,7 @@ BEGIN
     LTEXT "Created:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Χαρακτηριστικά:", 14020, 8, 152, 46, 10
+    LTEXT "Attributes:", 14020, 8, 152, 46, 10
     AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10
     AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10
     AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10
@@ -262,14 +262,14 @@ BEGIN
     LTEXT "Size on disk:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Δημιουργήθηκε:", 14014, 8, 131, 65, 10
+    LTEXT "Created:", 14014, 8, 131, 45, 10
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Τροποποιήθηκε:", 14016, 8, 147, 65, 10
+    LTEXT "Modified:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Προσπελάστηκε:", 14018, 8, 163, 65, 10
+    LTEXT "Accessed:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Χαρακτηριστικά:", 14020, 8, 189, 70, 10
+    LTEXT "Attributes:", 14020, 8, 189, 45, 10
     AUTOCHECKBOX "&Μόνο για ανάγνωση", 14021, 58, 188, 75, 10
     AUTOCHECKBOX "&Κρυφό", 14022, 126, 188, 50, 10
     AUTOCHECKBOX "&Archive", 14023, 181, 188, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Έκδοση"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Έκδοση αρχείου: ", 14000, 10, 10, 60, 10
+    LTEXT "Έκδοση αρχείου:", 14000, 10, 10, 60, 10
     EDITTEXT 14001, 80, 10, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Περιγραφή: ", 14002, 10, 20, 60, 10
+    LTEXT "Περιγραφή:", 14002, 10, 20, 60, 10
     EDITTEXT 14003, 80, 20, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Πνευματικά δικαιώματα: ", 14004, 10, 30, 70, 10
+    LTEXT "Πνευματικά δικαιώματα:", 14004, 10, 30, 70, 10
     EDITTEXT 14005, 80, 30, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Άλλες πληροφορίες: ", 14006, 10, 45, 220, 90
-    LTEXT "Όνομα στοιχείου: ", 14007, 20, 55, 60, 10
-    LTEXT "Τιμή: ", 14008, 130, 55, 45, 10
+    GROUPBOX "Άλλες πληροφορίες", 14006, 10, 45, 220, 90
+    LTEXT "Όνομα στοιχείου:", 14007, 20, 55, 60, 10
+    LTEXT "Τιμή:", 14008, 130, 55, 45, 10
     LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Τύπος:", -1, 8, 38, 95, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "Χωρητικότητα:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Δίσκος %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Εκκαθάριση δίσκου", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Δίσκος %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Εργαλεία"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Αυτή η επιλογή θα ελέγξει τον\nτόμο για σφάλματα.", -1, 40, 25, 160, 20
     PUSHBUTTON "Έ&λεγχος...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Ανασυγκρότηση", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Αυτή η επιλογή θα ανασυγκροτήσει τα\nαρχεία σε αυτόν τον τόμο", -1, 40, 85, 160, 20
-    PUSHBUTTON "&Ανασυγκρότηση...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Αντίγραφα ασφαλείας", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Αυτή η επιλογή θα δημιουργήσει αντίγραφα\nσφαλείας για τα αρχεία αυτού του τόμου.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Αντίγραφα ασφαλείας...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Υλικό"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Αρχείο:    %s", 14001, 44, 25, 188, 20
     GROUPBOX "Προγράμματα", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    CHECKBOX "&Άνοιγμα αυτού του είδους αρχείου, πάντα με το επιλεγμένο πρόγραμμα", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Αναζήτηση...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Άνοιγμα αυτού του είδους αρχείου, πάντα με το επιλεγμένο πρόγραμμα", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Αναζήτηση...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Άκυρο", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Τα έγγραφά μου"
     IDS_FAVORITES "Favorites"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
deleted file mode 100644
index 082fcee32ef..00000000000
--- a/dll/win32/shell32/lang/en-GB.rc
+++ /dev/null
@@ -1,902 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-
-MENU_001 MENUEX
-BEGIN
-    MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON
-    MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON
-    MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW
-    MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
-    MENUITEM "", -1, MFT_SEPARATOR
-    POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE
-    BEGIN
-        MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
-    END
-END
-
-/* shellview background menu */
-MENU_002 MENUEX
-BEGIN
-    POPUP ""
-    BEGIN
-        POPUP "&View", FCIDM_SHVIEW_VIEW
-        BEGIN
-            MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON
-            MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON
-            MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW
-            MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
-        END
-        MENUITEM "", -1, MFT_SEPARATOR
-        POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE
-        BEGIN
-            MENUITEM "", -1, MFT_SEPARATOR
-            MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
-        END
-        MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
-        MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
-        MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK
-    END
-END
-
-/* menubar EDIT menu */
-MENU_003 MENU
-BEGIN
-    MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO
-    MENUITEM SEPARATOR
-    MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT
-    MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY
-    MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT
-    MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK
-    MENUITEM SEPARATOR
-    MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO
-    MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO
-    MENUITEM SEPARATOR
-    MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION
-END
-
-/* shellview item menu */
-MENU_SHV_FILE MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
-        MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
-    END
-END
-
-IDM_DRAGFILE MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Copy here", IDM_COPYHERE
-        MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
-        MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
-    END
-END
-
-IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
-    LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24
-    LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
-    CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
-END
-
-IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
-    LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
-    LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
-    CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
-    EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
-END
-
-IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Message"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Yes to &all", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
-    LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
-END
-
-IDD_ABOUT DIALOGEX 0, 0, 275, 198
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About %s"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
-    LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
-    LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
-    LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
-    LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
-    LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
-    LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10
-    LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
-    LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
-    LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
-    LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10
-    LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10
-    DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14
-    PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14
-END
-
-IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85
-STYLE DS_SHELLFONT | WS_CHILD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10
-    LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75
-END
-
-IDD_RUN DIALOGEX 0, 0, 227, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Run"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18
-    LTEXT "&Open:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
-    DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP
-END
-
-IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Shortcut"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
-    EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Target type:", 14004, 8, 38, 68, 10
-    EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Target location:", 14006, 8, 55, 68, 10
-    EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Target:", 14008, 8, 71, 68, 10
-    EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "&Start in:", 14010, 8, 98, 68, 10
-    EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10
-    CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
-    LTEXT "&Run:", 14016, 8, 136, 68, 10
-    COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
-    LTEXT "C&omment:", 14018, 8, 154, 68, 10
-    EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
-    PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT
-END
-
-IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Extended Properties"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
-    LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10
-    CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10
-    LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40
-    CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
-END
-
-IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
-    EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Type of file:", 14004, 8, 40, 55, 10
-    CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
-    LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 56, 55, 10
-    EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 72, 55, 10
-    EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Size on disk:", 140101, 8, 88, 55, 10
-    EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Contains:", 14026, 8, 104, 55, 10
-    EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 128, 55, 10
-    EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Attributes:", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10
-    PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
-    EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
-    LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type of file:", 14004, 8, 35, 50, 10
-    CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Opens with:", 14006, 8, 53, 50, 10
-    ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
-    PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 75, 45, 10
-    EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 91, 45, 10
-    EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Size on disk:", 140112, 8, 107, 55, 10
-    EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 131, 45, 10
-    EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Modified:", 14016, 8, 147, 45, 10
-    EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Accessed:", 14018, 8, 163, 45, 10
-    EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Attributes:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 188, 67, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 188, 50, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 188, 49, 10
-    PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP
-END
-
-IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Version"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
-    EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
-    EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-    EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
-    LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
-    EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
-END
-
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
-    EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type:", -1, 8, 38, 95, 10
-    EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "File system:", -1, 8, 51, 95, 10
-    EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
-    LTEXT "Used space:", -1, 25, 69, 80, 10
-    EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10
-    LTEXT "Free space:", -1, 25, 82, 80, 10
-    EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Capacity:", -1, 25, 103, 80, 10
-    EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
-END
-
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Tools"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Error-checking", -1, 5, 5, 230, 60
-    ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
-    PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
-END
-
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Hardware"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-END
-
-IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Run As"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
-    LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
-    LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
-END
-
-IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Recycle Bin Properties"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
-    GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70
-    RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP
-    EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
-    LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10
-    RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
-    AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
-END
-
-IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Open With"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
-    LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10
-    LTEXT "File:    ", 14001, 44, 25, 188, 20
-    GROUPBOX "&Programs", -1, 7, 42, 249, 187
-    CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
-    DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
-END
-
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "View"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Folder views", -1, 7, 10, 249, 60
-    ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
-    LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20
-    PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
-    PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
-    LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
-    PUSHBUTTON "Restore &Defaults", 14004, 177, 215, 80, 14, WS_TABSTOP
-END
-
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "File Types"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT "Registered file &types:", -1, 7, 10, 70, 10
-    CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
-    PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
-    GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
-    LTEXT "Opens with:", -1, 12, 140, 40, 10
-    //ICON
-    LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
-    PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
-    LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30
-    PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
-END
-
-IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Confirm File Replace"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
-    PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14
-    PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14
-    ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
-    LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX
-    LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX
-    ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
-    LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX
-    LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX
-    ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
-END
-
-IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Log Off ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
-END
-
-IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Disconnect ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Disconnect", IDOK, 47, 38, 47, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 47, 14
-END
-
-IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "AutoPlay"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20
-    CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
-    GROUPBOX "Actions", -1, 7, 45, 212, 146
-    AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP
-    CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
-    AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10
-    PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED
-END
-
-IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON "", 1000, 5, 7, 21, 20
-    LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8
-    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
-    DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14
-END
-
-IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20
-    ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
-    EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8
-    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
-    AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10
-    DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14
-END
-
-IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Autoplay"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22
-    LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8
-    CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
-    AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8
-    DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14
-END
-
-IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Shut Down ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
-    LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10
-    COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
-    LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37
-    DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
-    PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14
-    PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14
-END
-
-IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14
-    PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14
-    LTEXT "Ca&pacity:", -1, 7, 6, 169, 9
-    COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "&File system", -1, 7, 35, 170, 9
-    COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
-    LTEXT "&Allocation unit size", -1, 7, 64, 170, 9
-    COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "Volume &label", -1, 7, 93, 170, 9
-    EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
-    GROUPBOX "Format &options", 4610, 7, 121, 170, 49
-    AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10
-    AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
-END
-
-IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Check Disk"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14
-    GROUPBOX "Check disk options", -1, 7, 6, 179, 40
-    PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
-    CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
-    LTEXT "", 14003, 60, 80, 170, 10
-END
-
-IDD_PICK_ICON DIALOGEX 0, 0, 193, 200
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
-    PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
-    EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
-END
-
-IDD_NOOPEN DIALOGEX 0, 0, 240, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Caution"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "This file could either be used by the operating system or by\n\
-another application. Modifying this file might damage your\n\
-system or make it less functional.\n\n\
-Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
-    DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14
-    PUSHBUTTON "No", IDNO, 180, 55, 50, 14
-END
-
-IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "&File Extension:", -1, 10, 10, 85, 14
-    EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
-    COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
-END
-
-STRINGTABLE
-BEGIN
-    /* columns in the shellview */
-    IDS_SHV_COLUMN_NAME "Name"
-    IDS_SHV_COLUMN_SIZE "Size"
-    IDS_SHV_COLUMN_TYPE "Type"
-    IDS_SHV_COLUMN_MODIFIED "Modified"
-    IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
-    IDS_SHV_COLUMN_DISK_CAPACITY "Size"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
-    IDS_SHV_COLUMN_OWNER "Owner"
-    IDS_SHV_COLUMN_GROUP "Group"
-    IDS_SHV_COLUMN_FILENAME "Filename"
-    IDS_SHV_COLUMN_CATEGORY "Category"
-    IDS_SHV_COLUMN_DELFROM "Original location"
-    IDS_SHV_COLUMN_DELDATE "Date deleted"
-    IDS_SHV_COLUMN_FONTTYPE "Fonttype"
-    IDS_SHV_COLUMN_WORKGROUP "Workgroup"
-    IDS_SHV_COLUMN_NETLOCATION "Network Location"
-    IDS_SHV_COLUMN_DOCUMENTS "Documents"
-    IDS_SHV_COLUMN_STATUS "Status"
-    IDS_SHV_COLUMN_COMMENTS "Comments"
-    IDS_SHV_COLUMN_LOCATION "Location"
-    IDS_SHV_COLUMN_MODEL "Model"
-
-    /* special folders */
-    IDS_DESKTOP "Desktop"
-    IDS_MYCOMPUTER "My Computer"
-    IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin"
-    IDS_CONTROLPANEL "Control Panel"
-    IDS_ADMINISTRATIVETOOLS "Administrative Tools"
-
-    /* special folders descriptions */
-    IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer."
-    IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations."
-    IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
-    IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones."
-
-    /* About shell dialog version string */
-    IDS_ABOUT_VERSION_STRING "Version %S (%S)"
-
-    /* context menus */
-    IDS_VIEW_LARGE "Lar&ge Icons"
-    IDS_VIEW_SMALL "S&mall Icons"
-    IDS_VIEW_LIST "&List"
-    IDS_VIEW_DETAILS "&Details"
-    IDS_SELECT "Select"
-    IDS_OPEN "Open"
-    IDS_CREATELINK "Create &Link"
-    IDS_COPY "&Copy"
-    IDS_DELETE "Delete"
-    IDS_PROPERTIES "Properties"
-    IDS_CUT "C&ut"
-    IDS_RESTORE "Restore"
-    IDS_FORMATDRIVE "Format..."
-    IDS_RENAME "Rename"
-    IDS_PASTE "Paste"
-    IDS_EJECT "Eject"
-    IDS_DISCONNECT "Disconnect"
-
-    IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
-    IDS_CREATEFOLDER_CAPTION "Unable to create folder"
-    IDS_DELETEITEM_CAPTION "Confirm File Deletion"
-    IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
-    IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
-    IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
-    IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
-    IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?"
-    IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?"
-    IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?"
-    IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?"
-    IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?"
-    IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
-    IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?"
-
-    IDS_FILEOOP_COPYING "Copying..."
-    IDS_FILEOOP_MOVING "Moving..."
-    IDS_FILEOOP_DELETING "Deleting..."
-    IDS_FILEOOP_FROM_TO "From %1 to %2"
-    IDS_FILEOOP_FROM "From %1"
-    IDS_FILEOOP_PREFLIGHT "Preflight"
-
-    /* message box strings */
-    IDS_RESTART_TITLE "Restart"
-    IDS_RESTART_PROMPT "Do you want to restart the system?"
-    IDS_SHUTDOWN_TITLE "Shutdown"
-    IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
-
-    /* Run File dialog */
-    IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_CAPTION "Browse"
-    IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
-
-    /* shell folder path default values */
-    IDS_PROGRAMS "Start Menu\\Programs"
-    IDS_PERSONAL "My Documents"
-    IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
-    IDS_RECENT "Recent"
-    IDS_SENDTO "SendTo"
-    IDS_STARTMENU "Start Menu"
-    IDS_MYMUSIC "My Music"
-    IDS_MYVIDEO "My Videos"
-    IDS_DESKTOPDIRECTORY "Desktop"
-    IDS_NETHOOD "NetHood"
-    IDS_TEMPLATES "Templates"
-    IDS_APPDATA "Application Data"
-    IDS_PRINTHOOD "PrintHood"
-    IDS_LOCAL_APPDATA "Local Settings\\Application Data"
-    IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files"
-    IDS_COOKIES "Cookies"
-    IDS_HISTORY "Local Settings\\History"
-    IDS_PROGRAM_FILES "Program Files"
-    IDS_MYPICTURES "My Pictures"
-    IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files"
-    IDS_COMMON_DOCUMENTS "Documents"
-    IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools"
-    IDS_COMMON_MUSIC "Documents\\My Music"
-    IDS_COMMON_PICTURES "Documents\\My Pictures"
-    IDS_COMMON_VIDEO "Documents\\My Videos"
-    IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning"
-    IDS_NETWORKPLACE "My Network Places"
-
-    IDS_NEWFOLDER "New Folder"
-
-    IDS_DRIVE_FIXED "Local Disk"
-    IDS_DRIVE_CDROM "CD Drive"
-    IDS_DRIVE_NETWORK "Network Disk"
-    IDS_DRIVE_FLOPPY "3.5 Floppy"
-    IDS_DRIVE_REMOVABLE "Removable Disk"
-    IDS_FS_UNKNOWN "Unknown"
-
-    /* Open With */
-    IDS_OPEN_WITH "Open With"
-    IDS_OPEN_WITH_CHOOSE "Choose Program..."
-    IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:"
-    IDS_OPEN_WITH_OTHER "Other Programs:"
-
-    IDS_SHELL_ABOUT_AUTHORS "&Authors"
-    IDS_SHELL_ABOUT_BACK "< &Back"
-    FCIDM_SHVIEW_NEW "New"
-    FCIDM_SHVIEW_NEWFOLDER "New &Folder"
-    FCIDM_SHVIEW_NEWLINK "New &Link"
-    IDS_FOLDER_OPTIONS "Folder Options"
-    IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
-    IDS_RECYCLEBIN_DISKSPACE "Space Available"
-    IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
-    IDS_PICK_ICON_TITLE "Choose Icon"
-    IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-    IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
-
-    IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
-    IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)."
-    IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)."
-    IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)."
-    IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
-
-    /* Friendly File Type Names */
-    IDS_DIRECTORY "Folder"
-    IDS_BAT_FILE "ReactOS Batch File"
-    IDS_CMD_FILE "ReactOS Command Script"
-    IDS_COM_FILE "DOS Application"
-    IDS_CPL_FILE "Control Panel Item"
-    IDS_CUR_FILE "Cursor"
-    IDS_DB__FILE "Database File"
-    IDS_DLL_FILE "Application Extension"
-    IDS_DRV_FILE "Device Driver"
-    IDS_EFI_FILE "Extensible Firmware Interface Executable"
-    IDS_EXE_FILE "Application"
-    IDS_NLS_FILE "National Language Support File"
-    IDS_OCX_FILE "ActiveX Control"
-    IDS_TLB_FILE "Type Library"
-    IDS_FON_FILE "Font file"
-    IDS_TTF_FILE "TrueType Font file"
-    IDS_OTF_FILE "OpenType Font file"
-    IDS_HLP_FILE "Help File"
-    IDS_ICO_FILE "Icon"
-    IDS_INI_FILE "Configuration Settings"
-    IDS_LNK_FILE "Shortcut"
-    IDS_NT__FILE "NT DOS32 Configuration File"
-    IDS_PIF_FILE "NT VDM Program Information File"
-    IDS_SCR_FILE "Screen Saver"
-    IDS_SYS_FILE "System File"
-    IDS_VXD_FILE "Virtual Device Driver"
-    IDS_ANY_FILE "%s-file"
-
-    IDS_OPEN_VERB "Open"
-    IDS_EXPLORE_VERB "Explore"
-    IDS_RUNAS_VERB "Run as..."
-    IDS_EDIT_VERB "Edit"
-    IDS_FIND_VERB "Find"
-    IDS_PRINT_VERB "Print"
-
-    IDS_FILE_FOLDER "%u Files, %u Folders"
-    IDS_PRINTERS "Printers"
-    IDS_FONTS "Fonts"
-    IDS_INSTALLNEWFONT "Install New Font..."
-
-    IDS_DEFAULT_CLUSTER_SIZE "Default allocation size"
-    IDS_COPY_OF "Copy of"
-
-    IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file."
-
-    IDS_FILE_DETAILS "Details for '%s' extension"
-    IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."
-    IDS_FILE_TYPES "File Types"
-    IDS_COLUMN_EXTENSION "Extensions"
-
-    /* As in 'INI File' or 'WAV File', fallback string for no-name extensions
-       used in the _File type_ tab of the _Folder Options_ dialog */
-    IDS_FILE_EXT_TYPE "%s File"
-
-    IDS_BYTES_FORMAT "bytes"
-    IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
-
-    IDS_MENU_EMPTY "(Empty)"
-    IDS_OBJECTS "%d Objects"
-    IDS_OBJECTS_SELECTED "%d Objects Selected"
-
-    IDS_ADVANCED_FOLDER "Files and Folders"
-    IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
-    IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
-    IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders"
-    IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
-    IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
-    IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails"
-    IDS_ADVANCED_HIDDEN "Hidden files and folders"
-    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
-    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
-    IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
-    IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
-    IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
-    IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings"
-    IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon"
-    IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer"
-    IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
-    IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items"
-
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
-    IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
-    IDS_NEWEXT_EXT_IN_USE "Extension is in use"
-
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
-END
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index c71253974af..81a31d15bbf 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -134,7 +134,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -162,9 +162,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18
+    LTEXT "Type the name of a program, folder, document, or Internet resource.", 12289, 36, 11, 182, 18
     LTEXT "&Open:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -282,25 +282,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -320,34 +320,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -398,34 +386,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -617,7 +583,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -744,7 +710,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -895,7 +861,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index 956a446cd11..c19a8ef9a01 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -1,4 +1,4 @@
-/* Spanish translation by ??? and Ismael Ferreras Morezuelas (Swyter) */
+// COPYRIGHT: Ismael Ferreras Morezuelas
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
@@ -135,7 +135,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -163,9 +163,9 @@ CAPTION "Ejecutar"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24
+    LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Abrir:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "Aceptar", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Examinar...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -227,7 +227,7 @@ BEGIN
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamaño:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Tamaño en disco:", 140101, 8, 88, 55, 10
+    LTEXT "En disco:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contiene:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -261,7 +261,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamaño:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Tamaño en disco:", 140112, 8, 107, 55, 10
+    LTEXT "En disco:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Creado:", 14014, 8, 131, 45, 10
@@ -283,25 +283,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versión"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versión del archivo: ", 14000, 10, 10, 62, 14
+    LTEXT "Versión del archivo:", 14000, 10, 10, 62, 14
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Descripción: ", 14002, 10, 27, 45, 10
+    LTEXT "Descripción:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Autoría: ", 14004, 10, 46, 66, 10
+    LTEXT "Autoría:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Información adicional de versión: ", 14006, 6, 70, 222, 115
+    GROUPBOX "Información adicional de versión", 14006, 6, 70, 222, 115
     LTEXT "Nombre del elemento:", 14007, 13, 82, 65, 10
-    LTEXT "Valor: ", 14008, 112, 82, 45, 10
+    LTEXT "Valor:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipo:", -1, 8, 38, 95, 10
@@ -321,34 +321,22 @@ BEGIN
     LTEXT "Capacidad:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Unidad %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Liberar espacio en disco", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Permitir al servidor de indexación indizar el disco para acelerar la búsqueda", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Unidad %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Herramientas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Comprobación de errores ", -1, 5, 5, 230, 60
+    GROUPBOX "Comprobación de errores", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Esta opción comprobará los errores en la\nunidad.", -1, 40, 25, 160, 20
+    LTEXT "Esta opción comprobará los errores en la unidad.", -1, 40, 25, 160, 20
     PUSHBUTTON "Comprobar ahora...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Desfragmentación ", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Esta opción desfragmentará los archivos en esta\nunidad.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Desfragmentar ahora...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Copia de seguridad ", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Esta opción realizará una copia de seguridad de\nlos archivos almacenados en la unidad.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Realizar copia de seguridad ahora...", 14002, 90, 170, 130, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -381,7 +369,7 @@ CAPTION "Propiedades de la Papelera"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
-    GROUPBOX "Configuración para la unidad seleccionada ", -1, 10, 72, 220, 70
+    GROUPBOX "Configuración para la unidad seleccionada", -1, 10, 72, 220, 70
     RADIOBUTTON "Tamaño &personalizado:", 14001, 20, 90, 88, 10, WS_TABSTOP
     EDITTEXT 14002, 120, 87, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "&Tamaño máximo(MB):", -1, 20, 105, 70, 10
@@ -389,42 +377,20 @@ BEGIN
     AUTOCHECKBOX "&Mostrar un cuadro de diálogo para confirmar la eliminación", 14004, 20, 155, 200, 10, WS_TABSTOP
 END
 
-IDD_OPEN_WITH DIALOGEX 0, 0, 284, 256
+IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
 CAPTION "Abrir con"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
     LTEXT "Elija el programa que desea usar para abrir el siguiente archivo:", -1, 44, 12, 211, 10
-    LTEXT "Archivo:    ", 14001, 44, 25, 188, 20
-    GROUPBOX "&Programas ", -1, 7, 42, 269, 187
+    LTEXT "Archivo:    ", 14001, 44, 30, 188, 10
+    GROUPBOX "&Programas", -1, 7, 42, 249, 187
     CONTROL "Programas", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 15, 193, 250, 10
-    PUSHBUTTON "&Examinar...", 14004, 218, 207, 50, 14
-    DEFPUSHBUTTON "Aceptar", IDOK, 170, 236, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 226, 236, 50, 14
-END
-
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tareas", -1, 7, 10, 279, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "M&ostrar tareas comunes en las carpetas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 160, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Utilizar las carpetas clá&sicas de ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 160, 10
-    GROUPBOX "Examinar carpetas ", -1, 7, 60, 279, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 75, 160, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Abrir cada carpeta en ventanas di&ferentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 87, 140, 10
-    GROUPBOX "Hacer clic en los elementos tal y como se indica ", -1, 7, 110, 279, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 220, 10
-    AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10
-    AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 190, 10
-    PUSHBUTTON "&Restaurar valores predeterminados", 14011, 146, 180, 140, 14, WS_TABSTOP
+    AUTOCHECKBOX "&Siempre use el programa para abrir este tipo de archivos", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Examinar...", 14004, 188, 207, 60, 14
+    DEFPUSHBUTTON "Aceptar", IDOK, 150, 236, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
 END
 
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 240
@@ -510,7 +476,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Seleccione un tipo de contenido y elija una acción para que ReactOS la realice automáticamente cuando ese tipo se use en este dispositivo:", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
-    GROUPBOX "Acciones ", -1, 7, 45, 212, 146
+    GROUPBOX "Acciones", -1, 7, 45, 212, 146
     AUTORADIOBUTTON "Seleccionar la &acción que desea ejecutar:", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
     AUTORADIOBUTTON "&Preguntarme siempre que elija una acción", 1006, 14, 177, 202, 10
@@ -590,7 +556,7 @@ BEGIN
     COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
     LTEXT "&Etiqueta del volumen", -1, 7, 93, 170, 9
     EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
-    GROUPBOX "&Opciones de formato ", 4610, 7, 121, 170, 49
+    GROUPBOX "&Opciones de formato", 4610, 7, 121, 170, 49
     AUTOCHECKBOX "Formato &rápido", 28674, 16, 135, 155, 10
     AUTOCHECKBOX "&Habilitar compresión", 28675, 16, 152, 155, 10
 END
@@ -601,10 +567,10 @@ CAPTION "Comprobación de disco"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "Iniciar", IDOK, 63, 95, 60, 14
-    GROUPBOX "Opciones de comprobación de disco ", -1, 7, 6, 225, 50
+    GROUPBOX "Opciones de comprobación de disco", -1, 7, 6, 225, 50
     PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Reparar &automáticamente errores en el sistema de archivos", 14000, 16, 15, 200, 10
-    AUTOCHECKBOX "&Examinar e intentar recuperar los sectores defectuosos", 14001, 16, 30, 200, 10
+    AUTOCHECKBOX "Reparar &automáticamente errores en el sistema de archivos", 14000, 12, 15, 200, 10
+    AUTOCHECKBOX "&Examinar e intentar recuperar los sectores defectuosos", 14001, 12, 30, 200, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 225, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -618,7 +584,7 @@ BEGIN
     PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14
 END
@@ -685,7 +651,7 @@ BEGIN
 
     /* special folders descriptions */
     IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer."
-    IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations."
+    IDS_FOLDER_OPTIONS_DESCRIPTION "Personalize archivos y carpetas, y cambie asociaciones de archivos."
     IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
     IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones."
 
@@ -745,7 +711,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Examinar"
     IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menú Inicio\\Programas"
     IDS_PERSONAL "Mis documentos"
     IDS_FAVORITES "Favoritos"
@@ -873,9 +839,9 @@ BEGIN
     IDS_OBJECTS_SELECTED "%d elementos seleccionados"
 
     IDS_ADVANCED_FOLDER "Files and Folders"
-    IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
-    IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_NET_CRAWLER "Buscar automáticamente carpetas e impresoras en red"
+    IDS_ADVANCED_FOLDER_SIZE_TIP "Mostrar tamaño de la carpeta"
+    IDS_ADVANCED_FRIENDLY_TREE "Mostrar vista simple en lista de carpetas"
     IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
     IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
@@ -885,7 +851,7 @@ BEGIN
     IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
     IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
     IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
-    IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
+    IDS_ADVANCED_DESKTOP_PROCESS "Abrir carpetas en procesos separados"
     IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings"
     IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon"
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer"
@@ -896,9 +862,9 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "La extensión %s ya está asociada con el tipo de archivo %s. ¿Desea desasociar %s con %s y crear un nuevo tipo de arcivo?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
+    IDS_REMOVE_EXT "Si elimina una extensión de archivo, no podrá abrir archivos con esa extensión haciendo doble click en sus íconos.\n\n¿Está seguro de eliminar esta extensión?"
     IDS_FILE_NOT_FOUND "El archivo '%s' no pudo ser encontrado."
 END
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index e696759bab1..47ffc957c5a 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -1,9 +1,5 @@
-/*
- * PROJECT:     shell32 for ReactOS
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Estonian Language resource file
- * TRANSLATOR:  Joann Mõndresku (joannmondresku at gmail dot com)
- */
+// LICENSE:   GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+// COPYRIGHT: Joann Mõndresku <joannmondresku@gmail.com>
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 
@@ -141,11 +137,11 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Autoriõigus 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
-    LTEXT "See ReactOS versioon on registreeritud järgmisele:", IDC_STATIC, 35, 115, 180, 10
+    LTEXT "See ReactOS versioon on registreeritud üksusele:", IDC_STATIC, 35, 115, 180, 10
     LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
     LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
     LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
@@ -169,9 +165,9 @@ CAPTION "Käivitus"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 182, 18
+    LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi.", 12289, 36, 11, 182, 18
     LTEXT "&Ava:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Loobu", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Sirvi...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -289,25 +285,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versioon"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Faili versioon: ", 14000, 10, 10, 55, 10
+    LTEXT "Faili versioon:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Kirjeldus: ", 14002, 10, 27, 45, 10
+    LTEXT "Kirjeldus:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Autoriõigus: ", 14004, 10, 46, 66, 10
+    LTEXT "Autoriõigus:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Teiste versioonide informatsioon: ", 14006, 6, 70, 222, 115
-    LTEXT "Üksikasja nimi: ", 14007, 13, 82, 50, 10
-    LTEXT "Väärtus: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Teiste versioonide informatsioon", 14006, 6, 70, 222, 115
+    LTEXT "Üksikasja nimi:", 14007, 13, 82, 50, 10
+    LTEXT "Väärtus:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Üldist"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tüüp:", -1, 8, 38, 95, 10
@@ -327,15 +323,11 @@ BEGIN
     LTEXT "Maht:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Draiv %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Kettapuhastus", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Tihenda draiv kettaruumi säästmiseks", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Luba indekseerimisteenusel ketas failiotsinguks indekseerida", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Draiv %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tööriistad"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -344,17 +336,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "See funktsioon otsib draivist tõrkeid.", -1, 40, 25, 160, 20
     PUSHBUTTON "Kontrolli kohe...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentimine", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "See funktsioon defragmendib draivi faile.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmendi kohe...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Varundus", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "See funktsioon varundab draivi faile.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Varunda kohe...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Riistvara"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -405,34 +389,12 @@ BEGIN
     LTEXT "Fail:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programmid", -1, 7, 42, 249, 187
     CONTROL "Programmid", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Ava seda tüüpi fail alati valitud programmiga", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Sirvi...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Ava seda tüüpi fail alati valitud programmiga", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Sirvi...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Loobu", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Üldist"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Toimingud", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Näita kaustades tavalisi &toiminguid", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Kasuta ReactOSi klassikalisi &kaustu", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Kaustade sirvimine", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Ava iga kaust &samas aknas", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Ava iga kaust &eraldi aknas", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Üksuste klõpsamine", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Kl&õps avab üksuse (osutamine valib)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Kriipsuta ikoonitiitlid &brauseri eeskujul alla", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Kriipsuta ikoonitiitlid alla ainult neile &osutamisel", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "Topeltklõps avab &üksuse (klõps valib)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Taasta vaikesätted", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Vaade"
@@ -505,7 +467,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
     LTEXT "Kas soovid kindlasti lahti ühendada?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Ühenda lahti", IDOK, 47, 38, 47, 14
+    DEFPUSHBUTTON "Ühend&a lahti", IDOK, 47, 38, 47, 14
     PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 47, 14
 END
 
@@ -529,7 +491,7 @@ CAPTION "Segasisu"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "See plaat või seaded sisladab rohkem kui üht tüüpi faile.", 1001, 32, 7, 191, 20
+    LTEXT "See plaat või seade sisladab rohkem kui üht tüüpi faile.", 1001, 32, 7, 191, 20
     LTEXT "Mida soovite ReactOSil teha lasta?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
@@ -624,7 +586,7 @@ BEGIN
     PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Vali ikoon alltoodud loendist:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Loobu", IDCANCEL, 135, 179, 50, 14
 END
@@ -637,24 +599,24 @@ BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Seda faili kasutavad operatsioonisüsteem ja paljud\n\
 programmid. Selle redigeerimine või muutmine võib Sinu\n\
-süsteemi kahjustada..\n\n\
+süsteemi kahjustada.\n\n\
 Kas oled kindel et soovid seda faili avada?", IDC_STATIC, 35, 5, 230, 60
     DEFPUSHBUTTON "Jah", IDYES, 125, 55, 50, 14
     PUSHBUTTON "Ei", IDNO, 180, 55, 50, 14
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "Loo uus laiendus"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&File Extension:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
     PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
+    LTEXT "&Seotud faili tüüp:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "Loobu", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -751,7 +713,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Sirvi"
     IDS_RUNDLG_BROWSE_FILTER "Rakendatavad failid (*.exe)\0*.exe\0Kõik failid (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Minu dokumendid"
     IDS_FAVORITES "Lemmikud"
@@ -901,10 +863,10 @@ BEGIN
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_SPECIFY_EXT "Te peate määrama laiendi."
+    IDS_NEWEXT_ALREADY_ASSOC "Laiend %s on juba seotud faili tüübi %s-iga. Kas tahate siduda lahti %s %s-ga ja luua uus faili tüüp sellele?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "Registreeritud faili nime laiendi eemaldamisel, Te ei saa enam avada faile selle laiendiga topelt klikkides nende ikoone.\n\nKas soovite kindlalt kustutada seda laiendit?"
+    IDS_FILE_NOT_FOUND "Faili '%s' ei leitud."
 END
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 9b712dce8ed..b0a4af5031f 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18
+    LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi.", 12289, 36, 11, 182, 18
     LTEXT "&Avaa:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Peruuta", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Selaa...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Käynnistä\\Ohjelmat"
     IDS_PERSONAL "Omat tiedostot"
     IDS_FAVORITES "Suosikit"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 7b6c083d1cc..92ccd88c41f 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -46,10 +46,10 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "C&ouper\tCtrl+X", FCIDM_SHVIEW_CUT
     MENUITEM "&Copier\tCtrl+C", FCIDM_SHVIEW_COPY
-    MENUITEM "Co&ller\tCtrl+V", FCIDM_SHVIEW_INSERT
+    MENUITEM "Coll&er\tCtrl+V", FCIDM_SHVIEW_INSERT
     MENUITEM "Créer un &lien", FCIDM_SHVIEW_INSERTLINK
     MENUITEM SEPARATOR
-    MENUITEM "Copier vers le &dossier...", FCIDM_SHVIEW_COPYTO
+    MENUITEM "Co&pier vers le dossier...", FCIDM_SHVIEW_COPYTO
     MENUITEM "&Déplacer vers le dossier...", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
     MENUITEM "&Tout sélectionner\tCtrl+A", FCIDM_SHVIEW_SELECTALL
@@ -107,7 +107,7 @@ BEGIN
     LTEXT "Dossier :", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
     EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Créer un nouveau dossier", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Créer un nouveau dossier", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 8, 174, 90, 14, WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
 END
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Exécuter"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 4, 182, 26
+    LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Ouvrir :", 12305, 7, 39, 26, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Parcourir...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -225,7 +225,7 @@ BEGIN
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Taille :", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Taille sur le disque :", 140101, 8, 88, 55, 10
+    LTEXT "Sur le disque :", 140101, 8, 88, 45, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contient :", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -248,7 +248,7 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
+    LTEXT "Type de fichier :", 14004, 8, 35, 55, 10
     CONTROL "Fichier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
     LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
@@ -259,7 +259,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Taille :", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Taille sur le disque :", 140112, 8, 107, 55, 10
+    LTEXT "Sur le disque :", 140112, 8, 107, 45, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Créé :", 14014, 8, 131, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10
+    LTEXT "Version du fichier :", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description : ", 14002, 10, 27, 45, 10
+    LTEXT "Description :", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright : ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright :", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115
-    LTEXT "Nom de l'élément : ", 14007, 13, 82, 94, 10
-    LTEXT "Valeur : ", 14008, 112, 82, 94, 10
+    GROUPBOX "Autres informations de version", 14006, 6, 70, 222, 115
+    LTEXT "Nom de l'élément :", 14007, 13, 82, 94, 10
+    LTEXT "Valeur :", 14008, 112, 82, 94, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type :", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacité :", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Lecteur %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Nettoyage de &disque", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Lecteur %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Outils"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Vérification d'erreurs", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Cette option vérifiera le volume pour éviter les\nerreurs.", -1, 40, 25, 160, 20
+    LTEXT "Cette option vérifiera le volume pour éviter les erreurs.", -1, 40, 25, 160, 20
     PUSHBUTTON "Vérifier maintenant...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Défragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Cette option va défragmenter les fichiers sur ce volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Défragmenter maintenant...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Sauvegarde", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Cette option va sauvegarder les fichiers sur le volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Sauvegarder maintenant...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Matériel"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -382,7 +370,7 @@ BEGIN
     GROUPBOX "Paramètres pour la localisation sélectionnée", -1, 10, 72, 220, 70
     RADIOBUTTON "Taille personnalisée :", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
-    LTEXT "T&aille maximale (MO) :", -1, 20, 105, 70, 10
+    LTEXT "T&aille maximale (Mo) :", -1, 20, 105, 70, 10
     RADIOBUTTON "Ne pas déplacer les fichie&rs vers la Corbeille. Effacer les fichiers immédiatement lors de la suppression.", 14003, 20, 117, 190, 20, BS_MULTILINE | WS_TABSTOP
     AUTOCHECKBOX "Afficher une fenêtre de confirmation d'effacement", 14004, 20, 155, 190, 10, WS_TABSTOP
 END
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Fichier :    ", 14001, 44, 25, 213, 20
     GROUPBOX "&Programmes", -1, 7, 42, 249, 187
     CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "Toujours utiliser le progr&amme sélectionné pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10
-    PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "Toujours utiliser ce progr&amme pour ouvrir ce type de fichier", 14003, 16, 193, 232, 10
+    PUSHBUTTON "Parcourir...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Général"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tâches", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "Pa&ramètres par défaut", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Affichage"
@@ -432,7 +398,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Affichage des dossiers", -1, 7, 10, 249, 60
     ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
-    LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que\nvous utilisez pour ce dossier à tous les dossiers.", -1, 60, 20, 180, 20
+    LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que vous utilisez pour ce dossier à tous les dossiers.", -1, 60, 20, 180, 20
     PUSHBUTTON "Appliquer à tous les dossiers", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Réinitialiser tous les dossiers", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Paramètres avancés :", -1, 7, 80, 100, 10
@@ -601,8 +567,8 @@ BEGIN
     DEFPUSHBUTTON "Démarrer", IDOK, 63, 95, 60, 14
     GROUPBOX "Options de vérification", -1, 7, 6, 179, 40
     PUSHBUTTON "Annuler", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Réparer automatiquement les erreurs du système de fichiers", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scanner pour rechercher et réparer les secteurs défectueux", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "Réparer automatiquement les erreurs du système de fichiers", 14000, 12, 15, 165, 10
+    AUTOCHECKBOX "&Scanner pour rechercher et réparer les secteurs défectueux", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 135, 179, 50, 14
 END
@@ -642,7 +608,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&File Extension:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    PUSHBUTTON "<< A&vancé", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
     LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
@@ -722,7 +688,7 @@ BEGIN
     IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer ?"
     IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer ?"
     IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier"
-    IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\nSi les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\ndossier sélectionné, ils seront remplacés. Voulez-vous toujours déplacer ou copier\nle dossier?"
+    IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\nSi les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le dossier sélectionné, ils seront remplacés.\nVoulez-vous toujours déplacer ou copier le dossier?"
 
     IDS_FILEOOP_COPYING "Copie..."
     IDS_FILEOOP_MOVING "Déplacement..."
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Parcourir"
     IDS_RUNDLG_BROWSE_FILTER "Fichiers exécutables (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menu Démarrer\\Programmes"
     IDS_PERSONAL "Mes documents"
     IDS_FAVORITES "Favoris"
@@ -890,8 +856,8 @@ BEGIN
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items"
 
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
+    IDS_NEWEXT_ADVANCED_LEFT "<< A&vancé"
+    IDS_NEWEXT_ADVANCED_RIGHT "A&vancé >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
     IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index dfb672d1de1..cfd8fc073f5 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -32,7 +32,7 @@ BEGIN
             MENUITEM "", -1, MFT_SEPARATOR
             MENUITEM "סידור אוטומטי", FCIDM_SHVIEW_AUTOARRANGE
         END
-        MENUITEM "רענון", FCIDM_SHVIEW_REFRESH
+        MENUITEM "רענן", FCIDM_SHVIEW_REFRESH
         MENUITEM "", -1, MFT_SEPARATOR
         MENUITEM "הדבק", FCIDM_SHVIEW_INSERT
         MENUITEM "הדבק כקיצור דרך", FCIDM_SHVIEW_INSERTLINK
@@ -46,14 +46,14 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT
     MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY
-    MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT
+    MENUITEM "ה&דבק\tCtrl+V", FCIDM_SHVIEW_INSERT
     MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK
     MENUITEM SEPARATOR
-    MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO
-    MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO
+    MENUITEM "העתק לתיקיה...", FCIDM_SHVIEW_COPYTO
+    MENUITEM "העבר לתיקיה...", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
-    MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION
+    MENUITEM "בחר ה&כל\tCtrl+A", FCIDM_SHVIEW_SELECTALL
+    MENUITEM "ה&פוך בחירה", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -79,9 +79,9 @@ BEGIN
     BEGIN
         MENUITEM "&Copy here", IDM_COPYHERE
         MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "צור &קיצורי דרך כאן", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "ביטול", 0
     END
 END
 
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "זכויות יוצרים 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -157,13 +157,13 @@ END
 
 IDD_RUN DIALOGEX 0, 0, 227, 95
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "הפעלה"
+CAPTION "הפעל"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "הקלד שם של תוכנית, תיקיה, מסמך או משאב אינטרנט  ו- ReactOS יפתח אותם עבורך.", 12289, 36, 11, 182, 18
-    LTEXT "&פתח את:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    LTEXT "הקלד את שם התוכנית, תקיה, מסמך, משאב אינטרנטי.", 12289, 36, 11, 182, 18
+    LTEXT "&Open:", 12305, 7, 39, 24, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "אישור", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "ביטול", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&עיון...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -203,9 +203,9 @@ CAPTION "מאפיינים מורחבים"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
-    LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10
-    CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10
-    LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40
+    LTEXT "בחר את התכונות המתקדמות עבור קיצור דרך זה.", -1, 5, 30, 210, 10
+    CHECKBOX "הפעלה בתור משתמש אחר", 14000, 25, 50, 150, 10
+    LTEXT "אפשרות זו מאפשרת לך להפעיל את הקיצור הדרך בתור משתמש אחר או להמשיך בתור משתמש נוכחי ולהגן על מחשבך והמידע שלך מפעילות תכנית לא מורשת.", -1, 50, 60, 175, 40
     CHECKBOX "הרץ בטווח זיכרון מופרד", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "אישור", 1, 63, 124, 50, 15, WS_VISIBLE
     PUSHBUTTON "ביטול", 2, 120, 124, 50, 15, WS_VISIBLE
@@ -250,7 +250,7 @@ BEGIN
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "סוג קובץ:", 14004, 8, 35, 50, 10
     CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "נפתח באמצעות:", 14006, 8, 53, 50, 10
+    LTEXT "Opens with:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "שי&נוי...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "גרסה"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "גרסת קובץ: ", 14000, 10, 10, 55, 10
+    LTEXT "גרסת קובץ:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "תיאור: ", 14002, 10, 27, 45, 10
+    LTEXT "תיאור:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "זכויות יוצרים: ", 14004, 10, 46, 66, 10
+    LTEXT "זכויות יוצרים:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "מידע נוסף: ", 14006, 6, 70, 222, 115
-    LTEXT "שם פריט: ", 14007, 13, 82, 50, 10
-    LTEXT "ערך: ", 14008, 112, 82, 45, 10
+    GROUPBOX "מידע נוסף", 14006, 6, 70, 222, 115
+    LTEXT "שם פריט:", 14007, 13, 82, 50, 10
+    LTEXT "ערך:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "כללי"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "סוג:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "קיבולת:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "כונן %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "ניקוי הדיסק", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "דחוס כונן זה כדי לחסוך בשטח דיסק", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "אפשר סידור תוכן באינדקס עבור קבצים בכונן זה בנוסף למאפייני קובץ", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "כונן %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "כלים"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "בדיקת שגיאות", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "אפשרות זו תבדוק אם ישנן שגיאות בכונן.", -1, 40, 25, 160, 20
     PUSHBUTTON "בדוק כעת...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "איחוי", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "אחה כעת...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "גיבוי", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "גבה כעת...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "חומרה"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -358,7 +346,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "הפעל כ-"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
+    LTEXT "באיזה חשבון משתמש ברצונך להשתמש כדי להפעיל תוכנית זו?", -1, 10, 20, 220, 20
     CHECKBOX "המשתמש הנוכחי %s", 14000, 10, 45, 150, 10
     LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
@@ -383,48 +371,26 @@ BEGIN
     RADIOBUTTON "&גודל מותאם אישית:", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "גודל &מרבי(MB):", -1, 20, 105, 70, 10
-    RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
+    RADIOBUTTON "אל תעביר קבצים לסל המחזור. הסר קבצים מיידית מתי בעת מחיקה.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
     AUTOCHECKBOX "ה&צג תיבת דו-שיח לאישור מחיקה", 14004, 20, 155, 140, 10, WS_TABSTOP
 END
 
 IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "פתיחה באמצעות"
+CAPTION "פתח באמצעות"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
     LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10
     LTEXT "קובץ:    ", 14001, 44, 25, 188, 20
     GROUPBOX "תוכניות:", -1, 7, 42, 249, 187
-    CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&עיון...", 14004, 198, 207, 50, 14
+    CONTROL "תוכניות", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&עיון...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "אישור", IDOK, 150, 236, 50, 14
     PUSHBUTTON "ביטול", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "כללי"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "משימות", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -435,7 +401,7 @@ BEGIN
     LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
-    LTEXT "Advanced settings:", -1, 7, 80, 100, 10
+    LTEXT "אפשרויות מתקדמות:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 177, 215, 80, 14, WS_TABSTOP
 END
@@ -445,28 +411,28 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "File Types"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Registered file &types:", -1, 7, 10, 70, 10
+    LTEXT "סוגי קבצים רשומים:", -1, 7, 10, 70, 10
     CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
     PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
-    GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
+    PUSHBUTTON "&מחק", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
+    GROUPBOX "פרטים עבורת סיומת '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
     LTEXT "Opens with:", -1, 12, 140, 40, 10
     //ICON
     LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
-    PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&שינוי...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
     LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30
-    PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&מתקדם", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
 END
 
 IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Confirm File Replace"
+CAPTION "וידוי החלפת קובץ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
-    PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14
+    DEFPUSHBUTTON "&כן", IDYES, 20, 122, 60, 14
+    PUSHBUTTON "כן לכולם", 12807, 85, 122, 60, 14
     PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
     LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
     LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
@@ -485,20 +451,20 @@ CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
+    LTEXT "האם אתה בטוח שברצונך להתנתק?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "התנתק", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Disconnect ReactOS"
+CAPTION "ניתוק ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Disconnect", IDOK, 47, 38, 47, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 47, 14
+    LTEXT "האם ברצונך לנתק?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "&נתק", IDOK, 47, 38, 47, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 99, 38, 47, 14
 END
 
 IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
@@ -508,7 +474,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
-    GROUPBOX "Actions", -1, 7, 45, 212, 146
+    GROUPBOX "פעולות", -1, 7, 45, 212, 146
     AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
     AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10
@@ -517,7 +483,7 @@ END
 
 IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
+CAPTION "תוכן מעורב"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
@@ -525,12 +491,12 @@ BEGIN
     LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 160, 186, 60, 14
 END
 
 IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
+CAPTION "תוכן מעורב"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
@@ -541,7 +507,7 @@ BEGIN
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
     AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 160, 185, 60, 14
 END
 
 IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
@@ -555,12 +521,12 @@ BEGIN
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 159, 160, 60, 14
 END
 
 IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Shut Down ReactOS"
+CAPTION "כיבוי ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
@@ -568,29 +534,29 @@ BEGIN
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
     LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
-    PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 75, 82, 60, 14
     PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14
 END
 
 IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Format"
+CAPTION "אתחול"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14
     PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14
-    LTEXT "Ca&pacity:", -1, 7, 6, 169, 9
+    LTEXT "&קיבולת:", -1, 7, 6, 169, 9
     COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
     LTEXT "&File system", -1, 7, 35, 170, 9
     COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
     CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
-    LTEXT "&Allocation unit size", -1, 7, 64, 170, 9
+    LTEXT "&גודל יחידת הקצאה", -1, 7, 64, 170, 9
     COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "Volume &label", -1, 7, 93, 170, 9
+    LTEXT "&תווית כונן", -1, 7, 93, 170, 9
     EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
-    GROUPBOX "Format &options", 4610, 7, 121, 170, 49
-    AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10
-    AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
+    GROUPBOX "אפשרויות אתחול", 4610, 7, 121, 170, 49
+    AUTOCHECKBOX "&אתחול מהיר", 28674, 16, 135, 155, 10
+    AUTOCHECKBOX "אפשר דחיסת קבצים", 28675, 16, 152, 155, 10
 END
 
 IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115
@@ -598,32 +564,32 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL
 CAPTION "Check Disk"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14
+    DEFPUSHBUTTON "התחל", IDOK, 63, 95, 60, 14
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
-    PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
 
 IDD_PICK_ICON DIALOGEX 0, 0, 193, 200
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "שינוי סמל"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
-    PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
+    PUSHBUTTON "עיון...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Caution"
+CAPTION "אזהרה"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
@@ -631,22 +597,22 @@ BEGIN
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\
 Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
-    DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14
+    DEFPUSHBUTTON "כן", IDYES, 125, 55, 50, 14
     PUSHBUTTON "No", IDNO, 180, 55, 50, 14
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "יצירת סיומת חדשה"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&File Extension:", -1, 10, 10, 85, 14
+    LTEXT "&סיומת קובץ:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    PUSHBUTTON "<< &מתקדם", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
     LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -658,16 +624,16 @@ BEGIN
     IDS_SHV_COLUMN_MODIFIED "שונה"
     IDS_SHV_COLUMN_ATTRIBUTES "תכונות"
     IDS_SHV_COLUMN_DISK_CAPACITY "גודל"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+    IDS_SHV_COLUMN_DISK_AVAILABLE "גודל פנוי"
     IDS_SHV_COLUMN_OWNER "בעלים"
     IDS_SHV_COLUMN_GROUP "קבוצות"
     IDS_SHV_COLUMN_FILENAME "שם קובץ"
     IDS_SHV_COLUMN_CATEGORY "קטגוריה"
-    IDS_SHV_COLUMN_DELFROM "Original location"
+    IDS_SHV_COLUMN_DELFROM "מיקום מקורי"
     IDS_SHV_COLUMN_DELDATE "תאריך מחיקה"
     IDS_SHV_COLUMN_FONTTYPE "סוג גופן"
     IDS_SHV_COLUMN_WORKGROUP "Workgroup"
-    IDS_SHV_COLUMN_NETLOCATION "Network Location"
+    IDS_SHV_COLUMN_NETLOCATION "מיקום רשת"
     IDS_SHV_COLUMN_DOCUMENTS "מסמכים"
     IDS_SHV_COLUMN_STATUS "מצב"
     IDS_SHV_COLUMN_COMMENTS "הערות"
@@ -706,13 +672,13 @@ BEGIN
     IDS_FORMATDRIVE "אתחול..."
     IDS_RENAME "שנה שם"
     IDS_PASTE "הכנס"
-    IDS_EJECT "Eject"
-    IDS_DISCONNECT "Disconnect"
+    IDS_EJECT "הוצא"
+    IDS_DISCONNECT "נתק"
 
     IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
     IDS_CREATEFOLDER_CAPTION "Unable to create folder"
-    IDS_DELETEITEM_CAPTION "Confirm File Deletion"
-    IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
+    IDS_DELETEITEM_CAPTION "וידוי מחיקת קובץ"
+    IDS_DELETEFOLDER_CAPTION "וידוי מחיקת תיקיה"
     IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
     IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
     IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
@@ -721,12 +687,12 @@ BEGIN
     IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?"
     IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?"
     IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?"
-    IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
+    IDS_OVERWRITEFILE_CAPTION "וידוי שכתוב קובץ"
     IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?"
 
-    IDS_FILEOOP_COPYING "Copying..."
-    IDS_FILEOOP_MOVING "Moving..."
-    IDS_FILEOOP_DELETING "Deleting..."
+    IDS_FILEOOP_COPYING "מעתיק..."
+    IDS_FILEOOP_MOVING "מעביר..."
+    IDS_FILEOOP_DELETING "מוחק..."
     IDS_FILEOOP_FROM_TO "From %1 to %2"
     IDS_FILEOOP_FROM "From %1"
     IDS_FILEOOP_PREFLIGHT "Preflight"
@@ -740,10 +706,10 @@ BEGIN
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
     IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_CAPTION "Browse"
+    IDS_RUNDLG_BROWSE_CAPTION "עיון"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "המסמכים שלי"
     IDS_FAVORITES "מועדפים"
@@ -773,31 +739,31 @@ BEGIN
     IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning"
     IDS_NETWORKPLACE "מיקומי הרשת שלי"
 
-    IDS_NEWFOLDER "תיקייה חדשה"
+    IDS_NEWFOLDER "תיקיה חדשה"
 
     IDS_DRIVE_FIXED "כונן מקומי"
-    IDS_DRIVE_CDROM "CD Drive"
+    IDS_DRIVE_CDROM "כונן CD"
     IDS_DRIVE_NETWORK "כונן רשת"
     IDS_DRIVE_FLOPPY "3.5 Floppy"
-    IDS_DRIVE_REMOVABLE "Removable Disk"
+    IDS_DRIVE_REMOVABLE "כונן נשלף"
     IDS_FS_UNKNOWN "Unknown"
 
     /* Open With */
-    IDS_OPEN_WITH "פתיחה באמצעות"
-    IDS_OPEN_WITH_CHOOSE "Choose Program..."
-    IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:"
-    IDS_OPEN_WITH_OTHER "Other Programs:"
+    IDS_OPEN_WITH "פתח באמצעות"
+    IDS_OPEN_WITH_CHOOSE "בחירת תכנית..."
+    IDS_OPEN_WITH_RECOMMENDED "תכניות מומלצות:"
+    IDS_OPEN_WITH_OTHER "תכניות אחרות:"
 
-    IDS_SHELL_ABOUT_AUTHORS "&Authors"
+    IDS_SHELL_ABOUT_AUTHORS "&יוצרים"
     IDS_SHELL_ABOUT_BACK "< &Back"
     FCIDM_SHVIEW_NEW "New"
-    FCIDM_SHVIEW_NEWFOLDER "New &Folder"
+    FCIDM_SHVIEW_NEWFOLDER "תיקיה חדשה"
     FCIDM_SHVIEW_NEWLINK "New &Link"
     IDS_FOLDER_OPTIONS "Folder Options"
-    IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
-    IDS_RECYCLEBIN_DISKSPACE "Space Available"
+    IDS_RECYCLEBIN_LOCATION "מיקום סל מחזור"
+    IDS_RECYCLEBIN_DISKSPACE "שטח פנוי"
     IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
-    IDS_PICK_ICON_TITLE "Choose Icon"
+    IDS_PICK_ICON_TITLE "בחר סמל"
     IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
     IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
@@ -808,69 +774,69 @@ BEGIN
     IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
 
     /* Friendly File Type Names */
-    IDS_DIRECTORY "Folder"
+    IDS_DIRECTORY "תיקיה"
     IDS_BAT_FILE "ReactOS Batch File"
     IDS_CMD_FILE "ReactOS Command Script"
-    IDS_COM_FILE "DOS Application"
-    IDS_CPL_FILE "Control Panel Item"
-    IDS_CUR_FILE "Cursor"
+    IDS_COM_FILE "תכנית DOS"
+    IDS_CPL_FILE "פריט לוח בקרה"
+    IDS_CUR_FILE "סמן"
     IDS_DB__FILE "Database File"
-    IDS_DLL_FILE "Application Extension"
-    IDS_DRV_FILE "Device Driver"
+    IDS_DLL_FILE "הרחבת יישום"
+    IDS_DRV_FILE "מנהל התקן"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
-    IDS_EXE_FILE "Application"
+    IDS_EXE_FILE "יישום"
     IDS_NLS_FILE "National Language Support File"
-    IDS_OCX_FILE "ActiveX Control"
+    IDS_OCX_FILE "בקר ActiveX"
     IDS_TLB_FILE "Type Library"
     IDS_FON_FILE "Font file"
     IDS_TTF_FILE "TrueType Font file"
     IDS_OTF_FILE "OpenType Font file"
     IDS_HLP_FILE "Help File"
-    IDS_ICO_FILE "Icon"
-    IDS_INI_FILE "Configuration Settings"
+    IDS_ICO_FILE "סמל"
+    IDS_INI_FILE "קובץ הגדרות תצורה"
     IDS_LNK_FILE "Shortcut"
     IDS_NT__FILE "NT DOS32 Configuration File"
     IDS_PIF_FILE "NT VDM Program Information File"
-    IDS_SCR_FILE "Screen Saver"
-    IDS_SYS_FILE "System File"
-    IDS_VXD_FILE "Virtual Device Driver"
+    IDS_SCR_FILE "שומר מסך"
+    IDS_SYS_FILE "קובץ מערכת"
+    IDS_VXD_FILE "מנהל התקן וירטואלי"
     IDS_ANY_FILE "%s-file"
 
-    IDS_OPEN_VERB "Open"
-    IDS_EXPLORE_VERB "Explore"
+    IDS_OPEN_VERB "פתח"
+    IDS_EXPLORE_VERB "סייר"
     IDS_RUNAS_VERB "Run as..."
     IDS_EDIT_VERB "Edit"
-    IDS_FIND_VERB "Find"
-    IDS_PRINT_VERB "Print"
+    IDS_FIND_VERB "מצא"
+    IDS_PRINT_VERB "הדפס"
 
-    IDS_FILE_FOLDER "%u Files, %u Folders"
-    IDS_PRINTERS "Printers"
+    IDS_FILE_FOLDER "%u קבצים, %u תיקיות"
+    IDS_PRINTERS "מדפסות"
     IDS_FONTS "Fonts"
-    IDS_INSTALLNEWFONT "Install New Font..."
+    IDS_INSTALLNEWFONT "התקנת גופן חדש..."
 
-    IDS_DEFAULT_CLUSTER_SIZE "Default allocation size"
+    IDS_DEFAULT_CLUSTER_SIZE "גודל ברירת מחדל להקצאה"
     IDS_COPY_OF "Copy of"
 
     IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file."
 
-    IDS_FILE_DETAILS "Details for '%s' extension"
+    IDS_FILE_DETAILS "פרטים עבורת סיומת '%s'"
     IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."
     IDS_FILE_TYPES "File Types"
-    IDS_COLUMN_EXTENSION "Extensions"
+    IDS_COLUMN_EXTENSION "סיומות"
 
     /* As in 'INI File' or 'WAV File', fallback string for no-name extensions
        used in the _File type_ tab of the _Folder Options_ dialog */
     IDS_FILE_EXT_TYPE "%s File"
 
-    IDS_BYTES_FORMAT "bytes"
-    IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
+    IDS_BYTES_FORMAT "בתים"
+    IDS_UNKNOWN_APP "יישום לא ידוע"
+    IDS_EXE_DESCRIPTION "תיאור:"
 
-    IDS_MENU_EMPTY "(Empty)"
-    IDS_OBJECTS "%d Objects"
-    IDS_OBJECTS_SELECTED "%d Objects Selected"
+    IDS_MENU_EMPTY "(ריק)"
+    IDS_OBJECTS "%d פריטים"
+    IDS_OBJECTS_SELECTED "%d פריטים נבחרו"
 
-    IDS_ADVANCED_FOLDER "Files and Folders"
+    IDS_ADVANCED_FOLDER "קבצים ותיקיות"
     IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
     IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
     IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
@@ -878,9 +844,9 @@ BEGIN
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
     IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
     IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails"
-    IDS_ADVANCED_HIDDEN "Hidden files and folders"
-    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
-    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDDEN "קבצים ותיקיות מוסתרים"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "אל תציג קבצים ותיקיות מוסתרים"
+    IDS_ADVANCED_SHOW_HIDDEN "הצג קבצים ותיקיות מוסתרים"
     IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
     IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
     IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
@@ -890,12 +856,12 @@ BEGIN
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items"
 
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
+    IDS_NEWEXT_ADVANCED_LEFT "<< &מתקדם"
+    IDS_NEWEXT_ADVANCED_RIGHT "&מתקדם >>"
     IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
-    IDS_NEWEXT_EXT_IN_USE "Extension is in use"
+    IDS_NEWEXT_SPECIFY_EXT "עליך לציין סיומת."
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_EXT_IN_USE "סיומת בשימוש"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
     IDS_FILE_NOT_FOUND "The file '%s' was not found."
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 5e4593eb002..cf46d58d95c 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -81,7 +81,7 @@ BEGIN
         MENUITEM "&Move here", IDM_MOVEHERE
         MENUITEM "Create &shortcuts here", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "Mégse", 0
     END
 END
 
@@ -114,13 +114,13 @@ END
 
 IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Message"
+CAPTION "Üzenet"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Yes to &all", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "&Mégse", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
     ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
     LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
 END
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet, és a ReactOS megnyitja.", 12289, 36, 11, 182, 18
-    LTEXT "&Megnyitás:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet.", 12289, 36, 11, 182, 18
+    LTEXT "&Open:", 12305, 7, 39, 24, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Mégse", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Böngészés...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -177,11 +177,11 @@ BEGIN
     ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
     EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Target type:", 14004, 8, 38, 68, 10
+    LTEXT "Cél típusa:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Target location:", 14006, 8, 55, 68, 10
+    LTEXT "Cél helye:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Target:", 14008, 8, 71, 68, 10
+    LTEXT "&Cél:", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "&Start in:", 14010, 8, 98, 68, 10
@@ -193,8 +193,8 @@ BEGIN
     LTEXT "C&omment:", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
     PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "&Ikoncsere...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "&Haladó...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
 IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
@@ -218,10 +218,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Type of file:", 14004, 8, 40, 55, 10
-    CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
+    LTEXT "Fájl típusa:", 14004, 8, 40, 55, 10
+    CONTROL "Mappa", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 56, 55, 10
+    LTEXT "Hely:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Size:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -236,7 +236,7 @@ BEGIN
     LTEXT "Attributes:", 14020, 8, 152, 46, 10
     AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10
     AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10
+    AUTOCHECKBOX "&Archív", 14023, 181, 151, 70, 10
     PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
@@ -248,14 +248,14 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type of file:", 14004, 8, 35, 50, 10
+    LTEXT "Fájl típusa:", 14004, 8, 35, 50, 10
     CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Opens with:", 14006, 8, 53, 50, 10
+    LTEXT "Társítva:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 75, 45, 10
+    LTEXT "Hely:", 14008, 8, 75, 45, 10
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Size:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
@@ -272,34 +272,34 @@ BEGIN
     LTEXT "Attributes:", 14020, 8, 189, 45, 10
     AUTOCHECKBOX "&Read-only", 14021, 58, 188, 67, 10
     AUTOCHECKBOX "&Hidden", 14022, 126, 188, 50, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 188, 49, 10
+    AUTOCHECKBOX "&Archív", 14023, 181, 188, 49, 10
     PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
 
 IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Version"
+CAPTION "Verzió"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "Fájlverzió:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Leírás:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Egyéb verzióinformációk", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,36 +319,24 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "Ez a művelet megkeresi a hibákat a köteten.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Hardware"
+CAPTION "Hardver"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 END
@@ -366,30 +354,30 @@ BEGIN
     LTEXT "User name:", -1, 20, 118, 54, 10
     COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
-    LTEXT "Password:", -1, 20, 143, 53, 10
+    LTEXT "Jelszó:", -1, 20, 143, 53, 10
     EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
     PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
     PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Mégse", 14008, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Recycle Bin Properties"
+CAPTION "Lomtár tulajdonságai"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
-    GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70
+    GROUPBOX "A kijelölt hely beállításai", -1, 10, 72, 220, 70
     RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10
-    RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
-    AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
+    RADIOBUTTON "&Ne mozgassa a fájlokat a lomtárba. Törléskor azonnal távolítsa el azokat.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
+    AUTOCHECKBOX "&Törléskor jóváhagyás kérése", 14004, 20, 155, 140, 10, WS_TABSTOP
 END
 
 IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Open With"
+CAPTION "Társítás"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
@@ -397,32 +385,10 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
-END
-
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Mégse", IDCANCEL, 206, 236, 50, 14
 END
 
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
@@ -466,15 +432,15 @@ BEGIN
     DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
     PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14
     PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
     LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
     LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
     LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX
+    LTEXT "Szeretné lecserélni a létező fájlt", -1, 44, 35, 228, 10, SS_NOPREFIX
     LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX
     ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
-    LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX
+    LTEXT "erre?", -1, 44, 75, 228, 10, SS_NOPREFIX
     LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
@@ -485,9 +451,9 @@ CAPTION "Log Off ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
+    LTEXT "Biztosan ki akar jelentkezni?", -1, 49, 15, 131, 8
     DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
@@ -496,9 +462,9 @@ CAPTION "Disconnect ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8
+    LTEXT "Biztosan leválasztja a kapcsolatot?", -1, 49, 15, 131, 8
     DEFPUSHBUTTON "&Disconnect", IDOK, 47, 38, 47, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 47, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 99, 38, 47, 14
 END
 
 IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
@@ -509,7 +475,7 @@ BEGIN
     LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
     GROUPBOX "Actions", -1, 7, 45, 212, 146
-    AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP
+    AUTORADIOBUTTON "Válasszon ki egy &műveletet:", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
     AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10
     PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED
@@ -521,11 +487,11 @@ CAPTION "Mixed Content"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8
+    LTEXT "Ezen a lemezen vagy eszközön többféle típusú tartalom van.", 1001, 32, 7, 191, 20
+    LTEXT "Mit tegyen a ReactOS?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 160, 186, 60, 14
 END
 
 IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
@@ -537,11 +503,11 @@ BEGIN
     LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20
     ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
     EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8
+    LTEXT "Mit tegyen a ReactOS?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
     AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 160, 185, 60, 14
 END
 
 IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
@@ -551,11 +517,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
     LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22
-    LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8
+    LTEXT "&Mit tegyen a ReactOS?", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 159, 160, 60, 14
 END
 
 IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
@@ -568,7 +534,7 @@ BEGIN
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
     LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
-    PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 75, 82, 60, 14
     PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14
 END
 
@@ -600,7 +566,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
-    PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
     AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
@@ -609,16 +575,16 @@ END
 
 IDD_PICK_ICON DIALOGEX 0, 0, 193, 200
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "Ikoncsere"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT "Válasszon egy ikont a listából:", -1, 7, 36, 179, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
@@ -627,10 +593,9 @@ CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "This file could either be used by the operating system or by\n\
-another application. Modifying this file might damage your\n\
-system or make it less functional.\n\n\
-Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
+    LTEXT "Ezt a fájlt az operációs rendszer vagy egy másik alkalmazás használhatja.\n\
+A fájl módosítása károsíthatja a rendszer működését.\n\n\
+Biztosan meg akarja nyitni ezt a fájlt?", IDC_STATIC, 35, 5, 195, 60
     DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14
     PUSHBUTTON "No", IDNO, 180, 55, 50, 14
 END
@@ -642,11 +607,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&File Extension:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    PUSHBUTTON "<< &Haladó", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
     LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -661,34 +626,34 @@ BEGIN
     IDS_SHV_COLUMN_DISK_AVAILABLE "Rendelkezésre álló hely"
     IDS_SHV_COLUMN_OWNER "Tulajdonos"
     IDS_SHV_COLUMN_GROUP "Csoport"
-    IDS_SHV_COLUMN_FILENAME "Filename"
+    IDS_SHV_COLUMN_FILENAME "Fájlnév"
     IDS_SHV_COLUMN_CATEGORY "Category"
-    IDS_SHV_COLUMN_DELFROM "Original location"
+    IDS_SHV_COLUMN_DELFROM "Eredeti hely"
     IDS_SHV_COLUMN_DELDATE "Date deleted"
     IDS_SHV_COLUMN_FONTTYPE "Fonttype"
     IDS_SHV_COLUMN_WORKGROUP "Workgroup"
-    IDS_SHV_COLUMN_NETLOCATION "Network Location"
+    IDS_SHV_COLUMN_NETLOCATION "Hálózati hely"
     IDS_SHV_COLUMN_DOCUMENTS "Documents"
     IDS_SHV_COLUMN_STATUS "Status"
     IDS_SHV_COLUMN_COMMENTS "Megjegyzések"
-    IDS_SHV_COLUMN_LOCATION "Location"
+    IDS_SHV_COLUMN_LOCATION "Hely"
     IDS_SHV_COLUMN_MODEL "Model"
 
     /* special folders */
     IDS_DESKTOP "Asztal"
     IDS_MYCOMPUTER "Számítógép"
-    IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin"
-    IDS_CONTROLPANEL "Control Panel"
+    IDS_RECYCLEBIN_FOLDER_NAME "Lomtár"
+    IDS_CONTROLPANEL "Vezérlőpult"
     IDS_ADMINISTRATIVETOOLS "Administrative Tools"
 
     /* special folders descriptions */
-    IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer."
+    IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Felügyeleti eszközök kezelése."
     IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations."
     IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
-    IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones."
+    IDS_PRINTERS_DESCRIPTION "Telepített nyomtatók és faxok megtekintése és újak hozzáadása."
 
     /* About shell dialog version string */
-    IDS_ABOUT_VERSION_STRING "Version %S (%S)"
+    IDS_ABOUT_VERSION_STRING "Verzió %S (%S)"
 
     /* context menus */
     IDS_VIEW_LARGE "Nagy képek"
@@ -713,27 +678,27 @@ BEGIN
     IDS_CREATEFOLDER_CAPTION "Unable to create folder"
     IDS_DELETEITEM_CAPTION "Állomány törlése"
     IDS_DELETEFOLDER_CAPTION "Mappa törlése"
-    IDS_DELETEITEM_TEXT "Biztosan törölni szeretnéd?: '%1'?"
-    IDS_DELETEMULTIPLE_TEXT "Biztosan törölni szeretnéd ezt a(z) %1 elemet?"
-    IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
-    IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?"
-    IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?"
-    IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?"
-    IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?"
-    IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?"
+    IDS_DELETEITEM_TEXT "Biztosan törölni szeretné: '%1'?"
+    IDS_DELETEMULTIPLE_TEXT "Biztosan törölni szeretné ezt a(z) %1 elemet?"
+    IDS_DELETESELECTED_TEXT "Biztosan törölni szeretné a kijelölt elem(ek)et?"
+    IDS_TRASHITEM_TEXT "Biztosan lomtárba akarja dobni a következőt: '%1'?"
+    IDS_TRASHFOLDER_TEXT "Biztosan lomtárba akarja dobni a(z) '%1' mappát és a teljes tartalmát?"
+    IDS_TRASHMULTIPLE_TEXT "Biztosan lomtárba akarja dobni ezt a(z) %1 elemet?"
+    IDS_CANTTRASH_TEXT "Az elemet '%1' nem lehet a lomtárba helyezni. Szeretné helyette törölni?"
+    IDS_OVERWRITEFILE_TEXT "Ebben a mappában már van egy '%1' nevű fájl.\n\nSzeretné lecserélni?"
     IDS_OVERWRITEFILE_CAPTION "Állomány felülírása"
     IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?"
 
     IDS_FILEOOP_COPYING "Copying..."
     IDS_FILEOOP_MOVING "Moving..."
-    IDS_FILEOOP_DELETING "Deleting..."
+    IDS_FILEOOP_DELETING "Törlés..."
     IDS_FILEOOP_FROM_TO "From %1 to %2"
     IDS_FILEOOP_FROM "From %1"
     IDS_FILEOOP_PREFLIGHT "Preflight"
 
     /* message box strings */
     IDS_RESTART_TITLE "Újraindítás"
-    IDS_RESTART_PROMPT "Újra szeretnéd indítani a rendszert?"
+    IDS_RESTART_PROMPT "Újra szeretné indítani a rendszert?"
     IDS_SHUTDOWN_TITLE "Kikapcsolás"
     IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?"
 
@@ -743,7 +708,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Dokumentumok"
     IDS_FAVORITES "Kedvencek"
@@ -773,7 +738,7 @@ BEGIN
     IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning"
     IDS_NETWORKPLACE "My Network Places"
 
-    IDS_NEWFOLDER "New Folder"
+    IDS_NEWFOLDER "Új mappa"
 
     IDS_DRIVE_FIXED "Local Disk"
     IDS_DRIVE_CDROM "CD Drive"
@@ -785,7 +750,7 @@ BEGIN
     /* Open With */
     IDS_OPEN_WITH "Open With"
     IDS_OPEN_WITH_CHOOSE "Choose Program..."
-    IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:"
+    IDS_OPEN_WITH_RECOMMENDED "Ajánlott programok:"
     IDS_OPEN_WITH_OTHER "Other Programs:"
 
     IDS_SHELL_ABOUT_AUTHORS "&Authors"
@@ -794,9 +759,9 @@ BEGIN
     FCIDM_SHVIEW_NEWFOLDER "&Mappa"
     FCIDM_SHVIEW_NEWLINK "&Parancsikon"
     IDS_FOLDER_OPTIONS "Folder Options"
-    IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
-    IDS_RECYCLEBIN_DISKSPACE "Space Available"
-    IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
+    IDS_RECYCLEBIN_LOCATION "Lomtár helye"
+    IDS_RECYCLEBIN_DISKSPACE "Szabad terület"
+    IDS_EMPTY_BITBUCKET "Lomtár ürítése"
     IDS_PICK_ICON_TITLE "Choose Icon"
     IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
     IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
@@ -808,42 +773,42 @@ BEGIN
     IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
 
     /* Friendly File Type Names */
-    IDS_DIRECTORY "Folder"
-    IDS_BAT_FILE "ReactOS Batch File"
-    IDS_CMD_FILE "ReactOS Command Script"
-    IDS_COM_FILE "DOS Application"
-    IDS_CPL_FILE "Control Panel Item"
+    IDS_DIRECTORY "Mappa"
+    IDS_BAT_FILE "ReactOS kötegfájl"
+    IDS_CMD_FILE "ReactOS parancsfájl"
+    IDS_COM_FILE "DOS alkalmazás"
+    IDS_CPL_FILE "Vezérlőpultelem"
     IDS_CUR_FILE "Cursor"
     IDS_DB__FILE "Database File"
     IDS_DLL_FILE "Application Extension"
     IDS_DRV_FILE "Device Driver"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
-    IDS_EXE_FILE "Application"
-    IDS_NLS_FILE "National Language Support File"
+    IDS_EXE_FILE "Alkalmazás"
+    IDS_NLS_FILE "Nyelvi támogatási fájl"
     IDS_OCX_FILE "ActiveX Control"
     IDS_TLB_FILE "Type Library"
     IDS_FON_FILE "Font file"
     IDS_TTF_FILE "TrueType Font file"
     IDS_OTF_FILE "OpenType Font file"
-    IDS_HLP_FILE "Help File"
+    IDS_HLP_FILE "Súgófájl"
     IDS_ICO_FILE "Icon"
     IDS_INI_FILE "Configuration Settings"
     IDS_LNK_FILE "Shortcut"
     IDS_NT__FILE "NT DOS32 Configuration File"
-    IDS_PIF_FILE "NT VDM Program Information File"
+    IDS_PIF_FILE "NT VDM programinformációs fájl"
     IDS_SCR_FILE "Screen Saver"
     IDS_SYS_FILE "System File"
     IDS_VXD_FILE "Virtual Device Driver"
     IDS_ANY_FILE "%s-file"
 
     IDS_OPEN_VERB "Open"
-    IDS_EXPLORE_VERB "Explore"
+    IDS_EXPLORE_VERB "Intéző"
     IDS_RUNAS_VERB "Run as..."
     IDS_EDIT_VERB "Edit"
     IDS_FIND_VERB "Find"
     IDS_PRINT_VERB "Print"
 
-    IDS_FILE_FOLDER "%u Files, %u Folders"
+    IDS_FILE_FOLDER "%u fájl, %u mappa"
     IDS_PRINTERS "Printers"
     IDS_FONTS "Fonts"
     IDS_INSTALLNEWFONT "Install New Font..."
@@ -851,7 +816,7 @@ BEGIN
     IDS_DEFAULT_CLUSTER_SIZE "Default allocation size"
     IDS_COPY_OF "Copy of"
 
-    IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file."
+    IDS_SHLEXEC_NOASSOC "Ehhez a fájltípushoz nincs ReactOS program társítva."
 
     IDS_FILE_DETAILS "Details for '%s' extension"
     IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."
@@ -862,41 +827,41 @@ BEGIN
        used in the _File type_ tab of the _Folder Options_ dialog */
     IDS_FILE_EXT_TYPE "%s File"
 
-    IDS_BYTES_FORMAT "bytes"
+    IDS_BYTES_FORMAT "bájt"
     IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
+    IDS_EXE_DESCRIPTION "Leírás:"
 
-    IDS_MENU_EMPTY "(Empty)"
-    IDS_OBJECTS "%d Objects"
-    IDS_OBJECTS_SELECTED "%d Objects Selected"
+    IDS_MENU_EMPTY "(üres)"
+    IDS_OBJECTS "%d elem"
+    IDS_OBJECTS_SELECTED "%d kijelölt elem"
 
-    IDS_ADVANCED_FOLDER "Files and Folders"
-    IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
+    IDS_ADVANCED_FOLDER "Fájlok és mappák"
+    IDS_ADVANCED_NET_CRAWLER "Hálózati mappák és nyomtatók automatikus keresése"
     IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
-    IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_FRIENDLY_TREE "Egyszerű mappanézet az intéző mappalistájában"
     IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
     IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
     IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails"
     IDS_ADVANCED_HIDDEN "Hidden files and folders"
-    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
-    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "elrejtése"
+    IDS_ADVANCED_SHOW_HIDDEN "megjelenítése"
     IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
     IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
-    IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
+    IDS_ADVANCED_DESKTOP_PROCESS "Mappaablakok megnyitása külön folyamatként"
     IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings"
     IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon"
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items"
 
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
-    IDS_NEWEXT_NEW "<New>"
+    IDS_NEWEXT_ADVANCED_LEFT "<< &Haladó"
+    IDS_NEWEXT_ADVANCED_RIGHT "&Haladó >>"
+    IDS_NEWEXT_NEW "<Új>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
     IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
+    IDS_REMOVE_EXT "Ha egy regisztrált fájlkiterjesztést töröl, nem fogja tudni az ilyen típusú fájlokat dupla kattintással megnyitni.\n\nBiztosan törli ezt a kiterjesztést?"
     IDS_FILE_NOT_FOUND "The file '%s' was not found."
 END
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index 7e8ea8455dc..6bd06b4e80a 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -3,11 +3,11 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 MENU_001 MENUEX
 BEGIN
     MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON
-    MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON
+    MENUITEM "Icone Piccole", FCIDM_SHVIEW_SMALLICON
     MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW
     MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW
     MENUITEM "", -1, MFT_SEPARATOR
-    POPUP "Disponi &Icone", FCIDM_SHVIEW_ARRANGE
+    POPUP "Disponi Icone", FCIDM_SHVIEW_ARRANGE
     BEGIN
         MENUITEM "", -1, MFT_SEPARATOR
         MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE
@@ -22,7 +22,7 @@ BEGIN
         POPUP "&Visualizza", FCIDM_SHVIEW_VIEW
         BEGIN
             MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON
-            MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON
+            MENUITEM "Icone Piccole", FCIDM_SHVIEW_SMALLICON
             MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW
             MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW
         END
@@ -65,8 +65,8 @@ BEGIN
         MENUITEM "&Taglia", IDM_CUT
         MENUITEM "&Copia", IDM_COPY
         MENUITEM SEPARATOR
-        MENUITEM "&Crea Collegamento", IDM_CREATELINK
-        MENUITEM "&Cancella", IDM_DELETE
+        MENUITEM "Crea Collegamento", IDM_CREATELINK
+        MENUITEM "Cancella", IDM_DELETE
         MENUITEM "&Rinomina", IDM_RENAME
         MENUITEM SEPARATOR
         MENUITEM "&Proprietà", IDM_PROPERTIES
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18
+    LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Apri:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annulla", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Esplora...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -186,7 +186,7 @@ BEGIN
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "&Eseguito in:", 14010, 8, 98, 68, 10
     EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "&Tasto per il collegamento:", 14014, 8, 117, 68, 10
+    LTEXT "Tasto per il collegamento:", 14014, 8, 117, 68, 10
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "E&secuzione:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
@@ -225,7 +225,7 @@ BEGIN
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Dimensione:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Dimensione sul disco:", 140101, 8, 88, 55, 10
+    LTEXT "Sul disco:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contenente:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -259,7 +259,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Dimensione:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Dimensione sul disco:", 140112, 8, 107, 55, 10
+    LTEXT "Sul disco:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Creato:", 14014, 8, 131, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versione"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versione: ", 14000, 10, 10, 55, 10
+    LTEXT "Versione:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Descrizione: ", 14002, 10, 27, 45, 10
+    LTEXT "Descrizione:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Altre informazioni sulla versione: ", 14006, 6, 70, 222, 115
-    LTEXT "Nome dell'elemento: ", 14007, 13, 82, 50, 10
-    LTEXT "Valore: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Altre informazioni sulla versione", 14006, 6, 70, 222, 115
+    LTEXT "Nome dell'elemento:", 14007, 13, 82, 50, 10
+    LTEXT "Valore:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipo:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacità:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Disco %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Pulitura &disco", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Disco %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Strumenti"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Controllo errori", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Questa opzione controllerà questo volume\nper verificare l'assenza di errori.", -1, 40, 25, 160, 20
+    LTEXT "Questa opzione controllerà questo volume per verificare l'assenza di errori.", -1, 40, 25, 160, 20
     PUSHBUTTON "Controlla...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Deframmentazione", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Questa opzione deframmenterà i file di questo volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Deframmenta...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Salvataggio", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Questa opzione effettuerà un salvataggio dei file del volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Salvataggio...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programmi", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Usare sempre il programma selezionato per aprire questo tipo di file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Sfoglia...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Usare sempre questo programma per aprire questo tipo di file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Sfoglia...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Generale"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Attività", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Mostrare le attività comuni nelle cartelle", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 200, 10
-    GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 200, 10
-    GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10
-    AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
-    AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
-    PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 120, 180, 120, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Visualizzazione"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 40
     PUSHBUTTON "Annulla", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Annulla", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Sfoglia"
     IDS_RUNDLG_BROWSE_FILTER "File Eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menu Avvio\\Programmi"
     IDS_PERSONAL "Documenti Personali"
     IDS_FAVORITES "Preferiti"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index b715a630b1f..29191a73328 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -49,11 +49,11 @@ BEGIN
     MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT
     MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK
     MENUITEM SEPARATOR
-    MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO
-    MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO
+    MENUITEM "フォルダにコピー(&F)...", FCIDM_SHVIEW_COPYTO
+    MENUITEM "フォルダに移動(&V)...", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
-    MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION
+    MENUITEM "すべて選択(&A)\tCtrl+A", FCIDM_SHVIEW_SELECTALL
+    MENUITEM "選択を反転(&I)", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "切り取り(&U)", IDM_CUT
+        MENUITEM "切り取り(&T)", IDM_CUT
         MENUITEM "コピー(&C)", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "ショートカットの作成(&L)", IDM_CREATELINK
@@ -78,10 +78,10 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM "&Copy here", IDM_COPYHERE
-        MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "ここに移動(&M)", IDM_MOVEHERE
+        MENUITEM "ここにショートカットを作成(&S)", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "キャンセル", 0
     END
 END
 
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -163,7 +163,7 @@ BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
     LTEXT "実行するプログラム名、または開くフォルダや文書名、インターネット リソース名を入力してください。", 12289, 36, 11, 182, 18
     LTEXT "名前(&O):", 12305, 7, 39, 27, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "キャンセル", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "参照(&B)...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -227,7 +227,7 @@ BEGIN
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "物理サイズ:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "収容サイズ:", 14026, 8, 104, 55, 10
+    LTEXT "内容:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "作成日時:", 14014, 8, 128, 55, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "バージョン"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-    LTEXT "ファイルバージョン: ", 14000, 10, 10, 55, 10
+    LTEXT "ファイルバージョン:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "説明: ", 14002, 10, 27, 45, 10
+    LTEXT "説明:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "著作権: ", 14004, 10, 46, 66, 10
+    LTEXT "著作権:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "その他のバージョン情報: ", 14006, 6, 70, 222, 115
-    LTEXT "項目名: ", 14007, 13, 82, 50, 10
-    LTEXT "値: ", 14008, 112, 82, 45, 10
+    GROUPBOX "その他のバージョン情報", 14006, 6, 70, 222, 115
+    LTEXT "項目名:", 14007, 13, 82, 50, 10
+    LTEXT "値:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "種類:", -1, 8, 38, 95, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "容量:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "ドライブ %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "ディスクのクリーンアップ", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "ドライブ %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ツール"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "このオプションはボリュームエラーをチェックします。", -1, 40, 25, 160, 20
     PUSHBUTTON "すぐにチェック...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "最適化", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "このオプションはこのボリュームのファイルを最適化します。", -1, 40, 85, 160, 20
-    PUSHBUTTON "すぐに最適化...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "バックアップ", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "このオプションはこのボリュームのファイルをバックアップします。", -1, 40, 150, 160, 20
-    PUSHBUTTON "すぐにバックアップ...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ハードウェア"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "ファイル:    ", 14001, 44, 25, 188, 20
     GROUPBOX "プログラムの一覧(&P)", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "この種類のファイルを開くときは、常に選択したプログラムを使用する(&A)", 14003, 20, 193, 225, 10
-    PUSHBUTTON "参照(&B)...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "この種類のファイルを開くときは、常に選択したプログラムを使用する(&A)", 14003, 16, 193, 232, 10
+    PUSHBUTTON "参照(&B)...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "全般"
-FONT 9, "MS UI Gothic", 0, 0, 0x0
-BEGIN
-    GROUPBOX "タスク", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "フォルダに共通のタスクを表示する(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "ReactOS クラシック フォルダを使用する(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 210, 10
-    GROUPBOX "フォルダの参照", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "同じウィンドウでフォルダを開く(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "フォルダごとに異なるウィンドウで開く(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
-    GROUPBOX "項目のクリック方法", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "シングルクリックで項目を開く(ポイントで選択) (&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "ブラウザに合わせてアイコンタイトルに下線を引く(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10
-    AUTORADIOBUTTON "ポイントしたときのみアイコンタイトルに下線を引く(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
-    AUTORADIOBUTTON "ダブルクリックで項目を開く(シングルクリックで選択)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
-    PUSHBUTTON "デフォルトに戻す(&R)", 14011, 180, 180, 75, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "表示"
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "以下のリストからアイコンを選択:", -1, 7, 36, 185, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 135, 179, 50, 14
 END
@@ -633,17 +599,17 @@ BEGIN
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "新しい拡張子を作成"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "&File Extension:", -1, 10, 10, 85, 14
+    LTEXT "ファイル拡張子(&F):", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
     PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
+    LTEXT "関連付け先(&A):", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -704,7 +670,7 @@ BEGIN
     IDS_RENAME "名前の変更"
     IDS_PASTE "挿入"
     IDS_EJECT "取り出し"
-    IDS_DISCONNECT "Disconnect"
+    IDS_DISCONNECT "接続の切断"
 
     IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません"
     IDS_CREATEFOLDER_CAPTION "フォルダを作成できません"
@@ -726,7 +692,7 @@ BEGIN
     IDS_FILEOOP_DELETING "削除中..."
     IDS_FILEOOP_FROM_TO "%1 から %2 へ"
     IDS_FILEOOP_FROM "%1 から"
-    IDS_FILEOOP_PREFLIGHT "Preflight"
+    IDS_FILEOOP_PREFLIGHT "準備中"
 
     /* message box strings */
     IDS_RESTART_TITLE "再起動"
@@ -735,12 +701,12 @@ BEGIN
     IDS_SHUTDOWN_PROMPT "シャットダウンしますか?"
 
     /* Run File dialog */
-    IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)"
+    IDS_RUNDLG_ERROR "「ファイルの実行」ダイアログを表示できませんでした (内部エラー)"
+    IDS_RUNDLG_BROWSE_ERROR "「閲覧」ダイアログを表示できませんでした (内部エラー)"
     IDS_RUNDLG_BROWSE_CAPTION "参照"
-    IDS_RUNDLG_BROWSE_FILTER "実行可能ファイル Files (*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0"
+    IDS_RUNDLG_BROWSE_FILTER "実行可能ファイル (*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "スタート メニュー\\プログラム"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -777,7 +743,7 @@ BEGIN
     IDS_DRIVE_NETWORK "ネットワーク ディスク"
     IDS_DRIVE_FLOPPY "3.5フロッピー"
     IDS_DRIVE_REMOVABLE "リムーバブル ディスク"
-    IDS_FS_UNKNOWN "Unknown"
+    IDS_FS_UNKNOWN "未知の形式"
 
     /* Open With */
     IDS_OPEN_WITH "プログラムから開く"
@@ -795,14 +761,14 @@ BEGIN
     IDS_RECYCLEBIN_DISKSPACE "利用できる領域"
     IDS_EMPTY_BITBUCKET "ごみ箱を空にする"
     IDS_PICK_ICON_TITLE "アイコンの選択"
-    IDS_PICK_ICON_FILTER "アイコンファイル (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-    IDS_OPEN_WITH_FILTER "実行可能 ファイル (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+    IDS_PICK_ICON_FILTER "アイコンファイル (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0すべてのファイル (*.*)\0*.*\0"
+    IDS_OPEN_WITH_FILTER "実行可能ファイル (*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0"
 
-    IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
-    IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)."
-    IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)."
-    IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)."
-    IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
+    IDS_CANTLOCKVOLUME "ボリュームをロックできませんでした (エラーコード: %lu)."
+    IDS_CANTDISMOUNTVOLUME "ボリュームをディスマウントできませんでした (エラーコード: %lu)."
+    IDS_CANTEJECTMEDIA "メディアを取り出しできませんでした (エラーコード: %lu)."
+    IDS_CANTSHOWPROPERTIES "プロパティを表示できませんでした (エラーコード: %lu)."
+    IDS_CANTDISCONNECT "接続を切れませんでした (エラーコード: %lu)."
 
     /* Friendly File Type Names */
     IDS_DIRECTORY "フォルダ"
@@ -811,14 +777,14 @@ BEGIN
     IDS_COM_FILE "DOS アプリケーション"
     IDS_CPL_FILE "コントロール パネルの項目"
     IDS_CUR_FILE "カーソル"
-    IDS_DB__FILE "Database File"
+    IDS_DB__FILE "データベース ファイル"
     IDS_DLL_FILE "アプリケーション 拡張"
     IDS_DRV_FILE "デバイス ドライバ"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
     IDS_EXE_FILE "アプリケーション"
-    IDS_NLS_FILE "National Language Support File"
-    IDS_OCX_FILE "ActiveX Control"
-    IDS_TLB_FILE "Type Library"
+    IDS_NLS_FILE "各国語サポートファイル"
+    IDS_OCX_FILE "ActiveX コントロール"
+    IDS_TLB_FILE "型ライブラリ"
     IDS_FON_FILE "フォント ファイル"
     IDS_TTF_FILE "TrueType フォント ファイル"
     IDS_OTF_FILE "OpenType フォント ファイル"
@@ -826,11 +792,11 @@ BEGIN
     IDS_ICO_FILE "アイコン ファイル"
     IDS_INI_FILE "設定ファイル"
     IDS_LNK_FILE "ショートカット"
-    IDS_NT__FILE "NT DOS32 Configuration File"
+    IDS_NT__FILE "NT DOS32 設定ファイル"
     IDS_PIF_FILE "NT VDM プログラム情報ファイル"
     IDS_SCR_FILE "スクリーンセーバー"
     IDS_SYS_FILE "システム ファイル"
-    IDS_VXD_FILE "仮想 デバイス ドライバ"
+    IDS_VXD_FILE "仮想デバイス ドライバ"
     IDS_ANY_FILE "%s-file"
 
     IDS_OPEN_VERB "開く"
@@ -889,11 +855,11 @@ BEGIN
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
-    IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
-    IDS_NEWEXT_EXT_IN_USE "Extension is in use"
+    IDS_NEWEXT_NEW "<新規>"
+    IDS_NEWEXT_SPECIFY_EXT "拡張子を指定して下さい。"
+    IDS_NEWEXT_ALREADY_ASSOC "拡張子 %s はすでにファイルの種類 %s に関連付けられています。%s から %s への関連付けを解除して、新しいファイルの種類を作成しますか?"
+    IDS_NEWEXT_EXT_IN_USE "拡張子は使用中"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "もし、ファイル名の拡張子を削除すれば、ダブルクリックによってそれらのファイルを開くことができなくなります。\n\nこの拡張子を削除しますか?"
+    IDS_FILE_NOT_FOUND "ファイル '%s' は見つかりませんでした。"
 END
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index 722e7b34a1a..26ccee7ab7a 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
+        MENUITEM "Cu&t", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
@@ -87,11 +87,11 @@ END
 
 IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
+CAPTION "폴더 찾아보기"
 FONT 9, "굴림"
 BEGIN
     DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "취소", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24
     LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
@@ -99,7 +99,7 @@ END
 
 IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
+CAPTION "폴더 찾아보기"
 FONT 9, "굴림"
 BEGIN
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
@@ -107,9 +107,9 @@ BEGIN
     LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
     EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "새 폴더 만들기(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "취소", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
 END
 
 IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -151,56 +151,56 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "굴림"
 BEGIN
-    LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10
+    LTEXT "ReactOS는 다음 단체의 도움으로 제공됩니다:", IDC_STATIC, 0, 0, 180, 10
     LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75
 END
 
 IDD_RUN DIALOGEX 0, 0, 227, 95
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Run"
+CAPTION "실행"
 FONT 9, "굴림"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18
+    LTEXT "Type the name of a program, folder, document, or Internet resource.", 12289, 36, 11, 182, 18
     LTEXT "&Open:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
+    PUSHBUTTON "취소", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP
 END
 
 IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Shortcut"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "바로 가기"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
     EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Target type:", 14004, 8, 38, 68, 10
+    LTEXT "대상 형식:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Target location:", 14006, 8, 55, 68, 10
+    LTEXT "대상 위치:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Target:", 14008, 8, 71, 68, 10
+    LTEXT "대상(&T):", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "&Start in:", 14010, 8, 98, 68, 10
     EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10
+    LTEXT "바로 가기 키(&K):", 14014, 8, 117, 68, 10
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "&Run:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     LTEXT "C&omment:", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
-    PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "대상 찾기(&F)...", 14020, 9, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "아이콘 변경(&C)...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "고급(&D)...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
 IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Extended Properties"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "고급 속성"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
     LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10
@@ -208,72 +208,72 @@ BEGIN
     LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40
     CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "중단", 2, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "일반"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Type of file:", 14004, 8, 40, 55, 10
-    CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
+    LTEXT "파일 형식:", 14004, 8, 40, 55, 10
+    CONTROL "폴더", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 56, 55, 10
+    LTEXT "위치:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 72, 55, 10
+    LTEXT "크기:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Size on disk:", 140101, 8, 88, 55, 10
+    LTEXT "디스크 할당 크기:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contains:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 128, 55, 10
+    LTEXT "만든 날짜:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Attributes:", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10
-    PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    AUTOCHECKBOX "읽기 전용(&R)", 14021, 58, 151, 70, 10
+    AUTOCHECKBOX "숨김(&H)", 14022, 126, 151, 70, 10
+    AUTOCHECKBOX "보관(&A)", 14023, 181, 151, 70, 10
+    PUSHBUTTON "고급(&D)...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "일반"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type of file:", 14004, 8, 35, 50, 10
+    LTEXT "파일 형식:", 14004, 8, 35, 50, 10
     CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Opens with:", 14006, 8, 53, 50, 10
+    LTEXT "연결 프로그램:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
-    PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "변경(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 75, 45, 10
+    LTEXT "위치:", 14008, 8, 75, 45, 10
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 91, 45, 10
+    LTEXT "크기:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Size on disk:", 140112, 8, 107, 55, 10
+    LTEXT "디스크 할당 크기:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 131, 45, 10
+    LTEXT "만든 날짜:", 14014, 8, 131, 45, 10
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Modified:", 14016, 8, 147, 45, 10
+    LTEXT "수정한 날짜:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Accessed:", 14018, 8, 163, 45, 10
+    LTEXT "액세스한 날짜:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Attributes:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 188, 67, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 188, 50, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 188, 49, 10
-    PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP
+    AUTOCHECKBOX "읽기 전용(&R)", 14021, 58, 188, 67, 10
+    AUTOCHECKBOX "숨김(&H)", 14022, 126, 188, 50, 10
+    AUTOCHECKBOX "보관(&A)", 14023, 181, 188, 49, 10
+    PUSHBUTTON "고급(&D)...", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
 
 IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 9, "굴림", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "General"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "일반"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,44 +319,32 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Tools"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "도구"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Hardware"
-FONT 9, "굴림", 0, 0, 0x0
+CAPTION "하드웨어"
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Run As"
-FONT 9, "굴림", 0, 0, 0x0
+FONT 9, "굴림", 0, 0, 0x1
 BEGIN
     LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
     CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 9, "굴림", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -460,7 +426,7 @@ END
 
 IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Confirm File Replace"
+CAPTION "파일 교체 확인"
 FONT 9, "굴림"
 BEGIN
     DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
@@ -602,23 +568,23 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
 
 IDD_PICK_ICON DIALOGEX 0, 0, 193, 200
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "아이콘 변경"
 FONT 9, "굴림", 400, 0, 0x1
 BEGIN
-    LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
+    LTEXT "파일에서 아이콘 찾기(&L):", -1, 7, 7, 179, 10
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT "아래 목록에서 아이콘 선택:", -1, 7, 36, 179, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
+    PUSHBUTTON "취소", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
@@ -658,7 +624,7 @@ BEGIN
     IDS_SHV_COLUMN_MODIFIED "Modified"
     IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
     IDS_SHV_COLUMN_DISK_CAPACITY "Size"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+    IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
     IDS_SHV_COLUMN_OWNER "Owner"
     IDS_SHV_COLUMN_GROUP "Group"
     IDS_SHV_COLUMN_FILENAME "Filename"
@@ -691,23 +657,23 @@ BEGIN
     IDS_ABOUT_VERSION_STRING "Version %S (%S)"
 
     /* context menus */
-    IDS_VIEW_LARGE "Lar&ge Icons"
-    IDS_VIEW_SMALL "S&mall Icons"
+    IDS_VIEW_LARGE "큰 아이콘(&G)"
+    IDS_VIEW_SMALL "작은 아이콘(&M)"
     IDS_VIEW_LIST "&List"
     IDS_VIEW_DETAILS "&Details"
     IDS_SELECT "Select"
     IDS_OPEN "Open"
     IDS_CREATELINK "Create &Link"
     IDS_COPY "&Copy"
-    IDS_DELETE "Delete"
+    IDS_DELETE "삭제"
     IDS_PROPERTIES "Properties"
     IDS_CUT "C&ut"
     IDS_RESTORE "Restore"
     IDS_FORMATDRIVE "Format..."
     IDS_RENAME "Rename"
-    IDS_PASTE "Paste"
-    IDS_EJECT "Eject"
-    IDS_DISCONNECT "Disconnect"
+    IDS_PASTE "붙여넣기"
+    IDS_EJECT "꺼내기"
+    IDS_DISCONNECT "연결 끊기"
 
     IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
     IDS_CREATEFOLDER_CAPTION "Unable to create folder"
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -775,11 +741,11 @@ BEGIN
 
     IDS_NEWFOLDER "New Folder"
 
-    IDS_DRIVE_FIXED "Local Disk"
-    IDS_DRIVE_CDROM "CD Drive"
-    IDS_DRIVE_NETWORK "Network Disk"
-    IDS_DRIVE_FLOPPY "3.5 Floppy"
-    IDS_DRIVE_REMOVABLE "Removable Disk"
+    IDS_DRIVE_FIXED "로컬 디스크"
+    IDS_DRIVE_CDROM "CD 드라이브"
+    IDS_DRIVE_NETWORK "네트워크 디스크"
+    IDS_DRIVE_FLOPPY "3.5 플로피"
+    IDS_DRIVE_REMOVABLE "이동식 디스크"
     IDS_FS_UNKNOWN "Unknown"
 
     /* Open With */
@@ -793,13 +759,13 @@ BEGIN
     FCIDM_SHVIEW_NEW "New"
     FCIDM_SHVIEW_NEWFOLDER "New &Folder"
     FCIDM_SHVIEW_NEWLINK "New &Link"
-    IDS_FOLDER_OPTIONS "Folder Options"
+    IDS_FOLDER_OPTIONS "폴더 옵션"
     IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
     IDS_RECYCLEBIN_DISKSPACE "Space Available"
-    IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
-    IDS_PICK_ICON_TITLE "Choose Icon"
-    IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-    IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+    IDS_EMPTY_BITBUCKET "휴지통 비우기"
+    IDS_PICK_ICON_TITLE "아이콘 선택"
+    IDS_PICK_ICON_FILTER "아이콘 파일 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
+    IDS_OPEN_WITH_FILTER "실행 파일 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
     IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
     IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)."
@@ -808,7 +774,7 @@ BEGIN
     IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
 
     /* Friendly File Type Names */
-    IDS_DIRECTORY "Folder"
+    IDS_DIRECTORY "폴더"
     IDS_BAT_FILE "ReactOS Batch File"
     IDS_CMD_FILE "ReactOS Command Script"
     IDS_COM_FILE "DOS Application"
@@ -839,7 +805,7 @@ BEGIN
     IDS_OPEN_VERB "Open"
     IDS_EXPLORE_VERB "Explore"
     IDS_RUNAS_VERB "Run as..."
-    IDS_EDIT_VERB "Edit"
+    IDS_EDIT_VERB "편집"
     IDS_FIND_VERB "Find"
     IDS_PRINT_VERB "Print"
 
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index 7ce4c43a764..0d444c1726b 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
+        MENUITEM "Cu&t", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 182, 18
+    LTEXT "Geef de naam van een programma, map, document, of Internet-adres op.", 12289, 36, 11, 182, 18
     LTEXT "&Openen:", 12305, 7, 39, 28, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annuleren", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Bladeren...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -658,7 +624,7 @@ BEGIN
     IDS_SHV_COLUMN_MODIFIED "Modified"
     IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
     IDS_SHV_COLUMN_DISK_CAPACITY "Size"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+    IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
     IDS_SHV_COLUMN_OWNER "Owner"
     IDS_SHV_COLUMN_GROUP "Group"
     IDS_SHV_COLUMN_FILENAME "Filename"
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index eade9e38fcd..2262934c8bb 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -3,7 +3,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 MENU_001 MENUEX
 BEGIN
     MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON
-    MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON
+    MENUITEM "Små ikoner", FCIDM_SHVIEW_SMALLICON
     MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW
     MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW
     MENUITEM "", -1, MFT_SEPARATOR
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Klipp &ut", IDM_CUT
+        MENUITEM "Klipp u&t", IDM_CUT
         MENUITEM "&Kopier", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "&Opprett snarvei", IDM_CREATELINK
@@ -120,7 +120,7 @@ BEGIN
     DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Ja til &alt", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&Nei", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Avbry&t", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Avbry&t", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
     ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
     LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
 END
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,12 +161,12 @@ CAPTION "Kjør"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18
+    LTEXT "Skriv inn navnet på et program, mappe, dokument eller Internett-ressurs.", 12289, 36, 11, 182, 18
     LTEXT "&Åpne:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Bla gjennom .", 12288, 170, 63, 54, 14, WS_TABSTOP
+    PUSHBUTTON "&Bla gjennom", 12288, 170, 70, 54, 14, WS_TABSTOP
 END
 
 IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 240, 130
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versjon"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Filversjon: ", 14000, 10, 10, 55, 10
+    LTEXT "Filversjon:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Beskrivelse: ", 14002, 10, 27, 45, 10
+    LTEXT "Beskrivelse:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Enerett: ", 14004, 10, 46, 66, 10
+    LTEXT "Enerett:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Annet versjon informasjon: ", 14006, 6, 70, 222, 115
-    LTEXT "Enhetsnavn: ", 14007, 13, 82, 50, 10
-    LTEXT "Verdi: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Annet versjon informasjon", 14006, 6, 70, 222, 115
+    LTEXT "Enhetsnavn:", 14007, 13, 82, 50, 10
+    LTEXT "Verdi:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Kapasitet:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Stasjon %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Diskoppryding", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Stasjon %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Verktøy"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Feilsøking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Dette alternativet vil kontrollere volumet for\nfeil.", -1, 40, 25, 160, 20
+    LTEXT "Dette alternativet vil kontrollere volumet for feil.", -1, 40, 25, 160, 20
     PUSHBUTTON "Kontroller nå...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentering", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Dette alternativet defragmenterer filene på volumet.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmenter nå...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Sikkerhetskopi", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Dette alternativet tar sikkerhetskopi av filene på volumet.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Ta sikkerhetskopi...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Maskinvare"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Fil:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Program", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Alltid bruk valgte program for å åpne denne filtypen", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Utforsk...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Alltid bruk valgte program for å åpne denne filtypen", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Utforsk...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Generielt"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Oppgaver", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Vis felles oppgaver i &mapper", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Bruk ReactOS klass&isk mapper", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Utforsk mapper", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Åpne hver mapper i sa&mme vindu", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Åpne hver mapper i sitt egen &vindu", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Klikk enheter som følgende", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Enkelt-klikk for å åpne en enhet (peker for å velge)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Understrek ikon titteler konsekvent med min &utforsker", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 190, 10
-    AUTORADIOBUTTON "Understrek ikon titteler bare mens jeg &peker på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10
-    AUTORADIOBUTTON "&Dobbelt klikk for å åpne enheten (Enkelt-klikk for å velge)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 194, 10
-    PUSHBUTTON "&Bruk standard", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Vis"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Alternativer for diskkontroll", -1, 7, 6, 179, 40
     PUSHBUTTON "Avbryt", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Reparer feil i filsysten automatisk", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Søk etter og forsøk å reparere skadet sektorer", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Søk etter og forsøk å reparere skadet sektorer", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start-meny\\Programmer"
     IDS_PERSONAL "Mine dokumenter"
     IDS_FAVORITES "Favoritter"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index ea12195550d..e134d811ba8 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -1,7 +1,5 @@
-/*
- *      Updated by Saibamen (July, 2015)
- *      Updated by BlackDragonDv (January, 2018)
- */
+// COPYRIGHT: 2015 Saibamen
+//            2018 BlackDragonDv
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
@@ -138,7 +136,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -166,9 +164,9 @@ CAPTION "Uruchamianie"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Wpisz nazwę programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18
-    LTEXT "&Otwórz:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    LTEXT "Wpisz nazwę programu, folderu, dokumentu lub zasobu internetowego.", 12289, 36, 11, 182, 18
+    LTEXT "&Otwórz:", 12305, 7, 39, 25, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Przeglądaj...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -191,7 +189,7 @@ BEGIN
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "&Uruchom w:", 14010, 8, 98, 68, 10
     EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "Skrót &klawiszowy:", 14014, 8, 117, 68, 10
+    LTEXT "Klawisz &skrótu:", 14014, 8, 117, 68, 10
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "U&ruchom:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
@@ -213,7 +211,7 @@ BEGIN
     LTEXT "Ta opcja pozwoli ci na uruchomienie skrótu jako inny użytkownik, do ochrony twoich danych przed niepowołanym dostępem.", -1, 50, 60, 175, 40
     CHECKBOX "Uruchom w osobnym przedziale pamięci", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Anuluj", 2, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
@@ -223,14 +221,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Typ:", 14004, 8, 40, 55, 10
+    LTEXT "Typ:", 14004, 8, 40, 42, 10
     CONTROL "Katalog", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Lokalizacja:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Rozmiar:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Rozmiar na dysku:", 140101, 8, 88, 60, 10
+    LTEXT "Na dysku:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Zawiera:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -240,8 +238,8 @@ BEGIN
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Atrybuty:", 14020, 8, 152, 46, 10
     AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Ukryty", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Archiwalny", 14023, 181, 151, 70, 10
+    AUTOCHECKBOX "&Ukryty", 14022, 130, 151, 50, 10
+    AUTOCHECKBOX "&Archiwalny", 14023, 181, 151, 50, 10
     PUSHBUTTON "Zaawa&nsowane...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
@@ -253,9 +251,9 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Typ pliku:", 14004, 8, 35, 50, 10
+    LTEXT "Typ:", 14004, 8, 35, 42, 10
     CONTROL "Plik", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Otwierany za pomocą:", 14006, 8, 53, 50, 10
+    LTEXT "Program:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "&Zmień...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -264,19 +262,19 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Rozmiar:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Rozmiar na dysku:", 140112, 8, 107, 60, 10
+    LTEXT "Na dysku:", 140112, 8, 107, 45, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Utworzony:", 14014, 8, 131, 45, 10
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Zmodyfikowany:", 14016, 8, 147, 60, 10
+    LTEXT "Zmieniony:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "Ostatnio użyty:", 14018, 8, 163, 60, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Atrybuty:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 188, 67, 10
-    AUTOCHECKBOX "&Ukryty", 14022, 130, 188, 50, 10
+    AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 188, 70, 10
+    AUTOCHECKBOX "&Ukryty", 14022, 130, 188, 36, 10
     AUTOCHECKBOX "&Archiwalny", 14023, 181, 188, 49, 10
     PUSHBUTTON "Zaawa&nsowane...", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
@@ -286,25 +284,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Wersja"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Wersja pliku: ", 14000, 10, 10, 55, 10
+    LTEXT "Wersja pliku:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Opis: ", 14002, 10, 27, 45, 10
+    LTEXT "Opis:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Prawa autorskie: ", 14004, 10, 46, 66, 10
+    LTEXT "Prawa autorskie:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Pozostałe informacje o wersji: ", 14006, 6, 70, 222, 115
-    LTEXT "Nazwa: ", 14007, 13, 82, 50, 10
-    LTEXT "Wartość: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Pozostałe informacje o wersji", 14006, 6, 70, 222, 115
+    LTEXT "Nazwa:", 14007, 13, 82, 50, 10
+    LTEXT "Wartość:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ:", -1, 8, 38, 95, 10
@@ -324,15 +322,11 @@ BEGIN
     LTEXT "Pojemność:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Napęd %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Oczyszczanie &dysku", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Kompresuj dysk, aby zaoszczędzić miejsce na dysku", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyspieszyć\nwyszukiwanie plików", 14012, 8, 205, 230, 17, WS_DISABLED | BS_MULTILINE
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Napęd %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Narzędzia"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -340,18 +334,10 @@ BEGIN
     GROUPBOX "Sprawdzanie błędów", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu błędów.", -1, 40, 25, 160, 20
-    PUSHBUTTON "Sprawdź...", 14000, 130, 45, 100, 15, WS_TABSTOP
-    GROUPBOX "Defragmentacja", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Ta opcja dokona defragmentacji plików woluminu.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmentuj...", 14001, 130, 105, 100, 15, WS_TABSTOP
-    GROUPBOX "Kopia zapasowa", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Ta opcja wykona kopię zapasową plików tego woluminu.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Wykonaj kopię zapasową...", 14002, 130, 170, 100, 15, WS_TABSTOP
+    PUSHBUTTON "&Sprawdź...", 14000, 130, 45, 100, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sprzęt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -368,11 +354,11 @@ BEGIN
     LTEXT "Zabezpiecz mój komputer i dane przed nieautoryzowanym działaniem programów", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Ta opcja może zabezpieczyć twój komputer lub dane na nim przed szkodliwymi programami, ale użycie jej może spowodować nieprawidłowe działanie programów.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
     CHECKBOX "Następujący użytkownik:", 14002, 10, 100, 90, 10
-    LTEXT "Nazwa użytkownika:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    LTEXT "Nazwa użytkownika:", -1, 20, 118, 74, 10
+    COMBOBOX 14003, 95, 115, 80, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Hasło:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    EDITTEXT 14005, 95, 140, 80, 14, ES_LEFT | WS_BORDER | WS_GROUP
     PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
     PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
     PUSHBUTTON "Anuluj", 14008, 122, 170, 60, 14, WS_TABSTOP
@@ -385,7 +371,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
     GROUPBOX "Ustawienia wybranej lokalizacji", -1, 10, 72, 220, 70
-    RADIOBUTTON "&Własny rozmiar", 14001, 20, 90, 80, 10, WS_TABSTOP
+    RADIOBUTTON "Własny &rozmiar", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 116, 102, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "&Maksymalny rozmiar(MB):", -1, 20, 105, 90, 10
     RADIOBUTTON "Nie przenoś plików do &Kosza, tylko od razu usuwaj.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
@@ -402,43 +388,21 @@ BEGIN
     LTEXT "Plik:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programy", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Zawsze używaj danego programu do otwierania tego typu plików", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Przeglądaj...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Zawsze używaj danego programu do otwierania tego typu plików", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Przeglądaj...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Ogólne"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Zadania", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Pokaż podstawowe zadania w &katalogach", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 180, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Użyj klasycznych katalogów &ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 180, 10
-    GROUPBOX "Przeglądaj katalogi", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Otwórz każdy katalog w tym &samym oknie", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 180, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Otwórz każdy katalog w &osobnym oknie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 180, 10
-    GROUPBOX "Działanie przycisków myszki", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Podkreś&laj tytuły ikon tak jak w przeglądarce", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 180, 10
-    AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po najechaniu na nie kursorem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
-    AUTORADIOBUTTON "Po&dwójne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
-    PUSHBUTTON "Przywróć &domyślne", 14011, 175, 180, 80, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Podgląd"
+CAPTION "Widok"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Podgląd folderów", -1, 7, 10, 249, 60
+    GROUPBOX "Widoki folderów", -1, 7, 10, 249, 60
     ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
     LTEXT "Możesz użyć podglądów (takich jak Detale lub Tytuły)\nktóre są ustawione dla tego katalogu, dla pozostałych.", -1, 20, 20, 210, 20
-    PUSHBUTTON "Zastosuj do w&szystkich Katalogów", 14001, 30, 50, 120, 14, WS_TABSTOP
+    PUSHBUTTON "Zastosuj do w&szystkich folderów", 14001, 30, 50, 120, 14, WS_TABSTOP
     PUSHBUTTON "Z&resetuj ustawienia", 14002, 170, 50, 80, 14, WS_TABSTOP
     LTEXT "Zaawansowane:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
@@ -497,12 +461,12 @@ END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Rozłączenie z ReactOS"
+CAPTION "Odłączanie ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Czy na pewno chcesz się rozłączyć?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Rozłącz", IDOK, 47, 38, 47, 14
+    LTEXT "Czy na pewno chcesz odłączyć?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "&Odłącz", IDOK, 47, 38, 47, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 99, 38, 47, 14
 END
 
@@ -511,7 +475,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLIN
 CAPTION "Autoodtwarzanie"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Wybierz rodzaj danych, a następnie czynność, którą ReactOS ma wykonać automagicznie, gdy ten rodzaj danych pojawia się w urządzeniu:", 1000, 7, 7, 215, 20
+    LTEXT "Zaznacz &typ zawartości i wybierz akcję, którą ReactOS wykona automatycznie, gdy ten typ zostanie użyty w tym urządzeniu:", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
     GROUPBOX "Akcje", -1, 7, 45, 212, 146
     AUTORADIOBUTTON "Wybierz akcję do &wykonania:", 1005, 14, 54, 202, 10, WS_GROUP
@@ -526,7 +490,7 @@ CAPTION "Dane mieszane"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "Ten dysk albo urządzenie zawiera dane więcej niż jednego rodzaju.", 1001, 32, 7, 191, 20
+    LTEXT "Ten dysk lub urządzenie zawiera więcej niż jeden typ zawartości.", 1001, 32, 7, 191, 20
     LTEXT "Co chcesz by ReactOS zrobił?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
@@ -539,12 +503,12 @@ CAPTION "Dane mieszane"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS może wykonać tą samą czynność za każdym razem kiedy odczytujesz dysk albo podłączasz urządzenie z tymi rodzajami plików:", 1001, 30, 7, 193, 20
+    LTEXT "ReactOS może wykonać tę samą akcję po każdym włożeniu dysku lub podłączeniu urządzenia z takim plikiem:", 1001, 30, 7, 193, 20
     ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
     EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Co chcesz by ReactOS zrobił?", 1002, 32, 41, 190, 8
+    LTEXT "Co ma zrobić ReactOS?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
-    AUTOCHECKBOX "Zawsze wykonuj wybraną czynność.", 1004, 32, 171, 190, 10
+    AUTOCHECKBOX "Zawsze wykonuj wybraną akcję.", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 160, 185, 60, 14
 END
@@ -556,7 +520,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
     LTEXT "ReactOS może wykonać tą samą czynność za każdym razem kiedy podłączasz to urządzenie.", 1001, 32, 7, 190, 22
-    LTEXT "&Co chcesz by ReactOS zrobił?", 1002, 32, 31, 190, 8
+    LTEXT "&Co ma zrobić ReactOS?", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "&Zawsze wykonuj wybraną czynność", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
@@ -600,14 +564,14 @@ END
 
 IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Sprawdzanie dysków"
+CAPTION "Sprawdzanie dysku"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14
-    GROUPBOX "Opcje sprawdzania dysków", -1, 7, 6, 179, 40
+    GROUPBOX "Opcje sprawdzania dysku", -1, 7, 6, 179, 40
     PUSHBUTTON "Anuluj", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Automatycznie naprawiaj błędy systemu plików", 14000, 16, 18, 165, 10
-    AUTOCHECKBOX "&Szukaj i próbuj odzyskać uszkodzone sektory", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "Automatycznie napraw błędy systemu plików", 14000, 12, 18, 165, 10
+    AUTOCHECKBOX "&Szukaj i próbuj odzyskać uszkodzone sektory", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -621,7 +585,7 @@ BEGIN
     PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Wybierz ikonę z poniższej listy:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 135, 179, 50, 14
 END
@@ -647,7 +611,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Rozszerzenie pliku:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "&Zaawansowane >>", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    PUSHBUTTON "<< &Zaawansowane", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
     LTEXT "&Skojarzony typ pliku:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
@@ -658,12 +622,12 @@ STRINGTABLE
 BEGIN
     /* columns in the shellview */
     IDS_SHV_COLUMN_NAME "Nazwa"
-    IDS_SHV_COLUMN_SIZE "Wielkość"
+    IDS_SHV_COLUMN_SIZE "Rozmiar"
     IDS_SHV_COLUMN_TYPE "Typ"
     IDS_SHV_COLUMN_MODIFIED "Modyfikacja"
     IDS_SHV_COLUMN_ATTRIBUTES "Atrybuty"
     IDS_SHV_COLUMN_DISK_CAPACITY "Wielkość"
-    IDS_SHV_COLUMN_DISK_AVAILABLE "Dostępna wielkość"
+    IDS_SHV_COLUMN_DISK_AVAILABLE "Wolne miejsce"
     IDS_SHV_COLUMN_OWNER "Właściciel"
     IDS_SHV_COLUMN_GROUP "Grupa"
     IDS_SHV_COLUMN_FILENAME "Nazwa pliku"
@@ -718,11 +682,11 @@ BEGIN
     IDS_CREATEFOLDER_CAPTION "Nie mogę utworzyć folderu"
     IDS_DELETEITEM_CAPTION "Potwierdź usunięcia pliku"
     IDS_DELETEFOLDER_CAPTION "Potwierdź usunięcie katalogu"
-    IDS_DELETEITEM_TEXT "Czy jesteś pewien, że chcesz usunąć '%1'?"
-    IDS_DELETEMULTIPLE_TEXT "Czy jesteś pewien, że chcesz usunąć te %1 pliki?"
-    IDS_DELETESELECTED_TEXT "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
-    IDS_TRASHITEM_TEXT "Czy jesteś pewien, że chcesz umieścić plik '%1' w Koszu?"
-    IDS_TRASHFOLDER_TEXT "Czy jesteś pewien, że chcesz umieścić folder '%1' i całą jego zawartość w koszu"
+    IDS_DELETEITEM_TEXT "Czy na pewno chcesz usunąć '%1'?"
+    IDS_DELETEMULTIPLE_TEXT "Czy na pewno chcesz usunąć te %1 pliki?"
+    IDS_DELETESELECTED_TEXT "Czy na pewno chcesz usunąć wybrane elementy?"
+    IDS_TRASHITEM_TEXT "Czy na pewno chcesz umieścić plik '%1' w Koszu?"
+    IDS_TRASHFOLDER_TEXT "Czy na pewno chcesz umieścić folder '%1' i całą jego zawartość w koszu"
     IDS_TRASHMULTIPLE_TEXT "Elementów: %1 - czy na pewno chcesz je umieścić w Koszu?"
     IDS_CANTTRASH_TEXT "Nie mogę przenieść elementu '%1' do Kosza. Czy chcesz go zamiast tego usunąć?"
     IDS_OVERWRITEFILE_TEXT "Ten folder zawiera już plik o nazwie '%1'.\n\nCzy chcesz go zastąpić?"
@@ -740,7 +704,7 @@ BEGIN
     IDS_RESTART_TITLE "Uruchom ponownie"
     IDS_RESTART_PROMPT "Czy chcesz zrestartować system?"
     IDS_SHUTDOWN_TITLE "Wyłącz"
-    IDS_SHUTDOWN_PROMPT "Czy chcesz wyłączyć system?"
+    IDS_SHUTDOWN_PROMPT "Czy chcesz zamknąć system?"
 
     /* Run File dialog */
     IDS_RUNDLG_ERROR "Nie mogę wyświetlić okna Uruchom (błąd wewnętrzny)"
@@ -748,7 +712,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Przeglądaj"
     IDS_RUNDLG_BROWSE_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menu Start\\Programy"
     IDS_PERSONAL "Moje dokumenty"
     IDS_FAVORITES "Ulubione"
@@ -778,7 +742,7 @@ BEGIN
     IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD"
     IDS_NETWORKPLACE "Moje miejsca sieciowe"
 
-    IDS_NEWFOLDER "Nowy katalog"
+    IDS_NEWFOLDER "Nowy folder"
 
     IDS_DRIVE_FIXED "Dysk lokalny"
     IDS_DRIVE_CDROM "Stacja dysków CD"
@@ -813,7 +777,7 @@ BEGIN
     IDS_CANTDISCONNECT "Nie można odłączyć (kod błędu: %lu)."
 
     /* Friendly File Type Names */
-    IDS_DIRECTORY "Katalog"
+    IDS_DIRECTORY "Folder"
     IDS_BAT_FILE "Plik wsadowy ReactOS"
     IDS_CMD_FILE "Skrypt konsoli ReactOS"
     IDS_COM_FILE "Aplikacja DOS"
@@ -834,7 +798,7 @@ BEGIN
     IDS_ICO_FILE "Ikona"
     IDS_INI_FILE "Ustawienia konfiguracji"
     IDS_LNK_FILE "Skrót"
-    IDS_NT__FILE "NT DOS32 Configuration File"
+    IDS_NT__FILE "Plik konfiguracji NT DOS32"
     IDS_PIF_FILE "Plik informacyjny o programie NT VDM"
     IDS_SCR_FILE "Wygaszacz ekranu"
     IDS_SYS_FILE "Plik systemowy"
@@ -878,7 +842,7 @@ BEGIN
     IDS_ADVANCED_FOLDER "Pliki i Foldery"
     IDS_ADVANCED_NET_CRAWLER "Automatycznie wyszukuj foldery sieciowe i drukarki"
     IDS_ADVANCED_FOLDER_SIZE_TIP "Wyświetl informacje o rozmiarze plików w etykietach folderów"
-    IDS_ADVANCED_FRIENDLY_TREE "Wyświetl listę folderów Eskploratora w prostym widoku folderów"
+    IDS_ADVANCED_FRIENDLY_TREE "Wyświetl listę folderów Eksploratora w prostym widoku folderów"
     IDS_ADVANCED_WEB_VIEW_BARRICADE "Wyświetl zawartość folderów systemowych"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Wyświetl pełną ścieżkę na pasku adresu"
     IDS_ADVANCED_SHOW_FULL_PATH "Wyświetl pełną ścieżkę na pasku tytułu"
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index 59f3632f7bc..bd6d1eae52f 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 182, 18
+    LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Abrir:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Procurar...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -218,14 +218,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Tipo de arquivo:", 14004, 8, 40, 55, 10
+    LTEXT "Tipo:", 14004, 8, 40, 55, 10
     CONTROL "Pasta", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Local:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamanho:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Tamanho em disco:", 140101, 8, 88, 55, 10
+    LTEXT "Em disco:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contém:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -248,7 +248,7 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Tipo de arquivo:", 14004, 8, 35, 50, 10
+    LTEXT "Tipo:", 14004, 8, 35, 50, 10
     CONTROL "Arquivo", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
     LTEXT "Abre com:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
@@ -259,7 +259,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamanho:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Tamanho em disco:", 140112, 8, 107, 55, 10
+    LTEXT "Em disco:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Criado:", 14014, 8, 131, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versão"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versão do arquivo: ", 14000, 10, 10, 55, 10
+    LTEXT "Versão:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Descrição: ", 14002, 10, 27, 45, 10
+    LTEXT "Descrição:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Outras informações de versão: ", 14006, 6, 70, 222, 115
-    LTEXT "Nome do item: ", 14007, 13, 82, 50, 10
-    LTEXT "Valor: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Outras informações de versão", 14006, 6, 70, 222, 115
+    LTEXT "Nome do item:", 14007, 13, 82, 50, 10
+    LTEXT "Valor:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipo:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacidade:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Limpeza de &Disco", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Comprimir drive para ganhar espaço em disco", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Permitir Serviço de Indexação para indexar este disco para rápida busca de arquivos", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ferramentas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Análise de erros", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Esta opção irá analisar erros no\nvolume.", -1, 40, 25, 160, 20
+    LTEXT "Esta opção irá analisar erros no volume.", -1, 40, 25, 160, 20
     PUSHBUTTON "Analisar Agora...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Desfragmentação", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Esta opção irá desfragmentar os arquivos no volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Desfragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Esta opção irá realizar o backup de arquivos no volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Fazer Backup Agora...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Arquivo:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programas", -1, 7, 42, 249, 187
         CONTROL "Programas", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Sempre usar o programa selecionado para abrir este tipo de arquivo", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Procurar...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Sempre usar o programa selecionado para abrir este tipo de arquivo", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Procurar...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Geral"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tarefas", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Exibir tarefas comuns em &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Usar pastas cláss&icas do ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Abrir novas pastas na mes&ma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Abrir novas pastas em &janelas independentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Clique único para abrir um item (apontar para &selecionar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Sublinhar títulos de ícones somente quando a&pontados", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "Clique &duplo para abrir um item (clique único para selecionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restaurar Padrões", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Visualizar"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Opções de verificação de disco", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Corrigir erros do sistema automaticamente", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Realizar varredura e tentar recuperar bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Realizar varredura e tentar recuperar bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Procurar"
     IDS_RUNDLG_BROWSE_FILTER "Arquivos Executáveis (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menu Iniciar\\Programas"
     IDS_PERSONAL "Meus Documentos"
     IDS_FAVORITES "Favoritos"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index b1de6abc904..ca04e3a6bd7 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -53,7 +53,7 @@ BEGIN
     MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
     MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION
+    MENUITEM "&Inverter Selec.", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -79,7 +79,7 @@ BEGIN
     BEGIN
         MENUITEM "&Copy here", IDM_COPYHERE
         MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "Criar &atalho aqui", IDM_LINKHERE
         MENUITEM SEPARATOR
         MENUITEM "Cancel", 0
     END
@@ -87,7 +87,7 @@ END
 
 IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Procurar Pastas"
+CAPTION "Procurar pasta"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
@@ -99,7 +99,7 @@ END
 
 IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Procurar Pastas"
+CAPTION "Procurar pasta"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
@@ -120,7 +120,7 @@ BEGIN
     DEFPUSHBUTTON "&Sim", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Sim para &todos", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&Não", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
     ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
     LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
 END
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo.", 12289, 36, 11, 182, 18
+    LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet.", 12289, 36, 11, 182, 18
     LTEXT "&Abrir:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Procurar...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -179,7 +179,7 @@ BEGIN
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipo de destino:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Localização do destino:", 14006, 8, 55, 68, 10
+    LTEXT "Loc. do destino:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "&Destino:", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
@@ -190,10 +190,10 @@ BEGIN
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "Executa&r:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
-    LTEXT "C&omemntário:", 14018, 8, 154, 68, 10
+    LTEXT "C&omentário:", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
     PUSHBUTTON "&Localizar Destino...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "&Trocar Icon...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "Troc&ar Icon...", 14021, 84, 172, 70, 14, ES_LEFT
     PUSHBUTTON "A&vançado...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
@@ -203,9 +203,9 @@ CAPTION "Propriedades Avançadas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
-    LTEXT "Escolha as propriedades avançadas que quer para este atalho.", -1, 5, 30, 210, 10
+    LTEXT "Escolha as propriedades avançadas para este atalho.", -1, 5, 30, 210, 10
     CHECKBOX "Executar com diferentes credenciais", 14000, 25, 50, 150, 10
-    LTEXT "Esta opção permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas não autorizados.", -1, 50, 60, 175, 40
+    LTEXT "Esta opção permite executar este atalho como outro utilizador, ou com a sua conta, enquanto protege o computador e dados, contra actividade de programas não autorizados.", -1, 50, 60, 175, 40
     CHECKBOX "Executar num espaço de memória separada", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
     PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE
@@ -218,14 +218,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Tipo de ficheiro:", 14004, 8, 40, 55, 10
+    LTEXT "Tipo:", 14004, 8, 40, 55, 10
     CONTROL "Pasta", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Localização:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamanho:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Size on disk:", 140101, 8, 88, 55, 10
+    LTEXT "No disco:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Contém:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -233,9 +233,9 @@ BEGIN
     LTEXT "Criado:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Propriedades:", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Sómente de Leitura", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Escondido", 14022, 126, 151, 70, 10
+    LTEXT "Atributos:", 14020, 8, 152, 46, 10
+    AUTOCHECKBOX "&Só de leitura", 14021, 58, 151, 70, 10
+    AUTOCHECKBOX "&Oculto", 14022, 126, 151, 70, 10
     AUTOCHECKBOX "&Arquivo", 14023, 181, 151, 70, 10
     PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
@@ -248,9 +248,9 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Tipo de Ficheiro:", 14004, 8, 35, 50, 10
-    CONTROL "Ficheiro", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Abre com::", 14006, 8, 53, 50, 10
+    LTEXT "Tipo:", 14004, 8, 35, 50, 10
+    CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
+    LTEXT "Abre com:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -259,7 +259,7 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Tamanho:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Size on disk:", 140112, 8, 107, 55, 10
+    LTEXT "No disco:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Criado:", 14014, 8, 131, 45, 10
@@ -269,8 +269,8 @@ BEGIN
     LTEXT "Acedido:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "propriedades:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Somente de Leitura", 14021, 58, 188, 67, 10
+    LTEXT "Atributos:", 14020, 8, 189, 45, 10
+    AUTOCHECKBOX "&Só de leitura", 14021, 58, 188, 67, 10
     AUTOCHECKBOX "&Oculto", 14022, 126, 188, 50, 10
     AUTOCHECKBOX "&Arquivo", 14023, 181, 188, 49, 10
     PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP
@@ -281,30 +281,30 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versão"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versão do Ficheiro: ", 14000, 10, 10, 55, 10
+    LTEXT "Versão:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Descrição: ", 14002, 10, 27, 45, 10
+    LTEXT "Descrição:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Outras informações da versão: ", 14006, 6, 70, 222, 115
-    LTEXT "Nome do Item: ", 14007, 13, 82, 50, 10
-    LTEXT "Valor: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Outras informações da versão", 14006, 6, 70, 222, 115
+    LTEXT "Nome do item:", 14007, 13, 82, 50, 10
+    LTEXT "Valor:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipo:", -1, 8, 38, 95, 10
     EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Sistema de Ficheiros:", -1, 8, 51, 95, 10
+    LTEXT "Sistema de ficheiros:", -1, 8, 51, 95, 10
     EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "Capacidade:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Disco %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Limpeza do &Disco", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Permitir indexar este disco para acelerar a procura de ficheiros", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Disco %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ferramentas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Esta opção vai verificar o volume por erros.", -1, 40, 25, 160, 20
     PUSHBUTTON "Verificar agora...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Desfragmentação", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Esta opção vai desfragmentar os ficheiros no volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Cópia de segurança", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Esta opção vai criar os ficheiros do volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Executar Cópia de Segurança...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -375,16 +363,16 @@ END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "propriedades da Reciclagem"
+CAPTION "Propriedades da reciclagem"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
-    GROUPBOX "propriedades para as localizações seleccionadas", -1, 10, 72, 220, 70
+    GROUPBOX "Propriedades para as localizações seleccionadas", -1, 10, 72, 220, 70
     RADIOBUTTON "&Tamanho personalizado:", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "Tamanho M&áximo(MB):", -1, 20, 105, 70, 10
     RADIOBUTTON "Não mover os ficheiros para a &Reciclagem. Apagá-los definitivamente.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
-    AUTOCHECKBOX "&Mostrar ecrân de confirmação de eliminação", 14004, 20, 155, 140, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Mostrar ecrâ de confirmação de eliminação", 14004, 20, 155, 140, 10, WS_TABSTOP
 END
 
 IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Ficheiro:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programas", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Utilizar sempre o programa seleccionado para abrir este tipo de ficheiros", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Seleccione...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Utilizar sempre este programa para abrir este tipo de ficheiro", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Seleccione...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Geral"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tarefas", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Mostrar tarefas comuns nas &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Utilizar pastas class&icas ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Procurar pastas", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Abrir cada pasta na &mesma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Abrir cada pasta na sua &janela", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Seleccione a seguinte opção", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Click simples para abrir um item", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Duplo-click para abrir um item (um click para seleccionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restaurar valores por defeito", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Ver"
@@ -432,8 +398,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Vistas das Pastas", -1, 7, 10, 249, 60
     ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
-    LTEXT "Pode aplicar a vista (como detalhes ou títulos) que\nestá a usar para esta pasta para todas as pastas.", -1, 60, 20, 180, 20
-    PUSHBUTTON "Applicar a T&odas as Pastas", 14001, 60, 50, 80, 14, WS_TABSTOP
+    LTEXT "Pode aplicar a vista (como detalhes ou títulos) que está a usar para esta pasta para todas as pastas.", -1, 60, 20, 180, 20
+    PUSHBUTTON "Aplicar a t&odas as Pastas", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reiniciar todas as Pastas", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Definições avançadas:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
@@ -442,7 +408,7 @@ END
 
 IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Tipos de Ficheiros"
+CAPTION "Tipos de Ficheiro"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 70, 10
@@ -452,7 +418,7 @@ BEGIN
     GROUPBOX "Detalhes para '%s' extensão", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
     LTEXT "Abre com:", -1, 12, 140, 40, 10
     //ICON
-    LTEXT "Appnome", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
+    LTEXT "", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
     PUSHBUTTON "&Mudar...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
     LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30
     PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
@@ -471,7 +437,7 @@ BEGIN
     LTEXT "Esta pasta já contém um ficheiro com o nome '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
     LTEXT "Esta pasta já contém um ficheiro sómente de leitura com o nome '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
     LTEXT "Esta pasta já contém um ficheiro de sistema com o nome '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "pretende substituir o ficheiro existente", -1, 44, 35, 228, 10, SS_NOPREFIX
+    LTEXT "Pretende substituir o ficheiro existente", -1, 44, 35, 228, 10, SS_NOPREFIX
     LTEXT "(data e tamanho desconhecido)", 12302, 79, 51, 198, 20, SS_NOPREFIX
     ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
     LTEXT "por este?", -1, 44, 75, 228, 10, SS_NOPREFIX
@@ -485,8 +451,8 @@ CAPTION "Terminar sessão ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Tem a certeza que quer terminar a sessão?", -1, 43, 15, 131, 8
-    DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14
+    LTEXT "Pretende terminar a sessão?", -1, 43, 15, 131, 8
+    DEFPUSHBUTTON "&Terminar sessão", IDOK, 30, 38, 64, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14
 END
 
@@ -496,7 +462,7 @@ CAPTION "Encerrar ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Tem a certeza que quer encerrar?", -1, 49, 15, 131, 8
+    LTEXT "Pretende encerrar o computador?", -1, 49, 15, 131, 8
     DEFPUSHBUTTON "&Encerrar", IDOK, 47, 38, 47, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 47, 14
 END
@@ -511,8 +477,8 @@ BEGIN
     GROUPBOX "Acções", -1, 7, 45, 212, 146
     AUTORADIOBUTTON "Seleccione uma acção para &executar:", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
-    AUTORADIOBUTTON "pergunte-me sempre para escolher uma &acção", 1006, 14, 177, 202, 10
-    PUSHBUTTON "&Restaurar valores por defeito", 1008, 108, 197, 110, 14, WS_DISABLED
+    AUTORADIOBUTTON "perguntar sempre para escolher uma &acção", 1006, 14, 177, 202, 10
+    PUSHBUTTON "&Restaurar predefinições", 1008, 108, 197, 110, 14, WS_DISABLED
 END
 
 IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
@@ -551,7 +517,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
     LTEXT "ReactOS pode executar sempre mesma acção de cada vez que inserir um disco ou um dispositivo.", 1001, 32, 7, 190, 22
-    LTEXT "&O que pretende que o ReactOS faça?", 1002, 32, 31, 190, 8
+    LTEXT "O que pretende que o ReactOS faça?", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "&Executar sempre a acção seleccionada", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
@@ -564,7 +530,7 @@ CAPTION "Encerrar ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
-    LTEXT "O que pretende aue o computador faça?", -1, 39, 7, 167, 10
+    LTEXT "O que pretende que o ReactOS faça?", -1, 39, 7, 167, 10
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
     LTEXT "Manter a sessão, deixando o computador a correr em baixa energia. O computador arranca quando tocar numa tecla ou mover o rato.", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
@@ -579,14 +545,14 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Iniciar", IDOK, 53, 198, 60, 14
     PUSHBUTTON "&Fechar", IDCANCEL, 118, 198, 60, 14
-    LTEXT "Ca&pacidade:", -1, 7, 6, 169, 9
+    LTEXT "Capacidade:", -1, 7, 6, 169, 9
     COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "&Sistema de Ficheiros", -1, 7, 35, 170, 9
+    LTEXT "&Sistema de ficheiros", -1, 7, 35, 170, 9
     COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
     CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
     LTEXT "&Tamanho da unidade de alocação", -1, 7, 64, 170, 9
     COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "&Nome do Volume ", -1, 7, 93, 170, 9
+    LTEXT "&Nome do volume", -1, 7, 93, 170, 9
     EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
     GROUPBOX "&Opções", 4610, 7, 121, 170, 49
     AUTOCHECKBOX "Formatação &Rápida", 28674, 16, 135, 155, 10
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Opções verificação do disco", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Reparar automáticamente erros nos ficheiros do sistema", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Procurar e tentar reparar sectores danificados", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Procurar e tentar reparar sectores danificados", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -613,10 +579,10 @@ CAPTION "Trocar Icone"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
-    PUSHBUTTON "procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
+    PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14
 END
@@ -636,7 +602,7 @@ Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "Criar nova extensão"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -656,7 +622,7 @@ BEGIN
     IDS_SHV_COLUMN_SIZE "Tamanho"
     IDS_SHV_COLUMN_TYPE "Tipo"
     IDS_SHV_COLUMN_MODIFIED "Modificado"
-    IDS_SHV_COLUMN_ATTRIBUTES "propriedades"
+    IDS_SHV_COLUMN_ATTRIBUTES "Atributos"
     IDS_SHV_COLUMN_DISK_CAPACITY "Tamanho"
     IDS_SHV_COLUMN_DISK_AVAILABLE "Disponível"
     IDS_SHV_COLUMN_OWNER "Dono"
@@ -667,10 +633,10 @@ BEGIN
     IDS_SHV_COLUMN_DELDATE "Data da eliminação"
     IDS_SHV_COLUMN_FONTTYPE "Tipo de letra"
     IDS_SHV_COLUMN_WORKGROUP "Grupo de trabalho"
-    IDS_SHV_COLUMN_NETLOCATION "localizações na rede"
+    IDS_SHV_COLUMN_NETLOCATION "Localizações na rede"
     IDS_SHV_COLUMN_DOCUMENTS "Documentos"
     IDS_SHV_COLUMN_STATUS "Estado"
-    IDS_SHV_COLUMN_COMMENTS "Commentários"
+    IDS_SHV_COLUMN_COMMENTS "Comentários"
     IDS_SHV_COLUMN_LOCATION "Localização"
     IDS_SHV_COLUMN_MODEL "Modelo"
 
@@ -704,13 +670,13 @@ BEGIN
     IDS_CUT "Cortar"
     IDS_RESTORE "Restaurar"
     IDS_FORMATDRIVE "Formatar..."
-    IDS_RENAME "Renaomear"
+    IDS_RENAME "Renomear"
     IDS_PASTE "Inserir"
     IDS_EJECT "Eject"
-    IDS_DISCONNECT "Disconnect"
+    IDS_DISCONNECT "Desligar"
 
-    IDS_CREATEFOLDER_DENIED "Impossivel de Criar Pasta '%1'"
-    IDS_CREATEFOLDER_CAPTION "Impossivel de Criar Pasta"
+    IDS_CREATEFOLDER_DENIED "Impossivel criar pasta '%1'"
+    IDS_CREATEFOLDER_CAPTION "Erro ao criar pasta"
     IDS_DELETEITEM_CAPTION "Confirmar exclusão do ficheiro"
     IDS_DELETEFOLDER_CAPTION "Confirmar exclusão da pasta"
     IDS_DELETEITEM_TEXT "Tem certeza que deseja excluir '%1'?"
@@ -728,7 +694,7 @@ BEGIN
     IDS_FILEOOP_MOVING "Moving..."
     IDS_FILEOOP_DELETING "Deleting..."
     IDS_FILEOOP_FROM_TO "From %1 to %2"
-    IDS_FILEOOP_FROM "From %1"
+    IDS_FILEOOP_FROM "De %1"
     IDS_FILEOOP_PREFLIGHT "Preflight"
 
     /* message box strings */
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Menu Iniciar\\Programas"
     IDS_PERSONAL "OS Meus Documentos"
     IDS_FAVORITES "Favoritos"
@@ -797,8 +763,8 @@ BEGIN
     IDS_RECYCLEBIN_LOCATION "Localização da Reciclagem"
     IDS_RECYCLEBIN_DISKSPACE "Espaço Disponível"
     IDS_EMPTY_BITBUCKET "Esvaziar Reciclagem"
-    IDS_PICK_ICON_TITLE "Escolha Ícone"
-    IDS_PICK_ICON_FILTER "Ficheiros de Ícones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
+    IDS_PICK_ICON_TITLE "Escolha icone"
+    IDS_PICK_ICON_FILTER "Ficheiros de icones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
     IDS_OPEN_WITH_FILTER "Ficheiros Executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
     IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
@@ -845,7 +811,7 @@ BEGIN
 
     IDS_FILE_FOLDER "%u Ficheiros, %u Pastas"
     IDS_PRINTERS "Impressoras"
-    IDS_FONTS "Tipos de Letras"
+    IDS_FONTS "Tipos de letra"
     IDS_INSTALLNEWFONT "Instalar novo tipo de letra..."
 
     IDS_DEFAULT_CLUSTER_SIZE "Tamanho da unidade de atribuição"
@@ -856,7 +822,7 @@ BEGIN
     IDS_FILE_DETAILS "Detalhes para '%s' extensão"
     IDS_FILE_DETAILSADV "Ficheiros com extensão '%s' são do tipo '%s'. Para mudar definições que afectam todos '%s' ficheiros, click Avançado."
     IDS_FILE_TYPES "File Types"
-    IDS_COLUMN_EXTENSION "Extensions"
+    IDS_COLUMN_EXTENSION "Extensões"
 
     /* As in 'INI File' or 'WAV File', fallback string for no-name extensions
        used in the _File type_ tab of the _Folder Options_ dialog */
@@ -864,7 +830,7 @@ BEGIN
 
     IDS_BYTES_FORMAT "bytes"
     IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
+    IDS_EXE_DESCRIPTION "Descrição:"
 
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
@@ -894,9 +860,9 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "A extensão %s já está associada ao tipo de arquivo %s. Deseja desassociar %s com %s e criar um novo tipo de arquivo?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
+    IDS_REMOVE_EXT "Se remover uma extensão de nome de arquivo registrado, não poderá abrir arquivos com esta extensão clicando duas vezes nos ícones.\n\nPretende remover esta extensão?"
     IDS_FILE_NOT_FOUND "The file '%s' was not found."
 END
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index ac88e47831d..f45978a9305 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+// COPYRIGHT: Ștefan Fulea <stefan.fulea@mail.com>
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
@@ -44,7 +44,7 @@ END
 /* menubar EDIT menu */
 MENU_003 MENU
 BEGIN
-    MENUITEM "&Anulează\tCtrl+Z", FCIDM_SHVIEW_UNDO
+    MENUITEM "&Anulare\tCtrl+Z", FCIDM_SHVIEW_UNDO
     MENUITEM SEPARATOR
     MENUITEM "&Decupează\tCtrl+X", FCIDM_SHVIEW_CUT
     MENUITEM "&Copie\tCtrl+C", FCIDM_SHVIEW_COPY
@@ -92,8 +92,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Specificare dosar"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "Con&firmă", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "A&nulează", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Revocare", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24
     LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
@@ -110,8 +110,8 @@ BEGIN
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
     EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&Crează dosar nou", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
-    DEFPUSHBUTTON "Con&firmă", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "A&nulează", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Revocare", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
 END
 
 IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
@@ -122,7 +122,7 @@ BEGIN
     DEFPUSHBUTTON "D&a", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Da pentru t&oate", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "N&u", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "A&nulează", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Revocare", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
     ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
     LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
 END
@@ -135,7 +135,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10
+    LTEXT "Drept de autor 1996-", IDC_STATIC, 35, 75, 68, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10
     LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -163,12 +163,12 @@ CAPTION "Executare"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Tastați numele unui program, dosar, document, sau a unei resurse de Internet, în vederea deschiderii în ReactOS.", 12289, 36, 4, 182, 26
-    LTEXT "&Deschide:", 12305, 7, 39, 33, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 179, 100
-    DEFPUSHBUTTON "Con&firmă", IDOK, 36, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "A&nulează", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "Spe&cificare…", 12288, 160, 70, 59, 14, WS_TABSTOP
+    LTEXT "Tastaţi numele unui program, dosar, document sau al unei resurse Internet.", 12289, 36, 11, 182, 18
+    LTEXT "&Deschis:", 12305, 7, 39, 33, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
+    DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
+    PUSHBUTTON "Revocare", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
+    PUSHBUTTON "&Răsfoire…", 12288, 160, 70, 59, 14, WS_TABSTOP
 END
 
 IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
@@ -209,8 +209,8 @@ BEGIN
     CHECKBOX "Execută sub o i&dentitate explicită", 14000, 25, 50, 150, 10
     LTEXT "Această opțiune vă permite execuția scurtăturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtăturii în mod securizat, protejând astfel calculatorul de activități neautorizate.", -1, 50, 60, 175, 40
     CHECKBOX "Execută în sp&ațiu de memorie separat", 14001, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "Con&firmă", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "A&nulează", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Revocare", 2, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
@@ -252,7 +252,7 @@ BEGIN
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tip fișier:", 14004, 8, 35, 50, 10
     CONTROL "Fișier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Va fi deschis cu:", 14006, 8, 53, 50, 10
+    LTEXT "Se deschide cu:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "Spe&cificare…", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -283,25 +283,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versiune"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versiune fișier: ", 14000, 10, 10, 55, 10
+    LTEXT "Versiune fișier:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Descriere: ", 14002, 10, 27, 45, 10
+    LTEXT "Descriere:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Drept de autor: ", 14004, 10, 46, 66, 10
+    LTEXT "Drept de autor:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
     GROUPBOX "Alte informații", 14006, 6, 70, 222, 115
-    LTEXT "Nume element: ", 14007, 13, 82, 50, 10
-    LTEXT "Valoare: ", 14008, 112, 82, 45, 10
+    LTEXT "Nume element:", 14007, 13, 82, 50, 10
+    LTEXT "Valoare:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tip:", -1, 8, 38, 95, 10
@@ -321,15 +321,11 @@ BEGIN
     LTEXT "Capacitate:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Partiție %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Curățare &disc…", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "&Comprimă volumul pentru a economisi spațiu", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Permite „Serviciu de inde&xare” pentru accelerarea căutărilor", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Partiție %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Instrumente"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -338,17 +334,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Această opțiune va verifica acest volum pentru eventuale erori în sistemul de fișiere.", -1, 40, 25, 180, 20
     PUSHBUTTON "&Verificare…", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "&Defragmentare", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Această opțiune presupune ordonarea fragmentelor de fișiere pentru a îmbunătăți viteza de citire.", -1, 40, 85, 180, 20
-    PUSHBUTTON "Defragmentare…", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Copie de rezervă", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Această opțiune va crea o copie de siguranță a fișierelor de pe această partiție.", -1, 40, 150, 180, 20
-    PUSHBUTTON "&Creare rezervă…", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Componente fizice"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -371,8 +359,8 @@ BEGIN
     LTEXT "Parolă:", -1, 20, 143, 53, 10
     EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
     PUSHBUTTON "…", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Con&firmă", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "A&nulează", 14008, 122, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Revocare", 14008, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
@@ -399,32 +387,10 @@ BEGIN
     LTEXT "Fișier:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programe", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Utilizează întotdeauna această aplicație", 14003, 20, 198, 225, 10
-    PUSHBUTTON "Spe&cificare…", 14004, 198, 207, 50, 14
-    DEFPUSHBUTTON "Con&firmă", IDOK, 150, 236, 50, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 206, 236, 50, 14
-END
-
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Generale"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Activități", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Incl&ude în ferestrele dosarelor și activiățile comune", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Prefer aspectul &clasic pentru dosare", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 200, 10
-    GROUPBOX "Parcurgere dosare", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "&Parcurge dosarele în aceiași fereastră", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "D&eschide fiecare dosar în fereastră proprie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 200, 10
-    GROUPBOX "Interacțiune elemente", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Deschide prin acțiune si&mplă (selecare prin indicare)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Subliniază titlurile la fel ca adresele &web", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Subliniază titlurile doar la pre&zența indicatorului", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "Deschide prin acțiune &dublă (selectare prin una simplă)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
-    PUSHBUTTON "&Restabilește opțiunile implicite", 14011, 130, 180, 126, 14, WS_TABSTOP
+    AUTOCHECKBOX "&Utilizează întotdeauna această aplicație", 14003, 16, 193, 232, 10
+    PUSHBUTTON "Spe&cificare…", 14004, 188, 207, 60, 14
+    DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 206, 236, 50, 14
 END
 
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
@@ -439,7 +405,7 @@ BEGIN
     PUSHBUTTON "Restabilește t&oate", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Opțiuni avansate:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
-    PUSHBUTTON "&Restabilește opțiunile implicite",  14004, 130, 215, 126, 14, WS_TABSTOP
+    PUSHBUTTON "&Restabilește opțiunile implicite", 14004, 130, 215, 126, 14, WS_TABSTOP
 END
 
 IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
@@ -454,7 +420,7 @@ BEGIN
     GROUPBOX "Detalii pentru extensia „%s”", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
     LTEXT "Va fi deschis cu:", -1, 22, 140, 50, 10
     //ICON
-    LTEXT "Nume aplicație", IDC_FILETYPES_APPNAME, 100, 140, 75, 10
+    LTEXT "", IDC_FILETYPES_APPNAME, 100, 140, 75, 10
     PUSHBUTTON "Spe&cificare…", IDC_FILETYPES_CHANGE, 190, 140, 50, 14, WS_TABSTOP
     LTEXT "", IDC_FILETYPES_DESCRIPTION, 22, 155, 160, 35
     PUSHBUTTON "A&vansate…", IDC_FILETYPES_ADVANCED, 190, 175, 50, 14, WS_TABSTOP
@@ -468,7 +434,7 @@ BEGIN
     DEFPUSHBUTTON "D&a", IDYES, 20, 122, 60, 14
     PUSHBUTTON "Da pentru t&oate", 12807, 85, 122, 60, 14
     PUSHBUTTON "N&u", IDNO, 150, 122, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 215, 122, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
     LTEXT "Dosarul curent deja conține un fișier cu numele „%2”.", 12291, 44, 10, 231, 22, SS_NOPREFIX
     LTEXT "Dosarul curent deja conține un fișier nemodificabil cu numele „%2”.", 12292, 41, 10, 222, 22, SS_NOPREFIX
@@ -487,9 +453,9 @@ CAPTION "Deautentificare"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8
+    LTEXT "Sigur doriți să vă deautentificați?", -1, 35, 16, 146, 8
     DEFPUSHBUTTON "&Deautentifică", IDOK, 41, 39, 50, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 95, 39, 50, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 95, 39, 50, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
@@ -500,7 +466,7 @@ BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
     LTEXT "Sigur doriți să vă deconectați?", -1, 49, 15, 131, 8
     DEFPUSHBUTTON "&Deconectează", IDOK, 47, 38, 47, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 99, 38, 47, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 99, 38, 47, 14
 END
 
 IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
@@ -526,8 +492,8 @@ BEGIN
     LTEXT "Acest disc sau dispozitiv conține mai mult de un singur tip de conținut.", 1001, 32, 7, 191, 20
     LTEXT "Ce acțiune doriți să fie îndeplinită?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
-    DEFPUSHBUTTON "Con&firmă", IDOK, 96, 186, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 160, 186, 60, 14
+    DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 160, 186, 60, 14
 END
 
 IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
@@ -542,8 +508,8 @@ BEGIN
     LTEXT "Ce acțiune doriți să fie îndeplinită?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
     AUTOCHECKBOX "&Efectuează mereu aceeși acțiune", 1004, 32, 171, 190, 10
-    DEFPUSHBUTTON "Con&firmă", IDOK, 96, 185, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 160, 185, 60, 14
+    DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 160, 185, 60, 14
 END
 
 IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
@@ -556,8 +522,8 @@ BEGIN
     LTEXT "&Ce acțiune doriți să fie îndeplinită?", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "&Efectuează mereu aceeași acțiune", 1004, 32, 143, 190, 8
-    DEFPUSHBUTTON "Con&firmă", IDOK, 94, 160, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 159, 160, 60, 14
+    DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 159, 160, 60, 14
 END
 
 IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
@@ -569,8 +535,8 @@ BEGIN
     LTEXT "Ce doriți să se întâmple?", -1, 39, 7, 167, 10
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
     LTEXT "Aceasta va menține sesiunea de lucru, păstrând calculatorul pe consum redus, cu toate datele în memorie. Calculatorul își va reveni când veți apăsa o tastă sau veți acționa dispozitivul de indicare.", 8225, 39, 40, 167, 37
-    DEFPUSHBUTTON "Con&firmă", 1, 7, 82, 60, 14, WS_GROUP
-    PUSHBUTTON "A&nulează", IDCANCEL, 75, 82, 60, 14
+    DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
+    PUSHBUTTON "Revocare", IDCANCEL, 75, 82, 60, 14
     PUSHBUTTON "&Manual…", IDHELP, 144, 82, 60, 14
 END
 
@@ -602,9 +568,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Pornește", IDOK, 63, 95, 60, 14
     GROUPBOX "Opțiuni de verificare", -1, 7, 6, 179, 40
-    PUSHBUTTON "A&nulează", IDCANCEL, 128, 95, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "&Repară erorile în mod automat", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Analizează și repară înregistrările eronate", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Analizează și repară înregistrările eronate", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -618,9 +584,9 @@ BEGIN
     PUSHBUTTON "Spe&cificare…", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Selectați o pictogramă din lista de mai jos:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON "Con&firmă", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 135, 179, 50, 14
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
@@ -638,7 +604,7 @@ Sigur doriți să deschideți acest fișier?", IDC_STATIC, 35, 5, 230, 60
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "Ceare nouă extensie"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -745,7 +711,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Specificare fișiere"
     IDS_RUNDLG_BROWSE_FILTER "Fișiere executabile (*.exe)\0*.exe\0Orice fișier (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Meniul Pornire\\Programe"
     IDS_PERSONAL "Documentele mele"
     IDS_FAVORITES "Favorite"
@@ -818,7 +784,7 @@ BEGIN
     IDS_CUR_FILE "Indicator"
     IDS_DB__FILE "Database File"
     IDS_DLL_FILE "Bibliotecă aplicație"
-    IDS_DRV_FILE "Modúl-pilot de dispozitiv"
+    IDS_DRV_FILE "Driver de dispozitiv"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
     IDS_EXE_FILE "Executabil"
     IDS_NLS_FILE "National Language Support File"
@@ -896,7 +862,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extensia %s este deja asoiată cu tipul de fișier %s. Doriți disasocierea %s cu %s și crearea unui nou tip de fișier pentru ea?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 5b2750ab2af..a90fb7522dc 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -1,10 +1,10 @@
-/* Russian language resource file by Kudratov Olimjon (olim98@bk.ru) */
+// COPYRIGHT: Kudratov Olimjon <olim98@bk.ru>
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 MENU_001 MENUEX
 BEGIN
-    MENUITEM "&Большие значки", FCIDM_SHVIEW_BIGICON
+    MENUITEM "&Крупные значки", FCIDM_SHVIEW_BIGICON
     MENUITEM "&Мелкие значки", FCIDM_SHVIEW_SMALLICON
     MENUITEM "&Список", FCIDM_SHVIEW_LISTVIEW
     MENUITEM "&Таблица", FCIDM_SHVIEW_REPORTVIEW
@@ -23,7 +23,7 @@ BEGIN
     BEGIN
         POPUP "&Вид", FCIDM_SHVIEW_VIEW
         BEGIN
-            MENUITEM "&Большие значки", FCIDM_SHVIEW_BIGICON
+            MENUITEM "&Крупные значки", FCIDM_SHVIEW_BIGICON
             MENUITEM "&Мелкие значки", FCIDM_SHVIEW_SMALLICON
             MENUITEM "&Список", FCIDM_SHVIEW_LISTVIEW
             MENUITEM "&Таблица", FCIDM_SHVIEW_REPORTVIEW
@@ -81,7 +81,7 @@ BEGIN
     BEGIN
         MENUITEM "&Copy here", IDM_COPYHERE
         MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "Создать &ярлыки здесь", IDM_LINKHERE
         MENUITEM SEPARATOR
         MENUITEM "Cancel", 0
     END
@@ -135,7 +135,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -163,9 +163,9 @@ CAPTION "Выполнить"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Введите имя программы, папки, документа или ресурс Интернета, и ReactOS откроет их.", 12289, 36, 11, 182, 18
-    LTEXT "&Открыть:", 12305, 7, 39, 34, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100
+    LTEXT "Введите имя программы, папки, документа или ресурс Интернета.", 12289, 36, 11, 182, 18
+    LTEXT "&Открыть:", 12305, 2, 39, 34, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Отмена", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Об&зор...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -195,7 +195,7 @@ BEGIN
     LTEXT "&Комментарий:", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
     PUSHBUTTON "&Найти объект...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "См&енить значок...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "Сменить &значок...", 14021, 84, 172, 70, 14, ES_LEFT
     PUSHBUTTON "&Дополнительно...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
@@ -283,25 +283,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Версия"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Версия файла: ", 14000, 10, 10, 55, 10
+    LTEXT "Версия файла:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Описание: ", 14002, 10, 27, 45, 10
+    LTEXT "Описание:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Авторские права: ", 14004, 10, 46, 66, 10
+    LTEXT "Авторские права:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Дополнительные сведения: ", 14006, 6, 70, 222, 115
-    LTEXT "Имя элемента: ", 14007, 13, 82, 63, 10
-    LTEXT "Значение: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Дополнительные сведения", 14006, 6, 70, 222, 115
+    LTEXT "Имя элемента:", 14007, 13, 82, 63, 10
+    LTEXT "Значение:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Тип:", -1, 8, 38, 95, 10
@@ -321,15 +321,11 @@ BEGIN
     LTEXT "Емкость:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Диск %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Очистка &диска", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "&Сжимать для экономии места", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Диск %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Сервис"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -338,17 +334,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Проверка тома на наличие ошибок.", -1, 40, 25, 160, 20
     PUSHBUTTON "Выполнить &проверку...", 14000, 110, 45, 120, 15, WS_TABSTOP
-    GROUPBOX "Дефрагментация диска", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Дефрагментация файлов, хранящихся на этом томе.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Выполнить д&ефрагментацию...", 14001, 110, 105, 120, 15, WS_TABSTOP
-    GROUPBOX "Архивация", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Архивация файлов, хранящихся на этом томе.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Выполнить &архивацию...", 14002, 110, 170, 120, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Оборудование"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -399,34 +387,12 @@ BEGIN
     LTEXT "Файл:    ", 14001, 44, 25, 188, 20
     GROUPBOX "Программы", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Использовать ее для всех файлов такого типа", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Обзор...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Использовать ее для всех файлов такого типа", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Обзор...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Общие"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Задачи", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Отобра&жение списка типичных задач в папках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Использовать обы&чные папки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 145, 10
-    GROUPBOX "Обзор папок", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "&Открывать папки в одном и том же окне", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "О&ткрывать каждую папку в отдельном окне", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 165, 10
-    GROUPBOX "Щелчки мышью", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "От&крывать одним щелчком, выделять указателем", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 185, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Подчеркив&ать подписи значков", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Подчеркивать подписи з&начков при наведении", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 175, 10
-    AUTORADIOBUTTON "Откр&ывать двойным, а выделять одним щелчком", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 180, 10
-    PUSHBUTTON "&Восстановить умолчания", 14011, 145, 180, 95, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Вид"
@@ -618,7 +584,7 @@ BEGIN
     PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Выберите значок из списка ниже:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 135, 179, 50, 14
 END
@@ -693,7 +659,7 @@ BEGIN
     IDS_ABOUT_VERSION_STRING "Версия %S (%S)"
 
     /* context menus */
-    IDS_VIEW_LARGE "&Большие значки"
+    IDS_VIEW_LARGE "&Крупные значки"
     IDS_VIEW_SMALL "&Мелкие значки"
     IDS_VIEW_LIST "&Список"
     IDS_VIEW_DETAILS "&Таблица"
@@ -745,7 +711,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Обзор"
     IDS_RUNDLG_BROWSE_FILTER "Исполняемые файлы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Главное меню\\Программы"
     IDS_PERSONAL "Мои документы"
     IDS_FAVORITES "Избранное"
@@ -831,7 +797,7 @@ BEGIN
     IDS_ICO_FILE "Значок"
     IDS_INI_FILE "Файл конфигурации"
     IDS_LNK_FILE "Ярлык"
-    IDS_NT__FILE "NT DOS32 Configuration File"
+    IDS_NT__FILE "Файл конфигурации NT DOS32"
     IDS_PIF_FILE "Информация о приложении NT VDM"
     IDS_SCR_FILE "Заставка"
     IDS_SYS_FILE "Системный файл"
@@ -895,10 +861,10 @@ BEGIN
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_SPECIFY_EXT "Необходимо задать расширение."
+    IDS_NEWEXT_ALREADY_ASSOC "Расширение '%s' уже сопоставлено файлам типа '%s'. Удалить сопоставление '%s' с '%s' и создать для него новый тип файла?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
+    IDS_REMOVE_EXT "Если вы удалите регистрацию расширения имени файлов, то вы не сможете открывать соответствующие файлы двойным щелчком.\n\nВы действительно хотите удалить это расширение?"
     IDS_FILE_NOT_FOUND "Файл '%s' не найден."
 END
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 6ec2a47e8f8..0e08cfb65e0 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Spustenie"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí.", 12289, 36, 11, 182, 18
+    LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja.", 12289, 36, 11, 182, 18
     LTEXT "&Otvoriť:", 12305, 7, 39, 28, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 39, 37, 181, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Zrušiť", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Prehľadávať...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -250,7 +250,7 @@ BEGIN
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ súboru:", 14004, 8, 35, 50, 10
     CONTROL "Súbor", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Otvoriť programom:", 14006, 8, 53, 50, 10
+    LTEXT "Programom:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Verzia"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Verzia súboru: ", 14000, 10, 10, 55, 10
+    LTEXT "Verzia súboru:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Popis: ", 14002, 10, 27, 45, 10
+    LTEXT "Popis:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Autorské práva: ", 14004, 10, 46, 66, 10 //Copyright
+    LTEXT "Autorské práva:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Iné informácie o verzii: ", 14006, 6, 70, 222, 115
-    LTEXT "Názov položky: ", 14007, 13, 82, 50, 10
-    LTEXT "Hodnota: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Iné informácie o verzii", 14006, 6, 70, 222, 115
+    LTEXT "Názov položky:", 14007, 13, 82, 50, 10
+    LTEXT "Hodnota:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ:", -1, 8, 38, 95, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "Kapacita:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Jednotka %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Čistenie &disku", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Jednotka %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Nástroje"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Umožňuje nájsť chyby na zväzku.", -1, 40, 25, 160, 20
     PUSHBUTTON "&Skontrolovať...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentácia", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Defragmentuje súbory na zväzku.", -1, 40, 85, 160, 20
-    PUSHBUTTON "&Defragmentovať...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Zálohovanie", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Zálohuje súbory na zväzku.", -1, 40, 150, 160, 20
-    PUSHBUTTON "&Zálohovať...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardvér"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Súbor:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programy", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "N&a otvorenie týchto súborov vždy použiť vybratý program", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Prehľadávať...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "N&a otvorenie týchto súborov vždy použiť vybratý program", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Prehľadávať...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Úlohy", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Zobraziť"
@@ -601,8 +567,8 @@ BEGIN
     DEFPUSHBUTTON "&Spustiť", IDOK, 63, 95, 60, 14
     GROUPBOX "Možnosti kontroly disku", -1, 7, 6, 179, 40
     PUSHBUTTON "Zrušiť", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "&Automaticky opraviť chyby v systéme súborov", 14000, 16, 15, 165, 10
-    AUTOCHECKBOX "Vy&hľadať a pokúsiť sa obnoviť chybné sektory", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Automaticky opraviť chyby v systéme súborov", 14000, 12, 15, 165, 10
+    AUTOCHECKBOX "Vy&hľadať a pokúsiť sa obnoviť chybné sektory", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 117, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Prehľadávať"
     IDS_RUNDLG_BROWSE_FILTER "Spustiteľné súbory (*.exe)\0*.exe\0Všetky súbory (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Ponuka Štart\\Programy"
     IDS_PERSONAL "Moje dokumenty"
     IDS_FAVORITES "Obľúbené položky"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index c14995ddb4a..7a7f86b51f0 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -27,7 +27,7 @@ BEGIN
             MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW
         END
         MENUITEM "", -1, MFT_SEPARATOR
-        POPUP "Arrange &Icons By", FCIDM_SHVIEW_VIEW
+        POPUP "Arrange &Icons By", FCIDM_SHVIEW_ARRANGE
         BEGIN
             MENUITEM "", -1, MFT_SEPARATOR
             MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
@@ -62,7 +62,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
+        MENUITEM "Cu&t", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Run"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18
+    LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani.", 12289, 36, 11, 182, 18
     LTEXT "&Odpri:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "V redu", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Prekliči", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Pre&brskaj", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "File version:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "Description:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Other version information", 14006, 6, 70, 222, 115
+    LTEXT "Item name:", 14007, 13, 82, 50, 10
+    LTEXT "Value:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Type:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Capacity:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tools"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Error-checking", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
+    LTEXT "This option will check the volume for errors.", -1, 40, 25, 160, 20
     PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "File:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programs", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "View"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Check disk options", -1, 7, 6, 179, 40
     PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Browse"
     IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index c746b522359..038709826db 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -1,6 +1,4 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
- * DATE OF TRANSLATION:  06-02-2014
-*/
+// COPYRIGHT: 2014 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
@@ -137,7 +135,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -165,9 +163,9 @@ CAPTION "Ekzekuto"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do të hap atë për ju.", 12289, 36, 11, 182, 18
+    LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti.", 12289, 36, 11, 182, 18
     LTEXT "&Hap:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "Anulo", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
     PUSHBUTTON "&Shfleto...", 12288, 160, 70, 59, 14, WS_TABSTOP
@@ -222,7 +220,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Tipi i dokumentit:", 14004, 8, 40, 55, 10
+    LTEXT "Tipi:", 14004, 8, 40, 55, 10
     CONTROL "Dosje", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Vendndodhje:", 14008, 8, 56, 55, 10
@@ -252,7 +250,7 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Tipi i dokumentit:", 14004, 8, 35, 50, 10
+    LTEXT "Tipi:", 14004, 8, 35, 50, 10
     CONTROL "Dokumenti", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
     LTEXT "Hap me:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
@@ -285,25 +283,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Versioni"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Versioni dokumentit: ", 14000, 10, 10, 55, 10
+    LTEXT "Versioni:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Përshkrimi: ", 14002, 10, 27, 45, 10
+    LTEXT "Përshkrimi:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Informacione të tjera Versioni: ", 14006, 6, 70, 222, 115
-    LTEXT "Emri artikullit: ", 14007, 13, 82, 50, 10
-    LTEXT "Vlera: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Informacione të tjera Versioni", 14006, 6, 70, 222, 115
+    LTEXT "Emri artikullit:", 14007, 13, 82, 50, 10
+    LTEXT "Vlera:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Përgjithshme"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tipi:", -1, 8, 38, 95, 10
@@ -323,34 +321,22 @@ BEGIN
     LTEXT "Kapaciteti:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Pastrim &Disku", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Kompres drivin për të kursyer hapësirë ​​në disk", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Lejo Shërbimet e Indeksimi për indeksim të këtij disku për dokumentat të shpejtë në kërkim", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Drive %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Vegla"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Bagim-kontroll", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Ky opsion do të kontrollojë volumin për\ngabime.", -1, 40, 25, 160, 20
+    LTEXT "Ky opsion do të kontrollojë volumin për gabime.", -1, 40, 25, 160, 20
     PUSHBUTTON "Kontrollo tani...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentacion", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Ky opsion do të defragmentojë dokumentat nga vëllimi", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmento Tani...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Rezervat", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Ky opsion do të ruaj/rezervoj dokumentat nga vëllimi.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Rezerv Tani...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Pajisje"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -401,34 +387,12 @@ BEGIN
     LTEXT "Dokument:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Programe", -1, 7, 42, 249, 187
     CONTROL "Programe", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Gjithmonë përdorni programin e përzgjedhur për të hapur këtë lloj dokumenti", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Shfleto...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Gjithmonë përdorni këtë program për të hapur këtë lloj dokumenti", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Shfleto...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Përgjithshëm"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Detyra", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Trego detyra të përbashkëta në dosjet", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Përdorimi ReactOS dosjet klasike", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Shfleto Dosje", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Hap çdo dosje në të njëtën dritare", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Hap çdo dosje në dritaren e saj", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Klikoni artikuj si më poshtë", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Klikim-njëherësh për të hapur një objekt (pikë për të zgjedhur)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Nënvizo titull ikone në përputhje me shfletuesin tim", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Nënvizo ikonën vetëm në tituj ku unë vë pikë në ta", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "Kliko-dyherë për të hapur një objekt (klikoni-njëerësht për të zgjedhur)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Rikthe Parazgjedhjet", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Vëzhgo"
@@ -606,7 +570,7 @@ BEGIN
     GROUPBOX "Opsione kontrollo diskun", -1, 7, 6, 179, 40
     PUSHBUTTON "Anulo", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Rregullo dokumentet e sistemit automatikisht", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Skano për shërim dhe përpjekje të sektorëve të këqij", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Skano për shërim dhe përpjekje të sektorëve të këqij", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -620,7 +584,7 @@ BEGIN
     PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Anulo", IDCANCEL, 135, 179, 50, 14
 END
@@ -747,7 +711,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Shfletp"
     IDS_RUNDLG_BROWSE_FILTER "Dokumentë Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Fillo Menu\\Programe"
     IDS_PERSONAL "Dokumentet e'mi"
     IDS_FAVORITES "Preferuarat"
@@ -898,7 +862,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 4d4d7c31431..fe9c5f12d58 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Kör"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs som du vill öppna.", 12289, 36, 11, 182, 18
+    LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs.", 12289, 36, 11, 182, 18
     LTEXT "&Öppna:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Bläddra...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Filversion: ", 14000, 10, 10, 55, 10
+    LTEXT "Filversion:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Beskrivning: ", 14002, 10, 27, 45, 10
+    LTEXT "Beskrivning:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "Copyright:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Annan versionsinformation: ", 14006, 6, 70, 222, 115
-    LTEXT "Objektnamn: ", 14007, 13, 82, 50, 10
-    LTEXT "Värde: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Annan versionsinformation", 14006, 6, 70, 222, 115
+    LTEXT "Objektnamn:", 14007, 13, 82, 50, 10
+    LTEXT "Värde:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allmänt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Typ:", -1, 8, 38, 95, 10
@@ -319,34 +319,22 @@ BEGIN
     LTEXT "Kapacitet:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Enhet %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Diskrensning", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Komprimera enhet för att spara diskutrymme", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Tillåt indexeringstjänsten att indexera den här disken för snabb filsökning", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Enhet %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Verktyg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX "Felkontroll", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Det här valet kontrollerar enheten efter\nfel.", -1, 40, 25, 160, 20
+    LTEXT "Det här valet kontrollerar enheten efter fel.", -1, 40, 25, 160, 20
     PUSHBUTTON "Kontrollera nu...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentering", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Det här valet defragmenterar filer på enheten", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragmentera nu...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Säkerhetskopiering", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Det här valet säkerhetskopierar filer på den här enheten.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Säkerhetskopiera nu...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hårdvara"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -397,34 +385,12 @@ BEGIN
     LTEXT "Fil:     ", 14001, 44, 25, 188, 20
     GROUPBOX "&Program", -1, 7, 42, 249, 187
     CONTROL "Program", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Använd alltid the valda programmet för att öppna den här filtypen", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Bläddra...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "&Använd alltid the valda programmet för att öppna den här filtypen", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Bläddra...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Allmänt"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Aktiviteter", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Visa vanliga aktiviteter i &mappar", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 125, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Använd ReactOS klass&iska mappar", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 125, 10
-    GROUPBOX "Bläddra mappar", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Öppna varje mapp i sa&mma fönster", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Öppna varje mapp i sitt eget &fönster", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Klicka på objekt enligt följande", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Enkelklicka för att öppna (markera genom att peka)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Stryk under ikontitlar som min &webbläsare", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10
-    AUTORADIOBUTTON "Stryk under ikontitlar endast när jag &pekar på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
-    AUTORADIOBUTTON "&Dubbelklicka för att öppna (markera genom att enkelklicka)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
-    PUSHBUTTON "&Återställ standardvärde", 14011, 160, 180, 90, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Visa"
@@ -602,7 +568,7 @@ BEGIN
     GROUPBOX "Alternativ för diskkontroll", -1, 7, 6, 179, 40
     PUSHBUTTON "Avbryt", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "Laga filsystemsfel automatiskt", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Sök och försök laga trasiga sektorer", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Sök och försök laga trasiga sektorer", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -616,7 +582,7 @@ BEGIN
     PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14
 END
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Bläddra"
     IDS_RUNDLG_BROWSE_FILTER "Körbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start-meny\\Program"
     IDS_PERSONAL "Mina dokument"
     IDS_FAVORITES "Favoriter"
@@ -894,7 +860,7 @@ BEGIN
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
     IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
     IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index cb183c44718..9588c5e5f85 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -1,18 +1,18 @@
-/* TRANSLATORS: 2006 Fatih Aşıcı, 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2015-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+// COPYRIGHT: 2006 Fatih Aşıcı, 2012 Arda Tanrıkulu (ardatan) <ardatanrikulu@gmail.com>, 2015-2020 Erdem Ersoy
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 MENU_001 MENUEX
 BEGIN
-    MENUITEM "&Büyük Simgeler", FCIDM_SHVIEW_BIGICON
-    MENUITEM "&Küçük Simgeler", FCIDM_SHVIEW_SMALLICON
-    MENUITEM "&Dizelge", FCIDM_SHVIEW_LISTVIEW
+    MENUITEM "&Büyük simgeler", FCIDM_SHVIEW_BIGICON
+    MENUITEM "&Küçük simgeler", FCIDM_SHVIEW_SMALLICON
+    MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW
     MENUITEM "&Ayrıntılar", FCIDM_SHVIEW_REPORTVIEW
     MENUITEM "", -1, MFT_SEPARATOR
     POPUP "&Simgeleri Düzenle", FCIDM_SHVIEW_ARRANGE
     BEGIN
         MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "&Kendiliğinden Düzenle", FCIDM_SHVIEW_AUTOARRANGE
+        MENUITEM "&Otomatik Düzenle", FCIDM_SHVIEW_AUTOARRANGE
     END
 END
 
@@ -23,9 +23,9 @@ BEGIN
     BEGIN
         POPUP "&Görünüm", FCIDM_SHVIEW_VIEW
         BEGIN
-            MENUITEM "&Büyük Simgeler", FCIDM_SHVIEW_BIGICON
-            MENUITEM "&Küçük Simgeler", FCIDM_SHVIEW_SMALLICON
-            MENUITEM "&Dizelge", FCIDM_SHVIEW_LISTVIEW
+            MENUITEM "&Büyük simgeler", FCIDM_SHVIEW_BIGICON
+            MENUITEM "&Küçük simgeler", FCIDM_SHVIEW_SMALLICON
+            MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW
             MENUITEM "&Ayrıntılar", FCIDM_SHVIEW_REPORTVIEW
         END
         MENUITEM "", -1, MFT_SEPARATOR
@@ -37,25 +37,25 @@ BEGIN
         MENUITEM "&Yenile", FCIDM_SHVIEW_REFRESH
         MENUITEM "", -1, MFT_SEPARATOR
         MENUITEM "Y&apıştır", FCIDM_SHVIEW_INSERT
-        MENUITEM "K&ısayol Yapıştır", FCIDM_SHVIEW_INSERTLINK
+        MENUITEM "&Kısayol Yapıştır", FCIDM_SHVIEW_INSERTLINK
     END
 END
 
 /* menubar EDIT menu */
 MENU_003 MENU
 BEGIN
-    MENUITEM "&Geri Al\tDenetim+Z", FCIDM_SHVIEW_UNDO
+    MENUITEM "&Geri Al\tCtrl+Z", FCIDM_SHVIEW_UNDO
     MENUITEM SEPARATOR
-    MENUITEM "&Kes\tDenetim+X", FCIDM_SHVIEW_CUT
-    MENUITEM "&Çoğalt\tDenetim+C", FCIDM_SHVIEW_COPY
-    MENUITEM "&Yapıştır\tDenetim+V", FCIDM_SHVIEW_INSERT
-    MENUITEM "K&ısayol Yapıştır", FCIDM_SHVIEW_INSERTLINK
+    MENUITEM "&Kes\tCtrl+X", FCIDM_SHVIEW_CUT
+    MENUITEM "&Çoğalt\tCtrl+C", FCIDM_SHVIEW_COPY
+    MENUITEM "&Yapıştır\tCtrl+V", FCIDM_SHVIEW_INSERT
+    MENUITEM "Kı&sayol Yapıştır", FCIDM_SHVIEW_INSERTLINK
     MENUITEM SEPARATOR
     MENUITEM "&Dizine Çoğalt...", FCIDM_SHVIEW_COPYTO
-    MENUITEM "D&izine Taşı...", FCIDM_SHVIEW_MOVETO
+    MENUITEM "Di&zine Taşı...", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
-    MENUITEM "&Tümünü Seç\tDenetim+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Seçimi Evir", FCIDM_SHVIEW_INVERTSELECTION
+    MENUITEM "&Tümünü Seç\tCtrl+A", FCIDM_SHVIEW_SELECTALL
+    MENUITEM "S&eçimi Evir", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -67,11 +67,11 @@ BEGIN
         MENUITEM "&Kes", IDM_CUT
         MENUITEM "&Çoğalt", IDM_COPY
         MENUITEM SEPARATOR
-        MENUITEM "K&ısayol Oluştur", IDM_CREATELINK
+        MENUITEM "Kısayol &oluştur", IDM_CREATELINK
         MENUITEM "&Sil", IDM_DELETE
-        MENUITEM "&Yeniden Adlandır", IDM_RENAME
+        MENUITEM "&Yeniden adlandır", IDM_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Husûsîyetler", IDM_PROPERTIES
+        MENUITEM "Ö&zellikler", IDM_PROPERTIES
     END
 END
 
@@ -83,7 +83,7 @@ BEGIN
         MENUITEM "&Move here", IDM_MOVEHERE
         MENUITEM "Create &shortcuts here", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "İptal", 0
     END
 END
 
@@ -135,7 +135,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Telif Hakkı 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -143,7 +143,7 @@ BEGIN
     LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
     LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
     LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
-    LTEXT "Yüklenen fizîkî bellek:", IDC_STATIC, 35, 152, 130, 10
+    LTEXT "Yüklü fiziksel bellek:", IDC_STATIC, 35, 152, 130, 10
     LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10
     DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14
     PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14
@@ -163,12 +163,12 @@ CAPTION "Çalıştır"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Bir izlencenin, dizinin, belgenin veyâ Umûmî Ağ kaynağının adını yazınız, ReactOS onu sizin için açacaktır.", 12289, 36, 11, 182, 18
+    LTEXT "Bir programın, dizinin, belgenin veya İnternet kaynağının adını yazın.", 12289, 36, 11, 182, 18
     LTEXT "&Aç:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "Tamam", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "İptal", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Göz At...", 12288, 170, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Gözat...", 12288, 170, 70, 50, 14, WS_TABSTOP
 END
 
 IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
@@ -179,35 +179,35 @@ BEGIN
     ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
     EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Varış Türü:", 14004, 8, 38, 68, 10
+    LTEXT "Hedef Türü:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Varış Konumu:", 14006, 8, 55, 68, 10
+    LTEXT "Hedef Konumu:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Varış:", 14008, 8, 71, 68, 10
+    LTEXT "&Hedef:", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "&Başlama Yeri:", 14010, 8, 98, 68, 10
     EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "&Kısayol Düğmesi:", 14014, 8, 117, 68, 10
+    LTEXT "&Kısayol Tuşu:", 14014, 8, 117, 68, 10
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "&Çalıştır:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Açıklama:", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
-    PUSHBUTTON "Va&rış Bul...", 14020, 9, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "H&edef Bul...", 14020, 9, 172, 70, 14, ES_LEFT
     PUSHBUTTON "&Simge Değiştir...", 14021, 84, 172, 70, 14, ES_LEFT
     PUSHBUTTON "&Gelişmiş...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
 IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Gelişmiş Husûsîyetler"
+CAPTION "Gelişmiş Özellikler"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
-    LTEXT "Bu kısayol için istediğiniz gelişmiş husûsîyetleri seçiniz.", -1, 5, 30, 210, 10
+    LTEXT "Bu kısayol için istediğiniz gelişmiş özellikleri seçiniz.", -1, 5, 30, 210, 10
     CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", 14000, 25, 50, 150, 10
-    LTEXT "Bu seçenek, bu kısayolu başka bir kullanıcı olarak çalıştırmanızı veyâ yetkilendirilmemiş izlence etkinliğinden bilgisayarınızı ve verinizi koruyarak kendiniz olarak sürdürmenizi sağlayabilir.", -1, 50, 60, 175, 40
+    LTEXT "Bu seçenek, bu kısayolu başka bir kullanıcı olarak çalıştırmanızı veya yetkilendirilmemiş program etkinliğinden bilgisayarınızı ve verinizi koruyarak kendiniz olarak sürdürmenizi sağlayabilir.", -1, 50, 60, 175, 40
     CHECKBOX "A&yrı Bellek Alanında Çalıştır", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE
     PUSHBUTTON "İptal", 2, 120, 124, 50, 15, WS_VISIBLE
@@ -215,12 +215,12 @@ END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Umûmî"
+CAPTION "Genel"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Kütüğün Türü:", 14004, 8, 40, 55, 10
+    LTEXT "Dosya Türü:", 14004, 8, 40, 55, 10
     CONTROL "Dizin", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Konum:", 14008, 8, 56, 55, 10
@@ -235,24 +235,24 @@ BEGIN
     LTEXT "Oluşturuldu:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Öz Nitelikler:", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Yalnızca Okunur", 14021, 58, 151, 70, 10
+    LTEXT "Öznitelikler:", 14020, 8, 152, 46, 10
+    AUTOCHECKBOX "&Salt Okunur", 14021, 58, 151, 70, 10
     AUTOCHECKBOX "&Gizli", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Belgelik", 14023, 181, 151, 70, 10
+    AUTOCHECKBOX "&Arşiv", 14023, 181, 151, 70, 10
     PUSHBUTTON "G&elişmiş...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Umûmî"
+CAPTION "Genel"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Kütüğün Türü:", 14004, 8, 35, 50, 10
+    LTEXT "Dosya Türü:", 14004, 8, 35, 50, 10
     CONTROL "Dosya", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Birlikte Açılır:", 14006, 8, 53, 50, 10
+    LTEXT "Birlikte Aç:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
     PUSHBUTTON "&Değiştir...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
@@ -268,13 +268,13 @@ BEGIN
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "Değiştirildi:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Erişildi:", 14018, 8, 163, 45, 10
+    LTEXT "Erişme:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Öz Nitelikler:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Yalnızca Okunur", 14021, 58, 188, 67, 10
+    LTEXT "Öznitelikler:", 14020, 8, 189, 45, 10
+    AUTOCHECKBOX "&Salt Okunur", 14021, 58, 188, 67, 10
     AUTOCHECKBOX "&Gizli", 14022, 126, 188, 50, 10
-    AUTOCHECKBOX "&Belgelik", 14023, 181, 188, 49, 10
+    AUTOCHECKBOX "&Arşiv", 14023, 181, 188, 49, 10
     PUSHBUTTON "G&elişmiş...", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
 
@@ -283,30 +283,30 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sürüm"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Kütüğün sürümü: ", 14000, 10, 10, 55, 10
+    LTEXT "Dosya sürümü:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Tanım: ", 14002, 10, 27, 45, 10
+    LTEXT "Tanım:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Telif Hakkı: ", 14004, 10, 46, 66, 10
+    LTEXT "Telif Hakkı:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Diğer sürüm bilgileri ", 14006, 6, 70, 222, 115
-    LTEXT "Öge Adı: ", 14007, 13, 82, 50, 10
-    LTEXT "Değer: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Diğer sürüm bilgileri", 14006, 6, 70, 222, 115
+    LTEXT "Öge adı:", 14007, 13, 82, 50, 10
+    LTEXT "Değer:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Umûmî"
+CAPTION "Genel"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Tür:", -1, 8, 38, 95, 10
     EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Kütük Dizgesi:", -1, 8, 51, 95, 10
+    LTEXT "Dosya Sistemi:", -1, 8, 51, 95, 10
     EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
@@ -321,34 +321,22 @@ BEGIN
     LTEXT "Sığa:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Sürücü %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Temizleme", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "D&isk Alanını Arttırmak İçin Sürücüyü Sıkıştır", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "&Hızlı Kütük Araması İçin Bu Diski Dizinlemeye Dizinleme Hizmeti'ne İzin Ver", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Sürücü %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Araçlar"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Yanlışlık Denetleme", -1, 5, 5, 230, 60
+    GROUPBOX "Hata denetleme", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "Bu seçenek, yanlışlıklar için bölümdeki bölümü denetleyecektir.", -1, 40, 25, 160, 20
-    PUSHBUTTON "&Şimdi Denetle...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Birleştirme", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Bu seçenek, bölümdeki kütükleri birleştirecektir.", -1, 40, 85, 160, 20
-    PUSHBUTTON "Ş&imdi Birleştir...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Yedekleme", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Bu seçenek, bölümdeki kütükleri yedekleyecektir.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Şi&mdi Yedekle...", 14002, 130, 170, 90, 15, WS_TABSTOP
+    LTEXT "Bu seçenek, hatalar için bölümü denetleyecektir.", -1, 40, 25, 160, 20
+    PUSHBUTTON "Şimdi &Denetle...", 14000, 130, 45, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Donanım"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -360,10 +348,10 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ayrı Çalıştır"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Bu izlenceyi çalıştırmak için hangi kullanıcı hesâbını kullanmak istiyorsunuz?", -1, 10, 20, 220, 20
-    CHECKBOX "&Şimdiki Kullanıcı (%s)", 14000, 10, 45, 150, 10
-    LTEXT "&Bilgisayarımı ve Verimi Yetkilendirilmemiş İzlence Etkinliğinden Koru", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "Bu seçenek, bilgisayarınıza ya da şahsî verinize zarar vermesinden bilgisayar zararlılarını önleyebilir, ancak onu seçmek izlencenin düzgün çalışmamasına neden olabilir.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
+    LTEXT "Bu programı çalıştırmak için hangi kullanıcı hesabını kullanmak istiyorsunuz?", -1, 10, 20, 220, 20
+    CHECKBOX "Şi&mdiki Kullanıcı (%s)", 14000, 10, 45, 150, 10
+    LTEXT "&Bilgisayarımı ve verimi yetkilendirilmemiş program etkinliğinden koru", -1, 25, 57, 200, 10, WS_DISABLED
+    CHECKBOX "Bu seçenek, bilgisayarınıza ya da şahsî verinize zarar vermesinden bilgisayar zararlılarını önleyebilir ancak onu seçmek programın düzgün çalışmamasına neden olabilir.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
     CHECKBOX "Aşağıdaki Kullanıcı:", 14002, 10, 100, 90, 10
     LTEXT "Kullanıcı Adı:", -1, 20, 118, 54, 10
     COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
@@ -377,15 +365,15 @@ END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Geri Dönüşüm Kutusu Seçenekleri"
+CAPTION "Geri Dönüşüm Kutusu Özellikleri"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
     GROUPBOX "Seçili Konum İçin Ayarlar", -1, 10, 72, 220, 70
-    RADIOBUTTON "&Husûsî Boyut:", 14001, 20, 90, 80, 10, WS_TABSTOP
+    RADIOBUTTON "Ö&zel boyut:", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
     LTEXT "&Boyut En Çok (MB):", -1, 20, 105, 70, 10
-    RADIOBUTTON "&Kütükleri Geri Dönüşüm Kutusu'na taşıma. Silindiğinde kütükleri hemen kaldır.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
+    RADIOBUTTON "&Dosyaları Geri Dönüşüm Kutusu'na taşıma. Dosyaları kalıcı olarak sil.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
     AUTOCHECKBOX "&Silme Onay İletişim Kutusunu Göster", 14004, 20, 155, 140, 10, WS_TABSTOP
 END
 
@@ -395,38 +383,16 @@ CAPTION "Birlikte Aç"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
-    LTEXT "Bu kütüğü açmak için kullanmak istediğiniz izlenceyi seçiniz:", -1, 44, 12, 211, 10
-    LTEXT "Kütük:    ", 14001, 44, 25, 188, 20
-    GROUPBOX "&İzlenceler", -1, 7, 42, 249, 187
-    CONTROL "İzlenceler", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Kütüğün Bu Türünü Açmak İçin Tüm Zamanlarda Seçili İzlenceyi Kullan", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Göz At...", 14004, 198, 207, 50, 14
+    LTEXT "Bu dosyayı açmak için kullanmak istediğiniz programı seçiniz:", -1, 44, 12, 211, 10
+    LTEXT "Dosya:    ", 14001, 44, 25, 188, 20
+    GROUPBOX "&Programlar", -1, 7, 42, 249, 187
+    CONTROL "Programlar", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
+    AUTOCHECKBOX "&Bu dosya türünü açmak için her zaman seçili programı kullan", 14003, 16, 193, 232, 10
+    PUSHBUTTON "&Gözat...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "Tamam", IDOK, 150, 236, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Umûmî"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Görevler", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "&Dizinlerde Ortak Görevleri Göster", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP | WS_GROUP
-    AUTORADIOBUTTON "&ReactOS Kökleşik Dizinleri Kullan", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 | WS_GROUP
-    GROUPBOX "Dizinlere Göz At", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "&Tüm Dizinleri Aynı Pencerede Aç", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP | WS_GROUP
-    AUTORADIOBUTTON "T&üm Dizinleri Kendi Penceresinde Aç", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 | WS_GROUP
-    GROUPBOX "Aşağıdaki Gibi Ögelere Tıkla", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Bir Öge Açmak İçin Tek Tıkla (Seçmek İçin Üzerine Git)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "T&arayıcımla Uyumlu Olarak Simge Başlıklarının Altını Çiz", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "&Simge Başlıklarının Yalnızca Onların Üzerine Gittiğimde Altını Çiz", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "B&ir Ögeyi Açmak İçin Çift Tıkla (Seçmek İçin Tek Tıkla)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Ön Tanımlıları Geri Getir", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Görünüm"
@@ -444,10 +410,10 @@ END
 
 IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Kütük Türleri"
+CAPTION "Dosya Türleri"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "&Kayıtlı Kütük Türleri:", -1, 7, 10, 70, 10
+    LTEXT "&Kayıtlı dosya türleri:", -1, 7, 10, 70, 10
     CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
     PUSHBUTTON "&Yeni", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP
     PUSHBUTTON "&Sil", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
@@ -470,9 +436,9 @@ BEGIN
     PUSHBUTTON "&Hayır", IDNO, 150, 122, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "Bu dizin önceden ""%2"" adlı bir kütük içeriyor.", 12291, 44, 10, 231, 22, SS_NOPREFIX
-    LTEXT "Bu dizin önceden ""%2"" adlı bir yalnızca okunur kütük içeriyor.", 12292, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "Bu dizin önceden ""%2"" adlı bir dizge kütüğü içeriyor.", 12293, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "Bu dizin zaten ""%2"" adlı bir dosya içeriyor.", 12291, 44, 10, 231, 22, SS_NOPREFIX
+    LTEXT "Bu dizin zaten ""%2"" adlı bir salt okunur dosya içeriyor.", 12292, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "Bu dizin zaten ""%2"" adlı bir sistem dosyası içeriyor.", 12293, 41, 10, 222, 22, SS_NOPREFIX
     LTEXT "Var olan kütüğü", -1, 44, 35, 228, 10, SS_NOPREFIX
     LTEXT "(bilinmeyen zaman ve boyut)", 12302, 79, 51, 198, 20, SS_NOPREFIX
     ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
@@ -487,14 +453,14 @@ CAPTION "ReactOS Oturumunu Kapat"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 21, 20
-    LTEXT "Oturumu kapatmayı istediğinizden emin misiniz?", -1, 33, 16, 151, 8
+    LTEXT "Oturumu kapatmak istediğinizden emin misiniz?", -1, 33, 16, 151, 8
     DEFPUSHBUTTON "&Oturumu Kapat", IDOK, 30, 39, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 95, 39, 60, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "ReactOS ile Bağlantıyı Kes"
+CAPTION "ReactOS Bağlantısını Kes"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
@@ -505,16 +471,16 @@ END
 
 IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Kendiliğinden Kullan"
+CAPTION "Otomatik Kullan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Bir içerik türü seçiniz, sonra şu tür bu aygıtta kullanıldığında kendliğinden yapmaya ReactOS için bir eylem seçiniz:", 1000, 7, 7, 215, 20
+    LTEXT "&Bir içerik türü seçiniz, sonra şu tür bu aygıtta kullanıldığında ReactOS'un otomatik uygulayacağı bir eylem seçiniz:", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
     GROUPBOX "Eylemler", -1, 7, 45, 212, 146
-    AUTORADIOBUTTON "&Yapmak İçin Bir Eylem Seç:", 1005, 14, 54, 202, 10, WS_GROUP
+    AUTORADIOBUTTON "&Yapmak için bir eylem seç:", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
-    AUTORADIOBUTTON "&Tüm Zamanlarda Bir Eylem Seçmek İçin Sor", 1006, 14, 177, 202, 10
-    PUSHBUTTON "&Ön Tanımlıları Geri Getir", 1008, 108, 197, 110, 14, WS_DISABLED
+    AUTORADIOBUTTON "&Her zaman bir eylem seçmemi iste", 1006, 14, 177, 202, 10
+    PUSHBUTTON "&Varsayılanları Geri Getir", 1008, 108, 197, 110, 14, WS_DISABLED
 END
 
 IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
@@ -536,39 +502,39 @@ CAPTION "Karışık İçerik"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS, bu kütük türüyle bir disk taktığınız ya da bir aygıt bağladığınız tüm zamanlarda aynı eylemi uygulayabilir:", 1001, 30, 7, 193, 20
+    LTEXT "ReactOS, bu dosya türüyle, bir disk taktığınız ya da bir aygıt bağladığınız her zaman aynı eylemi uygulayabilir:", 1001, 30, 7, 193, 20
     ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
     EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "ReactOS'un ne yapmasını istersiniz?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
-    AUTOCHECKBOX "Tüm Zamanlarda Seçili Eylemi Yap", 1004, 32, 171, 190, 10
+    AUTOCHECKBOX "Her zaman seçili eylemi yap", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "Tamam", IDOK, 96, 185, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 160, 185, 60, 14
 END
 
 IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Kendiliğinden Kullan"
+CAPTION "Otomatik Kullan"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS, bu aygıta bağlandığınız tüm zamanlarda aynı eylemi uygulayabilir.", 1001, 32, 7, 190, 22
+    LTEXT "ReactOS, bu aygıta bağlandığınız her zaman aynı eylemi uygulayabilir.", 1001, 32, 7, 190, 22
     LTEXT "&ReactOS'un ne yapmasını istersiniz?", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
-    AUTOCHECKBOX "&Tüm Zamanlarda Seçili Eylemi Yap", 1004, 32, 143, 190, 8
+    AUTOCHECKBOX "&Her zaman seçili eylemi yap", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "Tamam", IDOK, 94, 160, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 159, 160, 60, 14
 END
 
 IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Bilgisayarı Kapat"
+CAPTION "ReactOS'u Kapat"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
     LTEXT "Bilgisayarınızın ne yapmasını istersiniz?", -1, 39, 7, 167, 10
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
-    LTEXT "Oturumunuzu sürdürür, bilgisayarı bellekteki veriyle düşük güçte çalışmada tutar. Bir düğmeye bastığınızda veyâ fâreyi oynattığınızda bilgisayar uyanır.", 8225, 39, 40, 167, 37
+    LTEXT "Oturumunuzu sürdürür, bilgisayarı bellekteki veriyle düşük güçte çalışmada tutar. Bir tuşa bastığınızda veya fareyi oynattığınızda bilgisayar uyanır.", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "Tamam", 1, 7, 82, 60, 14, WS_GROUP
     PUSHBUTTON "İptal", IDCANCEL, 75, 82, 60, 14
     PUSHBUTTON "&Yardım", IDHELP, 144, 82, 60, 14
@@ -583,16 +549,16 @@ BEGIN
     PUSHBUTTON "&Kapat", IDCANCEL, 118, 198, 60, 14
     LTEXT "&Sığa:", -1, 7, 6, 169, 9
     COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "K&ütük Dizgesi", -1, 7, 35, 170, 9
+    LTEXT "&Dosya sistemi", -1, 7, 35, 170, 9
     COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
     CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
-    LTEXT "&Ayırma Birimi Boyutu", -1, 7, 64, 170, 9
+    LTEXT "&Ayırma birimi boyutu", -1, 7, 64, 170, 9
     COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-    LTEXT "B&ölüm Etiketi", -1, 7, 93, 170, 9
+    LTEXT "Bölü&m etiketi", -1, 7, 93, 170, 9
     EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
-    GROUPBOX "Biçimlendirme Seçenekleri", 4610, 7, 121, 170, 49
+    GROUPBOX "Biçimlendirme seçenekleri", 4610, 7, 121, 170, 49
     AUTOCHECKBOX "&Hızlı Biçimlendir", 28674, 16, 135, 155, 10
-    AUTOCHECKBOX "S&ıkıştırmayı Etkinleştir", 28675, 16, 152, 155, 10
+    AUTOCHECKBOX "Sıkıştırmayı &Etkinleştir", 28675, 16, 152, 155, 10
 END
 
 IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115
@@ -601,10 +567,10 @@ CAPTION "Disk Denetle"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Başlat", IDOK, 63, 95, 60, 14
-    GROUPBOX "Disk Denetleme Seçenekleri", -1, 7, 6, 179, 40
+    GROUPBOX "Disk denetleme seçenekleri", -1, 7, 6, 179, 40
     PUSHBUTTON "İptal", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "&Kütük Dizgesi Yanlışlıklarını Kendiliğinden Düzelt", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "B&ozuk Bölümler İçin Tara ve Bozuk Bölümlerin Kurtarılmasına Çalış", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "&Dosya sistemi hatalarını otomatik düzelt", 14000, 12, 15, 155, 10
+    AUTOCHECKBOX "B&ozuk bölümleri tara ve kurtarmaya çalış", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -614,11 +580,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL
 CAPTION "Simge Değiştir"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT "Bu kütükteki simgelere bak:", -1, 7, 7, 179, 10
-    PUSHBUTTON "Göz At...", IDC_BUTTON_PATH, 135, 17, 50, 14
+    LTEXT "Bu dosyadaki simgelere bak:", -1, 7, 7, 179, 10
+    PUSHBUTTON "Gözat...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Aşağıdaki dizelgeden bir simge seç:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT "Aşağıdaki listeden bir simge seç:", -1, 7, 36, 179, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 81, 179, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 135, 179, 50, 14
 END
@@ -629,10 +595,10 @@ CAPTION "Uyarı"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "Bu kütük, işletim dizgesi eliyle veyâ başka bir uygulama\n\
-eliyle kullanılıyor olabilir. Bu kütüğü değiştirmek dizgenize zarar\n\
-verebilir veyâ daha az işlevli yapabilir.\n\n\
-Bu kütüğü açmak istediğinizden emin misiniz?", IDC_STATIC, 35, 5, 230, 60
+    LTEXT "Bu dosya, işletim sistemi veya başka bir uygulama tarafından\n\
+kullanılıyor olabilir. Bu dosyayı değiştirmek sisteme zarar\n\
+verebilir veya sistem işlevlerini azaltabilir.\n\n\
+Bu dosyayı açmak istediğinizden emin misiniz?", IDC_STATIC, 35, 5, 230, 60
     DEFPUSHBUTTON "Evet", IDYES, 125, 55, 50, 14
     PUSHBUTTON "Hayır", IDNO, 180, 55, 50, 14
 END
@@ -645,10 +611,10 @@ BEGIN
     LTEXT "&File Extension:", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
     PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
+    LTEXT "&İlişkili Dosya Türü:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "İptal", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -658,23 +624,23 @@ BEGIN
     IDS_SHV_COLUMN_SIZE "Boyut"
     IDS_SHV_COLUMN_TYPE "Tür"
     IDS_SHV_COLUMN_MODIFIED "Değiştirildi"
-    IDS_SHV_COLUMN_ATTRIBUTES "Öz Nitelikler"
+    IDS_SHV_COLUMN_ATTRIBUTES "Öznitelikler"
     IDS_SHV_COLUMN_DISK_CAPACITY "Boyut"
     IDS_SHV_COLUMN_DISK_AVAILABLE "Kullanılabilir Boyut"
     IDS_SHV_COLUMN_OWNER "İye"
-    IDS_SHV_COLUMN_GROUP "Öbek"
-    IDS_SHV_COLUMN_FILENAME "Kütük Adı"
+    IDS_SHV_COLUMN_GROUP "Grup"
+    IDS_SHV_COLUMN_FILENAME "Dosya Adı"
     IDS_SHV_COLUMN_CATEGORY "Ulam"
     IDS_SHV_COLUMN_DELFROM "Özgün Konum"
-    IDS_SHV_COLUMN_DELDATE "Silinme Zamânı"
+    IDS_SHV_COLUMN_DELDATE "Silinme Zamanı"
     IDS_SHV_COLUMN_FONTTYPE "Yazı Tipi Türü"
-    IDS_SHV_COLUMN_WORKGROUP "Çalışma Takımı"
+    IDS_SHV_COLUMN_WORKGROUP "Çalışma Grubu"
     IDS_SHV_COLUMN_NETLOCATION "Ağ Konumu"
     IDS_SHV_COLUMN_DOCUMENTS "Belgeler"
     IDS_SHV_COLUMN_STATUS "Durum"
     IDS_SHV_COLUMN_COMMENTS "Açıklamalar"
     IDS_SHV_COLUMN_LOCATION "Konum"
-    IDS_SHV_COLUMN_MODEL "Biçim"
+    IDS_SHV_COLUMN_MODEL "Model"
 
     /* special folders */
     IDS_DESKTOP "Masaüstü"
@@ -685,7 +651,7 @@ BEGIN
 
     /* special folders descriptions */
     IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Bilgisayarınız için yönetim ayarlarını yapılandır."
-    IDS_FOLDER_OPTIONS_DESCRIPTION "Kütüklerin ve dizinlerin görünümünü husûsileştir ve kütük ilişkilendirmelerini değiştir."
+    IDS_FOLDER_OPTIONS_DESCRIPTION "Dosyaların ve dizinlerin görünümünü özelleştirin ve dosya ilişkilendirmelerini değiştir."
     IDS_FONTS_DESCRIPTION "Bilgisayarınızda yazı tiplerini ekle, değiştir ve yönet."
     IDS_PRINTERS_DESCRIPTION "Kurulu yazıcıları ve belgegeçer yazıcılarını gösterir ve yenilerini eklemene yardımcı olur."
 
@@ -693,27 +659,27 @@ BEGIN
     IDS_ABOUT_VERSION_STRING "Sürüm %S (%S)"
 
     /* context menus */
-    IDS_VIEW_LARGE "&Büyük Simgeler"
-    IDS_VIEW_SMALL "&Küçük Simgeler"
-    IDS_VIEW_LIST "&Dizelge"
+    IDS_VIEW_LARGE "&Büyük simgeler"
+    IDS_VIEW_SMALL "&Küçük simgeler"
+    IDS_VIEW_LIST "&Liste"
     IDS_VIEW_DETAILS "&Ayrıntılar"
     IDS_SELECT "Seç"
     IDS_OPEN "Aç"
-    IDS_CREATELINK "K&ısayol Oluştur"
+    IDS_CREATELINK "Kısayol &oluştur"
     IDS_COPY "&Çoğalt"
     IDS_DELETE "&Sil"
-    IDS_PROPERTIES "&Husûsîyetler"
+    IDS_PROPERTIES "Ö&zellikler"
     IDS_CUT "K&es"
-    IDS_RESTORE "Geri Getir"
+    IDS_RESTORE "Geri getir"
     IDS_FORMATDRIVE "Biçimlendir..."
-    IDS_RENAME "Yeniden Adlandır"
+    IDS_RENAME "Yeniden adlandır"
     IDS_PASTE "Yapıştır"
     IDS_EJECT "Eject"
     IDS_DISCONNECT "Disconnect"
 
     IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor."
     IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor"
-    IDS_DELETEITEM_CAPTION "Kütük Silmeyi Onayla"
+    IDS_DELETEITEM_CAPTION "Dosya Silmeyi Onayla"
     IDS_DELETEFOLDER_CAPTION "Dizin Silmeyi Onayla"
     IDS_DELETEITEM_TEXT """%1"" ögesini silmek istediğinizden emin misiniz?"
     IDS_DELETEMULTIPLE_TEXT "Bu %1 ögeyi silmek istediğinizden emin misiniz?"
@@ -721,12 +687,12 @@ BEGIN
     IDS_TRASHITEM_TEXT """%1"" ögesini Geri Dönüşüm Kutusu'na göndermek istediğinizden emin misiniz?"
     IDS_TRASHFOLDER_TEXT """%1"" ögesini ve onun tüm içeriğini Geri Dönüşüm Kutusu'na göndermek istediğinizden emin misiniz?"
     IDS_TRASHMULTIPLE_TEXT "Bu %1 ögeyi Geri Dönüşüm Kutusu'na göndermek istediğinizden emin misiniz?"
-    IDS_CANTTRASH_TEXT """%1"" ögesi Geri Dönüşüm Kutusu'na gönderilemiyor. Karşılık olarak onu silmek ister misiniz?"
-    IDS_OVERWRITEFILE_TEXT "Bu dizin önceden ""%1"" adlı bir kütük içeriyor.\n\nOnu yenisiyle değiştirmek ister misiniz?"
-    IDS_OVERWRITEFILE_CAPTION "Kütük Üzerine Yazmayı Onayla"
-    IDS_OVERWRITEFOLDER_TEXT "Bu dizin önceden ""%1"" adlı bir dizin içeriyor.\n\nVarış dizininde kütükler seçili dizindeki kütüklere göre aynı adlara iyeyse onlar yenileriyle değiştirilecektir. Dizini taşımayı veyâ kopyalamayı şimdi bile istiyor musunuz?"
+    IDS_CANTTRASH_TEXT """%1"" ögesi Geri Dönüşüm Kutusu'na gönderilemiyor. Onu kalıcı olarak silmek ister misiniz?"
+    IDS_OVERWRITEFILE_TEXT "Bu dizin zaten ""%1"" adlı bir dosya içeriyor.\n\nOnu yenisiyle değiştirmek ister misiniz?"
+    IDS_OVERWRITEFILE_CAPTION "Dosya Üzerine Yazmayı Onayla"
+    IDS_OVERWRITEFOLDER_TEXT "Bu dizin zaten ""%1"" adlı bir dizin içeriyor.\n\nHedef dizinindeki dosyalar, seçili dizindeki dosyalarla aynı adlı ise, onlar yenileriyle değiştirilecektir. Dizini taşımak veya kopyalamak istiyor musunuz?"
 
-    IDS_FILEOOP_COPYING "Çoğaltılıyor..."
+    IDS_FILEOOP_COPYING "Kopyalanıyor..."
     IDS_FILEOOP_MOVING "Taşınıyor..."
     IDS_FILEOOP_DELETING "Siliniyor..."
     IDS_FILEOOP_FROM_TO "%1 yerinden %2 yerine"
@@ -740,12 +706,12 @@ BEGIN
     IDS_SHUTDOWN_PROMPT "Bilgisayarı kapatmak ister misiniz?"
 
     /* Run File dialog */
-    IDS_RUNDLG_ERROR "Kütük Çalıştır iletişim kutusu görüntülenemiyor (iç yanlışlık)."
-    IDS_RUNDLG_BROWSE_ERROR "Göz At iletişim kutusu görüntülenemiyor (iç yanlışlık)."
+    IDS_RUNDLG_ERROR "Dosya Çalıştır iletişim kutusu görüntülenemiyor (iç hata)."
+    IDS_RUNDLG_BROWSE_ERROR "Göz At iletişim kutusu görüntülenemiyor (iç hata)."
     IDS_RUNDLG_BROWSE_CAPTION "Göz At"
-    IDS_RUNDLG_BROWSE_FILTER "Çalıştırılabilir Kütükler (*.exe)\0*.exe\0Tüm Kütükler (*.*)\0*.*\0"
+    IDS_RUNDLG_BROWSE_FILTER "Çalıştırılabilir Dosyalar (*.exe)\0*.exe\0Tüm Dosyalar (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Başlat Seçkesi\\İzlenceler"
     IDS_PERSONAL "Belgelerim"
     IDS_FAVORITES "Yer İmleri"
@@ -780,15 +746,15 @@ BEGIN
     IDS_DRIVE_FIXED "Yerli Disk"
     IDS_DRIVE_CDROM "CD-ROM"
     IDS_DRIVE_NETWORK "Ağ Diski"
-    IDS_DRIVE_FLOPPY "3,5 Yumuşak"
+    IDS_DRIVE_FLOPPY "3,5 Disket"
     IDS_DRIVE_REMOVABLE "Çıkarılabilir Disk"
     IDS_FS_UNKNOWN "Bilinmeyen"
 
     /* Open With */
     IDS_OPEN_WITH "Birlikte Aç"
-    IDS_OPEN_WITH_CHOOSE "İzlence Seç..."
-    IDS_OPEN_WITH_RECOMMENDED "Önerilen İzlenceler:"
-    IDS_OPEN_WITH_OTHER "Başka İzlenceler:"
+    IDS_OPEN_WITH_CHOOSE "Program Seç..."
+    IDS_OPEN_WITH_RECOMMENDED "Önerilen Programlar:"
+    IDS_OPEN_WITH_OTHER "Diğer Programlar:"
 
     IDS_SHELL_ABOUT_AUTHORS "&Yazarlar"
     IDS_SHELL_ABOUT_BACK "< &Geri"
@@ -800,14 +766,14 @@ BEGIN
     IDS_RECYCLEBIN_DISKSPACE "Kullanılabilir Alan"
     IDS_EMPTY_BITBUCKET "&Geri Dönüşüm Kutusu'nu Boşalt"
     IDS_PICK_ICON_TITLE "Simge Seç"
-    IDS_PICK_ICON_FILTER "Simge Kütükleri (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tüm Kütükler (*.*)\0*.*\0"
-    IDS_OPEN_WITH_FILTER "Çalıştırılabilir Kütükler (*.exe)\0*.exe\0Tüm Kütükler (*.*)\0*.*\0"
+    IDS_PICK_ICON_FILTER "Simge Dosyaları (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tüm Dosyalar (*.*)\0*.*\0"
+    IDS_OPEN_WITH_FILTER "Çalıştırılabilir Dosyalar (*.exe)\0*.exe\0Tüm Dosyalar (*.*)\0*.*\0"
 
     IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
-    IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)."
-    IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)."
-    IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)."
-    IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
+    IDS_CANTDISMOUNTVOLUME "Birim çıkarılamıyor (Hata Kodu: %lu)."
+    IDS_CANTEJECTMEDIA "Birim ayrılamıyor (Hata Kodu: %lu)."
+    IDS_CANTSHOWPROPERTIES "Özellikler gösterilemiyor (Hata Kodu: %lu)."
+    IDS_CANTDISCONNECT "Bağlanılamıyor (Hata Kodu: %lu)."
 
     /* Friendly File Type Names */
     IDS_DIRECTORY "Dizin"
@@ -821,7 +787,7 @@ BEGIN
     IDS_DRV_FILE "Aygıt Sürücüsü"
     IDS_EFI_FILE "Extensible Firmware Interface Executable"
     IDS_EXE_FILE "Uygulama"
-    IDS_NLS_FILE "National Language Support File"
+    IDS_NLS_FILE "Yerel Dil Desteği Dosyası"
     IDS_OCX_FILE "ActiveX Control"
     IDS_TLB_FILE "Type Library"
     IDS_FON_FILE "YazıTipi"
@@ -833,9 +799,9 @@ BEGIN
     IDS_LNK_FILE "Kısayol"
     IDS_NT__FILE "NT DOS32 Configuration File"
     IDS_PIF_FILE "NT VDM İzlence Bilgi Kütüğü"
-    IDS_SCR_FILE "Görüntülük Koruyucu"
+    IDS_SCR_FILE "Ekran Koruyucu"
     IDS_SYS_FILE "Dizge Kütüğü"
-    IDS_VXD_FILE "Farazî Aygıt Sürücüsü"
+    IDS_VXD_FILE "Sanal Aygıt Sürücüsü"
     IDS_ANY_FILE "%s Kütüğü"
 
     IDS_OPEN_VERB "Aç"
@@ -845,26 +811,26 @@ BEGIN
     IDS_FIND_VERB "Bul"
     IDS_PRINT_VERB "Yazdır"
 
-    IDS_FILE_FOLDER "%u Kütük, %u Dizin"
+    IDS_FILE_FOLDER "%u Dosya, %u Dizin"
     IDS_PRINTERS "Yazıcılar"
     IDS_FONTS "Yazı Tipleri"
     IDS_INSTALLNEWFONT "Yeni Yazı Tipi Yükle..."
 
-    IDS_DEFAULT_CLUSTER_SIZE "Ön tanımlı ayırma boyutu"
+    IDS_DEFAULT_CLUSTER_SIZE "Varsayılan ayırma boyutu"
     IDS_COPY_OF "Kopyası: "
 
-    IDS_SHLEXEC_NOASSOC "Kütüğün bu türünü açmak için yapılandırılmış ReactOS izlencesi yok."
+    IDS_SHLEXEC_NOASSOC "Bu dosya türünü açmak için yapılandırılmış ReactOS programı yok."
 
     IDS_FILE_DETAILS """%s"" Uzantısı İçin Ayrıntılar"
-    IDS_FILE_DETAILSADV """%s"" uzantılı kütükler ""%s"" türünündür. Tüm ""%s"" kütüklerini etkileyen ayarları değiştirmek için Gelişmiş'e tıklayınız."
-    IDS_FILE_TYPES "Kütük Türleri"
+    IDS_FILE_DETAILSADV """%s"" uzantılı dosyalar ""%s"" türünündür. Tüm ""%s"" dosyalarını etkileyen ayarları değiştirmek için Gelişmiş'e tıklayınız."
+    IDS_FILE_TYPES "Dosya Türleri"
     IDS_COLUMN_EXTENSION "Uzantılar"
 
     /* As in 'INI File' or 'WAV File', fallback string for no-name extensions
        used in the _File type_ tab of the _Folder Options_ dialog */
     IDS_FILE_EXT_TYPE "%s Kütük"
 
-    IDS_BYTES_FORMAT "çoklu"
+    IDS_BYTES_FORMAT "bit"
     IDS_UNKNOWN_APP "Bilinmeyen Uygulama"
     IDS_EXE_DESCRIPTION "Tanım:"
 
@@ -872,33 +838,33 @@ BEGIN
     IDS_OBJECTS "%d Nesne"
     IDS_OBJECTS_SELECTED "%d Nesne Seçili"
 
-    IDS_ADVANCED_FOLDER "Kütükler ve Dizinler"
-    IDS_ADVANCED_NET_CRAWLER "Ağ dizinlerini ve yazıcıları kendiliğinden ara"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "Dizin bilgi kutularında kütük boyutu bilgisini göster"
-    IDS_ADVANCED_FRIENDLY_TREE "Gezgin'in Dizinler dizelgesinde bayağı dizin görünümünü göster"
+    IDS_ADVANCED_FOLDER "Dosyalar ve Dizinler"
+    IDS_ADVANCED_NET_CRAWLER "Ağ dizinlerini ve yazıcıları otomatik ara"
+    IDS_ADVANCED_FOLDER_SIZE_TIP "Dizin bilgi kutularında dosya boyutu bilgisini göster"
+    IDS_ADVANCED_FRIENDLY_TREE "Gezginin Dizinler listesinde basit dizin görünümünü göster"
     IDS_ADVANCED_WEB_VIEW_BARRICADE "Dizge dizinlerinin içeriğini göster"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Konum çubuğunda tüm yolu göster"
     IDS_ADVANCED_SHOW_FULL_PATH "Başlık çubuğunda tüm yolu göster"
     IDS_ADVANCED_DISABLE_THUMB_CACHE "Küçük resimleri saklama"
-    IDS_ADVANCED_HIDDEN "Gizli kütükler ve dizinler"
-    IDS_ADVANCED_DONT_SHOW_HIDDEN "Gizli kütükler ve dizinleri gösterme"
-    IDS_ADVANCED_SHOW_HIDDEN "Gizli kütükler ve dizinleri göster"
-    IDS_ADVANCED_HIDE_FILE_EXT "Bilinen kütük türleri için eklentileri gizle"
-    IDS_ADVANCED_SUPER_HIDDEN "Korunan işletim dizgesi kütüklerini gizle (önerilir)"
+    IDS_ADVANCED_HIDDEN "Gizli dosyalar ve dizinler"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Gizli dosyalar ve dizinleri gösterme"
+    IDS_ADVANCED_SHOW_HIDDEN "Gizli dosyalar ve dizinleri göster"
+    IDS_ADVANCED_HIDE_FILE_EXT "Bilinen dosya türleri için eklentileri gizle"
+    IDS_ADVANCED_SUPER_HIDDEN "Korunan işletim sistemi dosyalarını gizle (önerilir)"
     IDS_ADVANCED_DESKTOP_PROCESS "Kütük penceresini ayrı bir işlemde başlat"
-    IDS_ADVANCED_CLASSIC_VIEW_STATE "Tüm dizinlerin görünüm ayarlarını anımsa"
-    IDS_ADVANCED_PERSIST_BROWSERS "Oturum açmada daha önceki dizin pencerelerini geri getir"
+    IDS_ADVANCED_CLASSIC_VIEW_STATE "Her dizinin görünüm ayarlarını hatırla"
+    IDS_ADVANCED_PERSIST_BROWSERS "Oturum açarken önceki dizin pencerelerini geri getir"
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Bilgisayarım'da Denetim Masası'nı göster"
-    IDS_ADVANCED_SHOW_COMP_COLOR "Şifrelenmiş veyâ sıkıştırılmış NTFS kütüklerini renkli göster"
+    IDS_ADVANCED_SHOW_COMP_COLOR "Şifrelenmiş veya sıkıştırılmış NTFS dosyalarını renkli göster"
     IDS_ADVANCED_SHOW_INFO_TIP "Dizin ve masaüstü ögeleri için açılan tanım göster"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
+    IDS_NEWEXT_SPECIFY_EXT "Bir uzantı belirtmelisiniz"
     IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "Kayıtlı bir dosya adı uzantısını kaldırırsanız, bu uzantıya sahip dosyaları simgelerine çift tıklayarak açamazsınız.\n\nBu uzantıyı silmek ister misiniz?"
+    IDS_FILE_NOT_FOUND "'%s' dosyası bulunamadı."
 END
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 1a571976b44..b148c8f9e5e 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -133,7 +133,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -161,9 +161,9 @@ CAPTION "Виконати"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Введіть ім'я програми, теки, документа або ресурсу Інтернету, і ReactOS відкриє їх.", 12289, 36, 11, 182, 18
-    LTEXT "&Відкрити:", 12305, 7, 39, 32, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100
+    LTEXT "Введіть ім'я програми, теки, документа або ресурсу Інтернету.", 12289, 36, 11, 182, 18
+    LTEXT "&Відкрити:", 12305, 3, 39, 32, 10
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "Скасувати", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "О&гляд...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -179,7 +179,7 @@ BEGIN
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Тип об'єкта:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Розташування:", 14006, 8, 55, 68, 10
+    LTEXT "шлях:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "О&б'єкт:", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
@@ -221,11 +221,11 @@ BEGIN
     LTEXT "Тип файлу:", 14004, 8, 40, 55, 10
     CONTROL "Тека", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Розташування:", 14008, 8, 56, 55, 10
+    LTEXT "шлях:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Розмір:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Size on disk:", 140101, 8, 88, 55, 10
+    LTEXT "На диску:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "Містить:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -255,11 +255,11 @@ BEGIN
     PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Розташування:", 14008, 8, 75, 50, 10
+    LTEXT "шлях:", 14008, 8, 75, 50, 10
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "Розмір:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Size on disk:", 140112, 8, 107, 55, 10
+    LTEXT "На диску:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Створено:", 14014, 8, 131, 45, 10
@@ -281,25 +281,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Версія"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Версія файлу: ", 14000, 10, 10, 55, 10
+    LTEXT "Версія файлу:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Опис: ", 14002, 10, 27, 45, 10
+    LTEXT "Опис:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Авторські права: ", 14004, 10, 46, 66, 10
+    LTEXT "Авторські права:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Додаткові відомості: ", 14006, 6, 70, 222, 115
-    LTEXT "Ім'я елемента: ", 14007, 13, 82, 50, 10
-    LTEXT "Значення: ", 14008, 112, 82, 45, 10
+    GROUPBOX "Додаткові відомості", 14006, 6, 70, 222, 115
+    LTEXT "Ім'я елемента:", 14007, 13, 82, 50, 10
+    LTEXT "Значення:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "Тип:", -1, 8, 38, 95, 10
@@ -319,15 +319,11 @@ BEGIN
     LTEXT "Місткість:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Диск %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "Очищення &диску", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Стискати диск для заощадження місця", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "Диск %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Сервіс"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -336,17 +332,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "Перевірка тому на наявність помилок.", -1, 40, 25, 160, 20
     PUSHBUTTON "Виконати перевірку...", 14000, 125, 45, 100, 15, WS_TABSTOP
-    GROUPBOX "Дефрагментація диску", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "Дефрагментація файлів на цьому томі", -1, 40, 85, 160, 20
-    PUSHBUTTON "Виконати дефрагментацію...", 14001, 125, 105, 100, 15, WS_TABSTOP
-    GROUPBOX "Архівація", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "Резервне копіювання файлів на цьому томі.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Виконати архівацію...", 14002, 125, 170, 100, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Обладнання"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -375,7 +363,7 @@ END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Властивості Кошика"
+CAPTION "Властивості кошика"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
@@ -393,38 +381,16 @@ CAPTION "Вибір програми"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
-    LTEXT "Виберіть програму, за допомогою якої слід відкрити цей файл.", -1, 44, 12, 234, 10
+    LTEXT "Виберіть програму, за допомогою якої слід відкрити цей файл.", -1, 44, 12, 215, 10
     LTEXT "Файл:    ", 14001, 44, 25, 188, 20
     GROUPBOX "&Програми", -1, 7, 42, 249, 187
     CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "Завжд&и використовувати цю програму для файлів цього типу", 14003, 20, 193, 225, 10
-    PUSHBUTTON "О&гляд...", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "Завжд&и використовувати цю програму для файлів цього типу", 14003, 16, 193, 232, 10
+    PUSHBUTTON "О&гляд...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Загальні"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Завдання", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "&Показувати список типових завдань у теках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Використовувати зви&чайні теки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 149, 10
-    GROUPBOX "Огляд тек", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Відкривати папки в то&му самому вікні", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Відкрива&ти кожну папку в окремому вікні", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 155, 10
-    GROUPBOX "Клацання мишею", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "Від&кривати одиночним, виділяти вказівником", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Підкресл&ювати підписи значків", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Підкр&еслювати лише при наведенні", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "Відкрив&ати подвійним, виділяти одиночним", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Стандартно", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "Вигляд"
@@ -601,8 +567,8 @@ BEGIN
     DEFPUSHBUTTON "Почати", IDOK, 63, 95, 60, 14
     GROUPBOX "Опції перевірки диску", -1, 7, 6, 179, 40
     PUSHBUTTON "Скасувати", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Виправити помилки файлової системи", 14000, 16, 15, 165, 10
-    AUTOCHECKBOX "&Спробувати відновити погані сектори", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "Виправити помилки файлової системи", 14000, 12, 15, 165, 10
+    AUTOCHECKBOX "&Спробувати відновити погані сектори", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -612,25 +578,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL
 CAPTION "Зміна значка"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
+    LTEXT "Значки в цьому файлі:", -1, 7, 7, 179, 10
     PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT "Виберіть значок зі списку нижче:", -1, 7, 36, 179, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Caution"
+CAPTION "Увага"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "This file could either be used by the operating system or by\n\
-another application. Modifying this file might damage your\n\
-system or make it less functional.\n\n\
-Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
+    LTEXT "Цей файл може використувавтись операційною системою або\n\
+іншою програмою. Зміна цього файлу може пошкодити вашу\n\
+систему або зіпсувати її функціонал.\n\n\
+Ви впевнені, що хочете відкрити цей файл?", IDC_STATIC, 35, 5, 230, 60
     DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14
     PUSHBUTTON "No", IDNO, 180, 55, 50, 14
 END
@@ -683,7 +649,7 @@ BEGIN
 
     /* special folders descriptions */
     IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer."
-    IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations."
+    IDS_FOLDER_OPTIONS_DESCRIPTION "Налаштувати відображення файлів і папок і змінюйте асоціації файлів."
     IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
     IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones."
 
@@ -709,7 +675,7 @@ BEGIN
     IDS_EJECT "Eject"
     IDS_DISCONNECT "Disconnect"
 
-    IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
+    IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'"
     IDS_CREATEFOLDER_CAPTION "Unable to create folder"
     IDS_DELETEITEM_CAPTION "Підтвердження вилучення файлу"
     IDS_DELETEFOLDER_CAPTION "Підтвердження вилучення папки"
@@ -727,8 +693,8 @@ BEGIN
     IDS_FILEOOP_COPYING "Copying..."
     IDS_FILEOOP_MOVING "Moving..."
     IDS_FILEOOP_DELETING "Deleting..."
-    IDS_FILEOOP_FROM_TO "From %1 to %2"
-    IDS_FILEOOP_FROM "From %1"
+    IDS_FILEOOP_FROM_TO "З %1 до %2"
+    IDS_FILEOOP_FROM "З %1"
     IDS_FILEOOP_PREFLIGHT "Preflight"
 
     /* message box strings */
@@ -743,7 +709,7 @@ BEGIN
     IDS_RUNDLG_BROWSE_CAPTION "Огляд"
     IDS_RUNDLG_BROWSE_FILTER "Виконувані Файли (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Мої документи"
     IDS_FAVORITES "Обране"
@@ -779,14 +745,14 @@ BEGIN
     IDS_DRIVE_CDROM "CD Drive"
     IDS_DRIVE_NETWORK "Мережний диск"
     IDS_DRIVE_FLOPPY "3.5 Floppy"
-    IDS_DRIVE_REMOVABLE "Removable Disk"
+    IDS_DRIVE_REMOVABLE "Знімний диск"
     IDS_FS_UNKNOWN "Unknown"
 
     /* Open With */
     IDS_OPEN_WITH "Відкрити за допомогою"
     IDS_OPEN_WITH_CHOOSE "Вибрати програму..."
     IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:"
-    IDS_OPEN_WITH_OTHER "Other Programs:"
+    IDS_OPEN_WITH_OTHER "Інші програми:"
 
     IDS_SHELL_ABOUT_AUTHORS "&Автори"
     IDS_SHELL_ABOUT_BACK "< &Назад"
@@ -829,9 +795,9 @@ BEGIN
     IDS_ICO_FILE "Icon"
     IDS_INI_FILE "Файл налаштувань"
     IDS_LNK_FILE "Ярлик"
-    IDS_NT__FILE "NT DOS32 Configuration File"
-    IDS_PIF_FILE "NT VDM Program Information File"
-    IDS_SCR_FILE "Screen Saver"
+    IDS_NT__FILE "Файл конфігурації NT DOS32"
+    IDS_PIF_FILE "Інформація про програму NT VDM"
+    IDS_SCR_FILE "Заставка"
     IDS_SYS_FILE "Системний файл"
     IDS_VXD_FILE "Драйвер віртуального пристрою"
     IDS_ANY_FILE "%s-file"
@@ -851,7 +817,7 @@ BEGIN
     IDS_DEFAULT_CLUSTER_SIZE "Розмір кластера за замовчуванням"
     IDS_COPY_OF "Копія"
 
-    IDS_SHLEXEC_NOASSOC "Немає програми ReactOS, сконфігурованої для відкриття цього типу файлів."
+    IDS_SHLEXEC_NOASSOC "Немає програм для відкриття цього типу файлів."
 
     IDS_FILE_DETAILS "Подробиці для розширення '%s'"
     IDS_FILE_DETAILSADV "Файли з розширенням '%s' мають тип '%s'. Щоб змінити параметри, які впливатимуть на всі файли '%s', натисніть кнопку 'Додатково'."
@@ -862,29 +828,29 @@ BEGIN
        used in the _File type_ tab of the _Folder Options_ dialog */
     IDS_FILE_EXT_TYPE "%s File"
 
-    IDS_BYTES_FORMAT "bytes"
-    IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
+    IDS_BYTES_FORMAT "байт"
+    IDS_UNKNOWN_APP "Невідома програма"
+    IDS_EXE_DESCRIPTION "Опис:"
 
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
-    IDS_OBJECTS_SELECTED "%d Objects Selected"
+    IDS_OBJECTS_SELECTED "Обрано %d об'єктів"
 
-    IDS_ADVANCED_FOLDER "Files and Folders"
-    IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
-    IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
-    IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders"
+    IDS_ADVANCED_FOLDER "Файли та папки"
+    IDS_ADVANCED_NET_CRAWLER "Автоматично знаходити мережеві папки і принтери"
+    IDS_ADVANCED_FOLDER_SIZE_TIP "Показувати розмір файлу в підказках папки"
+    IDS_ADVANCED_FRIENDLY_TREE "Простий перегляд папок в списку папок провідника"
+    IDS_ADVANCED_WEB_VIEW_BARRICADE "Показувати вміст системних папок"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
-    IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
-    IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails"
+    IDS_ADVANCED_SHOW_FULL_PATH "Показувати повний шлях в заголовку"
+    IDS_ADVANCED_DISABLE_THUMB_CACHE "Не кешувати ескізи"
     IDS_ADVANCED_HIDDEN "Hidden files and folders"
     IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
     IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
     IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
     IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
-    IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
-    IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings"
+    IDS_ADVANCED_DESKTOP_PROCESS "Запускати папки в окремих процесах"
+    IDS_ADVANCED_CLASSIC_VIEW_STATE "Пам'ятати налаштування кожної папки"
     IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon"
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
@@ -893,10 +859,10 @@ BEGIN
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
+    IDS_NEWEXT_SPECIFY_EXT "Ви повинні обрати розширення."
+    IDS_NEWEXT_ALREADY_ASSOC "Розришення %s вже пов'язано з типом файлу %s. Ви хочете відв'язати %s і %s і створити новий тип файлу?"
     IDS_NEWEXT_EXT_IN_USE "Extension is in use"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "Якщо видалити розширення з зареєстрованим файлом, ви не зможете відкривати файли з цим розширенням, двічі клацнувши їх значки.\n\nВи дійсно хочете видалити це розширення?"
+    IDS_FILE_NOT_FOUND "Файд '%s' не знайдено."
 END
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index c9bfb8cad5a..6a1e9ed5a0f 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -1,12 +1,7 @@
-/*
- * PROJECT:     ReactOS Shell32
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/win32/shell32/lang/zh-CN.rc
- * PURPOSE:     Chinese (Simplified) Language Resources
- * TRANSLATORS: 2008 zhangbing <e_zb@21cn.com, ezb@mail.gywb.cn>
-                2011 Elton Chung aka MfldElton <elton328@gmail.com>
-                2017 Luo Yufan <njlyf2011@hotmail.com>
- */
+// LICENSE:   GPL - See COPYING in the top level directory
+// COPYRIGHT: 2008 zhangbing <e_zb@21cn.com ezb@mail.gywb.cn>
+//            2011 Elton Chung (MfldElton) <elton328@gmail.com>
+//            2017 Luke Luo <njlyf2011@hotmail.com>
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
@@ -20,7 +15,7 @@ BEGIN
     POPUP "排列图标(&I)", FCIDM_SHVIEW_ARRANGE
     BEGIN
         MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE
+        MENUITEM "自动排列(&A)", FCIDM_SHVIEW_AUTOARRANGE
     END
 END
 
@@ -40,7 +35,7 @@ BEGIN
         POPUP "排列图标(&I)", FCIDM_SHVIEW_ARRANGE
         BEGIN
             MENUITEM "", -1, MFT_SEPARATOR
-            MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE
+            MENUITEM "自动排列(&A)", FCIDM_SHVIEW_AUTOARRANGE
         END
         MENUITEM "刷新", FCIDM_SHVIEW_REFRESH
         MENUITEM "", -1, MFT_SEPARATOR
@@ -72,7 +67,7 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "剪切(&U)", IDM_CUT
+        MENUITEM "剪切(&T)", IDM_CUT
         MENUITEM "复制(&C)", IDM_COPY
         MENUITEM SEPARATOR
         MENUITEM "创建快捷方式(&L)", IDM_CREATELINK
@@ -87,11 +82,11 @@ IDM_DRAGFILE MENU
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "&Copy here", IDM_COPYHERE
-        MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "复制到此处(&C)", IDM_COPYHERE
+        MENUITEM "移动到此处(&M)", IDM_MOVEHERE
+        MENUITEM "在此创建快捷方式(&S)", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "取消", 0
     END
 END
 
@@ -143,7 +138,7 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "版权所有 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS 团队\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
@@ -151,7 +146,7 @@ BEGIN
     LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
     LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
     LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
-    LTEXT "已安装的物理内存：", IDC_STATIC, 35, 152, 130, 10
+    LTEXT "已安装的物理内存:", IDC_STATIC, 35, 152, 130, 10
     LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10
     DEFPUSHBUTTON "确定", IDOK, 220, 178, 50, 14
     PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14
@@ -161,7 +156,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "宋体"
 BEGIN
-    LTEXT "为你带来 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10
+    LTEXT "带给您 ReactOS 的是:", IDC_STATIC, 0, 0, 180, 10
     LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75
 END
 
@@ -171,9 +166,9 @@ CAPTION "运行"
 FONT 9, "宋体"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "输入程序，目录，文件或者 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 182, 18
+    LTEXT "输入程序、目录、文件或 Internet 资源名称。", 12289, 36, 11, 182, 18
     LTEXT "打开(&O):", 12305, 7, 39, 32, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 42, 37, 178, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "确定", IDOK, 62, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 116, 70, 50, 14, WS_TABSTOP
     PUSHBUTTON "浏览(&B)...", 12288, 170, 70, 50, 14, WS_TABSTOP
@@ -187,9 +182,9 @@ BEGIN
     ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
     EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "目标类型：", 14004, 8, 38, 68, 10
+    LTEXT "目标类型:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "目标位置：", 14006, 8, 55, 68, 10
+    LTEXT "目标位置:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "目标(&T):", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
@@ -215,7 +210,7 @@ BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
     LTEXT "为这个快捷方式选择您想要的高级属性。", -1, 5, 30, 210, 10
     CHECKBOX "以其他用户身份运行", 14000, 25, 50, 150, 10
-    LTEXT "此选项允许您以另一用户身份运行此快捷方式，或继续以您自己的身份运行以保护您的计算机和数据不受未授权程序的破坏。", -1, 50, 60, 175, 40
+    LTEXT "此选项允许您以其他用户身份运行此快捷方式，或者在保护计算机和数据免受未经授权的程序活动的同时继续自行运行。", -1, 50, 60, 175, 40
     CHECKBOX "在单独的内存空间中运行", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE
     PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE
@@ -228,22 +223,22 @@ FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "文件类型：", 14004, 8, 40, 55, 10
+    LTEXT "文件类型:", 14004, 8, 40, 55, 10
     CONTROL "文件夹", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     LTEXT "地点:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "大小:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "在磁盘上的大小：", 140101, 8, 88, 55, 10
+    LTEXT "占用空间:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "包含：", 14026, 8, 104, 55, 10
+    LTEXT "包含:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "创建：", 14014, 8, 128, 55, 10
+    LTEXT "创建:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "属性：", 14020, 8, 152, 46, 10
+    LTEXT "属性:", 14020, 8, 152, 46, 10
     AUTOCHECKBOX "只读(&R)", 14021, 58, 151, 70, 10
     AUTOCHECKBOX "隐藏(&H)", 14022, 126, 151, 70, 10
     AUTOCHECKBOX "存档(&A)", 14023, 181, 151, 70, 10
@@ -258,7 +253,7 @@ BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "文件类型：", 14004, 8, 35, 50, 10
+    LTEXT "文件类型:", 14004, 8, 35, 50, 10
     CONTROL "文件", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
     LTEXT "打开方式:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
@@ -269,21 +264,21 @@ BEGIN
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "大小:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "在磁盘上的大小：", 140112, 8, 107, 55, 10
+    LTEXT "占用空间:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "创建：", 14014, 8, 131, 45, 10
+    LTEXT "创建:", 14014, 8, 131, 45, 10
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "修订日期：", 14016, 8, 147, 45, 10
+    LTEXT "修改日期:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "访问：", 14018, 8, 163, 45, 10
+    LTEXT "访问:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "属性：", 14020, 8, 189, 45, 10
+    LTEXT "属性:", 14020, 8, 189, 45, 10
     AUTOCHECKBOX "只读(&R)", 14021, 58, 188, 67, 10
     AUTOCHECKBOX "隐藏(&H)", 14022, 126, 188, 50, 10
     AUTOCHECKBOX "存档(&A)", 14023, 181, 188, 49, 10
-    PUSHBUTTON "高级...(&A)", 14028, 180, 185, 50, 15, WS_TABSTOP
+    PUSHBUTTON "高级...(&D)", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
 
 IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
@@ -291,34 +286,34 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "版本"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
-    LTEXT "文件版本: ", 14000, 10, 10, 55, 10
+    LTEXT "文件版本:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "描述: ", 14002, 10, 27, 45, 10
+    LTEXT "描述:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "版权: ", 14004, 10, 46, 66, 10
+    LTEXT "版权:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "其他版本信息: ", 14006, 6, 70, 222, 115
-    LTEXT "项目名称: ", 14007, 13, 82, 50, 10
-    LTEXT "值: ", 14008, 112, 82, 45, 10
+    GROUPBOX "其他版本信息", 14006, 6, 70, 222, 115
+    LTEXT "项目名称:", 14007, 13, 82, 50, 10
+    LTEXT "值:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "常规"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "类型：", -1, 8, 38, 95, 10
+    LTEXT "类型:", -1, 8, 38, 95, 10
     EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "文件系统：", -1, 8, 51, 95, 10
+    LTEXT "文件系统:", -1, 8, 51, 95, 10
     EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
-    LTEXT "已用空间：", -1, 25, 69, 80, 10
+    LTEXT "已用空间:", -1, 25, 69, 80, 10
     EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10
@@ -326,18 +321,14 @@ BEGIN
     EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "容量：", -1, 25, 103, 80, 10
+    LTEXT "容量:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "磁盘 %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "磁盘清理(&D)", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "磁盘 %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "工具"
 FONT 9, "宋体", 0, 0, 0x0
@@ -346,17 +337,9 @@ BEGIN
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
     LTEXT "该选项将检查卷\n中的错误。", -1, 40, 25, 160, 20
     PUSHBUTTON "开始检查...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "碎片整理", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "该选项将整理卷中的文件。", -1, 40, 85, 160, 20
-    PUSHBUTTON "开始整理...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "备份", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "该选项将备份卷中的文件。", -1, 40, 150, 160, 20
-    PUSHBUTTON "开始备份...", 14002, 130, 170, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "硬件"
 FONT 9, "宋体", 0, 0, 0x0
@@ -373,10 +356,10 @@ BEGIN
     LTEXT "保护我的计算机和数据不受未授权程序的活动影响", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "这个选项可以保护您的计算机或个人数据不受病毒损害，但是选择这项可能会引起程序工作不正确。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
     CHECKBOX "下列用户:", 14002, 10, 100, 90, 10
-    LTEXT "用户名：", -1, 20, 118, 54, 10
+    LTEXT "用户名:", -1, 20, 118, 54, 10
     COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
-    LTEXT "密码：", -1, 20, 143, 53, 10
+    LTEXT "密码:", -1, 20, 143, 53, 10
     EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
     PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
     PUSHBUTTON "确定", 14007, 57, 170, 60, 14, WS_TABSTOP
@@ -404,37 +387,15 @@ FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
     LTEXT "选择您想要用来打开此文件的程序:", -1, 44, 12, 211, 10
-    LTEXT "文件:    ", 14001, 44, 25, 188, 20
+    LTEXT "文件:   ", 14001, 44, 25, 188, 20
     GROUPBOX "程序(&P)", -1, 7, 42, 249, 187
     CONTROL "程序", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "始终使用选择的程序打开这种文件(&A)", 14003, 20, 193, 225, 10
-    PUSHBUTTON "浏览...(&B)", 14004, 198, 207, 50, 14
+    AUTOCHECKBOX "始终使用选择的程序打开这种文件(&A)", 14003, 16, 193, 232, 10
+    PUSHBUTTON "浏览...(&B)", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "确定", IDOK, 150, 236, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14
 END
 
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "常规"
-FONT 9, "宋体", 0, 0, 0x0
-BEGIN
-    GROUPBOX "任务", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "在文件夹中显示常见任务(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "使用 ReactOS 传统风格的文件夹(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "浏览文件夹", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "在同一窗口中打开每个文件夹(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "在不同窗口中打开不同的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "打开项目的方式", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "通过单击打开项目(指向时选定)(&s)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "根据浏览器设置给图标标题加下划线(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "仅当指向图标标题时加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "双击要打开的项目(单击时选定)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "还原为默认值(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP
-END
-
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
 CAPTION "视图"
@@ -445,7 +406,7 @@ BEGIN
     LTEXT "您可以应用您正在使用此文件夹的\n所有文件夹的视图(如详细信息或平铺)。", -1, 60, 20, 180, 20
     PUSHBUTTON "应用到所有文件夹(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "重置所有文件夹(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP
-    LTEXT "高级设置：", -1, 7, 80, 100, 10
+    LTEXT "高级设置:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "还原默认值(&D)", 14004, 177, 215, 80, 14, WS_TABSTOP
 END
@@ -459,10 +420,10 @@ BEGIN
     CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
     PUSHBUTTON "新建(&N)", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP
     PUSHBUTTON "删除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
-    GROUPBOX "'%S' 扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
+    GROUPBOX "'%s' 扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
     LTEXT "打开方式:", -1, 12, 140, 40, 10
     //ICON
-    LTEXT "应用程序名称", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
+    LTEXT "程序名称", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
     PUSHBUTTON "更改...(&C)", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
     LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30
     PUSHBUTTON "高级(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
@@ -478,13 +439,13 @@ BEGIN
     PUSHBUTTON "否(&N)", IDNO, 150, 122, 60, 14
     PUSHBUTTON "取消", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "此文件夹已包含名为 '%2' 的文件。", 12291, 44, 10, 231, 22, SS_NOPREFIX
-    LTEXT "此文件夹已包含一个名为 '%2' 的只读文件。", 12292, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "此文件夹已包含一个名为 '%2' 的系统文件。", 12293, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "此文件夹已包含名为'%2'的文件。", 12291, 44, 10, 231, 22, SS_NOPREFIX
+    LTEXT "此文件夹已包含一个名为'%2'的只读文件。", 12292, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "此文件夹已包含一个名为'%2'的系统文件。", 12293, 41, 10, 222, 22, SS_NOPREFIX
     LTEXT "你想要替换现有文件吗", -1, 44, 35, 228, 10, SS_NOPREFIX
     LTEXT "(未知的日期和大小)", 12302, 79, 51, 198, 20, SS_NOPREFIX
     ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
-    LTEXT "用这个吗？", -1, 44, 75, 228, 10, SS_NOPREFIX
+    LTEXT "用这个吗?", -1, 44, 75, 228, 10, SS_NOPREFIX
     LTEXT "(未知的日期和大小)", 12303, 79, 91, 198, 20, SS_NOPREFIX
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
@@ -516,7 +477,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLIN
 CAPTION "自动播放"
 FONT 9, "宋体"
 BEGIN
-    LTEXT "&选择一个内容类型，然后选择操作电脑来自动执行在此设备中使用该类型的时候(&S):", 1000, 7, 7, 215, 20
+    LTEXT "选择一个内容类型，然后选择操作电脑来自动执行在此设备中使用该类型的时候(&S):", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
     GROUPBOX "行动", -1, 7, 45, 212, 146
     AUTORADIOBUTTON "选择要执行的操作(&P):", 1005, 14, 54, 202, 10, WS_GROUP
@@ -527,12 +488,12 @@ END
 
 IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "混合的内容"
+CAPTION "混合内容"
 FONT 9, "宋体"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
     LTEXT "此磁盘或设备包含多个类型的内容。", 1001, 32, 7, 191, 20
-    LTEXT "你想要 ReactOS 做什么？", 1002, 32, 31, 188, 8
+    LTEXT "您想要 ReactOS 做什么?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "确定", IDOK, 96, 186, 60, 14
     PUSHBUTTON "取消", IDCANCEL, 160, 186, 60, 14
@@ -540,14 +501,14 @@ END
 
 IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "混合的内容"
+CAPTION "混合内容"
 FONT 9, "宋体"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "每次您插入盘或连接的设备与此类型的文件，ReactOS 可以执行相同的操作：", 1001, 30, 7, 193, 20
+    LTEXT "每次您插入盘或连接的设备与此类型的文件，ReactOS 可以执行相同的操作:", 1001, 30, 7, 193, 20
     ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
     EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "你想要 ReactOS 做什么？", 1002, 32, 41, 190, 8
+    LTEXT "您想要 ReactOS 做什么?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
     AUTOCHECKBOX "始终执行选择的操作。", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "确定", IDOK, 96, 185, 60, 14
@@ -561,7 +522,7 @@ FONT 9, "宋体"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
     LTEXT "每次您连接此设备，ReactOS 可以执行相同的操作。", 1001, 32, 7, 190, 22
-    LTEXT "你想要 ReactOS 做什么？(&W)", 1002, 32, 31, 190, 8
+    LTEXT "您想要 ReactOS 做什么?(&W)", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
     AUTOCHECKBOX "总是执行选定的操作(&A)", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "确定", IDOK, 94, 160, 60, 14
@@ -574,7 +535,7 @@ CAPTION "关闭 ReactOS"
 FONT 9, "宋体"
 BEGIN
     ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
-    LTEXT "你想让计算机做什么？", -1, 39, 7, 167, 10
+    LTEXT "您想让计算机做什么?", -1, 39, 7, 167, 10
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
     LTEXT "维护会话，计算机数据仍然保持在内存中。当你按下一个键或移动鼠标将唤醒这台计算机。", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "确定", 1, 7, 82, 60, 14, WS_GROUP
@@ -612,7 +573,7 @@ BEGIN
     GROUPBOX "请检查磁盘选项", -1, 7, 6, 179, 40
     PUSHBUTTON "取消", IDCANCEL, 128, 95, 60, 14
     AUTOCHECKBOX "自动修复文件系统错误", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "扫描并试图恢复坏扇区(&S)", 14001, 16, 30, 165, 10
+    AUTOCHECKBOX "扫描并试图恢复坏扇区(&S)", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
@@ -626,7 +587,7 @@ BEGIN
     PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
     LTEXT "从以下列表选择一个图标:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "确定", IDOK, 81, 179, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 135, 179, 50, 14
 END
@@ -637,24 +598,24 @@ CAPTION "警告"
 FONT 9, "宋体"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "由操作系统或另一个应用程序，也可以使用此文件。\n修改此文件可能会损坏您的系统，\n或者使它的功能变弱。\n\n\
-你确定你想要打开此文件？", IDC_STATIC, 35, 5, 230, 60
+    LTEXT "操作系统或其他应用程序可能会使用此文件。\n修改此文件可能会损坏您的系统，\n或者使它的功能不正常。\n\n\
+你确定您想要打开此文件?", IDC_STATIC, 35, 5, 230, 60
     DEFPUSHBUTTON "是", IDYES, 125, 55, 50, 14
     PUSHBUTTON "否", IDNO, 180, 55, 50, 14
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "新建扩展名"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 9, "宋体"
 BEGIN
-    LTEXT "&File Extension:", -1, 10, 10, 85, 14
+    LTEXT "文件扩展名(&F):", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
+    PUSHBUTTON "<< 高级(&V)", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    LTEXT "相关的文件类型(&A):", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -696,7 +657,7 @@ BEGIN
     IDS_PRINTERS_DESCRIPTION "显示安装的打印机和传真打印机，并帮助您添加新的。"
 
     /* About shell dialog version string */
-    IDS_ABOUT_VERSION_STRING "版本 %S (%S)"
+    IDS_ABOUT_VERSION_STRING "版本 %S(%S)"
 
     /* context menus */
     IDS_VIEW_LARGE "大图标(&G)"
@@ -717,20 +678,20 @@ BEGIN
     IDS_EJECT "弹出"
     IDS_DISCONNECT "断开"
 
-    IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'"
+    IDS_CREATEFOLDER_DENIED "无法创建文件夹'%1'"
     IDS_CREATEFOLDER_CAPTION "无法创建文件夹"
     IDS_DELETEITEM_CAPTION "确认文件删除"
     IDS_DELETEFOLDER_CAPTION "确认文件夹删除"
-    IDS_DELETEITEM_TEXT "确实要删除 '%1'?"
-    IDS_DELETEMULTIPLE_TEXT "确实要删除这 '%1' 项?"
+    IDS_DELETEITEM_TEXT "确实要删除'%1'?"
+    IDS_DELETEMULTIPLE_TEXT "确实要删除这'%1'项?"
     IDS_DELETESELECTED_TEXT "确实要删除所选的项目吗?"
-    IDS_TRASHITEM_TEXT "你确定你想要移动 '%1' 到回收站？"
-    IDS_TRASHFOLDER_TEXT "确定你想要将 '%1' 和它的所有内容发送到回收站吗?"
-    IDS_TRASHMULTIPLE_TEXT "确实要将这 '%1' 项发送到回收站吗?"
-    IDS_CANTTRASH_TEXT "项目 '%1' 不能发送到回收站。你想要彻底删除它吗？"
-    IDS_OVERWRITEFILE_TEXT "此文件夹已包含名为 '%1' 的文件。\n\n你想要替换它吗？"
+    IDS_TRASHITEM_TEXT "您确定想移动'%1'到回收站?"
+    IDS_TRASHFOLDER_TEXT "您确定想要将'%1'和它的所有内容发送到回收站吗?"
+    IDS_TRASHMULTIPLE_TEXT "确实要将这'%1'项发送到回收站吗?"
+    IDS_CANTTRASH_TEXT "项目'%1'不能发送到回收站。您想要彻底删除它吗?"
+    IDS_OVERWRITEFILE_TEXT "此文件夹已包含名为'%1'的文件。\n\n您想要替换它吗?"
     IDS_OVERWRITEFILE_CAPTION "确认文件覆盖"
-    IDS_OVERWRITEFOLDER_TEXT "此文件夹已包含一个名为 '%1' 文件夹。\n\n如果目标文件夹中的文件具有相同的名称作为\n所选文件夹中的文件，他们将被替换。 你仍然想要移动或\n复制该文件夹吗？"
+    IDS_OVERWRITEFOLDER_TEXT "此文件夹已包含一个名为'%1'文件夹。\n\n如果目标文件夹中的文件具有相同的名称作为\n所选文件夹中的文件，他们将被替换。 你仍然想要移动或\n复制该文件夹吗?"
 
     IDS_FILEOOP_COPYING "正在复制..."
     IDS_FILEOOP_MOVING "正在移动..."
@@ -746,12 +707,12 @@ BEGIN
     IDS_SHUTDOWN_PROMPT "是否关闭系统?"
 
     /* Run File dialog */
-    IDS_RUNDLG_ERROR "无法显示运行文件对话框 (内部错误)"
-    IDS_RUNDLG_BROWSE_ERROR "无法显示浏览对话框 (内部错误)"
+    IDS_RUNDLG_ERROR "无法显示运行文件对话框(内部错误)"
+    IDS_RUNDLG_BROWSE_ERROR "无法显示浏览对话框(内部错误)"
     IDS_RUNDLG_BROWSE_CAPTION "浏览"
     IDS_RUNDLG_BROWSE_FILTER "可执行文件 (*.exe)\0*.exe\0所有文件 (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     /* ATTENTION: If there is no special situation, please DO NOT change
     English folder names into Chinese, or it may cause problems in the system. */
     IDS_PROGRAMS "「开始」菜单\\程序"
@@ -795,8 +756,8 @@ BEGIN
     /* Open With */
     IDS_OPEN_WITH "打开方式"
     IDS_OPEN_WITH_CHOOSE "选择程序"
-    IDS_OPEN_WITH_RECOMMENDED "推荐的程序："
-    IDS_OPEN_WITH_OTHER "其他程序："
+    IDS_OPEN_WITH_RECOMMENDED "推荐的程序:"
+    IDS_OPEN_WITH_OTHER "其他程序:"
 
     IDS_SHELL_ABOUT_AUTHORS "作者(&A)"
     IDS_SHELL_ABOUT_BACK "< 返回(&B)"
@@ -811,11 +772,11 @@ BEGIN
     IDS_PICK_ICON_FILTER "图标文件 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
     IDS_OPEN_WITH_FILTER "可执行文件 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
 
-    IDS_CANTLOCKVOLUME "无法锁定卷 (错误代码: %lu)."
-    IDS_CANTDISMOUNTVOLUME "无法卸载卷 (错误代码: %lu)."
-    IDS_CANTEJECTMEDIA "无法弹出媒体 (错误代码: %lu)."
-    IDS_CANTSHOWPROPERTIES "无法显示属性 (错误代码: %lu)."
-    IDS_CANTDISCONNECT "无法断开连接 (错误代码: %lu)."
+    IDS_CANTLOCKVOLUME "无法锁定卷(错误代码:%lu)."
+    IDS_CANTDISMOUNTVOLUME "无法卸载卷(错误代码:%lu)."
+    IDS_CANTEJECTMEDIA "无法弹出媒体(错误代码:%lu)."
+    IDS_CANTSHOWPROPERTIES "无法显示属性(错误代码:%lu)."
+    IDS_CANTDISCONNECT "无法断开连接(错误代码:%lu)."
 
     /* Friendly File Type Names */
     IDS_DIRECTORY "文件夹"
@@ -824,14 +785,14 @@ BEGIN
     IDS_COM_FILE "DOS 应用程序"
     IDS_CPL_FILE "控制面板项"
     IDS_CUR_FILE "光标"
-    IDS_DB__FILE "Database File"
+    IDS_DB__FILE "数据库文件"
     IDS_DLL_FILE "应用程序扩展"
     IDS_DRV_FILE "设备驱动程序"
-    IDS_EFI_FILE "Extensible Firmware Interface Executable"
+    IDS_EFI_FILE "可扩展固件接口(EFI) 可执行文件"
     IDS_EXE_FILE "应用程序"
-    IDS_NLS_FILE "National Language Support File"
-    IDS_OCX_FILE "ActiveX Control"
-    IDS_TLB_FILE "Type Library"
+    IDS_NLS_FILE "国家语言支持文件"
+    IDS_OCX_FILE "ActiveX 控件"
+    IDS_TLB_FILE "类型库"
     IDS_FON_FILE "字体文件"
     IDS_TTF_FILE "TrueType 字体文件"
     IDS_OTF_FILE "OpenType 字体文件"
@@ -839,12 +800,12 @@ BEGIN
     IDS_ICO_FILE "图标"
     IDS_INI_FILE "配置设置"
     IDS_LNK_FILE "快捷方式"
-    IDS_NT__FILE "NT DOS32 Configuration File"
+    IDS_NT__FILE "NT DOS32 配置文件"
     IDS_PIF_FILE "NT VDM 程序信息文件"
     IDS_SCR_FILE "屏幕保护程序"
     IDS_SYS_FILE "系统文件"
     IDS_VXD_FILE "虚拟设备驱动程序"
-    IDS_ANY_FILE "%s-file"
+    IDS_ANY_FILE "%s-文件"
 
     IDS_OPEN_VERB "打开"
     IDS_EXPLORE_VERB "浏览"
@@ -863,8 +824,8 @@ BEGIN
 
     IDS_SHLEXEC_NOASSOC "没有为 ReactOS 配置关联的程序以打开这种类型的文件。"
 
-    IDS_FILE_DETAILS "'%S' 扩展名的详细信息"
-    IDS_FILE_DETAILSADV "文件扩展名为 '%s' 的类型 '%s'。若要更改会影响所有的 '%s' 文件的设置，请单击高级。"
+    IDS_FILE_DETAILS "'%s'扩展名的详细信息"
+    IDS_FILE_DETAILSADV "文件扩展名为'%s'的类型'%s'。若要更改会影响所有的'%s'文件的设置，请单击高级。"
     IDS_FILE_TYPES "文件类型"
     IDS_COLUMN_EXTENSION "扩展名"
 
@@ -874,7 +835,7 @@ BEGIN
 
     IDS_BYTES_FORMAT "字节"
     IDS_UNKNOWN_APP "未知应用程序"
-    IDS_EXE_DESCRIPTION "描述："
+    IDS_EXE_DESCRIPTION "描述:"
 
     IDS_MENU_EMPTY "(空)"
     IDS_OBJECTS "%d 个对象"
@@ -882,9 +843,9 @@ BEGIN
 
     IDS_ADVANCED_FOLDER "文件和文件夹"
     IDS_ADVANCED_NET_CRAWLER "自动搜索网络文件夹和打印机"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "在文件夹提示中显示文件大小信息"
+    IDS_ADVANCED_FOLDER_SIZE_TIP "在文件夹提示中显示大小信息"
     IDS_ADVANCED_FRIENDLY_TREE "在资源管理器文件夹列表中显示简单文件夹查看"
-    IDS_ADVANCED_WEB_VIEW_BARRICADE "显示系统文件夹的内容"
+    IDS_ADVANCED_WEB_VIEW_BARRICADE "显示系统文件夹内容"
     IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "在地址栏中显示完整路径"
     IDS_ADVANCED_SHOW_FULL_PATH "在标题栏中显示完整路径"
     IDS_ADVANCED_DISABLE_THUMB_CACHE "不缓存缩略图"
@@ -892,21 +853,21 @@ BEGIN
     IDS_ADVANCED_DONT_SHOW_HIDDEN "不显示隐藏的文件和文件夹"
     IDS_ADVANCED_SHOW_HIDDEN "显示隐藏的文件和文件夹"
     IDS_ADVANCED_HIDE_FILE_EXT "隐藏已知文件类型的扩展名"
-    IDS_ADVANCED_SUPER_HIDDEN "隐藏受保护的操作系统文件 (推荐)"
+    IDS_ADVANCED_SUPER_HIDDEN "隐藏受保护的操作系统文件(推荐)"
     IDS_ADVANCED_DESKTOP_PROCESS "在单独的进程中打开文件夹窗口"
     IDS_ADVANCED_CLASSIC_VIEW_STATE "记住每个文件夹的视图设置"
     IDS_ADVANCED_PERSIST_BROWSERS "在登录时还原上一个文件夹窗口"
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的电脑中显示控制面板"
     IDS_ADVANCED_SHOW_COMP_COLOR "用彩色显示加密或压缩的 NTFS 文件"
-    IDS_ADVANCED_SHOW_INFO_TIP "鼠标指向文件夹和桌面项时显示提示信息"
+    IDS_ADVANCED_SHOW_INFO_TIP "显示文件夹和桌面项目的弹出描述"
 
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
-    IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
-    IDS_NEWEXT_EXT_IN_USE "Extension is in use"
+    IDS_NEWEXT_ADVANCED_LEFT "<< 高级(&V)"
+    IDS_NEWEXT_ADVANCED_RIGHT "高级(&V) >>"
+    IDS_NEWEXT_NEW "<新建>"
+    IDS_NEWEXT_SPECIFY_EXT "您必须指定一个扩展名。"
+    IDS_NEWEXT_ALREADY_ASSOC "扩展名 %s 已经与文件类型 %s 关联。 是否要将 %s 与 %s 取消关联并为其创建新的文件类型?"
+    IDS_NEWEXT_EXT_IN_USE "扩展名正在被使用"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "如果删除已注册的文件扩展名，则无法通过双击其图标来打开具有此扩展名的文件。\n\n您确定要删除此扩展名吗?"
+    IDS_FILE_NOT_FOUND "无法找到文件'%s'。"
 END
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 43028e60ec3..f80b7adcdb3 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -1,10 +1,5 @@
-/*
- * PROJECT:    ReactOS Shell32
- * LICENSE:    GPL - See COPYING in the top level directory
- * FILE:       dll/win32/shell32/lang/zh-TW.rc
- * PURPOSE:    Chinese (Traditional) Language Resources
- * TRANSLATOR: Elton Chung aka MfldElton <elton328@gmail.com>
- */
+// LICENSE:   GPL - See COPYING in the top level directory
+// COPYRIGHT: Elton Chung (MfldElton) <elton328@gmail.com>
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
@@ -55,13 +50,13 @@ BEGIN
     MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT
     MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY
     MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT
-    MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK
+    MENUITEM "貼上捷徑(&S)", FCIDM_SHVIEW_INSERTLINK
     MENUITEM SEPARATOR
-    MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO
-    MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO
+    MENUITEM "複製到資料夾...(&F)", FCIDM_SHVIEW_COPYTO
+    MENUITEM "移動到資料夾...(&V)", FCIDM_SHVIEW_MOVETO
     MENUITEM SEPARATOR
-    MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL
-    MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION
+    MENUITEM "全選(&A)\tCtrl+A", FCIDM_SHVIEW_SELECTALL
+    MENUITEM "反選(&I)", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -70,14 +65,14 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
+        MENUITEM "Cu&t", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
+        MENUITEM "建立捷徑(&L)", IDM_CREATELINK
+        MENUITEM "刪除(&D)", IDM_DELETE
         MENUITEM "&Rename", IDM_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "內容(&P)", IDM_PROPERTIES
     END
 END
 
@@ -85,21 +80,21 @@ IDM_DRAGFILE MENU
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "&Copy here", IDM_COPYHERE
-        MENUITEM "&Move here", IDM_MOVEHERE
-        MENUITEM "Create &shortcuts here", IDM_LINKHERE
+        MENUITEM "複製到這裡(&C)", IDM_COPYHERE
+        MENUITEM "移動到這裡(&M)", IDM_MOVEHERE
+        MENUITEM "在這裡建立捷徑(&S)", IDM_LINKHERE
         MENUITEM SEPARATOR
-        MENUITEM "Cancel", 0
+        MENUITEM "取消", 0
     END
 END
 
 IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
+CAPTION "瀏覽資料夾"
 FONT 9, "新細明體"
 BEGIN
     DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "取消", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24
     LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120
@@ -107,17 +102,17 @@ END
 
 IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse for Folder"
+CAPTION "瀏覽資料夾"
 FONT 9, "新細明體"
 BEGIN
     LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24
     LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12
-    LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
+    LTEXT "資料夾:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
     CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
     EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "建立新資料夾(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
 END
 
 IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90
@@ -126,9 +121,9 @@ CAPTION "訊息"
 FONT 9, "新細明體"
 BEGIN
     DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Yes to &all", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "全部(&A)", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP
     PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "取消(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
     ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16
     LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0
 END
@@ -141,11 +136,11 @@ BEGIN
     ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20
     LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10
     LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10
-    LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10
+    LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10
     LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10
     LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10
     LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20
-    LTEXT "此版本是授權予:", IDC_STATIC, 35, 115, 180, 10
+    LTEXT "此版本授權予:", IDC_STATIC, 35, 115, 180, 10
     LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10
     LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10
     LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ
@@ -159,424 +154,390 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10
+    LTEXT "帶給您 ReactOS 的是:", IDC_STATIC, 0, 0, 180, 10
     LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75
 END
 
 IDD_RUN DIALOGEX 0, 0, 227, 95
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Run"
+CAPTION "執行"
 FONT 9, "新細明體"
 BEGIN
     ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE
-    LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18
+    LTEXT "請輸入程式、資料夾、檔案或 Internet 資源的名稱。", 12289, 36, 11, 182, 18
     LTEXT "&Open:", 12305, 7, 39, 24, 10
-    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100
+    CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
     DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
-    PUSHBUTTON "&Browse...", 12288, 160, 70, 59, 14, WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 98, 70, 59, 14, WS_TABSTOP
+    PUSHBUTTON "瀏覽(&B)...", 12288, 160, 70, 59, 14, WS_TABSTOP
 END
 
 IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Shortcut"
+CAPTION "捷徑"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE
     EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Target type:", 14004, 8, 38, 68, 10
+    LTEXT "目標類型:", 14004, 8, 38, 68, 10
     EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Target location:", 14006, 8, 55, 68, 10
+    LTEXT "目標位置:", 14006, 8, 55, 68, 10
     EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Target:", 14008, 8, 71, 68, 10
+    LTEXT "目標(&T):", 14008, 8, 71, 68, 10
     EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL
     LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "&Start in:", 14010, 8, 98, 68, 10
+    LTEXT "開始位置(&S):", 14010, 8, 98, 68, 10
     EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL
-    LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10
+    LTEXT "快速鍵(&K):", 14014, 8, 117, 68, 10
     CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14
     LTEXT "&Run:", 14016, 8, 136, 68, 10
     COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
-    LTEXT "C&omment:", 14018, 8, 154, 68, 10
+    LTEXT "註解(&O):", 14018, 8, 154, 68, 10
     EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL
-    PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT
-    PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "尋找目標(&F)...", 14020, 9, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "變更圖示(&C)...", 14021, 84, 172, 70, 14, ES_LEFT
+    PUSHBUTTON "進階(&D)...", 14022, 159, 172, 70, 14, ES_LEFT
 END
 
 IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Extended Properties"
+CAPTION "進階內容"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON
-    LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10
-    CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10
-    LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40
-    CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED
+    LTEXT "為這個捷徑選擇所需的高級內容。", -1, 5, 30, 210, 10
+    CHECKBOX "以不同的身分執行", 14000, 25, 50, 150, 10
+    LTEXT "這個選項允許您以其他用戶身份執行這個捷徑，或在保護電腦和數據免受未經授權的程式活動的同時繼續自行執行。", -1, 50, 60, 175, 40
+    CHECKBOX "在獨立的記憶體空間中執行", 14001, 25, 100, 150, 10, WS_DISABLED
     PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
+CAPTION "一般"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT
-    LTEXT "Type of file:", 14004, 8, 40, 55, 10
-    CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
+    LTEXT "檔案類型:", 14004, 8, 40, 55, 10
+    CONTROL "資料夾", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10
     LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 56, 55, 10
+    LTEXT "位置:", 14008, 8, 56, 55, 10
     EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 72, 55, 10
+    LTEXT "大小:", 14010, 8, 72, 55, 10
     EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Size on disk:", 140101, 8, 88, 55, 10
+    LTEXT "在磁碟上的大小:", 140101, 8, 88, 55, 10
     EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Contains:", 14026, 8, 104, 55, 10
+    LTEXT "包含:", 14026, 8, 104, 55, 10
     EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 128, 55, 10
+    LTEXT "建立日期:", 14014, 8, 128, 55, 10
     EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Attributes:", 14020, 8, 152, 46, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 151, 70, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 151, 70, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 151, 70, 10
-    PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "屬性:", 14020, 8, 152, 46, 10
+    AUTOCHECKBOX "唯讀(&R)", 14021, 58, 151, 70, 10
+    AUTOCHECKBOX "隱藏(&H)", 14022, 126, 151, 70, 10
+    AUTOCHECKBOX "封存(&A)", 14023, 181, 151, 70, 10
+    PUSHBUTTON "進階(&D)...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "General"
+CAPTION "一般"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE
     EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP
     LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type of file:", 14004, 8, 35, 50, 10
-    CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
-    LTEXT "Opens with:", 14006, 8, 53, 50, 10
+    LTEXT "檔案類型:", 14004, 8, 35, 50, 10
+    CONTROL "檔案", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10
+    LTEXT "開啟檔案:", 14006, 8, 53, 50, 10
     ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE
-    PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "更改(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Location:", 14008, 8, 75, 45, 10
+    LTEXT "位置:", 14008, 8, 75, 45, 10
     EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
-    LTEXT "Size:", 14010, 8, 91, 45, 10
+    LTEXT "大小:", 14010, 8, 91, 45, 10
     EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Size on disk:", 140112, 8, 107, 55, 10
+    LTEXT "在磁碟上的大小:", 140112, 8, 107, 55, 10
     EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Created:", 14014, 8, 131, 45, 10
+    LTEXT "建立日期:", 14014, 8, 131, 45, 10
     EDITTEXT 14015, 58, 131, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Modified:", 14016, 8, 147, 45, 10
+    LTEXT "修改日期:", 14016, 8, 147, 45, 10
     EDITTEXT 14017, 58, 147, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Accessed:", 14018, 8, 163, 45, 10
+    LTEXT "存取日期:", 14018, 8, 163, 45, 10
     EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Attributes:", 14020, 8, 189, 45, 10
-    AUTOCHECKBOX "&Read-only", 14021, 58, 188, 67, 10
-    AUTOCHECKBOX "&Hidden", 14022, 126, 188, 50, 10
-    AUTOCHECKBOX "&Archive", 14023, 181, 188, 49, 10
-    PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP
+    LTEXT "屬性:", 14020, 8, 189, 45, 10
+    AUTOCHECKBOX "唯讀(&R)", 14021, 58, 188, 67, 10
+    AUTOCHECKBOX "隱藏(&H)", 14022, 126, 188, 50, 10
+    AUTOCHECKBOX "封存(&A)", 14023, 181, 188, 49, 10
+    PUSHBUTTON "進階(&D)...", 14028, 180, 185, 50, 15, WS_TABSTOP
 END
 
 IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Version"
+CAPTION "版本"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    LTEXT "File version: ", 14000, 10, 10, 55, 10
+    LTEXT "檔案版本:", 14000, 10, 10, 55, 10
     EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Description: ", 14002, 10, 27, 45, 10
+    LTEXT "描述:", 14002, 10, 27, 45, 10
     EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    LTEXT "Copyright: ", 14004, 10, 46, 66, 10
+    LTEXT "著作權:", 14004, 10, 46, 66, 10
     EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
-    GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
-    LTEXT "Item name: ", 14007, 13, 82, 50, 10
-    LTEXT "Value: ", 14008, 112, 82, 45, 10
+    GROUPBOX "其他版本資訊", 14006, 6, 70, 222, 115
+    LTEXT "項目名稱:", 14007, 13, 82, 50, 10
+    LTEXT "值:", 14008, 112, 82, 45, 10
     LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY
     EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY
 END
 
-IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "General"
+CAPTION "一般"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE
+    ICON "", 14016, 10, 9, 32, 32, WS_VISIBLE
     EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Type:", -1, 8, 38, 95, 10
+    LTEXT "類型:", -1, 8, 38, 95, 10
     EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "File system:", -1, 8, 51, 95, 10
+    LTEXT "檔案系統:", -1, 8, 51, 95, 10
     EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
     CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10
-    LTEXT "Used space:", -1, 25, 69, 80, 10
+    LTEXT "已使用空間:", -1, 25, 69, 80, 10
     EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10
-    LTEXT "Free space:", -1, 25, 82, 80, 10
+    LTEXT "剩餘空間:", -1, 25, 82, 80, 10
     EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    LTEXT "Capacity:", -1, 25, 103, 80, 10
+    LTEXT "容量:", -1, 25, 103, 80, 10
     EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30
-    LTEXT "Drive %c", 14009, 100, 150, 70, 10
-    PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP
-    LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE
-    CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED
-    CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED
+    CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40
+    CTEXT "磁碟機 %c", 14009, 95, 162, 50, 10
 END
 
-IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Tools"
+CAPTION "工具"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Error-checking", -1, 5, 5, 230, 60
+    GROUPBOX "檢查錯誤", -1, 5, 5, 230, 60
     ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20
-    LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20
-    PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP
-    GROUPBOX "Defragmentation", -1, 5, 65, 230, 60
-    ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20
-    LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20
-    PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP
-    GROUPBOX "Backup", -1, 5, 130, 230, 60
-    ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20
-    LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20
-    PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP
+    LTEXT "這個選項將會檢查磁碟區上的錯誤。", -1, 40, 25, 160, 20
+    PUSHBUTTON "現在檢查...", 14000, 130, 45, 90, 15, WS_TABSTOP
 END
 
-IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230
+IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Hardware"
+CAPTION "硬體"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Run As"
+CAPTION "執行身分"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
-    LTEXT "User name:", -1, 20, 118, 54, 10
+    LTEXT "您要使用哪個使用者帳戶來運行此程式?", -1, 10, 20, 220, 20
+    CHECKBOX "當前使用者為 %s", 14000, 10, 45, 150, 10
+    LTEXT "保護我的電腦和數據不受未經授權程式的破壞", -1, 25, 57, 200, 10, WS_DISABLED
+    CHECKBOX "此選項可以防止電腦病毒損害您的電腦或個人數據，但選擇它可能會導致程式無法正常運行。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
+    CHECKBOX "以下使用者:", 14002, 10, 100, 90, 10
+    LTEXT "使用者名稱:", -1, 20, 118, 54, 10
     COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
-    LTEXT "Password:", -1, 20, 143, 53, 10
+    LTEXT "密碼:", -1, 20, 143, 53, 10
     EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
     PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
     PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "取消", 14008, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Recycle Bin Properties"
+CAPTION "資源回收筒內容"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
-    GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70
-    RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP
+    GROUPBOX "所選位置的設定", -1, 10, 72, 220, 70
+    RADIOBUTTON "自訂大小(&C):", 14001, 20, 90, 80, 10, WS_TABSTOP
     EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER
-    LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10
-    RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
-    AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
+    LTEXT "最大大小(&A)(MB):", -1, 20, 105, 70, 10
+    RADIOBUTTON "不要將檔案移動到資源回收筒，而是徹底刪除。(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP
+    AUTOCHECKBOX "顯示確認刪除對話方塊(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP
 END
 
 IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Open With"
+CAPTION "開啟檔案"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
-    LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10
-    LTEXT "File:    ", 14001, 44, 25, 188, 20
-    GROUPBOX "&Programs", -1, 7, 42, 249, 187
-    CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
-    AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10
-    PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14
+    LTEXT "選擇要開啟檔案的程式:", -1, 44, 12, 211, 10
+    LTEXT "檔案:   ", 14001, 44, 25, 188, 20
+    GROUPBOX "程式(&P)", -1, 7, 42, 249, 187
+    CONTROL "程式", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
+    AUTOCHECKBOX "總是使用選定的城市開啟所選類型的檔案(&A)", 14003, 16, 193, 232, 10
+    PUSHBUTTON "瀏覽(&B)...", 14004, 188, 207, 60, 14
     DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
-END
-
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
-FONT 9, "新細明體", 0, 0, 0x0
-BEGIN
-    GROUPBOX "Tasks", -1, 7, 10, 249, 45
-    CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
-    AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
-    GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
-    CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
-    AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
-    GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
-    CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
-    AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
-    AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10
-    AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
-    AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
-    PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14
 END
 
 IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "View"
+CAPTION "檢視"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Folder views", -1, 7, 10, 249, 60
+    GROUPBOX "資料夾檢視", -1, 7, 10, 249, 60
     ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
-    LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20
-    PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
-    PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
-    LTEXT "Advanced settings:", -1, 7, 80, 100, 10
+    LTEXT "您可以將用於此資料夾的視圖（例如[詳細資料]或[並排]）應用於所有資料夾。", -1, 60, 20, 180, 20
+    PUSHBUTTON "套用到所有資料夾(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP
+    PUSHBUTTON "重設所有資料夾(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP
+    LTEXT "進階設定:", -1, 7, 80, 100, 10
     CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
-    PUSHBUTTON "Restore &Defaults", 14004, 177, 215, 80, 14, WS_TABSTOP
+    PUSHBUTTON "還原成預設值(&D)", 14004, 177, 215, 80, 14, WS_TABSTOP
 END
 
 IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "File Types"
+CAPTION "檔案類型"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    LTEXT "Registered file &types:", -1, 7, 10, 70, 10
+    LTEXT "已註冊的檔案類型(&T):", -1, 7, 10, 70, 10
     CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80
     PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
-    GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
-    LTEXT "Opens with:", -1, 12, 140, 40, 10
+    PUSHBUTTON "刪除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP
+    GROUPBOX "副檔名 '%s' 的詳細資訊", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70
+    LTEXT "開啟檔案:", -1, 12, 140, 40, 10
     //ICON
-    LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
-    PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
+    LTEXT "", IDC_FILETYPES_APPNAME, 100, 140, 40, 10
+    PUSHBUTTON "變更(&C)...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP
     LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30
-    PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
+    PUSHBUTTON "進階(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP
 END
 
 IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Confirm File Replace"
+CAPTION "確認取代檔案"
 FONT 9, "新細明體"
 BEGIN
     DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14
-    PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14
+    PUSHBUTTON "全部(&A)", 12807, 85, 122, 60, 14
     PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 215, 122, 60, 14
     ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
-    LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
-    LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
-    LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX
-    LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX
+    LTEXT "此資料夾已包含名為'%2'的檔案。", 12291, 44, 10, 231, 22, SS_NOPREFIX
+    LTEXT "此資料夾已包含名為'%2'的唯讀檔案。", 12292, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "此資料夾已包含名為'%2'的系統檔案。", 12293, 41, 10, 222, 22, SS_NOPREFIX
+    LTEXT "您是否想要取代已存在的檔案", -1, 44, 35, 228, 10, SS_NOPREFIX
+    LTEXT "(未知日期和大小)", 12302, 79, 51, 198, 20, SS_NOPREFIX
     ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
-    LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX
-    LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX
+    LTEXT "換成這個嗎?", -1, 44, 75, 228, 10, SS_NOPREFIX
+    LTEXT "(未知日期和大小)", 12303, 79, 91, 198, 20, SS_NOPREFIX
     ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL
 END
 
 IDD_LOG_OFF DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Log Off ReactOS"
+CAPTION "登出 ReactOS"
 FONT 9, "新細明體"
 BEGIN
     ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14
+    LTEXT "您確定要登出 ReactOS 嗎?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "登出(&L)", IDOK, 49, 38, 43, 14
+    PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14
 END
 
 IDD_DISCONNECT DIALOGEX 0, 0, 188, 60
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Disconnect ReactOS"
+CAPTION "中斷 ReactOS"
 FONT 9, "新細明體"
 BEGIN
     ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20
-    LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8
-    DEFPUSHBUTTON "&Disconnect", IDOK, 47, 38, 47, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 47, 14
+    LTEXT "您確定要中斷 ReactOS 嗎?", -1, 49, 15, 131, 8
+    DEFPUSHBUTTON "中斷(&D)", IDOK, 47, 38, 47, 14
+    PUSHBUTTON "取消", IDCANCEL, 99, 38, 47, 14
 END
 
 IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "AutoPlay"
+CAPTION "自動播放"
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20
+    LTEXT "選擇內容類型，然後選擇 ReactOS 在此装置中使用該類型時自動執行的动作(&S):", 1000, 7, 7, 215, 20
     CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200
-    GROUPBOX "Actions", -1, 7, 45, 212, 146
-    AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP
+    GROUPBOX "動作", -1, 7, 45, 212, 146
+    AUTORADIOBUTTON "選擇要執行的動作(&P):", 1005, 14, 54, 202, 10, WS_GROUP
     CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107
-    AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10
-    PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED
+    AUTORADIOBUTTON "總是提示我選擇一個動作(&C)", 1006, 14, 177, 202, 10
+    PUSHBUTTON "還原成預設值(&R)", 1008, 108, 197, 110, 14, WS_DISABLED
 END
 
 IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
+CAPTION "混合内容"
 FONT 9, "新細明體"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8
+    LTEXT "此磁碟或装置包含多種類型的內容。", 1001, 32, 7, 191, 20
+    LTEXT "您希望 ReactOS 做什麼?", 1002, 32, 31, 188, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139
     DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 160, 186, 60, 14
 END
 
 IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Mixed Content"
+CAPTION "混合內容"
 FONT 9, "新細明體"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20
+    LTEXT "每次插入磁碟或使用此類文件連接裝置時，ReactOS 都可以執行相同的動作:", 1001, 30, 7, 193, 20
     ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL
     EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8
+    LTEXT "您希望 ReactOS 做什麼?", 1002, 32, 41, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112
-    AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10
+    AUTOCHECKBOX "總是執行指定的動作。", 1004, 32, 171, 190, 10
     DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 160, 185, 60, 14
 END
 
 IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION
-CAPTION "Autoplay"
+CAPTION "自動播放"
 FONT 9, "新細明體"
 BEGIN
     ICON "", 1000, 5, 7, 21, 20
-    LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22
-    LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8
+    LTEXT "ReactOS 可以執行您選擇的相同動作。", 1001, 32, 7, 190, 22
+    LTEXT "您希望 ReactOS 做什麼?(&W)", 1002, 32, 31, 190, 8
     CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96
-    AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8
+    AUTOCHECKBOX "總是執行相同的動作(&A)", 1004, 32, 143, 190, 8
     DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 159, 160, 60, 14
 END
 
 IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
-CAPTION "Shut Down ReactOS"
+CAPTION "關閉 ReactOS"
 FONT 9, "新細明體"
 BEGIN
     ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
-    LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10
+    LTEXT "您希望電腦做什麼?", -1, 39, 7, 167, 10
     COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
-    LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37
+    LTEXT "維持工作階段，电脑數據仍然保持在 RAM 中。當你按下一個鍵或移動鼠標將喚醒這台電腦。", 8225, 39, 40, 167, 37
     DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
-    PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 75, 82, 60, 14
     PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14
 END
 
@@ -597,8 +558,8 @@ BEGIN
     LTEXT "磁碟區標籤(&L)", -1, 7, 93, 170, 9
     EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL
     GROUPBOX "格式化選項(&O)", 4610, 7, 121, 170, 49
-    AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10
-    AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
+    AUTOCHECKBOX "快速格式化(&Q)", 28674, 16, 135, 155, 10
+    AUTOCHECKBOX "啟用壓縮(&E)", 28675, 16, 152, 155, 10
 END
 
 IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115
@@ -606,55 +567,53 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL
 CAPTION "檢查磁碟"
 FONT 9, "新細明體"
 BEGIN
-    DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14
-    GROUPBOX "Check disk options", -1, 7, 6, 179, 40
-    PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14
-    AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10
-    AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10
+    DEFPUSHBUTTON "開始", IDOK, 63, 95, 60, 14
+    GROUPBOX "檢查磁碟選項", -1, 7, 6, 179, 40
+    PUSHBUTTON "取消", IDCANCEL, 128, 95, 60, 14
+    AUTOCHECKBOX "自動修復檔案系統錯誤", 14000, 12, 15, 155, 10
+    AUTOCHECKBOX "嘗試掃描和修復壞磁區(&S)", 14001, 12, 30, 165, 10
     CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8
     LTEXT "", 14003, 60, 80, 170, 10
 END
 
 IDD_PICK_ICON DIALOGEX 0, 0, 193, 200
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "變更圖示"
 FONT 9, "新細明體", 400, 0, 0x1
 BEGIN
-    LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
-    PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
+    LTEXT "在這個檔案裡尋找圖示:", -1, 7, 7, 179, 10
+    PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14
     EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
-    LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
-    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT "選擇所列出的圖示:", -1, 7, 36, 179, 10
+    LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 135, 179, 50, 14
 END
 
 IDD_NOOPEN DIALOGEX 0, 0, 240, 75
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Caution"
+CAPTION "警告"
 FONT 9, "新細明體"
 BEGIN
     ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
-    LTEXT "This file could either be used by the operating system or by\n\
-another application. Modifying this file might damage your\n\
-system or make it less functional.\n\n\
-Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60
-    DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14
-    PUSHBUTTON "No", IDNO, 180, 55, 50, 14
+    LTEXT "這個檔案可由操作系統或其他應用程式所使用。\n修改這個文件可能會導致您的系統損毀，\n或者使它的功能失效。\n\n\
+您是否仍要開啟這個檔案?", IDC_STATIC, 35, 5, 230, 60
+    DEFPUSHBUTTON "是", IDYES, 125, 55, 50, 14
+    PUSHBUTTON "否", IDNO, 180, 55, 50, 14
 END
 
 IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75
-CAPTION "Create New Extension"
+CAPTION "建立新副檔名"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "&File Extension:", -1, 10, 10, 85, 14
+    LTEXT "文件副檔名(&F):", -1, 10, 10, 85, 14
     EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14
-    PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
-    LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
+    PUSHBUTTON "<< 進階(&V)", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15
+    LTEXT "相關的檔案類型(&A):", IDC_NEWEXT_ASSOC, 10, 34, 85, 14
     COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14
+    PUSHBUTTON "取消", IDCANCEL, 190, 55, 60, 14
 END
 
 STRINGTABLE
@@ -663,24 +622,24 @@ BEGIN
     IDS_SHV_COLUMN_NAME "名稱"
     IDS_SHV_COLUMN_SIZE "大小"
     IDS_SHV_COLUMN_TYPE "類型"
-    IDS_SHV_COLUMN_MODIFIED "已修改"
+    IDS_SHV_COLUMN_MODIFIED "修改"
     IDS_SHV_COLUMN_ATTRIBUTES "屬性"
     IDS_SHV_COLUMN_DISK_CAPACITY "使用空間"
     IDS_SHV_COLUMN_DISK_AVAILABLE "剩餘空間"
-    IDS_SHV_COLUMN_OWNER "Owner"
-    IDS_SHV_COLUMN_GROUP "Group"
-    IDS_SHV_COLUMN_FILENAME "檔案名稱"
-    IDS_SHV_COLUMN_CATEGORY "Category"
-    IDS_SHV_COLUMN_DELFROM "Original location"
-    IDS_SHV_COLUMN_DELDATE "Date deleted"
-    IDS_SHV_COLUMN_FONTTYPE "Fonttype"
-    IDS_SHV_COLUMN_WORKGROUP "Workgroup"
-    IDS_SHV_COLUMN_NETLOCATION "Network Location"
-    IDS_SHV_COLUMN_DOCUMENTS "Documents"
-    IDS_SHV_COLUMN_STATUS "Status"
-    IDS_SHV_COLUMN_COMMENTS "Comments"
-    IDS_SHV_COLUMN_LOCATION "Location"
-    IDS_SHV_COLUMN_MODEL "Model"
+    IDS_SHV_COLUMN_OWNER "所有者"
+    IDS_SHV_COLUMN_GROUP "小組"
+    IDS_SHV_COLUMN_FILENAME "檔案名"
+    IDS_SHV_COLUMN_CATEGORY "類型"
+    IDS_SHV_COLUMN_DELFROM "原始位置"
+    IDS_SHV_COLUMN_DELDATE "刪除日期"
+    IDS_SHV_COLUMN_FONTTYPE "字型類型"
+    IDS_SHV_COLUMN_WORKGROUP "工作群組"
+    IDS_SHV_COLUMN_NETLOCATION "網路位置"
+    IDS_SHV_COLUMN_DOCUMENTS "文件"
+    IDS_SHV_COLUMN_STATUS "狀態"
+    IDS_SHV_COLUMN_COMMENTS "評論"
+    IDS_SHV_COLUMN_LOCATION "位置"
+    IDS_SHV_COLUMN_MODEL "模型"
 
     /* special folders */
     IDS_DESKTOP "桌面"
@@ -690,13 +649,13 @@ BEGIN
     IDS_ADMINISTRATIVETOOLS "管理工具"
 
     /* special folders descriptions */
-    IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer."
-    IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations."
-    IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer."
-    IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones."
+    IDS_ADMINISTRATIVETOOLS_DESCRIPTION "設定您電腦上的管理設定。"
+    IDS_FOLDER_OPTIONS_DESCRIPTION "自訂檔案和資料夾的顯示和變更檔案關聯設定。"
+    IDS_FONTS_DESCRIPTION "新增、變更和管理您電腦上的字型。"
+    IDS_PRINTERS_DESCRIPTION "顯示已安裝的印表機和傳真印表機並幫助您新增印表機。"
 
     /* About shell dialog version string */
-    IDS_ABOUT_VERSION_STRING "版本 %S (%S)"
+    IDS_ABOUT_VERSION_STRING "版本 %S(%S)"
 
     /* context menus */
     IDS_VIEW_LARGE "大圖示(&G)"
@@ -714,44 +673,44 @@ BEGIN
     IDS_FORMATDRIVE "格式化..."
     IDS_RENAME "重新命名"
     IDS_PASTE "插入"
-    IDS_EJECT "Eject"
-    IDS_DISCONNECT "Disconnect"
+    IDS_EJECT "退出"
+    IDS_DISCONNECT "中斷"
 
-    IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
-    IDS_CREATEFOLDER_CAPTION "Unable to create folder"
-    IDS_DELETEITEM_CAPTION "Confirm File Deletion"
-    IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion"
-    IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
-    IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
-    IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
-    IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?"
-    IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?"
-    IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?"
-    IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?"
-    IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?"
-    IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
-    IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?"
+    IDS_CREATEFOLDER_DENIED "無法建立資料夾'%1'"
+    IDS_CREATEFOLDER_CAPTION "無法建立資料夾"
+    IDS_DELETEITEM_CAPTION "確認刪除檔案"
+    IDS_DELETEFOLDER_CAPTION "確認取代檔案"
+    IDS_DELETEITEM_TEXT "您確定要刪除'%1'嗎?"
+    IDS_DELETEMULTIPLE_TEXT "您確定要刪除 %1 個項目嗎?"
+    IDS_DELETESELECTED_TEXT "您確定要刪除所選項目嗎?"
+    IDS_TRASHITEM_TEXT "您確定要將'%1'傳送到資源回收筒嗎?"
+    IDS_TRASHFOLDER_TEXT "您確定要將'%1'和它的所有內容傳送到資源回收筒嗎?"
+    IDS_TRASHMULTIPLE_TEXT "您確定要將這'%1'項傳送到資源回收筒嗎?"
+    IDS_CANTTRASH_TEXT "項目'%1'無法傳送到資源回收筒。您要徹底刪除它嗎?"
+    IDS_OVERWRITEFILE_TEXT "這個資料夾已包含名為'%1'的檔案。\n\n您想要取代它嗎?"
+    IDS_OVERWRITEFILE_CAPTION "確認覆寫文件"
+    IDS_OVERWRITEFOLDER_TEXT "本資料夾已經有名稱為'%1'的資料夾。\n\n如果現有資料夾中的檔案名稱與正要移動或複製資料夾中的檔案名稱相同，\n檔案將會被取代。您仍然要移動或複製資料夾嗎?"
 
-    IDS_FILEOOP_COPYING "Copying..."
-    IDS_FILEOOP_MOVING "Moving..."
-    IDS_FILEOOP_DELETING "Deleting..."
-    IDS_FILEOOP_FROM_TO "From %1 to %2"
-    IDS_FILEOOP_FROM "From %1"
+    IDS_FILEOOP_COPYING "正在複製..."
+    IDS_FILEOOP_MOVING "正在移動..."
+    IDS_FILEOOP_DELETING "正在刪除..."
+    IDS_FILEOOP_FROM_TO "從 %1 到 %2"
+    IDS_FILEOOP_FROM "從 %1"
     IDS_FILEOOP_PREFLIGHT "Preflight"
 
     /* message box strings */
     IDS_RESTART_TITLE "重新啟動"
-    IDS_RESTART_PROMPT "Do you want to restart the system?"
+    IDS_RESTART_PROMPT "您確定要重新開機嗎?"
     IDS_SHUTDOWN_TITLE "關機"
-    IDS_SHUTDOWN_PROMPT "Do you want to shutdown?"
+    IDS_SHUTDOWN_PROMPT "您確定要關機嗎?"
 
     /* Run File dialog */
-    IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)"
-    IDS_RUNDLG_BROWSE_CAPTION "Browse"
-    IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+    IDS_RUNDLG_ERROR "無法顯示執行文件對話方塊(內部錯誤)"
+    IDS_RUNDLG_BROWSE_ERROR "無法顯示瀏覽對話方塊(內部錯誤)"
+    IDS_RUNDLG_BROWSE_CAPTION "瀏覽"
+    IDS_RUNDLG_BROWSE_FILTER "可執行檔 (*.exe)\0*.exe\0所有檔案 (*.*)\0*.*\0"
 
-    /* shell folder path default values */
+    /* Shell folder path default values. See also: dll/win32/userenv/lang */
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "我的文件"
     IDS_FAVORITES "我的最愛"
@@ -783,128 +742,128 @@ BEGIN
 
     IDS_NEWFOLDER "新資料夾"
 
-    IDS_DRIVE_FIXED "Local Disk"
-    IDS_DRIVE_CDROM "CD Drive"
-    IDS_DRIVE_NETWORK "Network Disk"
-    IDS_DRIVE_FLOPPY "3.5 Floppy"
-    IDS_DRIVE_REMOVABLE "Removable Disk"
-    IDS_FS_UNKNOWN "Unknown"
+    IDS_DRIVE_FIXED "本機磁碟"
+    IDS_DRIVE_CDROM "CD 光碟機"
+    IDS_DRIVE_NETWORK "網路磁碟"
+    IDS_DRIVE_FLOPPY "3.5-吋磁片"
+    IDS_DRIVE_REMOVABLE "抽取式磁碟"
+    IDS_FS_UNKNOWN "未知"
 
     /* Open With */
-    IDS_OPEN_WITH "Open With"
-    IDS_OPEN_WITH_CHOOSE "Choose Program..."
-    IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:"
-    IDS_OPEN_WITH_OTHER "Other Programs:"
+    IDS_OPEN_WITH "開啟檔案"
+    IDS_OPEN_WITH_CHOOSE "選擇程式..."
+    IDS_OPEN_WITH_RECOMMENDED "推薦的程式:"
+    IDS_OPEN_WITH_OTHER "其它程式:"
 
-    IDS_SHELL_ABOUT_AUTHORS "&Authors"
+    IDS_SHELL_ABOUT_AUTHORS "作者(&A)"
     IDS_SHELL_ABOUT_BACK "< &Back"
-    FCIDM_SHVIEW_NEW "New"
-    FCIDM_SHVIEW_NEWFOLDER "New &Folder"
-    FCIDM_SHVIEW_NEWLINK "New &Link"
-    IDS_FOLDER_OPTIONS "Folder Options"
-    IDS_RECYCLEBIN_LOCATION "Recycle Bin Location"
-    IDS_RECYCLEBIN_DISKSPACE "Space Available"
-    IDS_EMPTY_BITBUCKET "Empty Recycle Bin"
-    IDS_PICK_ICON_TITLE "Choose Icon"
-    IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-    IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+    FCIDM_SHVIEW_NEW "新增"
+    FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)"
+    FCIDM_SHVIEW_NEWLINK "新增捷徑(&L)"
+    IDS_FOLDER_OPTIONS "資料夾選項"
+    IDS_RECYCLEBIN_LOCATION "資源回收筒位置"
+    IDS_RECYCLEBIN_DISKSPACE "可用空間"
+    IDS_EMPTY_BITBUCKET "清空資源回收筒"
+    IDS_PICK_ICON_TITLE "選擇圖示"
+    IDS_PICK_ICON_FILTER "圖示檔案 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
+    IDS_OPEN_WITH_FILTER "可執行檔 (*.exe)\0*.exe\0所有檔案 (*.*)\0*.*\0"
 
-    IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)."
-    IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)."
-    IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)."
-    IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)."
-    IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)."
+    IDS_CANTLOCKVOLUME "無法鎖定磁碟區(錯誤碼:%lu)."
+    IDS_CANTDISMOUNTVOLUME "無法卸載磁碟區(錯誤碼:%lu)."
+    IDS_CANTEJECTMEDIA "無法退出媒體(錯誤碼:%lu)."
+    IDS_CANTSHOWPROPERTIES "無法顯示內容(錯誤碼:%lu)."
+    IDS_CANTDISCONNECT "無法中斷(錯誤碼:%lu)."
 
     /* Friendly File Type Names */
-    IDS_DIRECTORY "Folder"
-    IDS_BAT_FILE "ReactOS Batch File"
-    IDS_CMD_FILE "ReactOS Command Script"
-    IDS_COM_FILE "DOS Application"
-    IDS_CPL_FILE "Control Panel Item"
-    IDS_CUR_FILE "Cursor"
-    IDS_DB__FILE "Database File"
-    IDS_DLL_FILE "Application Extension"
-    IDS_DRV_FILE "Device Driver"
-    IDS_EFI_FILE "Extensible Firmware Interface Executable"
-    IDS_EXE_FILE "Application"
+    IDS_DIRECTORY "資料夾"
+    IDS_BAT_FILE "ReactOS 批次文件"
+    IDS_CMD_FILE "ReactOS 命令指令碼"
+    IDS_COM_FILE "DOS 應用程式"
+    IDS_CPL_FILE "控制台項目"
+    IDS_CUR_FILE "指標"
+    IDS_DB__FILE "資料庫檔案"
+    IDS_DLL_FILE "應用程式擴充"
+    IDS_DRV_FILE "裝置驅動程式"
+    IDS_EFI_FILE "可延伸軔體介面 (EFI) 可執行檔"
+    IDS_EXE_FILE "應用程式"
     IDS_NLS_FILE "National Language Support File"
-    IDS_OCX_FILE "ActiveX Control"
+    IDS_OCX_FILE "ActiveX 控制項"
     IDS_TLB_FILE "Type Library"
-    IDS_FON_FILE "Font file"
-    IDS_TTF_FILE "TrueType Font file"
-    IDS_OTF_FILE "OpenType Font file"
-    IDS_HLP_FILE "Help File"
-    IDS_ICO_FILE "Icon"
-    IDS_INI_FILE "Configuration Settings"
-    IDS_LNK_FILE "Shortcut"
-    IDS_NT__FILE "NT DOS32 Configuration File"
-    IDS_PIF_FILE "NT VDM Program Information File"
-    IDS_SCR_FILE "Screen Saver"
-    IDS_SYS_FILE "System File"
-    IDS_VXD_FILE "Virtual Device Driver"
-    IDS_ANY_FILE "%s-file"
+    IDS_FON_FILE "字型檔案"
+    IDS_TTF_FILE "TrueType 字型檔案"
+    IDS_OTF_FILE "OpenType 字型檔案"
+    IDS_HLP_FILE "說明檔"
+    IDS_ICO_FILE "圖示"
+    IDS_INI_FILE "組態設定"
+    IDS_LNK_FILE "捷徑"
+    IDS_NT__FILE "NT DOS32 組態設定"
+    IDS_PIF_FILE "NT VDM 程式資訊檔案"
+    IDS_SCR_FILE "螢幕保護裝置"
+    IDS_SYS_FILE "系統檔案"
+    IDS_VXD_FILE "虛擬裝置驅動程式"
+    IDS_ANY_FILE "%s-檔案"
 
-    IDS_OPEN_VERB "Open"
-    IDS_EXPLORE_VERB "Explore"
-    IDS_RUNAS_VERB "Run as..."
-    IDS_EDIT_VERB "Edit"
-    IDS_FIND_VERB "Find"
-    IDS_PRINT_VERB "Print"
+    IDS_OPEN_VERB "開啟"
+    IDS_EXPLORE_VERB "檔案總管"
+    IDS_RUNAS_VERB "執行身分..."
+    IDS_EDIT_VERB "編輯"
+    IDS_FIND_VERB "搜索"
+    IDS_PRINT_VERB "列印"
 
-    IDS_FILE_FOLDER "%u Files, %u Folders"
-    IDS_PRINTERS "Printers"
-    IDS_FONTS "Fonts"
-    IDS_INSTALLNEWFONT "Install New Font..."
+    IDS_FILE_FOLDER "%u 個檔案，%u 個資料夾"
+    IDS_PRINTERS "印表機"
+    IDS_FONTS "字型"
+    IDS_INSTALLNEWFONT "安裝新字型..."
 
-    IDS_DEFAULT_CLUSTER_SIZE "Default allocation size"
-    IDS_COPY_OF "Copy of"
+    IDS_DEFAULT_CLUSTER_SIZE "預設配置大小"
+    IDS_COPY_OF "複製"
 
-    IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file."
+    IDS_SHLEXEC_NOASSOC "沒有為 ReactOS 設定關聯的程式以開啟這種類型的檔案。"
 
-    IDS_FILE_DETAILS "Details for '%s' extension"
-    IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."
-    IDS_FILE_TYPES "File Types"
-    IDS_COLUMN_EXTENSION "Extensions"
+    IDS_FILE_DETAILS "副檔名'%s'的詳細資料"
+    IDS_FILE_DETAILSADV "副檔名為'%s'的檔案屬於類型'%s'。如果要變更影響所有'%s'檔案的設定值，請按一下［進階］。"
+    IDS_FILE_TYPES "檔案類型"
+    IDS_COLUMN_EXTENSION "副檔名"
 
     /* As in 'INI File' or 'WAV File', fallback string for no-name extensions
        used in the _File type_ tab of the _Folder Options_ dialog */
-    IDS_FILE_EXT_TYPE "%s File"
+    IDS_FILE_EXT_TYPE "%s 檔案"
 
-    IDS_BYTES_FORMAT "bytes"
-    IDS_UNKNOWN_APP "Unknown application"
-    IDS_EXE_DESCRIPTION "Description:"
+    IDS_BYTES_FORMAT "位元組"
+    IDS_UNKNOWN_APP "未知應用程式"
+    IDS_EXE_DESCRIPTION "描述:"
 
-    IDS_MENU_EMPTY "(Empty)"
-    IDS_OBJECTS "%d Objects"
-    IDS_OBJECTS_SELECTED "%d Objects Selected"
+    IDS_MENU_EMPTY "(空)"
+    IDS_OBJECTS "%d 個物件"
+    IDS_OBJECTS_SELECTED "已選擇 %d 個物件"
 
-    IDS_ADVANCED_FOLDER "Files and Folders"
-    IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers"
-    IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips"
-    IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list"
-    IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders"
-    IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar"
-    IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar"
-    IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails"
-    IDS_ADVANCED_HIDDEN "Hidden files and folders"
-    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
-    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
-    IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types"
-    IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)"
-    IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process"
-    IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings"
-    IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon"
-    IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer"
-    IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color"
-    IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items"
+    IDS_ADVANCED_FOLDER "檔案和資料夾"
+    IDS_ADVANCED_NET_CRAWLER "自動搜尋網路資料夾和印表機"
+    IDS_ADVANCED_FOLDER_SIZE_TIP "在資料夾提示中顯示檔案大小的資訊"
+    IDS_ADVANCED_FRIENDLY_TREE "在檔案總管的資料夾清單顯示簡易的資料夾檢視"
+    IDS_ADVANCED_WEB_VIEW_BARRICADE "顯示系統資料夾的內容"
+    IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "在位址列中顯示完整路徑"
+    IDS_ADVANCED_SHOW_FULL_PATH "在標題列中顯示完整路徑"
+    IDS_ADVANCED_DISABLE_THUMB_CACHE "停用快取縮圖"
+    IDS_ADVANCED_HIDDEN "隱藏的檔案和資料夾"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "不要顯示隱藏的檔案和資料夾"
+    IDS_ADVANCED_SHOW_HIDDEN "顯示隱藏的檔案和資料夾"
+    IDS_ADVANCED_HIDE_FILE_EXT "隱藏已知檔案類型的副檔名"
+    IDS_ADVANCED_SUPER_HIDDEN "隱藏受保護的作業系統檔案（建議選項）"
+    IDS_ADVANCED_DESKTOP_PROCESS "在個別的處理程序中開啟資料夾視窗"
+    IDS_ADVANCED_CLASSIC_VIEW_STATE "記住每個資料夾的檢視設定"
+    IDS_ADVANCED_PERSIST_BROWSERS "在登入時還原先前的資料夾視窗"
+    IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的電腦顯示控制台"
+    IDS_ADVANCED_SHOW_COMP_COLOR "使用色彩來顯示加密或壓縮的 NTFS 檔案"
+    IDS_ADVANCED_SHOW_INFO_TIP "顯示資料夾和桌面項目的快顯描述"
 
-    IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
-    IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
-    IDS_NEWEXT_NEW "<New>"
-    IDS_NEWEXT_SPECIFY_EXT "You must specify an extension."
-    IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?"
-    IDS_NEWEXT_EXT_IN_USE "Extension is in use"
+    IDS_NEWEXT_ADVANCED_LEFT "<< 進階(&V)"
+    IDS_NEWEXT_ADVANCED_RIGHT "進階(&V) >>"
+    IDS_NEWEXT_NEW "<新增>"
+    IDS_NEWEXT_SPECIFY_EXT "您必須指定一個副檔名。"
+    IDS_NEWEXT_ALREADY_ASSOC "副檔名 %s 已經與檔案類型 %s 關聯。 是否要將 %s 與 %s 取消關聯並為其建立新的檔案類型?"
+    IDS_NEWEXT_EXT_IN_USE "副檔名正在被使用"
 
-    IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?"
-    IDS_FILE_NOT_FOUND "The file '%s' was not found."
+    IDS_REMOVE_EXT "如果您移除註冊的檔案類型，您將無法透過在檔案圖示上 按兩下 來開啟檔案。\n\n您要移除這個檔案類型嗎?"
+    IDS_FILE_NOT_FOUND "找不到檔案'%s'。"
 END
diff --git a/dll/win32/shell32/res/icons/165.ico b/dll/win32/shell32/res/icons/165.ico
deleted file mode 100644
index 2f3c44155b8ec4c957ba26c33d61e8b4c733b39e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25214
zcmeHP34DxK*FPbHs;Wr@wKWo5zN)vfsFp6YVoR&mq|`2w5FxSeCSu=rMXUCu6tN~W
zB(VlT#9pxnv1_Ze$oc-~&ODQukqi~m_xpamoZRQ`=Pu8E?m6dwhsc3mqDqwrzAG(#
zgJ?RDDO`Y-7AE@SO$ir4x+4YWBf8{G<mzh5UxcWBH7$(%1&IFem9R1Yl{`dqnh+I1
zKB+(0k!ZNT7A`=+I-;B3NZ6SFZ3iO1wnT3W51=+6Dfh4YcLYo$fE7jgL9c>Jg0MQt
z1N5<pyx`07DFbo>y#&e&`p4YD4&Gi1J5;^_|6!9xjkrnUtf_IMhHOcacW!%cUJwB4
z;LRv6l!3a2<yL3VUgd>>m4DqdtS#@H(U%(uPjlz;%$YNJ%9JTQe*AbIF=7NqL_~1E
ze*L&dj~?8mOBW6a2|+&_bM%Ogym@3N-Xt_4m^Th-r}~h4{8#=pc2pqm`nDf$9@0wj
zzk2m*UbbwRdY1kOO`JH9M~xcAk&%%+aNt1h)vFigq7kp@>(6WZ`YDoU>4VHe?(y%<
z`+gY0vBTQ%&qG=&Ubk%7!qL&uR{YPIGl#$Z_FJAbX%deaGlqu^8>aYQ*Uz8V_xES<
z*Y*FJV@HSNI{*6@4Ck%jf6Gwg_$MYN^3I(*t@vNDVg)Z=yqJIZ;Ro~Dl6hG_;A`GE
zuo-WFzhOW#-a4*JZu6gUVBtuP8_^bhXsvkOx^*jW-@e_7|4o}V@w#>Ec;(8KykyA|
zo;PovN{=4goTCQ`HRI^P-*CdjZn@6?p(SHDeq?)&AJInfw0`}1j){q};$P+@At8Z(
z{`qI#uwetQTD3~0$AJG$hHp3qyl;wV!P}<v%ys@#mXGIcqXRf$R9kM0y;H_k_>=LL
z_aHVlR`D)tYR{fMYHnm6Wc~a+qy=vV-$rVw_OKWA{^pxipFyu!?hUeEANgq#Zy(!%
zw~ubmQ@XXV8h35~$;zJ`)|_MU&csHxRPTOlWNY3%tN#lde-r=G2ffw@@c-!8>S?@l
zTp;fl8^Alpv{xj3**3ZzZyVK4%}c__wpe2ztg$$u;X<v|JF^AvjlBD^2kiN7&<o|?
z`}}C(-`oe`|HPUZyn8|r=hVfGXvax&hrDq9E&Cw+|FV7-Cr;{^Q}!`W?Ro$FVb6ts
zjPc8$P}5jzW6r{R+0+5bm$aE3-+z=E{XOrU+{w)U!-o&~^y$-2Mdm_y*fu7BlNXK5
zG5_GJuJGnMcSiC@N2fjzo;9kJI*iL6>&vD0bTjuMIeHfFn;K%t$}>Ih7#qkb%f{r0
zfAC#Pc>na&EdD5M0#`U<V7J5l*!}1LE`M?$mr3cZ_;=nK%+B#0&3)K8E$96293R9-
zuoq)ZKGXRJe7h;$(<X7{i(?h9!f%<wy}9(ko+@1IcrSL@+m$u`E&K4`(L*)vfByOB
zQ>`6YW0r3BgkV0pa&k`iUtjUS*!$JfCUfbOUW#YoTccu!dvNhz`f$<hA!h!ycX|8F
zP)k;x>3I+Kfa6h9bHYD+UmU|_PxRxmNBgQdsDgR;1oQDp+C)Xwu%?P8bmF3Wx|r9_
zk@!WNGOH`kn13Tjw0BBJKDl;Aj`;r=e7a$sSGqcuE2K;^?>n-tgsNT~Z^b+Ip9hzA
zuH+-%cjLTeQ*uN}(?a>whFLk{U&gsY`Y0}Tq-O^By#*3kRXO4RQ_O|7W)RlnUHdC-
z#|plZ7{%R(T;g!UB@P>WiMtNE#9aoaapwVP9MV6HJN8ZE;64{Qu-8TI(DNb(fZF%C
z$Zfk_;5OkGxOLbCPL272Ppp|P{6Ey%{5!tz_gUH$_P;()cz*z@X<1&<EqE_2X^Vs2
zABgrKvs%ipDlBmtJ;JjkJw(`+9v}`>`Oigxm4hwYecET?5Btu;TGwXYmuE6`7ySV=
zPDYYA6AAAU|KH>sz+0;4x+S+fE{rzvPb9h!(QSyIM|jsws8d!8!~bvTgYc0@H}lKI
zc^6E*>3LzyAHpl*p#95|pe2N|F|%*~WIq(|!jH~Sqpa}#?%5G{UzyzKmTpqrR){YE
z5*?E*Nj$Wrsvj~x|5P8OU0EYC*7<dl>!~x_JI9CI#e7_Gc*jL_WYF?HMk2?&43d6G
z*%#V}#{NzHLc*Xo%7Qv|4dsqqI&*Mn2nTiU#J+vosrR(({9rCQp)uF*(Ut=`20cdA
zKd<3q>VwRKjKK?=1L1q`-n|*;&YfdRI(zmkpE+}eQ&Us<)TvW^^5jWAapDATOWwob
z(NnqM%E3H5b{?<UvxRpa*vp4f4sl9Kipb#^ft`Zo9g#V(<o|{ALHHNGckkZKfBf+W
z{|uR0bOEC45E7k}CTEMDK;&%EA#6$9&RtiG<&JB|aoF;4ylZbFuiLnRj~qM30hlkx
z2EIk|dQ}pAt+r3$@%cMj{-;iz$}?un;6;lTDP7<4<;xYn(wF%7cuq=6QvFL#PUg*<
zH}k=R2d#XWD_L{kRQ914y7px>Z21>Gp6K)DFI>Q)uUxZcjp9${WXFyjEPThs#qrUj
zN3-;0E~QSXJ2#xh|Ni~^IXjXu&yM!(+sBslPw+46{&`Yvjz9LlC|Se5{q`HDrKLR+
zojZS?&s{jrckbL#a~KdD_+4(S9ccq&6)C#B%a<=_TuDzCU-jW>=R@nW^Z|Qr#_Fgj
zS^pDqk$=B&6UOuP>({OLzH#FQU%PhgiKO*Y`XO~lUEtp@7x}N$vu|(Jw(#;aJZF_h
z$_oF3A_fcpV#3WehxYi=rAvI_!i8t%U-~5cOI^9fxTztuxqdJ9!Dr$BO8OOZpOX$8
z5dI_o0sez#em`4{-_>hZ)n1y_8p$f|_{rmZ?)*8`he^|?=IYwl#tCCq(=aUZnco5F
zgY-@6KwY`I_N5PK^EFV8zhP2`HYU04qwOGRKZn#SxB33Jy?<r|jEYnu3;#BKs=@}5
zI1sNSkH7C<HkG?z^3R$4vqoPuXj1=ulYiUfBU!~~>$fqbo9a93pjhKLBdctnPlaXt
zf8FH2Dt;XBE+#*}O<3hax~k{z`e(`5e)fJ|Rqt&w`Ut47=D$srI4w~XWbg1!6V3;O
z{gLpECG3@iJ(KXwAng5weV_3CBYgh|XF$StjBp+zoJ$Dj3Bs9(AafGVhRA=OAR`cD
zBf{C2aP}pfTM6<7LH;1fu>={4fKwsJPz3pjAm<U}CxY#sAUhFcCxV<vkP``VA^{UZ
zkP`_qB0&Zx$bbYHkRb08<XnQBOOSI3axOv6CCIr1IhP>k5^N0w*`6TV6J&dWY)_Ew
z39>ywwkOE;1bLpI%OL162s#XcE{UMSAm}g%It+qNhM<!n=$8okC4#PuperNj{0KTf
zg6@)_yCmpf2|8GUu9ct@CFsNnI%R@RnV`!j=!*&ZVuHSypf4uqiwXK-g1(rbFDB@V
z3HoA!u9%=JCg_O?dSZf}n4l*n=!pq7Q-YqIpl2uO*$H+5f=z&+PbcWp3Ho$`KAoTw
zC+Nfpb_If6fnYl$*c1qM8-m?{U^gJx4G6k_g6^Lx9vDlopAhUm1iJ~rUP7>!5bQk!
z8;M%PuyYXX90a=%!RAA-_YiD11ltY4?nSVB5$s+ByBERkMX-Aj>{|r;6u~}4u<H@*
zdIVb@!H!3;-x2J01p6Do{zkA*5^RzLn<T*&Nw6yt?1}`86~Wd@u(i^*QSAw~QnVXH
zu=^4)I0QR5!46KaffH=s1Uv%4=8g0=1Y0-3&P}k_6YSgsJ2%1Zk2X6HZ2koMJ^}Yd
zz;_Ys`UETw!JbdB=M(S^1WW?~(?Gy95O53x{R#oIK)_rP@Ed5SJpq?Nz>^U07z7*!
z0hdC+nh>xh1Y8LLXG6fz5HK_ZY!(4KL%_@sFf#=F5CIoNzy%SoKm;rh0SiRHMiH=4
z1Z)%m$3?(D5%5pcvu96Q+t;6BMg$Y^Uj+OY0pmr$coFbj1bi0(*G0f{5in}mzx4m-
zQvCd&ABs;%!2g8!_<Q%3E%RGurxUks?~nVX>?wWvonNp2_Iv!zyLWH?VMl87yL9<V
zT(SSb_ERSP>b2|fH*Q?GanoM@)n~WIRd7Q7U*0Nn?tH?93l}e@*~@=ob4<d%y$Nw~
zC*S_%ty6KS*qF}P%YS5JOhN_s__#QyJ&8wm#~nL%?9g$0`41e7j!OnV3H#o2OHPb~
zzB1{sz5KhDY>3~TxW~!uy}kR~6XUigZBN>tb$-#+l3(nWbz9@&;^Pw3zipegZ{M*q
zoBUG1FKW%&wQE<bTd{t_hK(Deqhn$=ZT>l%{7q57uk*^$Hg47G?DC_4-;c{}vX5Tz
zQx^GseCqi$UC`90+rmYoM=$=s>`-{g(#O`1&+PA-Hf{QSzd22Pewb@p|GfFO_4`bo
zGIiSY8AJOH7|_(`Tig6IXW8WUY2I+?&~d|tHVYpq1;&q_U}mQx3QwG5o!@6j<WOu2
z!<r2rF%sEF+15X1tWEwtefu@+-`w9nY(RKZpMir0+c-mnO@9B-E?s@#!jQdN_a4|<
ztX!|&w)wwqCR6LvT*m*K7A;$~Zqv41`+$HBfq_B69Xo||w#nbPiCQ{7GQZ@Pg+sK3
z^J&<~m|y+1NXX{V=c@+B{Mn@2M%VkY{!`X$D(U0<g>4=7!#;KE+0UR-9X@k_`_E^e
ze_qq4R_!`9io@9{=1|bZ#igjr2Ngg3uxhoBKK|s>>hHemRwMfY4lbqhxVcrRP{HlJ
z_X;{y^6>QXuKa!#`}yB|>+Sz}$Eia3Qf}{-D}jF%|6@OYnX<1Jb1moQUZVUP>Ys}p
z+lPZosZy_$0+lRPvS7)QB@4n8u$Mni7S2xo;w4@yY~_j;eXXRO0d;V4F63M|vyH-q
zi@FrEQ$Oh)k=s$HxjcCaJDOp5Sq;;xj(N1aMn8{Zk*xA*aSnxFw$86}w8suP6tv1;
zNT++nZhp$|sI%ZGUjdz1MD4h|)*Z;FgFI!=Ib;r|@yR|ru=d$FdzHW7G)-R0!jCh_
zsfK5hS8o~RNzP7QMaM)={oC^DIb*qV7YuUSg3nzB>*C)s`O*`F@0k4iMqiU7<B(*M
zQ=iG#>dDU6<WXDyK0!PdzLd-Kt>siP>1FQ>27_W=WJJO<;lBvvh*Uu~2DB(7%fA=s
zqDve}PHq`7rc?>5MhfWl9(ujLh(12bDqjCVirxhY5&C$m_{gY84+j*99P@!ye1zWl
z<Cf0)GNn99S;gy1r+75<^6-c#Wt~4#ANffcFRxGZ@iy^MDPC|M`Y4NfbVU02630uN
z8+m;1M;81$R;Nhk2yiLRBEMq*MXqr(y0<Or*A=fG>12v8ml+=r(5slUlbffPyQi01
zIdeTVi|dPpx7X@1=hs!K)vHI%V&;01O#Q9hHmGRZz#gBud3oZWo0eZ!taw0Rj~<!%
zs~Ph<_UKimc(GcaJ4<)rJWTvJ7W4M0Rm<DC<c~&IL(3l&K#o-!M0!oqtA7hj`E|t`
z5c*r7L`1~M67t8ie>;X(CtY=`xljS!`_;+u@n~|aZO9@PQMIaP9gjwBor9W)nhmj@
ztdg8P;oQqNcJuVGig)sqp1XT}?p4kz-q};{<%|S(ckBGlp3aCCXOrI;iNDtQwK;Ng
zv&rx7CLDn$>-^51?rL>-+VJUsXe4>Md0O|&0o5Sd-QCS5-WZKSw(+VO^vgP)oD?^n
zp4M#Q>X~t|+OUcEZ1Ni?z;^hp#`Y-!w)>t%IPTx?jMAfGNHYEGzAsw5?e|3s+xyPA
zVxFpl{=eQ^h0d`MbVA8<gFm|8xpN4Ig?8qy!1{E>a~I&VghE3ysWa{Z&Izja`=a0v
z?gGDg07H`_w<z%aU2FR{xwmy%f9@96l@~5t$is&Z=OIIe@VIf~)ZMp1g9fQPd~z4D
z3;0?)G#GdHIzBUY*OFoMpZCoj%Ik5Lv3qz|-nelickbL-k=%_G+>UmiQ0_&_*!<Mn
zpJT`7?CzRi4?(y~>dglijpp@+R%kzr<?fc&zTkue>$G6O0-im4HVY1_E9Pfa-)0;?
zv3rjCZ)%_Wb+49@ymTz?a<<{_7=OWrY3&O(NpNCvhfMBZ$(_EiE}^`pe{<eGtxt~I
z@BG_Jh5ehm#K18_+o`(ovE?Y>J)}*+a^c*j?t{s*V5ho-hVr_BEqK?=0Z-jN`kEgk
zcP-|C4uDj<(!R#Sl<_TjT%S&g2kGNu1l(dcXkzambq{UN_lBoxA8ox4iYhdF!uGnS
zm!)>Pvywx8UCG_=uI0A37IU#f-OW72r5!SE@lWwLY2MH$wvTq}fp+_xSn(+6)+%n0
zK99@)GS`ZveM=seC+>XWeGIwtb8yipyX~Xh3ZPB3jxXa5x1zZG>4p4G>I`$+C6BFA
z?P~3pNa<-Fho|U1?%vqHyMngoR7&{%YMUET{N|ZOEbR%sbZ|EpJ=oi-ZQ((~x-UtJ
zd1C*CKe-1e@2=%uV)<O?ho&dnr$@2J*-c#h@LqO1I-A{3&a<Y|ClnuA+ka>Nk4Gu&
zf41!x{Jznhfa`0x{Lv(SdEOMk_^UN<>6bmc&)o0s^LG5L`yeOR&9vKpX{XltEv#ES
zQ`)@)>JF-;jgh2l{r+k5bk6(wVW!e4Pfe-ObDr3Kl@n_pNjsoATDzKWiszwWA3nIe
zJBs^`yu!VQU*VoZFXL{;We$(Py$syV2pxDy-N^{Xos7WVY392ar#H=gV*6E7qwk`f
z46RK|-_*X>lHe*o$vQHTc85ZI%R3bEY<Y)5-JigHjCop}u*VuKaTaAK`mxu#dHmYc
z(frkb4o|{h7_@qx)t9z4T(sbA$8BHAp|Mjr{AeP#idw@vlM?v=uuQfj*kdXCtnF&$
zqz=KOZriqvm*E>C_lcLsuH&9-r*I_hEUw=X%ZrvQ<paRlE`cwYTUZ$s_W60WFIZXm
zX2NEt?lcR&SMHVz4qNb?@;e2G4jnT4g1LU4{g?LT{9sAKj~13^TN2Fi^Xh*_Muy$3
z`}f~}XCVzUCfK;!w{JhU_V3-hr|@<+Z{Fm;{`yOi)GzI5ZArX*za)<q_q_TqcNw*|
zFJ8RJ_DJ}Uyn@etp6yG$_S&^fleu`F?MvHNf%m<7^{ScD)w3y1OG`JU!~gZyU!Pn5
zA3k^pyq{n`HH_|cz9!Eq4$lg^d!4TfF7z6FU_%9C{k+Ei(W6IdP6a1?^X3f}-<odn
z4aDEn(((M;@6WG&yDwihiLwTsQ~#~LKT_x4AcMA#|6lag&}IO9rO|ynYXsE+4gd~N
z**n~~r4oqi143Q{4d!PdX<PK+uAu552X(~@57{`(iPDE--U;iKum=&=DEu4n@eCj9
zldvuc?-Q_H*A%wv+BIOj@GMv_yg#7pgm;JV&J*5w!aGlR*Wu$i{VL(TR#+eGHww#z
zy;)(wupcX&4!#u%+l6lv;hUuJTlj7&+>D0n65N+y!34{N@20|w36@51VffAyzVixW
zgYP`yJ5Tt|6Tb6=?>yl<4?N9M!gn56n~j9CiNb*4TtYaP5Y8opa|z*GLO7EU&P#;z
z65+f=I4>zY7tU{l^O?eB;jBeCPZG|Hg!3Zdyhu1N63&ajW?d$n7YXM@!g*0)vT$A`
zoEHgqcNHcJ=S9MKm~b9eSTCG;31?oynHTt_IfU~%;k-^buM^JegtIx}Os?=&IBOH+
z34%O9kS7T81VNr4$P?s#`UF9KA;=EESxqO%JOr7CAoCF99fG_=kaq}jjl#7FjtMdu
zK_(-}WCWRvAQKYgFM=!#Ox1XTyhxB23GyOA9wf+m1o@R9zY^qEg8WL5UkUOnK@KIz
z&IH++ATv`KFmaHR334)UQ7s5^GC{s4$oB-<o*>&R?33X4#3mznJi+}zt|!R#1i7A|
zlOX6MfJbUW&`A(<5(J$DK^H;LLlE>31RVrH2Lawj6Lcp8-HE~l3g!>`5`w-&;Q^s9
zA?Qm8`VxYkhoI*{-mU~a4?({}(C-lRJA~hhQkW>{cL@3&f_{gfn<D6@2)ZePZi=9r
zBIu?Fx+#KgO5v}dn<D(al)_O#H$~7*5p+`uX9b-a_zofH)Cl@Cf-a4qOC#ve2s$)^
z4h?IoayD=3KOg<esnpYnXU?7lHuL<2i)pqD?MvE!;9&Bhl*31k9y@;GWPRK8`f>3I
z+g7at=4Tf`Lwjw~eX0KX4IAHBwJKUrKCxT2+NS&dxO~M=D_5<0bM^eFHQ%mXXPZ9K
zcg_#r&Yd@Z!NNrg76X@KneGcWa-{F{8JJ$UnX_hp_kCu%?}UkyfWqlD(zkb}6?&RE
z-FNhuv6$xJy^vv?!Q|Y=Yw5lMu^B#m0A_u}NMCaWqfF_(ef#wvFks*yB=>6PJ6J29
zC&HB8H7p#s8MvNEwrIbPDP2%8!oF`vJKxTsnXZdgf19@WNk$^ycE0TcI%K*)ExmzC
zCSTu%jT$#;>gWG;v*rqSqosdgN~bUDTe+|B@qnvcr*1vX)NVVY4xd)9UgI-?posHu
zcr4wB8~MNpI>{ov{F}gxRCu@If8P7gdzG?Ee*^AK{1^Au<Mq3nhC6TG!i8PSJ)Zu$
ztIoxxoU3a&7dKs2>7{ipWlYXRSN8GprOnA@%H+)=-K7|CHzi&xUaWY@;w4KxUcS&P
zuM~c@ND+PESDl>oMITRh)aA>c53ayV1@pi3^5f~|)g%vjA5YgN#^l?M{}aN-BcR1O
z<u8kKN*tcC0<t`-n9eBok^foFC{jk8^*JRg<7Z|E@ZMzF?ZwE0FyX%#>g7@F_INZ#
zDF4ZSj27w$gDGc$1u9~J7ItuUF5wKz>0D#Fu0U01J;ITubX_<?ViDKUi+kujyqxu>
z`uzR9!j;+8S)~U!d%G0(6tiJDDX*(hyhiQM8^g5i<t|}=?<P&c{ohdObBXeM)c)MR
zNssoDEa|$UHEP$WU0IbkhW(m$s1a^7uOdC4PXp5RtcH*1=FMv*KRzP)8hX8^$3JO5
zUv0z{Fj=Av4tkfS!kT96bnq%y)ERYUhP^zb>ddgDT833HGhNt*z15sw%(93uhb0ja
z<}fU?a2DyxTALXb+b#Z^^Q-KZ`K3XN`qVgQ_J?eoT5SB!u5;;&E9hD6hV#F6&AZUA
zcsKvH!G^$qc80dCTNv84X>DlHA=I$6_3QoSw|d9hrrTD*wO^F%c5rf+N8@LF$6dRI
zso!B7G-xol3J&Gn<2v!2X08US0+xYUbqu~8-1enU>&^3*tm3a4G~|@Shk0Xk4EK&0
z#fhVWc(z}e$IJIA<4pbD{D%6!v(^968jc+D1rO>F%EMvH8-hEek;8^^V25_R3%?~d
zy?#;a^1Vtnsv0}_RIA^j?zOoW%WnAXpLfoU;FV{RjMHiH_m7LmdCbRZH!yPD&(*W$
zzG>+n+}^-Wsj=*IY#bLn)RuK;L%7&Ve^v6Y`?vYe`?vV7M}PAD^9OlU6^ru2Ds*rC
z;3Vr-PGqNbA*^2;#;@Pm!%j<D^4;^y*VCELU&`R~moxax73Q=f2YFfzi}K?u7|QOP
z$278R2u-e7h$ed($}Oy#v1n8p7p`!h3s$_&`QEw4dEZKBDs!6+hJ(Dc2^svGH*@`_
zP9wuBVcuKwM2&se(zl+WRo%vh@`1IthBmGhy}D_kxqCa%-~*j$@WD_ToZN*5?deE^
zHnyfgE8CZRyQXg)!*ADb;rBPUaj%_Ac*?eDK5^(UpGY~%r&BMmk6&}^F*c5t`R^w_
zpBa)5Ci9Prmhg^ETlm1PMBa$sliUc~+y12eT)j>$yXC#AeqgYe7Jl&HfeMO#Ed#oc
zDxXxdTfR~iZ&hCI`O5EmoxyKw2&F?$B+j#Hm8U9y<;oSl0zH$`@1$Sj^egEsx=7Ct
z-?v-dyP7rss!@wSl|QO#xBM54zH*g1q#w3a`J)dFUp8*wN_HH+wIn2PzT2R)pg0S{
zBhldONxr9<`%D4JovjnOUu1Q;vvm)2_wHRKzstR?tDtLFuhFerw@Bo4k>xeHUF3EA
z77F1$zq)IM>lErfmdN94;$p}Uzl>&VT~9l3&t<2gT~uk*H{`x*EVb;_iRun&Pu;>>
z)6AgiN~U((I-NY`e@#Qj#8b6~sr2DjsZ{05RI2QIioEKcqLC4?O5U!0VKX_$OeU92
zeIVy9qlzp0)8;+bXm9c#bSPmLRoge6JkR||rH`+ml1IiX85qBVMs;E%=<1PO^!|>i
zR4;8Y)w{fu-aR#jK0Y#nzB?2{mkuUS<J9Ria9VpBZWut5CrzXo)2HFy*mSf#fa1o5
zQj3ArY1`DEG<()8C3lMcVL0yEY#JU+u}GhYyK8;=^ilV6<c>}EZsD|HXdq-*$a#<-
zH90R7a^Ao0-x2t)8382-W^!W^58pM$xP9?u{jc;58aC3x>ZU>6dcG<wcL-{HCOG`h
zC5+nvBIQZ=BMC#IgFvTXgx(0dxr55Tp{@v2c$XYXmnrM;x@$R8(+&`$O1zdSKRFc9
zI~8$uHp@#6d4ZSLy;?|<e;i(hT=hz!!sc+k`~~vA^in}{I8R<UN1Ybdu;QlXh$EHQ
zp!QkIz4k0J>;oC>?6C$m{s4XEKI^Deo273hw-^jcR#7Jfkzqt)G5*i8tV9AisL~*K
zh+@dc!`VZA*Dk1`Uhe|*ZFso5n+G}eo;1bHy)xykSsMsM4+^4y5+zDhcBrYZ(Eyp9
gahex?olR$WK`*K>qzm!2u%H(uENDe|IUc9~1)WDI!~g&Q

diff --git a/dll/win32/shell32/res/icons/167.ico b/dll/win32/shell32/res/icons/167.ico
deleted file mode 100644
index 65e10a525c1c1b5861a849a4cefd9a7f8c18c9c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmeHLy^a$x5T1>*n{-gnAswmEwFo*S;0Y)Z1uf4&d6AH4cnJ!MR8Z1@lox=8f(D^`
zgexgdm~U)PGV9pB{UHd6wKVI^%(wG>Gxkaw6IC>$)rv4LX|p7{O%#5wXmg$D3w)>S
zgFS*Vt~74E_)ZVrUDDg<_vpjRC-il5Mju~2rEl+F(~nPYN{>#lsRL67rVfngfQd$&
z%G4O@Vj_U47YoF9mnH%rwB)#4ng|d=JCY^>`1oEV;;jrJKCkP!!KF44z{eY(z@gd+
zB<{-O40B{qHTcpSz))rr06Ok6a~u_d#$`}(3LclgVFVA|MDKA|j_Z)S_X<LqWZX*&
z84}Ouq<N@Rn2_fA^U^{BUvolQ(BdoPc;!ZL@26eYsu@OA?IW!Wc;3Zlhk$?^9e4Wj
z`GbHgf40JdioC-{V@nV1mTtkW!4@zBt6+3s=kQ$sdtk=epRh|~>@QPUYX~gb*7&`3
z%<b=#l@~Q#a~(KA;O0on<?iCY3((_{cBczb26KXMR6E9kcCKU4U~YULx2%tku^{Fi
z4$>f8_%^p}tfh|+-}MeZRD<Tie}e=5t9;BqMnj2TuZ!SfpYRXWAbGj>x>ojgG0h)o
z=(Hb8{P^#-+n0RLSnZR&lF=}VUusG9Kx+_PS_41Ri5#F@{lc%;Tk4Jb5NjC1uX*@+
z%^$y;63g|WFF)gB6AsoD?@fvEGbs%{`A<uEbYG<Z!Y^~Iy$?U{6X2bORGySicxCRo
z*Gf3%N!7~!T#t{zpWADtK9uU}8k72uxz|csgkP@#`=rM*r}|LJ+clQTo8s@9uP+W<
z#rII^@0+&|UNoe75%c4W(WZ=^eZJp^GscRB+&d?D=EfOk%S6wg(va%IRs5`pbqMZQ
zbFTjXiC@-R&ws0a-eb8nVE?h!y_Gj;(DloG3-=HHkYkE9&L`G5b69scpV+E1i}TDm
X#f3YosBl(6IIGZS6mrjJ71sU+{R#7z

diff --git a/dll/win32/shell32/res/icons/182.ico b/dll/win32/shell32/res/icons/182.ico
deleted file mode 100644
index a5c73c0226cb165e5ed048cfae53c69a7db9826a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7278
zcmeHL?{8C87=Am(*ao=Xt?i(|xV`IzwLr&O!KoqYS3lX3PWeFMO#BBhXpAwb5#k4a
zs3=MlV}g=Ef}f1Un3&)a{9sVxk7zJ486hJJWZ7VB{21Huc}{!C-L>5qgMN{BeR_J{
z=bZDLb9(Ojo>wFw3&ggAC~IY~Mr5-H>VkT`9IF>;TVU$891Dv4xLBlvZGfi%_M6EH
zg@P!h1cfLxJay_6>LLaG2L}m!)+FCZ-lYYsX%-APxtvon*KvXY*Ku>kTo-)A>dCrA
zU!HtEpYL&9bmLpGo^@kZ?!=Mo+u)u2%lUjR*6aM#xAiUXPB@SLG0Q!1w4=M!KkuS1
zjeIt5W!(+`<j(YMJ5C;y>umqb{h=@M3CF{HbMA(7PKie+@D9L|<43IQOY1&$TAR23
z%<<@V6TiBx>GkJI{T&CqwIgwu^_-LA?D@v^>Uo$q_TPDA_W>sy4tHh4&E&VG-*1i;
z8^l=Ov}1SJ#iYVrTQzU`>Jsx0_x4yl;ofXMoXs}}1F^7`)h|;IS<mQKsovh=F|?mH
z9Q3ArT^3H$%!YHLt$<@zO&Hzj=Nu2i40iC~LD{!&pBy-JNcQjFFH=)f`rLoqyG1^F
z@ku%Q+6!{_uixdH_g<CL$3K+Q$3BqB$w|3=`?hR-J})P~|4s(}J}ciIep4nUCghii
zNx6CRrd+>%U2fgFCFA4ca_!nRJT3)^{Pv2x@!U?4*T>|>jT>_H>Qy=W`3@Nw8Ij@P
zVHp}468U3D5{Y4{+4ioCjg86W%a`TSrAsn8Ix2&MgYswJ*K+aVMXczIyz{IrSFT)<
zfq?<JaN&XkI!?>^^XH|%zhCz3*&}=R?v-7;cFnN*ht$Izc(?=iyaSJQ*HpCb$3<%6
z?G-IvD^k<GxuUh>M;-jqlKrP$k>9j*gSMrc{HA#)WB5!a6N|+%na)Q$GntJWH)b4;
z-<39eI-LfePIq>8rqkflUF7YQ;Zvy;_*4pfDg{1elV7*q@az4yj(jv}=ATR^@vE9l
zu357tnOwVeZ8A!}BjGXdi3IpW0(_!_{POq;ZE+g-cpQ8@4nDq|d~3z+ZEw}QjY${H
zaaOKe={T!at#X{Uwl+uet8I^gw{7sY4c=bO{*h==KS~21je?Ix!AB$Hmo2Yo%gBdX
zD_V$rQzU2wH6qQPpWv33=13FyM?zLG7zzfhP^hKOYb~L$=9|!8qsiC5=@Ie^XE5@0
zOU(D9OK+`C^Nan~*tod(D)J3}Yiw*NzKZ;!dao_=RLR#a^sdSG8GNAP(**(n?mW%J
z3k4`u6GnG>oMPYYYOpbae;%?3U~qH4QCAv2fYNJAP_cm&&<$(>o_YXy0%H<sAO_&(
zA`OUVzCt{s5UW)M)I#iZ650;H*l-H*nL?aa6;O+skZz$q*G+B2c2xnjs7Y;_S06F3
znhEz~j+OKg-)e2d!KxfMFSeO4%IPCcSBSG`)n^+6#P`a;_z=4*#Om1FGk4k{mRAOB
zM=k&UBi2`l^=H**8v~=w()g%rV0=cKC4JQL>*KznaQB#1pKT1h`o?FpSsI^LpFV2&
z^>GJMxC70q&o=V~wfy?H$0^*!wEj%zpKT0qpHl|Lhx?r}Fh1P(lmUIz^6TS1sBj;g
z6O1-X)7NOTG(Mxvl0Itr^>LR~{J(^|Y*~==!>eyNufFkl_35LQUmthss{HTevrnyZ
z`aGB3GhOL3pI-uZ{yQ)}<N%a`@gXOm4CpJTkDP&iE;xs~g;(G7G1@GR&uFuxk6Qlq
zBd?*)Wu@<*XVwp|zTv$3#^=?ik6M0x<Wuyy;MsW4pq5`B`5pbe@Vj}?pq5`BIVZg@
z$U7<IofJ#%lfO<Ma#9L8sX2rF*q>T{edN6q=Vi31%Q{Ol2i6H{-;1#y`y-E5R-f}S
zS}e=e>6_2`*`I6muOGQVRZVDpr5Nk$_>23A9OSIOKV^TL=Gc!~T7OhUy!yz4s`&!>
zR7G%{N}r8>{fOcn;LiGyk5%)9(d0OlJ{$dpakav$kG!x#UU<%6zq#}^`bb7MQlEDL
up1o?C_xvMI{srn&^i>PU$$!bU|KF`&WI>^{2`qv8nXlk@e(3SdS^F27Q9Bj@

diff --git a/dll/win32/shell32/res/icons/183.ico b/dll/win32/shell32/res/icons/183.ico
deleted file mode 100644
index 16f873c362fb344f42419856b5e16e2835ffb448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7278
zcmeHMU2jxH7=E{u(iXJ4-H&o8boZQP>2~EqKn&3k_0}u9q$n3A@)N|MF~(#~AYSmH
zuA-<A6VwC}y)ls(6B5z{jRqxA5~GPp2`OnHO$(*vqqO7m%<gQa$32x=JRy;{=jojH
zeP-s_na<fW^HwAx3nY_?qHL6*29ZZa;0yd_Io2%FwZQlpITjW9Zm~$7b$}-UwwujL
zrIIM61cfM6Jay_6e36p=L4XAAHOXHj@6aN#85WIrw&ma#ZHq>7wt0W|tM#k3z<Whp
z#bQq1nEpWPiu5aYI>P=C_i~<B)CBmC%5JLo<LUfH67Y|gw<WzV`m=8oQ3?KsM{}_p
z_|5DAzUTGj*nu|kWjF5q)Zg>Fccz{7Pkz<i;T`E;^QZSiKkI*7c3&(WE<b-H_r3P3
zEp@^AyN>QDd&y*SeQ&az^|x<$r`@eoa_Mi{xhI*!BqrBy)x6yvd@i|TTWni$M{i%U
zx34`Kag(uLeHlLydrDtbKO46U^=EX4{$~8SVpvVH8`h1s5|&w*FuF6>IUa^t?BKzJ
zvVZ@6DIYo{2M!#N>FH^`?myVEMc#kmaryj}=j7~fzslEdzbvPZzbB`Uy(?2wQ*!(E
zZQ1&4pPV@PtqlHgR=zp>x=c<^%FmNia`Wa*xqkh++`4s3CMG5%^~+20+B3UEUL6-X
zH!M9pBXaH9HMw!)hFraRRYpfgWn^ST8n(YBXFu7APkTn*d^#h;!^1K@J}#FpUzSUk
zF3H%~m<$aK$;FEo<;s;SGB`LW7cN|o^XJdYz`%g)-Md%z?b|22ckiBM#P_NDGjM+f
z?#c{2vZ*1^HsOujn9l}UzEPwhyD`wRc&Yz0zah|cdvAT9dF+4P!-2Mryt_8gT=J{e
z1lnry>4yR>O}?kFa^=cG0dLVlVb!Wtg+h0CccEfE<efbDd>(v04?dp<pRbrhz9S1h
zn+2cEg3o5bS7*FK^E2OMwx{`wyKLDq*X``=blv64m%HwY6)Rk~tE<a(Gi;wqgHNZy
zr_<omY4GVZ_;fl&eyIcAalktcc*g<nIN%*;DfvW4pe4w+rJ}K@MylO<1;^v<sW$Qt
zCSuWOA{vb)67eS6;)$f@+t6O4&DXx|LGlY{G4f4I9<a^!nl!)IZ>_D1D_4bY@mp(a
zOXaHYi<)g)WVz%U7usX;-Gh$=K3yQN!JVg>{X*%U*r#OfbTpV4!Iy_D0=T)k+i0rx
zA3<r`5;z%PEwCBb0zB~_;4$<`YyeyUCl_hK-sVf}Z4~xup@3T0N1cGS2XJpVjs2Ly
zJ}nebi<*#*Q=j9eHuia;fLhd~Htk-~$6i;3fqLV|K3!qI9SW%BpMUK6754n0fLeZi
zoK+Og9-)9*etn#O6wW`PfLeZioY@r4VWEIpetnz;70!YR=foQ56F4{4U}88&;`yz>
z#Bi=u1}0Xoq?TVFXIaJXC0n09Ve6Zi(Pn94Mw_LH)hnsx*T<P!e+Sz7=KI*zH!)k^
z#B6;Nt5;I1o<5(;Fi=k)`2xk~0{Mg*=o82<)L>%BHz<Qz?A)+I4no7kkdIIXCPpp)
z_>tF8T$i>!eZtl^F{9107PItC%xJSTF>3kskxx-v7q&iq!qzu2TfY{w^i9mxH!*7Y
z^^xCE{JVq!YWek%b5fia<ee1qPP(k;Glra$LQZPVU^}*_mR}!vFU8MgwD~#cvoxQH
zK0)n&V{FIv$fMQO=jSq7EbIA<&1d{<&$0T)kKCXN6Ix#>?)CNli}Q&bq(TmI?wDgc
zYH9s3m9q7b2UYV0@~MhoKSB3Kzj;*g3{V?C^08{ZFq-Tq=-%kJOsGy<A9-PgyzrdC
zc5`WK^pT8ir9RIBTzg@fz5bCW{}lc-V_^X~`Oi4^|GN!{EGShcfhBM^|F6RS{LuZI
Gwe}YZ&unV|

diff --git a/dll/win32/shell32/res/icons/184.ico b/dll/win32/shell32/res/icons/184.ico
deleted file mode 100644
index 0bcf28650661a367c1d5105f3e5b4ecb4f324f82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmeHMYfx2X6kVbspa}}0VvnmO*$eH`gEW;il`^zad_gJ-gb&0w`I;OBa}<ctAZN6!
zQ70X9N>OXF`lZt}Q&Ku<>ZmXd4$3$pC_WH&YoE(uPG|1bZtBe+?z!uJkInwp`3~pc
zx0XON_`%@-+W>3{03w0Lu>)H|fCHTCu5&~zp+9%CC@d^QUS1wnuU(7${CqStG(be~
zNpc?)P3VoyS));M<Pdfj%)|bzA7lTPHK?zz$Bi2|Fnm-3_Wbxg%8!-cyY-7vS67Dv
zb@jM*?HaCJxq|E0ucNlM7MCtv!pThwu<h4kY^ykqeZ_e=xh)4rcjn`GaXwD$`UuB%
z<l@8+>u~kzRa943W7oPVIIGuDeHI4`#^b=cY4~k@21-87z+W3@U~fS>4u773!&^T<
z&dL?2s;a`ztCR6HYbuE~M}ESeMJXuRFcZITn1!R8=U{jKR7^}vz_$fcaO#^JT)1!n
zht{THUr{P{e7O(@3n$_a@|1j*i9=t^MEO@)=sPGL`B}+G95D=M_bkWx^XE}o{2|JA
z=AdjxHv7wQYS#*s5|w*%v2<=4oc-cZv@`>=CyztzFY9sn@?}(3R-!O7g_wk*87Wx9
zHf7XE%uP<hn1lo@OHab~6^n50+&L^AHv~Bo;*rBPWpE7A;$kqSZ%?e8mV}y`8dOwN
zAay_#(g*fHMw}BV{i86nXIEqnAAmDw&fwz3izqKI$LZ6jQC3!l($Z3_TD1zfxw**B
z&c4~>a6fnd4&1pruyB!|$5^x&Xb~UlG2&YQez6NYMy%hz$<KE>`C%B}uCCFaZ`4P>
z?=hlv{drkNu~QqP%P&`(HBa-Ab3I0+<};>ex?;x6S+nO%=PFIe(0oK{ni21%Po6S$
zTB<c7G(R>mDe2v$q;caXBu|`_lIXe^qe&dA`A+dehrRXoJHtmLj2tz3OuRKZX}&}3
ztNjPOHgM43xYyqp@@A~o^Gn;<4n{uu`4?V%Ddy!~y<h3mw_mh1jC{AqC%XGT`P9?T
zJR8-c=W~%xCqD+9k=?XDJfibM4?ps#!{O-C^|8kztP!sHj-5P4N6m+I@EBp54-OA$
z7h)j1eW*3shX-rEZCJaIkg$-Dc41+m{?-T$d(g-Sv)(|ktv<M|=3Cw*H1FT$0c%)C
z{zksFJ%WN-yFRXbpgn?u0$m?hzEyxVT3LpgZ_(1aCtIKSW**-zCYs;!J?6jjO|gWl
z`4UR}&vT07me+fa`~Yt}_{RyY2t8cgY4|s;-;Av_+Hl|?qKFux57F-~pcmIvIEgMq
zYa)>6hwVH+2+xW>fpYPzvWMJV2|b%O@a!c#v-t$drJSS=Res&Ka`P<Z6DXH*D!0bH
z!q4-h@Vsrn+BfI4bvN&B&aAQLbnI^bJmU+`v_64y+3!Ek)xvXi)BertH(PtoKGvVJ
z&RP4`HFRFN?EKV4!t=dPpj>u-Y7e3I5NZ#Ppe7M&5}_s$Y7(I)F>1{HX{&48YOGv#
ze(Fe}J`(C9x1eScY9^s(5^5%)W)f;9qeknzfpXdTspEt?PN?G=F{!CfO()cJLQN;s
zbV5xh)O12kXVh5tYwhcL*0J_=PPy#-)Y77Vm#9C5`ctSs*<UWypF;g9)Sp8ADb$}r
z{VCL+Lj7sfXq`7uE;~Opz42aBGYd7dP%{fPvrsb&HM3AN3pKM)GYd7dP%{fPvr%K;
zqrTtfoVBlWI#w=s{Q6!}=L>bdQ0EJEzEI~2b-qyN3w6Fw=L>bdQ0EJEzG#iNaK}$?
zLiD|$HzD*UjG#Xu^e2S=gwUT5`V&HbLg-Hj{RyEzVbqv=)q1n9t$l3HDVKf!^i@Qk
zOL{3nFGc932)z`cmm>61nm|uQ=&1-j6``kM)M%YIP%b+^{T$Kf!WU33J3sv;<GIk^
z&E1A_+4<>tiQX6bUP9l?Xx)u<j-Hs%6Z0Bcr}fHZ=cn%`dR->BUWbmgHLpp>3g!MU
zp><kMAI~knUYE(Gt-G<#-Om2CUiWI>KfOuuB@BKMJ?k6iFTJ1iK!qNt_wce#xeWdq
z3Aggohn3p}{ajJ#I-dF_e?XO}258zp{b0FWn4G$fr@qM_SSy{a{Pd-TzO>iSI&W%C
zewyJy%CA~LpFLlO_4%hyzmekxo%0p=e*&9y@Beq`Jud~CFKN6GZHYVSSLk|n80#zd
E-w*s%+5i9m

diff --git a/dll/win32/shell32/res/icons/185.ico b/dll/win32/shell32/res/icons/185.ico
deleted file mode 100644
index 9a6078060281b30bf6fd3655e64181a387ba5018..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmeHLTTEP46kQkkfO;*c^{r)mReUSfXLYD=ZPi*4S_O-ZG0_h{j6Y3`N)sQ|XifYu
z+NeomQ)#Oqlmw|sO{;BuB^u&~k2EncVHg;g8JHOc5ZJDLnVH-<jFg$nhZxSVXP<l5
z*>|72@14V12e42CpAYmUXf6R(0I6din#+Noc&<{<(N@!R+;pw|;Fk~)$ixI*U*p5i
zzy5;p@d@mDY9+?T#*j=V>Hnr5#;b2`L&t|NVsvyAiJ=5-2#JJR0z>SNjEo>2k7M7<
zoALS9C$aaHr}63A&tdONjc9(M9=o?}K#X`i9z$|?7=wd@Xy5)kT6VvK16{}PV=Rn4
z9lOx>#<OUB?HLRuhcFNwz`+li(9(GXBb?&|=lWIXFLdnKiUaR%As$7P77mAT<df~#
zf3zKcjwTTvA4BW0P8{C(77l;B4UtF~5srz3BkV_zh$qn3*N-1Q+ktOeKEfAYx1qK3
zD86aiiSPHlkMH)phkoMy{c3%P#bOABLJ0MS@Y^51BQ_XAPfrg91_sa_?4|_~><*&4
zn|=BqeIO7(psS0%i#a(@=8bT!J-xjMGA0s@@LY7d$1{)3SKvQV0n2E{v@AbceS_cM
z;D7vy&Gl7&D|>)dwb6dmw(ZAg8~Imd;_Dx-d8D?kW<zalU0qFM<9ZWc_mFM#kEY+7
z)|vR)`<?bc%B?l=>eaX1e#f16-F?r!48LzpwTYKqyYjm0Z@BTMn^)a(tACZh%)~1%
zx%9HjuekE6tFN)`D!Z!E#4CK~oqxfF7p=J1=d=nFUv}zgr=M}=S!bVfuD#s0moGE%
zrDbL1<tLq7e#)d<s<^x4OHSatOHWL-(j~;*HMdGivs#Jbu9{nm7N^?6#rj#KxU1$?
z@q$!axIjO}io0rV6&X!&SIr-E&sF<6{kd3k*K2F#sJRP9u9|1zIclDT=csuWZj`)8
zi|TGUYVL-Q)93$vkuem@Fszx{AwJcnsaD*C3Yn=LLba1Ro2U4WGuycZ@9${eL~bP>
zt)bAn*1Y67hDC)OBy%p)k4A-Dgcv=Ie99T4*YJ{GuR{(b<c&fe<aq5n#{u(ra@-^q
zaOU7OKe?HZo6&+oZYJbrG<xS)`)N}wb)MtN%|v6p<|juKa>UGiyZd^d>EpCd*M|I1
zG}d$eSWL)Sb6fAfoY(Qh$ag*GC&w0YY$3-Ma%>^T7IJJM#};yIA;%VS>`Z<1{>is#
zeWI~m@1Gh)s0)O;K&T6Zx<IH4gt|be3xv9W?|E3L3ux)z1^fJsXsp-#)GtE)BGfNJ
z{UX#aLj5AtFGBqy)Gx%Nnfuq@i`GEB#(K?9jV07rLX9QVSVD~@)L24|CDd3#jpg7v
z#x#xfnxA@5s0W35P^brmdQhkbg?dn^2Zef2s0W>UrY6kPLHio(H9vK#^BnbAQmal{
zf<7^MOwF3Yr(zoG&R@uSPTefj&6)esXG=XT)X>wKj?q|me(mS8p6ht(cPF1-FJIGG
zGk-qoxyEuILAZ}Ft#QA>!A-BRX8wHEbB*PmhHy_~TGPBb#`GF%=Few6ck(+dr|_>S
z`SV!Mxkus5U$5c8GW<iYF~6SAujl`l^*mo*tMC78uIGj2pS|_Gko>c`o)?mTHrMll
z@)y38JCXVh<(oG>p0N!Y@6j^rdHT9@!8^svV~;}jGMc9DQKZhze4j%1Gqn8!SA3hw

diff --git a/dll/win32/shell32/res/icons/186.ico b/dll/win32/shell32/res/icons/186.ico
deleted file mode 100644
index 294b1d9f94d6f5d7b1c72e3483c2a653773e42f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmeHM$#N7&5X}K2jTR8I$x_SX=^l><$q30<wq#qfk$tcu48bDyErJLLf(Q;=ef3B1
z4_vwW<S+0Cu!?<08%Sa;zgHq#HSLkq4Fo4L^rE`^RoBbPs;;R@iKJwe_`aY_%ek~j
zRpiaRFXz^a{EKJZd<KjHthbz<Jb6;ioH-+>PoI`kr%uU<6DQ==t5@>+^=o<l{JFe*
z`BGlIcp=Z8J(KzQc{zUkxLmq)NiJW$EEg_ZkZaej$@S~k<;IO0a`Wa*xpnK7OioV9
z(W6J@%9SfJK0Yoo^0!>QdQ~o7yeLysQ*z|U5xIT)w%oaMNABLeE7Q}{a`^CJxp(iL
z96EGJ?%%&J2M->U2M->|%*>1&IB-CWG4k-?L)pK7zdU;MNS-`-B767lmB)`C%bq=Z
zWMX1M#>U2E=gyt-^yyRCzJ0rF+qO-%Zrv*9&!3ms*;(1QZ=dYmy<2wd*de=i?UK2<
zIT;ujSS~ytxsMU}7y(9LquLVTP<rFW`W2SqN31P2kM~DLHvOWFY#ALM?kPL+;73OX
zw<!N}YbnTA+}EK$IQ)b1KasDY(SXB`wEC8JtGN7z7C#`j6rXA-k*{^oX&=0$!}odT
z^63(n@LoO+|M~|*|5NGGkA<MSdy#}zPYv(qf@;XK-#ulAZ!VOwLA7e%Cs~FS2fybf
zEk)j6;6>VtMX<%<;Lrj~K3~ZA6-HP#4-B+h8|eS8hW7%?_j#yct^eDQZ_4E}1<%IF
z>+RcYt*`%^THg2Aes^zg--7jjy~t-vo%s@iD3xkAYFO*p6!HxjFXNRwUjnb<RlROl
zwc7KQ!)H5kg+i(12SKG$snROt4U2qdrX!p8@@ylpRVqPH{&JD;>TJt+xjdTie4kZ<
zz%PH{@LlV?Y&PeihF605K=JdCZ|vy$tTUU*=5qNwsw|kxw{@)V%yecv)L<2B?VpD4
zH>_)0pTYYJ4J@>fcln0KbYlaosi~>CxjCIqx3sjhuGRM?6}45XKUuTJ(q=wo%p`tV
ziE%OWB5ji&2+%6k?o<5G<@a=9&`un@C%Kwtuw7Z%9RF%wj&ak7I&DA!Xs?5n#oyGx
zyNnUr$OCMX8^#n+&l>Qs2=MzH1%3zqh``1?t^;_N_1VU+z;D1X&;zsrQRBQW4-F0d
ziM`w`V4?sYSK8KNeQg7K%Q-Axf8p6?pbJ<9L~Skhj#Jn>8tf@8utzo6!-jJ$i34cd
zuq^`nR)e;u@vH;j7}quIUk&!+2773O{j<To+hFgUDDLVb1nhg%W`D3>=KZpUJ@o(d
z@q#v)xa7M@^f_MaKh6(f|6P6eI*v0*^>H>aI1h#TQN8H>N<Jjj$C=IQ>-f8Ryms$b
z(kA~d`mUC0yU&)=ckA#v$@sJXIGft}kF%onU$t>Ytm%JLNBxOD$9dBF5NH0o`Z!w}
zoO$g$#Cg>a(YBY;<a70#YY1bIRG;4f&fZp^v52Funp*1ml|&yo0o!lRL7e|XeI1Wz
zpH)jsu9q&57qI=unVm6N))@b&KI1^`dirS0#u<4DLmfi3^<MRnH;Apzb(dq09Ee>D
zxCTepVQM2sVUVA&pbzyxo^ufSi?`B8j>V2aJ$>X$40+cN^~Wu#j~q%YedLAgykiX5
zf5t(5V4u}&?4ix?l77&KdLT!A<Z|9xpL2jdMD_ViP+xtZRy|N3Ii=Y8ocEmn$Z^@<
zU|tid&ywSz-=*t^`s0@T4zUM`rH>q)jXV3x__MUyC~X{|&AkDi+c|;Kej6z1hYS5~
zsE=G*B7MdHc|JQAI0p!g1O1>61btAbo?DXRH_6{t#BEvQ_s{+_?(94D=?CW``>UlJ
z5A`GJ3w4#FKJt&T^^w!GJ|Gtwjse$VT^BSK^og-hsGeJrqdxMWiS+3M^0Btxi~&I(
zG!8l@yw`EjlA3zWl4~Gxv$6D%AGUF)KJvOY4%Fs&s1F(o#>0(?`V=jb>ND;fd*q?R
zxuA1`{dN6_`l3F$CD&!-tz-3{^N(?-57gIwYw2pc8cW52&y(uY2aW^xLM(ajf@`#b
zzn2QuS8yMz;GP=!{fT8iK9Fb6o*m;i_^!bJ9Sr{OVDNtjga11a)5ne-8;j~|o&vdv
Q#(zXs1F3P8A1YVzAC%-Y3;+NC

diff --git a/dll/win32/shell32/res/icons/187.ico b/dll/win32/shell32/res/icons/187.ico
deleted file mode 100644
index 379ae10b7d38a9218b03b6c28b496e3e2705661e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6518
zcmeHM*>V$C5N$!QWm{mhIkp@{GovU%jxh?5C<ziv9+Ij+u^7xw6;)6aRXp&T*L(#3
zz$>qL$`|AVSk1oU4Q#Vc&bf9ES5rbrPQsI0b?VMc-#e#o-<~@?Es=<<5XTX;QMniu
z`C4T0+>wiGMgGRMb-V^_2iUKfoH=tw&YwRo=gyszvuDrB>C>m>?c2BV?%g|i_3D+p
zdGkhIzkV$*U%r(2`FS~Y>Xcl)dR4AnyC#<}UzVFUZ_2G(x8(Ni+j8g59l3k=u1ro&
z%83&v<ofmNGCn>oGBznUZrqS7SFXs^)RY`Qeq5ybr`)@DPwwBpFAp9(km>1ZId<%r
zJbd_2jvhTKj~+deBS((N<HwI>W@bhXA3iKko;;C5hYpGF`||YZQ+fXUxr~jC$+KtA
z<iLRgGBGhBqobp;ckf<#@#2N--o0CP?b;<fckYx+moCZd?5xbq&B?)o2W9{M{jz7z
z9@)2VpKRK+shNwGb;}-D_Q3z;fvt5SBO`(f>wi|d9kpt8C_hv#mn)TOwMKodR;%n#
z{q~sSr3$6t4I4N2<%ggikt%xrr21_}KMZ|e*61Zxt6KW4F&E>Z7wFCKo><M&uj^60
z7`?>m^^u-Mei;!nJXU{y=v`wUEvIocOvt)_B<d8CUTJukgQ161D&<OGKlEGDUa7RG
zXP0t$s7~)Dz2bX4)p<+bopuslu~=HT|A^!v*~*XVp9uACpvNTh*=)A*!+U)y9d`?b
zq8TrJMmCqfuhZweLV<eOxOqX!-v#=vWGbFU2j~T>U}Qr%*l;68@8&%C4_?@?Amwl0
zk54!QDaUa|3PreKL59```i^)eo^dj+xEcORkYaJ@8%v+)Po~qjg9j@MMM@#hSEP|h
z$3VP4k;<hqP7XcTrQmsazE&6Yg9E+sTr!1Q<Xo3sJkQO4W$6dk<PwQw20d~P#09cn
z2Kvta!7m09@kA<_N}<bw*!tf7wFB{icqWldvWt<v&x7$DYkJqlF&=8F%=nb8@92zn
zc0jtiy1Ki&qtR$jPfu*Mj+aPSR;>JN)heULd(@H{e_o__@)H4Ex%xcC2~1u-_^1au
z(W4hg1AYGyQj7Ow!WaP>Ne3=wfikci_!anV3Ggw7u*Y)G{{`3rlz<oz7RI$#sZ@SP
z4mS(<?E>S2nCG!Q9=YWla=|}vo%_!qumT9nYUGSl$RmB^lLp97edMn`TjZnxkc0Y!
z_Tw1btd5`86zq$8Poqyiz%_0t$Xk8n;y&_cAGx!SyxT|K>?2q9kt6%ajeX?AKJsB7
zxp-h3ZWeI!fakQ$wiCHBuQwIs&JFp=ZS#{G`F=xw5SV+YAJtE-@N>;Le|$UC&EMwd
z{cV1p+ro2v(*!oO!;kM0GxlTr<k0!s{5+=pOXbHmn;F||{gscc9_##-pEfMT|298;
z&?x?F&hRl~PGer5jduJ`etesn_{Vpmk8e*C2O9s31DjLl&6d|~XzcU3<#8+VXY=E`
z(#JP%z^^uZh(BzL?ibuUmcmc}>-_19R{3e4&CUI*9e&gV%)A+c`2IKZC%@XzZ2r`d
z&jz0p^5c7*>(f-||1dxO&<a0p96XccC$ED1s2Q}(&$#E>qXuI3BJRNi?I2HBc#V5f
zBXF<gdZ2c(B!1LW%o?Z-VSb+LJAqt{Kz`IuTH;4t$iy9e!1>b;whcBvkL~vY?FfVK
zEb^m{vt)k8fZCw^Z1tH?8_3lN<VQWJWq!sz;~zCHvj_5+Fm`~K+!_zG!L~!+Rd&lg
z069oY{HW0xzoWJmwB+Ww@|#xAtyXQ(R-YU4qt4bAKYf5YpNR#=0Ac%q`3a$Mss2z-
zZF!x~Bj2s?TT|il&-v5uj6L$x4#pza-?W&o@dwW72el(?3wc#Xe$*aY=0{D_*nnE-
z!Ww{!d$H~d>I>RL8x+cCx73jzHPE*BX#?u9X5RDxK^qtcwjH!V*F{@$>M>jHgQ(56
z#E<&0@jLlZ*EN11H`hbgLVZCyY+E!=!fm_!^gGucb?6`#G$uHI^#$z++oCqvE%#;A
zty`Ku<Bxu)4dmB(Yio1c93S!nueZxj8@LY4h1l}k2KQ(M-<JyZS1<=vFdsyHf1>Hb
z2jzte7e@IE{#)RG2Os}C`1s$!$Nvt*^vRPaN5lO39z|`U^DmK=Kx7>4r>a%_1L9BQ
AxBvhE

diff --git a/dll/win32/shell32/shell32.rc b/dll/win32/shell32/shell32.rc
index 3306effe53c..481e75881bd 100644
--- a/dll/win32/shell32/shell32.rc
+++ b/dll/win32/shell32/shell32.rc
@@ -88,9 +88,6 @@ END
  * which also have a neutral version. This is to
  * get localized bitmaps for example.
  */
-#ifdef LANGUAGE_EN_GB
-    #include "lang/en-GB.rc"
-#endif
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 5c1d2354fe3..ef678e037a7 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -319,20 +319,8 @@
 #define IDD_SHORTCUT_EXTENDED_PROPERTIES 16
 
 /* Folder Options */
-#define IDD_FOLDER_OPTIONS_GENERAL         17
 #define IDD_FOLDER_OPTIONS_VIEW            18
 #define IDD_FOLDER_OPTIONS_FILETYPES       19
-#define IDC_FOLDER_OPTIONS_TASKICON        30109
-#define IDC_FOLDER_OPTIONS_FOLDERICON      30110
-#define IDC_FOLDER_OPTIONS_CLICKICON       30111
-#define IDC_FOLDER_OPTIONS_COMMONTASKS     14001
-#define IDC_FOLDER_OPTIONS_CLASSICFOLDERS  14002
-#define IDC_FOLDER_OPTIONS_SAMEWINDOW      14004
-#define IDC_FOLDER_OPTIONS_OWNWINDOW       14005
-#define IDC_FOLDER_OPTIONS_SINGLECLICK     14007
-#define IDC_FOLDER_OPTIONS_ULBROWSER       14008
-#define IDC_FOLDER_OPTIONS_ULPOINT         14009
-#define IDC_FOLDER_OPTIONS_DOUBLECLICK     14010
 
 /* Yes to all msgbox */
 #define IDD_YESTOALL_MSGBOX  20
@@ -458,9 +446,7 @@
 #define IDI_SHELL_FONT_FILE2       157
 #define IDI_SHELL_RUN2             160
 #define IDI_SHELL_CONFIRM_DELETE   161
-#define IDI_SHELL_TOOLS_BACKUP     165
 #define IDI_SHELL_TOOLS_CHKDSK     166
-#define IDI_SHELL_TOOLS_DEFRAG     167
 #define IDI_SHELL_PRINTER_OK       168
 #define IDI_SHELL_NET_PRINTER_OK   169
 #define IDI_SHELL_FILE_PRINTER_OK  170
@@ -475,15 +461,6 @@
 #define IDI_SHELL_COMPUTER_SYNC    179
 #define IDI_SHELL_COMPUTER_WINDOW  180
 #define IDI_SHELL_COMPUTER_DESKTOP 181
-
-/* Folder Options, General dialog */
-#define IDI_SHELL_SHOW_COMMON_TASKS    182
-#define IDI_SHELL_CLASSIC_FOLDERS      183
-#define IDI_SHELL_OPEN_IN_SOME_WINDOW  184
-#define IDI_SHELL_OPEN_IN_NEW_WINDOW   185
-#define IDI_SHELL_SINGLE_CLICK_TO_OPEN 186
-#define IDI_SHELL_DOUBLE_CLICK_TO_OPEN 187
-
 #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191
 #define IDI_SHELL_FULL_RECYCLE_BIN1  192
 #define IDI_SHELL_WEB_FOLDERS      193