[distrib/pre-installed.data]:

- Improved layout (uses table for the address field)
- Use localized country name only for the respective countries; otherwise
  fallback to English.  (Could make this more intelligent.)
[chinese/distrib/{archive,floppyinst,pre-installed}.wml]:
- New translations by Franklin.  Many thanks!
[chinese/bin/tocn.pl chinese/bin/totw.pl chinese/po/vendors.zh.po]
- Minor revisions

CVS version numbers

chinese/bin/fix_big5.pl: 1.5 -> 1.6 
chinese/bin/tocn.pl: 1.35 -> 1.36 
chinese/bin/totw.pl: 1.35 -> 1.36 
chinese/distrib/archive.wml: INITIAL -> 1.1 
chinese/distrib/floppyinst.wml: INITIAL -> 1.1 
chinese/distrib/pre-installed.wml: INITIAL -> 1.1 
chinese/po/vendors.zh.po: 1.3 -> 1.4 
english/distrib/pre-installed.data: 1.32 -> 1.33

3 files changed, 7 insertions, 1 deletions

diff --git a/chinese/bin/fix_big5.pl b/chinese/bin/fix_big5.pl
index 601b5a6bf87..19fce5af89b 100755
--- a/chinese/bin/fix_big5.pl
+++ b/chinese/bin/fix_big5.pl
@@ -19,3 +19,4 @@ s/<tw戈(畐)?>/[CN:计沮$1:][HKTW:戈$1:]/g;
 s/<tw蹲(|)>/[CN:旧$1:][HKTW:蹲$1:]/g;
 s/<tw杆竚>/[CN:砞称:][HKTW:杆竚:]/g;
 s/<tw硈钡梆>/[CN:狠:][HKTW:硈钡梆:]/g;
+s/<tw睲虫>/[CN::][HKTW:睲虫:]/g;
diff --git a/chinese/bin/tocn.pl b/chinese/bin/tocn.pl
index a4284f889d8..a8bf357ffb1 100755
--- a/chinese/bin/tocn.pl
+++ b/chinese/bin/tocn.pl
@@ -21,9 +21,11 @@ s|^<A href=".*">(&#20013;&#25991;&nbsp;.+CN.+)</A>(?=&nbsp;)|<B>$1</B>|;
 # s/\<t\<文件\>\>/文档/g;
 # s/\<t\<延伸\>\>/扩展/g;
 
+s/二进位套件/二进制包/g;
+s/(源码|原始码)套件/源码包/g;
 s/软(?:体|件)套件/软件包/g;
-s/原始码套件/源码包/g;
 s/(装置|设备|视窗|窗口)管理员/$1管理器/g;
+s/(二|八|十|十六)进位/$1进制/g;
 s/笔记型(?=电脑|计算机)/笔记本/g;
 s/拨接连线/拨号连接/g;
 1 while (s/^((?:[\x00-\x7F]|[\x80-\xFF].)*)光碟机/$1光驱/);
@@ -117,3 +119,4 @@ s/设定档(?:案)?/配置文件/g;
 s/档案名称/文件名/g;
 s/函式库/程序库/g;
 s/资料库/数据库/g;
+s/义大利/意大利/g;
diff --git a/chinese/bin/totw.pl b/chinese/bin/totw.pl
index 4013f3ea0aa..6228fd14b96 100755
--- a/chinese/bin/totw.pl
+++ b/chinese/bin/totw.pl
@@ -47,6 +47,7 @@ s/干ゅン/干郎/g;
 1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)ず/$1癘拘砰/);
 if ($sublang eq 'tw') {
 	1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)び(?=呼)/$1び/);
+	s/種/竡/g;
 }
 1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)砰/$1/);
 1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)/$1璉春/);
@@ -67,6 +68,7 @@ if ($sublang eq 'hk') {
     s/穨╰参/巨╰参/g;
 #    s/窾蝴呼/瞴戈癟呼/g;
     s/瞴戈癟呼/窾蝴呼/g;
+    s/竡/種/g;
     s/呼悔呼(?:隔|蹈)/が羛呼/g;
     1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)呼隔/$1呼蹈/);
     1 while (s/^((?:[\x00-\x7f]|[\x80-\xff].)*)ㄏノ/$1ノめ/);