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

--- a/client.py
+++ b/client.py
@@ -30,17 +30,17 @@ DEFAULTS = {
   'INSPECTOR_REV':  'SEA2_19_RELBRANCH',
 
   # URL of the default hg repository to clone for Venkman.
   'VENKMAN_REPO': 'http://hg.mozilla.org/venkman/',
   # The stable revision to use
   'VENKMAN_REV':  'SEA2_19_RELBRANCH',
 
   # 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/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-23.0a2
+23.0

--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -44,11 +44,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
@@ -116,17 +116,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.23.0a': False,
+        'extensions.checkCompatibility.23.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.20a2
+2.20