diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc index 8a0f2fb29c9..0216ac54578 100644 --- a/reactos/dll/win32/shell32/lang/bg-BG.rc +++ b/reactos/dll/win32/shell32/lang/bg-BG.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Системен файл" IDS_VXD_FILE "Водач на привидно устройство" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Отваряне" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc index 653dac760a2..a8349a04cba 100644 --- a/reactos/dll/win32/shell32/lang/ca-ES.rc +++ b/reactos/dll/win32/shell32/lang/ca-ES.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc index 812cc853bc4..acb80f7e8c0 100644 --- a/reactos/dll/win32/shell32/lang/cs-CZ.rc +++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc @@ -806,7 +806,8 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systémový soubor" IDS_VXD_FILE "Virtuální ovladač zařízení" - + IDS_ANY_FILE "%s-file" + IDS_OPEN_VERB "Otevřít" IDS_EXPLORE_VERB "Prozkoumat" IDS_RUNAS_VERB "Spustit jako..." diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc index aaf16d36ead..51c37f5ef5b 100644 --- a/reactos/dll/win32/shell32/lang/da-DK.rc +++ b/reactos/dll/win32/shell32/lang/da-DK.rc @@ -806,6 +806,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc index 706512ee90a..34af8ef4f01 100644 --- a/reactos/dll/win32/shell32/lang/de-DE.rc +++ b/reactos/dll/win32/shell32/lang/de-DE.rc @@ -801,6 +801,7 @@ BEGIN IDS_SCR_FILE "Bildschirmschoner" IDS_SYS_FILE "Systemdatei" IDS_VXD_FILE "Virtueller Gerätetreiber" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Öffnen" IDS_EXPLORE_VERB "Durchsuchen" diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc index 72b232f1f52..92b9f08e410 100644 --- a/reactos/dll/win32/shell32/lang/el-GR.rc +++ b/reactos/dll/win32/shell32/lang/el-GR.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc index 6531862cca5..3762094c35d 100644 --- a/reactos/dll/win32/shell32/lang/en-GB.rc +++ b/reactos/dll/win32/shell32/lang/en-GB.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc index 63fcf0118cf..4d1b85fa98c 100644 --- a/reactos/dll/win32/shell32/lang/en-US.rc +++ b/reactos/dll/win32/shell32/lang/en-US.rc @@ -634,7 +634,7 @@ END STRINGTABLE BEGIN /* columns in the shellview */ - IDS_SHV_COLUMN1 "File" + IDS_SHV_COLUMN1 "Name" IDS_SHV_COLUMN2 "Size" IDS_SHV_COLUMN3 "Type" IDS_SHV_COLUMN4 "Modified" @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc index bb167f348d4..be7676ce507 100644 --- a/reactos/dll/win32/shell32/lang/es-ES.rc +++ b/reactos/dll/win32/shell32/lang/es-ES.rc @@ -802,6 +802,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Archivo del sistema" IDS_VXD_FILE "Controlador de dispositivo virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc index b30fa7d8793..86c243d17be 100644 --- a/reactos/dll/win32/shell32/lang/fi-FI.rc +++ b/reactos/dll/win32/shell32/lang/fi-FI.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc index 9980843ac8b..bff6898e43a 100644 --- a/reactos/dll/win32/shell32/lang/fr-FR.rc +++ b/reactos/dll/win32/shell32/lang/fr-FR.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Écran de veille" IDS_SYS_FILE "Fichier système" IDS_VXD_FILE "Pilote de périphérique virtuel" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ouvrir" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/he-IL.rc b/reactos/dll/win32/shell32/lang/he-IL.rc index db3fc7ad48d..13275d2c1a2 100644 --- a/reactos/dll/win32/shell32/lang/he-IL.rc +++ b/reactos/dll/win32/shell32/lang/he-IL.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc index 9a2d8175c24..a9a6a58c94d 100644 --- a/reactos/dll/win32/shell32/lang/hu-HU.rc +++ b/reactos/dll/win32/shell32/lang/hu-HU.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc index e4c671f35ed..b08db89c95b 100644 --- a/reactos/dll/win32/shell32/lang/it-IT.rc +++ b/reactos/dll/win32/shell32/lang/it-IT.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "File di sistema" IDS_VXD_FILE "Driver di Periferica Virtuale" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Apri" IDS_EXPLORE_VERB "Esplora" diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc index de273073992..c371112534b 100644 --- a/reactos/dll/win32/shell32/lang/ja-JP.rc +++ b/reactos/dll/win32/shell32/lang/ja-JP.rc @@ -797,6 +797,7 @@ BEGIN IDS_SCR_FILE "スクリーンセーバー" IDS_SYS_FILE "システム ファイル" IDS_VXD_FILE "仮想 デバイス ドライバ" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "開く" IDS_EXPLORE_VERB "エクスプローラで開く" diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc index 4bbed12ff8f..40c95a4d76b 100644 --- a/reactos/dll/win32/shell32/lang/ko-KR.rc +++ b/reactos/dll/win32/shell32/lang/ko-KR.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc index a04455ab817..98a1f097069 100644 --- a/reactos/dll/win32/shell32/lang/nl-NL.rc +++ b/reactos/dll/win32/shell32/lang/nl-NL.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc index 9c9b1e53a0f..af2a9bd5795 100644 --- a/reactos/dll/win32/shell32/lang/no-NO.rc +++ b/reactos/dll/win32/shell32/lang/no-NO.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systemfil" IDS_VXD_FILE "Virtuell enhetdriver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Åpne" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc index fb35477fb28..e3065a02c20 100644 --- a/reactos/dll/win32/shell32/lang/pl-PL.rc +++ b/reactos/dll/win32/shell32/lang/pl-PL.rc @@ -804,6 +804,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Plik systemowy" IDS_VXD_FILE "Sterownik urządzenia wirtualnego" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Otwórz" IDS_EXPLORE_VERB "Eksploruj" diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc index 38405fb654f..56fb937e4f8 100644 --- a/reactos/dll/win32/shell32/lang/pt-BR.rc +++ b/reactos/dll/win32/shell32/lang/pt-BR.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Arquivo do sistema" IDS_VXD_FILE "Dispositivo de Driver Virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc index f46bf263b11..cdad2c5a781 100644 --- a/reactos/dll/win32/shell32/lang/pt-PT.rc +++ b/reactos/dll/win32/shell32/lang/pt-PT.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Ficheiro de Sistema" IDS_VXD_FILE "Driver de Dispositivo Virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/ro-RO.rc b/reactos/dll/win32/shell32/lang/ro-RO.rc index 38930ff1236..9e765c45a26 100644 --- a/reactos/dll/win32/shell32/lang/ro-RO.rc +++ b/reactos/dll/win32/shell32/lang/ro-RO.rc @@ -802,6 +802,7 @@ BEGIN IDS_SCR_FILE "Animație regim de inactivitate" IDS_SYS_FILE "Fișier de sistem" IDS_VXD_FILE "Pilot dispozitiv virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Deschide" IDS_EXPLORE_VERB "Explorează" diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc index 1f6c5ed2264..2d4e6535e6d 100644 --- a/reactos/dll/win32/shell32/lang/ru-RU.rc +++ b/reactos/dll/win32/shell32/lang/ru-RU.rc @@ -802,6 +802,7 @@ BEGIN IDS_SCR_FILE "Заставка" IDS_SYS_FILE "Системный файл" IDS_VXD_FILE "Драйвер виртуального устройства" + IDS_ANY_FILE "%s-файл" IDS_OPEN_VERB "Открыть" IDS_EXPLORE_VERB "Открыть в дереве" diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index 903dd14f1d8..30815653eb8 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systémový súbor" IDS_VXD_FILE "Ovládač virtuálneho zariadenia" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Otvoriť" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc index 2aa91bcebf0..50b4987be59 100644 --- a/reactos/dll/win32/shell32/lang/sl-SI.rc +++ b/reactos/dll/win32/shell32/lang/sl-SI.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/lang/sq-AL.rc b/reactos/dll/win32/shell32/lang/sq-AL.rc index 4a54f7d33ca..58672595dec 100644 --- a/reactos/dll/win32/shell32/lang/sq-AL.rc +++ b/reactos/dll/win32/shell32/lang/sq-AL.rc @@ -804,6 +804,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Dokumente Sistemi" IDS_VXD_FILE "Udhëzuesi Virtual Pajisjes" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Hap" IDS_EXPLORE_VERB "Eksplorer" diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc index 60335209038..cbfed0074f5 100644 --- a/reactos/dll/win32/shell32/lang/sv-SE.rc +++ b/reactos/dll/win32/shell32/lang/sv-SE.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Skärmsläckare" IDS_SYS_FILE "Systemfil" IDS_VXD_FILE "Virtuell enhetsdrivruting" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Öppna" IDS_EXPLORE_VERB "Utforska" diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc index 73fd4b74234..9492c6815c7 100644 --- a/reactos/dll/win32/shell32/lang/tr-TR.rc +++ b/reactos/dll/win32/shell32/lang/tr-TR.rc @@ -802,6 +802,7 @@ BEGIN IDS_SCR_FILE "Görüntülük Koruyucu" IDS_SYS_FILE "Dizge Kütüğü" IDS_VXD_FILE "Farazî Aygıt Sürücüsü" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Aç" IDS_EXPLORE_VERB "Araştır" diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc index 069512f5e6b..7a2de3add98 100644 --- a/reactos/dll/win32/shell32/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32/lang/uk-UA.rc @@ -800,6 +800,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Системний файл" IDS_VXD_FILE "Драйвер віртуального пристрою" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Відкрити" IDS_EXPLORE_VERB "Відкрити в дереві" diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc index 42785f04baf..a98bfb782ec 100644 --- a/reactos/dll/win32/shell32/lang/zh-CN.rc +++ b/reactos/dll/win32/shell32/lang/zh-CN.rc @@ -807,6 +807,7 @@ BEGIN IDS_SCR_FILE "屏幕保护程序" IDS_SYS_FILE "系统文件" IDS_VXD_FILE "虚拟设备驱动程序" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "打开" IDS_EXPLORE_VERB "浏览" diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc index 2b9f286e467..9b745c1ebc4 100644 --- a/reactos/dll/win32/shell32/lang/zh-TW.rc +++ b/reactos/dll/win32/shell32/lang/zh-TW.rc @@ -808,6 +808,7 @@ BEGIN IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index 73526b68d3e..0154a183a46 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -159,6 +159,7 @@ #define IDS_SCR_FILE 217 #define IDS_SYS_FILE 218 #define IDS_VXD_FILE 219 +#define IDS_ANY_FILE 220 #define IDS_EMPTY_BITBUCKET 172 #define IDS_SHLEXEC_NOASSOC 173 diff --git a/reactos/dll/win32/shell32/wine/pidl.c b/reactos/dll/win32/shell32/wine/pidl.c index 234d0c062df..96958a28c9c 100644 --- a/reactos/dll/win32/shell32/wine/pidl.c +++ b/reactos/dll/win32/shell32/wine/pidl.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -2491,15 +2492,13 @@ void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize) return; } /* display Ext-file as description */ - strcpy(pOut, sType); - _strupr(pOut); + _strupr(sType); /* load localized file string */ sTemp[0] = '\0'; - if(LoadStringA(shell32_hInstance, IDS_SHV_COLUMN1, sTemp, 64)) + if(LoadStringA(shell32_hInstance, IDS_ANY_FILE, sTemp, 64)) { sTemp[63] = '\0'; - strcat(pOut, "-"); - strcat(pOut, sTemp); + StringCchPrintfA(pOut, uOutSize, sTemp, sType); } } #else