8 files changed, 30 insertions, 513 deletions

diff --git a/chinese/mozilla-tclp/Makefile b/chinese/mozilla-tclp/Makefile
index bcbbfde67a40..15a112fee5f7 100644
--- a/chinese/mozilla-tclp/Makefile
+++ b/chinese/mozilla-tclp/Makefile
@@ -4,19 +4,18 @@
 #
 # $FreeBSD$
 #
-BROKEN=	"out of sync with mozilla."
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.6
 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.
+# Same as ftp://ftp.mozilla.org/pub/mozilla/l10n/lang/moz0.96/langzhtw.xpi.
 # Use this to avoid checksum problems.
-DISTNAME=		0.9.1-0615-RELEASE-langzhtw
+DISTNAME=	langzhtw-0.9.6-1122
 EXTRACT_SUFX=	.xpi
 
-MAINTAINER=	keith@FreeBSD.org
+MAINTAINER=	piaip@csie.ntu.edu.tw
 
 RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla
 
@@ -34,24 +33,21 @@ do-build:
 
 do-install:
 	(cd ${PREFIX}/lib/mozilla/chrome; \
-	${MV} all-locales.rdf all-locales.rdf.orig; \
-	${MV} user-locales.rdf user-locales.rdf.orig; \
+	${MV} -f all-locales.rdf all-locales.rdf.orig; \
+	${MV} -f user-locales.rdf user-locales.rdf.orig; \
 	${MV} installed-chrome.txt installed-chrome.txt.orig)
-	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
-	${MV} unix.js unix.js.orig)
 	${MV} ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
 	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
-	${INSTALL_DATA} ${FILESDIR}/all-locales.rdf \
-		${PREFIX}/lib/mozilla/chrome;
-	${INSTALL_DATA} ${FILESDIR}/user-locales.rdf \
-		${PREFIX}/lib/mozilla/chrome;
 	${INSTALL_DATA} ${WRKSRC}/chrome/zh-TW.jar \
 		${PREFIX}/lib/mozilla/chrome;
 	${INSTALL_DATA} ${WRKSRC}/chrome/zh-unix.jar \
 		${PREFIX}/lib/mozilla/chrome;
-	${INSTALL_DATA} ${FILESDIR}/unix.js ${PREFIX}/lib/mozilla/defaults/pref
+	${INSTALL_DATA} ${WRKSRC}/chrome/TW.jar \
+		${PREFIX}/lib/mozilla/chrome;
+	# "===> Registering Language Pack for Mozilla...";
+	${PREFIX}/bin/mozilla -v;
 
 .include <bsd.port.post.mk>
diff --git a/chinese/mozilla-tclp/distinfo b/chinese/mozilla-tclp/distinfo
index 0a37650d11ca..de1395b0600e 100644
--- a/chinese/mozilla-tclp/distinfo
+++ b/chinese/mozilla-tclp/distinfo
@@ -1 +1 @@
-MD5 (0.9.1-0615-RELEASE-langzhtw.xpi) = ab68f2518c4ffcb5d45e9a276ec46680
+MD5 (langzhtw-0.9.6-1122.xpi) = 837ac3f6807d49dde25676cf7d6e6bd6
diff --git a/chinese/mozilla-tclp/files/all-locales.rdf b/chinese/mozilla-tclp/files/all-locales.rdf
deleted file mode 100644
index 672dfd1763b3..000000000000
--- a/chinese/mozilla-tclp/files/all-locales.rdf
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<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"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:communicator"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:messenger"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:editor"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:necko"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:cookie"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:wallet"/>
-    <RDF:li resource="urn:mozilla:locale:zh-TW:global-platform"/>
-    <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: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"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:embed"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:editor"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:communicator"/>
-    <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: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"/>
-    <RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
-    <RDF:li resource="urn:mozilla:locale:US:communicator-region"/>
-    <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: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: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 cdb057cab8ea..aede89af18ab 100644
--- a/chinese/mozilla-tclp/files/installed-chrome.txt
+++ b/chinese/mozilla-tclp/files/installed-chrome.txt
@@ -1,64 +1,23 @@
-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/
+locale,install,url,jar:resource:/chrome/TW.jar!/locale/TW/communicator-region/
+locale,install,url,jar:resource:/chrome/TW.jar!/locale/TW/editor-region/
+locale,install,url,jar:resource:/chrome/TW.jar!/locale/TW/global-region/
+locale,install,url,jar:resource:/chrome/TW.jar!/locale/TW/messenger-region/
+locale,install,url,jar:resource:/chrome/TW.jar!/locale/TW/navigator-region/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/communicator/
-locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/content-packs/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/cookie/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/editor/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/global/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/help/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/mozldap/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/navigator/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/necko/
-locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/cookie/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/pipnss/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/pippki/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/wallet/
-locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/global-platform/
 locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/communicator-platform/
+locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/global-platform/
 locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/navigator-platform/
+locale,install,select,TW
+locale,install,select,zh-TW
diff --git a/chinese/mozilla-tclp/files/unix.js b/chinese/mozilla-tclp/files/unix.js
deleted file mode 100644
index da255a1b4d3a..000000000000
--- a/chinese/mozilla-tclp/files/unix.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// The other platforms roll this all into "toolbar mode".
-pref("browser.chrome.toolbar_tips", true);
-pref("browser.chrome.show_menubar", true);
-
-pref("mail.empty_trash", false);
-
-// Handled differently under Mac/Windows
-pref("network.hosts.smtp_server", "localhost");
-pref("network.hosts.pop_server", "pop");
-pref("mail.check_new_mail", true);
-pref("mail.sort_by", 0);
-pref("news.sort_by", 0);
-pref("browser.startup.license_accepted", "");
-pref("browser.cache.memory_cache_size", 3000);
-pref("browser.cache.disk_cache_size", 5000);
-pref("browser.ncols", 0);
-pref("browser.installcmap", false);
-pref("mail.signature_file", "~/.signature");
-pref("mail.default_fcc", "~/nsmail/Sent");
-pref("news.default_fcc", "~/nsmail/Sent");
-pref("mailnews.reply_with_extra_lines", 0);
-pref("browser.startup.default_window", 0);
-pref("security.warn_accept_cookie", false);
-pref("editor.disable_spell_checker", false);
-pref("editor.dont_lock_spell_files", true);
-pref("editor.singleLine.pasteNewlines", 0);
-
-// Middle-mouse handling
-pref("middlemouse.paste", true);
-pref("middlemouse.openNewWindow", true);
-pref("middlemouse.scrollbarPosition", true);
-
-// Clipboard behavior
-pref("clipboard.autocopy", true);
-
-// Instead of "delay_images"
-pref("browser.autoload_images", true);
-
-// Most Unix people think modal pref windows are stupid:
-pref("browser.prefWindowModal", false);
-
-// Unix only
-pref("mail.use_movemail", true);
-pref("mail.use_builtin_movemail", true);
-pref("mail.movemail_program", "");
-pref("mail.movemail_warn", false);
-pref("mail.sash_geometry", "");
-pref("news.cache_xover", false);
-pref("news.show_first_unread", false);
-pref("news.sash_geometry", "");
-pref("helpers.global_mime_types_file", "/usr/local/lib/netscape/mime.types");
-pref("helpers.global_mailcap_file", "/usr/local/lib/netscape/mailcap");
-pref("helpers.private_mime_types_file", "~/.mime.types");
-pref("helpers.private_mailcap_file", "~/.mailcap");
-pref("applications.telnet", "xterm -e telnet %h %p");
-pref("applications.tn3270", "xterm -e tn3270 %h");
-pref("applications.rlogin", "xterm -e rlogin %h");
-pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
-pref("applications.tmp_dir", "/tmp");
-// On Solaris/IRIX, this should be "lp"
-pref("print.print_command", "lpr");
-pref("print.print_reversed", false);
-pref("print.print_color", true);
-pref("print.print_landscape", false);
-pref("print.print_paper_size", 0);
-
-// Not sure what this one does...
-pref("browser.fancy_ftp", true);
-
-// Fortezza stuff
-pref("fortezza.toggle", 1);
-pref("fortezza.timeout", 30);
-
-
-// font names
-
-// ar
-
-pref("font.name.serif.el", "misc-fixed-iso8859-7");
-pref("font.name.sans-serif.el", "misc-fixed-iso8859-7");
-pref("font.name.monospace.el", "misc-fixed-iso8859-7");
-
-pref("font.name.serif.he", "misc-fixed-iso8859-8");
-pref("font.name.sans-serif.he", "misc-fixed-iso8859-8");
-pref("font.name.monospace.he", "misc-fixed-iso8859-8");
-
-pref("font.name.serif.ja", "jis-fixed-jisx0208.1983-0");
-pref("font.name.sans-serif.ja", "jis-fixed-jisx0208.1983-0");
-pref("font.name.monospace.ja", "jis-fixed-jisx0208.1983-0");
-
-pref("font.name.serif.ko", "daewoo-mincho-ksc5601.1987-0");
-pref("font.name.sans-serif.ko", "daewoo-mincho-ksc5601.1987-0");
-pref("font.name.monospace.ko", "daewoo-mincho-ksc5601.1987-0");
-
-// th
-
-pref("font.name.serif.tr", "adobe-times-iso8859-9");
-pref("font.name.sans-serif.tr", "adobe-helvetica-iso8859-9");
-pref("font.name.monospace.tr", "adobe-courier-iso8859-9");
-
-pref("font.name.serif.x-baltic", "b&h-lucidux serif-iso8859-4");
-pref("font.name.sans-serif.x-baltic", "b&h-lucidux sans-iso8859-4");
-pref("font.name.monospace.x-baltic", "b&h-lucidux mono-iso8859-4");
-
-pref("font.name.serif.x-central-euro", "adobe-times-iso8859-2");
-pref("font.name.sans-serif.x-central-euro", "adobe-helvetica-iso8859-2");
-pref("font.name.monospace.x-central-euro", "adobe-courier-iso8859-2");
-
-pref("font.name.serif.x-cyrillic", "cronyx-times-koi8-r");
-pref("font.name.sans-serif.x-cyrillic", "cronyx-helvetica-koi8-r");
-pref("font.name.monospace.x-cyrillic", "cronyx-courier-koi8-r");
-
-pref("font.name.serif.x-unicode", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-unicode", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-unicode", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-user-def", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-user-def", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-user-def", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-western", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-western", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-western", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.sans-serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
-
-// zh-TW
-
-
-// minimum font sizes
-
-pref("font.min-size.variable.ja", 16);
-pref("font.min-size.fixed.ja", 16);
-
-pref("font.min-size.variable.ko", 16);
-pref("font.min-size.fixed.ko", 16);
-
-pref("font.min-size.variable.zh-CN", 16);
-pref("font.min-size.fixed.zh-CN", 16);
-
-pref("font.min-size.variable.zh-TW", 16);
-pref("font.min-size.fixed.zh-TW", 16);
-
-// ps font
-pref("print.psnativecode.ja", "euc-jp");
-pref("print.psnativefont.ja", "Ryumin-Light-EUC-H");
-
-pref("print.psnativecode.zh-TW", "big5");
-pref("print.psnativefont.zh-TW", "ArphicMingB5-Regular-B5pc-H");
-
-pref("print.psnativecode.zh-CN", "gb2312");
-pref("print.psnativefont.zh-CN", "ArphicMingGB-Regular-GB-EUC-H");
-
-pref("mail.signature_date", 0);
-
-// Outliner column defaults
-pref("mail.threadpane.messagepane_height", 400);
-
-pref("taskbar.x", -1);
-pref("taskbar.y", -1);
-pref("taskbar.floating", false);
-pref("taskbar.horizontal", false);
-pref("taskbar.ontop", false);
-pref("taskbar.button_style", -1);
-
diff --git a/chinese/mozilla-tclp/files/user-locales.rdf b/chinese/mozilla-tclp/files/user-locales.rdf
deleted file mode 100644
index b6c66ba3ffb4..000000000000
--- a/chinese/mozilla-tclp/files/user-locales.rdf
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<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">
-    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:editor">
-    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:editor"/>
-  </RDF:Description>
-  <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">
-    <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">
-    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:embed"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:help">
-    <c:selectedLocale resource="urn:mozilla:locale:zh-TW:help"/>
-  </RDF:Description>
-  <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:global-region">
-    <c:selectedLocale resource="urn:mozilla:locale:US:global-region"/>
-  </RDF:Description>
-  <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">
-    <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>
diff --git a/chinese/mozilla-tclp/pkg-descr b/chinese/mozilla-tclp/pkg-descr
index f8022d392e49..e413262ac0bb 100644
--- a/chinese/mozilla-tclp/pkg-descr
+++ b/chinese/mozilla-tclp/pkg-descr
@@ -2,6 +2,6 @@ Mozilla is an open-source web browser, designed for standards compliance,
 performance and portability.
 
 Mozilla Traditional Chinese Language Pack provides an L10N environment
-for BIG5 users.  It is written by Francis S.Lin <piaip@csie.ntu.edu.tw>.
+for BIG5 users.  It is written by Hung-Teh Lin <piaip@csie.ntu.edu.tw>.
 
-WWW: http://www.csie.ntu.edu.tw/~b7506051/mt4/
+WWW: http://www.csie.ntu.edu.tw/~b7506051/mozilla/
diff --git a/chinese/mozilla-tclp/pkg-plist b/chinese/mozilla-tclp/pkg-plist
index cc2fdbabc441..73cd805c912f 100644
--- a/chinese/mozilla-tclp/pkg-plist
+++ b/chinese/mozilla-tclp/pkg-plist
@@ -2,16 +2,14 @@
 @exec mv %D/lib/mozilla/chrome/all-locales.rdf %D/lib/mozilla/chrome/all-locales.rdf.orig
 @exec mv %D/lib/mozilla/chrome/user-locales.rdf %D/lib/mozilla/chrome/user-locales.rdf.orig
 @exec mv %D/lib/mozilla/chrome/installed-chrome.txt %D/lib/mozilla/chrome/installed-chrome.txt.orig
-@exec mv %D/lib/mozilla/defaults/pref/unix.js %D/lib/mozilla/defaults/pref/unix.js.orig
 bin/mozilla
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/zh-TW.jar
 lib/mozilla/chrome/zh-unix.jar
+lib/mozilla/chrome/TW.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/defaults/pref/unix.js
 @unexec mv %D/bin/mozilla.orig %D/bin/mozilla
 @unexec mv %D/lib/mozilla/chrome/all-locales.rdf.orig %D/lib/mozilla/chrome/all-locales.rdf
 @unexec mv %D/lib/mozilla/chrome/user-locales.rdf.orig %D/lib/mozilla/chrome/user-locales.rdf
 @unexec mv %D/lib/mozilla/chrome/installed-chrome.txt.orig %D/lib/mozilla/chrome/installed-chrome.txt
-@unexec mv %D/lib/mozilla/defaults/pref/unix.js.orig %D/lib/mozilla/defaults/pref/unix.js