wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge the last pgo-green cset from mozilla-inbound to mozilla-central

Browse Source
This commit is contained in:
Phil Ringnalda 2013-03-25 21:32:35 -07:00
commit d06408e6a3
7 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/branding/aurora/configure.sh
View File

@ -5,3 +5,4 @@
MOZ_APP_DISPLAYNAME=Aurora
ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
MOZ_UPDATER=1
MOZ_ANDROID_ANR_REPORTER=1

1
mobile/android/branding/beta/configure.sh
View File

@ -5,3 +5,4 @@
MOZ_APP_DISPLAYNAME="Firefox Beta"
ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=

1
mobile/android/branding/nightly/configure.sh
View File

@ -4,3 +4,4 @@
MOZ_APP_DISPLAYNAME=Nightly
MOZ_UPDATER=1
MOZ_ANDROID_ANR_REPORTER=1

1
mobile/android/branding/official/configure.sh
View File

@ -5,3 +5,4 @@
MOZ_APP_DISPLAYNAME=Firefox
ANDROID_PACKAGE_NAME=org.mozilla.firefox
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=

1
mobile/android/branding/unofficial/configure.sh
View File

@ -5,3 +5,4 @@
ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
MOZ_APP_DISPLAYNAME="Fennec `echo $USER`"
MOZ_UPDATER=
MOZ_ANDROID_ANR_REPORTER=

2
mobile/android/chrome/content/browser.js
View File

@ -7100,7 +7100,7 @@ var Telemetry = {
return;
}
message = Strings.browser.formatStringFromName("telemetry.optout.message",
message = Strings.browser.formatStringFromName("telemetry.optout.message2",
[brandShortName, serverOwner, brandShortName], 3);
buttons = [
{

4
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -65,9 +65,9 @@ telemetry.optin.message2=Send info to %1$S so that we can improve %2$S?
telemetry.optin.learnMore=Learn more
telemetry.optin.send=Send
telemetry.optin.dontSend=Don't send
# LOCALIZATION NOTE (telemetry.optout.message): %1$S and %3$S will be replaced by
# LOCALIZATION NOTE (telemetry.optout.message2): %1$S and %3$S will be replaced by
# brandShortName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
telemetry.optout.message=%1$S sends information about performance, hardware, usage and customizations back to %2$S to help improve %3$S.
telemetry.optout.message2=%1$S sends information about performance, stability, hardware, usage and customizations back to %2$S to help improve %3$S.
telemetry.optout.ok=OK
# XPInstall