Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 08:50:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32_NEW]

Browse source 
- 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
This commit is contained in:
Ged Murphy 2011-05-26 21:11:36 +00:00
parent 83c347aaef
commit b0ebdd8ffe
32 changed files with 54 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/win32/shell32/lang/bg-BG.rc
View file

@ -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 "Ïå÷àòà÷è"

3
dll/win32/shell32/lang/ca-ES.rc
View file

@ -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"

3
dll/win32/shell32/lang/cs-CZ.rc
View file

@ -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žek"
IDS_PRINTERS "Tiskárny"

3
dll/win32/shell32/lang/da-DK.rc
View file

@ -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"

3
dll/win32/shell32/lang/de-DE.rc
View file

@ -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"

3
dll/win32/shell32/lang/el-GR.rc
View file

@ -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"

3
dll/win32/shell32/lang/en-GB.rc
View file

@ -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"

3
dll/win32/shell32/lang/en-US.rc
View file

@ -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"

3
dll/win32/shell32/lang/es-ES.rc
View file

@ -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"

3
dll/win32/shell32/lang/fi-FI.rc
View file

@ -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"

3
dll/win32/shell32/lang/fr-FR.rc
View file

@ -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"

3
dll/win32/shell32/lang/hu-HU.rc
View file

@ -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"

3
dll/win32/shell32/lang/it-IT.rc
View file

@ -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"

3
dll/win32/shell32/lang/ja-JP.rc
View file

@ -743,12 +743,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 "プリンタ"

3
dll/win32/shell32/lang/ko-KR.rc
View file

@ -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"

3
dll/win32/shell32/lang/nl-NL.rc
View file

@ -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"

3
dll/win32/shell32/lang/no-NO.rc
View file

@ -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"

3
dll/win32/shell32/lang/pl-PL.rc
View file

@ -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"

3
dll/win32/shell32/lang/pt-BR.rc
View file

@ -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"

3
dll/win32/shell32/lang/pt-PT.rc
View file

@ -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"

3
dll/win32/shell32/lang/ro-RO.rc
View file

@ -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"

15
dll/win32/shell32/lang/ru-RU.rc
View file

@ -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 "Ïðèíòåðû"

3
dll/win32/shell32/lang/sk-SK.rc
View file

@ -749,12 +749,11 @@ BEGIN
IDS_SYS_FILE "Systémový súbor"
IDS_OPEN_VERB "Otvori<72>"
IDS_EXPLORE_VERB "Explore"
IDS_RUNAS_VERB "Spusti<74> ako "
IDS_EDIT_VERB "Upravi<76>"
IDS_FIND_VERB "Find" //Nájs<6A>, H¾ada<64>, Vyh¾ada<64> ???
IDS_PRINT_VERB "Tlaèi<C3A8>"
IDS_PLAY_VERB "Prehra<72>"
IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukážka, Prezrie<69> ???
IDS_FILE_FOLDER "súbory: %u, prieèinky: %u"
IDS_PRINTERS "Tlaèiarne"

3
dll/win32/shell32/lang/sl-SI.rc
View file

@ -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"

3
dll/win32/shell32/lang/sv-SE.rc
View file

@ -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"

3
dll/win32/shell32/lang/tr-TR.rc
View file

@ -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"

15
dll/win32/shell32/lang/uk-UA.rc
View file

@ -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 "Ïðèíòåðè"

3
dll/win32/shell32/lang/zh-CN.rc
View file

@ -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"

3
dll/win32/shell32/lang/zh-TW.rc
View file

@ -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"

17
dll/win32/shell32/shlexec.cpp
View file

@ -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);

3
dll/win32/shell32/shresdef.h
View file

@ -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

4
dll/win32/shell32/shv_def_cmenu.cpp
View file

@ -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;