From 004b81ff4eb72d26b3515c4461aac36db8b95f6d Mon Sep 17 00:00:00 2001
From: Philip Tzou <philip@users.mediawiki.org>
Date: Fri, 20 Feb 2009 19:05:33 +0000
Subject: [PATCH] Update the Chinese conversion tables.

---
 includes/ZhConversion.php                   | 71 +++++++++++++++++----
 includes/zhtable/simpphrases_exclude.manual |  4 +-
 includes/zhtable/toSimp.manual              |  1 +
 includes/zhtable/toTrad.manual              |  3 +-
 includes/zhtable/trad2simp.manual           |  3 +-
 includes/zhtable/tradphrases.manual         | 60 ++++++++++++++++-
 includes/zhtable/tradphrases_exclude.manual |  5 +-
 7 files changed, 129 insertions(+), 18 deletions(-)

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 46d1811a54..b741cb2367 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -2598,6 +2598,7 @@ $zh2Hant = array(
 '一发千钧' => '一髮千鈞',
 '一哄而散' => '一鬨而散',
 '丁丁当当' => '丁丁當當',
+'丁丑' => '丁丑',
 '七划' => '七劃',
 '七天后' => '七天後',
 '七情六欲' => '七情六慾',
@@ -2650,6 +2651,7 @@ $zh2Hant = array(
 '不采' => '不採',
 '不断发' => '不斷發',
 '不准' => '不準',
+'不准确' => '不準確',
 '不知所云' => '不知所云',
 '不谷' => '不穀',
 '不药而愈' => '不藥而癒',
@@ -2659,6 +2661,15 @@ $zh2Hant = array(
 '不丑' => '不醜',
 '不锈钢' => '不鏽鋼',
 '不斗' => '不鬥',
+'丑三' => '丑三',
+'丑婆子' => '丑婆子',
+'丑年' => '丑年',
+'丑日' => '丑日',
+'丑旦' => '丑旦',
+'丑时' => '丑時',
+'丑月' => '丑月',
+'丑表功' => '丑表功',
+'丑角' => '丑角',
 '且于' => '且於',
 '世田谷' => '世田谷',
 '世界杯' => '世界盃',
@@ -2703,6 +2714,7 @@ $zh2Hant = array(
 '之于' => '之於',
 '之托' => '之託',
 '之余' => '之餘',
+'乙丑' => '乙丑',
 '九世之仇' => '九世之讎',
 '九划' => '九劃',
 '九天后' => '九天後',
@@ -2885,7 +2897,6 @@ $zh2Hant = array(
 '云然' => '云然',
 '云尔' => '云爾',
 '互于' => '互於',
-'五公里' => '五公里',
 '五划' => '五劃',
 '五天后' => '五天後',
 '五岳' => '五嶽',
@@ -3420,10 +3431,10 @@ $zh2Hant = array(
 '公仔面' => '公仔麵',
 '公仆' => '公僕',
 '公元后' => '公元後',
+'公孙丑' => '公孫丑',
 '公干' => '公幹',
 '公历' => '公曆',
 '公历史' => '公歷史',
-'公里' => '公裡',
 '公厘' => '公釐',
 '公余' => '公餘',
 '六划' => '六劃',
@@ -3468,6 +3479,8 @@ $zh2Hant = array(
 '凶杀案' => '凶殺案',
 '凶相毕露' => '凶相畢露',
 '凹洞里' => '凹洞裡',
+'出乖弄丑' => '出乖弄醜',
+'出乖露丑' => '出乖露醜',
 '出于' => '出於',
 '出谋划策' => '出謀劃策',
 '出游' => '出遊',
@@ -3611,7 +3624,6 @@ $zh2Hant = array(
 '匪干' => '匪幹',
 '匿于' => '匿於',
 '区划' => '區劃',
-'十公里' => '十公里',
 '十划' => '十劃',
 '十多只' => '十多隻',
 '十天后' => '十天後',
@@ -3799,7 +3811,6 @@ $zh2Hant = array(
 '恶心' => '噁心',
 '噙齿戴发' => '噙齒戴髮',
 '喷洒' => '噴洒',
-'吨公里' => '噸公里',
 '当啷' => '噹啷',
 '当当' => '噹噹',
 '噜苏' => '嚕囌',
@@ -3930,6 +3941,7 @@ $zh2Hant = array(
 '伙同' => '夥同',
 '伙众' => '夥眾',
 '伙计' => '夥計',
+'大丑' => '大丑',
 '大伙儿' => '大伙兒',
 '大伙' => '大夥',
 '大干' => '大幹',
@@ -3949,7 +3961,6 @@ $zh2Hant = array(
 '大言非夸' => '大言非夸',
 '大赞' => '大讚',
 '大周折' => '大週摺',
-'大丑' => '大醜',
 '大金发苔' => '大金髮苔',
 '大锤' => '大鎚',
 '大只' => '大隻',
@@ -3985,6 +3996,7 @@ $zh2Hant = array(
 '奥占' => '奧佔',
 '夺斗' => '奪鬥',
 '奋斗' => '奮鬥',
+'女丑' => '女丑',
 '女佣人' => '女佣人',
 '女佣' => '女傭',
 '女仆' => '女僕',
@@ -4108,8 +4120,10 @@ $zh2Hant = array(
 '对于' => '對於',
 '对准' => '對準',
 '对华发动' => '對華發動',
+'对表达' => '對表達',
 '对表' => '對錶',
 '导游' => '導遊',
+'小丑' => '小丑',
 '小仆' => '小僕',
 '小伙子' => '小夥子',
 '小于' => '小於',
@@ -4182,6 +4196,7 @@ $zh2Hant = array(
 '差之毫厘' => '差之毫厘',
 '差之毫厘，谬以千里' => '差之毫釐，謬以千里',
 '差于' => '差於',
+'己丑' => '己丑',
 '已占' => '已佔',
 '已于' => '已於',
 '巴尔干' => '巴爾幹',
@@ -4206,7 +4221,6 @@ $zh2Hant = array(
 '干系' => '干係',
 '干着急' => '干著急',
 '平平当当' => '平平當當',
-'平方公里' => '平方公裡',
 '平泉庄' => '平泉莊',
 '平准' => '平準',
 '年后' => '年後',
@@ -4400,6 +4414,7 @@ $zh2Hant = array(
 '往复' => '往複',
 '很干' => '很乾',
 '很凶' => '很兇',
+'很丑' => '很醜',
 '律历志' => '律曆志',
 '后上' => '後上',
 '后下' => '後下',
@@ -5111,6 +5126,7 @@ $zh2Hant = array(
 '数天后' => '數天後',
 '数罪并罚' => '數罪併罰',
 '数与虏确' => '數與虜确',
+'文丑' => '文丑',
 '文汇报' => '文匯報',
 '文后' => '文後',
 '文征明' => '文徵明',
@@ -5127,7 +5143,6 @@ $zh2Hant = array(
 '断发' => '斷髮',
 '断发文身' => '斷髮文身',
 '方便面' => '方便麵',
-'方公里' => '方公里',
 '方几' => '方几',
 '方才' => '方纔',
 '方志' => '方誌',
@@ -5429,6 +5444,7 @@ $zh2Hant = array(
 '核准的' => '核准的',
 '格于' => '格於',
 '格范' => '格範',
+'格里历' => '格里曆',
 '格斗' => '格鬥',
 '桂圆干' => '桂圓乾',
 '桅杆' => '桅杆',
@@ -5534,6 +5550,7 @@ $zh2Hant = array(
 '正当着' => '正當著',
 '此后' => '此後',
 '步步高升' => '步步高升',
+'武丑' => '武丑',
 '武斗' => '武鬥',
 '归并' => '歸併',
 '归功于' => '歸功於',
@@ -5561,7 +5578,6 @@ $zh2Hant = array(
 '殴斗' => '毆鬥',
 '母范' => '母範',
 '母丑' => '母醜',
-'每公里' => '每公里',
 '每于' => '每於',
 '每只' => '每隻',
 '毒药' => '毒藥',
@@ -5587,7 +5603,6 @@ $zh2Hant = array(
 '求知欲' => '求知慾',
 '求签' => '求籤',
 '求道于盲' => '求道於盲',
-'江苏' => '江甦',
 '池里' => '池裡',
 '污蔑' => '污衊',
 '汲于' => '汲於',
@@ -5632,6 +5647,7 @@ $zh2Hant = array(
 '洒洒' => '洒洒',
 '洒脱' => '洒脫',
 '洗炼' => '洗鍊',
+'洗练' => '洗鍊',
 '洗发' => '洗髮',
 '洛钟东应' => '洛鐘東應',
 '泄欲' => '洩慾',
@@ -5930,6 +5946,7 @@ $zh2Hant = array(
 '独占' => '獨佔',
 '独占鳌头' => '獨佔鰲頭',
 '独辟蹊径' => '獨闢蹊徑',
+'获匪其丑' => '獲匪其醜',
 '兽欲' => '獸慾',
 '献丑' => '獻醜',
 '率团参加' => '率團參加',
@@ -5960,7 +5977,6 @@ $zh2Hant = array(
 '产卵洄游' => '產卵洄游',
 '产后' => '產後',
 '产于' => '產於',
-'苏联' => '甦聯',
 '用于' => '用於',
 '用药' => '用藥',
 '甩发' => '甩髮',
@@ -6008,6 +6024,7 @@ $zh2Hant = array(
 '症候' => '癥候',
 '症状' => '癥狀',
 '症结' => '癥結',
+'癸丑' => '癸丑',
 '发干' => '發乾',
 '发于' => '發於',
 '发汗药' => '發汗藥',
@@ -6278,7 +6295,18 @@ $zh2Hant = array(
 '答覆' => '答覆',
 '策划' => '策劃',
 '筵几' => '筵几',
-'个中' => '箇中',
+'个中原因' => '箇中原因',
+'个中奥妙' => '箇中奧妙',
+'个中奥秘' => '箇中奧秘',
+'个中好手' => '箇中好手',
+'个中强手' => '箇中強手',
+'个中消息' => '箇中消息',
+'个中滋味' => '箇中滋味',
+'个中玄机' => '箇中玄機',
+'个中理由' => '箇中理由',
+'个中讯息' => '箇中訊息',
+'个中资讯' => '箇中資訊',
+'个中高手' => '箇中高手',
 '个旧' => '箇舊',
 '算在里面' => '算在裡面',
 '算历' => '算曆',
@@ -7285,6 +7313,7 @@ $zh2Hant = array(
 '转台' => '轉檯',
 '转托' => '轉託',
 '转斗千里' => '轉鬥千里',
+'辛丑' => '辛丑',
 '辟谷' => '辟穀',
 '办公台' => '辦公檯',
 '辞汇' => '辭彙',
@@ -7476,39 +7505,52 @@ $zh2Hant = array(
 '丑丫头' => '醜丫頭',
 '丑事' => '醜事',
 '丑人' => '醜人',
+'丑侪' => '醜儕',
 '丑八怪' => '醜八怪',
 '丑剌剌' => '醜剌剌',
 '丑剧' => '醜劇',
 '丑化' => '醜化',
+'丑史' => '醜史',
 '丑名' => '醜名',
 '丑咤' => '醜吒',
 '丑地' => '醜地',
 '丑夷' => '醜夷',
 '丑女' => '醜女',
 '丑女效颦' => '醜女效顰',
+'丑奴儿' => '醜奴兒',
 '丑妇' => '醜婦',
 '丑媳' => '醜媳',
 '丑媳妇' => '醜媳婦',
 '丑小鸭' => '醜小鴨',
 '丑巴怪' => '醜巴怪',
+'丑徒' => '醜徒',
 '丑恶' => '醜惡',
 '丑态' => '醜態',
+'丑毙了' => '醜斃了',
 '丑于' => '醜於',
 '丑末' => '醜末',
 '丑样' => '醜樣',
 '丑死' => '醜死',
-'丑生' => '醜生',
+'丑比' => '醜比',
+'丑沮' => '醜沮',
+'丑男' => '醜男',
 '丑闻' => '醜聞',
 '丑声' => '醜聲',
 '丑声远播' => '醜聲遠播',
 '丑脸' => '醜臉',
 '丑虏' => '醜虜',
 '丑行' => '醜行',
+'丑言' => '醜言',
 '丑诋' => '醜詆',
 '丑话' => '醜話',
 '丑语' => '醜語',
+'丑贼生' => '醜賊生',
+'丑辞' => '醜辭',
+'丑辱' => '醜辱',
+'丑逆' => '醜逆',
 '丑丑' => '醜醜',
 '丑陋' => '醜陋',
+'丑杂' => '醜雜',
 '丑头怪脸' => '醜頭怪臉',
 '丑类' => '醜類',
 '酝酿着' => '醞釀著',
@@ -8332,10 +8374,13 @@ $zh2Hant = array(
 '齿发' => '齒髮',
 '出儿' => '齣兒',
 '出剧' => '齣劇',
+'出动画' => '齣動畫',
 '出卡通' => '齣卡通',
 '出子' => '齣子',
 '出戏' => '齣戲',
+'出节目' => '齣節目',
 '出电影' => '齣電影',
+'出电视' => '齣電視',
 '龙卷' => '龍捲',
 '龙眼干' => '龍眼乾',
 '龙须' => '龍鬚',
@@ -9764,6 +9809,7 @@ $zh2Hans = array(
 '薩' => '萨',
 '薳' => '䓕',
 '薴' => '苧',
+'薹' => '苔',
 '薺' => '荠',
 '藍' => '蓝',
 '藎' => '荩',
@@ -12319,6 +12365,7 @@ $zh2Hans = array(
 '沿著稱' => '沿著称',
 '沿著者' => '沿著者',
 '沿著述' => '沿著述',
+'洗鍊' => '洗练',
 '活著' => '活着',
 '活著書' => '活著书',
 '活著作' => '活著作',
diff --git a/includes/zhtable/simpphrases_exclude.manual b/includes/zhtable/simpphrases_exclude.manual
index 420a3eeaec..1a42f909cb 100644
--- a/includes/zhtable/simpphrases_exclude.manual
+++ b/includes/zhtable/simpphrases_exclude.manual
@@ -7,4 +7,6 @@
 关於
 对於
 属於
-夥计
\ No newline at end of file
+夥计
+抽薹
+芸薹
\ No newline at end of file
diff --git a/includes/zhtable/toSimp.manual b/includes/zhtable/toSimp.manual
index 396f865558..da617aa43c 100644
--- a/includes/zhtable/toSimp.manual
+++ b/includes/zhtable/toSimp.manual
@@ -36,6 +36,7 @@
 金鍊	金链
 銀鍊	银链
 鍊錘	链锤
+洗鍊	洗练
 石碁镇	石碁镇
 反覆	反复
 回覆	回复
diff --git a/includes/zhtable/toTrad.manual b/includes/zhtable/toTrad.manual
index cfd8cf0833..dcb7357fad 100644
--- a/includes/zhtable/toTrad.manual
+++ b/includes/zhtable/toTrad.manual
@@ -56,4 +56,5 @@
 合著者	合著者
 答复	答覆
 反复	反覆
-索馬里	索馬里
\ No newline at end of file
+索馬里	索馬里
+洗练	洗鍊
\ No newline at end of file
diff --git a/includes/zhtable/trad2simp.manual b/includes/zhtable/trad2simp.manual
index 4ea6f8466d..c96ca801b2 100644
--- a/includes/zhtable/trad2simp.manual
+++ b/includes/zhtable/trad2simp.manual
@@ -111,4 +111,5 @@ U+055AB喫|U+05403吃|
 U+07661癡|U+075F4痴|
 U+083F4菴|U+05EB5庵|
 U+07DB5綵|U+05F69彩|U+0433D䌽|
-U+08123脣|U+05507唇|
\ No newline at end of file
+U+08123脣|U+05507唇|
+U+085B9薹|U+082D4苔|
\ No newline at end of file
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 40f94aeec6..522d8bff6c 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -546,7 +546,6 @@
 醜話
 醜媳
 醜吒
-醜生
 醜聲遠播
 醜夷
 弄醜
@@ -556,8 +555,50 @@
 不嫌母醜
 一爭兩醜
 惡直醜正
+很醜
+醜男
+醜斃了
+醜奴兒
+醜言
+醜徒
+醜雜
+醜儕
+醜沮
+醜辭
+醜比
+醜辱
+醜逆
+醜史
+醜賊生
+醜婆子
+出乖弄醜
+出乖露醜
+獲匪其醜
+乙丑
+丁丑
+己丑
+辛丑
+癸丑
+丑時
+丑日
+丑月
+丑年
+文丑
+武丑
+女丑
+小丑
+大丑
+丑婆子
+丑旦
+丑角
+丑三
+丑表功
+公孫丑
 么麼小丑
 齣電影
+齣電視
+齣動畫
+齣節目
 齣卡通
 齣戲
 齣劇
@@ -837,6 +878,7 @@
 皇極曆
 儒略改革曆
 希伯來曆
+格里曆
 厤物之意
 爰定祥厤
 白黴
@@ -2595,4 +2637,18 @@
 口燥唇乾
 舌乾唇焦
 花菴詞選
-渾箇
\ No newline at end of file
+渾箇
+箇中原因
+箇中理由
+箇中高手
+箇中好手
+箇中強手
+箇中滋味
+箇中奧秘
+箇中奧妙
+箇中玄機
+箇中消息
+箇中資訊
+箇中訊息
+對表達
+不準確
\ No newline at end of file
diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual
index af48ad0321..2ba4dfa385 100644
--- a/includes/zhtable/tradphrases_exclude.manual
+++ b/includes/zhtable/tradphrases_exclude.manual
@@ -14,6 +14,7 @@
 采
 着
 借
+甦
 可憐虫
 一齣
 上弔
@@ -243,4 +244,6 @@
 丰度
 剪彩
 脣
-菴
\ No newline at end of file
+菴
+公裡
+箇中
\ No newline at end of file
-- 
2.20.1