diff --git a/browser/confvars.sh b/browser/confvars.sh index 0d231e367287..8f42c7316bf4 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -62,9 +62,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 diff --git a/browser/locales/shipped-locales b/browser/locales/shipped-locales index 03cc20a61930..aa038c5d1e32 100644 --- a/browser/locales/shipped-locales +++ b/browser/locales/shipped-locales @@ -45,7 +45,6 @@ it ja linux win32 ja-JP-mac osx kk -km kn ko ku @@ -56,7 +55,6 @@ lv mai mk ml -mn mr nb-NO nl @@ -77,7 +75,6 @@ son sq sr sv-SE -sw ta ta-LK te