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

Delta Between Two Patch Sets: mobile/android/base/strings.xml.in

Issue 6296160390086656: Issue 2491 - Fix design elements in onboarding slides (Closed)
Left Patch Set: Removed unsused import Created May 21, 2015, 1:43 p.m.
Right Patch Set: Renamed button background. Created May 22, 2015, 12:04 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
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 @SYNCSTRINGSPATH@ 10 #includesubst @SYNCSTRINGSPATH@
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 <string name="remote_tabs_panel_moved_link">&remote_tabs_panel_moved_link;</st ring> 386 <string name="remote_tabs_panel_moved_link">&remote_tabs_panel_moved_link;</st ring>
387 387
388 <string name="filepicker_title">&filepicker_title;</string> 388 <string name="filepicker_title">&filepicker_title;</string>
389 <string name="filepicker_audio_title">&filepicker_audio_title;</string> 389 <string name="filepicker_audio_title">&filepicker_audio_title;</string>
390 <string name="filepicker_image_title">&filepicker_image_title;</string> 390 <string name="filepicker_image_title">&filepicker_image_title;</string>
391 <string name="filepicker_video_title">&filepicker_video_title;</string> 391 <string name="filepicker_video_title">&filepicker_video_title;</string>
392 392
393 <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mo bile's 393 <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mo bile's
394 profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -- > 394 profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -- >
395 <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</s tring> 395 <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</s tring>
396 <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string> 396 <string name="bookmarkdefaults_url_aboutfirefox">about:</string>
397 397
398 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockplus --> 398 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockplus -->
399 <string name="bookmarkdefaults_title_adblockplus">@bookmarks_adblockplus@</str ing> 399 <string name="bookmarkdefaults_title_adblockplus">@bookmarks_adblockplus@</str ing>
400 <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</strin g> 400 <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</strin g>
401 401
402 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptableads --> 402 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptableads -->
403 <string name="bookmarkdefaults_title_acceptableads">@bookmarks_acceptableads@< /string> 403 <string name="bookmarkdefaults_title_acceptableads">@bookmarks_acceptableads@< /string>
404 <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</s tring> 404 <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</s tring>
405 405
406 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockbrowserbetacommunity --> 406 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockbrowserbetacommunity -->
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 <string name="abb_pref_category_further_blocking_summary">Disable tracking and malware sites or add custom filter lists</string> 500 <string name="abb_pref_category_further_blocking_summary">Disable tracking and malware sites or add custom filter lists</string>
501 501
502 <string name="abb_pref_category_exceptions">Exceptions</string> 502 <string name="abb_pref_category_exceptions">Exceptions</string>
503 503
504 <string name="abb_pref_category_acceptable_ads">Acceptable Ads</string> 504 <string name="abb_pref_category_acceptable_ads">Acceptable Ads</string>
505 <string name="abb_pref_category_acceptable_ads_summary">Configure Acceptable A ds</string> 505 <string name="abb_pref_category_acceptable_ads_summary">Configure Acceptable A ds</string>
506 506
507 <string name="abb_pref_category_whitelisted_sites">Whitelisted Websites</strin g> 507 <string name="abb_pref_category_whitelisted_sites">Whitelisted Websites</strin g>
508 <string name="abb_pref_category_whitelisted_sites_summary">Add exceptions for websites</string> 508 <string name="abb_pref_category_whitelisted_sites_summary">Add exceptions for websites</string>
509 509
510 <string name="abb_pref_about_acceptable_ads">About Acceptable Ads</string>
510 <string name="abb_pref_acceptable_ads">Allow some non-intrusive advertising</s tring> 511 <string name="abb_pref_acceptable_ads">Allow some non-intrusive advertising</s tring>
511 512
512 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > 513 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string >
513 514
514 <!-- Adblock Browser onboarding (first run page [FRP]) --> 515 <!-- Adblock Browser onboarding (first run page [FRP]) -->
515 <string name="abb_frp_button_1">Two more steps</string> 516 <string name="abb_frp_button_1">Two more steps</string>
516 <string name="abb_frp_button_2">Only one more step</string> 517 <string name="abb_frp_button_2">Only one more step</string>
517 <string name="abb_frp_button_3">Finish</string> 518 <string name="abb_frp_button_3">Finish</string>
518 519
519 <string name="abb_frp_headline_1">Browse in peace</string> 520 <string name="abb_frp_headline_1">Browse in peace</string>
520 <string name="abb_frp_headline_2">You\'re in control</string> 521 <string name="abb_frp_headline_2">You\'re in control</string>
521 <string name="abb_frp_headline_3">Be the first</string> 522 <string name="abb_frp_headline_3">Be the first</string>
522 523
523 <string name="abb_frp_step_1_text">Adblocking is automatically integrated - no more annoying ads while you surf!</string> 524 <string name="abb_frp_step_1_text">Adblocking is automatically integrated - no more annoying ads while you surf!</string>
524 <string name="abb_frp_step_2_text">Annoying ads are always blocked, while noni ntrusive ads are displayed by default. You can change this setting at any time.< /string> 525 <string name="abb_frp_step_2_text">Annoying ads are always blocked, while noni ntrusive ads are displayed by default. You can change this setting at any time.< /string>
525 <string name="abb_frp_step_2_text_where">Tap the Menu » Settings » Adblocking » Acceptable Ads</string> 526 <string name="abb_frp_step_2_text_where">Tap the Menu » Settings » Adblocking » Acceptable Ads</string>
Felix Dahlke 2015/05/22 11:50:57 It's actually Menu->Settings->Adblocking->Adblocki
René Jeschke 2015/05/22 12:04:44 Na, on my device it's Settings -> Adblocking -> Ac
Felix Dahlke 2015/05/22 12:09:57 OK good point, let's go with the less-awkward-look
526 <string name="abb_frp_step_2_text_learn">Learn more about Acceptable Ads by cl icking on the thumbnail when you first launch the browser.</string> 527 <string name="abb_frp_step_2_text_learn">Learn more about Acceptable Ads by cl icking on the thumbnail when you first launch the browser.</string>
527 <string name="abb_frp_step_3_text">Bugs can be reported in our Google+ communi ty. The link to the Adblock Browser Google+ community will be added to your favo rites.</string> 528 <string name="abb_frp_step_3_text">Bugs can be reported in our Google+ communi ty. The link to the Adblock Browser Google+ community will be added to your favo rites.</string>
528 529
529 <string name="abb_adblocking_active_languages">Active for websites in...</stri ng> 530 <string name="abb_adblocking_active_languages">Active for websites in...</stri ng>
530 <string name="abb_adblocking_available_languages">Other Languages</string> 531 <string name="abb_adblocking_available_languages">Other Languages</string>
531 <string name="abb_adblocking_none_selected">None</string> 532 <string name="abb_adblocking_none_selected">None</string>
532 <string name="abb_adblocking_select_below">Select one below</string> 533 <string name="abb_adblocking_select_below">Select one below</string>
533 <string name="abb_adblocking_none_available">None</string> 534 <string name="abb_adblocking_none_available">None</string>
534 <string name="abb_adblocking_all_selected">No more available subscriptions</st ring> 535 <string name="abb_adblocking_all_selected">No more available subscriptions</st ring>
535 <string name="abb_adblocking_waiting">Fetching available subscriptions...</str ing> 536 <string name="abb_adblocking_waiting">Fetching available subscriptions...</str ing>
536 537
537 <!-- This is currently just a filler-text --> 538 <!-- This is currently just a filler-text -->
538 <string name="abb_pref_category_acceptable_ads_extra_summary">We\'d like to en courage websites to use starightforward, unobtrusive 539 <string name="abb_pref_category_acceptable_ads_extra_summary">We\'d like to en courage websites to use straightforward, unobtrusive
539 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you 540 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you
540 still wanto to block every ad you can disable this in a few seconds.</string> 541 still want to block every ad you can disable this in a few seconds.</string>
541 542
542 </resources> 543 </resources>
543 544
LEFTRIGHT

Powered by Google App Engine
This is Rietveld