[ros-diffs] [hbelusca] 69850: [BROWSEUI] - Apply the same fix as r69849, but for the Forward tooltip. Also it would be nice to use ATL strings to retrieve the resources & not hardcoding an extra NULL character...

Author: hbelusca
Date: Sun Nov  8 14:41:26 2015
New Revision: 69850

URL: http://svn.reactos.org/svn/reactos?rev=69850&view=rev
Log:
[BROWSEUI]
- Apply the same fix as r69849, but for the Forward tooltip. Also it would be nice to use
ATL strings to retrieve the resources & not hardcoding an extra NULL character inside
the resource string.
- Add a missing string resource in romanian RC file.

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:41:26 2015
@@ -265,7 +265,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Напред"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -283,7 +283,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Zurück zu %s\0"
-    IDS_FORWARD "Vorwärts"
+    IDS_FORWARD "Forward to %s\0"
 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:41:26 2015
@@ -283,7 +283,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -266,7 +266,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Volver a %s\0"
-    IDS_FORWARD "Adelante"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -267,7 +267,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -265,7 +265,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Avanti"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -273,7 +273,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Dalej"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -267,6 +267,10 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Înapoi la %s\0"
-    IDS_FORWARD "Înainte"
-END
-
+    IDS_FORWARD "Forward to %s\0"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy
To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full
Screen|Properties|Cut|Copy|Paste|Folder Options||"
+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:41:26 2015
@@ -267,7 +267,7 @@
 STRINGTABLE
 BEGIN
   IDS_BACK "Back to %s\0"
-  IDS_FORWARD "Вперед"
+  IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -284,7 +284,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Perpara"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -265,7 +265,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Ä°leri"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -267,7 +267,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Вперед"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

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:41:26 2015
@@ -285,7 +285,7 @@
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "前进"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/browseui/travellog.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell…
==============================================================================
--- 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:41:26 2015
@@ -447,12 +447,15 @@
                             IDS_BACK, (wchar_t*)&resourceString, 0);
         if (FAILED_UNEXPECTEDLY(hResult))
             return hResult;
-        wcscpy(templateString, resourceString);
     }
     else
     {
-        wcscpy(templateString, L"Forward to %s");
-    }
+        hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(),
+                            IDS_FORWARD, (wchar_t*)&resourceString, 0);
+        if (FAILED_UNEXPECTEDLY(hResult))
+            return hResult;
+    }
+    wcscpy(templateString, resourceString);
     _snwprintf(pwzText, cchText, templateString, tempString);
 
     TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning
L\"%S\"\n", punk, iOffset, pwzText);