Issue 3220 - FAQ and Privacy Policy links redirect to English site only

mobile/android/base/strings.xml.in

Index: mobile/android/base/strings.xml.in
===================================================================
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -79,18 +79,19 @@
 
   <string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>
   <string name="launcher_shortcuts_empty">&launcher_shortcuts_empty;</string>
 
   <string name="choose_file">&choose_file;</string>
 
   <string name="url_bar_default_text">&url_bar_default_text2;</string>
 
-  <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq -->
-  <string name="faq_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/faq</string>
+  <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%LOCALE% -->

[Felix Dahlke, 2016/09/15 14:59:22]

Nit: I think we should move this line below the "Changed" line, that seems
consistent with how we normally do it.

[diegocarloslima, 2016/10/21 13:37:43]

Acknowledged.

+  <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 -->
+  <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_android_faq&amp;lang=&formatS1;</string>
 
   <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/ -->
   <string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/</string>
   <string name="help_menu">&help_menu;</string>
 
   <string name="quit">&quit;</string>
   <string name="bookmark">&bookmark;</string>
   <string name="bookmark_remove">&bookmark_remove;</string>