author | Margaret Leibovic <margaret.leibovic@gmail.com> |
Wed, 23 Mar 2016 15:22:11 -0400 | |
changeset 291851 | d24f23b9b8a14ea2b9f9e55f1b8736e65b2c08fa |
parent 291795 | 71d3427c683190cdb409063ad67e24d5926f4591 |
child 291852 | b3eed99cb17bc8d6e6eda1a6f4ecb53fd1b30a43 |
push id | 74700 |
push user | cbook@mozilla.com |
push date | Wed, 06 Apr 2016 10:06:38 +0000 |
treeherder | mozilla-inbound@49d808d13f4f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | sebastian |
bugs | 1254225 |
milestone | 48.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -214,17 +214,18 @@ <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party"> <!ENTITY pref_cookies_disabled "Disabled"> <!ENTITY pref_tap_to_load_images_title2 "Show images"> <!ENTITY pref_tap_to_load_images_enabled "Always"> <!ENTITY pref_tap_to_load_images_data "Only over Wi-Fi"> <!ENTITY pref_tap_to_load_images_disabled2 "Blocked"> -<!ENTITY pref_show_web_fonts "Show web fonts"> +<!ENTITY pref_show_web_fonts "Show Web fonts"> +<!ENTITY pref_show_web_fonts_summary "Hide to use default fonts and reduce website load times"> <!ENTITY pref_tracking_protection_title2 "Tracking Protection"> <!ENTITY pref_tracking_protection_summary3 "Enabled in Private Browsing"> <!ENTITY pref_donottrack_title "Do not track"> <!ENTITY pref_donottrack_summary "&brandShortName; will tell sites that you do not want to be tracked"> <!ENTITY pref_tracking_protection_enabled "Enabled"> <!ENTITY pref_tracking_protection_enabled_pb "Enabled in Private Browsing">
--- a/mobile/android/base/resources/xml/preferences_advanced.xml +++ b/mobile/android/base/resources/xml/preferences_advanced.xml @@ -34,17 +34,18 @@ <ListPreference android:key="browser.image_blocking" android:title="@string/pref_tap_to_load_images_title2" android:entries="@array/pref_browser_image_blocking_entries" android:entryValues="@array/pref_browser_image_blocking_values" android:persistent="false" /> <CheckBoxPreference android:key="browser.display.use_document_fonts" - android:title="@string/pref_show_web_fonts" /> + android:title="@string/pref_show_web_fonts" + android:summary="@string/pref_show_web_fonts_summary"/> <ListPreference android:key="plugin.enable" android:title="@string/pref_plugins" android:entries="@array/pref_plugins_entries" android:entryValues="@array/pref_plugins_values" android:persistent="false" /> <SwitchPreference android:key="media.autoplay.enabled"
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -202,16 +202,17 @@ <string name="pref_cookies_disabled">&pref_cookies_disabled;</string> <string name="pref_tap_to_load_images_title2">&pref_tap_to_load_images_title2;</string> <string name="pref_tap_to_load_images_enabled">&pref_tap_to_load_images_enabled;</string> <string name="pref_tap_to_load_images_data">&pref_tap_to_load_images_data;</string> <string name="pref_tap_to_load_images_disabled2">&pref_tap_to_load_images_disabled2;</string> <string name="pref_show_web_fonts">&pref_show_web_fonts;</string> + <string name="pref_show_web_fonts_summary">&pref_show_web_fonts_summary;</string> <string name="pref_tracking_protection_title">&pref_tracking_protection_title2;</string> <string name="pref_tracking_protection_summary">&pref_tracking_protection_summary3;</string> <string name="pref_donottrack_title">&pref_donottrack_title;</string> <string name="pref_donottrack_summary">&pref_donottrack_summary;</string> <string name="pref_tracking_protection_enabled">&pref_tracking_protection_enabled;</string> <string name="pref_tracking_protection_enabled_pb">&pref_tracking_protection_enabled_pb;</string>