author | Jonathan Almeida [:jonalmeida] <jonalmeida942@gmail.com> |
Wed, 30 Sep 2015 16:48:42 -0400 | |
changeset 265681 | b15f00941fb048d6733ed752726c700ec3922b56 |
parent 265680 | 6720d34c74b46103715be5534ee1de3fa5e019e1 |
child 265682 | b07f2f312b9b54fbece4fec5861163debc92cd10 |
push id | 66003 |
push user | cbook@mozilla.com |
push date | Fri, 02 Oct 2015 11:37:40 +0000 |
treeherder | mozilla-inbound@3fd732d24f46 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | antlam |
bugs | 1210129 |
milestone | 44.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 @@ -213,17 +213,17 @@ <!ENTITY pref_header_devtools "Developer tools"> <!ENTITY pref_cookies_menu "Cookies"> <!ENTITY pref_cookies_accept_all "Enabled"> <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party"> <!ENTITY pref_cookies_disabled "Disabled"> <!ENTITY pref_tap_to_load_images_title "Tap-to-load images"> -<!ENTITY pref_tap_to_load_images_summary "Load images only when you tap on them"> +<!ENTITY pref_tap_to_load_images_summary2 "Load images only when you long press them"> <!ENTITY pref_tracking_protection_title "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 tracking_protection_prompt_title "Now with Tracking Protection"> <!ENTITY tracking_protection_prompt_text "Actively block tracking elements so you don\'t have to worry.">
--- a/mobile/android/base/resources/xml-v11/preferences_customize.xml +++ b/mobile/android/base/resources/xml-v11/preferences_customize.xml @@ -28,17 +28,17 @@ android:title="@string/pref_restore" android:defaultValue="quit" android:entries="@array/pref_restore_entries" android:entryValues="@array/pref_restore_values" android:persistent="true" /> <CheckBoxPreference android:key="browser.image_blocking.enabled" android:title="@string/pref_tap_to_load_images_title" - android:summary="@string/pref_tap_to_load_images_summary" + android:summary="@string/pref_tap_to_load_images_summary2" android:defaultValue="false"/> <CheckBoxPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" android:defaultValue="false" /> <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
--- a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml +++ b/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml @@ -35,17 +35,17 @@ android:title="@string/pref_restore" android:defaultValue="quit" android:entries="@array/pref_restore_entries" android:entryValues="@array/pref_restore_values" android:persistent="true" /> <CheckBoxPreference android:key="browser.image_blocking.enabled" android:title="@string/pref_tap_to_load_images_title" - android:summary="@string/pref_tap_to_load_images_summary" + android:summary="@string/pref_tap_to_load_images_summary2" android:defaultValue="false"/> <CheckBoxPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" android:defaultValue="false" /> <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
--- a/mobile/android/base/resources/xml/preferences_customize.xml +++ b/mobile/android/base/resources/xml/preferences_customize.xml @@ -36,17 +36,17 @@ android:title="@string/pref_restore" android:defaultValue="quit" android:entries="@array/pref_restore_entries" android:entryValues="@array/pref_restore_values" android:persistent="true" /> <CheckBoxPreference android:key="browser.image_blocking.enabled" android:title="@string/pref_tap_to_load_images_title" - android:summary="@string/pref_tap_to_load_images_summary" + android:summary="@string/pref_tap_to_load_images_summary2" android:defaultValue="false"/> <CheckBoxPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" android:defaultValue="false" /> <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -204,17 +204,17 @@ <string name="pref_manage_logins">&pref_manage_logins;</string> <string name="pref_cookies_menu">&pref_cookies_menu;</string> <string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string> <string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string> <string name="pref_cookies_disabled">&pref_cookies_disabled;</string> <string name="pref_tap_to_load_images_title">&pref_tap_to_load_images_title;</string> - <string name="pref_tap_to_load_images_summary">&pref_tap_to_load_images_summary;</string> + <string name="pref_tap_to_load_images_summary2">&pref_tap_to_load_images_summary2;</string> <string name="pref_tracking_protection_title">&pref_tracking_protection_title;</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_char_encoding">&pref_char_encoding;</string> <string name="pref_char_encoding_on">&pref_char_encoding_on;</string>