From 4888f694bddadb0d2de8d3d0c6b0fe110a70326e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sun, 8 Nov 2015 14:41:26 +0000
Subject: [PATCH] [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.

svn path=/trunk/; revision=69850
---
 reactos/dll/win32/browseui/lang/bg-BG.rc | 2 +-
 reactos/dll/win32/browseui/lang/de-DE.rc | 2 +-
 reactos/dll/win32/browseui/lang/en-US.rc | 2 +-
 reactos/dll/win32/browseui/lang/es-ES.rc | 2 +-
 reactos/dll/win32/browseui/lang/he-IL.rc | 2 +-
 reactos/dll/win32/browseui/lang/it-IT.rc | 2 +-
 reactos/dll/win32/browseui/lang/pl-PL.rc | 2 +-
 reactos/dll/win32/browseui/lang/ro-RO.rc | 6 +++++-
 reactos/dll/win32/browseui/lang/ru-RU.rc | 2 +-
 reactos/dll/win32/browseui/lang/sq-AL.rc | 2 +-
 reactos/dll/win32/browseui/lang/tr-TR.rc | 2 +-
 reactos/dll/win32/browseui/lang/uk-UA.rc | 2 +-
 reactos/dll/win32/browseui/lang/zh-CN.rc | 2 +-
 reactos/dll/win32/browseui/travellog.cpp | 7 +++++--
 14 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/reactos/dll/win32/browseui/lang/bg-BG.rc b/reactos/dll/win32/browseui/lang/bg-BG.rc
index 9886938ae41..38eeb893e0a 100644
--- a/reactos/dll/win32/browseui/lang/bg-BG.rc
+++ b/reactos/dll/win32/browseui/lang/bg-BG.rc
@@ -265,7 +265,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Напред"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/de-DE.rc b/reactos/dll/win32/browseui/lang/de-DE.rc
index 2d35c6e8cf9..f804050961b 100644
--- a/reactos/dll/win32/browseui/lang/de-DE.rc
+++ b/reactos/dll/win32/browseui/lang/de-DE.rc
@@ -283,7 +283,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Zurück zu %s\0"
-    IDS_FORWARD "Vorwärts"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 
diff --git a/reactos/dll/win32/browseui/lang/en-US.rc b/reactos/dll/win32/browseui/lang/en-US.rc
index e7db936da38..09f59ae9702 100644
--- a/reactos/dll/win32/browseui/lang/en-US.rc
+++ b/reactos/dll/win32/browseui/lang/en-US.rc
@@ -283,7 +283,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/es-ES.rc b/reactos/dll/win32/browseui/lang/es-ES.rc
index de46897380a..728ed71f9d1 100644
--- a/reactos/dll/win32/browseui/lang/es-ES.rc
+++ b/reactos/dll/win32/browseui/lang/es-ES.rc
@@ -266,7 +266,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Volver a %s\0"
-    IDS_FORWARD "Adelante"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/he-IL.rc b/reactos/dll/win32/browseui/lang/he-IL.rc
index 60cd9e5d5ed..1f4ffb1e1a7 100644
--- a/reactos/dll/win32/browseui/lang/he-IL.rc
+++ b/reactos/dll/win32/browseui/lang/he-IL.rc
@@ -267,7 +267,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/it-IT.rc b/reactos/dll/win32/browseui/lang/it-IT.rc
index fba05b95f5e..c44ff413608 100644
--- a/reactos/dll/win32/browseui/lang/it-IT.rc
+++ b/reactos/dll/win32/browseui/lang/it-IT.rc
@@ -265,7 +265,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Avanti"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/pl-PL.rc b/reactos/dll/win32/browseui/lang/pl-PL.rc
index 85075647bb5..231955d3a2c 100644
--- a/reactos/dll/win32/browseui/lang/pl-PL.rc
+++ b/reactos/dll/win32/browseui/lang/pl-PL.rc
@@ -273,7 +273,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Dalej"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/ro-RO.rc b/reactos/dll/win32/browseui/lang/ro-RO.rc
index 31a57ced85f..845c1039beb 100644
--- a/reactos/dll/win32/browseui/lang/ro-RO.rc
+++ b/reactos/dll/win32/browseui/lang/ro-RO.rc
@@ -267,6 +267,10 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Înapoi la %s\0"
-    IDS_FORWARD "Înainte"
+    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
diff --git a/reactos/dll/win32/browseui/lang/ru-RU.rc b/reactos/dll/win32/browseui/lang/ru-RU.rc
index f2980cd2f25..7f6b17c799e 100644
--- a/reactos/dll/win32/browseui/lang/ru-RU.rc
+++ b/reactos/dll/win32/browseui/lang/ru-RU.rc
@@ -267,7 +267,7 @@ END
 STRINGTABLE
 BEGIN
   IDS_BACK "Back to %s\0"
-  IDS_FORWARD "Вперед"
+  IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/sq-AL.rc b/reactos/dll/win32/browseui/lang/sq-AL.rc
index 5c646ae2e01..13422f95ea3 100644
--- a/reactos/dll/win32/browseui/lang/sq-AL.rc
+++ b/reactos/dll/win32/browseui/lang/sq-AL.rc
@@ -284,7 +284,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Perpara"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/tr-TR.rc b/reactos/dll/win32/browseui/lang/tr-TR.rc
index f3c27b5e776..a2458bc2e4c 100644
--- a/reactos/dll/win32/browseui/lang/tr-TR.rc
+++ b/reactos/dll/win32/browseui/lang/tr-TR.rc
@@ -265,7 +265,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "İleri"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/uk-UA.rc b/reactos/dll/win32/browseui/lang/uk-UA.rc
index a5673efa86d..37feac86107 100644
--- a/reactos/dll/win32/browseui/lang/uk-UA.rc
+++ b/reactos/dll/win32/browseui/lang/uk-UA.rc
@@ -267,7 +267,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Вперед"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/zh-CN.rc b/reactos/dll/win32/browseui/lang/zh-CN.rc
index 04e488448b5..08b5ae02c7f 100644
--- a/reactos/dll/win32/browseui/lang/zh-CN.rc
+++ b/reactos/dll/win32/browseui/lang/zh-CN.rc
@@ -285,7 +285,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_BACK "Back to %s\0"
-    IDS_FORWARD "前进"
+    IDS_FORWARD "Forward to %s\0"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/travellog.cpp b/reactos/dll/win32/browseui/travellog.cpp
index a21e4c2f22c..896aff8b091 100644
--- a/reactos/dll/win32/browseui/travellog.cpp
+++ b/reactos/dll/win32/browseui/travellog.cpp
@@ -447,12 +447,15 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetToolTipText(IUnknown *punk, int iOffset
                             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);