From ce6b6fab9fe0708270373e061bd5133cafc1891f Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Fri, 18 Aug 2017 08:38:52 +0000 Subject: [PATCH] [STOBJECT] Fix bug that caused some resource strings not to be loaded. - These strings need to either be in every language file or have their own resource range but since we are using the same resource ids with windows I will just duplicate them. svn path=/trunk/; revision=75604 --- reactos/dll/shellext/stobject/lang/cs-CZ.rc | 3 +++ reactos/dll/shellext/stobject/lang/de-DE.rc | 3 +++ reactos/dll/shellext/stobject/lang/en-US.rc | 3 +++ reactos/dll/shellext/stobject/lang/es-ES.rc | 3 +++ reactos/dll/shellext/stobject/lang/fr-FR.rc | 3 +++ reactos/dll/shellext/stobject/lang/it-IT.rc | 3 +++ reactos/dll/shellext/stobject/lang/ro-RO.rc | 3 +++ reactos/dll/shellext/stobject/lang/ru-RU.rc | 3 +++ reactos/dll/shellext/stobject/lang/tr-TR.rc | 3 +++ reactos/dll/shellext/stobject/lang/zh-CN.rc | 3 +++ reactos/dll/shellext/stobject/lang/zh-TW.rc | 3 +++ reactos/dll/shellext/stobject/stobject.rc | 13 ------------- 12 files changed, 33 insertions(+), 13 deletions(-) diff --git a/reactos/dll/shellext/stobject/lang/cs-CZ.rc b/reactos/dll/shellext/stobject/lang/cs-CZ.rc index 910653245b6..84fe3d4fb11 100644 --- a/reactos/dll/shellext/stobject/lang/cs-CZ.rc +++ b/reactos/dll/shellext/stobject/lang/cs-CZ.rc @@ -17,6 +17,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Upravit možnosti napájení" IDS_PWR_METER "&Otevřít ukazatel spotřeby" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "zbývá %1!u!%%" IDS_PWR_CHARGING " (nabíjení)" IDS_PWR_UNKNOWN_REMAINING "Zbývá neznámo" @@ -28,6 +29,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Bezpečně odebrat hardware" IDS_HOTPLUG_REMOVE_2 "&Bezpečně odebrat hardwar" IDS_HOTPLUG_REMOVE_3 "Bezpečně odebrat%s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Jednotka(%s)" IDS_HOTPLUG_DRIVES " - Jednotky(%s)" @@ -39,6 +41,7 @@ BEGIN IDS_VOL_VOLUME "Hlasitost" IDS_VOL_ADJUST "&Upravit vlastnosti zvuku" IDS_VOL_OPEN "&Otevřít ovládání hlasitosti" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Hlasitost (ztlumeno)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/de-DE.rc b/reactos/dll/shellext/stobject/lang/de-DE.rc index 2d1331b9d78..1563baf1729 100644 --- a/reactos/dll/shellext/stobject/lang/de-DE.rc +++ b/reactos/dll/shellext/stobject/lang/de-DE.rc @@ -17,6 +17,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Energieverwaltungseigenschaften einstellen" IDS_PWR_METER "Batterieanzeige ö&ffnen" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% verbleibend" IDS_PWR_CHARGING " (wird aufgeladen)" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" @@ -28,6 +29,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Hardware sicher entfernen" IDS_HOTPLUG_REMOVE_2 "&Hardware sicher entfernen" IDS_HOTPLUG_REMOVE_3 "%s entfernen" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Laufwerk (%s)" IDS_HOTPLUG_DRIVES " - Laufwerke (%s)" @@ -39,6 +41,7 @@ BEGIN IDS_VOL_VOLUME "Lautstärke" IDS_VOL_ADJUST "&Audioeigenschaften einstellen" IDS_VOL_OPEN "&Lautstärkeregelung öffnen" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Lautstärke (ausgeschaltet)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/en-US.rc b/reactos/dll/shellext/stobject/lang/en-US.rc index c4a2f48f1bb..e10c25c3cc8 100644 --- a/reactos/dll/shellext/stobject/lang/en-US.rc +++ b/reactos/dll/shellext/stobject/lang/en-US.rc @@ -17,6 +17,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" IDS_PWR_CHARGING " (charging)" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" @@ -28,6 +29,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Drive(%s)" IDS_HOTPLUG_DRIVES " - Drives(%s)" @@ -39,6 +41,7 @@ BEGIN IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Adjust Audio Properties" IDS_VOL_OPEN "&Open Volume Control" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (muted)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/es-ES.rc b/reactos/dll/shellext/stobject/lang/es-ES.rc index 4aa6b808101..c7a3d0d6b22 100644 --- a/reactos/dll/shellext/stobject/lang/es-ES.rc +++ b/reactos/dll/shellext/stobject/lang/es-ES.rc @@ -18,6 +18,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Ajustar propiedades de energía" IDS_PWR_METER "Abrir &medidor de energía" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "Queda un %1!u!%%" IDS_PWR_CHARGING " (cargando)" IDS_PWR_UNKNOWN_REMAINING "Estado de batería desconocido" @@ -29,6 +30,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Desconectar de forma segura" IDS_HOTPLUG_REMOVE_2 "&Desconectar de forma segura" IDS_HOTPLUG_REMOVE_3 "Desconectar de forma segura %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Unidad(%s)" IDS_HOTPLUG_DRIVES " - Unidades(%s)" @@ -40,6 +42,7 @@ BEGIN IDS_VOL_VOLUME "Volumen" IDS_VOL_ADJUST "&Ajustar propiedades de audio" IDS_VOL_OPEN "Abrir &control de volumen" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volumen (silenciado)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/fr-FR.rc b/reactos/dll/shellext/stobject/lang/fr-FR.rc index 65ddfbc8abc..273cb83b896 100644 --- a/reactos/dll/shellext/stobject/lang/fr-FR.rc +++ b/reactos/dll/shellext/stobject/lang/fr-FR.rc @@ -17,6 +17,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" IDS_PWR_CHARGING " (charging)" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" @@ -28,6 +29,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Drive(%s)" IDS_HOTPLUG_DRIVES " - Drives(%s)" @@ -39,6 +41,7 @@ BEGIN IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Ajuster les propriétés audio" IDS_VOL_OPEN "&Ouvrir le controle du volume" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (muet)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/it-IT.rc b/reactos/dll/shellext/stobject/lang/it-IT.rc index 917acc07db9..a4d715427c8 100644 --- a/reactos/dll/shellext/stobject/lang/it-IT.rc +++ b/reactos/dll/shellext/stobject/lang/it-IT.rc @@ -17,6 +17,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Modifica proprietà alimentazione" IDS_PWR_METER "&Apri misuratore alimentazione" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% rimanenti" IDS_PWR_CHARGING " (in carica)" IDS_PWR_UNKNOWN_REMAINING "Autonomia sconosciuta" @@ -28,6 +29,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Rimozione sicura dell'Hardware" IDS_HOTPLUG_REMOVE_2 "&Rimozione sicura dell'Hardware" IDS_HOTPLUG_REMOVE_3 "Rimozione sicura di %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Unità disco(%s)" IDS_HOTPLUG_DRIVES " - Unità dischi(%s)" @@ -39,6 +41,7 @@ BEGIN IDS_VOL_VOLUME "Volume" IDS_VOL_ADJUST "&Modifica proprietà audio" IDS_VOL_OPEN "&Apri controllo del Volume" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volume (spento)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/ro-RO.rc b/reactos/dll/shellext/stobject/lang/ro-RO.rc index 1a066d6d2d1..0de2e8de7cd 100644 --- a/reactos/dll/shellext/stobject/lang/ro-RO.rc +++ b/reactos/dll/shellext/stobject/lang/ro-RO.rc @@ -18,6 +18,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Ajustare proprietăți de consum energie" IDS_PWR_METER "&Deschide Contor de energie" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "Au mai rămas %1!u!%%" IDS_PWR_CHARGING " (în încărcare)" IDS_PWR_UNKNOWN_REMAINING "Nu este disponibil cât a mai rămas" @@ -29,6 +30,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Scoate în siguranță acest dispozitiv" IDS_HOTPLUG_REMOVE_2 "S&coate în siguranță acest dispozitiv" IDS_HOTPLUG_REMOVE_3 "Scoate în siguranță %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - unitate (%s)" IDS_HOTPLUG_DRIVES " - unități (%s)" @@ -40,6 +42,7 @@ BEGIN IDS_VOL_VOLUME "Volum" IDS_VOL_ADJUST "&Ajustează proprietăți audio" IDS_VOL_OPEN "&Deschide control de volum" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Volum (mut)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/ru-RU.rc b/reactos/dll/shellext/stobject/lang/ru-RU.rc index 91734e91636..572f1613fd6 100644 --- a/reactos/dll/shellext/stobject/lang/ru-RU.rc +++ b/reactos/dll/shellext/stobject/lang/ru-RU.rc @@ -19,6 +19,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Настройка параметров электропитания" IDS_PWR_METER "&Открыть показатели питания" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%1!u!%% осталось" IDS_PWR_CHARGING " (зарядка)" IDS_PWR_UNKNOWN_REMAINING "Неизвестно" @@ -30,6 +31,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Безопасное извлечение устройства" IDS_HOTPLUG_REMOVE_2 "&Безопасное извлечение устройства" IDS_HOTPLUG_REMOVE_3 "Безопасное извлечение %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Диск(%s)" IDS_HOTPLUG_DRIVES " - Диски(%s)" @@ -41,6 +43,7 @@ BEGIN IDS_VOL_VOLUME "Громкость" IDS_VOL_ADJUST "&Настройка параметров аудио" IDS_VOL_OPEN "&Открыть управление громкостью" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Громкость (выключено)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/tr-TR.rc b/reactos/dll/shellext/stobject/lang/tr-TR.rc index 672a780f903..8177ba0dd42 100644 --- a/reactos/dll/shellext/stobject/lang/tr-TR.rc +++ b/reactos/dll/shellext/stobject/lang/tr-TR.rc @@ -19,6 +19,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "&Güç Husûsiyetlerini Düzenle" IDS_PWR_METER "G&üç Ölçücüsünü Aç" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%%%1!u! kaldı." IDS_PWR_CHARGING " (Yükleniyor)" IDS_PWR_UNKNOWN_REMAINING "Bilinmeyen kalan." @@ -30,6 +31,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "Donanımı Güvenli Kaldır" IDS_HOTPLUG_REMOVE_2 "&Donanımı Güvenli Kaldır" IDS_HOTPLUG_REMOVE_3 "%s Donanımını Güvenli Kaldır" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Sürücü (%s)" IDS_HOTPLUG_DRIVES " - Sürücüler (%s)" @@ -41,6 +43,7 @@ BEGIN IDS_VOL_VOLUME "Ses Düzeyi" IDS_VOL_ADJUST "&Ses Husûsiyetlerini Düzenle" IDS_VOL_OPEN "&Ses Düzeyi Denetimini Aç" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "Ses Düzeyi (Sessiz)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/zh-CN.rc b/reactos/dll/shellext/stobject/lang/zh-CN.rc index c0478d83d99..6ba1f37f4bd 100644 --- a/reactos/dll/shellext/stobject/lang/zh-CN.rc +++ b/reactos/dll/shellext/stobject/lang/zh-CN.rc @@ -19,6 +19,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "调整电源属性(&A)" IDS_PWR_METER "开放式电源表(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "剩余 %1!u!%%" IDS_PWR_CHARGING " (充电中)" IDS_PWR_UNKNOWN_REMAINING "未知剩余" @@ -30,6 +31,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "安全地删除硬件" IDS_HOTPLUG_REMOVE_2 "安全地删除硬件(&S)" IDS_HOTPLUG_REMOVE_3 "安全地删除 %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - 磁盘(%s)" IDS_HOTPLUG_DRIVES " - 磁盘(%s)" @@ -41,6 +43,7 @@ BEGIN IDS_VOL_VOLUME "音量" IDS_VOL_ADJUST "调整音频属性(&A)" IDS_VOL_OPEN "打开音量控制(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "(静音)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/lang/zh-TW.rc b/reactos/dll/shellext/stobject/lang/zh-TW.rc index 6a7b1bc4402..35ae8c4a6f5 100644 --- a/reactos/dll/shellext/stobject/lang/zh-TW.rc +++ b/reactos/dll/shellext/stobject/lang/zh-TW.rc @@ -19,6 +19,7 @@ BEGIN //Power related strings IDS_PWR_PROPERTIES "調整電源屬性(&A)" IDS_PWR_METER "開放式電源表(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "剩餘 %1!u!%%" IDS_PWR_CHARGING " (充電中)" IDS_PWR_UNKNOWN_REMAINING "未知剩餘" @@ -30,6 +31,7 @@ BEGIN IDS_HOTPLUG_REMOVE_1 "安全地刪除硬體" IDS_HOTPLUG_REMOVE_2 "安全地刪除硬體(&S)" IDS_HOTPLUG_REMOVE_3 "安全地刪除 %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - 磁碟(%s)" IDS_HOTPLUG_DRIVES " - 磁碟(%s)" @@ -41,6 +43,7 @@ BEGIN IDS_VOL_VOLUME "音量" IDS_VOL_ADJUST "調整音訊屬性(&A)" IDS_VOL_OPEN "開啟音量控制(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" IDS_VOL_MUTED "(靜音)" //Keyboard-Mouse related strings diff --git a/reactos/dll/shellext/stobject/stobject.rc b/reactos/dll/shellext/stobject/stobject.rc index 81be2e93dcd..8c7e4a0f017 100644 --- a/reactos/dll/shellext/stobject/stobject.rc +++ b/reactos/dll/shellext/stobject/stobject.rc @@ -15,19 +15,6 @@ IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #include -// Strings common to all languages -STRINGTABLE -BEGIN - // Power related strings - IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - - // Hotplug related strings - IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" - - // Volume related strings - IDS_VOL_RUN "SNDVOL32.EXE" -END - /* UTF-8 */ #pragma code_page(65001)