Author: spetreolle
Date: Sat Feb 4 16:12:15 2017
New Revision: 73674
URL: http://svn.reactos.org/svn/reactos?rev=73674&view=rev
Log:
[STOBJECT]
Add a partial French translation.
Remove hardcoded string.
CORE-12490 #resolve
Added:
trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc
- copied, changed from r73673,
trunk/reactos/dll/shellext/stobject/lang/en-US.rc
Modified:
trunk/reactos/dll/shellext/stobject/stobject.rc
trunk/reactos/dll/shellext/stobject/volume.cpp
Copied: trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc (from r73673,
trunk/reactos/dll/shellext/stobject/lang/en-US.rc)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc?p2=trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc&p1=trunk/reactos/dll/shellext/stobject/lang/en-US.rc&r1=73673&r2=73674&rev=73674&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/stobject/lang/fr-FR.rc [iso-8859-1] Sat Feb 4
16:12:15 2017
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+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
@@ -6,9 +6,9 @@
CAPTION "Power Meter"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "Power status", 1001, "Button", BS_GROUPBOX | WS_CHILD |
WS_VISIBLE, 9, 20, 234, 189
- CONTROL "&Always show icon on the taskbar.", 1002, "Button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10
- CONTROL "Show details for each &battery.", 1003, "Button", BS_AUTOCHECKBOX
| WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8
+ 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
@@ -37,9 +37,9 @@
//Volume related strings
IDS_VOL_VOLUME "Volume"
- IDS_VOL_ADJUST "&Adjust Audio Properties"
- IDS_VOL_OPEN "&Open Volume Control"
- IDS_VOL_MUTED "Volume (muted)"
+ 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"
Modified: trunk/reactos/dll/shellext/stobject/stobject.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stobject.rc?rev=73674&r1=73673&r2=73674&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Sat Feb 4
16:12:15 2017
@@ -43,6 +43,9 @@
#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
Modified: trunk/reactos/dll/shellext/stobject/volume.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volume.cpp?rev=73674&r1=73673&r2=73674&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Sat Feb 4
16:12:15 2017
@@ -143,6 +143,7 @@
HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray)
{
HRESULT hr;
+ WCHAR strTooltip[128];
TRACE("Volume_Init\n");
@@ -166,7 +167,8 @@
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)
