Update the Chinese conversion tables

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 25d3786..4d60854 100644 (file)
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -2554,6 +2554,7 @@ $zh2Hant = array(
 "一树百获" =>      "一樹百穫",
 "一准" =>    "一準",
 "一争两丑" =>      "一爭兩醜",
+"一箭双雕" =>      "一箭雙鵰",
 "一扎" =>    "一紮",
 "一冲" =>    "一衝",
 "一锅面" =>         "一鍋麵",
@@ -2628,7 +2629,7 @@ $zh2Hant = array(
 "丹药" =>    "丹藥",
 "主仆" =>    "主僕",
 "主干" =>    "主幹",
-"么么小丑" =>      "么麼小醜",
+"么么小丑" =>      "么麼小丑",
 "之后" =>    "之後",
 "之于" =>    "之於",
 "九世之雠" =>      "九世之讎",
@@ -2818,7 +2819,6 @@ $zh2Hant = array(
 "并一不二" =>      "併一不二",
 "并入" =>    "併入",
 "并兼" =>    "併兼",
-"并列" =>    "併列",
 "并到" =>    "併到",
 "并力" =>    "併力",
 "并合" =>    "併合",
@@ -3225,7 +3225,6 @@ $zh2Hant = array(
 "吊钟" =>    "吊鐘",
 "同伙" =>    "同夥",
 "名闻于世" =>      "名聞於世",
-"名表" =>    "名錶",
 "后发座" =>         "后髮座",
 "向后" =>    "向後",
 "向着" =>    "向著",
@@ -3473,6 +3472,7 @@ $zh2Hant = array(
 "宝山庄" =>         "寶山庄",
 "宝历" =>    "寶曆",
 "封面里" =>         "封面裡",
+"射雕" =>    "射鵰",
 "将于" =>    "將於",
 "专美于前" =>      "專美於前",
 "专注" =>    "專註",
@@ -3494,7 +3494,6 @@ $zh2Hant = array(
 "就范" =>    "就範",
 "就读于" =>         "就讀於",
 "尼克松" =>         "尼克鬆",
-"尼采" =>    "尼採",
 "局里" =>    "局裡",
 "居于" =>    "居於",
 "屈服于" =>         "屈服於",
@@ -3544,6 +3543,7 @@ $zh2Hant = array(
 "平准" =>    "平準",
 "年后" =>    "年後",
 "年历" =>    "年曆",
+"年历史" =>         "年歷史",
 "年谷" =>    "年穀",
 "年里" =>    "年裡",
 "并州" =>    "并州",
@@ -3620,7 +3620,6 @@ $zh2Hant = array(
 "别扭" =>    "彆扭",
 "别拗" =>    "彆拗",
 "别气" =>    "彆氣",
-"别脚" =>    "彆腳",
 "别着" =>    "彆著",
 "弹子台" =>         "彈子檯",
 "弹药" =>    "彈藥",
@@ -4058,7 +4057,6 @@ $zh2Hant = array(
 "采拾" =>    "採拾",
 "采挖" =>    "採挖",
 "采掘" =>    "採掘",
-"采采" =>    "採採",
 "采摘" =>    "採摘",
 "采摭" =>    "採摭",
 "采择" =>    "採擇",
@@ -4125,6 +4123,7 @@ $zh2Hant = array(
 "换发" =>    "換髮",
 "揪采" =>    "揪採",
 "揭丑" =>    "揭醜",
+"挥手表" =>         "揮手表",
 "搋面" =>    "搋麵",
 "搏斗" =>    "搏鬥",
 "摇荡" =>    "搖蕩",
@@ -4193,9 +4192,9 @@ $zh2Hant = array(
 "敬挽" =>    "敬輓",
 "敲钟" =>    "敲鐘",
 "整只" =>    "整隻",
-"整出" =>    "整齣",
 "敌后" =>    "敵後",
 "敷药" =>    "敷藥",
+"数天后" =>         "數天後",
 "数罪并罚" =>      "數罪併罰",
 "数与虏确" =>      "數與虜确",
 "文汇报" =>         "文匯報",
@@ -4877,6 +4876,8 @@ $zh2Hant = array(
 "祝发" =>    "祝髮",
 "神荼郁垒" =>      "神荼鬱壘",
 "神游" =>    "神遊",
+"神雕像" =>         "神雕像",
+"神雕" =>    "神鵰",
 "祭吊" =>    "祭弔",
 "禁欲" =>    "禁慾",
 "禁药" =>    "禁藥",
@@ -5159,7 +5160,6 @@ $zh2Hant = array(
 "耳后" =>    "耳後",
 "耽于" =>    "耽於",
 "耿耿于怀" =>      "耿耿於懷",
-"聊斋志异" =>      "聊齋誌異",
 "联系" =>    "聯係",
 "联于" =>    "聯於",
 "联系" =>    "聯繫",
@@ -5206,6 +5206,7 @@ $zh2Hant = array(
 "臻于完善" =>      "臻於完善",
 "舂谷" =>    "舂穀",
 "兴致" =>    "興緻",
+"举手表" =>         "舉手表",
 "旧庄" =>    "舊庄",
 "旧历" =>    "舊曆",
 "旧药" =>    "舊藥",
@@ -5566,6 +5567,7 @@ $zh2Hant = array(
 "衬里" =>    "襯裡",
 "西岳" =>    "西嶽",
 "西历" =>    "西曆",
+"西历史" =>         "西歷史",
 "西药" =>    "西藥",
 "西游" =>    "西遊",
 "要冲" =>    "要衝",
@@ -5675,7 +5677,6 @@ $zh2Hant = array(
 "雠隙" =>    "讎隙",
 "豆腐干" =>         "豆腐乾",
 "竖着" =>    "豎著",
-"丰富多采" =>      "豐富多採",
 "丰滨" =>    "豐濱",
 "丰滨乡" =>         "豐濱鄉",
 "象征" =>    "象徵",
@@ -5704,7 +5705,6 @@ $zh2Hant = array(
 "跟前跟后" =>      "跟前跟後",
 "路签" =>    "路籤",
 "跳樑小丑" =>      "跳樑小醜",
-"跳樑猖獗之小丑" =>     "跳樑猖獗之小醜",
 "跳荡" =>    "跳蕩",
 "跳表" =>    "跳錶",
 "躁郁" =>    "躁鬱",
@@ -5728,7 +5728,6 @@ $zh2Hant = array(
 "轮回" =>    "輪迴",
 "转台" =>    "轉檯",
 "转讬" =>    "轉託",
-"辛丑" =>    "辛醜",
 "辟谷" =>    "辟穀",
 "办公台" =>         "辦公檯",
 "辞汇" =>    "辭彙",
@@ -5920,6 +5919,9 @@ $zh2Hant = array(
 "医药" =>    "醫藥",
 "酿制" =>    "釀製",
 "衅钟" =>    "釁鐘",
+"采石之役" =>      "采石之役",
+"采石之战" =>      "采石之戰",
+"采石矶" =>         "采石磯",
 "釉药" =>    "釉藥",
 "里程表" =>         "里程錶",
 "重划" =>    "重劃",
@@ -5964,7 +5966,6 @@ $zh2Hant = array(
 "表蒙子" =>         "錶蒙子",
 "表针" =>    "錶針",
 "表链" =>    "錶鏈",
-"表面" =>    "錶面",
 "锻鍊出" =>         "鍛鍊出",
 "锲而不舍" =>      "鍥而不捨",
 "钟表" =>    "鍾錶",
@@ -6407,6 +6408,7 @@ $zh2Hant = array(
 "鸣钟" =>    "鳴鐘",
 "鸿范" =>    "鴻範",
 "鹄发" =>    "鵠髮",
+"雕悍" =>    "鵰悍",
 "鹤发" =>    "鶴髮",
 "咸味" =>    "鹹味",
 "咸嘴淡舌" =>      "鹹嘴淡舌",
@@ -6520,6 +6522,8 @@ $zh2Hant = array(
 "鄭凱云" => "鄭凱云",
 "筑陽" => "筑陽",
 "筑後" => "筑後",
+"采石磯" => "采石磯",
+"采石之戰" => "采石之戰",
 );
 
 $zh2Hans = array(
@@ -9169,6 +9173,7 @@ $zh2Hans = array(
 "鵬"=>"鹏",
 "鵮"=>"鹐",
 "鵯"=>"鹎",
+"鵰"=>"雕",
 "鵲"=>"鹊",
 "鵷"=>"鹓",
 "鵾"=>"鹍",
@@ -9493,6 +9498,20 @@ $zh2TW = array(
 "‘" => "『",
 "’" => "』",
 "着" => "著",
+"元凶" => "元凶",
+"凶器" => "凶器",
+"凶徒" => "凶徒",
+"凶手" => "凶手",
+"凶案" => "凶案",
+"凶残" => "凶殘",
+"凶杀" => "凶殺",
+"疑凶" => "疑凶",
+"真凶" => "真凶",
+"缉凶" => "緝凶",
+"行凶" => "行凶",
+"行凶后" => "行凶後",
+"买凶" => "買凶",
+"追凶" => "追凶",
 "缺省" => "預設",
 "串行" => "串列",
 "以太网" => "乙太網",
@@ -9791,6 +9810,10 @@ $zh2HK = array(
 "“" => "「",
 "‘" => "『",
 "’" => "』",
+"凶殺" => "兇殺",
+"凶殘" => "兇殘",
+"緝凶" => "緝兇",
+"買凶" => "買兇",
 "打印机" => "打印機",
 "印表機" => "打印機",
 "字节" => "位元組",

diff --git a/includes/zhtable/simp2trad.manual b/includes/zhtable/simp2trad.manual
index be8d7fd..783466f 100644 (file)
--- a/includes/zhtable/simp2trad.manual
+++ b/includes/zhtable/simp2trad.manual
@@ -196,3 +196,4 @@ U+06ce8注|U+06ce8注|U+08a3b註|
 U+04ed1仑|U+04f96侖|U+05d19崙|
 U+06817栗|U+06817栗|U+06144慄|
 U+05742坂|U+05742坂|U+0962a阪|
+U+096d5雕|U+096d5雕|U+09d70鵰|

diff --git a/includes/zhtable/toHK.manual b/includes/zhtable/toHK.manual
index 2492d92..9afddb7 100644 (file)
--- a/includes/zhtable/toHK.manual
+++ b/includes/zhtable/toHK.manual
@@ -2,6 +2,10 @@
 “    「
 ‘    『
 ’    』
+凶殺 兇殺
+凶殘 兇殘
+緝凶 緝兇
+買凶 買兇
 打印机      打印機
 印表機      打印機
 字节 位元組

diff --git a/includes/zhtable/toTW.manual b/includes/zhtable/toTW.manual
index d096df7..b927c42 100644 (file)
--- a/includes/zhtable/toTW.manual
+++ b/includes/zhtable/toTW.manual
@@ -3,6 +3,20 @@
 ‘    『
 ’    』
 着    著
+元凶 元凶
+凶器 凶器
+凶徒 凶徒
+凶手 凶手
+凶案 凶案
+凶残 凶殘
+凶杀 凶殺
+疑凶 疑凶
+真凶 真凶
+缉凶 緝凶
+行凶 行凶
+行凶后      行凶後
+买凶 買凶
+追凶 追凶
 缺省 預設
 串行 串列
 以太网      乙太網

diff --git a/includes/zhtable/toTrad.manual b/includes/zhtable/toTrad.manual
index cbc4f93..277d4ee 100644 (file)
--- a/includes/zhtable/toTrad.manual
+++ b/includes/zhtable/toTrad.manual
@@ -23,3 +23,5 @@
 鄭凱云      鄭凱云
 筑陽 筑陽
 筑後 筑後
+采石磯      采石磯
+采石之戰   采石之戰

diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index ecb33dd..7656773 100644 (file)
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -22,6 +22,8 @@
 千多隻
 萬多隻
 億多隻
+數天後
+多天後
 多天後
 零天後
 一天後
@@ -247,6 +249,8 @@
 並發現
 並發展
 並發動
+舉手表
+揮手表
 併一不二
 連三併四
 相併
@@ -380,8 +384,7 @@
 小醜跳樑
 跳樑小醜
 怨在小醜
-跳樑猖獗之小醜
-么麼小醜
+么麼小丑
 小醜跳樑
 齣電影
 齣卡通
@@ -629,6 +632,8 @@
 裏勾外連
 裏手
 水里鄉
+年歷史
+西歷史
 百花曆
 寶曆
 穆罕默德曆
@@ -1158,3 +1163,9 @@
 原子鐘
 泳氣鐘
 電子鐘
+射鵰
+神鵰
+神雕像
+采石磯
+采石之戰
+采石之役

diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual
index 99912be..eee93c8 100644 (file)
--- a/includes/zhtable/tradphrases_exclude.manual
+++ b/includes/zhtable/tradphrases_exclude.manual
@@ -1,4 +1,5 @@
 三國誌
+聊齋誌異
 北迴
 南迴
 併排
@@ -104,3 +105,13 @@
 採邑
 嚮日
 佔城
+名錶
+錶面
+彆腳
+併力
+併列
+豐富多採
+採採
+尼採
+辛醜
+整齣