Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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

Issue 29602576: Issue 6015 - Give feedback is pointing to mozilla page (Closed)
Patch Set: Created Nov. 9, 2017, 9:19 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 <string name="pref_default_browser_mozilla_support_tablet">&pref_default_brows er_mozilla_support_tablet;</string> 333 <string name="pref_default_browser_mozilla_support_tablet">&pref_default_brows er_mozilla_support_tablet;</string>
334 334
335 <string name="pref_about_firefox">&pref_about_firefox;</string> 335 <string name="pref_about_firefox">&pref_about_firefox;</string>
336 336
337 <string name="pref_vendor_faqs">&pref_vendor_faqs;</string> 337 <string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
338 <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 --> 338 <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 -->
339 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%L OCALE% --> 339 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%L OCALE% -->
340 <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_ android_faq&amp;version=&formatS1;&amp;os=&formatS2;&amp;lang=&formatS3;</string > 340 <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_ android_faq&amp;version=&formatS1;&amp;os=&formatS2;&amp;lang=&formatS3;</string >
341 341
342 <string name="pref_vendor_feedback">&pref_vendor_feedback;</string> 342 <string name="pref_vendor_feedback">&pref_vendor_feedback;</string>
343 <!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_sourc e=feedback-settings 343 <!-- Changed Feedback URL. See https://issues.adblockplus.org/ticket/6015 -->
344 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_beta_commun ity
344 This should be kept in sync with the "app.feedbackURL" pref defined in mo bile.js --> 345 This should be kept in sync with the "app.feedbackURL" pref defined in mo bile.js -->
345 <string name="feedback_link">https://input.mozilla.org/feedback/android/&forma tS1;/&formatS2;/?utm_source=feedback-settings</string> 346 <string name="feedback_link">https://adblockplus.org/redirect?link=adblock_bro wser_android_beta_community</string>
346 347
347 <string name="pref_dialog_set_default">&pref_dialog_set_default;</string> 348 <string name="pref_dialog_set_default">&pref_dialog_set_default;</string>
348 <string name="pref_default">&pref_dialog_default;</string> 349 <string name="pref_default">&pref_dialog_default;</string>
349 <string name="pref_dialog_remove">&pref_dialog_remove;</string> 350 <string name="pref_dialog_remove">&pref_dialog_remove;</string>
350 351
351 <string name="pref_search_last_toast">&pref_search_last_toast;</string> 352 <string name="pref_search_last_toast">&pref_search_last_toast;</string>
352 353
353 <string name="pref_panels_show">&pref_panels_show;</string> 354 <string name="pref_panels_show">&pref_panels_show;</string>
354 <string name="pref_panels_hide">&pref_panels_hide;</string> 355 <string name="pref_panels_hide">&pref_panels_hide;</string>
355 <string name="pref_panels_reorder">&pref_panels_reorder;</string> 356 <string name="pref_panels_reorder">&pref_panels_reorder;</string>
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 715 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
715 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 716 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
716 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 717 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
717 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 718 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
718 719
719 <!-- This is currently just a filler-text --> 720 <!-- This is currently just a filler-text -->
720 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 721 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
721 722
722 </resources> 723 </resources>
723 724
OLDNEW

Powered by Google App Engine
This is Rietveld