Author: rnaumann Date: Sun Nov 8 14:30:25 2015 New Revision: 69849
URL: http://svn.reactos.org/svn/reactos?rev=69849&view=rev Log: [BROWSEUI] Use a resource string instead of a hardcoded one for the "Back" button. Patch by Ștefan Fulea with Spanish translation by Ismael Ferreras Morezuelas. CORE-10303 Changes by me: -Add the same for Russian -Add German translation
Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc trunk/reactos/dll/win32/browseui/travellog.cpp
Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@
STRINGTABLE BEGIN - IDS_BACK "Ðазад" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐапÑед" END
Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -282,7 +282,7 @@
STRINGTABLE BEGIN - IDS_BACK "Zurück" + IDS_BACK "Zurück zu %s\0" IDS_FORWARD "Vorwärts" END
Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -282,7 +282,7 @@
STRINGTABLE BEGIN - IDS_BACK "Back" + IDS_BACK "Back to %s\0" IDS_FORWARD "Forward" END
Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -265,7 +265,7 @@
STRINGTABLE BEGIN - IDS_BACK "Atrás" + IDS_BACK "Volver a %s\0" IDS_FORWARD "Adelante" END
Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@
STRINGTABLE BEGIN - IDS_BACK "Back" + IDS_BACK "Back to %s\0" IDS_FORWARD "Forward" END
Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@
STRINGTABLE BEGIN - IDS_BACK "Indietro" + IDS_BACK "Back to %s\0" IDS_FORWARD "Avanti" END
Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -272,7 +272,7 @@
STRINGTABLE BEGIN - IDS_BACK "Wstecz" + IDS_BACK "Back to %s\0" IDS_FORWARD "Dalej" END
Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@
STRINGTABLE BEGIN - IDS_BACK "Ãnapoi" + IDS_BACK "Ãnapoi la %s\0" IDS_FORWARD "Ãnainte" END
Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@
STRINGTABLE BEGIN - IDS_BACK "Ðазад" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐпеÑед" END
Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -283,7 +283,7 @@
STRINGTABLE BEGIN - IDS_BACK "Mrapa" + IDS_BACK "Back to %s\0" IDS_FORWARD "Perpara" END
Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@
STRINGTABLE BEGIN - IDS_BACK "Geri" + IDS_BACK "Back to %s\0" IDS_FORWARD "İleri" END
Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@
STRINGTABLE BEGIN - IDS_BACK "Ðазад" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐпеÑед" END
Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh-... ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -284,7 +284,7 @@
STRINGTABLE BEGIN - IDS_BACK "åé" + IDS_BACK "Back to %s\0" IDS_FORWARD "åè¿" END
Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travello... ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -428,6 +428,7 @@ CTravelEntry *destinationEntry; wchar_t tempString[MAX_PATH]; wchar_t templateString[200]; + wchar_t *resourceString; HRESULT hResult;
if (pwzText == NULL) @@ -442,7 +443,11 @@ return hResult; if (iOffset < 0) { - wcscpy(templateString, L"Back to %s"); + hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_BACK, (wchar_t*)&resourceString, 0); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + wcscpy(templateString, resourceString); } else {