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 1d2e714..1d44468 100644 (file)
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -488,7 +488,6 @@ $zh2Hant = array(
 "帻"=>"幘",
 "帼"=>"幗",
 "幂"=>"冪",
-"庄"=>"莊",
 "庆"=>"慶",
 "庐"=>"廬",
 "庑"=>"廡",
@@ -508,7 +507,6 @@ $zh2Hant = array(
 "弹"=>"彈",
 "强"=>"強",
 "归"=>"歸",
-"彝"=>"彞",
 "彦"=>"彥",
 "彻"=>"徹",
 "径"=>"徑",
@@ -858,7 +856,6 @@ $zh2Hant = array(
 "灭"=>"滅",
 "灯"=>"燈",
 "灵"=>"靈",
-"灶"=>"竈",
 "灾"=>"災",
 "灿"=>"燦",
 "炀"=>"煬",
@@ -2567,6 +2564,7 @@ $zh2Hant = array(
 "七扎" =>    "七紮",
 "七只" =>    "七隻",
 "万俟" =>    "万俟",
+"万旗" =>    "万旗",
 "三元里" =>         "三元裡",
 "三天后" =>         "三天後",
 "三棱锥" =>         "三稜錐",
@@ -2892,6 +2890,7 @@ $zh2Hant = array(
 "佛罗棱萨" =>      "佛羅稜薩",
 "作奸犯科" =>      "作姦犯科",
 "作准" =>    "作準",
+"作庄" =>    "作莊",
 "你才子发昏" =>   "你纔子發昏",
 "并一不二" =>      "併一不二",
 "并入" =>    "併入",
@@ -2951,6 +2950,7 @@ $zh2Hant = array(
 "偎干就湿" =>      "偎乾就濕",
 "偏后" =>    "偏後",
 "偏于" =>    "偏於",
+"做庄" =>    "做莊",
 "停停当当" =>      "停停當當",
 "停征" =>    "停徵",
 "停制" =>    "停製",
@@ -3084,7 +3084,7 @@ $zh2Hant = array(
 "冥蒙" =>    "冥濛",
 "冬山庄" =>         "冬山庄",
 "冶游" =>    "冶遊",
-"冷面相待" =>      "冷面相待",
+"冷面相" =>         "冷面相",
 "冷面" =>    "冷麵",
 "凌蒙初" =>         "凌濛初",
 "凌藉" =>    "凌藉",
@@ -3531,6 +3531,7 @@ $zh2Hant = array(
 "宗周钟" =>         "宗周鐘",
 "官地为采" =>      "官地為寀",
 "官历" =>    "官曆",
+"官庄" =>    "官莊",
 "定于" =>    "定於",
 "定准" =>    "定準",
 "定制" =>    "定製",
@@ -3540,6 +3541,7 @@ $zh2Hant = array(
 "宫里" =>    "宮裡",
 "宴游" =>    "宴遊",
 "家仆" =>    "家僕",
+"家庄" =>    "家莊",
 "家里" =>    "家裡",
 "家丑" =>    "家醜",
 "容后说明" =>      "容後說明",
@@ -3597,6 +3599,7 @@ $zh2Hant = array(
 "山岳" =>    "山嶽",
 "山后" =>    "山後",
 "山梁" =>    "山樑",
+"山庄" =>    "山莊",
 "山药" =>    "山藥",
 "山里" =>    "山裡",
 "峰回" =>    "峰迴",
@@ -3692,6 +3695,7 @@ $zh2Hant = array(
 "府后" =>    "府後",
 "座钟" =>    "座鐘",
 "康采恩" =>         "康採恩",
+"康庄" =>    "康莊",
 "庙里" =>    "廟裡",
 "广舍" =>    "廣捨",
 "延后" =>    "延後",
@@ -3789,6 +3793,7 @@ $zh2Hant = array(
 "后市" =>    "後市",
 "后年" =>    "後年",
 "后几" =>    "後幾",
+"后庄" =>    "後庄",
 "后序" =>    "後序",
 "后座" =>    "後座",
 "后悔" =>    "後悔",
@@ -4320,6 +4325,7 @@ $zh2Hant = array(
 "新历" =>    "新曆",
 "新历史" =>         "新歷史",
 "新扎" =>    "新紮",
+"新庄" =>    "新莊",
 "斲雕为朴" =>      "斲雕為樸",
 "断后" =>    "斷後",
 "断发" =>    "斷髮",
@@ -4441,6 +4447,7 @@ $zh2Hant = array(
 "术赤" =>    "朮赤",
 "朱理安历" =>      "朱理安曆",
 "李连杰" =>         "李連杰",
+"村庄" =>    "村莊",
 "村落发" =>         "村落發",
 "村里" =>    "村裡",
 "束发" =>    "束髮",
@@ -4482,11 +4489,13 @@ $zh2Hant = array(
 "弃舍" =>    "棄捨",
 "棉制" =>    "棉製",
 "棒子面" =>         "棒子麵",
+"枣庄" =>    "棗莊",
 "栋梁" =>    "棟樑",
 "棫朴" =>    "棫樸",
 "栖于" =>    "棲於",
 "植发" =>    "植髮",
 "椰枣干" =>         "椰棗乾",
+"楚庄王" =>         "楚莊王",
 "桢干" =>    "楨幹",
 "榨干" =>    "榨乾",
 "乐意于" =>         "樂意於",
@@ -4870,6 +4879,7 @@ $zh2Hant = array(
 "献丑" =>    "獻醜",
 "率团参加" =>      "率團參加",
 "玉历" =>    "玉曆",
+"王庄" =>    "王莊",
 "班里" =>    "班裡",
 "理发" =>    "理髮",
 "琴钟" =>    "琴鐘",
@@ -4890,6 +4900,7 @@ $zh2Hant = array(
 "用药" =>    "用藥",
 "甩发" =>    "甩髮",
 "田谷" =>    "田穀",
+"田庄" =>    "田莊",
 "田里" =>    "田裡",
 "由于" =>    "由於",
 "男仆" =>    "男僕",
@@ -4938,6 +4949,7 @@ $zh2Hant = array(
 "百只" =>    "百隻",
 "皇历" =>    "皇曆",
 "皇极历" =>         "皇極曆",
+"皇庄" =>    "皇莊",
 "皓发" =>    "皓髮",
 "皮里阳秋" =>      "皮裏陽秋",
 "皮里春秋" =>      "皮裡春秋",
@@ -5102,6 +5114,7 @@ $zh2Hant = array(
 "站干岸儿" =>      "站乾岸兒",
 "竟于" =>    "竟於",
 "童仆" =>    "童僕",
+"端庄" =>    "端莊",
 "竞斗" =>    "競鬥",
 "竹签" =>    "竹籤",
 "笆斗" =>    "笆鬥",
@@ -5216,6 +5229,7 @@ $zh2Hant = array(
 "綑扎" =>    "綑紮",
 "绿发" =>    "綠髮",
 "绿霉素" =>         "綠黴素",
+"绸缎庄" =>         "綢緞莊",
 "维系" =>    "維繫",
 "绾发" =>    "綰髮",
 "网里" =>    "網裡",
@@ -5295,6 +5309,7 @@ $zh2Hant = array(
 "群丑" =>    "群醜",
 "义仆" =>    "義僕",
 "义形于色" =>      "義形於色",
+"义庄" =>    "義莊",
 "习于" =>    "習於",
 "翕辟" =>    "翕闢",
 "翱游" =>    "翱遊",
@@ -5306,6 +5321,7 @@ $zh2Hant = array(
 "老干部" =>         "老幹部",
 "老蒙" =>    "老懞",
 "老于世故" =>      "老於世故",
+"老庄" =>    "老莊",
 "老姜" =>    "老薑",
 "老板" =>    "老闆",
 "考后" =>    "考後",
@@ -5398,11 +5414,25 @@ $zh2Hant = array(
 "苹萦" =>    "苹縈",
 "茵藉" =>    "茵藉",
 "茶几" =>    "茶几",
+"茶庄" =>    "茶莊",
 "茶面" =>    "茶麵",
 "草丛里" =>         "草叢裡",
 "草药" =>    "草藥",
 "荷花淀" =>         "荷花澱",
+"庄主" =>    "莊主",
+"庄周" =>    "莊周",
+"庄员" =>    "莊員",
+"庄严" =>    "莊嚴",
+"庄园" =>    "莊園",
+"庄子" =>    "莊子",
+"庄家" =>    "莊家",
+"庄户" =>    "莊戶",
+"庄敬" =>    "莊敬",
+"庄田" =>    "莊田",
+"庄稼" =>    "莊稼",
 "庄里" =>    "莊裡",
+"庄重" =>    "莊重",
+"庄院" =>    "莊院",
 "茎干" =>    "莖幹",
 "莽荡" =>    "莽蕩",
 "菌丝体" =>         "菌絲體",
@@ -5623,6 +5653,7 @@ $zh2Hant = array(
 "裁制" =>    "裁製",
 "里勾外连" =>      "裏勾外連",
 "里手" =>    "裏手",
+"里海" =>    "裏海",
 "里面" =>    "裏面",
 "补药" =>    "補藥",
 "补血药" =>         "補血藥",
@@ -5635,7 +5666,6 @@ $zh2Hant = array(
 "里带" =>    "裡帶",
 "里弦" =>    "裡弦",
 "里应外合" =>      "裡應外合",
-"里海" =>    "裡海",
 "里脊" =>    "裡脊",
 "里衣" =>    "裡衣",
 "里通外国" =>      "裡通外國",
@@ -5868,6 +5898,7 @@ $zh2Hant = array(
 "起哄" =>    "起鬨",
 "赶制" =>    "趕製",
 "赶面棍" =>         "趕麵棍",
+"赵庄" =>    "趙莊",
 "趋于" =>    "趨於",
 "趱干" =>    "趲幹",
 "跌荡" =>    "跌蕩",
@@ -5903,6 +5934,7 @@ $zh2Hant = array(
 "辫发" =>    "辮髮",
 "农历" =>    "農曆",
 "农民历" =>         "農民曆",
+"农庄" =>    "農莊",
 "农药" =>    "農藥",
 "迂回" =>    "迂迴",
 "近似于" =>         "近似於",
@@ -5956,6 +5988,7 @@ $zh2Hant = array(
 "连采" =>    "連採",
 "连于" =>    "連於",
 "连系" =>    "連繫",
+"连庄" =>    "連莊",
 "周游" =>    "週遊",
 "进占" =>    "進佔",
 "逼并" =>    "逼併",
@@ -6129,6 +6162,7 @@ $zh2Hant = array(
 "录着" =>    "錄著",
 "录制" =>    "錄製",
 "钱谷" =>    "錢穀",
+"钱庄" =>    "錢莊",
 "锦心绣口" =>      "錦心繡口",
 "锦绣花园" =>      "錦綉花園",
 "锦绣" =>    "錦繡",
@@ -6347,6 +6381,7 @@ $zh2Hant = array(
 "饭后" =>    "飯後",
 "饭后钟" =>         "飯後鐘",
 "饭团" =>    "飯糰",
+"饭庄" =>    "飯莊",
 "饲喂" =>    "飼餵",
 "饼干" =>    "餅乾",
 "馄饨面" =>         "餛飩麵",

diff --git a/includes/zhtable/simp2trad.manual b/includes/zhtable/simp2trad.manual
index 48a52d1..ae0503f 100644 (file)
--- a/includes/zhtable/simp2trad.manual
+++ b/includes/zhtable/simp2trad.manual
@@ -199,3 +199,4 @@ U+05742坂|U+05742坂|U+0962a阪|
 U+096d5雕|U+096d5雕|U+09d70鵰|
 U+05398厘|U+05398厘|U+091d0釐|
 U+06881梁|U+06881梁|U+06a11樑|
+U+05e84庄|U+05e84庄|U+0838a莊|

diff --git a/includes/zhtable/simp2trad_noconvert.manual b/includes/zhtable/simp2trad_noconvert.manual
index d05bc83..30c24db 100644 (file)
--- a/includes/zhtable/simp2trad_noconvert.manual
+++ b/includes/zhtable/simp2trad_noconvert.manual
@@ -1 +1,3 @@
 著
+竈
+彞

diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index aed3367..527975f 100644 (file)
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -393,6 +393,7 @@
 提摩太後書
 當家纔知柴米價
 剛纔一載
+裏海
 骨頭裡掙出來的錢纔做得肉
 恰纔
 遠縣纔至
@@ -888,7 +889,7 @@
 意大利麵
 湯下麵
 茶麵
-冷面相待
+冷面相
 糞穢衊面
 湟潦生苹
 食野之苹
@@ -1102,6 +1103,7 @@
 种放
 种師道
 种師中
+後庄
 舊庄
 正官庄
 龜山庄
@@ -1226,6 +1228,7 @@
 輓曲
 敬輓
 万俟
+万旗
 鬚鯨
 鬚鯊
 兇手

diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual
index 122b0a9..16715bf 100644 (file)
--- a/includes/zhtable/tradphrases_exclude.manual
+++ b/includes/zhtable/tradphrases_exclude.manual
@@ -60,6 +60,7 @@
 克裡
 纍纍
 華裡
+裡海
 瞭解
 明瞭
 發黴
@@ -145,3 +146,4 @@
 後樑
 石樑
 木樑
+舊莊