☠☠ backed out by d99a7f64432a ☠ ☠ | |
author | Garvan Keeley <gkeeley@mozilla.com> |
Fri, 03 Oct 2014 13:04:00 -0400 | |
changeset 232268 | 29fcac263c20f12cfed5e1549fa6abd8c4110338 |
parent 232267 | 23a0a5f3c0adcf5501deeaae2c007d32a8fbac82 |
child 232269 | 450473a4733cbcdbbe543ef0eebe9c2f4f79440b |
push id | 4187 |
push user | bhearsum@mozilla.com |
push date | Fri, 28 Nov 2014 15:29:12 +0000 |
treeherder | mozilla-beta@f23cc6a30c11 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nalexander |
bugs | 1007264 |
milestone | 35.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
|
mobile/android/base/locales/en-US/android_strings.dtd | file | annotate | diff | comparison | revisions | |
mobile/android/base/strings.xml.in | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -261,18 +261,17 @@ size. --> <!ENTITY datareporting_abouthr_title "View my Health Report"> <!ENTITY datareporting_telemetry_title "Telemetry"> <!ENTITY datareporting_telemetry_summary "Shares performance, usage, hardware and customization data about your browser with &vendorShortName; to help us make &brandShortName; better"> <!ENTITY datareporting_crashreporter_summary "&brandShortName; submits crash reports to help &vendorShortName; make your browser more stable and secure"> <!-- Localization note (datareporting_crashreporter_title_short) : This string matches (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.--> <!ENTITY datareporting_crashreporter_title_short "Crash Reporter"> <!ENTITY datareporting_wifi_title2 "&vendorShortName; Location Service"> -<!ENTITY datareporting_wifi_geolocation_summary "Receives Wi-Fi and cellular location data when running in the background and shares it with &vendorShortName; to improve our geolocation service"> - +<!ENTITY datareporting_wifi_geolocation_summary2 "Shares Wi-Fi and cellular location data based on the approximate location of your device with &vendorShortName; to improve our geolocation service"> <!-- Localization note (pref_update_autodownload2) : This should mention downloading specifically, since the pref only prevents automatic downloads and not the actual notification that an update is available. --> <!ENTITY pref_update_autodownload2 "Download updates automatically"> <!ENTITY pref_update_autodownload_wifi "Only over Wi-Fi"> <!ENTITY pref_update_autodownload_never "Never"> <!ENTITY pref_update_autodownload_always "Always">
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -256,17 +256,17 @@ <string name="datareporting_telemetry_title">&datareporting_telemetry_title;</string> <string name="datareporting_telemetry_summary">&datareporting_telemetry_summary;</string> <string name="datareporting_fhr_title">&datareporting_fhr_title;</string> <string name="datareporting_fhr_summary2">&datareporting_fhr_summary2;</string> <string name="datareporting_abouthr_title">&datareporting_abouthr_title;</string> <string name="datareporting_crashreporter_title_short">&datareporting_crashreporter_title_short;</string> <string name="datareporting_crashreporter_summary">&datareporting_crashreporter_summary;</string> <string name="datareporting_wifi_title">&datareporting_wifi_title2;</string> - <string name="datareporting_wifi_geolocation_summary">&datareporting_wifi_geolocation_summary;</string> + <string name="datareporting_wifi_geolocation_summary">&datareporting_wifi_geolocation_summary2;</string> <string name="go">&go;</string> <string name="search">&search;</string> <string name="reload">&reload;</string> <string name="forward">&forward;</string> <string name="menu">&menu;</string> <string name="back">&back;</string> <string name="stop">&stop;</string>