Separate locale version from Mozilla version so we do not have to bump locale version for every release. b=226377 r=kairo, bsmedberg sr=ben a=asa

browser/extensions/inspector/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Document Inspector"
         chrome:author="Joe Hewitt"
         chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

client.mk

@@ -693,6 +693,8 @@ CONFIG_STATUS_DEPS := \
 	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
 	$(CONFIG_STATUS_DEPS_L10N) \
 	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
+	$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
+	$(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
 	$(NULL)
 
 # configure uses the program name to determine @srcdir@. Calling it without

config/chrome-versions.sh

@@ -0,0 +1,4 @@
+# This is a shell script, sourced by configure.
+
+MOZILLA_LOCALE_VERSION=1.6b
+MOZILLA_REGION_VERSION=1.6b

configure

@@ -15167,6 +15167,10 @@ EOF
 
 
 
+. ${srcdir}/config/chrome-versions.sh
+
+
+
 
 
 
@@ -15721,6 +15725,8 @@ s%@MOZ_MOVEMAIL@%$MOZ_MOVEMAIL%g
 s%@LIBS_PATH@%$LIBS_PATH%g
 s%@CYGDRIVE_MOUNT@%$CYGDRIVE_MOUNT%g
 s%@MOZILLA_VERSION@%$MOZILLA_VERSION%g
+s%@MOZILLA_LOCALE_VERSION@%$MOZILLA_LOCALE_VERSION%g
+s%@MOZILLA_REGION_VERSION@%$MOZILLA_REGION_VERSION%g
 s%@ac_configure_args@%$ac_configure_args%g
 s%@MOZ_DEFINES@%$MOZ_DEFINES%g
 

configure.in

@@ -5312,6 +5312,10 @@ MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_SUBST(MOZILLA_VERSION)
 
+. ${srcdir}/config/chrome-versions.sh
+AC_SUBST(MOZILLA_LOCALE_VERSION)
+AC_SUBST(MOZILLA_REGION_VERSION)
+
 AC_SUBST(ac_configure_args)
 
 dnl Spit out some output

directory/xpcom/base/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="MozLDAP"
         chrome:author="mozilla.org"
         chrome:name="mozldap"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

directory/xpcom/base/resources/locale/en-US/contents.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:mozldap"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

editor/ui/composer/content/contents-region.rdf.in

@@ -11,7 +11,7 @@
   <RDF:Description about="urn:mozilla:package:editor-region"
         chrome:author="mozilla.org"
         chrome:name="editor-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

editor/ui/composer/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Editor"
         chrome:author="mozilla.org"
         chrome:name="editor"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
   

editor/ui/composer/locale/en-US/contents-region.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:editor-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

editor/ui/composer/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:editor"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/content-packs/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Content Pack Switching"
         chrome:author="mozilla.org"
         chrome:name="content-packs"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <!-- overlay information -->

extensions/content-packs/resources/locale/en-US/contents.rdf.in

@@ -22,7 +22,7 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:content-packs"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>
 
 

extensions/cookie/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Cookie Manager"
         chrome:author="mozilla.org"
         chrome:name="cookie"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <!-- overlay information -->

extensions/cookie/resources/locale/en-US/contents.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:cookie"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/help/resources/content/contents.rdf.in

@@ -10,7 +10,7 @@
         chrome:displayName="Mozilla Help Viewer"
         chrome:author="netscape.com"
         chrome:name="help"
-        chrome:localeVersion="@MOZILLA_VERSION@">
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description> 
 
   <!-- Declare overlay points used in this package -->

extensions/help/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:help"
-   chrome:localeVersion="@MOZILLA_VERSION@"/>
+   chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/inspector/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Document Inspector"
         chrome:author="Joe Hewitt"
         chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

extensions/inspector/resources/locale/en-US/contents.rdf.in

@@ -17,5 +17,5 @@
   </RDF:Description>
 
   <RDF:Description about="urn:mozilla:locale:en-US:inspector"
-	                 chrome:localeVersion="@MOZILLA_VERSION@"/>
+	                 chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/irc/xul/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:author="mozilla.org"
         chrome:authorURL="http://www.mozilla.org/projects/rt-messaging/chatzilla/"
         chrome:description="A simple, straightforward Internet Relay Chat (IRC) client."
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:extension="true"
         chrome:name="chatzilla">
   </RDF:Description>

extensions/irc/xul/locale/en-US/contents.rdf.in

@@ -23,6 +23,6 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:chatzilla"
-       chrome:localeVersion="@MOZILLA_VERSION@"/>
+       chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 
 </RDF:RDF>

extensions/p3p/resources/content/contents.rdf.in

@@ -46,7 +46,7 @@
     chrome:displayName="Platform for Privacy Preferences Project"
     chrome:author="Netscape Communications Corporation"
     chrome:name="p3p"
-    chrome:localeVersion="@MOZILLA_VERSION@">
+    chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <RDF:Seq about="urn:mozilla:overlays">

extensions/p3p/resources/locale/en-US/contents.rdf.in

@@ -53,7 +53,7 @@
   </RDF:Description>
 
   <RDF:Description about="urn:mozilla:locale:en-US:p3p"
-    chrome:localeVersion="@MOZILLA_VERSION@"/>
+    chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 
 </RDF:RDF>
 

extensions/pref/autoconfig/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="AutoConfig"
         chrome:author="mozilla.org"
         chrome:name="autoconfig"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:autoconfig"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/transformiix/resources/buster/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="XSLT QA Tools"
         chrome:author="mozilla.org"
         chrome:name="xslt-qa"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

extensions/tridentprofile/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Profile Migrator"
         chrome:author="mozilla.org"
         chrome:name="profile"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <!-- overlay information -->

extensions/tridentprofile/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:tridentprofile"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

extensions/venkman/resources/content/contents.rdf.in

@@ -48,7 +48,7 @@
   <RDF:Description about="urn:mozilla:package:venkman"
         chrome:displayName="JavaScript Debugger"
         chrome:author="mozilla.org"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:name="venkman">
   </RDF:Description>
 

extensions/venkman/resources/locale/en-US/contents.rdf.in

@@ -60,6 +60,6 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:venkman"
-       chrome:localeVersion="@MOZILLA_VERSION@"/>
+       chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 
 </RDF:RDF>

extensions/wallet/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Form Manager"
         chrome:author="mozilla.org"
         chrome:name="wallet"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <!-- overlay information -->

extensions/wallet/resources/locale/en-US/contents.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:wallet"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

layout/html/forms/resources/locale/en-US/contents.rdf.in

@@ -57,5 +57,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:forms"
-        chrome:localeVersion="@MOZILLA_VERSION@"/>
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

mail/base/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mail/base/content/help.rdf.in

@@ -10,6 +10,6 @@
         chrome:displayName="Mozilla Help Viewer"
         chrome:author="netscape.com"
         chrome:name="help"
-        chrome:localeVersion="@MOZILLA_VERSION@">
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description> 
 </RDF:RDF>

mail/base/content/messenger-views.rdf.in

@@ -10,7 +10,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-views"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
-</RDF:RDF>
+</RDF:RDF>

mail/base/content/navigator.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Navigator"
         chrome:author="mozilla.org"
         chrome:name="navigator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mail/extensions/inspector/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Document Inspector"
         chrome:author="Joe Hewitt"
         chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mail/extensions/offline/content/contents.rdf.in

@@ -17,7 +17,7 @@
         chrome:description="This extension adds offline support to Mozilla Thunderbird." 
         chrome:extension="true"
         chrome:settingsURL="chrome://messenger-offline/content/pref-offline.xul"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mail/extensions/offline/locale/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:messenger-offline"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

mailnews/base/resources/content/contents-region.rdf.in

@@ -11,7 +11,7 @@
   <RDF:Description about="urn:mozilla:package:messenger-region"
         chrome:author="mozilla.org"
         chrome:name="messenger-region"
-	chrome:localeVersion="@MOZILLA_VERSION@">
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

mailnews/base/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/base/resources/locale/en-US/contents-region.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:messenger-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

mailnews/base/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:messenger"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

mailnews/extensions/mailviews/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-views"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/extensions/mdn/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-mdn"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:messenger-mdn"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

mailnews/extensions/smime/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-smime"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:messenger-smime"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

mailnews/extensions/smoketest/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-smoketest"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/mapi/resources/content/contents.rdf.in

@@ -13,7 +13,7 @@
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
         chrome:name="messenger-mapi"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

mailnews/mapi/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

netwerk/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Necko"
         chrome:author="mozilla.org"
         chrome:name="necko"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

netwerk/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:necko"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

security/manager/pki/resources/content/contents.rdf.in

@@ -34,7 +34,7 @@
         chrome:displayName="pippki"
         chrome:author="PSM Team"
         chrome:name="pippki"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
   <!-- Declare overlay points used in this package -->

security/manager/pki/resources/locale/en-US/contents.rdf.in

@@ -44,5 +44,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:pippki"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

security/manager/ssl/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="pipnss"
         chrome:author="PSM Team"
         chrome:name="pipnss"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>  
 

security/manager/ssl/resources/locale/en-US/contents.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:pipnss"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

toolkit/components/passwordmgr/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Password Manager"
         chrome:author="mozilla.org"
         chrome:name="passwordmgr"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

toolkit/components/passwordmgr/resources/locale/contents.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:passwordmgr"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

toolkit/content/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="Platform Specific"
         chrome:author="mozilla.org"
         chrome:name="global-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

toolkit/content/contents-region.rdf.in

@@ -12,7 +12,7 @@
 	chrome:displayName="US Regional Contents"
         chrome:author="mozilla.org"
         chrome:name="global-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

toolkit/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Toolkit"
         chrome:author="mozilla.org"
         chrome:name="global"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 </RDF:RDF>

toolkit/locale/contents-platform.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	           chrome:localeVersion="@MOZILLA_VERSION@"/>
+	           chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

toolkit/locale/contents-region.rdf.in

@@ -25,5 +25,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:global-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

toolkit/locale/contents.rdf.in

@@ -24,5 +24,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:global"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

toolkit/mozapps/contents-content.rdf.in

@@ -13,7 +13,7 @@
         chrome:author="mozilla.org"
         chrome:name="mozapps"
         chrome:skinVersion="1.5"
-        chrome:localeVersion="@MOZILLA_VERSION@">
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

toolkit/mozapps/contents-locale.rdf.in

@@ -18,6 +18,6 @@
 
   <!-- version information -->
   <RDF:Description about="urn:mozilla:locale:en-US:mozapps"
-     chrome:localeVersion="@MOZILLA_VERSION@"/>
+     chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 
 </RDF:RDF>

xpfe/browser/resources/content/contents-region.rdf.in

@@ -11,7 +11,7 @@
   <RDF:Description about="urn:mozilla:package:navigator-region"
         chrome:author="mozilla.org"
         chrome:name="navigator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@">
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

xpfe/browser/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Navigator"
         chrome:author="mozilla.org"
         chrome:name="navigator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

xpfe/browser/resources/content/mac/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="Mac Specific Resources"
         chrome:author="mozilla.org"
         chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

xpfe/browser/resources/content/unix/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="UNIX Bindings"
         chrome:author="mozilla.org"
         chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

xpfe/browser/resources/content/win/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="Windows Specific Resources"
         chrome:author="mozilla.org"
         chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

xpfe/browser/resources/locale/en-US/contents-region.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:navigator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

xpfe/browser/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:navigator"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/communicator/resources/content/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="Platform Specific Bindings"
         chrome:author="mozilla.org"
         chrome:name="communicator-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

xpfe/communicator/resources/content/contents-region.rdf.in

@@ -11,7 +11,7 @@
   <RDF:Description about="urn:mozilla:package:communicator-region"
         chrome:author="mozilla.org"
         chrome:name="communicator-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

xpfe/communicator/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Communicator Shared"
         chrome:author="mozilla.org"
         chrome:name="communicator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 

xpfe/communicator/resources/locale/en-US/contents-region.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:communicator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

xpfe/communicator/resources/locale/en-US/contents.rdf.in

@@ -19,5 +19,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in

@@ -55,5 +55,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:mozldap"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/components/download-manager/resources/mac/contents.rdf.in

@@ -11,7 +11,7 @@
                    chrome:displayName="Mac-specific dl mgr files"
                    chrome:author="mozilla.org"
                    chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
+                   chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
                    chrome:skinVersion="1.5">
   </RDF:Description>
  

xpfe/components/download-manager/resources/unix/contents.rdf.in

@@ -11,7 +11,7 @@
                    chrome:displayName="Unix-specific dl mgr files"
                    chrome:author="mozilla.org"
                    chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
+                   chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
                    chrome:skinVersion="1.5">
   </RDF:Description>
  

xpfe/components/download-manager/resources/win/contents.rdf.in

@@ -11,7 +11,7 @@
                    chrome:displayName="Win-specific dl mgr files"
                    chrome:author="mozilla.org"
                    chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
+                   chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
                    chrome:skinVersion="1.5">
   </RDF:Description>
  

xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in

@@ -22,5 +22,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/global/resources/content/contents-platform.rdf.in

@@ -12,6 +12,6 @@
         chrome:displayName="Platform Specific"
         chrome:author="mozilla.org"
         chrome:name="global-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
   </RDF:Description>
 </RDF:RDF>

xpfe/global/resources/content/contents-region.rdf.in

@@ -12,7 +12,7 @@
 	chrome:displayName="US Regional Contents"
         chrome:author="mozilla.org"
         chrome:name="global-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
+ 	chrome:localeVersion="@MOZILLA_REGION_VERSION@">
   </RDF:Description>
 
 </RDF:RDF>

xpfe/global/resources/content/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="Toolkit"
         chrome:author="mozilla.org"
         chrome:name="global"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:skinVersion="1.5">
   </RDF:Description>
 </RDF:RDF>

xpfe/global/resources/locale/en-US/brand.dtd.in

@@ -1,4 +1,4 @@
-<!ENTITY  lang.version          "@MOZILLA_VERSION@">
+<!ENTITY  lang.version          "@MOZILLA_LOCALE_VERSION@">
 <!ENTITY  brandShortName        "Mozilla">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  sidebarName           "Sidebar">

xpfe/global/resources/locale/en-US/contents-region.rdf.in

@@ -13,7 +13,7 @@
         chrome:author="mozilla.org"
         chrome:name="US"
         chrome:localeType="region"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_REGION_VERSION@"
         chrome:previewURL="http://www.mozilla.org/locales/US.gif">
     <chrome:packages>
       <RDF:Seq about="urn:mozilla:locale:US:packages">
@@ -25,5 +25,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:global-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>

xpfe/global/resources/locale/en-US/contents.rdf.in

@@ -12,7 +12,7 @@
         chrome:displayName="English(US)"
         chrome:author="mozilla.org"
         chrome:name="en-US"
-        chrome:localeVersion="@MOZILLA_VERSION@"
+        chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
         chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
     <chrome:packages>
       <RDF:Seq about="urn:mozilla:locale:en-US:packages">
@@ -24,5 +24,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:global"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>

xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in

@@ -20,5 +20,5 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>