[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-4 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Chinese Conversion Table Update 2015-4 .. Chinese Conversion Table Update 2015-4 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: Ic1355c98e8e18217c73461239d4754f9d117999d --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad_noconvert.manual M maintenance/language/zhtable/simpphrases.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toSimp.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/trad2simp.manual M maintenance/language/zhtable/trad2simp_noconvert.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 11 files changed, 127 insertions(+), 14 deletions(-) Approvals: Nikerabbit: Looks good to me, approved Hammertkh: Looks good to me, but someone else must approve Liuxinyu970226: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 32f69d9..b59be8c 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1474,7 +1474,6 @@ '虑' = '慮', '虚' = '虛', '虫' = '蟲', -'虬' = '虯', '虮' = '蟣', '虽' = '雖', '虾' = '蝦', @@ -3075,6 +3074,7 @@ '9余' = '9餘', '·范' = '·范', '’s ' = '’s', +'、面点' = '、麵點', '。个中' = '。箇中', '〇周后' = '〇周後', '〇年' = '〇年', @@ -5803,6 +5803,7 @@ '支干' = '支幹', '支配欲' = '支配慾', '收获' = '收穫', +'改制成' = '改制成', '改征' = '改徵', '改采' = '改採', '放懞挣' = '放懞掙', @@ -5874,25 +5875,40 @@ '方志' = '方誌', '于0' = '於0', '于1' = '於1', +'于1天' = '於1天', '于2' = '於2', +'于2天' = '於2天', '于3' = '於3', +'于3天' = '於3天', '于4' = '於4', +'于4天' = '於4天', '于5' = '於5', +'于5天' = '於5天', '于6' = '於6', +'于6天' = '於6天', '于7' = '於7', +'于7天' = '於7天', '于8' = '於8', +'于8天' = '於8天', '于9' = '於9', +'于9天' = '於9天', '于一' = '於一', +'于一天' = '於一天', '于一役' = '於一役', '于七' = '於七', +'于七天' = '於七天', '于三' = '於三', +'于三天' = '於三天', '于世' = '於世', '于之' = '於之', '于乎' = '於乎', '于九' = '於九', +'于九天' = '於九天', '于事' = '於事', '于二' = '於二', +'于二天' = '於二天', '于五' = '於五', +'于五天' = '於五天', '于人' = '於人', '于今' = '於今', '于他' = '於他', @@ -5900,14 +5916,18 @@ '于何' = '於何', '于你' = '於你', '于八' = '於八', +'于八天' = '於八天', '于六' = '於六', +'于六天' = '於六天', '于前' = '於前', '于劣' = '於劣', '于勤' = '於勤', '于十' = '於十', +'于十天' = '於十天', '于半' = '於半', '于呼哀哉' = '於呼哀哉', '于四' = '於四', +'于四天' = '於四天', '于国' = '於國', '于坏' = '於坏', '于垂' = '於垂', @@ -6161,6 +6181,7 @@ '柜上' = '柜上', '柜子' = '柜子', '柜柳' = '柜柳', +'查封后' = '查封後', '柱梁' = '柱樑', '柳斌杰' = '柳斌杰', '柳诒征' = '柳詒徵', @@ -6186,6 +6207,7 @@ '杆秤' = '桿秤', '杆菌' = '桿菌', '梁上君子' = '梁上君子', +'梁启超' = '梁啓超', '条干' = '條幹', '梨干' = '梨乾', '梯冲' = '梯衝', @@ -6435,6 +6457,7 @@ '涂长望' = '涂長望', '涂鴻欽' = '涂鴻欽', '涂鸿钦' = '涂鴻欽', +'涌水塘' = '涌水塘', '涳蒙' = '涳濛', '涸干' = '涸乾', '凉席' = '涼蓆', @@ -6472,6 +6495,7 @@ '涌入' = '湧入', '涌出' = '湧出', '涌向' = '湧向', +'涌水' = '湧水', '涌泉' = '湧泉', '涌现' = '湧現', '涌起' = '湧起', @@ -7133,6 +7157,7 @@ '节欲' = '節慾', '节目里' = '節目裡', '节余' = '節餘', +'范亭' = '範亭', '范例' = '範例', '范围' = '範圍', '范字' = '範字', @@ -7330,7 +7355,6 @@ '羁系' = '羈繫', '美容美发' = '美容美髮', '美于' = '美於', -'美制' = '美製', '美丑' = '美醜', '美发学' = '美髮學', '美发师' = '美髮師', @@ -7885,6 +7909,7 @@ '角落里' = '角落裡', '觚棱' = '觚稜', '解雇' = '解僱', +'解封后' = '解封後', '解铃仍须系铃人' = '解鈴仍須繫鈴人', '解铃还须系铃人' = '解鈴還須繫鈴人', '解发佯狂' = '解髮佯狂', @@ -7927,7 +7952,6 @@ '托附' = '託附', '许愿起经' = '許愿起經', '許聖杰' = '許聖杰', -'许虬' = '許虬', '注上' = '註上', '注册' = '註冊', '注失' = '註失', @@ -8739,6 +8763,7 @@ '雪里蕻' = '雪裡蕻', '云吞' = '雲吞', '云笈七签' = '雲笈七籤', +'云里雾里' = '雲裡霧裡', '云游' = '雲遊', '云须' = '雲鬚', '零个' = '零個', @@ -9359,6 +9384,8 @@ '面饺' = '麵餃', '面饼' = '麵餅', '面馆' = '麵館', +'面点、' = '麵點、', +'面点师' = '麵點師', '麻将席' = '麻將蓆', '麻酱面' = '麻醬麵', '黄干黑瘦' = '黃乾黑瘦', @@ -12098,6 +12125,7 @@ '鈿' = '钿', '鉀' = '钾', '鉁' = '豅', +'鉄' = '铁', '鉅' = '钜', '鉆' = '钻', '鉈' = '铊', @@ -13722,6 +13750,7 @@ '穀旦' = '穀旦', '穀梁' = '穀梁', '穀水' = '穀水', +'穀阳' = '穀阳', '穀陽' = '穀阳', '穿著者' = '穿着者', '竹昇' = '竹升', @@ -13757,6 +13786,7 @@ '著者' = '著者', '著身' = '著身', '著述' = '著述', +'蔡孝乾' = '蔡孝乾', '蔡絛' = '蔡絛', '行餘' = '行馀', '覆蓋' = '覆盖', @@ -13971,7 +14001,7 @@ '叱咤叱' = '叱咤叱', '叱咤咤' = '叱咤咤', '叱咤樂壇' = '叱咤樂壇', -'斯坦福' = '史丹福', +'斯坦福大学' = '史丹福大學', '斯皮尔伯格' = '史匹柏', '斯特劳斯' = '史特勞斯', '斯威士兰' = '史瓦濟蘭', @@ -14179,7 +14209,8 @@ '东盟' = '東協', '亚细安' = '東協', '東盟' = '東協', -'东南亚国家联盟' = '東南亞國協', +'东南亚国家联盟' = '東南亞國家協會', +'東南亞國家聯盟' = '東南亞國家協會', '柏林墙' = '柏林圍牆', '柏林牆' = '柏林圍牆', '乍得' = '查德', @@ -14253,7 +14284,9 @@ '铁托' = '狄托', '塞拉利昂' = '獅子山', '独联体' = '獨立國協', +'獨聯體' = '獨立國協', '独立国家联合体' = '獨立國家國協', +'獨立國家聯合體' = '獨立國家國協', '波利尼西亚' = '玻里尼西亞', '波利尼西亞' = '玻里尼西亞', '本傑明' = '班傑明', @@ -14482,6 +14515,7 @@ '集装箱' = '貨櫃', '数据库' = '資料庫',
[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-4 - change (mediawiki/core)
Chiefwei has uploaded a new change for review. https://gerrit.wikimedia.org/r/215301 Change subject: Chinese Conversion Table Update 2015-4 .. Chinese Conversion Table Update 2015-4 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: Ic1355c98e8e18217c73461239d4754f9d117999d --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad_noconvert.manual M maintenance/language/zhtable/simpphrases.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toSimp.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/trad2simp.manual M maintenance/language/zhtable/trad2simp_noconvert.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 11 files changed, 127 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/215301/1 diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 32f69d9..b59be8c 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1474,7 +1474,6 @@ '虑' = '慮', '虚' = '虛', '虫' = '蟲', -'虬' = '虯', '虮' = '蟣', '虽' = '雖', '虾' = '蝦', @@ -3075,6 +3074,7 @@ '9余' = '9餘', '·范' = '·范', '’s ' = '’s', +'、面点' = '、麵點', '。个中' = '。箇中', '〇周后' = '〇周後', '〇年' = '〇年', @@ -5803,6 +5803,7 @@ '支干' = '支幹', '支配欲' = '支配慾', '收获' = '收穫', +'改制成' = '改制成', '改征' = '改徵', '改采' = '改採', '放懞挣' = '放懞掙', @@ -5874,25 +5875,40 @@ '方志' = '方誌', '于0' = '於0', '于1' = '於1', +'于1天' = '於1天', '于2' = '於2', +'于2天' = '於2天', '于3' = '於3', +'于3天' = '於3天', '于4' = '於4', +'于4天' = '於4天', '于5' = '於5', +'于5天' = '於5天', '于6' = '於6', +'于6天' = '於6天', '于7' = '於7', +'于7天' = '於7天', '于8' = '於8', +'于8天' = '於8天', '于9' = '於9', +'于9天' = '於9天', '于一' = '於一', +'于一天' = '於一天', '于一役' = '於一役', '于七' = '於七', +'于七天' = '於七天', '于三' = '於三', +'于三天' = '於三天', '于世' = '於世', '于之' = '於之', '于乎' = '於乎', '于九' = '於九', +'于九天' = '於九天', '于事' = '於事', '于二' = '於二', +'于二天' = '於二天', '于五' = '於五', +'于五天' = '於五天', '于人' = '於人', '于今' = '於今', '于他' = '於他', @@ -5900,14 +5916,18 @@ '于何' = '於何', '于你' = '於你', '于八' = '於八', +'于八天' = '於八天', '于六' = '於六', +'于六天' = '於六天', '于前' = '於前', '于劣' = '於劣', '于勤' = '於勤', '于十' = '於十', +'于十天' = '於十天', '于半' = '於半', '于呼哀哉' = '於呼哀哉', '于四' = '於四', +'于四天' = '於四天', '于国' = '於國', '于坏' = '於坏', '于垂' = '於垂', @@ -6161,6 +6181,7 @@ '柜上' = '柜上', '柜子' = '柜子', '柜柳' = '柜柳', +'查封后' = '查封後', '柱梁' = '柱樑', '柳斌杰' = '柳斌杰', '柳诒征' = '柳詒徵', @@ -6186,6 +6207,7 @@ '杆秤' = '桿秤', '杆菌' = '桿菌', '梁上君子' = '梁上君子', +'梁启超' = '梁啓超', '条干' = '條幹', '梨干' = '梨乾', '梯冲' = '梯衝', @@ -6435,6 +6457,7 @@ '涂长望' = '涂長望', '涂鴻欽' = '涂鴻欽', '涂鸿钦' = '涂鴻欽', +'涌水塘' = '涌水塘', '涳蒙' = '涳濛', '涸干' = '涸乾', '凉席' = '涼蓆', @@ -6472,6 +6495,7 @@ '涌入' = '湧入', '涌出' = '湧出', '涌向' = '湧向', +'涌水' = '湧水', '涌泉' = '湧泉', '涌现' = '湧現', '涌起' = '湧起', @@ -7133,6 +7157,7 @@ '节欲' = '節慾', '节目里' = '節目裡', '节余' = '節餘', +'范亭' = '範亭', '范例' = '範例', '范围' = '範圍', '范字' = '範字', @@ -7330,7 +7355,6 @@ '羁系' = '羈繫', '美容美发' = '美容美髮', '美于' = '美於', -'美制' = '美製', '美丑' = '美醜', '美发学' = '美髮學', '美发师' = '美髮師', @@ -7885,6 +7909,7 @@ '角落里' = '角落裡', '觚棱' = '觚稜', '解雇' = '解僱', +'解封后' = '解封後', '解铃仍须系铃人' = '解鈴仍須繫鈴人', '解铃还须系铃人' = '解鈴還須繫鈴人', '解发佯狂' = '解髮佯狂', @@ -7927,7 +7952,6 @@ '托附' = '託附', '许愿起经' = '許愿起經', '許聖杰' = '許聖杰', -'许虬' = '許虬', '注上' = '註上', '注册' = '註冊', '注失' = '註失', @@ -8739,6 +8763,7 @@ '雪里蕻' = '雪裡蕻', '云吞' = '雲吞', '云笈七签' = '雲笈七籤', +'云里雾里' = '雲裡霧裡', '云游' = '雲遊', '云须' = '雲鬚', '零个' = '零個', @@ -9359,6 +9384,8 @@ '面饺' = '麵餃', '面饼' = '麵餅', '面馆' = '麵館', +'面点、' = '麵點、', +'面点师' = '麵點師', '麻将席' = '麻將蓆', '麻酱面' = '麻醬麵', '黄干黑瘦' = '黃乾黑瘦', @@ -12098,6 +12125,7 @@ '鈿' = '钿', '鉀' = '钾', '鉁' = '豅', +'鉄' = '铁', '鉅' = '钜', '鉆' = '钻', '鉈' = '铊', @@ -13722,6 +13750,7 @@ '穀旦' = '穀旦', '穀梁' = '穀梁', '穀水' = '穀水', +'穀阳' = '穀阳', '穀陽' = '穀阳', '穿著者' = '穿着者', '竹昇' = '竹升', @@ -13757,6 +13786,7 @@ '著者' = '著者', '著身' = '著身', '著述' = '著述', +'蔡孝乾' = '蔡孝乾', '蔡絛' = '蔡絛', '行餘' = '行馀', '覆蓋' = '覆盖', @@ -13971,7 +14001,7 @@ '叱咤叱' = '叱咤叱', '叱咤咤' = '叱咤咤', '叱咤樂壇' = '叱咤樂壇', -'斯坦福' = '史丹福', +'斯坦福大学' = '史丹福大學', '斯皮尔伯格' = '史匹柏', '斯特劳斯' = '史特勞斯', '斯威士兰' = '史瓦濟蘭', @@ -14179,7 +14209,8 @@ '东盟' = '東協', '亚细安' = '東協', '東盟' = '東協', -'东南亚国家联盟' = '東南亞國協', +'东南亚国家联盟' = '東南亞國家協會', +'東南亞國家聯盟' = '東南亞國家協會', '柏林墙' = '柏林圍牆', '柏林牆' = '柏林圍牆', '乍得' = '查德', @@ -14253,7 +14284,9 @@ '铁托' = '狄托', '塞拉利昂' = '獅子山', '独联体' = '獨立國協', +'獨聯體' = '獨立國協', '独立国家联合体' = '獨立國家國協', +'獨立國家聯合體' = '獨立國家國協', '波利尼西亚' = '玻里尼西亞', '波利尼西亞' = '玻里尼西亞', '本傑明' = '班傑明', @@ -14482,6 +14515,7 @@ '集装箱' = '貨櫃', '数据库' = '資料庫', '數據庫' = '資料庫', +'信息时代' = '資訊時代', '信息论' = '資訊理論', '乔布斯' = '賈伯斯', '宾西法尼亚' = '賓夕法尼亞', @@
