mobile/android/base/strings.xml.in - Issue 29346916: Issue 3220 - FAQ and Privacy Policy links redirect to English site only

Side by Side Diff: mobile/android/base/strings.xml.in

Issue 29346916: Issue 3220 - FAQ and Privacy Policy links redirect to English site only (Closed)

Patch Set: Created June 22, 2016, 12:31 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« mobile/android/base/resources/xml/preferences_vendor.xml ('K') | « mobile/android/base/resources/xml/preferences_vendor.xml ('k') | mobile/android/chrome/content/aboutAdblockBrowser.xhtml » ('j') | mobile/android/chrome/content/aboutAdblockBrowser.xhtml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 #filter substitution	1 #filter substitution

2 <?xml version="1.0" encoding="utf-8"?>	2 <?xml version="1.0" encoding="utf-8"?>

3 <!-- This Source Code Form is subject to the terms of the Mozilla Public	3 <!-- This Source Code Form is subject to the terms of the Mozilla Public

4 - License, v. 2.0. If a copy of the MPL was not distributed with this	4 - License, v. 2.0. If a copy of the MPL was not distributed with this

5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->	5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

6	6

7 <!DOCTYPE resources [	7 <!DOCTYPE resources [

8 #includesubst @BRANDPATH@	8 #includesubst @BRANDPATH@

9 #includesubst @STRINGSPATH@	9 #includesubst @STRINGSPATH@

10 #includesubst @ABBSTRINGSPATH@	10 #includesubst @ABBSTRINGSPATH@

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 <string name="crash_restart_label">&crash_restart_label;</string>	77 <string name="crash_restart_label">&crash_restart_label;</string>

78 <string name="exit_label">&exit_label;</string>	78 <string name="exit_label">&exit_label;</string>

79	79

80 <string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>	80 <string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>

81 <string name="launcher_shortcuts_empty">&launcher_shortcuts_empty;</string>	81 <string name="launcher_shortcuts_empty">&launcher_shortcuts_empty;</string>

82	82

83 <string name="choose_file">&choose_file;</string>	83 <string name="choose_file">&choose_file;</string>

84	84

85 <string name="url_bar_default_text">&url_bar_default_text2;</string>	85 <string name="url_bar_default_text">&url_bar_default_text2;</string>

86	86

87 <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq -->	87 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%L OCALE% -->
	Felix Dahlke 2016/09/15 14:59:22 Nit: I think we should move this line below the "C 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. Show quoted text On 2016/09/15 14:59:22, Felix Dahlke wrote: > Nit: I think we should move this line below the "Changed" line, that seems > consistent with how we normally do it. Acknowledged.
88 <string name="faq_link">https://support.mozilla.org/1/mobile/&formatS1;/&forma tS2;/&formatS3;/faq</string>	88 <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 -->

	89 <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_ android_faq&lang=&formatS1;</string>

89	90

90 <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/ -->	91 <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/ -->

91 <string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&form atS2;/&formatS3;/</string>	92 <string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&form atS2;/&formatS3;/</string>

92 <string name="help_menu">&help_menu;</string>	93 <string name="help_menu">&help_menu;</string>

93	94

94 <string name="quit">&quit;</string>	95 <string name="quit">&quit;</string>

95 <string name="bookmark">&bookmark;</string>	96 <string name="bookmark">&bookmark;</string>

96 <string name="bookmark_remove">&bookmark_remove;</string>	97 <string name="bookmark_remove">&bookmark_remove;</string>

97 <string name="bookmark_added">&bookmark_added;</string>	98 <string name="bookmark_added">&bookmark_added;</string>

98 <string name="bookmark_already_added">&bookmark_already_added;</string>	99 <string name="bookmark_already_added">&bookmark_already_added;</string>

(...skipping 556 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
655 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>	656 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>

656 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>	657 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>

657 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>	658 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>

658 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>	659 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>

659	660

660 <!-- This is currently just a filler-text -->	661 <!-- This is currently just a filler-text -->

661 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>	662 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>

662	663

663 </resources>	664 </resources>

664	665

OLD	NEW