[STOBJECT]

Add a partial French translation.
Remove hardcoded string.
CORE-12490 #resolve

svn path=/trunk/; revision=73674

diff --git a/reactos/dll/shellext/stobject/lang/fr-FR.rc b/reactos/dll/shellext/stobject/lang/fr-FR.rc
new file mode 100644 (file)
index 0000000..65ddfbc
--- /dev/null
+++ b/reactos/dll/shellext/stobject/lang/fr-FR.rc
@@ -0,0 +1,48 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_POWER_METER DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Power Meter"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Etat de l'alimentation", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 
+    CONTROL "&Toujours afficher l'icone.", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 
+    CONTROL "Afficher les détails pour chaque &batterie.", 1003, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 
+    CONTROL "", 1000, "Static", SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 
+END
+
+STRINGTABLE
+BEGIN
+    //Power related strings
+    IDS_PWR_PROPERTIES        "&Adjust Power Properties"
+    IDS_PWR_METER             "&Open Power Meter"
+    IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining"
+    IDS_PWR_CHARGING          " (charging)"
+    IDS_PWR_UNKNOWN_REMAINING "Unknown remaining"
+    IDS_PWR_AC "On AC power"
+    IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining"
+    IDS_PWR_MINUTES_REMAINING "%1!u! min (%2!u!%%) remaining"
+
+    //Hotplug related strings
+    IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware"
+    IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware"
+    IDS_HOTPLUG_REMOVE_3 "Safely remove %s"
+    IDS_HOTPLUG_COMMA ", "
+    IDS_HOTPLUG_DRIVE " - Drive(%s)"
+    IDS_HOTPLUG_DRIVES " - Drives(%s)"
+    IDS_HOTPLUG_A "A:"
+    IDS_HOTPLUG_REQUIRES "This hardware requires ""Safe Removal"""
+    IDS_HOTPLUG_CLICK "Before removing this hardware, click on this icon and select the hardware you want to remove."
+
+    //Volume related strings
+    IDS_VOL_VOLUME "Volume"
+    IDS_VOL_ADJUST "&Ajuster les propriétés audio"
+    IDS_VOL_OPEN "&Ouvrir le controle du volume"
+    IDS_VOL_MUTED "Volume (muet)"
+
+    //Keyboard-Mouse related strings
+    IDS_KEYS_STICKY "StickyKeys"
+    IDS_KEYS_MOUSE "MouseKeys"
+    IDS_KEYS_FILTER "FilterKeys"
+END

diff --git a/reactos/dll/shellext/stobject/stobject.rc b/reactos/dll/shellext/stobject/stobject.rc
index e90f43f..81be2e9 100644 (file)
--- a/reactos/dll/shellext/stobject/stobject.rc
+++ b/reactos/dll/shellext/stobject/stobject.rc
@@ -43,6 +43,9 @@ END
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif

diff --git a/reactos/dll/shellext/stobject/volume.cpp b/reactos/dll/shellext/stobject/volume.cpp
index 1c5b73a..57d9a5d 100644 (file)
--- a/reactos/dll/shellext/stobject/volume.cpp
+++ b/reactos/dll/shellext/stobject/volume.cpp
@@ -143,6 +143,7 @@ HRESULT Volume_IsMute()
 HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray)
 {
     HRESULT hr;
+    WCHAR strTooltip[128];
 
     TRACE("Volume_Init\n");
 
@@ -166,7 +167,8 @@ HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray)
     else
         icon = g_hIconVolume;
 
-    return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_VOLUME, icon, L"Volume Control");
+    LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip));
+    return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_VOLUME, icon, strTooltip);
 }
 
 HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray)