5 files changed, 238 insertions, 210 deletions

diff --git a/chinese/mozilla-tclp/Makefile b/chinese/mozilla-tclp/Makefile
index e2d19b8d6dbd..7a357ae11bf5 100644
--- a/chinese/mozilla-tclp/Makefile
+++ b/chinese/mozilla-tclp/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-BROKEN=		"out of sync with mozilla(0.9.1)"
 PORTNAME=	mozilla
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9.1
 CATEGORIES=	chinese www
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~b7506051/mt4/langpack/
 PKGNAMESUFFIX=	-tclp
 # Same as ftp://ftp.mozilla.org/pub/mozilla/l10n/lang/moz0.81/langzhtw.xpi.
 # Use this to avoid checksum problems.
-DISTNAME=	0.8.1-0401-RELEASE-langzhtw
+DISTNAME=		0.9.1-0615-RELEASE-langzhtw
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	keith@FreeBSD.org
diff --git a/chinese/mozilla-tclp/distinfo b/chinese/mozilla-tclp/distinfo
index d3256bb3e47e..0a37650d11ca 100644
--- a/chinese/mozilla-tclp/distinfo
+++ b/chinese/mozilla-tclp/distinfo
@@ -1 +1 @@
-MD5 (0.8.1-0401-RELEASE-langzhtw.xpi) = 1205e72fae7af2954f8417e9dc6d8d62
+MD5 (0.9.1-0615-RELEASE-langzhtw.xpi) = ab68f2518c4ffcb5d45e9a276ec46680
diff --git a/chinese/mozilla-tclp/files/all-locales.rdf b/chinese/mozilla-tclp/files/all-locales.rdf
index 0d6f6c667191..672dfd1763b3 100644
--- a/chinese/mozilla-tclp/files/all-locales.rdf
+++ b/chinese/mozilla-tclp/files/all-locales.rdf
@@ -1,14 +1,21 @@
 <?xml version="1.0"?>
-<RDF:RDF
-     xmlns:NS1414="http://www.mozilla.org/rdf/chrome#"
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:locale:US">
-    <NS1414:displayName>US Region</NS1414:displayName>
-    <NS1414:author>mozilla.org</NS1414:author>
-    <NS1414:name>US</NS1414:name>
-    <NS1414:previewURL>http://www.mozilla.org/locales/US.gif</NS1414:previewURL>
-    <NS1414:locType>install</NS1414:locType>
-    <NS1414:packages resource="urn:mozilla:locale:US:packages"/>
+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <RDF:Description about="urn:mozilla:locale:zh-TW:navigator-platform"
+                   c:baseURL="jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/navigator-platform/">
+    <c:package resource="urn:mozilla:package:navigator-platform"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:global"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/global/">
+    <c:package resource="urn:mozilla:package:global"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:necko"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/necko/">
+    <c:package resource="urn:mozilla:package:necko"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:global-platform"
+                   c:baseURL="jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/global-platform/">
+    <c:package resource="urn:mozilla:package:global-platform"/>
   </RDF:Description>
   <RDF:Seq about="urn:mozilla:locale:zh-TW:packages">
     <RDF:li resource="urn:mozilla:locale:zh-TW:global"/>
@@ -23,21 +30,37 @@
     <RDF:li resource="urn:mozilla:locale:zh-TW:communicator-platform"/>
     <RDF:li resource="urn:mozilla:locale:zh-TW:navigator-platform"/>
   </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:en-US:editor">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/editor/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform">
-    <NS1414:baseURL>resource:/chrome/en-unix/locale/en-US/navigator-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:global-platform">
-    <NS1414:baseURL>jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/global-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:global-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:cookie">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/cookie/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:cookie"/>
+  <RDF:Description about="urn:mozilla:locale:US:navigator-region"
+                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/navigator-region/">
+    <c:package resource="urn:mozilla:package:navigator-region"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:communicator"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/communicator/">
+    <c:package resource="urn:mozilla:package:communicator"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:editor"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/editor/">
+    <c:package resource="urn:mozilla:package:editor"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW"
+                   c:displayName="0.9.1 zh-TW: Traditional Chinese"
+                   c:author="Francis S.Lin, piaip@csie.ntu.edu.tw"
+                   c:name="zh-TW"
+                   c:previewURL="http://www.csie.ntu.edu.tw/~b7506051/mt4/"
+                   c:locType="install">
+    <c:packages resource="urn:mozilla:locale:zh-TW:packages"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
+                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/global-platform/">
+    <c:package resource="urn:mozilla:package:global-platform"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:US:messenger-region"
+                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/messenger-region/">
+    <c:package resource="urn:mozilla:package:messenger-region"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
+                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/">
+    <c:package resource="urn:mozilla:package:communicator-platform"/>
   </RDF:Description>
   <RDF:Seq about="urn:mozilla:locale:en-US:packages">
     <RDF:li resource="urn:mozilla:locale:en-US:necko"/>
@@ -49,97 +72,40 @@
     <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
     <RDF:li resource="urn:mozilla:locale:en-US:global"/>
     <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
+    <RDF:li resource="urn:mozilla:locale:en-US:pipnss"/>
+    <RDF:li resource="urn:mozilla:locale:en-US:pippki"/>
     <RDF:li resource="urn:mozilla:locale:en-US:cookie"/>
     <RDF:li resource="urn:mozilla:locale:en-US:wallet"/>
+    <RDF:li resource="urn:mozilla:locale:en-US:help"/>
     <RDF:li resource="urn:mozilla:locale:en-US:messenger"/>
   </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:editor">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/editor/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:navigator-region">
-    <NS1414:baseURL>resource:/chrome/US/locale/US/navigator-region/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <NS1414:previewURL>http://www.mozilla.org/locales/en-US.gif</NS1414:previewURL>
-    <NS1414:displayName>English (US)</NS1414:displayName>
-    <NS1414:author>mozilla.org</NS1414:author>
-    <NS1414:name>en-US</NS1414:name>
-    <NS1414:locType>install</NS1414:locType>
-    <NS1414:packages resource="urn:mozilla:locale:en-US:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:global">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/global/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:cookie">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/cookie/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:cookie"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:communicator">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/communicator/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:embed">
-    <NS1414:baseURL>resource:/chrome/embed/locale/en-US/embed/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:embed"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:wallet">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/wallet/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:necko">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/necko/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:necko"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:messenger-region">
-    <NS1414:baseURL>resource:/chrome/US/locale/US/messenger-region/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:communicator-platform">
-    <NS1414:baseURL>jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/communicator-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:navigator">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/navigator/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW">
-    <NS1414:displayName>0.8.1 Traditional Chinese (zh-TW)</NS1414:displayName>
-    <NS1414:author>Francis S.Lin, piaip@csie.ntu.edu.tw</NS1414:author>
-    <NS1414:name>zh-TW</NS1414:name>
-    <NS1414:previewURL>http://www.csie.ntu.edu.tw/~b7506051/mt4/</NS1414:previewURL>
-    <NS1414:locType>install</NS1414:locType>
-    <NS1414:packages resource="urn:mozilla:locale:zh-TW:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:communicator-region">
-    <NS1414:baseURL>resource:/chrome/US/locale/US/communicator-region/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform">
-    <NS1414:baseURL>resource:/chrome/en-unix/locale/en-US/communicator-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:global">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/global/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform">
-    <NS1414:baseURL>resource:/chrome/en-unix/locale/en-US/global-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:global-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:editor-region">
-    <NS1414:baseURL>resource:/chrome/US/locale/US/editor-region/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:wallet">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/wallet/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:messenger">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:messenger"/>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:cookie"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/cookie/">
+    <c:package resource="urn:mozilla:package:cookie"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:communicator"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/communicator/">
+    <c:package resource="urn:mozilla:package:communicator"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:pippki"
+                   c:baseURL="jar:resource:/chrome/pippki.jar!/locale/en-US/pippki/">
+    <c:package resource="urn:mozilla:package:pippki"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:US:editor-region"
+                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/editor-region/">
+    <c:package resource="urn:mozilla:package:editor-region"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:wallet"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/wallet/">
+    <c:package resource="urn:mozilla:package:wallet"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/navigator/">
+    <c:package resource="urn:mozilla:package:navigator"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:navigator"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/navigator/">
+    <c:package resource="urn:mozilla:package:navigator"/>
   </RDF:Description>
   <RDF:Seq about="urn:mozilla:locale:US:packages">
     <RDF:li resource="urn:mozilla:locale:US:editor-region"/>
@@ -148,33 +114,82 @@
     <RDF:li resource="urn:mozilla:locale:US:global-region"/>
     <RDF:li resource="urn:mozilla:locale:US:messenger-region"/>
   </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:US:global-region">
-    <NS1414:baseURL>resource:/chrome/US/locale/US/global-region/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/messenger/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/communicator/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:navigator-platform">
-    <NS1414:baseURL>jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/navigator-platform/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator">
-    <NS1414:baseURL>resource:/chrome/en-US/locale/en-US/navigator/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:navigator"/>
+  <RDF:Description about="urn:mozilla:locale:en-US:pipnss"
+                   c:baseURL="jar:resource:/chrome/pipnss.jar!/locale/en-US/pipnss/">
+    <c:package resource="urn:mozilla:package:pipnss"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:cookie"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/cookie/">
+    <c:package resource="urn:mozilla:package:cookie"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:US"
+                   c:displayName="US Region"
+                   c:localeType="region"
+                   c:author="mozilla.org"
+                   c:name="US"
+                   c:previewURL="http://www.mozilla.org/locales/US.gif"
+                   c:locType="install">
+    <c:packages resource="urn:mozilla:locale:US:packages"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:US:global-region"
+                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/global-region/">
+    <c:package resource="urn:mozilla:package:global-region"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:messenger"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/messenger/">
+    <c:package resource="urn:mozilla:package:messenger"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
+                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/">
+    <c:package resource="urn:mozilla:package:navigator-platform"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:editor"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/editor/">
+    <c:package resource="urn:mozilla:package:editor"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:US:communicator-region"
+                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/communicator-region/">
+    <c:package resource="urn:mozilla:package:communicator-region"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:embed"
+                   c:baseURL="jar:resource:/chrome/embed.jar!/locale/en-US/embed/">
+    <c:package resource="urn:mozilla:package:embed"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:wallet"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/wallet/">
+    <c:package resource="urn:mozilla:package:wallet"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:messenger"
+                   c:baseURL="jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger/">
+    <c:package resource="urn:mozilla:package:messenger"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:global"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/global/">
+    <c:package resource="urn:mozilla:package:global"/>
   </RDF:Description>
   <RDF:Seq about="urn:mozilla:locale:root">
     <RDF:li resource="urn:mozilla:locale:en-US"/>
     <RDF:li resource="urn:mozilla:locale:US"/>
     <RDF:li resource="urn:mozilla:locale:zh-TW"/>
   </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:zh-TW:necko">
-    <NS1414:baseURL>jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/necko/</NS1414:baseURL>
-    <NS1414:package resource="urn:mozilla:package:necko"/>
+  <RDF:Description about="urn:mozilla:locale:zh-TW:communicator-platform"
+                   c:baseURL="jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/communicator-platform/">
+    <c:package resource="urn:mozilla:package:communicator-platform"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US"
+                   c:previewURL="http://www.mozilla.org/locales/en-US.gif"
+                   c:displayName="English (US)"
+                   c:author="mozilla.org"
+                   c:name="en-US"
+                   c:locType="install">
+    <c:packages resource="urn:mozilla:locale:en-US:packages"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:help"
+                   c:baseURL="jar:resource:/chrome/help.jar!/locale/en-US/help/">
+    <c:package resource="urn:mozilla:package:help"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:locale:en-US:necko"
+                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/necko/">
+    <c:package resource="urn:mozilla:package:necko"/>
   </RDF:Description>
 </RDF:RDF>
diff --git a/chinese/mozilla-tclp/files/installed-chrome.txt b/chinese/mozilla-tclp/files/installed-chrome.txt
index b3a7b6805ba7..cdb057cab8ea 100644
--- a/chinese/mozilla-tclp/files/installed-chrome.txt
+++ b/chinese/mozilla-tclp/files/installed-chrome.txt
@@ -1,48 +1,54 @@
-content,install,url,resource:/chrome/comm/content/necko/
-locale,install,url,resource:/chrome/en-US/locale/en-US/necko/
-content,install,url,resource:/chrome/embed/content/embed/
-skin,install,url,resource:/chrome/embed/skin/modern/embed/
-locale,install,url,resource:/chrome/embed/locale/en-US/embed/
-content,install,url,resource:/chrome/comm/content/editor/
-content,install,url,resource:/chrome/comm/content/editor-region/
-locale,install,url,resource:/chrome/en-US/locale/en-US/editor/
-locale,install,url,resource:/chrome/US/locale/US/editor-region/
-skin,install,url,resource:/chrome/classic/skin/classic/communicator/
-skin,install,url,resource:/chrome/classic/skin/classic/editor/
-skin,install,url,resource:/chrome/classic/skin/classic/global/
-skin,install,url,resource:/chrome/classic/skin/classic/messenger/
-skin,install,url,resource:/chrome/classic/skin/classic/navigator/
-skin,install,url,resource:/chrome/modern/skin/modern/communicator/
-skin,install,url,resource:/chrome/modern/skin/modern/editor/
-skin,install,url,resource:/chrome/modern/skin/modern/global/
-skin,install,url,resource:/chrome/modern/skin/modern/messenger/
-skin,install,url,resource:/chrome/modern/skin/modern/navigator/
-content,install,url,resource:/chrome/comm/content/navigator/
-content,install,url,resource:/chrome/comm/content/navigator-region/
-content,install,url,resource:/chrome/comm/content/navigator-platform/
-locale,install,url,resource:/chrome/en-US/locale/en-US/navigator/
-locale,install,url,resource:/chrome/US/locale/US/navigator-region/
-locale,install,url,resource:/chrome/en-unix/locale/en-US/navigator-platform/
-content,install,url,resource:/chrome/comm/content/communicator/
-locale,install,url,resource:/chrome/en-US/locale/en-US/communicator/
-content,install,url,resource:/chrome/comm/content/communicator-region/
-content,install,url,resource:/chrome/comm/content/communicator-platform/
-locale,install,url,resource:/chrome/US/locale/US/communicator-region/
-locale,install,url,resource:/chrome/en-unix/locale/en-US/communicator-platform/
-content,install,url,resource:/chrome/toolkit/content/global/
-locale,install,url,resource:/chrome/en-US/locale/en-US/global/
-content,install,url,resource:/chrome/toolkit/content/global-region/
-content,install,url,resource:/chrome/toolkit/content/global-platform/
-locale,install,url,resource:/chrome/US/locale/US/global-region/
-locale,install,url,resource:/chrome/en-unix/locale/en-US/global-platform/
-content,install,url,resource:/chrome/comm/content/cookie/
-locale,install,url,resource:/chrome/en-US/locale/en-US/cookie/
-content,install,url,resource:/chrome/comm/content/wallet/
-locale,install,url,resource:/chrome/en-US/locale/en-US/wallet/
-content,install,url,resource:/chrome/messenger/content/messenger/
-content,install,url,resource:/chrome/messenger/content/messenger-region/
-locale,install,url,resource:/chrome/en-US/locale/en-US/messenger/
-locale,install,url,resource:/chrome/US/locale/US/messenger-region/
+content,install,url,jar:resource:/chrome/comm.jar!/content/necko/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/necko/
+content,install,url,jar:resource:/chrome/embed.jar!/content/embed/
+skin,install,url,jar:resource:/chrome/embed.jar!/skin/modern/embed/
+locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/embed/
+content,install,url,jar:resource:/chrome/comm.jar!/content/editor/
+content,install,url,jar:resource:/chrome/comm.jar!/content/editor-region/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/editor/
+locale,install,url,jar:resource:/chrome/US.jar!/locale/US/editor-region/
+skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/communicator/
+skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/editor/
+skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/global/
+skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/messenger/
+skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/navigator/
+skin,install,url,jar:resource:/chrome/modern.jar!/skin/modern/communicator/
+skin,install,url,jar:resource:/chrome/modern.jar!/skin/modern/editor/
+skin,install,url,jar:resource:/chrome/modern.jar!/skin/modern/global/
+skin,install,url,jar:resource:/chrome/modern.jar!/skin/modern/messenger/
+skin,install,url,jar:resource:/chrome/modern.jar!/skin/modern/navigator/
+content,install,url,jar:resource:/chrome/comm.jar!/content/navigator/
+content,install,url,jar:resource:/chrome/comm.jar!/content/navigator-region/
+content,install,url,jar:resource:/chrome/comm.jar!/content/navigator-platform/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/navigator/
+locale,install,url,jar:resource:/chrome/US.jar!/locale/US/navigator-region/
+locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/
+content,install,url,jar:resource:/chrome/comm.jar!/content/communicator/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/communicator/
+content,install,url,jar:resource:/chrome/comm.jar!/content/communicator-region/
+content,install,url,jar:resource:/chrome/comm.jar!/content/communicator-platform/
+locale,install,url,jar:resource:/chrome/US.jar!/locale/US/communicator-region/
+locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/
+content,install,url,jar:resource:/chrome/toolkit.jar!/content/global/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/global/
+content,install,url,jar:resource:/chrome/toolkit.jar!/content/global-region/
+content,install,url,jar:resource:/chrome/toolkit.jar!/content/global-platform/
+locale,install,url,jar:resource:/chrome/US.jar!/locale/US/global-region/
+locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/global-platform/
+content,install,url,jar:resource:/chrome/pipnss.jar!/content/pipnss/
+locale,install,url,jar:resource:/chrome/pipnss.jar!/locale/en-US/pipnss/
+content,install,url,jar:resource:/chrome/pippki.jar!/content/pippki/
+locale,install,url,jar:resource:/chrome/pippki.jar!/locale/en-US/pippki/
+content,install,url,jar:resource:/chrome/comm.jar!/content/cookie/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/cookie/
+content,install,url,jar:resource:/chrome/comm.jar!/content/wallet/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/wallet/
+content,install,url,jar:resource:/chrome/help.jar!/content/help/
+locale,install,url,jar:resource:/chrome/help.jar!/locale/en-US/help/
+content,install,url,jar:resource:/chrome/messenger.jar!/content/messenger/
+content,install,url,jar:resource:/chrome/messenger.jar!/content/messenger-region/
+locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/messenger/
+locale,install,url,jar:resource:/chrome/US.jar!/locale/US/messenger-region/
 skin,install,select,classic/1.0
 locale,install,select,en-US
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/global/
diff --git a/chinese/mozilla-tclp/files/user-locales.rdf b/chinese/mozilla-tclp/files/user-locales.rdf
index 85f783ab3b85..b6c66ba3ffb4 100644
--- a/chinese/mozilla-tclp/files/user-locales.rdf
+++ b/chinese/mozilla-tclp/files/user-locales.rdf
@@ -1,44 +1,52 @@
 <?xml version="1.0"?>
-<RDF:RDF
-     xmlns:NS1541="http://www.mozilla.org/rdf/chrome#"
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:package:global">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:global-region">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:US:global-region"/>
-  </RDF:Description>
+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <RDF:Description about="urn:mozilla:package:wallet">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:global-platform">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:global-platform"/>
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:wallet"/>
   </RDF:Description>
   <RDF:Description about="urn:mozilla:package:editor">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:editor"/>
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:editor"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:navigator-platform">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:navigator-platform"/>
+  <RDF:Description about="urn:mozilla:package:communicator-platform">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:communicator-platform"/>
   </RDF:Description>
   <RDF:Description about="urn:mozilla:package:navigator">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:navigator"/>
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:navigator"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:communicator">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:communicator"/>
   </RDF:Description>
   <RDF:Description about="urn:mozilla:package:embed">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:embed"/>
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:embed"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:communicator">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:communicator"/>
+  <RDF:Description about="urn:mozilla:package:help">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:help"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:messenger">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:messenger"/>
+  <RDF:Description about="urn:mozilla:package:global-platform">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:global-platform"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:communicator-platform">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:communicator-platform"/>
+  <RDF:Description about="urn:mozilla:package:global-region">
+    <c:selectedLocale resource="urn:mozilla:locale:US:global-region"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:necko">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:necko"/>
+  <RDF:Description about="urn:mozilla:package:pipnss">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:pipnss"/>
   </RDF:Description>
   <RDF:Description about="urn:mozilla:package:cookie">
-    <NS1541:selectedLocale resource="urn:mozilla:locale:zh-TW:cookie"/>
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:cookie"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:navigator-platform">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:navigator-platform"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:pippki">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:pippki"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:global">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:global"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:necko">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:necko"/>
+  </RDF:Description>
+  <RDF:Description about="urn:mozilla:package:messenger">
+    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:messenger"/>
   </RDF:Description>
 </RDF:RDF>