From 7b00ed1727c2d4b92b6cbad5f5441c0314f6f91a Mon Sep 17 00:00:00 2001
From: Philip Tzou <philip@users.mediawiki.org>
Date: Sun, 29 Mar 2009 02:09:46 +0000
Subject: [PATCH] Update the Chinese conversion tables.

---
 includes/ZhConversion.php           | 65 ++++++++++++++++++++++++++++-
 includes/zhtable/simp2trad.manual   |  8 +++-
 includes/zhtable/trad2simp.manual   |  8 +++-
 includes/zhtable/tradphrases.manual | 50 +++++++++++++++++++++-
 4 files changed, 127 insertions(+), 4 deletions(-)

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 2bbad8b5e8..00fa0a748d 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -243,6 +243,7 @@ $zh2Hant = array(
 '卤' => '鹵',
 '卫' => '衛',
 '却' => '卻',
+'卺' => '巹',
 '厂' => '廠',
 '厅' => '廳',
 '历' => '歷',
@@ -481,6 +482,7 @@ $zh2Hant = array(
 '帻' => '幘',
 '帼' => '幗',
 '幂' => '冪',
+'幞' => '襆',
 '并' => '並',
 '广' => '廣',
 '庆' => '慶',
@@ -1413,6 +1415,7 @@ $zh2Hant = array(
 '蝇' => '蠅',
 '蝈' => '蟈',
 '蝉' => '蟬',
+'蝎' => '蠍',
 '蝼' => '螻',
 '蝾' => '蠑',
 '螀' => '螿',
@@ -1808,6 +1811,7 @@ $zh2Hant = array(
 '酂' => '酇',
 '酝' => '醞',
 '酦' => '醱',
+'酰' => '醯',
 '酱' => '醬',
 '酽' => '釅',
 '酾' => '釃',
@@ -2143,6 +2147,7 @@ $zh2Hant = array(
 '鞑' => '韃',
 '鞒' => '鞽',
 '鞯' => '韉',
+'鞲' => '韝',
 '韦' => '韋',
 '韧' => '韌',
 '韨' => '韍',
@@ -2536,6 +2541,7 @@ $zh2Hant = array(
 '鼍' => '鼉',
 '鼗' => '鞀',
 'é¼¹' => 'é¼´',
+'齄' => '齇',
 '齐' => '齊',
 '齑' => '齏',
 '齿' => '齒',
@@ -2711,6 +2717,8 @@ $zh2Hant = array(
 '9天后' => '9天後',
 '9只' => '9隻',
 '·范' => '·范',
+'、克制' => '、剋制',
+'。克制' => '。剋制',
 '〇只' => '〇隻',
 '〇余' => '〇餘',
 '一干二净' => '一乾二淨',
@@ -2794,6 +2802,7 @@ $zh2Hant = array(
 '不准翻印' => '不准翻印',
 '不准许' => '不准許',
 '不准谁' => '不准誰',
+'不克制' => '不剋制',
 '不前不后' => '不前不後',
 '不加自制' => '不加自制',
 '不占凶吉' => '不占凶吉',
@@ -2901,6 +2910,7 @@ $zh2Hant = array(
 '九谷' => '九穀',
 '九扎' => '九紮',
 '九只' => '九隻',
+'也克制' => '也剋制',
 '也斗了胆' => '也斗了膽',
 '干干' => '乾乾',
 '干干儿的' => '乾乾兒的',
@@ -3059,6 +3069,7 @@ $zh2Hant = array(
 '乱发' => '亂髮',
 '乱哄' => '亂鬨',
 '乱哄不过来' => '亂鬨不過來',
+'了克制' => '了剋制',
 '事后' => '事後',
 '事情干脆' => '事情干脆',
 '事有斗巧' => '事有鬥巧',
@@ -3135,6 +3146,7 @@ $zh2Hant = array(
 '仇仇' => '仇讎',
 '今后' => '今後',
 '介于' => '介於',
+'他克制' => '他剋制',
 '付托' => '付託',
 '仙后座' => '仙后座',
 '仙药' => '仙藥',
@@ -3412,6 +3424,7 @@ $zh2Hant = array(
 '作奸犯科' => '作姦犯科',
 '作准' => '作準',
 '作庄' => '作莊',
+'你克制' => '你剋制',
 '你斗了胆' => '你斗了膽',
 '你才子发昏' => '你纔子發昏',
 '佣金收益' => '佣金收益',
@@ -3463,6 +3476,7 @@ $zh2Hant = array(
 '修胡刀' => '修鬍刀',
 '俯冲' => '俯衝',
 '个里' => '個裡',
+'们克制' => '們剋制',
 '们斗了胆' => '們斗了膽',
 '倒绷孩儿' => '倒繃孩兒',
 '幸免' => '倖免',
@@ -3740,6 +3754,8 @@ $zh2Hant = array(
 '剃须' => '剃鬚',
 '削发' => '削髮',
 '削面' => '削麵',
+'克制不了' => '剋制不了',
+'克制不住' => '剋制不住',
 '克扣' => '剋扣',
 '克日' => '剋日',
 '克星' => '剋星',
@@ -3803,8 +3819,10 @@ $zh2Hant = array(
 '划开' => '劃開',
 '剧药' => '劇藥',
 '刘克庄' => '劉克莊',
+'力克制' => '力剋制',
 '力拼' => '力拚',
 '力拼众敌' => '力拼眾敵',
+'力求克制' => '力求剋制',
 '力争上游' => '力爭上遊',
 '功致' => '功緻',
 '加于' => '加於',
@@ -3965,6 +3983,7 @@ $zh2Hant = array(
 '只采声' => '只采聲',
 '叮叮当当' => '叮叮噹噹',
 '叮当' => '叮噹',
+'可以克制' => '可以剋制',
 '可于' => '可於',
 '可紧可松' => '可緊可鬆',
 '可自制' => '可自制',
@@ -4040,6 +4059,7 @@ $zh2Hant = array(
 '周游' => '周遊',
 '呼吁' => '呼籲',
 '命中注定' => '命中注定',
+'和克制' => '和剋制',
 '和奸' => '和姦',
 '咎征' => '咎徵',
 '咬姜呷醋' => '咬薑呷醋',
@@ -4141,9 +4161,11 @@ $zh2Hant = array(
 '土制' => '土製',
 '土霉素' => '土霉素',
 '在制品' => '在制品',
+'在克制' => '在剋制',
 '在后' => '在後',
 '在于' => '在於',
 '地占' => '地佔',
+'地克制' => '地剋制',
 '地方志' => '地方志',
 '地志' => '地誌',
 '地丑德齐' => '地醜德齊',
@@ -4208,6 +4230,7 @@ $zh2Hant = array(
 '夜光表' => '夜光錶',
 '夜里' => '夜裡',
 '夜游' => '夜遊',
+'够克制' => '夠剋制',
 '梦有五不占' => '夢有五不占',
 '梦里' => '夢裡',
 '梦游' => '夢遊',
@@ -4280,6 +4303,7 @@ $zh2Hant = array(
 '女仆' => '女僕',
 '奴仆' => '奴僕',
 '奸淫掳掠' => '奸淫擄掠',
+'她克制' => '她剋制',
 '好干' => '好乾',
 '好家伙' => '好傢夥',
 '好勇斗狠' => '好勇鬥狠',
@@ -4428,6 +4452,7 @@ $zh2Hant = array(
 '少占' => '少佔',
 '少采' => '少採',
 '少于' => '少於',
+'就克制' => '就剋制',
 '就于' => '就於',
 '就范' => '就範',
 '就里' => '就裡',
@@ -4708,6 +4733,7 @@ $zh2Hant = array(
 '形于' => '形於',
 '仿佛' => '彷彿',
 '役于' => '役於',
+'彼此克制' => '彼此剋制',
 '往后' => '往後',
 '往日無仇' => '往日無讎',
 '往肚里吞' => '往肚裡吞',
@@ -4893,6 +4919,7 @@ $zh2Hant = array(
 '后龙' => '後龍',
 '徐干' => '徐幹',
 '徒托空言' => '徒託空言',
+'得克制' => '得剋制',
 '得于' => '得於',
 '徜徉于' => '徜徉於',
 '从事于' => '從事於',
@@ -4974,6 +5001,7 @@ $zh2Hant = array(
 '忠仆' => '忠僕',
 '忠于' => '忠於',
 'å¿«å¹²' => 'å¿«ä¹¾',
+'快克制' => '快剋制',
 '快快当当' => '快快當當',
 '快冲' => '快衝',
 '忽前忽后' => '忽前忽後',
@@ -5005,6 +5033,7 @@ $zh2Hant = array(
 '悠悠荡荡' => '悠悠蕩蕩',
 '悠荡' => '悠蕩',
 '悠游' => '悠遊',
+'您克制' => '您剋制',
 '悲筑' => '悲筑',
 '悲郁' => '悲鬱',
 '闷在心里' => '悶在心裡',
@@ -5014,8 +5043,10 @@ $zh2Hant = array(
 '惇朴' => '惇樸',
 '恶直丑正' => '惡直醜正',
 '恶斗' => '惡鬥',
+'想克制' => '想剋制',
 '惴栗' => '惴慄',
 '意占' => '意佔',
+'意克制' => '意剋制',
 '意大利面' => '意大利麵',
 '意面' => '意麵',
 '爱在心里' => '愛在心裡',
@@ -5048,6 +5079,7 @@ $zh2Hant = array(
 '凭借着' => '憑藉著',
 '恳托' => '懇託',
 '懈松' => '懈鬆',
+'应克制' => '應剋制',
 '应征' => '應徵',
 '应钟' => '應鐘',
 '懔栗' => '懍慄',
@@ -5068,6 +5100,7 @@ $zh2Hant = array(
 '恋恋不舍' => '戀戀不捨',
 '成于' => '成於',
 '成药' => '成藥',
+'我克制' => '我剋制',
 '或于' => '或於',
 '戬谷' => '戩穀',
 '截发' => '截髮',
@@ -5102,6 +5135,7 @@ $zh2Hant = array(
 '手里' => '手裡',
 '手表' => '手錶',
 '手松' => '手鬆',
+'才克制' => '才剋制',
 '才干休' => '才干休',
 '才干戈' => '才干戈',
 '才干扰' => '才干擾',
@@ -5517,6 +5551,7 @@ $zh2Hant = array(
 '于你' => '於你',
 '于八' => '於八',
 '于六' => '於六',
+'于克制' => '於剋制',
 '于前' => '於前',
 '于劣' => '於劣',
 '于勤' => '於勤',
@@ -5634,6 +5669,7 @@ $zh2Hant = array(
 '明窗净几' => '明窗淨几',
 '明范' => '明範',
 '明里' => '明裡',
+'易克制' => '易剋制',
 '易于' => '易於',
 '星历' => '星曆',
 '星期后' => '星期後',
@@ -5713,6 +5749,10 @@ $zh2Hant = array(
 '月丽于箕' => '月麗於箕',
 '有仆' => '有僕',
 '有够赞' => '有夠讚',
+'有征伐' => '有征伐',
+'有征战' => '有征戰',
+'有征服' => '有征服',
+'有征讨' => '有征討',
 '有征' => '有徵',
 '有恒街' => '有恒街',
 '有栖川' => '有栖川',
@@ -6208,6 +6248,7 @@ $zh2Hant = array(
 '无征不信' => '無徵不信',
 '无业游民' => '無業游民',
 '无梁楼盖' => '無樑樓蓋',
+'无法克制' => '無法剋制',
 '无药可救' => '無藥可救',
 '無言不仇' => '無言不讎',
 '无余' => '無餘',
@@ -6418,6 +6459,7 @@ $zh2Hant = array(
 '百药之长' => '百藥之長',
 '百炼' => '百鍊',
 '百只' => '百隻',
+'的克制' => '的剋制',
 '皆准' => '皆準',
 '皇天后土' => '皇天后土',
 '皇历' => '皇曆',
@@ -6440,6 +6482,7 @@ $zh2Hant = array(
 '盛赞' => '盛讚',
 '盗采' => '盜採',
 '盗钟' => '盜鐘',
+'尽量克制' => '盡量剋制',
 '监制' => '監製',
 '盘里' => '盤裡',
 '盘回' => '盤迴',
@@ -6927,6 +6970,7 @@ $zh2Hant = array(
 '老面皮' => '老面皮',
 '考后' => '考後',
 '考征' => '考徵',
+'而克制' => '而剋制',
 '而后' => '而後',
 '而于' => '而於',
 '耍斗' => '耍鬥',
@@ -6962,6 +7006,7 @@ $zh2Hant = array(
 '胡云' => '胡云',
 '胡朴安' => '胡樸安',
 '胡里胡涂' => '胡裡胡塗',
+'能克制' => '能剋制',
 '能干休' => '能干休',
 '能干戈' => '能干戈',
 '能干扰' => '能干擾',
@@ -7019,6 +7064,7 @@ $zh2Hant = array(
 '致于' => '致於',
 '臻于' => '臻於',
 '舂谷' => '舂穀',
+'与克制' => '與剋制',
 '兴致' => '興緻',
 '举手表' => '舉手表',
 '举手表决' => '舉手表決',
@@ -7117,6 +7163,7 @@ $zh2Hant = array(
 '落于' => '落於',
 '落发' => '落髮',
 '着儿' => '著兒',
+'着克制' => '著剋制',
 '着书立说' => '著書立說',
 '着色软体' => '著色軟體',
 '着重指出' => '著重指出',
@@ -7271,6 +7318,8 @@ $zh2Hant = array(
 '蜜里调油' => '蜜裡調油',
 '蜡月' => '蜡月',
 '蜡祭' => '蜡祭',
+'蝎蝎螫螫' => '蝎蝎螫螫',
+'蝎谮' => '蝎譖',
 '虮蝨相吊' => '蟣蝨相弔',
 '蛏干' => '蟶乾',
 '蠁干' => '蠁幹',
@@ -7475,6 +7524,7 @@ $zh2Hant = array(
 '西谷米' => '西谷米',
 '西游' => '西遊',
 '要占' => '要佔',
+'要克制' => '要剋制',
 '要占卜' => '要占卜',
 '要自制' => '要自制',
 '要冲' => '要衝',
@@ -7701,6 +7751,7 @@ $zh2Hant = array(
 '车站里' => '車站裡',
 '车里' => '車裡',
 '轨范' => '軌範',
+'军队克制' => '軍隊剋制',
 '轩辟' => '軒闢',
 '较于' => '較於',
 '载于' => '載於',
@@ -7969,8 +8020,8 @@ $zh2Hant = array(
 '酿制' => '釀製',
 '衅钟' => '釁鐘',
 '采石之役' => '采石之役',
-'采石之戰' => '采石之戰',
 '采石之战' => '采石之戰',
+'采石之戰' => '采石之戰',
 '采石磯' => '采石磯',
 '采石矶' => '采石磯',
 '釉药' => '釉藥',
@@ -8851,6 +8902,8 @@ $zh2Hant = array(
 '龙须' => '龍鬚',
 '龙斗虎伤' => '龍鬥虎傷',
 '龟山庄' => '龜山庄',
+'！克制' => '！剋制',
+'，克制' => '，剋制',
 '０多只' => '０多隻',
 '０天后' => '０天後',
 '０只' => '０隻',
@@ -8873,6 +8926,9 @@ $zh2Hant = array(
 '８只' => '８隻',
 '９天后' => '９天後',
 '９只' => '９隻',
+'：克制' => '：剋制',
+'；克制' => '；剋制',
+'？克制' => '？剋制',
 );
 
 $zh2Hans = array(
@@ -9261,6 +9317,7 @@ $zh2Hans = array(
 '巒' => '峦',
 '巔' => '巅',
 'å·°' => 'å·¯',
+'巹' => '卺',
 '帥' => '帅',
 '師' => '师',
 '帳' => '帐',
@@ -10367,6 +10424,7 @@ $zh2Hans = array(
 '蟻' => '蚁',
 '蠅' => '蝇',
 '蠆' => '虿',
+'蠍' => '蝎',
 '蠐' => '蛴',
 '蠑' => '蝾',
 '蠟' => '蜡',
@@ -10397,6 +10455,7 @@ $zh2Hans = array(
 '褳' => '裢',
 '褸' => '褛',
 '褻' => '亵',
+'襆' => '幞',
 '襇' => '裥',
 '襏' => '袯',
 '襖' => '袄',
@@ -10819,6 +10878,7 @@ $zh2Hans = array(
 '醣' => '糖',
 '醫' => '医',
 '醬' => '酱',
+'醯' => '酰',
 '醱' => '酦',
 '釀' => '酿',
 '釁' => '衅',
@@ -11219,6 +11279,7 @@ $zh2Hans = array(
 '韓' => '韩',
 '韙' => '韪',
 '韜' => '韬',
+'韝' => '鞲',
 '韞' => '韫',
 '韻' => '韵',
 '響' => '响',
@@ -11702,6 +11763,7 @@ $zh2Hans = array(
 '鼉' => '鼍',
 '鼕' => '冬',
 'é¼´' => 'é¼¹',
+'齇' => '齄',
 '齊' => '齐',
 '齋' => '斋',
 '齎' => '赍',
@@ -13313,6 +13375,7 @@ $zh2Hans = array(
 '猜著稱' => '猜著称',
 '猜著者' => '猜著者',
 '猜著述' => '猜著述',
+'瓮里醯雞' => '瓮里醯鸡',
 '甜著' => '甜着',
 '甜著書' => '甜著书',
 '甜著作' => '甜著作',
diff --git a/includes/zhtable/simp2trad.manual b/includes/zhtable/simp2trad.manual
index 2a40507336..553f625aba 100644
--- a/includes/zhtable/simp2trad.manual
+++ b/includes/zhtable/simp2trad.manual
@@ -358,4 +358,10 @@ U+07A57穗|U+07A57穗|U+07E50繐|
 U+084D1蓑|U+084D1蓑|U+07C11簑|
 U+26216𦈖|U+04308䌈|
 U+03CE0ã³ |U+06FBEæ¾¾|
-U+0447D䑽|U+26A99𦪙|
\ No newline at end of file
+U+0447D䑽|U+26A99𦪙|
+U+0874E蝎|U+0880D蠍|
+U+09170酰|U+091AF醯|
+U+09F44齄|U+09F47齇|
+U+097B2鞲|U+097DD韝|
+U+05E5E幞|U+08946襆|
+U+0537A卺|U+05DF9巹|
\ No newline at end of file
diff --git a/includes/zhtable/trad2simp.manual b/includes/zhtable/trad2simp.manual
index d5bcfa0e85..729883dc80 100644
--- a/includes/zhtable/trad2simp.manual
+++ b/includes/zhtable/trad2simp.manual
@@ -276,4 +276,10 @@ U+058B0墰|U+0575B坛|
 U+091A3醣|U+07CD6糖|
 U+0537D卽|U+05373即|
 U+065E3旣|U+065E2既|
-U+09EB4麴|U+066F2曲|U+09EB4麴|
\ No newline at end of file
+U+09EB4麴|U+066F2曲|U+09EB4麴|
+U+0880D蠍|U+0874E蝎|
+U+091AF醯|U+09170酰|
+U+09F47齇|U+09F44齄|
+U+097DD韝|U+097B2鞲|
+U+08946襆|U+05E5E幞|
+U+05DF9巹|U+0537A卺|
\ No newline at end of file
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index f8012d7e3e..4fdf891bd4 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -2385,6 +2385,10 @@
 三徵七辟
 額徵
 有徵
+有征服
+有征戰
+有征伐
+有征討
 無徵不信
 文徵明
 徵跡
@@ -3002,4 +3006,48 @@
 不乾不淨
 生發生
 必須
-·范
\ No newline at end of file
+·范
+、剋制
+，剋制
+。剋制
+！剋制
+？剋制
+；剋制
+：剋制
+不剋制
+也剋制
+了剋制
+他剋制
+們剋制
+剋制不了
+剋制不住
+力剋制
+力求剋制
+可以剋制
+和剋制
+在剋制
+地剋制
+夠剋制
+她剋制
+你剋制
+您剋制
+就剋制
+彼此剋制
+得剋制
+快剋制
+想剋制
+意剋制
+應剋制
+我剋制
+才剋制
+於剋制
+易剋制
+無法剋制
+的剋制
+盡量剋制
+而剋制
+能剋制
+與剋制
+著剋制
+要剋制
+軍隊剋制
\ No newline at end of file
-- 
2.20.1