[SHELL32_NEW]

- Merge 51423, 51426 and 51435

- Remove "Play" and "Preview" translations - they shouldn't be in shell32
- Pass an argument array to FormatMessage to insert the filename details into error messages (instead of failing)

svn path=/branches/shell32_new-bringup/; revision=51934

diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 4f2b2f9..4f19997 100644 (file)
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -744,12 +744,11 @@ BEGIN
        IDS_SYS_FILE                "Ñèñòåìåí ôàéë"
 
        IDS_OPEN_VERB               "Îòâàðÿíå"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Èçïúëíÿâàíå êàòî "
        IDS_EDIT_VERB               "Îáðàáîòêà"
        IDS_FIND_VERB               "Òúðñåíå"
        IDS_PRINT_VERB              "Ðàçïå÷àòâàíå"
-       IDS_PLAY_VERB               "Âúçïðîèçâåæäàíå"
-       IDS_PREVIEW_VERB            "Ïðåãëåä"
 
        IDS_FILE_FOLDER             "%u ôàéëà, %u ïàïêè"
        IDS_PRINTERS                "Ïå÷àòà÷è"

diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 978a58f..bf4f940 100644 (file)
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 8914ee8..c160a1c 100644 (file)
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -730,12 +730,11 @@ BEGIN
        IDS_SYS_FILE                "Systémový soubor"
 
        IDS_OPEN_VERB               "Otevøít"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Spustit jako "
        IDS_EDIT_VERB               "Upravit"
        IDS_FIND_VERB               "Najít"
        IDS_PRINT_VERB              "Tisknout"
-       IDS_PLAY_VERB               "Pøehrát"
-       IDS_PREVIEW_VERB            "Náhled"
 
        IDS_FILE_FOLDER             "%u souborù, %u slo\9eek"
        IDS_PRINTERS                "Tiskárny"

diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index e0f9152..0e06164 100644 (file)
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -732,12 +732,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index 42cd6e5..bf4ccfa 100644 (file)
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -747,12 +747,11 @@ BEGIN
        IDS_SYS_FILE                "Systemdatei"
 
        IDS_OPEN_VERB               "Öffnen"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Ausführen als "
        IDS_EDIT_VERB               "Bearbeiten"
        IDS_FIND_VERB               "Finden"
        IDS_PRINT_VERB              "Drucken"
-       IDS_PLAY_VERB               "Abspielen"
-       IDS_PREVIEW_VERB            "Vorschau"
 
        IDS_FILE_FOLDER             "%u Dateien, %u Ordner"
        IDS_PRINTERS                "Drucker"

diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 30542a0..f47854c 100644 (file)
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -744,12 +744,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index 9880c90..5e69339 100644 (file)
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index a7adfb3..946a4eb 100644 (file)
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -754,12 +754,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index 30e60b1..95dd072 100644 (file)
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -756,12 +756,11 @@ BEGIN
        IDS_SYS_FILE                "Archivo del sistema"
 
        IDS_OPEN_VERB               "Abrir"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Ejecutar como ..."
        IDS_EDIT_VERB               "Editar"
        IDS_FIND_VERB               "Buscar"
        IDS_PRINT_VERB              "Imprimir"
-       IDS_PLAY_VERB               "Reproducir"
-       IDS_PREVIEW_VERB            "Vista previa"
 
        IDS_FILE_FOLDER             "%u Archivos, %u Carpetas"
        IDS_PRINTERS                "Impresoras"

diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 9526e49..f8958cf 100644 (file)
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 998d9df..3b2c1fd 100644 (file)
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -747,12 +747,11 @@ BEGIN
        IDS_SYS_FILE                "Fichier système"
 
        IDS_OPEN_VERB               "Ouvrir"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Lancer en tant que "
        IDS_EDIT_VERB               "Éditer"
        IDS_FIND_VERB               "Chercher"
        IDS_PRINT_VERB              "Imprimer"
-       IDS_PLAY_VERB               "Lire"
-       IDS_PREVIEW_VERB            "Apercevoir"
 
        IDS_FILE_FOLDER             "%u fichiers, %u répertoires"
        IDS_PRINTERS                "Imprimantes"

diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index e492982..e9f12f7 100644 (file)
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -746,12 +746,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index d91d17c..134c697 100644 (file)
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -754,12 +754,11 @@ BEGIN
        IDS_SYS_FILE                "File di sistema"
 
        IDS_OPEN_VERB               "Apri"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Eseguire come "
        IDS_EDIT_VERB               "Modifica"
        IDS_FIND_VERB               "Cerca"
        IDS_PRINT_VERB              "Stampa"
-       IDS_PLAY_VERB               "Mostra"
-       IDS_PREVIEW_VERB            "Anteprima"
 
        IDS_FILE_FOLDER             "%u File, %u Cartelle"
        IDS_PRINTERS                "Stampanti"

diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 6270d7d..9545f6c 100644 (file)
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "\83V\83X\83e\83\80 \83t\83@\83C\83\8b"
 
        IDS_OPEN_VERB               "\8aJ\82­"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "\95Ê\82Ì\83\86\81[\83U\81[\82Æ\82µ\82Ä\8eÀ\8ds "
        IDS_EDIT_VERB               "\95Ò\8fW"
        IDS_FIND_VERB               "\8c\9f\8dõ"
        IDS_PRINT_VERB              "\88ó\8dü"
-       IDS_PLAY_VERB               "\8dÄ\90¶"
-       IDS_PREVIEW_VERB            "\83v\83\8c\83r\83\85\81["
 
        IDS_FILE_FOLDER             "%u \8cÂ\82Ì\83t\83@\83C\83\8b\81A %u \8cÂ\82Ì\83t\83H\83\8b\83_"
        IDS_PRINTERS                "\83v\83\8a\83\93\83^"

diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index 2758493..37565bd 100644 (file)
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index c754e70..5e957b7 100644 (file)
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 2f944c0..e204a77 100644 (file)
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -746,12 +746,11 @@ BEGIN
        IDS_SYS_FILE                "Systemfil"
 
        IDS_OPEN_VERB               "Åpne"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Kjør som"
        IDS_EDIT_VERB               "Rediger"
        IDS_FIND_VERB               "Finn"
        IDS_PRINT_VERB              "Skriv ut"
-       IDS_PLAY_VERB               "Spill"
-       IDS_PREVIEW_VERB            "Forhåndsvis"
 
        IDS_FILE_FOLDER             "%u filer, %u mapper"
        IDS_PRINTERS                "Skrivere"

diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index d41fb99..65e8513 100644 (file)
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -751,12 +751,11 @@ BEGIN
        IDS_SYS_FILE                "Plik systemowy"
 
        IDS_OPEN_VERB               "Otwórz"
+       IDS_EXPLORE_VERB            "Eksploruj"
        IDS_RUNAS_VERB              "Uruchom jako "
        IDS_EDIT_VERB               "Edytuj"
        IDS_FIND_VERB               "Wyszukaj"
        IDS_PRINT_VERB              "Drukuj"
-       IDS_PLAY_VERB               "Odtwórz"
-       IDS_PREVIEW_VERB            "Podgl¹d"
 
        IDS_FILE_FOLDER             "%u Plików, %u Katalogów"
        IDS_PRINTERS                "Drukarki"

diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index e018066..c06bf15 100644 (file)
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -745,12 +745,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 25541f0..e34e556 100644 (file)
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -746,12 +746,11 @@ BEGIN
        IDS_SYS_FILE                "Ficheiro de Sistema"
 
        IDS_OPEN_VERB               "Abrir"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Executar como "
        IDS_EDIT_VERB               "Editar"
        IDS_FIND_VERB               "Procurar"
        IDS_PRINT_VERB              "Imprimir"
-       IDS_PLAY_VERB               "Reproduzir"
-       IDS_PREVIEW_VERB            "Previzualizar"
 
        IDS_FILE_FOLDER             "%u Ficheiros, %u Pastas"
        IDS_PRINTERS                "Impressoras"

diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 3a89641..ef9e213 100644 (file)
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -746,12 +746,11 @@ BEGIN
        IDS_SYS_FILE                "Fișier de sistem"
 
        IDS_OPEN_VERB               "Deschidere"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Rulare ca "
        IDS_EDIT_VERB               "Editare"
        IDS_FIND_VERB               "Căutare"
        IDS_PRINT_VERB              "Imprimare"
-       IDS_PLAY_VERB               "Redare"
-       IDS_PREVIEW_VERB            "Previzualizare"
 
        IDS_FILE_FOLDER             "%u fișiere, %u dosare"
        IDS_PRINTERS                "Imprimante"

diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 64ccb66..62a4167 100644 (file)
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -668,10 +668,10 @@ BEGIN
        IDS_LOGOFF_PROMPT           "Do you want to log off?"
 
     /* Run File dialog */
-       IDS_RUNDLG_ERROR            "Unable to display Run File dialog box (internal error)"
-       IDS_RUNDLG_BROWSE_ERROR     "Unable to display Browse dialog box (internal error)"
-       IDS_RUNDLG_BROWSE_CAPTION   "Browse"
-       IDS_RUNDLG_BROWSE_FILTER    "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+       IDS_RUNDLG_ERROR            "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Âûïîëíèòü Ôàéë (âíóòðåííÿÿ îøèáêà)"
+       IDS_RUNDLG_BROWSE_ERROR     "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Îáçîð (âíóòðåííÿÿ îøèáêà)"
+       IDS_RUNDLG_BROWSE_CAPTION   "Îáçîð"
+       IDS_RUNDLG_BROWSE_FILTER    "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0"
 
        /* shell folder path default values */
        IDS_PROGRAMS                "Ãëàâíîå ìåíþ\\Ïðîãðàììû"
@@ -722,8 +722,8 @@ BEGIN
        IDS_RECYCLEBIN_DISKSPACE    "Äîñòóïíîå ïðîñòðàíñòâî"
        IDS_EMPTY_BITBUCKET         "Î÷èñòèòü êîðçèíó"
        IDS_PICK_ICON_TITLE         "Âûáðàòü çíà÷îê"
-       IDS_PICK_ICON_FILTER        "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-       IDS_OPEN_WITH_FILTER        "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+       IDS_PICK_ICON_FILTER        "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñå ôàéëû (*.*)\0*.*\0"
+       IDS_OPEN_WITH_FILTER        "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0"
        IDS_DIRECTORY               "Ïàïêà"
        IDS_VIRTUAL_DRIVER          "Äðàéâåð âèðòóàëüíîãî óñòðîéñòâà"
        IDS_BAT_FILE                "Ïàêåòíûé ôàéë ReactOS"
@@ -742,12 +742,11 @@ BEGIN
        IDS_SYS_FILE                "Ñèñòåìíûé ôàéë"
 
        IDS_OPEN_VERB               "Îòêðûòü"
+       IDS_EXPLORE_VERB            "Îòêðûòü â äåðåâå"
        IDS_RUNAS_VERB              "Çàïóñòèòü êàê "
        IDS_EDIT_VERB               "Èçìåíèòü"
        IDS_FIND_VERB               "Ïîèñê"
        IDS_PRINT_VERB              "Ïå÷àòü"
-       IDS_PLAY_VERB               "Âîñïðîèçâåñòè"
-       IDS_PREVIEW_VERB            "Ïðåäïðîñìîòð"
 
        IDS_FILE_FOLDER             "%u ôàéëîâ, %u ïàïîê"
        IDS_PRINTERS                "Ïðèíòåðû"

diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 2a5f7ed..084351c 100644 (file)
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -749,12 +749,11 @@ BEGIN
        IDS_SYS_FILE                "Systémový súbor"
 
        IDS_OPEN_VERB               "Otvori\9d"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Spusti\9d ako "
        IDS_EDIT_VERB               "Upravi\9d"
        IDS_FIND_VERB               "Find" //Nájs\9d, H¾ada\9d, Vyh¾ada\9d ???
        IDS_PRINT_VERB              "Tlaèi\9d"
-       IDS_PLAY_VERB               "Prehra\9d"
-       IDS_PREVIEW_VERB            "Preview" //Náh¾ad, Uká\9eka, Prezrie\9d ???
 
        IDS_FILE_FOLDER             "súbory: %u, prieèinky: %u"
        IDS_PRINTERS                "Tlaèiarne"

diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 84513d4..79bd536 100644 (file)
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index cc940c8..6bfcf61 100644 (file)
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index b950630..b5f8e62 100644 (file)
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -743,12 +743,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 785a675..181df04 100644 (file)
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -682,10 +682,10 @@ BEGIN
        IDS_LOGOFF_PROMPT           "Âè õî÷åòå âèéòè ç ñèñòåìè?"
 
     /* Run File dialog */
-       IDS_RUNDLG_ERROR            "Unable to display Run File dialog box (internal error)"
-       IDS_RUNDLG_BROWSE_ERROR     "Unable to display Browse dialog box (internal error)"
-       IDS_RUNDLG_BROWSE_CAPTION   "Browse"
-       IDS_RUNDLG_BROWSE_FILTER    "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+       IDS_RUNDLG_ERROR            "Íåìîæëèâî â³äîáðàçèòè ijàëîã Çàïóñêó Ôàéëó (âíóòð³øíÿ ïîìèëêà)"
+       IDS_RUNDLG_BROWSE_ERROR     "Íåìîæëèâî â³äîáðàçèòè ijàëîã Îãëÿäó (âíóòð³øíÿ ïîìèëêà)"
+       IDS_RUNDLG_BROWSE_CAPTION   "Îãëÿä"
+       IDS_RUNDLG_BROWSE_FILTER    "Âèêîíóâàí³ Ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0"
 
        /* shell folder path default values */
        IDS_PROGRAMS                "Start Menu\\Programs"
@@ -736,8 +736,8 @@ BEGIN
        IDS_RECYCLEBIN_DISKSPACE    "Äîñòóïíèé ïðîñò³ð"
        IDS_EMPTY_BITBUCKET         "Î÷èñòèòè Êîøèê"
        IDS_PICK_ICON_TITLE         "Âèáðàòè çíà÷îê"
-       IDS_PICK_ICON_FILTER        "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
-       IDS_OPEN_WITH_FILTER        "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0All Files (*.*)\0*.*\0"
+       IDS_PICK_ICON_FILTER        "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñ³ Ôàéëè (*.*)\0*.*\0"
+       IDS_OPEN_WITH_FILTER        "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0"
        IDS_DIRECTORY               "Ïàïêà"
        IDS_VIRTUAL_DRIVER          "Äðàéâåð â³ðòóàëüíîãî ïðèñòðîþ"
        IDS_BAT_FILE                "Ïàêåòíèé ôàéë ReactOS"
@@ -756,12 +756,11 @@ BEGIN
        IDS_SYS_FILE                "Ñèñòåìíèé ôàéë"
 
        IDS_OPEN_VERB               "³äêðèòè"
+       IDS_EXPLORE_VERB            "³äêðèòè â äåðåâ³"
        IDS_RUNAS_VERB              "Çàïóñòèòè ÿê "
        IDS_EDIT_VERB               "Çì³íèòè"
        IDS_FIND_VERB               "Ïîøóê"
        IDS_PRINT_VERB              "Äðóê"
-       IDS_PLAY_VERB               "³äòâîðèòè"
-       IDS_PREVIEW_VERB            "Ïåðåãëÿä"
 
        IDS_FILE_FOLDER             "%u ôàéë³â, %u ïàïîê"
        IDS_PRINTERS                "Ïðèíòåðè"

diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 7b25bb4..ba4d7c8 100644 (file)
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -731,12 +731,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 5e386cb..22dd7af 100644 (file)
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -744,12 +744,11 @@ BEGIN
        IDS_SYS_FILE                "System file"
 
        IDS_OPEN_VERB               "Open"
+       IDS_EXPLORE_VERB            "Explore"
        IDS_RUNAS_VERB              "Run as "
        IDS_EDIT_VERB               "Edit"
        IDS_FIND_VERB               "Find"
        IDS_PRINT_VERB              "Print"
-       IDS_PLAY_VERB               "Play"
-       IDS_PREVIEW_VERB            "Preview"
 
        IDS_FILE_FOLDER             "%u Files, %u Folders"
        IDS_PRINTERS                "Printers"

diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index f83c901..252e339 100644 (file)
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -1426,15 +1426,22 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd,
     return retval;
 }
 
-void do_error_dialog( UINT_PTR retval, HWND hwnd )
+void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename)
 {
     WCHAR msg[2048];
-    int error_code=GetLastError();
+    DWORD error_code = GetLastError();
+    DWORD_PTR msgArguments[3]  = { (DWORD_PTR)filename, 0, 0 };
 
     if (retval == SE_ERR_NOASSOC)
         LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR));
     else
-        FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL);
+        FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                       NULL,
+                       error_code,
+                       LANG_USER_DEFAULT,
+                       msg,
+                       sizeof(msg)/sizeof(WCHAR),
+                       (va_list*)msgArguments);
 
     MessageBoxW(hwnd, msg, NULL, MB_ICONERROR);
 }
@@ -1596,7 +1603,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
             Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
 
             //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
-               do_error_dialog(retval, sei_tmp.hwnd);
+               do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName);
         }
         HeapFree(GetProcessHeap(), 0, wszApplicationName);
         if (wszParameters != parametersBuffer)
@@ -1824,7 +1831,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
         Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
 
         //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
-            do_error_dialog(retval, sei_tmp.hwnd);
+            do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName);
     }
 
     HeapFree(GetProcessHeap(), 0, wszApplicationName);

diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 982d321..1d62937 100644 (file)
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -153,8 +153,7 @@
 #define IDS_EDIT_VERB               303
 #define IDS_FIND_VERB               304
 #define IDS_PRINT_VERB              305
-#define IDS_PLAY_VERB               306
-#define IDS_PREVIEW_VERB            307
+
 #define IDS_FILE_FOLDER             308
 #define IDS_CREATELINK              309
 #define IDS_INSTALLNEWFONT          310

diff --git a/dll/win32/shell32/shv_def_cmenu.cpp b/dll/win32/shell32/shv_def_cmenu.cpp
index 0914b3c..13ce1a1 100644 (file)
--- a/dll/win32/shell32/shv_def_cmenu.cpp
+++ b/dll/win32/shell32/shv_def_cmenu.cpp
@@ -646,10 +646,6 @@ IDefaultContextMenuImpl::AddStaticContextMenusToMenu(
            idResource = IDS_FIND_VERB;
         else if (!wcsicmp(curEntry->szVerb, L"print"))
            idResource = IDS_PRINT_VERB;
-        else if (!wcsicmp(curEntry->szVerb, L"play"))
-           idResource = IDS_PLAY_VERB;
-        else if (!wcsicmp(curEntry->szVerb, L"preview"))
-           idResource = IDS_PREVIEW_VERB;
         else if (!wcsicmp(curEntry->szVerb, L"printto"))
                {
                        curEntry = curEntry->Next;