From 5a5e44e0af23f41bd1a2f602420e0593e338be16 Mon Sep 17 00:00:00 2001 From: Shinjiman Date: Sun, 3 Aug 2008 10:33:32 +0000 Subject: [PATCH] Update the Chinese conversion tables Last minute changes for the release branch 1.13 --- includes/ZhConversion.php | 122 ++----------------- includes/zhtable/simpphrases.manual | 1 + includes/zhtable/trad2simp.manual | 3 +- includes/zhtable/trad2simp_supp_unset.manual | 1 - includes/zhtable/tradphrases.manual | 2 +- includes/zhtable/tradphrases_exclude.manual | 1 + 6 files changed, 16 insertions(+), 114 deletions(-) diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 7a934cc346..e97b343aeb 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -4583,6 +4583,7 @@ $zh2Hant = array( "村里" => "村裡", "束发" => "束髮", "杯干" => "杯乾", +"杰特" => "杰特", "东岳" => "東嶽", "东冲西突" => "東衝西突", "东游" => "東遊", @@ -6224,7 +6225,7 @@ $zh2Hant = array( "游憩" => "遊憩", "游戏" => "遊戲", "游手好闲" => "遊手好閑", -"游手好閒" => "遊手好閒", +"游手好闲" => "遊手好閒", "游星" => "遊星", "游乐" => "遊樂", "游标卡尺" => "遊標卡尺", @@ -6453,9 +6454,9 @@ $zh2Hant = array( "开药" => "開藥", "开辟" => "開闢", "开哄" => "開鬨", -"閒情逸致" => "閒情逸緻", -"閒荡" => "閒蕩", -"閒游" => "閒遊", +"闲情逸致" => "閒情逸緻", +"闲荡" => "閒蕩", +"闲游" => "閒遊", "间不容发" => "間不容髮", "闵采尔" => "閔採爾", "合府" => "閤府", @@ -6642,7 +6643,6 @@ $zh2Hant = array( "余存" => "餘存", "余孽" => "餘孽", "余巾" => "餘巾", -"余年" => "餘年", "余式定理" => "餘式定理", "余弦" => "餘弦", "余思" => "餘思", @@ -6696,7 +6696,7 @@ $zh2Hant = array( "余酲" => "餘酲", "余钱" => "餘錢", "余闰" => "餘閏", -"余閒" => "餘閒", +"余闲" => "餘閒", "余震" => "餘震", "余音" => "餘音", "余韵" => "餘韻", @@ -7088,7 +7088,7 @@ $zh2Hant = array( ); $zh2Hans = array( -"餘"=>"馀", +"餘"=>"余", "瀋"=>"沈", "畫"=>"划", "鍾"=>"钟", @@ -9280,6 +9280,7 @@ $zh2Hans = array( "閎"=>"闳", "閏"=>"闰", "閑"=>"闲", +"閒"=>"闲", "間"=>"间", "閔"=>"闵", "閘"=>"闸", @@ -9475,6 +9476,7 @@ $zh2Hans = array( "餓"=>"饿", "餕"=>"馂", "餖"=>"饾", +"餘"=>"余", "餚"=>"肴", "餛"=>"馄", "餜"=>"馃", @@ -9847,99 +9849,19 @@ $zh2Hans = array( "龜"=>"龟", "一畫" => "一画", -"萬餘" => "万余", "三聯畫" => "三联画", "上畫" => "上画", "專著" => "专著", -"業餘" => "业余", -"之餘" => "之余", "書畫" => "书画", "乾坤 " => "乾坤 ", "乾隆" => "乾隆", -"餘 " => "余 ", -"餘下" => "余下", -"餘人" => "余人", -"餘值" => "余值", -"餘元" => "余元", -"餘光中" => "余光中", -"餘黨" => "余党", -"餘興" => "余兴", -"餘函數" => "余函数", -"餘切" => "余切", -"餘利" => "余利", -"餘剩 " => "余剩 ", -"餘割" => "余割", -"餘力" => "余力", -"餘勇" => "余勇", -"餘味" => "余味", -"餘因子" => "余因子", -"餘地" => "余地", -"餘外" => "余外", -"餘天" => "余天", -"餘姚" => "余姚", -"餘威" => "余威", -"餘存" => "余存", -"餘孽" => "余孽", -"餘安安" => "余安安", -"餘家" => "余家", -"餘干" => "余干", -"餘年" => "余年", -"餘慶" => "余庆", -"餘弦" => "余弦", -"餘悸" => "余悸", -"餘數" => "余数", -"餘料" => "余料", -"餘暉" => "余晖", -"餘暇" => "余暇", -"餘杭" => "余杭", -"餘桃" => "余桃", -"餘款" => "余款", -"餘步" => "余步", -"餘毒" => "余毒", -"餘氯" => "余氯", -"餘江" => "余江", -"餘瀝" => "余沥", -"餘波" => "余波", -"餘溫" => "余温", -"餘燼" => "余烬", -"餘熱" => "余热", -"餘犯" => "余犯", -"餘生" => "余生", -"餘電" => "余电", -"餘類推" => "余类推", -"餘糧" => "余粮", -"餘緯度" => "余纬度", -"餘缺" => "余缺", -"餘者" => "余者", -"餘蓄" => "余蓄", -"餘裕 " => "余裕 ", -"餘角" => "余角", -"餘言" => "余言", -"餘輝" => "余辉", -"餘部 " => "余部 ", -"餘量 " => "余量 ", -"餘錢" => "余钱", -"餘閑" => "余闲", -"餘震" => "余震", -"餘音" => "余音", -"餘韻" => "余韵", -"餘項" => "余项", -"餘額" => "余额", -"餘風" => "余风", "作畫" => "作画", -"借餘" => "借余", "入畫" => "入画", -"公餘" => "公余", -"其餘" => "其余", -"冗餘" => "冗余", "寫生畫" => "写生画", -"凈餘" => "净余", "幾畫" => "几画", "刻畫" => "刻画", -"剩餘" => "剩余", "動畫" => "动画", "勾畫" => "勾画", -"千餘" => "千余", "卓著" => "卓著", "單色畫" => "单色画", "賣畫" => "卖画", @@ -9953,21 +9875,14 @@ $zh2Hans = array( "合著" => "合著", "名畫" => "名画", "名著" => "名著", -"唾餘" => "唾余", "國畫" => "国画", "圖畫" => "图画", "土著" => "土著", "壁畫" => "壁画", -"多餘" => "多余", -"大餘" => "大余", "奇畫" => "奇画", "如畫" => "如画", "字畫" => "字画", "宣傳畫" => "宣传画", -"寬餘" => "宽余", -"富餘" => "富余", -"尚餘" => "尚余", -"工餘" => "工余", "巨著" => "巨著", "年畫" => "年画", "幽默畫" => "幽默画", @@ -9975,7 +9890,6 @@ $zh2Hans = array( "彩畫" => "彩画", "所畫" => "所画", "扉畫" => "扉画", -"扶餘" => "扶余", "拙著" => "拙著", "指畫" => "指画", "描畫" => "描画", @@ -9983,7 +9897,6 @@ $zh2Hans = array( "撰著" => "撰著", "擘畫 " => "擘画 ", "教畫" => "教画", -"新餘" => "新余", "於乎" => "於乎", "於夫羅" => "於夫罗", "於姓" => "於姓", @@ -9993,14 +9906,11 @@ $zh2Hans = array( "於潛縣" => "於潜县", "於菟" => "於菟", "旋乾轉坤" => "旋乾转坤", -"無餘" => "无余", "春畫" => "春画", "昭著" => "昭著", -"有餘" => "有余", "機械畫" => "机械画", "柳詒徵" => "柳诒徵", "樊於期" => "樊於期", -"殘餘" => "残余", "比畫 " => "比画 ", "水鹼" => "水碱", "水粉畫" => "水粉画", @@ -10008,14 +9918,12 @@ $zh2Hans = array( "洋鹼" => "洋碱", "海景畫" => "海景画", "塗畫" => "涂画", -"溢餘" => "溢余", "漫畫" => "漫画", "炭畫" => "炭画", "點畫" => "点画", "煙鹼" => "烟碱", "燒鹼" => "烧碱", "版畫" => "版画", -"由餘" => "由余", "畫 " => "画 ", "畫一" => "画一", "畫上" => "画上", @@ -10083,8 +9991,6 @@ $zh2Hans = array( "畫集 " => "画集 ", "畫面" => "画面", "畫頁" => "画页", -"百餘" => "百余", -"盈餘" => "盈余", "鹽鹼" => "盐碱", "硝鹼" => "硝碱", "鹼 " => "碱 ", @@ -10097,22 +10003,18 @@ $zh2Hans = array( "鹼熔" => "碱熔", "鹼類" => "碱类", "磁畫" => "磁画", -"空餘" => "空余", "筆畫" => "笔画", "策畫" => "策画", "純鹼" => "纯碱", "組畫" => "组画", "細密畫" => "细密画", -"結餘" => "结余", "繪畫" => "绘画", "絹畫" => "绢画", -"編餘" => "编余", "編著" => "编著", "耐鹼" => "耐碱", "肉鹼" => "肉碱", "肖像畫" => "肖像画", "膠畫" => "胶画", -"節餘" => "节余", "茶鹼" => "茶碱", "著書" => "著书", "著作" => "著作", @@ -10120,16 +10022,12 @@ $zh2Hans = array( "著錄" => "著录", "著稱" => "著称", "著述" => "著述", -"血餘炭" => "血余炭", "裸體畫" => "裸体画", "西洋畫" => "西洋画", "西畫" => "西画", "論著" => "论著", "譯著" => "译著", -"課餘" => "课余", "貼畫" => "贴画", -"贏餘" => "赢余", -"趙福餘" => "赵福余", "返鹼" => "返碱", "連環畫" => "连环画", "透視畫" => "透视画", @@ -10142,6 +10040,8 @@ $zh2Hans = array( "雕畫" => "雕画", "靜物畫" => "静物画", "風景畫" => "风景画", +"餘 " => "馀 ", +"餘年" => "馀年", "魏徵" => "魏徵", "鯰 " => "鲶 ", "鯰魚" => "鲶鱼", diff --git a/includes/zhtable/simpphrases.manual b/includes/zhtable/simpphrases.manual index b2153d8f2b..de2f88c5fc 100644 --- a/includes/zhtable/simpphrases.manual +++ b/includes/zhtable/simpphrases.manual @@ -34,3 +34,4 @@ 樊於期 於菟 於潜县 +馀年 diff --git a/includes/zhtable/trad2simp.manual b/includes/zhtable/trad2simp.manual index 00adb7f5a8..51c34ed86d 100644 --- a/includes/zhtable/trad2simp.manual +++ b/includes/zhtable/trad2simp.manual @@ -18,4 +18,5 @@ U+05bc0寀|U+091c7采| U+08518蔘|U+053c2参| U+06b05欅|U+06989榉| U+07343獃|U+05446呆| -U+09918餘|U+09980馀|U+04f59余| +U+09918餘|U+04f59余|U+09980馀| +U+09592閒|U+095f2闲| diff --git a/includes/zhtable/trad2simp_supp_unset.manual b/includes/zhtable/trad2simp_supp_unset.manual index 7179f1ea9a..e69de29bb2 100644 --- a/includes/zhtable/trad2simp_supp_unset.manual +++ b/includes/zhtable/trad2simp_supp_unset.manual @@ -1 +0,0 @@ -=>"余" diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual index 2705e87464..c568d2706f 100644 --- a/includes/zhtable/tradphrases.manual +++ b/includes/zhtable/tradphrases.manual @@ -1196,6 +1196,7 @@ 楨幹 據榦而窺井底 井榦摧敗 +杰特 李連杰 周杰倫 稜鏡 @@ -1623,5 +1624,4 @@ 多餘 剩餘 餘生 -餘年 有餘 diff --git a/includes/zhtable/tradphrases_exclude.manual b/includes/zhtable/tradphrases_exclude.manual index ddfb8a2da6..70e66c716d 100644 --- a/includes/zhtable/tradphrases_exclude.manual +++ b/includes/zhtable/tradphrases_exclude.manual @@ -156,3 +156,4 @@ 舊莊 介係詞 介繫詞 +餘年 -- 2.20.1