- remove duplicate properties entry in recycle bin context menu shell extension

- make string "empty recycle bin" translatable
- bug 3289

svn path=/trunk/; revision=34125

diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc
index f5c6c87..65d3095 100644 (file)
--- a/reactos/dll/win32/shell32/lang/bg-BG.rc
+++ b/reactos/dll/win32/shell32/lang/bg-BG.rc
@@ -662,6 +662,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Íàñòðîéêè íà ïàïêèòå"
        IDS_RECYCLEBIN_LOCATION     "Ìÿñòî íà êîø÷åòî"
        IDS_RECYCLEBIN_DISKSPACE    "Ñâîáîäíî ìÿñòî"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Èçáåðåòå çíà÷å"
        IDS_PICK_ICON_FILTER        "Ôàéëîâå ñúñ çíà÷åòà(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Èçïúëíèìè ôàéëîâå\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc
index 54b562d..6e30ed3 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ca-ES.rc
+++ b/reactos/dll/win32/shell32/lang/ca-ES.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc
index 7120a29..cea891c 100644 (file)
--- a/reactos/dll/win32/shell32/lang/cs-CZ.rc
+++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc
@@ -660,6 +660,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc
index de8408e..8c55feb 100644 (file)
--- a/reactos/dll/win32/shell32/lang/da-DK.rc
+++ b/reactos/dll/win32/shell32/lang/da-DK.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
         IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc
index d5f0ec0..a92eb09 100644 (file)
--- a/reactos/dll/win32/shell32/lang/de-DE.rc
+++ b/reactos/dll/win32/shell32/lang/de-DE.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Ordneroptionen"
        IDS_RECYCLEBIN_LOCATION     "Papierkorbpfad"
        IDS_RECYCLEBIN_DISKSPACE    "freier Speicher"
+       IDS_EMPTY_BITBUCKET         "Papierkorb leeren"
        IDS_PICK_ICON_TITLE         "Symbol auswählen"
        IDS_PICK_ICON_FILTER        "Symboldateien(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Programme\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc
index 1830d3b..a4d998a 100644 (file)
--- a/reactos/dll/win32/shell32/lang/el-GR.rc
+++ b/reactos/dll/win32/shell32/lang/el-GR.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc
index 431132e..0a6badd 100644 (file)
--- a/reactos/dll/win32/shell32/lang/en-GB.rc
+++ b/reactos/dll/win32/shell32/lang/en-GB.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc
index b0c87fb..b234da6 100644 (file)
--- a/reactos/dll/win32/shell32/lang/en-US.rc
+++ b/reactos/dll/win32/shell32/lang/en-US.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc
index 4da8884..8d6f3f6 100644 (file)
--- a/reactos/dll/win32/shell32/lang/es-ES.rc
+++ b/reactos/dll/win32/shell32/lang/es-ES.rc
@@ -661,6 +661,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Opciones de carpetas"
        IDS_RECYCLEBIN_LOCATION     "Ubicación de la Papelera de reciclaje"
        IDS_RECYCLEBIN_DISKSPACE    "Espacio disponible"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Seleccione un icono"
        IDS_PICK_ICON_FILTER        "Archivos de iconos(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc
index e2c8ca5..06c9e98 100644 (file)
--- a/reactos/dll/win32/shell32/lang/fi-FI.rc
+++ b/reactos/dll/win32/shell32/lang/fi-FI.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc
index 818f8cf..26563ee 100644 (file)
--- a/reactos/dll/win32/shell32/lang/fr-FR.rc
+++ b/reactos/dll/win32/shell32/lang/fr-FR.rc
@@ -663,6 +663,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Options du dossier"
        IDS_RECYCLEBIN_LOCATION     "Emplacement de la corbeille"
        IDS_RECYCLEBIN_DISKSPACE    "Espace disponible"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choisir une icône"
        IDS_PICK_ICON_FILTER        "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Fichiers exécutables\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc
index dca015c..bc2bdea 100644 (file)
--- a/reactos/dll/win32/shell32/lang/hu-HU.rc
+++ b/reactos/dll/win32/shell32/lang/hu-HU.rc
@@ -662,6 +662,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc
index fb093a9..9670434 100644 (file)
--- a/reactos/dll/win32/shell32/lang/it-IT.rc
+++ b/reactos/dll/win32/shell32/lang/it-IT.rc
@@ -660,8 +660,9 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Opzioni della cartella"
        IDS_RECYCLEBIN_LOCATION     "Posizione del Cestino"
        IDS_RECYCLEBIN_DISKSPACE    "Spazio disponibile"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Scegliere un icona"
-    IDS_PICK_ICON_FILTER        "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
+       IDS_PICK_ICON_FILTER        "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "File eseguibili\0*.exe\0"
        IDS_DIRECTORY               "Cartella"
        IDS_VIRTUAL_DRIVER          "Virtual Device Driver"

diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc
index 4db92ab..e857bb8 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ja-JP.rc
+++ b/reactos/dll/win32/shell32/lang/ja-JP.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc
index 3d67cc5..a730865 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ko-KR.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KR.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/nb-NO.rc b/reactos/dll/win32/shell32/lang/nb-NO.rc
index b501e66..12f0bd2 100644 (file)
--- a/reactos/dll/win32/shell32/lang/nb-NO.rc
+++ b/reactos/dll/win32/shell32/lang/nb-NO.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc
index c440f0b..1238f18 100644 (file)
--- a/reactos/dll/win32/shell32/lang/nl-NL.rc
+++ b/reactos/dll/win32/shell32/lang/nl-NL.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
index d429e5b..4b2dada 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@@ -665,6 +665,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Opcje katalogów"
        IDS_RECYCLEBIN_LOCATION     "Lokalizacja kosza"
        IDS_RECYCLEBIN_DISKSPACE    "Pozosta³o wolnego miejsca"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Wybierz ikonê"
        IDS_PICK_ICON_FILTER        "Pliki ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Programy\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc
index 4064364..4f97720 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pt-BR.rc
+++ b/reactos/dll/win32/shell32/lang/pt-BR.rc
@@ -661,6 +661,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc
index 4467c95..8cf94d6 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pt-PT.rc
+++ b/reactos/dll/win32/shell32/lang/pt-PT.rc
@@ -661,6 +661,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc
index e2ee7c6..cb21403 100644 (file)
--- a/reactos/dll/win32/shell32/lang/ru-RU.rc
+++ b/reactos/dll/win32/shell32/lang/ru-RU.rc
@@ -657,6 +657,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Ñâîéñòâà ïàïêè"
        IDS_RECYCLEBIN_LOCATION     "Ðàñïîëîæåíèå Êîðçèíû"
        IDS_RECYCLEBIN_DISKSPACE    "Äîñòóïíîå ïðîñòðàíñòâî"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Âûáðàòü çíà÷îê"
        IDS_PICK_ICON_FILTER        "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Èñïîëíÿåìûå ôàéëû\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc
index 8382aa2..5f69c18 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sk-SK.rc
+++ b/reactos/dll/win32/shell32/lang/sk-SK.rc
@@ -665,6 +665,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Mo\9enosti prieèinka"
        IDS_RECYCLEBIN_LOCATION     "Umiestnenia Ko\9aa" //Recycle Bin Location
        IDS_RECYCLEBIN_DISKSPACE    "Dostupné miesto"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Súbory ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Spustite¾né súbory\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc
index 8d8ea82..78f9ab8 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sl-SI.rc
+++ b/reactos/dll/win32/shell32/lang/sl-SI.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc
index 384fea9..65cb8d9 100644 (file)
--- a/reactos/dll/win32/shell32/lang/sv-SE.rc
+++ b/reactos/dll/win32/shell32/lang/sv-SE.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc
index 375adc1..f2ac50e 100644 (file)
--- a/reactos/dll/win32/shell32/lang/tr-TR.rc
+++ b/reactos/dll/win32/shell32/lang/tr-TR.rc
@@ -659,6 +659,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc
index fccd290..70bdc82 100644 (file)
--- a/reactos/dll/win32/shell32/lang/uk-UA.rc
+++ b/reactos/dll/win32/shell32/lang/uk-UA.rc
@@ -660,6 +660,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Âëàñòèâîñò³ ïàïêè"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc
index ead1469..a94de27 100644 (file)
--- a/reactos/dll/win32/shell32/lang/zh-CN.rc
+++ b/reactos/dll/win32/shell32/lang/zh-CN.rc
@@ -660,6 +660,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc
index a0333ae..d7782a7 100644 (file)
--- a/reactos/dll/win32/shell32/lang/zh-TW.rc
+++ b/reactos/dll/win32/shell32/lang/zh-TW.rc
@@ -660,6 +660,7 @@ BEGIN
        IDS_FOLDER_OPTIONS          "Folder Options"
        IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
        IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+       IDS_EMPTY_BITBUCKET         "Empty Recycle Bin"
        IDS_PICK_ICON_TITLE         "Choose Icon"
        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
        IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"

diff --git a/reactos/dll/win32/shell32/recyclebin.c b/reactos/dll/win32/shell32/recyclebin.c
index e34cf75..0bf9260 100644 (file)
--- a/reactos/dll/win32/shell32/recyclebin.c
+++ b/reactos/dll/win32/shell32/recyclebin.c
@@ -680,12 +680,10 @@ static HRESULT WINAPI
 RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT indexMenu,
                             UINT idCmdFirst, UINT idCmdLast, UINT uFlags )
 {
-    RecycleBin * This = impl_from_IContextMenu(iface);
-    static WCHAR szOpen[] = { 'O','p','e','n',0 };
-    static WCHAR szEmpty[] = { 'E','m','p','t','y',' ','R','e','c','y','c','l','e',' ','B','i','n',0 };
-    static WCHAR szProperties[] = { 'P','r','o','p','e','r','t','i','e','s',0 };
+    WCHAR szBuffer[100];
     MENUITEMINFOW mii;
     int id = 1;
+    RecycleBin * This = impl_from_IContextMenu(iface);
 
     TRACE("%p %p %u %u %u %u\n", This,
           hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags );
@@ -696,7 +694,10 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
     memset( &mii, 0, sizeof(mii) );
     mii.cbSize = sizeof(mii);
     mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
-    mii.dwTypeData = (LPWSTR)szOpen;
+    szBuffer[0] = L'\0';
+    LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
+    szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+    mii.dwTypeData = (LPWSTR)szBuffer;
     mii.cch = strlenW( mii.dwTypeData );
     mii.wID = idCmdFirst + id++;
     mii.fState = MFS_ENABLED;
@@ -707,7 +708,9 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
     This->iIdOpen = 1;
 
     mii.fState = MFS_ENABLED;
-    mii.dwTypeData = (LPWSTR)szEmpty;
+    szBuffer[0] = L'\0';
+    LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
+    szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
     mii.cch = strlenW( mii.dwTypeData );
     mii.wID = idCmdFirst + id++;
     if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii ))
@@ -716,16 +719,6 @@ RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT
         return E_FAIL;
     }
     This->iIdEmpty = 2;
-    mii.fState = MFS_ENABLED;
-    mii.dwTypeData = (LPWSTR)szProperties;
-    mii.cch = strlenW( mii.dwTypeData );
-    mii.wID = idCmdFirst + id++;
-    if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii ))
-    {
-        TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties");
-        return E_FAIL;
-    }
-    This->iIdProperties = 3;
     return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id );
 }
 

diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
index 4adcaad..b8bc59e 100644 (file)
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@@ -132,6 +132,7 @@
 #define IDS_INI_FILE                169
 #define IDS_LNK_FILE                170
 #define IDS_SYS_FILE                171
+#define IDS_EMPTY_BITBUCKET         172
 
 /* Note: this string is referenced from the registry */
 #define IDS_RECYCLEBIN_FOLDER_NAME   8964