--- a/calendar/sunbird/config/version.txt
+++ b/calendar/sunbird/config/version.txt
@@ -1,1 +1,1 @@
-2.3a2
+2.3b1

--- a/client.py
+++ b/client.py
@@ -30,17 +30,17 @@ DEFAULTS = {
   'INSPECTOR_REV':  'DOMI_2_0_13_RELEASE',
 
   # URL of the default hg repository to clone for Venkman.
   'VENKMAN_REPO': 'http://hg.mozilla.org/venkman/',
   # The stable revision to use
   'VENKMAN_REV':  'VENKMAN_RELEASE_0_9_89',
 
   # URL of the default hg repository to clone for Mozilla.
-  'MOZILLA_REPO': 'http://hg.mozilla.org/releases/mozilla-aurora/',
+  'MOZILLA_REPO': 'http://hg.mozilla.org/releases/mozilla-beta/',
 }
 
 REPO_SHORT_NAMES = {
 'mozilla-central':  'moz',
 'dom-inspector':    'dom',
 'ldap-sdks':        'ldap',
 }
 

--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,13 +1,13 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
-ac_add_options --with-l10n-base=../../releases/l10n/mozilla-aurora
+ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5

--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,13 +1,13 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
-ac_add_options --with-l10n-base=../../releases/l10n/mozilla-aurora
+ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5

--- a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -11,17 +11,17 @@ fi
 #. $topsrcdir/build/macosx/universal/mozconfig
 
 # Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
-ac_add_options --with-l10n-base=../../../releases/l10n/mozilla-aurora
+ac_add_options --with-l10n-base=../../../releases/l10n/mozilla-beta
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling

--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,15 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-ac_add_options --with-l10n-base=../../releases/l10n/mozilla-aurora
+ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 if test -n "${_PYMAKE}"; then

--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-21.0a2
+21.0

--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -40,11 +40,11 @@ THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_UA_BUILDID=20100101
 
 MOZ_BRANDING_DIRECTORY=mail/branding/aurora
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # 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=thunderbird-comm-aurora
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-beta,thunderbird-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-aurora
+MAR_CHANNEL_ID=thunderbird-comm-beta

--- a/mail/locales/shipped-locales
+++ b/mail/locales/shipped-locales
@@ -1,1 +1,56 @@
+ar
+ast
+be
+bg
+bn-BD
+br
+ca
+cs
+da
+de
+el
+en-GB
 en-US
+es-AR
+es-ES
+et
+eu
+fi
+fr
+fy-NL
+ga-IE
+gd
+gl
+he
+hr
+hu
+hy-AM
+id
+is
+it
+ja linux win32
+ja-JP-mac osx
+ko
+lt
+nb-NO
+nl
+nn-NO
+pa-IN
+pl
+pt-BR
+pt-PT
+rm
+ro
+ru
+si
+sk
+sl
+sq
+sr
+sv-SE
+ta-LK
+tr
+uk
+vi
+zh-CN
+zh-TW

--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -99,17 +99,17 @@ class ThunderTestProfile(mozrunner.Thund
         # disable the first use junk dialog
         'mailnews.ui.junk.firstuse': False,
         # set the relative dirs properly
         'mail.root.none-rel' :  "[ProfD]Mail",
         'mail.root.pop3-rel' :  "[ProfD]Mail",
         # Do not allow check new mail to be set
         'mail.startup.enabledMailCheckOnce' :  True,
         # Disable compatibility checking
-        'extensions.checkCompatibility.21.0a': False,
+        'extensions.checkCompatibility.21.0': False,
         # Stop any pings to AMO on add-on install
         'extensions.getAddons.cache.enabled': False,
         # Disable test pilot new tab (this can be set to anything currently, just needs to be set).
         'extensions.testpilot.lastversion': '1.0',
         # In case a developer is working on a laptop without a network
         # connection, don't detect offline mode; hence we'll still startup
         # online which is what mozmill currently requires. It'll also protect us
         # from any random network failures.

--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.18a2
+2.18