[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Chinese Conversion Table Update 2015-6 .. Chinese Conversion Table Update 2015-6 Update the Chinese conversion table routinely to fix bugs reported from https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82 . It is only data changes and only works for Chinese WikiProjects. Change-Id: Ibf6d776d07a611a2afcb2c6c984074c39c8c0d70 --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 8 files changed, 294 insertions(+), 812 deletions(-) Approvals: LNDDYL: Looks good to me, but someone else must approve Liangent: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 87cc48e..31806b7 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1370,6 +1370,7 @@ '脶' => '腡', '脸' => '臉', '腊' => '臘', +'腌' => '醃', '腘' => '膕', '腭' => '齶', '腻' => '膩', @@ -3355,6 +3356,7 @@ '干奴才' => '乾奴才', '干妹' => '乾妹', '干姊' => '乾姊', +'干姐' => '乾姐', '干娘' => '乾娘', '干妈' => '乾媽', '干子' => '乾子', @@ -3416,6 +3418,7 @@ '干癣' => '乾癬', '干瘾' => '乾癮', '干白儿' => '乾白兒', +'干白葡萄酒' => '乾白葡萄酒', '干的' => '乾的', '干眼' => '乾眼', '干瞪眼' => '乾瞪眼', @@ -3426,6 +3429,7 @@ '干篾片' => '乾篾片', '干粉' => '乾粉', '干粮' => '乾糧', +'干红葡萄酒' => '乾紅葡萄酒', '干结' => '乾結', '干丝' => '乾絲', '干纲' => '乾綱', @@ -3654,7 +3658,6 @@ '于贈' => '于贈', '于赠' => '于贈', '于越' => '于越', -'于军' => '于軍', '于軍' => '于軍', '于道泉' => '于道泉', '于远伟' => '于遠偉', @@ -3677,9 +3680,8 @@ '于韦斯屈莱' => '于韋斯屈萊', '于風政' => '于風政', '于风政' => '于風政', +'于飛' => '于飛', '于飞' => '于飛', -'于飛島' => '于飛島', -'于飞岛' => '于飛島', '于余曲折' => '于餘曲折', '于鬯' => '于鬯', '于魁智' => '于魁智', @@ -3731,6 +3733,7 @@ '人数里' => '人數裡', '人物志' => '人物誌', '人生天里' => '人生天里', +'人发指' => '人髮指', '什锦面' => '什錦麵', '仇仇' => '仇讎', '介胄' => '介冑', @@ -3744,7 +3747,6 @@ '代理发行' => '代理發行', '代码表' => '代碼表', '代表' => '代表', -'令人发指' => '令人髮指', '以自制' => '以自制', '仲裁制' => '仲裁制', '件钟' => '件鐘', @@ -3835,6 +3837,7 @@ '依托' => '依託', '侵并' => '侵併', '局促' => '侷促', +'便于' => '便於', '系数' => '係數', '系为' => '係為', '保险柜' => '保險柜', @@ -3844,6 +3847,7 @@ '修杰麟' => '修杰麟', '修胡刀' => '修鬍刀', '俯冲' => '俯衝', +'个月里' => '個月裡', '个里' => '個裡', '个钟' => '個鐘', '个钟表' => '個鐘錶', @@ -3854,7 +3858,6 @@ '候复' => '候覆', '倚闲' => '倚閑', '倛丑' => '倛醜', -'借听于聋' => '借聽於聾', '借鉴' => '借鑑', '倦游' => '倦遊', '假里' => '假裡', @@ -4066,8 +4069,8 @@ '分子钟' => '分子鐘', '分子云' => '分子雲', '分布于' => '分布於', -'分散于' => '分散於', '分钟' => '分鐘', +'分钟里' => '分鐘裡', '刑余' => '刑餘', '划一桨' => '划一槳', '划上' => '划上', @@ -4243,7 +4246,6 @@ '卵与石斗' => '卵與石鬥', '卷须' => '卷鬚', '厂部' => '厂部', -'厝薪于火' => '厝薪於火', '原子钟' => '原子鐘', '原钟' => '原鐘', '历物之意' => '厤物之意', @@ -4256,6 +4258,7 @@ '反复' => '反覆', '反覆' => '反覆', '取舍' => '取捨', +'取决于' => '取決於', '受雇' => '受僱', '受托' => '受託', '丛林里' => '叢林裡', @@ -4517,6 +4520,7 @@ '回游' => '回遊', '因于' => '因於', '困倦起来' => '困倦起來', +'困于' => '困於', '困兽之斗' => '困獸之鬥', '困兽犹斗' => '困獸猶鬥', '困斗' => '困鬥', @@ -4568,6 +4572,7 @@ '埃及历史' => '埃及歷史', '埃及艳后' => '埃及豔后', '埃荣冲' => '埃榮衝', +'城市里' => '城市裡', '城里' => '城裡', '埔子里' => '埔子里', '埔里社' => '埔裏社', @@ -4765,7 +4770,6 @@ '字汇' => '字彙', '字码表' => '字碼表', '字里行间' => '字裡行間', -'存十一于千百' => '存十一於千百', '存折' => '存摺', '存于' => '存於', '孛里海' => '孛里海', @@ -4811,10 +4815,10 @@ '实干' => '實幹', '实累累' => '實纍纍', '写字台' => '寫字檯', -'宽宽松松' => '寬寬鬆鬆', '宽于' => '寬於', '宽余' => '寬餘', '宽松' => '寬鬆', +'宽松松' => '寬鬆鬆', '寮采' => '寮寀', '寶山庄' => '寶山庄', '宝历' => '寶曆', @@ -4864,13 +4868,16 @@ '小型钟表面' => '小型鐘表面', '小型钟表' => '小型鐘錶', '小型钟面' => '小型鐘面', +'小时里' => '小時裡', '小米面' => '小米麵', '小只' => '小隻', '少采' => '少採', '就范' => '就範', '就里' => '就裡', '尸位素餐' => '尸位素餐', +'尸佼' => '尸佼', '尸利' => '尸利', +'尸子' => '尸子', '尸居余气' => '尸居餘氣', '尸弃佛' => '尸棄佛', '尸祝' => '尸祝', @@ -4900,7 +4907,7 @@ '山羊胡' => '山羊鬍', '山里有' => '山裡有', '山里的' => '山裡的', -'山谷道' => '山谷道', +'山谷' => '山谷', '山重水复' => '山重水複', '岫岩' => '岫巖', '岱岳' => '岱嶽', @@ -4945,7 +4952,7 @@ '已占算' => '已占算', '巴尔干' => '巴爾幹', '巷里' => '巷裡', -'市里' => '市裡', +'市里的' => '市裡的', '布谷' => '布穀', '布谷鸟' => '布穀鳥', '布谷鸟钟' => '布穀鳥鐘', @@ -4985,8 +4992,8 @@ '干了' => '幹了', '干事' => '幹事', '干些' => '幹些', -'干人' => '幹人', '干什么' => '幹什麼', +'干仗' => '幹仗', '干个' => '幹個', '干劲' => '幹勁', '干吏' => '幹吏', @@ -5025,8 +5032,7 @@ '干起来' => '幹起來', '干路' => '幹路', '干办' => '幹辦', -'干这一行' => '幹這一行', -'干这种事' => '幹這種事', +'干这' => '幹這', '干道' => '幹道', '干部' => '幹部', '干革命' => '幹革命', @@ -5344,6 +5350,7 @@ '忠于' => '忠於', '快快当当' => '快快當當', '快冲' => '快衝', +'怎么干' => '怎麼幹', '怒于' => '怒於', '怒气冲天' => '怒氣衝天', '怒火冲天' => '怒火衝天', @@ -5441,6 +5448,7 @@ '截发' => '截髮', '战天斗地' => '戰天鬥地', '战栗' => '戰慄', +'战于' => '戰於', '战斗' => '戰鬥', '戏
[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)
Chiefwei has uploaded a new change for review. https://gerrit.wikimedia.org/r/225002 Change subject: Chinese Conversion Table Update 2015-6 .. Chinese Conversion Table Update 2015-6 Update the Chinese conversion table routinely to fix bugs reported from https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82. It is only data changes and only works for Chinese WikiProjects. Change-Id: Ibf6d776d07a611a2afcb2c6c984074c39c8c0d70 --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 8 files changed, 266 insertions(+), 812 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/225002/1 diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 87cc48e..8b6c0b0 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1370,6 +1370,7 @@ '脶' => '腡', '脸' => '臉', '腊' => '臘', +'腌' => '醃', '腘' => '膕', '腭' => '齶', '腻' => '膩', @@ -3355,6 +3356,7 @@ '干奴才' => '乾奴才', '干妹' => '乾妹', '干姊' => '乾姊', +'干姐' => '乾姐', '干娘' => '乾娘', '干妈' => '乾媽', '干子' => '乾子', @@ -3416,6 +3418,7 @@ '干癣' => '乾癬', '干瘾' => '乾癮', '干白儿' => '乾白兒', +'干白葡萄酒' => '乾白葡萄酒', '干的' => '乾的', '干眼' => '乾眼', '干瞪眼' => '乾瞪眼', @@ -3426,6 +3429,7 @@ '干篾片' => '乾篾片', '干粉' => '乾粉', '干粮' => '乾糧', +'干红葡萄酒' => '乾紅葡萄酒', '干结' => '乾結', '干丝' => '乾絲', '干纲' => '乾綱', @@ -3654,7 +3658,6 @@ '于贈' => '于贈', '于赠' => '于贈', '于越' => '于越', -'于军' => '于軍', '于軍' => '于軍', '于道泉' => '于道泉', '于远伟' => '于遠偉', @@ -3677,9 +3680,8 @@ '于韦斯屈莱' => '于韋斯屈萊', '于風政' => '于風政', '于风政' => '于風政', +'于飛' => '于飛', '于飞' => '于飛', -'于飛島' => '于飛島', -'于飞岛' => '于飛島', '于余曲折' => '于餘曲折', '于鬯' => '于鬯', '于魁智' => '于魁智', @@ -3731,6 +3733,7 @@ '人数里' => '人數裡', '人物志' => '人物誌', '人生天里' => '人生天里', +'人发指' => '人髮指', '什锦面' => '什錦麵', '仇仇' => '仇讎', '介胄' => '介冑', @@ -3744,7 +3747,6 @@ '代理发行' => '代理發行', '代码表' => '代碼表', '代表' => '代表', -'令人发指' => '令人髮指', '以自制' => '以自制', '仲裁制' => '仲裁制', '件钟' => '件鐘', @@ -3835,6 +3837,7 @@ '依托' => '依託', '侵并' => '侵併', '局促' => '侷促', +'便于' => '便於', '系数' => '係數', '系为' => '係為', '保险柜' => '保險柜', @@ -3854,7 +3857,6 @@ '候复' => '候覆', '倚闲' => '倚閑', '倛丑' => '倛醜', -'借听于聋' => '借聽於聾', '借鉴' => '借鑑', '倦游' => '倦遊', '假里' => '假裡', @@ -4066,7 +4068,6 @@ '分子钟' => '分子鐘', '分子云' => '分子雲', '分布于' => '分布於', -'分散于' => '分散於', '分钟' => '分鐘', '刑余' => '刑餘', '划一桨' => '划一槳', @@ -4243,7 +4244,6 @@ '卵与石斗' => '卵與石鬥', '卷须' => '卷鬚', '厂部' => '厂部', -'厝薪于火' => '厝薪於火', '原子钟' => '原子鐘', '原钟' => '原鐘', '历物之意' => '厤物之意', @@ -4256,6 +4256,7 @@ '反复' => '反覆', '反覆' => '反覆', '取舍' => '取捨', +'取决于' => '取決於', '受雇' => '受僱', '受托' => '受託', '丛林里' => '叢林裡', @@ -4517,6 +4518,7 @@ '回游' => '回遊', '因于' => '因於', '困倦起来' => '困倦起來', +'困于' => '困於', '困兽之斗' => '困獸之鬥', '困兽犹斗' => '困獸猶鬥', '困斗' => '困鬥', @@ -4568,6 +4570,7 @@ '埃及历史' => '埃及歷史', '埃及艳后' => '埃及豔后', '埃荣冲' => '埃榮衝', +'城市里' => '城市裡', '城里' => '城裡', '埔子里' => '埔子里', '埔里社' => '埔裏社', @@ -4765,7 +4768,6 @@ '字汇' => '字彙', '字码表' => '字碼表', '字里行间' => '字裡行間', -'存十一于千百' => '存十一於千百', '存折' => '存摺', '存于' => '存於', '孛里海' => '孛里海', @@ -4811,10 +4813,10 @@ '实干' => '實幹', '实累累' => '實纍纍', '写字台' => '寫字檯', -'宽宽松松' => '寬寬鬆鬆', '宽于' => '寬於', '宽余' => '寬餘', '宽松' => '寬鬆', +'宽松松' => '寬鬆鬆', '寮采' => '寮寀', '寶山庄' => '寶山庄', '宝历' => '寶曆', @@ -4870,7 +4872,9 @@ '就范' => '就範', '就里' => '就裡', '尸位素餐' => '尸位素餐', +'尸佼' => '尸佼', '尸利' => '尸利', +'尸子' => '尸子', '尸居余气' => '尸居餘氣', '尸弃佛' => '尸棄佛', '尸祝' => '尸祝', @@ -4900,7 +4904,7 @@ '山羊胡' => '山羊鬍', '山里有' => '山裡有', '山里的' => '山裡的', -'山谷道' => '山谷道', +'山谷' => '山谷', '山重水复' => '山重水複', '岫岩' => '岫巖', '岱岳' => '岱嶽', @@ -4945,7 +4949,7 @@ '已占算' => '已占算', '巴尔干' => '巴爾幹', '巷里' => '巷裡', -'市里' => '市裡', +'市里的' => '市裡的', '布谷' => '布穀', '布谷鸟' => '布穀鳥', '布谷鸟钟' => '布穀鳥鐘', @@ -4985,8 +4989,8 @@ '干了' => '幹了', '干事' => '幹事', '干些' => '幹些', -'干人' => '幹人', '干什么' => '幹什麼', +'干仗' => '幹仗', '干个' => '幹個', '干劲' => '幹勁', '干吏' => '幹吏', @@ -5025,8 +5029,7 @@ '干起来' => '幹起來', '干路' => '幹路', '干办' => '幹辦', -'干这一行' => '幹這一行', -'干这种事' => '幹這種事', +'干这' => '幹這', '干道' => '幹道', '干部' => '幹部', '干革命' => '幹革命', @@ -5344,6 +5347,7 @@ '忠于' => '忠於', '快快当当' => '快快當當', '快冲' => '快衝', +'怎么干' => '怎麼幹', '怒于' => '怒於', '怒气冲天' => '怒氣衝天', '怒火冲天' => '怒火衝天', @@ -5441,6 +5445,7 @@ '截发' => '截髮', '战天斗地' => '戰天鬥地', '战栗' => '戰慄', +'战于' => '戰於', '战斗' => '戰鬥', '戏里' => '戲裡', '戲院里' => '戲院里', @@ -5734,7 +5739,6 @@ '控制' => '控制', '推情准理' => '推情準理', '推托之词' => '推托之詞', -'推舟于陆' => '推舟於陸', '推托' => '推託', '提子干' => '提子乾', '提心吊胆' => '提心弔膽', @@ -5876,126 +5880,10 @@ '方志恒' => '方志恒', '方法里' => '方法裡', '方志' => '方誌', -'于0' => '於0', -'于1' => '於1', -'于1天' => '於1天', -'于2' => '於2', -'
