Update the Chinese conversion tables

Last minute changes for the release branch 1.13

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 4d60854..252e73e 100644 (file)
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -2589,6 +2589,7 @@ $zh2Hant = array(
 "不寒而栗" =>      "不寒而慄",
 "不屑于" =>         "不屑於",
 "不采" =>    "不採",
+"不断发" =>         "不斷發",
 "不准" =>    "不準",
 "不为牛后" =>      "不為牛後",
 "不知就里" =>      "不知就裡",
@@ -3168,6 +3169,7 @@ $zh2Hant = array(
 "反朴" =>    "反樸",
 "反冲" =>    "反衝",
 "反复" =>    "反複",
+"反复制" =>         "反複製",
 "取信于" =>         "取信於",
 "取舍" =>    "取捨",
 "取材于" =>         "取材於",
@@ -3275,7 +3277,6 @@ $zh2Hant = array(
 "向应" =>    "嚮應",
 "向迩" =>    "嚮邇",
 "严丝合缝" =>      "嚴絲合縫",
-"严复" =>    "嚴複",
 "嚼谷" =>    "嚼穀",
 "囉囉苏苏" =>      "囉囉囌囌",
 "囉苏" =>    "囉囌",
@@ -3479,14 +3480,13 @@ $zh2Hant = array(
 "对折" =>    "對摺",
 "对于" =>    "對於",
 "对准" =>    "對準",
+"对华发动" =>      "對華發動",
 "对表" =>    "對錶",
 "导游" =>    "導遊",
 "小仆" =>    "小僕",
 "小伙子" =>         "小夥子",
 "小于" =>    "小於",
 "小米面" =>         "小米麵",
-"小丑" =>    "小醜",
-"小丑跳樑" =>      "小醜跳樑",
 "小只" =>    "小隻",
 "少采" =>    "少採",
 "少于" =>    "少於",
@@ -3855,7 +3855,6 @@ $zh2Hant = array(
 "急冲而下" =>      "急衝而下",
 "性征" =>    "性徵",
 "性欲" =>    "性慾",
-"怨在小丑" =>      "怨在小醜",
 "怪里怪气" =>      "怪裡怪氣",
 "怫郁" =>    "怫鬱",
 "息谷" =>    "息穀",
@@ -4187,7 +4186,6 @@ $zh2Hant = array(
 "敢于" =>    "敢於",
 "散伙" =>    "散夥",
 "散荡" =>    "散蕩",
-"散发" =>    "散髮",
 "敦朴" =>    "敦樸",
 "敬挽" =>    "敬輓",
 "敲钟" =>    "敲鐘",
@@ -4324,6 +4322,7 @@ $zh2Hant = array(
 "术赤" =>    "朮赤",
 "朱理安历" =>      "朱理安曆",
 "李连杰" =>         "李連杰",
+"村落发" =>         "村落發",
 "村里" =>    "村裡",
 "束发" =>    "束髮",
 "东岳" =>    "東嶽",
@@ -4757,6 +4756,7 @@ $zh2Hant = array(
 "男用表" =>         "男用錶",
 "留后" =>    "留後",
 "留发" =>    "留髮",
+"毕生发展" =>      "畢生發展",
 "划着" =>    "畫著",
 "异于" =>    "異於",
 "当一天和尚撞一天钟" =>       "當一天和尚撞一天鐘",
@@ -4971,6 +4971,7 @@ $zh2Hant = array(
 "筑西" =>    "筑西",
 "筑邦" =>    "筑邦",
 "筑阳" =>    "筑陽",
+"答复" =>    "答覆",
 "策划" =>    "策劃",
 "筵几" =>    "筵几",
 "箕斗" =>    "箕鬥",
@@ -5160,6 +5161,7 @@ $zh2Hant = array(
 "耳后" =>    "耳後",
 "耽于" =>    "耽於",
 "耿耿于怀" =>      "耿耿於懷",
+"聊斋志异" =>      "聊齋志異",
 "联系" =>    "聯係",
 "联于" =>    "聯於",
 "联系" =>    "聯繫",
@@ -5396,6 +5398,7 @@ $zh2Hant = array(
 "处于" =>    "處於",
 "号志" =>    "號誌",
 "虫部" =>    "虫部",
+"蛇发女妖" =>      "蛇髮女妖",
 "蛔虫药" =>         "蛔蟲藥",
 "蜂涌" =>    "蜂湧",
 "蛮干" =>    "蠻幹",
@@ -5455,7 +5458,6 @@ $zh2Hant = array(
 "被里" =>    "被裡",
 "被复" =>    "被複",
 "被复着" =>         "被覆著",
-"被发" =>    "被髮",
 "裁并" =>    "裁併",
 "裁制" =>    "裁製",
 "里勾外连" =>      "裏勾外連",
@@ -5511,6 +5513,7 @@ $zh2Hant = array(
 "复以百万" =>      "複以百萬",
 "复位" =>    "複位",
 "复信" =>    "複信",
+"复元音" =>         "複元音",
 "复分数" =>         "複分數",
 "复分析" =>         "複分析",
 "复列" =>    "複列",
@@ -5538,6 +5541,7 @@ $zh2Hant = array(
 "复比" =>    "複比",
 "复决" =>    "複決",
 "复活" =>    "複活",
+"复流" =>    "複流",
 "复测" =>    "複測",
 "复亩珍" =>         "複畝珍",
 "复发" =>    "複發",
@@ -5557,6 +5561,7 @@ $zh2Hant = array(
 "复议" =>    "複議",
 "复变函数" =>      "複變函數",
 "复赛" =>    "複賽",
+"复辅音" =>         "複輔音",
 "复述" =>    "複述",
 "复选" =>    "複選",
 "复钱" =>    "複錢",
@@ -5589,6 +5594,7 @@ $zh2Hant = array(
 "规划" =>    "規劃",
 "规范" =>    "規範",
 "观采" =>    "觀採",
+"角落发" =>         "角落發",
 "角落里" =>         "角落裡",
 "解雇" =>    "解僱",
 "解痛药" =>         "解痛藥",
@@ -5704,7 +5710,6 @@ $zh2Hant = array(
 "跌荡" =>    "跌蕩",
 "跟前跟后" =>      "跟前跟後",
 "路签" =>    "路籤",
-"跳樑小丑" =>      "跳樑小醜",
 "跳荡" =>    "跳蕩",
 "跳表" =>    "跳錶",
 "躁郁" =>    "躁鬱",
@@ -5863,6 +5868,7 @@ $zh2Hant = array(
 "郁朴" =>    "郁樸",
 "郊游" =>    "郊遊",
 "郘钟" =>    "郘鐘",
+"部落发" =>         "部落發",
 "乡愿" =>    "鄉愿",
 "乡里" =>    "鄉裡",
 "郑凯云" =>         "鄭凱云",
@@ -6253,7 +6259,6 @@ $zh2Hant = array(
 "发癣" =>    "髮癬",
 "发短心长" =>      "髮短心長",
 "发禁" =>    "髮禁",
-"发端" =>    "髮端",
 "发笺" =>    "髮箋",
 "发纱" =>    "髮紗",
 "发结" =>    "髮結",
@@ -6524,6 +6529,10 @@ $zh2Hant = array(
 "筑後" => "筑後",
 "采石磯" => "采石磯",
 "采石之戰" => "采石之戰",
+"張三丰" => "張三丰",
+"丰韻" => "丰韻",
+"丰儀" => "丰儀",
+"丰標不凡" => "丰標不凡",
 );
 
 $zh2Hans = array(
@@ -7204,6 +7213,7 @@ $zh2Hans = array(
 "櫸"=>"榉",
 "櫻"=>"樱",
 "欄"=>"栏",
+"欅"=>"榉",
 "權"=>"权",
 "欏"=>"椤",
 "欒"=>"栾",
@@ -9512,6 +9522,8 @@ $zh2TW = array(
 "行凶后" => "行凶後",
 "买凶" => "買凶",
 "追凶" => "追凶",
+"复苏" => "復甦",
+"復蘇" => "復甦",
 "缺省" => "預設",
 "串行" => "串列",
 "以太网" => "乙太網",

diff --git a/includes/zhtable/toTW.manual b/includes/zhtable/toTW.manual
index b927c42..a8f0c0b 100644 (file)
--- a/includes/zhtable/toTW.manual
+++ b/includes/zhtable/toTW.manual
@@ -17,6 +17,8 @@
 行凶后      行凶後
 买凶 買凶
 追凶 追凶
+复苏 復甦
+復蘇 復甦
 缺省 預設
 串行 串列
 以太网      乙太網

diff --git a/includes/zhtable/toTrad.manual b/includes/zhtable/toTrad.manual
index 277d4ee..8c0ed09 100644 (file)
--- a/includes/zhtable/toTrad.manual
+++ b/includes/zhtable/toTrad.manual
@@ -25,3 +25,7 @@
 筑後 筑後
 采石磯      采石磯
 采石之戰   采石之戰
+張三丰      張三丰
+丰韻 丰韻
+丰儀 丰儀
+丰標不凡   丰標不凡

diff --git a/includes/zhtable/trad2simp.manual b/includes/zhtable/trad2simp.manual
index da7e5c7..c33afd5 100644 (file)
--- a/includes/zhtable/trad2simp.manual
+++ b/includes/zhtable/trad2simp.manual
@@ -16,3 +16,4 @@ U+06de9淩|U+051cc凌|
 U+095e2闢|U+08f9f辟|
 U+05bc0寀|U+091c7采|
 U+08518蔘|U+053c2参|
+U+06b05欅|U+06989榉|

diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 7656773..5b82512 100644 (file)
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -381,11 +381,7 @@
 不嫌母醜
 一爭兩醜
 惡直醜正
-小醜跳樑
-跳樑小醜
-怨在小醜
 么麼小丑
-小醜跳樑
 齣電影
 齣卡通
 齣戲
@@ -502,7 +498,12 @@
 張三丰
 復始
 複分析
+複輔音
+複元音
+複流
+反複製
 顛覆
+答覆
 覆沒
 覆亡
 覆水難收
@@ -1169,3 +1170,11 @@
 采石磯
 采石之戰
 采石之役
+聊齋志異
+不斷發
+部落發
+角落發
+村落發
+蛇髮女妖
+畢生發展
+對華發動

diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual
index eee93c8..afbc50b 100644 (file)
--- a/includes/zhtable/tradphrases_exclude.manual
+++ b/includes/zhtable/tradphrases_exclude.manual
@@ -28,8 +28,11 @@
 弔臂
 弔銷
 形影相弔
+被髮
+散髮
 長髮
 髮毛
+髮端
 周而複始
 答複
 複興
@@ -113,5 +116,7 @@
 豐富多採
 採採
 尼採
+小醜
 辛醜
 整齣
+嚴複