https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01e5cb0c0423dfef5c6e34ceb0c4bf9f29a3f5f8

commit 01e5cb0c0423dfef5c6e34ceb0c4bf9f29a3f5f8
Author:     David Quintana <[email protected]>
AuthorDate: Sat Jan 5 15:44:16 2019 +0100
Commit:     GitHub <[email protected]>
CommitDate: Sat Jan 5 15:44:16 2019 +0100

    Resource file strings cleanup (#581)
    
    [CMDUTILS/AT] Fix missing translation strings in certain files.
    [NOTEPAD] Fix SUBLANG code to brazillian.
    [RAPPS] Fix missing translation strings in certain files.
    [FDEBUG] Fix translation string ID.
    [CPL/INPUT] Fix missing translation strings in certain files.
    [ACPPAGE] Fix incorrect resource IDs.
    [NETSHELL] Fix incorrect resource IDs.
    [DEVMGR] Fix missing translation strings in certain files.
    [LSASRV] Fix missing translation strings in certain files.
    [RASDLG] Fix missing translation strings in certain files.
    [SHELL32] Fix missing translation strings and incorrect resource IDs.
    [TAPIUI] Fix missing translation strings in certain files.
    [WINFILE] Fix incorrect resource IDs.
    [NTVDM] Fix missing translation strings in certain files.
    [USERSRV] Fix missing translation strings in certain files.
    [BROWSEUI] One more missing string.
    [FLTMC] Fix missing translation strings in certain files.
    
    Detected using the TransDiffer tool (early alpha).
    This doesn't include everything anymore, but I wanted to get the PR out of 
the way.
---
 base/applications/cmdutils/at/lang/ru-RU.rc        |  1 +
 base/applications/fltmc/lang/bg-BG.rc              |  6 +++-
 base/applications/fltmc/lang/cs-CZ.rc              |  6 +++-
 base/applications/fltmc/lang/de-DE.rc              |  6 +++-
 base/applications/fltmc/lang/en-US.rc              |  1 -
 base/applications/fltmc/lang/es-ES.rc              |  6 +++-
 base/applications/fltmc/lang/fr-FR.rc              |  6 +++-
 base/applications/fltmc/lang/it-IT.rc              |  6 +++-
 base/applications/fltmc/lang/pl-PL.rc              |  6 +++-
 base/applications/fltmc/lang/ro-RO.rc              |  6 +++-
 base/applications/fltmc/lang/ru-RU.rc              |  6 +++-
 base/applications/fltmc/lang/sq-AL.rc              |  6 +++-
 base/applications/fltmc/lang/sv-SE.rc              |  6 +++-
 base/applications/fltmc/lang/tr-TR.rc              |  6 +++-
 base/applications/fltmc/lang/uk-UA.rc              |  6 +++-
 base/applications/fltmc/lang/zh-CN.rc              |  6 +++-
 base/applications/fltmc/lang/zh-TW.rc              |  6 +++-
 base/applications/notepad/lang/pt-BR.rc            |  2 +-
 base/applications/rapps/lang/no-NO.rc              |  1 +
 boot/freeldr/fdebug/lang/ro-RO.rc                  |  2 +-
 dll/cpl/input/lang/ja-JP.rc                        |  1 +
 dll/shellext/acppage/lang/bg-BG.rc                 |  2 +-
 dll/shellext/acppage/lang/cs-CZ.rc                 |  2 +-
 dll/shellext/acppage/lang/de-DE.rc                 |  2 +-
 dll/shellext/acppage/lang/es-ES.rc                 |  2 +-
 dll/shellext/acppage/lang/eu-ES.rc                 |  2 +-
 dll/shellext/acppage/lang/fr-FR.rc                 |  2 +-
 dll/shellext/acppage/lang/he-IL.rc                 |  2 +-
 dll/shellext/acppage/lang/hu-HU.rc                 |  2 +-
 dll/shellext/acppage/lang/id-ID.rc                 |  2 +-
 dll/shellext/acppage/lang/it-IT.rc                 |  2 +-
 dll/shellext/acppage/lang/nl-NL.rc                 |  2 +-
 dll/shellext/acppage/lang/no-NO.rc                 |  2 +-
 dll/shellext/acppage/lang/pl-PL.rc                 |  2 +-
 dll/shellext/acppage/lang/sk-SK.rc                 |  2 +-
 dll/shellext/acppage/lang/sq-AL.rc                 |  2 +-
 dll/shellext/acppage/lang/sv-SE.rc                 |  2 +-
 dll/shellext/acppage/lang/uk-UA.rc                 |  2 +-
 dll/shellext/acppage/lang/zh-CN.rc                 |  2 +-
 dll/shellext/acppage/lang/zh-TW.rc                 |  2 +-
 dll/shellext/netshell/lang/da-DK.rc                |  2 +-
 dll/shellext/netshell/lang/el-GR.rc                |  2 +-
 dll/shellext/netshell/lang/hu-HU.rc                |  2 +-
 dll/shellext/netshell/lang/id-ID.rc                |  2 +-
 dll/shellext/netshell/lang/sv-SE.rc                |  2 +-
 dll/shellext/netshell/lang/zh-CN.rc                |  2 +-
 dll/shellext/netshell/lang/zh-TW.rc                |  2 +-
 dll/win32/browseui/lang/hi-IN.rc                   |  1 +
 dll/win32/devmgr/lang/cs-CZ.rc                     |  1 +
 dll/win32/lsasrv/lang/it-IT.rc                     | 33 ++++++++++++++++++++++
 dll/win32/lsasrv/lang/sq-AL.rc                     | 33 ++++++++++++++++++++++
 dll/win32/lsasrv/lang/tr-TR.rc                     | 33 ++++++++++++++++++++++
 dll/win32/lsasrv/lang/zh-CN.rc                     | 33 ++++++++++++++++++++++
 dll/win32/lsasrv/lang/zh-TW.rc                     | 32 +++++++++++++++++++++
 dll/win32/rasdlg/lang/no-NO.rc                     |  1 +
 dll/win32/shell32/lang/bg-BG.rc                    |  5 ++--
 dll/win32/shell32/lang/ca-ES.rc                    |  5 ++--
 dll/win32/shell32/lang/cs-CZ.rc                    | 25 ++++++++++++++--
 dll/win32/shell32/lang/da-DK.rc                    |  5 ++--
 dll/win32/shell32/lang/de-DE.rc                    |  5 ++--
 dll/win32/shell32/lang/el-GR.rc                    |  1 +
 dll/win32/shell32/lang/en-GB.rc                    |  5 ++--
 dll/win32/shell32/lang/en-US.rc                    |  4 +--
 dll/win32/shell32/lang/es-ES.rc                    |  5 ++--
 dll/win32/shell32/lang/et-EE.rc                    |  4 +--
 dll/win32/shell32/lang/fi-FI.rc                    |  5 ++--
 dll/win32/shell32/lang/fr-FR.rc                    |  5 ++--
 dll/win32/shell32/lang/he-IL.rc                    |  5 ++--
 dll/win32/shell32/lang/hi-IN.rc                    |  4 +--
 dll/win32/shell32/lang/hu-HU.rc                    |  5 ++--
 dll/win32/shell32/lang/it-IT.rc                    |  5 ++--
 dll/win32/shell32/lang/ja-JP.rc                    |  5 ++--
 dll/win32/shell32/lang/ko-KR.rc                    |  5 ++--
 dll/win32/shell32/lang/nl-NL.rc                    |  5 ++--
 dll/win32/shell32/lang/no-NO.rc                    |  1 +
 dll/win32/shell32/lang/pl-PL.rc                    |  4 +--
 dll/win32/shell32/lang/pt-BR.rc                    |  5 ++--
 dll/win32/shell32/lang/pt-PT.rc                    |  5 ++--
 dll/win32/shell32/lang/ro-RO.rc                    |  7 +++--
 dll/win32/shell32/lang/ru-RU.rc                    |  1 +
 dll/win32/shell32/lang/sk-SK.rc                    |  5 ++--
 dll/win32/shell32/lang/sl-SI.rc                    |  7 +++--
 dll/win32/shell32/lang/sq-AL.rc                    |  5 ++--
 dll/win32/shell32/lang/sv-SE.rc                    |  5 ++--
 dll/win32/shell32/lang/tr-TR.rc                    |  5 ++--
 dll/win32/shell32/lang/uk-UA.rc                    |  5 ++--
 dll/win32/shell32/lang/zh-CN.rc                    |  5 ++--
 dll/win32/shell32/lang/zh-TW.rc                    |  5 ++--
 dll/win32/tapiui/lang/de-DE.rc                     |  1 +
 modules/rosapps/applications/winfile/lang/pl-PL.rc | 10 +++----
 subsystems/mvdm/ntvdm/lang/zh-CN.rc                |  7 +++++
 win32ss/user/winsrv/usersrv/lang/hu-HU.rc          | 17 +++++++++++
 92 files changed, 414 insertions(+), 111 deletions(-)

diff --git a/base/applications/cmdutils/at/lang/ru-RU.rc 
b/base/applications/cmdutils/at/lang/ru-RU.rc
index 00e4ecd062..f70dd53a46 100644
--- a/base/applications/cmdutils/at/lang/ru-RU.rc
+++ b/base/applications/cmdutils/at/lang/ru-RU.rc
@@ -31,6 +31,7 @@ id                 Порядковый номер запланированно
     IDS_CONFIRM_YES "Y"
     IDS_CONFIRM_NO "N"
 
+    IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n"
     IDS_NEW_JOB "Добавлено новое задание с ID = %lu\n"
     IDS_JOBS_LIST "Статус ID   День                     Время          
Команда\n"
     IDS_NO_ENTRIES "В списке нет запланированных задач.\n"
diff --git a/base/applications/fltmc/lang/bg-BG.rc 
b/base/applications/fltmc/lang/bg-BG.rc
index d2c410ac38..ce8f93c05f 100644
--- a/base/applications/fltmc/lang/bg-BG.rc
+++ b/base/applications/fltmc/lang/bg-BG.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/cs-CZ.rc 
b/base/applications/fltmc/lang/cs-CZ.rc
index c0f0587d79..31818e02b4 100644
--- a/base/applications/fltmc/lang/cs-CZ.rc
+++ b/base/applications/fltmc/lang/cs-CZ.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/de-DE.rc 
b/base/applications/fltmc/lang/de-DE.rc
index f796fc113d..6d7145df68 100644
--- a/base/applications/fltmc/lang/de-DE.rc
+++ b/base/applications/fltmc/lang/de-DE.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/en-US.rc 
b/base/applications/fltmc/lang/en-US.rc
index 728063f3bb..b35472356d 100644
--- a/base/applications/fltmc/lang/en-US.rc
+++ b/base/applications/fltmc/lang/en-US.rc
@@ -7,7 +7,6 @@ BEGIN
                unload      Unloads a Filter driver\n\
                filters     Lists the Filters currently registered in the 
system\n\
                volumes     Lists all volumes\n\n"
-    
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
diff --git a/base/applications/fltmc/lang/es-ES.rc 
b/base/applications/fltmc/lang/es-ES.rc
index 4a60da641f..eacd39911c 100644
--- a/base/applications/fltmc/lang/es-ES.rc
+++ b/base/applications/fltmc/lang/es-ES.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/fr-FR.rc 
b/base/applications/fltmc/lang/fr-FR.rc
index a927ddf768..0eba0fccd9 100644
--- a/base/applications/fltmc/lang/fr-FR.rc
+++ b/base/applications/fltmc/lang/fr-FR.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/it-IT.rc 
b/base/applications/fltmc/lang/it-IT.rc
index 4808d17104..0ab4430670 100644
--- a/base/applications/fltmc/lang/it-IT.rc
+++ b/base/applications/fltmc/lang/it-IT.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/pl-PL.rc 
b/base/applications/fltmc/lang/pl-PL.rc
index 5a33ba79f7..97bb55b74a 100644
--- a/base/applications/fltmc/lang/pl-PL.rc
+++ b/base/applications/fltmc/lang/pl-PL.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nPrawidłowe polecenia:\n\
                load        Ładuje sterownik filtra\n\
                unload      Wyładowuje sterownik filtra\n\
-               filters     Wyświetla listę aktualnie zarejestrowanych 
filtrów\n\n"
+               filters     Wyświetla listę aktualnie zarejestrowanych 
filtrów\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Ładuje sterownik filtra\n"
     IDS_USAGE_UNLOAD    "Wyładowuje sterownik filtra\n"
     IDS_USAGE_FILTERS   "Wyświetla listę zarejestrowanych filtrów\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Nazwa filtra                    Liczba wystąpień  
  Wysokość    Ramka\n"
     IDS_DISPLAY_FILTERS2    "Nazwa filtra                    Liczba wystąpień  
 Ramka\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Nie udało się wyświetlić listy filtrów (0x%X)\n"
     IDS_ERROR_LOAD      "Nie udało się załadować filtra (0x%X)\n"
     IDS_ERROR_UNLOAD    "Nie udało się wyładować filtra (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/ro-RO.rc 
b/base/applications/fltmc/lang/ro-RO.rc
index dca313e40c..c4cdc9c776 100644
--- a/base/applications/fltmc/lang/ro-RO.rc
+++ b/base/applications/fltmc/lang/ro-RO.rc
@@ -7,17 +7,20 @@ BEGIN
     IDS_USAGE "\nComenzi valide:\n\
                load        Încarcă un modul-pilot de tip filtru\n\
                unload      Descarcă un modul-pilot de tip filtru\n\
-               filters     Afișează filtrele înregistrate acum în sistem\n\n"
+               filters     Afișează filtrele înregistrate acum în sistem\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Încarcă un modul-pilot de tip filtru\n"
     IDS_USAGE_UNLOAD    "Descarcă un modul-pilot de tip filtru\n"
     IDS_USAGE_FILTERS   "Afișează toate filtrele înregistrate\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Nume de filtru                  Num Instanțe     
Altitudine  Cadru\n"
     IDS_DISPLAY_FILTERS2    "Nume de filtru                  Num Instanțe    
Cadru\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -26,4 +29,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Eșec la afișarea filtrelor (0x%X)\n"
     IDS_ERROR_LOAD      "Eșec la încărcarea filtrului (0x%X)\n"
     IDS_ERROR_UNLOAD    "Eșec la descărcarea filtrului (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/ru-RU.rc 
b/base/applications/fltmc/lang/ru-RU.rc
index 42c4ad3183..242ce3e1c0 100644
--- a/base/applications/fltmc/lang/ru-RU.rc
+++ b/base/applications/fltmc/lang/ru-RU.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nДопустимые команды :\n\
                load        Загрузить драйвер фильтра\n\
                unload      Выгрузить драйвер фильтра\n\
-               filters     Список фильтров, зарегистрированных в системе\n\n"
+               filters     Список фильтров, зарегистрированных в системе\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Загружает драйвер фильтра\n"
     IDS_USAGE_UNLOAD    "Выгружает драйвер фильтра\n"
     IDS_USAGE_FILTERS   "Выводит список всех зарегистрированных фильтров\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Не удалось получить список фильтров (0x%X)\n"
     IDS_ERROR_LOAD      "Не удалось загрузить фильтр (0x%X)\n"
     IDS_ERROR_UNLOAD    "Не удалось выгрузить фильтр (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/sq-AL.rc 
b/base/applications/fltmc/lang/sq-AL.rc
index 890a5c3e3f..741c5cd3c7 100644
--- a/base/applications/fltmc/lang/sq-AL.rc
+++ b/base/applications/fltmc/lang/sq-AL.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/sv-SE.rc 
b/base/applications/fltmc/lang/sv-SE.rc
index a03fdf3cf3..ceec7d4d9d 100644
--- a/base/applications/fltmc/lang/sv-SE.rc
+++ b/base/applications/fltmc/lang/sv-SE.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/tr-TR.rc 
b/base/applications/fltmc/lang/tr-TR.rc
index 76b568266f..a926205472 100644
--- a/base/applications/fltmc/lang/tr-TR.rc
+++ b/base/applications/fltmc/lang/tr-TR.rc
@@ -7,17 +7,20 @@ BEGIN
     IDS_USAGE "\nGeçerli komutlar:\n\
                load        Bir süzgeç sürücüsünü yükler\n\
                unload      Bir süzgeç sürücüsünü kaldırır\n\
-               filters     Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n"
+               filters     Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Bir süzgeç sürücüsünü yükler\n"
     IDS_USAGE_UNLOAD    "Bir süzgeç sürücüsünü kaldırır\n"
     IDS_USAGE_FILTERS   "Kayıtlı tüm süzgeçleri dizelgeler\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Süzgeç Adı                      Örnek Sayısı     
Yükseklik    Kare\n"
     IDS_DISPLAY_FILTERS2    "Süzgeç Adı                      Örnek Sayısı      
 Kare\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -26,4 +29,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Süzgeçleri dizelgeleme başarısız (0x%X)\n"
     IDS_ERROR_LOAD      "Süzgeçleri yükleme başarısız (0x%X)\n"
     IDS_ERROR_UNLOAD    "Süzgeçleri kaldırma başarısız (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/uk-UA.rc 
b/base/applications/fltmc/lang/uk-UA.rc
index c3cdccf9ea..b0c270a5b9 100644
--- a/base/applications/fltmc/lang/uk-UA.rc
+++ b/base/applications/fltmc/lang/uk-UA.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/zh-CN.rc 
b/base/applications/fltmc/lang/zh-CN.rc
index 7c62d69b1a..984615e3e1 100644
--- a/base/applications/fltmc/lang/zh-CN.rc
+++ b/base/applications/fltmc/lang/zh-CN.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\n有效的命令 :\n\
                load        加载一个过滤驱动\n\
                unload      卸载一个过滤驱动\n\
-               filters     显示已在系统中注册的过滤驱动列表\n\n"
+               filters     显示已在系统中注册的过滤驱动列表\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "加载一个过滤驱动\n"
     IDS_USAGE_UNLOAD    "卸载一个过滤驱动\n"
     IDS_USAGE_FILTERS   "显示已在系统中注册的过滤驱动列表\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "过滤驱动名称                   数目 实例         权值        
帧\n"
     IDS_DISPLAY_FILTERS2    "过滤驱动名称                   数目 实例        帧\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "无法列举过滤驱动列表 (0x%X)\n"
     IDS_ERROR_LOAD      "无法加载过滤驱动 (0x%X)\n"
     IDS_ERROR_UNLOAD    "无法卸载过滤驱动 (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/fltmc/lang/zh-TW.rc 
b/base/applications/fltmc/lang/zh-TW.rc
index 5dcc8a8279..ed42682eea 100644
--- a/base/applications/fltmc/lang/zh-TW.rc
+++ b/base/applications/fltmc/lang/zh-TW.rc
@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the 
system\n\n"
+               filters     Lists the Filters currently registered in the 
system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    
Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   
Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name       
                       FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
diff --git a/base/applications/notepad/lang/pt-BR.rc 
b/base/applications/notepad/lang/pt-BR.rc
index c53be7640f..4e4c487c85 100644
--- a/base/applications/notepad/lang/pt-BR.rc
+++ b/base/applications/notepad/lang/pt-BR.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 ID_ACCEL ACCELERATORS
 BEGIN
diff --git a/base/applications/rapps/lang/no-NO.rc 
b/base/applications/rapps/lang/no-NO.rc
index c2d7a4835e..5294e62c7d 100644
--- a/base/applications/rapps/lang/no-NO.rc
+++ b/base/applications/rapps/lang/no-NO.rc
@@ -158,6 +158,7 @@ BEGIN
     IDS_AINFO_URLSITE "\nHjemmeside: "
     IDS_AINFO_LICENSE "\nLisens: "
     IDS_AINFO_URLDOWNLOAD "\nNedlasting: "
+    IDS_AINFO_LANGUAGES "\nLanguages: "
 END
 
 STRINGTABLE
diff --git a/boot/freeldr/fdebug/lang/ro-RO.rc 
b/boot/freeldr/fdebug/lang/ro-RO.rc
index 5bedfd5fa9..522d9535a7 100644
--- a/boot/freeldr/fdebug/lang/ro-RO.rc
+++ b/boot/freeldr/fdebug/lang/ro-RO.rc
@@ -40,7 +40,7 @@ CAPTION "Despre depanatorul FreeLoader"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Depanatorul FreeLoader v1.0\nDrept de autor (C) 2003\nde Brian 
Palmer ([email protected])", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | 
WS_GROUP, 53, 28, 122, 26
-    DEFPUSHBUTTON "Î&nchide", 183, 189, 44, 14, WS_GROUP
+    DEFPUSHBUTTON "Î&nchide", IDOK, 189, 44, 14, WS_GROUP
     ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20
     EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | 
WS_VSCROLL
 END
diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc
index 5456447899..0257bb8ed5 100644
--- a/dll/cpl/input/lang/ja-JP.rc
+++ b/dll/cpl/input/lang/ja-JP.rc
@@ -161,6 +161,7 @@ BEGIN
     IDS_DIVEHI_PHONETIC_LAYOUT "ディベヒ語 音素"
     IDS_DIVEHI_TYPEWRITER_LAYOUT "ディベヒ語 タイプライター"
     IDS_DUTCH_LAYOUT "オランダ語"
+    IDS_ESPERANTO_LAYOUT "Esperanto"
     IDS_ESTONIAN_LAYOUT "エストニア語"
     IDS_FAEROESE_LAYOUT "フェロー語"
     IDS_FARSI_LAYOUT "現代ペルシャ語"
diff --git a/dll/shellext/acppage/lang/bg-BG.rc 
b/dll/shellext/acppage/lang/bg-BG.rc
index e0a98de9ae..48ba265722 100644
--- a/dll/shellext/acppage/lang/bg-BG.rc
+++ b/dll/shellext/acppage/lang/bg-BG.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Съвместимост"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Ако имате затруднения при работата на приложението с РеактОС, 
изберете като коя операционна система да му се представя РеактОС.\nPlease note 
that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Ако имате затруднения при работата на приложението с РеактОС, 
изберете като коя операционна система да му се представя РеактОС.\nPlease note 
that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Режими на съвместимост", IDC_COMPATGROUP, 7, 41, 225, 49
     CHECKBOX "Изпълняване на приложението в режим на съвместимост за:", 
IDC_CHKRUNCOMPATIBILITY, 10, 57, 220, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 10, 70, 220, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/cs-CZ.rc 
b/dll/shellext/acppage/lang/cs-CZ.rc
index b2f5e3710e..2ba59989ed 100644
--- a/dll/shellext/acppage/lang/cs-CZ.rc
+++ b/dll/shellext/acppage/lang/cs-CZ.rc
@@ -10,7 +10,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilita"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Pokud jsou problémy se spouštěním tohoto programu v systému 
ReactOS, zvolte operační systém, který ReactOS tomuto programu sdělí.\nPlease 
note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Pokud jsou problémy se spouštěním tohoto programu v systému 
ReactOS, zvolte operační systém, který ReactOS tomuto programu sdělí.\nPlease 
note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Režim kompatibility", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Spustit tento program v režimu kompatibility pro:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/de-DE.rc 
b/dll/shellext/acppage/lang/de-DE.rc
index 572fd30697..e248b9744c 100644
--- a/dll/shellext/acppage/lang/de-DE.rc
+++ b/dll/shellext/acppage/lang/de-DE.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilität"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Falls dieses Programm Probleme verursacht, wählen Sie einen 
Kompatibilitätsmodus, unter dem das Programm möglicherweise korrekt 
funktioniert.\nBitte beachten Sie dass sich diese Funktion aktuell in 
Entwicklung befindet.", -1, 7, 7, 210, 31
+    LTEXT "Falls dieses Programm Probleme verursacht, wählen Sie einen 
Kompatibilitätsmodus, unter dem das Programm möglicherweise korrekt 
funktioniert.\nBitte beachten Sie dass sich diese Funktion aktuell in 
Entwicklung befindet.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Kompatibilitätsmodus", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Programm im Kompatibilitätsmodus ausführen für:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/es-ES.rc 
b/dll/shellext/acppage/lang/es-ES.rc
index 2d5e195e86..086a3136cd 100644
--- a/dll/shellext/acppage/lang/es-ES.rc
+++ b/dll/shellext/acppage/lang/es-ES.rc
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Compatibilidad"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Si tiene problemas ejecutando este programa en ReactOS, seleccione 
el modo de compatibilidad que coincida con otro sistema operativo en el que 
funciona.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Si tiene problemas ejecutando este programa en ReactOS, seleccione 
el modo de compatibilidad que coincida con otro sistema operativo en el que 
funciona.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 
7, 210, 31
     GROUPBOX "Modo de compatibilidad", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Ejecutar este programa en modo de compatibilidad para:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/eu-ES.rc 
b/dll/shellext/acppage/lang/eu-ES.rc
index 85b318f7f2..f1c974c9a7 100644
--- a/dll/shellext/acppage/lang/eu-ES.rc
+++ b/dll/shellext/acppage/lang/eu-ES.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Konpatibilitatea"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "ReactOS programa hau exekutatzean arazoak badituzu, hautatu 
konpatibilitate aukera bat jada funtzionatzen duen beste sistema operatibo 
batekin\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "ReactOS programa hau exekutatzean arazoak badituzu, hautatu 
konpatibilitate aukera bat jada funtzionatzen duen beste sistema operatibo 
batekin\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 
210, 31
     GROUPBOX "Konpatibilitate Modua ", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Programa hau exekutatu konpatibilizatzeko moduan honekin:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/fr-FR.rc 
b/dll/shellext/acppage/lang/fr-FR.rc
index bab739139f..9603a37c23 100644
--- a/dll/shellext/acppage/lang/fr-FR.rc
+++ b/dll/shellext/acppage/lang/fr-FR.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Compatibilité"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, 
sélectionnez le système d'exploitation que ReactOS montrera à 
l'application.\nCette fonctionnalité est en cours de développement.", -1, 7, 7, 
210, 31
+    LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, 
sélectionnez le système d'exploitation que ReactOS montrera à 
l'application.\nCette fonctionnalité est en cours de développement.", 
IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Mode de compatibilité", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Lancer ce programme en mode de compatibilité pour :", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/he-IL.rc 
b/dll/shellext/acppage/lang/he-IL.rc
index a7b9deb6e7..13962f2bfa 100644
--- a/dll/shellext/acppage/lang/he-IL.rc
+++ b/dll/shellext/acppage/lang/he-IL.rc
@@ -6,7 +6,7 @@ EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "תאימות"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "אם הנך נתקל בבעיות בהפעלת התכנית בReactOS, אנא בחר את מערכת ההפעלה 
שReactOS תדווח לתכנית.", -1, 7,7,210,31
+    LTEXT "אם הנך נתקל בבעיות בהפעלת התכנית בReactOS, אנא בחר את מערכת ההפעלה 
שReactOS תדווח לתכנית.", IDC_EXPLANATION, 7,7,210,31
     GROUPBOX "מצב תאימות", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "הפעל תוכנית זו במצב תאימות עבור:", IDC_CHKRUNCOMPATIBILITY, 18, 
57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/hu-HU.rc 
b/dll/shellext/acppage/lang/hu-HU.rc
index 4696bd8fb2..759cd3f54a 100644
--- a/dll/shellext/acppage/lang/hu-HU.rc
+++ b/dll/shellext/acppage/lang/hu-HU.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilitás"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Ha probléma van, válassz ki egy operációs rendszert amit a ReactOS 
színlelni fog\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Ha probléma van, válassz ki egy operációs rendszert amit a ReactOS 
színlelni fog\nPlease note that this is a work in progress.", IDC_EXPLANATION, 
7, 7, 210, 31
     GROUPBOX "Kompatibilitási mód", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Ez a program kompatibilitási módban fut:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/id-ID.rc 
b/dll/shellext/acppage/lang/id-ID.rc
index 52a17eb56d..9052bd7d36 100644
--- a/dll/shellext/acppage/lang/id-ID.rc
+++ b/dll/shellext/acppage/lang/id-ID.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilitas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Jika anda mempunyai masalah menjalan program ini dalam ReactOS, 
pilih sistem operasi ReactOS seharusnya melaporkan atas aplikasi ini.\nPlease 
note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Jika anda mempunyai masalah menjalan program ini dalam ReactOS, 
pilih sistem operasi ReactOS seharusnya melaporkan atas aplikasi ini.\nPlease 
note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Mode Kompatibilitas", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Jalankan program ini dalam mode kompatibilitas:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/it-IT.rc 
b/dll/shellext/acppage/lang/it-IT.rc
index ffa895b356..b1c4253ead 100644
--- a/dll/shellext/acppage/lang/it-IT.rc
+++ b/dll/shellext/acppage/lang/it-IT.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Compatibilità"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Se ci sono problemi ad eseguire questo programma in ReactOS potete 
scegliere un sistema operativo da segnalare all'applicazione.\nPlease note that 
this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Se ci sono problemi ad eseguire questo programma in ReactOS potete 
scegliere un sistema operativo da segnalare all'applicazione.\nPlease note that 
this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Modalità compatibile", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Esegui questo programma in modalità compatibile per:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/nl-NL.rc 
b/dll/shellext/acppage/lang/nl-NL.rc
index 00c07f807a..453a916d51 100644
--- a/dll/shellext/acppage/lang/nl-NL.rc
+++ b/dll/shellext/acppage/lang/nl-NL.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Compatibiliteit"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "If you have problems running this program in ReactOS, select an 
operating system ReactOS should report to the application.\nPlease note that 
this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "If you have problems running this program in ReactOS, select an 
operating system ReactOS should report to the application.\nPlease note that 
this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Compatibility mode", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Run this program in compatibility mode for:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/no-NO.rc 
b/dll/shellext/acppage/lang/no-NO.rc
index 61e75c9eb8..c1bdc09e1c 100644
--- a/dll/shellext/acppage/lang/no-NO.rc
+++ b/dll/shellext/acppage/lang/no-NO.rc
@@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompaktibilitet"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Hvis du har problemer med å kjøre programmer i ReactOS, velg et 
operativsystem ReactOS skulle fungere for programmet.\nPlease note that this is 
a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Hvis du har problemer med å kjøre programmer i ReactOS, velg et 
operativsystem ReactOS skulle fungere for programmet.\nPlease note that this is 
a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Kompaktibilitetsmodus", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Kjør dette programmet i kompaktibilitetsmodus for:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/pl-PL.rc 
b/dll/shellext/acppage/lang/pl-PL.rc
index 411465f5f7..0e0a8cbdae 100644
--- a/dll/shellext/acppage/lang/pl-PL.rc
+++ b/dll/shellext/acppage/lang/pl-PL.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Zgodność"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Jeżeli masz problemy z uruchamianiem tego programu w ReactOS, 
wybierz system operacyjny, który ReactOS powinien zgłaszać aplikacji.\nProszę 
pamiętać, że praca nad tą funkcją jest w toku.", -1, 7, 7, 210, 31
+    LTEXT "Jeżeli masz problemy z uruchamianiem tego programu w ReactOS, 
wybierz system operacyjny, który ReactOS powinien zgłaszać aplikacji.\nProszę 
pamiętać, że praca nad tą funkcją jest w toku.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Tryb zgodności", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Uruchom ten program w trybie zgodności z:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/sk-SK.rc 
b/dll/shellext/acppage/lang/sk-SK.rc
index 7046e68d6b..7b3f88bc68 100644
--- a/dll/shellext/acppage/lang/sk-SK.rc
+++ b/dll/shellext/acppage/lang/sk-SK.rc
@@ -12,7 +12,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilita"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Ak máte problémy so spustením tohto programu v systéme ReactOS, 
vyberte operačný systém, pod názvom ktorého sa systém ReactOS ohlási 
programu.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Ak máte problémy so spustením tohto programu v systéme ReactOS, 
vyberte operačný systém, pod názvom ktorého sa systém ReactOS ohlási 
programu.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 
7, 210, 31
     GROUPBOX "Kompatibilný režim", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Tento program spustiť v režime kompatibilnom so systémom:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/sq-AL.rc 
b/dll/shellext/acppage/lang/sq-AL.rc
index ef006378da..92f67635ea 100644
--- a/dll/shellext/acppage/lang/sq-AL.rc
+++ b/dll/shellext/acppage/lang/sq-AL.rc
@@ -9,7 +9,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Pajtueshmëri"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Nëse keni probleme ne ekzekutimin e këtij programi në ReactOS, 
përzgjidhni një sistem operativ ReactOS duhet të raportojë për 
zbatimin.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Nëse keni probleme ne ekzekutimin e këtij programi në ReactOS, 
përzgjidhni një sistem operativ ReactOS duhet të raportojë për 
zbatimin.\nPlease note that this is a work in progress.", IDC_EXPLANATION, 7, 
7, 210, 31
     GROUPBOX "Mjeti Pajtueshmërise", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Ekzekuto kete program ne menyre pajtueshmerie per:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/sv-SE.rc 
b/dll/shellext/acppage/lang/sv-SE.rc
index 8769da7b92..e7cd9335c2 100644
--- a/dll/shellext/acppage/lang/sv-SE.rc
+++ b/dll/shellext/acppage/lang/sv-SE.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Kompatibilitet"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Ifall du har problem med att köra det här programmet i ReactOS, 
välj det operativsystem som ReactOS ska rapportera till programmet.\nPlease 
note that this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Ifall du har problem med att köra det här programmet i ReactOS, 
välj det operativsystem som ReactOS ska rapportera till programmet.\nPlease 
note that this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Kompatibilitetsläge", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Kör det här programmet i kompatibilitetsläge för:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/uk-UA.rc 
b/dll/shellext/acppage/lang/uk-UA.rc
index 7e193633c8..6ce5de7f7e 100644
--- a/dll/shellext/acppage/lang/uk-UA.rc
+++ b/dll/shellext/acppage/lang/uk-UA.rc
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Сумісність"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Якщо у Вас виникли проблеми із запуском цієї програми у ReactOS, 
виберіть режим сумісності з потрібною версією ОС.\nPlease note that this is a 
work in progress.", -1, 7, 7, 210, 31
+    LTEXT "Якщо у Вас виникли проблеми із запуском цієї програми у ReactOS, 
виберіть режим сумісності з потрібною версією ОС.\nPlease note that this is a 
work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "Режим сумісності", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "Запускати програму в режимі сумісності для:", 
IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/zh-CN.rc 
b/dll/shellext/acppage/lang/zh-CN.rc
index 9cc658cdf9..6412d62651 100644
--- a/dll/shellext/acppage/lang/zh-CN.rc
+++ b/dll/shellext/acppage/lang/zh-CN.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "兼容性"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
-    LTEXT "如果您在 ReactOS 中运行此程序出现问题,选择 ReactOS 
应报告给应用程序的操作系统。\n请注意,这是一项正在进行的工作。", -1, 7, 7, 210, 31
+    LTEXT "如果您在 ReactOS 中运行此程序出现问题,选择 ReactOS 
应报告给应用程序的操作系统。\n请注意,这是一项正在进行的工作。", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "兼容模式", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "用兼容模式运行这个程序:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, 
BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/acppage/lang/zh-TW.rc 
b/dll/shellext/acppage/lang/zh-TW.rc
index ecf27c19af..e9fe17cc56 100644
--- a/dll/shellext/acppage/lang/zh-TW.rc
+++ b/dll/shellext/acppage/lang/zh-TW.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "相容性"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    LTEXT "如果您有問題在 ReactOS 中運行此程式,選擇 ReactOS 應報告給應用程式的作業系統。\nPlease note that 
this is a work in progress.", -1, 7, 7, 210, 31
+    LTEXT "如果您有問題在 ReactOS 中運行此程式,選擇 ReactOS 應報告給應用程式的作業系統。\nPlease note that 
this is a work in progress.", IDC_EXPLANATION, 7, 7, 210, 31
     GROUPBOX "相容模式", IDC_COMPATGROUP, 7, 41, 210, 49
     CHECKBOX "用相容模式運行這個程式:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, 
BS_AUTOCHECKBOX | WS_TABSTOP
     COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | 
CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
diff --git a/dll/shellext/netshell/lang/da-DK.rc 
b/dll/shellext/netshell/lang/da-DK.rc
index 8157c44671..2d180ca61c 100644
--- a/dll/shellext/netshell/lang/da-DK.rc
+++ b/dll/shellext/netshell/lang/da-DK.rc
@@ -42,7 +42,7 @@ BEGIN
     LTEXT "Bytes:", -1, 73, 115, 44, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8
-    PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Egenskaber", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/el-GR.rc 
b/dll/shellext/netshell/lang/el-GR.rc
index ad41251b90..c72f05a28c 100644
--- a/dll/shellext/netshell/lang/el-GR.rc
+++ b/dll/shellext/netshell/lang/el-GR.rc
@@ -42,7 +42,7 @@ BEGIN
     LTEXT "Bytes:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "&Ιδιότητες", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Ιδιότητες", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "&Απενεργοποίηση", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/hu-HU.rc 
b/dll/shellext/netshell/lang/hu-HU.rc
index bf0bdc157e..4584e91e6c 100644
--- a/dll/shellext/netshell/lang/hu-HU.rc
+++ b/dll/shellext/netshell/lang/hu-HU.rc
@@ -42,7 +42,7 @@ BEGIN
     LTEXT "Bytes:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Tulajdonságok", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "&Letiltás", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/id-ID.rc 
b/dll/shellext/netshell/lang/id-ID.rc
index 67cc57e601..be7e2dca0b 100644
--- a/dll/shellext/netshell/lang/id-ID.rc
+++ b/dll/shellext/netshell/lang/id-ID.rc
@@ -42,7 +42,7 @@ BEGIN
     LTEXT "Bytes:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "&Properti", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Properti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "&Dimatikan", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/sv-SE.rc 
b/dll/shellext/netshell/lang/sv-SE.rc
index c8069180bd..9d54a045b9 100644
--- a/dll/shellext/netshell/lang/sv-SE.rc
+++ b/dll/shellext/netshell/lang/sv-SE.rc
@@ -42,7 +42,7 @@ BEGIN
     LTEXT "Bytes:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "&Egenskaper", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/zh-CN.rc 
b/dll/shellext/netshell/lang/zh-CN.rc
index 0a9dff8f10..34db5a2d0b 100644
--- a/dll/shellext/netshell/lang/zh-CN.rc
+++ b/dll/shellext/netshell/lang/zh-CN.rc
@@ -51,7 +51,7 @@ BEGIN
     LTEXT "字节数:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "属性(&P)", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "属性(&P)", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "禁用(&D)", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/shellext/netshell/lang/zh-TW.rc 
b/dll/shellext/netshell/lang/zh-TW.rc
index 4974976077..1b1c772bef 100644
--- a/dll/shellext/netshell/lang/zh-TW.rc
+++ b/dll/shellext/netshell/lang/zh-TW.rc
@@ -50,7 +50,7 @@ BEGIN
     LTEXT "位元組:", -1, 17, 115, 32, 8
     RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
     RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
-    PUSHBUTTON "屬性(&P)", IDC_PROPERTIES, 10, 150, 50, 14
+    PUSHBUTTON "屬性(&P)", IDC_STATUS_PROPERTIES, 10, 150, 50, 14
     PUSHBUTTON "禁用(&D)", IDC_ENDISABLE, 66, 150, 50, 14
     RTEXT "", IDC_STATUS, 83, 20, 98, 8
     RTEXT "", IDC_DURATION, 83, 34, 98, 8
diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc
index 1e6cd20f40..d3c949e072 100644
--- a/dll/win32/browseui/lang/hi-IN.rc
+++ b/dll/win32/browseui/lang/hi-IN.rc
@@ -286,6 +286,7 @@ STRINGTABLE
 BEGIN
     IDS_BACK "%s पर वापस"
     IDS_FORWARD "%s के लिए आगे"
+    IDS_FOLDER_OPTIONS "Folder Options"
 END
 
 STRINGTABLE
diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc
index 106c3c65e7..cef5ec783a 100644
--- a/dll/win32/devmgr/lang/cs-CZ.rc
+++ b/dll/win32/devmgr/lang/cs-CZ.rc
@@ -313,6 +313,7 @@ BEGIN
   IDS_HINT_UNINSTALL    " Odinstaluje ovladače vybraného zařízení."
   IDS_HINT_ADD          " Umožní přidat do systému zastaralé zařízení 
nepodporující Plug and Play."
   IDS_HINT_ABOUT        " Ukončí program.."
+  IDS_HINT_EXIT         " Exits the program."
 
   IDS_HINT_DEV_BY_TYPE  " Zobrazí zařízení podle typu hardwaru."
   IDS_HINT_DEV_BY_CONN  " Zobrazí zařízení podle typu připojení."
diff --git a/dll/win32/lsasrv/lang/it-IT.rc b/dll/win32/lsasrv/lang/it-IT.rc
index 68c0ac0e75..6d37e81078 100644
--- a/dll/win32/lsasrv/lang/it-IT.rc
+++ b/dll/win32/lsasrv/lang/it-IT.rc
@@ -43,3 +43,36 @@ BEGIN
     IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Utenti desktop Remoti"
     IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Network Configuration Operators"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_CREATE_TOKEN_PRIVILEGE "Create a token object"
+    IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token"
+    IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory"
+    IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process"
+    IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain"
+    IDS_TCB_PRIVILEGE "Act as part of the operating system"
+    IDS_SECURITY_PRIVILEGE "Manage auditing and security log"
+    IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects"
+    IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers"
+    IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance"
+    IDS_SYSTEMTIME_PRIVILEGE "Change the system time"
+    IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process"
+    IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority"
+    IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile"
+    IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects"
+    IDS_BACKUP_PRIVILEGE "Back up files and directories"
+    IDS_RESTORE_PRIVILEGE "Restore files and directories"
+    IDS_SHUTDOWN_PRIVILEGE "Shut down the system"
+    IDS_DEBUG_PRIVILEGE "Debug programs"
+    IDS_AUDIT_PRIVILEGE "Generate security audits"
+    IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values"
+    IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking"
+    IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system"
+    IDS_UNDOCK_PRIVILEGE "Remove computer from docking station"
+    IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data"
+    IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be 
trusted for delegation"
+    IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks"
+    IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication"
+    IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects"
+END
diff --git a/dll/win32/lsasrv/lang/sq-AL.rc b/dll/win32/lsasrv/lang/sq-AL.rc
index 05536611e8..55084f4b55 100644
--- a/dll/win32/lsasrv/lang/sq-AL.rc
+++ b/dll/win32/lsasrv/lang/sq-AL.rc
@@ -46,3 +46,36 @@ BEGIN
     IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Përdoruesit e Desktop-it në Distance"
     IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Operatorët e Konfigurimit Rrjetit"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_CREATE_TOKEN_PRIVILEGE "Create a token object"
+    IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token"
+    IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory"
+    IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process"
+    IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain"
+    IDS_TCB_PRIVILEGE "Act as part of the operating system"
+    IDS_SECURITY_PRIVILEGE "Manage auditing and security log"
+    IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects"
+    IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers"
+    IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance"
+    IDS_SYSTEMTIME_PRIVILEGE "Change the system time"
+    IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process"
+    IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority"
+    IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile"
+    IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects"
+    IDS_BACKUP_PRIVILEGE "Back up files and directories"
+    IDS_RESTORE_PRIVILEGE "Restore files and directories"
+    IDS_SHUTDOWN_PRIVILEGE "Shut down the system"
+    IDS_DEBUG_PRIVILEGE "Debug programs"
+    IDS_AUDIT_PRIVILEGE "Generate security audits"
+    IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values"
+    IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking"
+    IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system"
+    IDS_UNDOCK_PRIVILEGE "Remove computer from docking station"
+    IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data"
+    IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be 
trusted for delegation"
+    IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks"
+    IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication"
+    IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects"
+END
diff --git a/dll/win32/lsasrv/lang/tr-TR.rc b/dll/win32/lsasrv/lang/tr-TR.rc
index b2a82aad59..73141319a7 100644
--- a/dll/win32/lsasrv/lang/tr-TR.rc
+++ b/dll/win32/lsasrv/lang/tr-TR.rc
@@ -44,3 +44,36 @@ BEGIN
     IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Uzak Masaüstü Kullanıcıları"
     IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Ağ Yapılandırma İşletmenleri"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_CREATE_TOKEN_PRIVILEGE "Create a token object"
+    IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token"
+    IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory"
+    IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process"
+    IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain"
+    IDS_TCB_PRIVILEGE "Act as part of the operating system"
+    IDS_SECURITY_PRIVILEGE "Manage auditing and security log"
+    IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects"
+    IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers"
+    IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance"
+    IDS_SYSTEMTIME_PRIVILEGE "Change the system time"
+    IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process"
+    IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority"
+    IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile"
+    IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects"
+    IDS_BACKUP_PRIVILEGE "Back up files and directories"
+    IDS_RESTORE_PRIVILEGE "Restore files and directories"
+    IDS_SHUTDOWN_PRIVILEGE "Shut down the system"
+    IDS_DEBUG_PRIVILEGE "Debug programs"
+    IDS_AUDIT_PRIVILEGE "Generate security audits"
+    IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values"
+    IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking"
+    IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system"
+    IDS_UNDOCK_PRIVILEGE "Remove computer from docking station"
+    IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data"
+    IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be 
trusted for delegation"
+    IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks"
+    IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication"
+    IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects"
+END
diff --git a/dll/win32/lsasrv/lang/zh-CN.rc b/dll/win32/lsasrv/lang/zh-CN.rc
index 23b90d0769..a3a3953e40 100644
--- a/dll/win32/lsasrv/lang/zh-CN.rc
+++ b/dll/win32/lsasrv/lang/zh-CN.rc
@@ -44,3 +44,36 @@ BEGIN
     IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "远程桌面用户"
     IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "网络配置操作员"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_CREATE_TOKEN_PRIVILEGE "Create a token object"
+    IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token"
+    IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory"
+    IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process"
+    IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain"
+    IDS_TCB_PRIVILEGE "Act as part of the operating system"
+    IDS_SECURITY_PRIVILEGE "Manage auditing and security log"
+    IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects"
+    IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers"
+    IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance"
+    IDS_SYSTEMTIME_PRIVILEGE "Change the system time"
+    IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process"
+    IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority"
+    IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile"
+    IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects"
+    IDS_BACKUP_PRIVILEGE "Back up files and directories"
+    IDS_RESTORE_PRIVILEGE "Restore files and directories"
+    IDS_SHUTDOWN_PRIVILEGE "Shut down the system"
+    IDS_DEBUG_PRIVILEGE "Debug programs"
+    IDS_AUDIT_PRIVILEGE "Generate security audits"
+    IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values"
+    IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking"
+    IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system"
+    IDS_UNDOCK_PRIVILEGE "Remove computer from docking station"
+    IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data"
+    IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be 
trusted for delegation"
+    IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks"
+    IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication"
+    IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects"
+END
diff --git a/dll/win32/lsasrv/lang/zh-TW.rc b/dll/win32/lsasrv/lang/zh-TW.rc
index 40ff153218..60686b433f 100644
--- a/dll/win32/lsasrv/lang/zh-TW.rc
+++ b/dll/win32/lsasrv/lang/zh-TW.rc
@@ -45,3 +45,35 @@ BEGIN
     IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "網路配置操作員"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_CREATE_TOKEN_PRIVILEGE "Create a token object"
+    IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token"
+    IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory"
+    IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process"
+    IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain"
+    IDS_TCB_PRIVILEGE "Act as part of the operating system"
+    IDS_SECURITY_PRIVILEGE "Manage auditing and security log"
+    IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects"
+    IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers"
+    IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance"
+    IDS_SYSTEMTIME_PRIVILEGE "Change the system time"
+    IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process"
+    IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority"
+    IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile"
+    IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects"
+    IDS_BACKUP_PRIVILEGE "Back up files and directories"
+    IDS_RESTORE_PRIVILEGE "Restore files and directories"
+    IDS_SHUTDOWN_PRIVILEGE "Shut down the system"
+    IDS_DEBUG_PRIVILEGE "Debug programs"
+    IDS_AUDIT_PRIVILEGE "Generate security audits"
+    IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values"
+    IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking"
+    IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system"
+    IDS_UNDOCK_PRIVILEGE "Remove computer from docking station"
+    IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data"
+    IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be 
trusted for delegation"
+    IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks"
+    IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication"
+    IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects"
+END
diff --git a/dll/win32/rasdlg/lang/no-NO.rc b/dll/win32/rasdlg/lang/no-NO.rc
index 997ff22e33..071c352503 100644
--- a/dll/win32/rasdlg/lang/no-NO.rc
+++ b/dll/win32/rasdlg/lang/no-NO.rc
@@ -1955,6 +1955,7 @@ BEGIN
     313 "Sikre mitt passord og min data\0"
     314 "The %1 protocol cannot be selected because it is not installed or is 
disabled for Remote Access.  To change, in Control Panel start Network, choose 
Services page, Remote Access Properties, and press the Network button.\0"
     315 "Kan ikke lagre vise data.\0"
+    316 "Cannot display data.\0"
     317 "Kan ikke få auto-dial informasjon.\0"
     318 "Kan ikke laste dialog.\0"
     319 "Kan ikke deaktiver delt tilgang.\0"
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index ffdd79d6ca..448384f68e 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -67,6 +67,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Из&рязване", IDM_CUT
         MENUITEM "За&помняне", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Създаване на &връзка", IDM_CREATELINK
         MENUITEM "Из&триване", IDM_DELETE
@@ -214,8 +215,8 @@ BEGIN
     CHECKBOX "Изпълняване с различни правомощия", IDC_SHORTEX_RUN_DIFFERENT, 
30, 50, 150, 10
     LTEXT "Тази възможност ви позволява да изпълните препратката като друг 
потребител или да продължите като себе си, като предпазвате компютъра и данните 
от неупълномощена дейност на приложенията.", -1, 50, 60, 200, 40
     CHECKBOX "Изпълняване в отделен дял от паметта", IDC_SHORTEX_RUN_SEPARATE, 
30, 100, 170, 10, WS_DISABLED
-    PUSHBUTTON "Добре", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Прекъсване", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Добре", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Прекъсване", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 99fef6743b..429dd34036 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ut", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
         MENUITEM "&Delete", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 5412233caf..daabd65bcd 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -72,6 +72,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Vyj&mout", IDM_CUT
         MENUITEM "&Kopírovat", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Vytvořit zástupc&e", IDM_CREATELINK
         MENUITEM "O&dstranit", IDM_DELETE
@@ -219,8 +220,8 @@ BEGIN
     CHECKBOX "Spustit s jinými pověřeními", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 
150, 10
     LTEXT "Tato možnost umožní spustit tohoto zástupce jako jiný uživatel nebo 
při spuštění se současným uživatelem chránit počítač před nepovolenou aktivitou 
programu.", -1, 50, 60, 175, 40
     CHECKBOX "Spustit v odděleném paměťovém prostoru", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Storno", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
@@ -941,6 +942,26 @@ BEGIN
     IDS_OBJECTS "Položek: %d"
     IDS_OBJECTS_SELECTED "Položek vybráno: %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_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
     IDS_NEWEXT_NEW "<New>"
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 4fb9455d28..a39927ee99 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -72,6 +72,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "K&lip", IDM_CUT
         MENUITEM "&Kopiere", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Opret &Link", IDM_CREATELINK
         MENUITEM "&Slet", IDM_DELETE
@@ -219,8 +220,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index cc3a1e62b1..f86c5f262b 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Ausschneiden", IDM_CUT
         MENUITEM "&Kopieren", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "&Verknüpfung erstellen", IDM_CREATELINK
         MENUITEM "&Löschen", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Als anderer Benutzer ausführen", IDC_SHORTEX_RUN_DIFFERENT, 25, 
50, 150, 10
     LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem 
anderen oder Ihrem eigenen Benutzerkonto auszuführen während der Computer und 
Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", 
-1, 50, 60, 175, 40
     CHECKBOX "In getrenntem Speicherbereich ausführen", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abbrechen", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index a4d64e37df..3a943f229c 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Α&ποκοπή", IDM_CUT
         MENUITEM "Α&ντιγραφή", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Δημιουργία &συντόμευσης", IDM_CREATELINK
         MENUITEM "&Διαγραφή", IDM_DELETE
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index 5193a8a147..14e6654a48 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ut", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
         MENUITEM "&Delete", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index c2fe653b54..c5dd4829f4 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -214,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 25, 
100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Cancel", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index 94d270d794..e207b501f4 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -74,6 +74,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ortar", IDM_CUT
         MENUITEM "&Copiar", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "C&rear acceso directo", IDM_CREATELINK
         MENUITEM "&Eliminar", IDM_DELETE
@@ -221,8 +222,8 @@ BEGIN
     CHECKBOX "Ejecutar con credenciales diferentes", 
IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10
     LTEXT "Esta opción puede permitirle ejecutar este acceso directo como otro 
usuario, o continuar como usted mismo mientras protege su equipo y datos de una 
actividad de programa no autorizada.", -1, 50, 60, 175, 40
     CHECKBOX "Ejecutar en otro espacio de memoria", IDC_SHORTEX_RUN_SEPARATE, 
25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "Aceptar", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Cancelar", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Aceptar", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Cancelar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 0d7e94c576..1f9dee687f 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -221,8 +221,8 @@ BEGIN
     CHECKBOX "Käivita teistsuguse mandaadiga", IDC_SHORTEX_RUN_DIFFERENT, 25, 
50, 150, 10
     LTEXT "Selle suvandi abil saad käivitada otsetee teise või enda 
kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata 
programmitegevuse eest.", -1, 50, 60, 175, 40
     CHECKBOX "Käivita eraldi mäluruumis", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 
150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Loobu", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Loobu", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 39d9977420..3f284deaab 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Leikkaa", IDM_CUT
         MENUITEM "&Kopioi", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Lu&o Linkki", IDM_CREATELINK
         MENUITEM "&Poista", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 5767689c1a..1c525d04f0 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ouper", IDM_CUT
         MENUITEM "&Copier", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Créer un &lien", IDM_CREATELINK
         MENUITEM "&Supprimer", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Exécuter avec des droits différents", IDC_SHORTEX_RUN_DIFFERENT, 
25, 50, 150, 10
     LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant 
qu'autre utilisateur ou de continuer vous-même en protégeant votre ordinateur 
et vos données des activés de programme non autorisées.", -1, 50, 60, 175, 40
     CHECKBOX "Lancer dans un espace mémoire séparé", IDC_SHORTEX_RUN_SEPARATE, 
25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Annuler", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index 59cd236710..f734560050 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "גזור", IDM_CUT
         MENUITEM "העתק", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "צור קישור", IDM_CREATELINK
         MENUITEM "מחק", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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 "הרץ בטווח זיכרון מופרד", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 
10, WS_DISABLED
-    PUSHBUTTON "אישור", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "ביטול", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "אישור", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "ביטול", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 53462a60a0..3d759b38b1 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -214,8 +214,8 @@ BEGIN
     CHECKBOX "विभिन्न क्रिडेन्शॅल के साथ रन करें", IDC_SHORTEX_RUN_DIFFERENT, 
25, 50, 150, 10
     LTEXT "यह विकल्प आपको इस शॉर्टकट को किसी अन्य उपयोगकर्ता के रूप में चलाने 
की अनुमति दे सकता है, या अनधिकृत प्रोग्राम गतिविधि से आपके कंप्यूटर और डेटा की 
सुरक्षा करते समय स्वयं के रूप में जारी रख सकता है।", -1, 50, 60, 175, 40
     CHECKBOX "अलग मेमोरी स्पेस में चलाएं", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 
150, 10, WS_DISABLED
-    PUSHBUTTON "ओके", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "रद्द करें", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "ओके", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "रद्द करें", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index f4f96e6873..bab678e9d8 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Kivágás", IDM_CUT
         MENUITEM "Másolás", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Parancsikon létrehozása", IDM_CREATELINK
         MENUITEM "Törlés", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index b9215aefb7..f4de79b596 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Taglia", IDM_CUT
         MENUITEM "&Copia", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "&Crea Collegamento", IDM_CREATELINK
         MENUITEM "&Cancella", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Eseguire con credenziali diverse", IDC_SHORTEX_RUN_DIFFERENT, 
25, 50, 150, 10
     LTEXT "Questa opzione permette l'esecuzione del collegamento come se si 
fosse un altro utente o di proteggere il computer e i dati da attività non 
autorizzate del programma.", -1, 50, 60, 175, 40
     CHECKBOX "Eseguire in uno spazio di memoria separato", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Annulla", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Annulla", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 977202de71..9e5d792fd2 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "切り取り(&U)", IDM_CUT
         MENUITEM "コピー(&C)", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "ショートカットの作成(&L)", IDM_CREATELINK
         MENUITEM "削除(&D)", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "異なる人物証明情報で実行する", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10
     LTEXT 
"このオプションを使用するとこのショートカットを別のユーザーとして実行できます。また、自分自身で実行する場合、許可されていないプログラムの活動からコンピュータとデータを保護できます。",
 -1, 50, 60, 175, 40
     CHECKBOX "別のメモリ領域で実行する", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, 
WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "中止", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "中止", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index dd45e850db..af088d2160 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ut", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
         MENUITEM "&Delete", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index fab5179d96..cc7bc171dd 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ut", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
         MENUITEM "&Delete", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 1282fc73c3..997fd580b1 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Klipp &ut", IDM_CUT
         MENUITEM "&Kopier", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "&Opprett snarvei", IDM_CREATELINK
         MENUITEM "&Slett", IDM_DELETE
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index c922e682ec..8e808a890a 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -219,8 +219,8 @@ BEGIN
     CHECKBOX "Uruchom z innym Użytkownikiem", IDC_SHORTEX_RUN_DIFFERENT, 25, 
50, 150, 10
     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", IDC_SHORTEX_RUN_SEPARATE, 
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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Przerwij", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index e300e15ec8..9b3cb6744e 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ortar", IDM_CUT
         MENUITEM "&Copiar", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Criar a&talho", IDM_CREATELINK
         MENUITEM "E&xcluir", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Executar com credenciais diferentes", IDC_SHORTEX_RUN_DIFFERENT, 
25, 50, 150, 10
     LTEXT "Esta opção permite você executar este atalho como outro usuário, ou 
continuar como si próprio enquanto protege seu computador e dados de atividades 
de programas não autorizados.", -1, 50, 60, 175, 40
     CHECKBOX "Executar em espaço de memória separado", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abortar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index d4afb55a5c..5b30db67e8 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ortar", IDM_CUT
         MENUITEM "&Copiar", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Criar &Link", IDM_CREATELINK
         MENUITEM "&Apagar", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Executar com diferentes credenciais", IDC_SHORTEX_RUN_DIFFERENT, 
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
     CHECKBOX "Executar num espaço de memória separada", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abortar", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index ec4b8651f4..57a0b70fc3 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -68,6 +68,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Decupează", IDM_CUT
         MENUITEM "&Copiază", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Crează sc&urtătură", IDM_CREATELINK
         MENUITEM "Șt&erge", IDM_DELETE
@@ -215,8 +216,8 @@ BEGIN
     CHECKBOX "Execută sub o i&dentitate explicită", IDC_SHORTEX_RUN_DIFFERENT, 
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", 
IDC_SHORTEX_RUN_SEPARATE, 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 "Con&firmă", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "A&nulează", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
@@ -493,7 +494,7 @@ 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
 END
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 6aab59fab5..5d56f1f7f3 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -73,6 +73,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Вырезать", IDM_CUT
         MENUITEM "&Копировать", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Создать &ярлык", IDM_CREATELINK
         MENUITEM "&Удалить", IDM_DELETE
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 6ea9041d59..25a9ba1461 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Vystrihnúť", IDM_CUT
         MENUITEM "&Kopírovať", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Vytvoriť o&dkaz", IDM_CREATELINK
         MENUITEM "&Odstrániť", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "&Spustiť s inými povereniami", IDC_SHORTEX_RUN_DIFFERENT, 25, 
50, 150, 10
     LTEXT "Táto možnosť umožňuje spustiť tento odkaz ako iný používateľ, alebo 
pokračovať so svojím používateľským oprávnením, ale s ochranou počítača a 
údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 170, 40
     CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 190, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Prerušiť", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Prerušiť", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 18dbf64927..deb4179a91 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
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "C&ut", IDM_CUT
         MENUITEM "&Copy", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Create &Link", IDM_CREATELINK
         MENUITEM "&Delete", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 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", IDC_SHORTEX_RUN_SEPARATE, 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 "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index f7f98d67f0..ad7d9417d3 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -70,6 +70,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Prej", IDM_CUT
         MENUITEM "&Kopjo", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Krijo &Lidhje", IDM_CREATELINK
         MENUITEM "&Fshi", IDM_DELETE
@@ -217,8 +218,8 @@ BEGIN
     CHECKBOX "Ekzekuto me kredenciale të ndryshme", IDC_SHORTEX_RUN_DIFFERENT, 
25, 50, 150, 10
     LTEXT "Ky opsion mund të lejojë për të drejtuar këtë ikonë si një 
përdorues tjetër, ose të vazhdojë si veten tënde, duke mbrojtur kompjuterin 
tuaj dhe të dhënat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 
175, 40
     CHECKBOX "Ekzekuto në hapësirë ​​të veçantë që e kujtesës", 
IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Ndërprej", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Ndërprej", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 1e2caefde9..5ba90e530b 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "K&lipp ut", IDM_CUT
         MENUITEM "&Kopiera", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Skapa &genväg", IDM_CREATELINK
         MENUITEM "&Ta bort", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Kör med andra användaruppgifter", IDC_SHORTEX_RUN_DIFFERENT, 25, 
50, 150, 10
     LTEXT "Det här alternativet tillåter dig att köra genvägen som en annan 
användare eller som dig själv samtidigt som din dator skyddas från otillåten 
programaktivitet.", -1, 50, 60, 175, 40
     CHECKBOX "Kör i seperat minnesutrymme", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 
150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Avbryt", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Avbryt", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 753cbdc99d..9eaa2a7c34 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -68,6 +68,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Kes", IDM_CUT
         MENUITEM "&Çoğalt", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "K&ısayol Oluştur", IDM_CREATELINK
         MENUITEM "&Sil", IDM_DELETE
@@ -215,8 +216,8 @@ BEGIN
     CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", IDC_SHORTEX_RUN_DIFFERENT, 
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
     CHECKBOX "A&yrı Bellek Alanında Çalıştır", IDC_SHORTEX_RUN_SEPARATE, 25, 
100, 150, 10, WS_DISABLED
-    PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "İptal", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Tamam", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "İptal", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 59f72c0a47..d1c45341a6 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -66,6 +66,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Вирізати", IDM_CUT
         MENUITEM "&Копіювати", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "Створити &ярлик", IDM_CREATELINK
         MENUITEM "В&идалити", IDM_DELETE
@@ -213,8 +214,8 @@ BEGIN
     CHECKBOX "Запускати з іншими обліковими даними", 
IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10
     LTEXT "Цей параметр дозволяє використовувати цей ярлик від імені іншого 
користувача або продовжувати роботу від свого імені, що захищає комп'ютер й 
дані від несанкціонованих дій програми.", -1, 50, 60, 175, 40
     CHECKBOX "Запускати в окремій області пам'яті", IDC_SHORTEX_RUN_SEPARATE, 
25, 100, 150, 10, WS_DISABLED
-    PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "Скасувати", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "Скасувати", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 05a7d1deb3..b355bcc388 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -76,6 +76,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "剪切(&U)", IDM_CUT
         MENUITEM "复制(&C)", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "创建快捷方式(&L)", IDM_CREATELINK
         MENUITEM "删除(&D)", IDM_DELETE
@@ -223,8 +224,8 @@ BEGIN
     CHECKBOX "以其他用户身份运行", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10
     LTEXT "此选项允许您以其他用户身份运行此快捷方式,或者在保护计算机和数据免受未经授权的程序活动的同时继续自行运行。", -1, 50, 60, 
175, 40
     CHECKBOX "在单独的内存空间中运行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, 
WS_DISABLED
-    PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "确定", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 30ca5829fb..1369c53a22 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -75,6 +75,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "剪下(&U)", IDM_CUT
         MENUITEM "複製(&C)", IDM_COPY
+        MENUITEM "Paste", IDM_INSERT
         MENUITEM SEPARATOR
         MENUITEM "建立捷徑(&L)", IDM_CREATELINK
         MENUITEM "刪除(&D)", IDM_DELETE
@@ -222,8 +223,8 @@ BEGIN
     CHECKBOX "以不同的身分執行", IDC_SHORTEX_RUN_DIFFERENT, 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 "在獨立的記憶體空間中執行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, 
WS_DISABLED
-    PUSHBUTTON "確定", 1, 63, 124, 50, 15, WS_VISIBLE
-    PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "確定", IDOK, 63, 124, 50, 15, WS_VISIBLE
+    PUSHBUTTON "取消", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE
 END
 
 IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205
diff --git a/dll/win32/tapiui/lang/de-DE.rc b/dll/win32/tapiui/lang/de-DE.rc
index 24f5539e79..10aca15438 100644
--- a/dll/win32/tapiui/lang/de-DE.rc
+++ b/dll/win32/tapiui/lang/de-DE.rc
@@ -369,6 +369,7 @@ BEGIN
     43 "Auf das Ende eine Sprachnachricht warten"
     44 "Die Landeskennzahl, Vorwahl und Rufnummer wählen"
     45 "Die Vorwahl und Rufnummer wählen"
+    46 "Dial the area code and number."
     47 "Die Landeskennzahl wählen"
     48 "Die Vorwahl wählen"
     49 "Die Rufnummer wählen"
diff --git a/modules/rosapps/applications/winfile/lang/pl-PL.rc 
b/modules/rosapps/applications/winfile/lang/pl-PL.rc
index 1323764ae4..56f220f9e0 100644
--- a/modules/rosapps/applications/winfile/lang/pl-PL.rc
+++ b/modules/rosapps/applications/winfile/lang/pl-PL.rc
@@ -95,10 +95,10 @@ IDM_WINEFILE MENU
         MENUITEM "&Wszystkie atrybuty pliku",   ID_VIEW_ALL_ATTRIBUTES, CHECKED
         MENUITEM "Wybrane &atrybuty pliku...",  ID_VIEW_SELECTED_ATTRIBUTES
         MENUITEM SEPARATOR
-        MENUITEM "P&osortuj alfabetycznie",     404
-        MENUITEM "Posortuj po &typie",          405
-        MENUITEM "Posortuj po wie&lkości",      406
-        MENUITEM "Po&sortuj po dacie",            407
+        MENUITEM "P&osortuj alfabetycznie",     ID_VIEW_SORT_NAME
+        MENUITEM "Posortuj po &typie",          ID_VIEW_SORT_TYPE
+        MENUITEM "Posortuj po wie&lkości",      ID_VIEW_SORT_SIZE
+        MENUITEM "Po&sortuj po dacie",          ID_VIEW_SORT_DATE
         MENUITEM SEPARATOR
         MENUITEM "Filtruj widok &...",              ID_VIEW_FILTER
     }
@@ -116,7 +116,7 @@ IDM_WINEFILE MENU
 #endif
         MENUITEM SEPARATOR
         MENUITEM "&Zminimalizuj przy starcie",  504
-        MENUITEM "Z&apisz ustawienia przed zakończeniem",511
+        MENUITEM "Z&apisz ustawienia przed zakończeniem",ID_VIEW_SAVESETTINGS
     }
 
 
diff --git a/subsystems/mvdm/ntvdm/lang/zh-CN.rc 
b/subsystems/mvdm/ntvdm/lang/zh-CN.rc
index fce7177bf5..e6703bb4a2 100644
--- a/subsystems/mvdm/ntvdm/lang/zh-CN.rc
+++ b/subsystems/mvdm/ntvdm/lang/zh-CN.rc
@@ -13,5 +13,12 @@ STRINGTABLE
 BEGIN
     IDS_VDM_DUMPMEM_TXT,    "内存转储 (文本) (&T)"
     IDS_VDM_DUMPMEM_BIN,    "内存转储 (二进制) (&B)"
+    IDS_VDM_MOUNT_FLOPPY,   "Insert a floppy in drive %d <%s>..."
+    IDS_VDM_EJECT_FLOPPY,   "Eject floppy from drive %d"
     IDS_VDM_QUIT       ,    "退出 ReactOS DOS 虚拟机 (&Q)"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_NO_MEDIA,   "No media"
+END
diff --git a/win32ss/user/winsrv/usersrv/lang/hu-HU.rc 
b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc
index 8b55512225..ba3c76c415 100644
--- a/win32ss/user/winsrv/usersrv/lang/hu-HU.rc
+++ b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc
@@ -24,3 +24,20 @@ BEGIN
     LTEXT "Hogy visszatérj ReactOS-ba és ellenőrizd a státuszát a programnak, 
kattins a Mégsére.", IDC_STATIC, 7, 26, 178, 16
     LTEXT "Ha azt választod, hogy azzonal bezársz egy programot, minden nem 
mentett adatot vesztesz. A program mostani bezárásához, kattints a Bezásás 
Most-ra.", IDC_STATIC, 7, 53, 178, 26
 END
+
+
+STRINGTABLE
+BEGIN
+    IDS_SEVERITY_SUCCESS        "Success"
+    IDS_SEVERITY_INFORMATIONAL  "System Information"
+    IDS_SEVERITY_WARNING        "System Warning"
+    IDS_SEVERITY_ERROR          "System Error"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SYSTEM_PROCESS          "System Process"
+    IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception"
+    IDS_OK_TERMINATE_PROGRAM    "Click on OK to terminate the program."
+    IDS_CANCEL_DEBUG_PROGRAM    "Click on CANCEL to debug the program."
+END

Reply via email to