Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating confvars.sh, mobile mozconfigs, removed mn,sw from shipped l…

…ocales as per bug 797387 a=release
  • Loading branch information...
commit 1db81b55ba14fc3a09eaefe345ea7a6b8657c379 1 parent d19a3c5
@lsblakk lsblakk authored
View
4 browser/confvars.sh
@@ -36,9 +36,9 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
# of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-beta
+MAR_CHANNEL_ID=firefox-mozilla-release
MOZ_PROFILE_MIGRATOR=1
MOZ_EXTENSION_MANAGER=1
MOZ_APP_STATIC_INI=1
View
2  browser/locales/shipped-locales
@@ -58,7 +58,6 @@ lv
mai
mk
ml
-mn
mr
nb-NO
nl
@@ -79,7 +78,6 @@ son
sq
sr
sv-SE
-sw
ta
ta-LK
te
View
2  mobile/android/config/mozconfigs/android-armv6/l10n-release
@@ -22,4 +22,4 @@ export MOZILLA_OFFICIAL=1
export MOZ_PKG_SPECIAL=armv6
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android-armv6/release
@@ -20,4 +20,4 @@ export MOZ_TELEMETRY_REPORTING=1
export MOZ_PKG_SPECIAL=armv6
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -20,4 +20,4 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android-x86/release
@@ -18,4 +18,4 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android/l10n-nightly
@@ -23,4 +23,4 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android/l10n-release
@@ -20,4 +20,4 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/android/config/mozconfigs/android/nightly
@@ -16,7 +16,7 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
View
2  mobile/android/config/mozconfigs/android/release
@@ -18,4 +18,4 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-branding=mobile/android/branding/official
View
2  mobile/xul/config/mozconfigs/android/debug
@@ -16,7 +16,7 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
-ac_add_options --with-branding=mobile/xul/branding/beta
+ac_add_options --with-branding=mobile/xul/branding/official
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
View
2  mobile/xul/config/mozconfigs/android/nightly
@@ -16,7 +16,7 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
-ac_add_options --with-branding=mobile/xul/branding/beta
+ac_add_options --with-branding=mobile/xul/branding/official
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
View
2  mobile/xul/config/mozconfigs/android/release
@@ -18,4 +18,4 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/xul/branding/beta
+ac_add_options --with-branding=mobile/xul/branding/official
Please sign in to comment.
Something went wrong with that request. Please try again.