[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-6

2017-12-09 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/396568 )

Change subject: Chinese Conversion Table Update 2017-6
..

Chinese Conversion Table Update 2017-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: I4bf1e1ae2efd157fa74650b9ece0cce211c66598
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/simp2trad.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/toTrad.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
10 files changed, 43 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/396568/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 41bdba4..6633df2 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -4904,21 +4904,15 @@
 '峇里海' => '峇里海',
 '峰回' => '峰迴',
 '峻岭' => '峻岭',
-'崑剧' => '崑劇',
 '昆剧' => '崑劇',
-'崑山' => '崑山',
 '昆山' => '崑山',
 '昆冈' => '崑岡',
 '昆仑' => '崑崙',
 '昆嵛' => '崑嵛',
 '昆承湖' => '崑承湖',
-'崑曲' => '崑曲',
 '昆曲' => '崑曲',
-'崑腔' => '崑腔',
 '昆腔' => '崑腔',
-'崑苏' => '崑蘇',
 '昆苏' => '崑蘇',
-'崑调' => '崑調',
 '昆调' => '崑調',
 '崖广' => '崖广',
 '嶒棱' => '嶒稜',
@@ -4949,6 +4943,7 @@
 '希伯来历史' => '希伯來歷史',
 '帘子' => '帘子',
 '帘布' => '帘布',
+'帛尸梨' => '帛尸梨',
 '帝后台' => '帝后臺',
 '帝后臺' => '帝后臺',
 '师范' => '師範',
@@ -7465,6 +7460,7 @@
 '姜茶' => '薑茶',
 '姜蓉' => '薑蓉',
 '姜还是老的辣' => '薑還是老的辣',
+'姜酮' => '薑酮',
 '姜饼' => '薑餅',
 '姜黄' => '薑黃',
 '薙发' => '薙髮',
@@ -7498,7 +7494,6 @@
 '藤制' => '藤製',
 '药签' => '藥籤',
 '药面儿' => '藥麵兒',
-'苏崑' => '蘇崑',
 '苏昆' => '蘇崑',
 '苹婆' => '蘋婆',
 '苹果' => '蘋果',
@@ -7588,6 +7583,7 @@
 '冲头阵' => '衝頭陣',
 '冲风' => '衝風',
 '衡鉴' => '衡鑑',
+'表征' => '表徵',
 '表面包' => '表面包',
 '袋杆' => '袋桿',
 '袋里' => '袋裡',
@@ -8979,7 +8975,6 @@
 '松脆' => '鬆脆',
 '松脱' => '鬆脫',
 '松蛋' => '鬆蛋',
-'松起' => '鬆起',
 '松软' => '鬆軟',
 '松通' => '鬆通',
 '松开' => '鬆開',
@@ -9874,7 +9869,9 @@
 '島' => '岛',
 '峽' => '峡',
 '崍' => '崃',
+'崑' => '昆',
 '崗' => '岗',
+'崙' => '仑',
 '崢' => '峥',
 '崬' => '岽',
 '嵐' => '岚',
@@ -13454,7 +13451,6 @@
 '拚搏' => '拚搏',
 '拚死' => '拚死',
 '拾瀋' => '拾渖',
-'拿破崙' => '拿破仑',
 '挨剋' => '挨剋',
 '提昇' => '提升',
 '蒐錄' => '搜录',
@@ -13506,14 +13502,6 @@
 '旋乾转坤' => '旋乾转坤',
 '無言不讎' => '无言不雠',
 '曠若發矇' => '旷若发矇',
-'崑崙' => '昆仑',
-'崑劇' => '昆剧',
-'崑山' => '昆山',
-'崑島' => '昆岛',
-'崑曲' => '昆曲',
-'崑腔' => '昆腔',
-'崑蘇' => '昆苏',
-'崑調' => '昆调',
 '易·乾' => '易·乾',
 '易經·乾' => '易经·乾',
 '易经·乾' => '易经·乾',
@@ -13830,6 +13818,8 @@
 '前波美拉尼亚' => '前波莫瑞',
 '前波美拉尼亞' => '前波莫瑞',
 '加蓬' => '加彭',
+'加泰罗尼亚' => '加泰隆尼亞',
+'加泰羅尼亞' => '加泰隆尼亞',
 '加沙地带' => '加薩走廊',
 '加沙地帶' => '加薩走廊',
 '包豪斯' => '包浩斯',
@@ -15015,6 +15005,7 @@
 '击剑' => '劍擊',
 '擊劍' => '劍擊',
 '加薩走廊' => '加沙地帶',
+'加泰隆尼亞' => '加泰羅尼亞',
 '迦納' => '加納',
 '加彭' => '加蓬',
 '努力著' => '努力着',
@@ -15250,6 +15241,7 @@
 '衣索匹亞' => '埃塞俄比亚',
 '衣索比亞' => '埃塞俄比亞',
 '葉里溫' => '埃里溫',
+'埋著' => '埋着',
 '城市里' => '城市裏',
 '城里' => '城裏',
 '域里' => '域裏',
@@ -15968,7 +15960,6 @@
 '朝著者' => '朝著者',
 '朝著述' => '朝著述',
 '朝著錄' => '朝著錄',
-'板球' => '木球',
 '賓·拉登' => '本·拉登',
 '班傑明' => '本傑明',
 '賓拉登' => '本拉登',
@@ -16018,7 +16009,6 @@
 '台球' => '桌球',
 '撞球' => '桌球',
 '梅鐸' => '梅鐸',
-'默多克' => '梅鐸',
 '条文里' => '條文裏',
 '梳著' => '梳着',
 '梳著作' => '梳著作',
@@ -16584,8 +16574,6 @@
 '箱里' => '箱裏',
 '节目里' => '節目裏',
 '簽著' => '簽着',
-'篮板球' => '籃板球',
-'籃板球' => '籃板球',
 '迈克尔' => '米高',
 '麦克尔' => '米高',
 '迈克尔·欧文' => '米高·奧雲',
@@ -16635,10 +16623,7 @@
 '彩球' => '綵球',
 '彩綢' => '綵綢',
 '彩绸' => '綵綢',
-'彩线' => '綵綫',
-'彩線' => '綵線',
 '彩船' => '綵船',
-'彩衣' => '綵衣',
 '线图里' => '線圖裏',
 '緝凶' => '緝兇',
 '县里' => '縣裏',
@@ -17852,7 +17837,6 @@
 '偷著者' => '偷著者',
 '偷著述' => '偷著述',
 '傅利葉' => '傅里叶',
-'母音' => '元音',
 '光著' => '光着',
 '光著書' => '光著书',
 '光著作' => '光著作',
@@ -17975,6 +17959,7 @@
 '辦著者' => '办著者',
 '辦著述' => '办著述',
 '加薩走廊' => '加沙地带',
+'加泰隆尼亞' => '加泰罗尼亚',
 '迦納' => '加纳',
 '加彭' => '加蓬',
 '動著' => '动着',
@@ -18237,6 +18222,7 @@
 '衣索比亞' => '埃塞俄比亚',
 '艾菲爾' => '埃菲尔',
 '葉里溫' => '埃里温',
+'埋著' => '埋着',
 '功能變數名稱' => '域名',
 '網域名稱' => '域名',
 '吉里巴斯' => '基里巴斯',
diff --git a/maintenance/language/zhtable/simp2trad.manual 
b/maintenance/language/zhtable/simp2trad.manual
index 9fee611..e762494 100644
--- a/maintenance/language/zhtable/simp2trad.manual
+++ b/maintenance/language/zhtable/simp2trad.manual
@@ -112,6 +112,7 @@
 U+06597斗|U+06597斗|U+09B25鬥|
 U+065CB旋|U+065CB旋|U+0955F镟|
 U+065D7旗|U+065D7旗|U+065C2旂|
+U+06606昆|U+06606昆|U+05D11崑|U+05D10崐|
 U+066F2曲|U+066F2曲|U+09EAF麯|U+09EB4麯|
 U+0672F术|U+08853術|U+0672E朮|
 U+06731朱|U+06731朱|U+07843硃|
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index 4715cec..b0aa131

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-5

2017-10-20 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/385331 )

Change subject: Chinese Conversion Table Update 2017-5
..

Chinese Conversion Table Update 2017-5

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: I8ad74e6d7696e51aa691e0f026e11b07c8f90a78
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
6 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/385331/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 64cce78..41bdba4 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -4663,6 +4663,7 @@
 '大历' => '大曆',
 '大本钟' => '大本鐘',
 '大历史' => '大歷史',
+'大历险' => '大歷險',
 '大病初愈' => '大病初癒',
 '大目干连' => '大目乾連',
 '大笨钟' => '大笨鐘',
@@ -6805,6 +6806,8 @@
 '碧河里' => '碧河里',
 '碰钟' => '碰鐘',
 '确系' => '確係',
+'码码表' => '碼碼表',
+'码表示' => '碼表示',
 '码表' => '碼錶',
 '磁制' => '磁製',
 '磨蝎' => '磨蝎',
@@ -8909,7 +8912,6 @@
 '发型' => '髮型',
 '发夹' => '髮夾',
 '发妻' => '髮妻',
-'发姐' => '髮姐',
 '发屋' => '髮屋',
 '发已霜白' => '髮已霜白',
 '发带' => '髮帶',
@@ -14051,6 +14053,8 @@
 '數碼訊號' => '數位訊號',
 '数字电视' => '數位電視',
 '數碼電視' => '數位電視',
+'数字音乐' => '數位音樂',
+'數碼音樂' => '數位音樂',
 '調制解調器' => '數據機',
 '调制解调器' => '數據機',
 '斯堪的納維亞' => '斯堪地那維亞',
@@ -14184,6 +14188,7 @@
 '百慕大' => '百慕達',
 '卢旺达' => '盧安達',
 '盧旺達' => '盧安達',
+'真人騷' => '真人秀',
 '睾' => '睪',
 '知识产权局' => '知識產權局',
 '知識產權局' => '知識產權署',
@@ -16416,6 +16421,7 @@
 '看著者' => '看著者',
 '看著述' => '看著述',
 '看著錄' => '看著錄',
+'真人秀' => '真人騷',
 '眼眶里' => '眼眶裏',
 '眼睛里' => '眼睛裏',
 '眼里' => '眼裏',
@@ -19273,6 +19279,7 @@
 '看著稱' => '看著称',
 '看著者' => '看著者',
 '看著述' => '看著述',
+'真人騷' => '真人秀',
 '著業' => '着业',
 '著絲' => '着丝',
 '著麼' => '着么',
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index a63149e..4715cec 100644
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -2682,3 +2682,4 @@
 塑膠袋塑料袋
 烏龍麵乌冬面
 披索 比索
+真人騷真人秀
diff --git a/maintenance/language/zhtable/toHK.manual 
b/maintenance/language/zhtable/toHK.manual
index b71764a..efcfcb6 100644
--- a/maintenance/language/zhtable/toHK.manual
+++ b/maintenance/language/zhtable/toHK.manual
@@ -3053,3 +3053,4 @@
 人行道行人路
 塑料袋膠袋
 烏龍麵烏冬麵
+真人秀真人騷
diff --git a/maintenance/language/zhtable/toTW.manual 
b/maintenance/language/zhtable/toTW.manual
index 16e2751..6b5a857 100644
--- a/maintenance/language/zhtable/toTW.manual
+++ b/maintenance/language/zhtable/toTW.manual
@@ -750,6 +750,8 @@
 數碼技術   數位技術
 数字信号   數位訊號
 數碼訊號   數位訊號
+数字音乐   數位音樂
+數碼音樂   數位音樂
 数字化數位化
 數碼化數位化
 移动网络   行動網路
@@ -788,3 +790,4 @@
 塑料袋塑膠袋
 触摸屏觸控螢幕
 乌冬面烏龍麵
+真人騷真人秀
diff --git a/maintenance/language/zhtable/tradphrases.manual 
b/maintenance/language/zhtable/tradphrases.manual
index c5d5fd7..ba2f5e8 100644
--- a/maintenance/language/zhtable/tradphrases.manual
+++ b/maintenance/language/zhtable/tradphrases.manual
@@ -2171,6 +2171,7 @@
 埃及歷史
 大明歷史
 大歷史
+大歷險
 大衍歷史
 太初歷史
 官歷史
@@ -2981,6 +2982,8 @@
 編碼表
 字碼表
 電碼表
+碼碼表
+碼表示
 科斗
 灕水
 這只不
diff --git a/maintenance/language/zhtable/tradphrases_exclude.manual 
b/maintenance/language/zhtable/tradphrases_exclude.manual
index 3ab14eb..ce1c524 100644
--- a/maintenance/language/zhtable/tradphrases_exclude.manual
+++ b/maintenance/language/zhtable/tradphrases_exclude.manual
@@ -778,3 +778,4 @@
 箇舊
 條幹
 檯布
+髮姐

-- 
To view, visit https://gerrit.wikimedia.org/r/385331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ad74e6d7696e51aa691e0f026e11b07c8f90a78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chiefwei 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-4

2017-08-17 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372234 )

Change subject: Chinese Conversion Table Update 2017-4
..

Chinese Conversion Table Update 2017-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: Ic66546d3a47e4dd946ae67c636a638ca181b0ca1
---
M languages/data/ZhConversion.php
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/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
8 files changed, 82 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/372234/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 03ebe21..64cce78 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3155,6 +3155,7 @@
 '上签约' => '上簽約',
 '上签署' => '上簽署',
 '上签订' => '上簽訂',
+'上签证' => '上簽證',
 '上签' => '上籤',
 '上系上' => '上繫上',
 '上课钟' => '上課鐘',
@@ -3172,6 +3173,7 @@
 '下签约' => '下簽約',
 '下签署' => '下簽署',
 '下签订' => '下簽訂',
+'下签证' => '下簽證',
 '下签' => '下籤',
 '下课钟' => '下課鐘',
 '不干不净' => '不乾不淨',
@@ -3247,6 +3249,7 @@
 '中签约' => '中簽約',
 '中签署' => '中簽署',
 '中签订' => '中簽訂',
+'中签证' => '中簽證',
 '中签' => '中籤',
 '中风后' => '中風後',
 '丰仪' => '丰儀',
@@ -4322,7 +4325,6 @@
 '台子女' => '台子女',
 '台子孙' => '台子孫',
 '台州' => '台州',
-'台布景' => '台布景',
 '台历史' => '台歷史',
 '台钟' => '台鐘',
 '台风奖' => '台風獎',
@@ -4867,6 +4869,8 @@
 '尸祝' => '尸祝',
 '尸祿' => '尸祿',
 '尸禄' => '尸祿',
+'尸罗' => '尸羅',
+'尸羅' => '尸羅',
 '尸罗精舍' => '尸羅精舍',
 '尸羅精舍' => '尸羅精舍',
 '尸臣' => '尸臣',
@@ -5883,6 +5887,7 @@
 '星历' => '星曆',
 '星期后' => '星期後',
 '星历史' => '星歷史',
+'星露谷物语' => '星露谷物語',
 '春游' => '春遊',
 '春香斗学' => '春香鬥學',
 '昭惠后' => '昭惠后',
@@ -6034,6 +6039,7 @@
 '架钟' => '架鐘',
 '某只' => '某隻',
 '染殿后' => '染殿后',
+'染发生' => '染發生',
 '染发' => '染髮',
 '柜上' => '柜上',
 '柜子' => '柜子',
@@ -6063,7 +6069,6 @@
 '杆菌' => '桿菌',
 '梁上君子' => '梁上君子',
 '梁启超' => '梁啓超',
-'条干' => '條幹',
 '条文里' => '條文裡',
 '梨干' => '梨乾',
 '梯冲' => '梯衝',
@@ -6139,7 +6144,6 @@
 '横征暴敛' => '橫徵暴斂',
 '横梁' => '橫樑',
 '横冲' => '橫衝',
-'台布' => '檯布',
 '台历' => '檯曆',
 '台灯' => '檯燈',
 '台球' => '檯球',
@@ -8494,6 +8498,10 @@
 '闯荡' => '闖蕩',
 '闯炼' => '闖鍊',
 '关系' => '關係',
+'关系列' => '關系列',
+'关系所' => '關系所',
+'关系科' => '關系科',
+'关系统' => '關系統',
 '辟佛' => '闢佛',
 '辟作' => '闢作',
 '辟划' => '闢劃',
@@ -9710,6 +9718,7 @@
 '圞' => 'ꢮ',
 '坿' => '附',
 '垜' => '垛',
+'垻' => '坝',
 '埡' => '垭',
 '執' => '执',
 '堅' => '坚',
@@ -13498,6 +13507,7 @@
 '崑崙' => '昆仑',
 '崑劇' => '昆剧',
 '崑山' => '昆山',
+'崑島' => '昆岛',
 '崑曲' => '昆曲',
 '崑腔' => '昆腔',
 '崑蘇' => '昆苏',
@@ -13875,6 +13885,9 @@
 '哥特式' => '哥德式',
 '哥斯达黎加' => '哥斯大黎加',
 '哥斯達黎加' => '哥斯大黎加',
+'唐纳德·特朗普' => '唐納·川普',
+'當勞·特朗普' => '唐納·川普',
+'當奴·特朗普' => '唐納·川普',
 '卡拉奇' => '喀拉蚩',
 '乔治·奥威尔' => '喬治·歐威爾',
 '佐治亚' => '喬治亞',
@@ -13951,6 +13964,7 @@
 '尼日尔' => '尼日',
 '尼日爾' => '尼日',
 '雅马哈' => '山葉',
+'特朗普' => '川普',
 '机床' => '工具機',
 '機床' => '工具機',
 '珍寶客機' => '巨無霸客機',
@@ -14105,6 +14119,7 @@
 '奥巴马' => '歐巴馬',
 '奧巴馬' => '歐巴馬',
 '正在叱咤' => '正在叱咤',
+'圣佩德罗苏拉' => '汕埠',
 '文莱' => '汶萊',
 '沙律' => '沙拉',
 '沙地阿拉伯' => '沙烏地阿拉伯',
@@ -14270,7 +14285,8 @@
 '毛里塔尼亞' => '茅利塔尼亞',
 '霍尔木兹' => '荷姆茲',
 '霍爾木茲' => '荷姆茲',
-'荷李活道' => '荷李活道',
+'荷里活廣場' => '荷里活廣場',
+'荷里活道' => '荷里活道',
 '莫桑比克' => '莫三比克',
 '瓦文萨' => '華勒沙',
 '華里沙' => '華勒沙',
@@ -14349,6 +14365,8 @@
 '屏幕' => '螢幕',
 '行人路权' => '行人路權',
 '行人路權' => '行人路權',
+'流動作業系統' => '行動作業系統',
+'移动操作系统' => '行動作業系統',
 '流動網絡' => '行動網路',
 '移动网络' => '行動網路',
 '流動電話' => '行動電話',
@@ -14840,6 +14858,7 @@
 '占高枝' => '佔高枝',
 '維德角' => '佛得角',
 '作品里' => '作品裏',
+'操作系统' => '作業系統',
 '來著' => '來着',
 '來著作' => '來著作',
 '來著名' => '來著名',
@@ -15843,6 +15862,8 @@
 '數碼訊號' => '數碼訊號',
 '数字电视' => '數碼電視',
 '數位電視' => '數碼電視',
+'数字音乐' => '數碼音樂',
+'數位音樂' => '數碼音樂',
 '數著作' => '數著作',
 '數著名' => '數著名',
 '數著稱' => '數著稱',
@@ -15974,7 +15995,6 @@
 '枕著述' => '枕著述',
 '枕著錄' => '枕著錄',
 '檯' => '枱',
-'台布' => '枱布',
 '台历' => '枱曆',
 '台灯' => '枱燈',
 '台面上' => '枱面上',
@@ -16101,6 +16121,8 @@
 '活著者' => '活著者',
 '活著述' => '活著述',
 '活著錄' => '活著錄',
+'移动操作系统' => '流動作業系統',
+'行動作業系統' => '流動作業系統',
 '移动网络' => '流動網絡',
 '行動網路' => '流動網絡',
 '移动电话' => '流動電話',
@@ -16313,6 +16335,8 @@
 '畫著稱' => '畫著稱',
 '畫著者' => '畫著者',
 '画里' => '畫裏',
+'唐納·川普' => '當勞·特朗普',
+'唐纳德·特朗普' => '當勞·特朗普',
 '當著' => '當着',
 '當著作' => '當著作',
 '過著作' => '當著作',
@@ -18118,6 +18142,9 @@
 '哭著稱' => '哭著称',
 '哭著者' => '哭著者',
 '哭著述' => '哭著述',
+'唐納·川普' => '唐纳德·特朗普',
+'當勞·特朗普' => '唐纳德·特朗普',
+'當奴·特朗普' => '唐纳德·特朗普',
 '唱著' => '唱着',
 '唱著書' => '唱著书',
 '唱著作' => '唱著作',
@@ -18180,6 +18207,7 @@
 '土魯斯' => '图卢兹',
 '吐瓦魯' => '图瓦卢',
 '原子筆' => '圆珠笔',
+'汕埠' => '圣佩德罗苏拉',
 '聖露西亞' => '圣卢西亚',
 '聖克里斯多福及尼維斯' => '圣基茨和尼维斯',
 '聖吉斯納域斯' => '圣基茨和尼维斯',
@@ -18204,6 +18232,7 @@
 '艾菲爾' => '埃菲尔',
 '葉里溫' =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-3

2017-04-29 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351096 )

Change subject: Chinese Conversion Table Update 2017-3
..

Chinese Conversion Table Update 2017-3

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: I42c80634bc57cf0d3ccf87c055a0594909684752
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
4 files changed, 26 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/351096/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 55813ae..03ebe21 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -4186,6 +4186,7 @@
 '十出生' => '十出生',
 '十出祁山' => '十出祁山',
 '十出头' => '十出頭',
+'十出頭' => '十出頭',
 '十周后' => '十周後',
 '十天后' => '十天後',
 '十扎' => '十紮',
@@ -5847,7 +5848,10 @@
 '方便面' => '方便麵',
 '方向' => '方向',
 '方法里' => '方法裡',
+'于山东' => '於山東',
+'于山西' => '於山西',
 '于海上' => '於海上',
+'于海拔' => '於海拔',
 '于海边' => '於海邊',
 '于震中' => '於震中',
 '于震前' => '於震前',
@@ -6663,7 +6667,8 @@
 '症结' => '癥結',
 '癸丑' => '癸丑',
 '发干' => '發乾',
-'发呆' => '發獃',
+'发状态' => '發狀態',
+'发状况' => '發狀況',
 '发签' => '發籤',
 '发松' => '發鬆',
 '发面' => '發麵',
@@ -6959,7 +6964,7 @@
 '个中翘楚' => '箇中翹楚',
 '个中道理' => '箇中道理',
 '个中高手' => '箇中高手',
-'个旧' => '箇舊',
+'个旧市' => '箇舊市',
 '算历' => '算曆',
 '算历史' => '算歷史',
 '算准' => '算準',
@@ -8329,6 +8334,7 @@
 '铜钟' => '銅鐘',
 '铯钟' => '銫鐘',
 '铝制' => '鋁製',
+'锌制' => '鋅製',
 '钢之炼金术师' => '鋼之鍊金術師',
 '钢梁' => '鋼樑',
 '钢制' => '鋼製',
@@ -8439,6 +8445,7 @@
 '钟点' => '鐘點',
 '钟鼎' => '鐘鼎',
 '钟鼓' => '鐘鼓',
+'铁制' => '鐵製',
 '铁锈' => '鐵鏽',
 '铁钟' => '鐵鐘',
 '铸钟' => '鑄鐘',
@@ -8500,6 +8507,7 @@
 '辟谣' => '闢謠',
 '辟辟' => '闢辟',
 '辟邪以律' => '闢邪以律',
+'防制法' => '防制法',
 '防水表' => '防水錶',
 '防御' => '防禦',
 '防范' => '防範',
@@ -8569,6 +8577,7 @@
 '雪里' => '雪裡',
 '雪里红' => '雪裡紅',
 '雪里蕻' => '雪裡蕻',
+'云南个旧' => '雲南箇舊',
 '云吞' => '雲吞',
 '云吞面' => '雲吞麵',
 '云笈七签' => '雲笈七籤',
diff --git a/maintenance/language/zhtable/toTrad.manual 
b/maintenance/language/zhtable/toTrad.manual
index f106db1..1d53615 100644
--- a/maintenance/language/zhtable/toTrad.manual
+++ b/maintenance/language/zhtable/toTrad.manual
@@ -565,3 +565,4 @@
 杜琪峰杜琪峯
 單向 單向
 轉向 轉向 #分詞用
+十出頭十出頭
diff --git a/maintenance/language/zhtable/tradphrases.manual 
b/maintenance/language/zhtable/tradphrases.manual
index 4effa8e..9b2e081 100644
--- a/maintenance/language/zhtable/tradphrases.manual
+++ b/maintenance/language/zhtable/tradphrases.manual
@@ -2469,6 +2469,7 @@
 精制服
 經有云
 編制法
+防制法
 能干休
 能干戈
 能干擾
@@ -3298,6 +3299,9 @@
 于海
 於海邊
 於海上
+於海拔
+於山東
+於山西
 于凌辰
 于魁智
 于鬯
@@ -3575,6 +3579,10 @@
 蒸製
 烹製
 醃製
+鐵製
+鋼製
+銅製
+鋅製
 和製漢
 和製英語
 壓製機
@@ -3672,6 +3680,8 @@
 短發生
 頭發現
 蛋白發
+發狀態
+發狀況
 古人有云
 昔人有云
 云敞
@@ -3698,3 +3708,5 @@
 金聖歎
 天台 #分詞用
 性別扭曲
+箇舊市
+雲南箇舊
diff --git a/maintenance/language/zhtable/tradphrases_exclude.manual 
b/maintenance/language/zhtable/tradphrases_exclude.manual
index e6aac9c..c6225601 100644
--- a/maintenance/language/zhtable/tradphrases_exclude.manual
+++ b/maintenance/language/zhtable/tradphrases_exclude.manual
@@ -86,6 +86,7 @@
 獃氣
 獃子
 獃頭獃腦
+發獃
 希腊
 腊肉
 瞭如
@@ -774,3 +775,4 @@
 長于
 關于
 難于
+箇舊

-- 
To view, visit https://gerrit.wikimedia.org/r/351096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42c80634bc57cf0d3ccf87c055a0594909684752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chiefwei 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-1

2017-01-02 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/330132 )

Change subject: Chinese Conversion Table Update 2017-1
..

Chinese Conversion Table Update 2017-1

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: I7684fc2805f7f2076b974a2136fcbb3e9dd86607
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/simp2trad.manual
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/simpphrases_exclude.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/toTrad.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
11 files changed, 99 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/330132/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 4594385..a3cd622 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -542,7 +542,6 @@
 '帼' => '幗',
 '幂' => '冪',
 '并' => '並',
-'幺' => '么',
 '广' => '廣',
 '庄' => '莊',
 '庆' => '慶',
@@ -3161,6 +3160,7 @@
 '上梁山' => '上梁山',
 '上梁' => '上樑',
 '上台面' => '上檯面',
+'上签了' => '上簽了',
 '上签名' => '上簽名',
 '上签字' => '上簽字',
 '上签定' => '上簽定',
@@ -3178,6 +3178,7 @@
 '下于' => '下於',
 '下梁' => '下樑',
 '下注解' => '下注解',
+'下签了' => '下簽了',
 '下签名' => '下簽名',
 '下签字' => '下簽字',
 '下签定' => '下簽定',
@@ -3254,6 +3255,7 @@
 '中庄子' => '中庄子',
 '中文里' => '中文裡',
 '中于' => '中於',
+'中签了' => '中簽了',
 '中签名' => '中簽名',
 '中签字' => '中簽字',
 '中签定' => '中簽定',
@@ -3286,20 +3288,34 @@
 '主钟差' => '主鐘差',
 '主钟曲线' => '主鐘曲線',
 '乃系' => '乃係',
-'么么唱唱' => '么么唱唱',
 '么九' => '么九',
-'么儿' => '么兒',
+'么二三' => '么二三',
+'么元' => '么元',
+'么兒' => '么兒',
 '么半' => '么半',
+'么叔' => '么叔',
 '么喝' => '么喝',
 '么女' => '么女',
 '么妹' => '么妹',
+'么姓' => '么姓',
+'么姨' => '么姨',
+'么娘' => '么娘',
+'么媽' => '么媽',
+'么孃' => '么孃',
 '么子' => '么子',
+'么小' => '么小',
 '么弟' => '么弟',
 '么正' => '么正',
-'么爷' => '么爺',
+'么氏' => '么氏',
+'么爸' => '么爸',
+'么爹' => '么爹',
+'么爺' => '么爺',
+'么篇' => '么篇',
+'么舅' => '么舅',
+'么蛾子' => '么蛾子',
 '么雞' => '么雞',
-'么么小丑' => '么麼小丑',
-'么麼小丑' => '么麼小丑',
+'么鳳' => '么鳳',
+'么麼' => '么麼',
 '之一只' => '之一只',
 '之二只' => '之二只',
 '之八九只' => '之八九只',
@@ -4128,7 +4144,6 @@
 '别辟' => '別闢',
 '利欲' => '利慾',
 '利于' => '利於',
-'刮来刮去' => '刮來刮去',
 '刮起来' => '刮起來',
 '刮胡' => '刮鬍',
 '到山里' => '到山裡',
@@ -4777,6 +4792,7 @@
 '妖气冲天' => '妖氣衝天',
 '妆台' => '妝檯',
 '始于' => '始於',
+'姓么' => '姓么',
 '委托' => '委託',
 '委托书' => '委託書',
 '奸夫' => '姦夫',
@@ -4987,6 +5003,7 @@
 '已占卜' => '已占卜',
 '已占算' => '已占算',
 '巴尔干' => '巴爾幹',
+'巴而术' => '巴而朮',
 '巷里' => '巷裡',
 '市里的' => '市裡的',
 '布谷' => '布穀',
@@ -6069,6 +6086,7 @@
 '本庄' => '本庄',
 '本征' => '本徵',
 '本出戏' => '本齣戲',
+'术虎高' => '朮虎高',
 '术赤' => '朮赤',
 '朱庆余' => '朱慶餘',
 '朱理安历' => '朱理安曆',
@@ -7324,6 +7342,7 @@
 '耍斗' => '耍鬥',
 '耕获' => '耕穫',
 '耳余' => '耳餘',
+'耶律术烈' => '耶律朮烈',
 '耿于' => '耿於',
 '聊斋志异' => '聊齋志異',
 '圣人历' => '聖人曆',
@@ -7508,6 +7527,7 @@
 '庄里' => '莊裡',
 '茎干' => '莖幹',
 '莜面' => '莜麵',
+'莪术' => '莪朮',
 '莽荡' => '莽蕩',
 '菜干' => '菜乾',
 '菜坛' => '菜罈',
@@ -8871,7 +8891,6 @@
 '台风后' => '颱風後',
 '刮了' => '颳了',
 '刮倒' => '颳倒',
-'刮去' => '颳去',
 '刮大风' => '颳大風',
 '刮得' => '颳得',
 '刮走' => '颳走',
@@ -13447,7 +13466,6 @@
 '乾，健也' => '乾，健也',
 '乾，天也' => '乾，天也',
 '五箇山' => '五箇山',
-'什么' => '什么',
 '仇讎' => '仇雠',
 '以微知著' => '以微知著',
 '仰屋著書' => '仰屋著书',
@@ -13525,7 +13543,6 @@
 '覆核' => '复核',
 '覆检' => '复检',
 '復甦' => '复苏',
-'多么' => '多么',
 '大麴' => '大曲',
 '天道为乾' => '天道为乾',
 '天道為乾' => '天道为乾',
@@ -13556,13 +13573,12 @@
 '年陞' => '年升',
 '么九' => '幺九',
 '么二三' => '幺二三',
+'么兒' => '幺儿',
 '么元' => '幺元',
 '么鳳' => '幺凤',
 '么半' => '幺半',
-'么半群' => '幺半群',
-'么廝' => '幺厮',
-'幺厮' => '幺厮',
 '么叔' => '幺叔',
+'么喝' => '幺喝',
 '么女' => '幺女',
 '么媽' => '幺妈',
 '么妹' => '幺妹',
@@ -13570,22 +13586,20 @@
 '么姨' => '幺姨',
 '么娘' => '幺娘',
 '么孃' => '幺娘',
-'幺孃' => '幺娘',
 '么子' => '幺子',
 '么小' => '幺小',
 '么弟' => '幺弟',
 '么正' => '幺正',
 '么氏' => '幺氏',
+'么爺' => '幺爷',
 '么爸' => '幺爸',
 '么爹' => '幺爹',
 '么篇' => '幺篇',
 '么舅' => '幺舅',
 '么蛾子' => '幺蛾子',
-'么謙' => '幺谦',
+'么雞' => '幺鸡',
 '么麼' => '幺麽',
-'么麽' => '幺麽',
 '幺麽' => '幺麽',
-'么麽小丑' => '幺麽小丑',
 '慶餘' => '庆馀',
 '康乾' => '康乾',
 '张法乾' => '张法乾',
@@ -13594,7 +13608,6 @@
 '待覆' => '待复',
 '後姓' => '後姓',
 '慫慂' => '怂恿',
-'怎么' => '怎么',
 '恩威並著' => '恩威并著',
 '噁心' => '恶心',
 '情蒐' => '情搜',
@@ -13821,11 +13834,8 @@
 '躊躇滿志' => '踌躇滿志',
 '較著' => '较著',
 '近角聪信' => '近角聪信',
-'这么' => '这么',
 '造麴' => '造曲',
 '遺著' => '遗著',
-'那么' => '那么',
-'那麽' => '那麽',
 '郭子乾' => '郭子乾',
 '酒麴' => '酒曲',
 '醉瀋' => '醉渖',
@@ -13889,9 +13899,8 @@
 '鬱氏' => '鬱氏',
 '魏徵' => '魏徵',
 '魚乾乾' => '鱼干干',
+'麼氏' => '麽氏',
 '麽氏' => '麽氏',
-'麼麼' => '麽麽',
-'麽麽' => '麽麽',
 '黃麴毒素' => '黄曲毒素',
 '黃潤乾' => '黄润乾',
 '黄润乾' => '黄润乾',
@@ -13940,6 +13949,7 @@
 '落車' =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2016-6

2016-08-27 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307055

Change subject: Chinese Conversion Table Update 2016-6
..

Chinese Conversion Table Update 2016-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: I36aaffc024fe0e2df5a029b232d825f7d15cd3ed
---
M languages/data/ZhConversion.php
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
6 files changed, 91 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/307055/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 37a0584..a15d910 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3175,6 +3175,7 @@
 '上系上' => '上繫上',
 '上课钟' => '上課鐘',
 '上面糊' => '上面糊',
+'下文里' => '下文裡',
 '下于' => '下於',
 '下梁' => '下樑',
 '下注解' => '下注解',
@@ -3231,7 +3232,6 @@
 '丑表功' => '丑表功',
 '丑角' => '丑角',
 '且于' => '且於',
-'世田谷' => '世田谷',
 '世界杯' => '世界盃',
 '世纪里' => '世紀裡',
 '世纪钟' => '世紀鐘',
@@ -3362,6 +3362,7 @@
 '干性' => '乾性',
 '干打雷' => '乾打雷',
 '干折' => '乾折',
+'干拌面' => '乾拌麵',
 '干撂台' => '乾撂台',
 '干撇下' => '乾撇下',
 '干擦' => '乾擦',
@@ -3477,6 +3478,7 @@
 '乱发生' => '亂發生',
 '乱发脾气' => '亂發脾氣',
 '乱发' => '亂髮',
+'乱斗' => '亂鬥',
 '乱哄哄' => '亂鬨鬨',
 '了然后' => '了然後',
 '事有斗巧' => '事有鬥巧',
@@ -4087,8 +4089,6 @@
 '刑余' => '刑餘',
 '划一桨' => '划一槳',
 '划一槳' => '划一槳',
-'划上' => '划上',
-'划下' => '划下',
 '划不來' => '划不來',
 '划不来' => '划不來',
 '划了一会' => '划了一會',
@@ -4204,6 +4204,8 @@
 '北回铁路' => '北迴鐵路',
 '匪干' => '匪幹',
 '匿于' => '匿於',
+'区里有' => '區裡有',
+'区里的' => '區裡的',
 '十个' => '十個',
 '十出家' => '十出家',
 '十出击' => '十出擊',
@@ -4263,6 +4265,7 @@
 '卷须' => '卷鬚',
 '厂部' => '厂部',
 '原子钟' => '原子鐘',
+'原文里' => '原文裡',
 '原钟' => '原鐘',
 '历物之意' => '厤物之意',
 '去山里' => '去山裡',
@@ -4291,6 +4294,7 @@
 '口里' => '口裡',
 '口钟' => '口鐘',
 '古人有云' => '古人有云',
+'古文里' => '古文裡',
 '古书云' => '古書云',
 '古書云' => '古書云',
 '古柯咸' => '古柯鹹',
@@ -4842,6 +4846,7 @@
 '寡欲' => '寡慾',
 '实干' => '實幹',
 '实累累' => '實纍纍',
+'实验里' => '實驗裡',
 '写字台' => '寫字檯',
 '宽于' => '寬於',
 '宽余' => '寬餘',
@@ -5068,6 +5073,7 @@
 '干革命' => '幹革命',
 '干头' => '幹頭',
 '干么' => '幹麼',
+'幽并' => '幽并',
 '几个' => '幾個',
 '几周后' => '幾周後',
 '几天后' => '幾天後',
@@ -5392,6 +5398,7 @@
 '怒气冲天' => '怒氣衝天',
 '怒火冲天' => '怒火衝天',
 '怒发冲冠' => '怒髮衝冠',
+'怜奈' => '怜奈',
 '思如泉涌' => '思如泉湧',
 '怠于' => '怠於',
 '急于' => '急於',
@@ -5597,6 +5604,7 @@
 '拉面色' => '拉面色',
 '拉面部' => '拉面部',
 '拉面' => '拉麵',
+'拌面' => '拌麵',
 '拒人于' => '拒人於',
 '拒于' => '拒於',
 '拓朴' => '拓樸',
@@ -5695,6 +5703,7 @@
 '捶炼' => '捶鍊',
 '扫荡' => '掃蕩',
 '授勋' => '授勳',
+'授时历' => '授時曆',
 '掌柜' => '掌柜',
 '排干' => '排乾',
 '排干部' => '排幹部',
@@ -5910,6 +5919,7 @@
 '斫雕为朴' => '斫雕為樸',
 '新井里美' => '新井里美',
 '新干县' => '新幹縣',
+'新庄子' => '新庄子',
 '新历' => '新曆',
 '新历史' => '新歷史',
 '新扎' => '新紮',
@@ -6074,6 +6084,7 @@
 '村落发' => '村落發',
 '村里有' => '村裡有',
 '村里的' => '村裡的',
+'杜琪峰' => '杜琪峯',
 '杜老志道' => '杜老誌道',
 '杞宋无征' => '杞宋無徵',
 '束发' => '束髮',
@@ -6141,6 +6152,7 @@
 '梁上君子' => '梁上君子',
 '梁启超' => '梁啓超',
 '条干' => '條幹',
+'条文里' => '條文裡',
 '梨干' => '梨乾',
 '梯冲' => '梯衝',
 '械系' => '械繫',
@@ -6232,6 +6244,7 @@
 '欧游' => '歐遊',
 '止于' => '止於',
 '正官庄' => '正官庄',
+'正文里' => '正文裡',
 '正杰' => '正杰',
 '武丑' => '武丑',
 '武后' => '武后',
@@ -6274,8 +6287,6 @@
 '水并流' => '水併流',
 '水来汤里去' => '水來湯裡去',
 '水准' => '水準',
-'水无怜奈' => '水無怜奈',
-'水無怜奈' => '水無怜奈',
 '水表示' => '水表示',
 '水表面' => '水表面',
 '水里' => '水裡',
@@ -6333,7 +6344,6 @@
 '泰山梁木' => '泰山梁木',
 '泱郁' => '泱鬱',
 '泳气钟' => '泳氣鐘',
-'洄游' => '洄遊',
 '洋河大曲' => '洋河大麯',
 '洒家' => '洒家',
 '洒淅' => '洒淅',
@@ -6380,6 +6390,8 @@
 '涂敏恒' => '涂敏恆',
 '涂泽民' => '涂澤民',
 '涂澤民' => '涂澤民',
+'涂尔干' => '涂爾幹',
+'涂爾幹' => '涂爾幹',
 '涂紹煃' => '涂紹煃',
 '涂绍煃' => '涂紹煃',
 '涂羽卿' => '涂羽卿',
@@ -6712,21 +6724,18 @@
 '甜面酱' => '甜麵醬',
 '生力面' => '生力麵',
 '生于' => '生於',
-'生殖洄游' => '生殖洄游',
 '生物钟' => '生物鐘',
 '生发生' => '生發生',
 '生华发' => '生華髮',
 '生姜' => '生薑',
 '生锈' => '生鏽',
 '生发' => '生髮',
-'产卵洄游' => '產卵洄游',
 '苏醒' => '甦醒',
 '用于' => '用於',
 '用法里' => '用法裡',
 '甩发' => '甩髮',
 '田子里' => '田子里',
 '田庄英雄' => '田庄英雄',
-'田谷' => '田穀',
 '田里' => '田裡',
 '由余' => '由余',
 '由于' => '由於',
@@ -6743,6 +6752,7 @@
 '毕于' => '畢於',
 '毕业于' => '畢業於',
 '毕生发展' => '畢生發展',
+'画里' => '畫裡',
 '当准' => '當準',
 '当当丁丁' => '當當丁丁',
 '当当网' => '當當網',
@@ -7110,7 +7120,6 @@
 '吁求' => '籲求',
 '吁请' => '籲請',
 '米沈' => '米瀋',
-'米谷' => '米穀',
 '米团' => '米糰',
 '米余' => '米餘',
 '米面' => '米麵',
@@ -7190,6 +7199,7 @@
 '绑扎' => '綁紮',
 '绥棱' => '綏稜',
 '捆扎' => '綑紮',
+'经文里' => '經文裡',
 '經有云' => '經有云',
 '经有云' => '經有云',
 '综合征' => '綜合徵',
@@ -7248,7 +7258,6 @@
 '系上头' => '繫上頭',
 '系上黑' => '繫上黑',
 '系上，' => '繫上，',
-'系世' => '繫世',
 '系到' => '繫到',
 '系囚' => '繫囚',
 '系心' => '繫心',
@@ -7314,6 +7323,7 @@
 '老板' => '老闆',
 '老面皮' => '老面皮',
 '考征' => '考徵',
+'考试制度' => '考試制度',
 '耍斗' => '耍鬥',
 '耕获' => '耕穫',

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-5 - change (mediawiki/core)

2016-07-10 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/298180

Change subject: Chinese Conversion Table Update 2016-5
..

Chinese Conversion Table Update 2016-5

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: I63054fc4a6cdc6e0fc350a6509ca1154f9464f42
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/simp2trad.manual
M maintenance/language/zhtable/simp2trad_noconvert.manual
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/trad2simp_noconvert.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
9 files changed, 38 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/298180/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 87e957d..4d8e848 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -421,7 +421,6 @@
 '埘' => '塒',
 '埙' => '塤',
 '埚' => '堝',
-'埯' => '垵',
 '堑' => '塹',
 '堕' => '墮',
 '墙' => '牆',
@@ -3205,7 +3204,7 @@
 '不好干预' => '不好干預',
 '不嫌母丑' => '不嫌母醜',
 '不寒而栗' => '不寒而慄',
-'不吊' => '不弔',
+'不吊，' => '不弔，',
 '不卷' => '不捲',
 '不采' => '不採',
 '不斗胆' => '不斗膽',
@@ -3817,6 +3816,7 @@
 '并入' => '併入',
 '并兼' => '併兼',
 '并到' => '併到',
+'并力' => '併力',
 '并合' => '併合',
 '并名' => '併名',
 '并吞' => '併吞',
@@ -4036,7 +4036,7 @@
 '其次辟地' => '其次辟地',
 '其余' => '其餘',
 '典范' => '典範',
-'兼并' => '兼并',
+'兼并' => '兼併',
 '冉有仆' => '冉有僕',
 '冗余' => '冗餘',
 '冤仇' => '冤讎',
@@ -4423,6 +4423,7 @@
 '吟游' => '吟遊',
 '吧台' => '吧檯',
 '含齿戴发' => '含齒戴髮',
+'吸干' => '吸乾',
 '吹干' => '吹乾',
 '吹发' => '吹髮',
 '吹胡' => '吹鬍',
@@ -4966,7 +4967,6 @@
 '嶒棱' => '嶒稜',
 '岳岳' => '嶽嶽',
 '岳麓' => '嶽麓',
-'川谷' => '川穀',
 '巡回医疗' => '巡回醫療',
 '巡回' => '巡迴',
 '巡游' => '巡遊',
@@ -5009,7 +5009,6 @@
 '年谷' => '年穀',
 '年里' => '年裡',
 '年鉴' => '年鑑',
-'并力' => '并力',
 '并州' => '并州',
 '并日而食' => '并日而食',
 '并迭' => '并迭',
@@ -5120,7 +5119,6 @@
 '吊孝' => '弔孝',
 '吊客' => '弔客',
 '吊宴' => '弔宴',
-'吊带' => '弔帶',
 '吊影' => '弔影',
 '吊恤' => '弔恤',
 '吊慰' => '弔慰',
@@ -5129,7 +5127,6 @@
 '吊撒' => '弔撒',
 '吊文' => '弔文',
 '吊旗' => '弔旗',
-'吊死' => '弔死',
 '吊民' => '弔民',
 '吊祭' => '弔祭',
 '吊纸' => '弔紙',
@@ -5581,6 +5578,7 @@
 '抱素怀朴' => '抱素懷樸',
 '抵御' => '抵禦',
 '抹干' => '抹乾',
+'抽干' => '抽乾',
 '抽公签' => '抽公籤',
 '抽签' => '抽籤',
 '抿发' => '抿髮',
@@ -5698,6 +5696,8 @@
 '扫荡' => '掃蕩',
 '授勋' => '授勳',
 '掌柜' => '掌柜',
+'排干' => '排乾',
+'排干部' => '排幹部',
 '排骨面' => '排骨麵',
 '挂名' => '掛名',
 '挂历' => '掛曆',
@@ -8514,6 +8514,7 @@
 '炼金术' => '鍊金術',
 '锲而不舍' => '鍥而不捨',
 '镰仓' => '鎌倉',
+'镇里' => '鎮裡',
 '镜图里' => '鏡圖裡',
 '锈病' => '鏽病',
 '锈菌' => '鏽菌',
@@ -9428,7 +9429,6 @@
 '龜山庄' => '龜山庄',
 '龟鉴' => '龜鑑',
 '，并力' => '，並力',
-'，并力攻' => '，并力攻',
 '，并力討' => '，并力討',
 '，并力讨' => '，并力討',
 '，个中' => '，箇中',
@@ -9863,9 +9863,7 @@
 '圞' => 'ꢮ',
 '坿' => '附',
 '垜' => '垛',
-'垵' => '埯',
 '埡' => '垭',
-'埰' => '采',
 '執' => '执',
 '堅' => '坚',
 '堊' => '垩',
@@ -14088,7 +14086,6 @@
 '威士顿康星' => '威斯康辛',
 '威尔士' => '威爾斯',
 '威爾士' => '威爾斯',
-'字库' => '字型檔',
 '存盘' => '存檔',
 '孟德爾遜' => '孟德爾頌',
 '门德尔松' => '孟德爾頌',
@@ -17057,7 +17054,10 @@
 '見著述' => '見著述',
 '見著錄' => '見著錄',
 '視著' => '視着',
+'視著作' => '視著作',
 '視著名' => '視著名',
+'視著稱' => '視著稱',
+'視著者' => '視著者',
 '角落里' => '角落裏',
 '分辨率' => '解像度',
 '解析度' => '解像度',
@@ -17389,6 +17389,7 @@
 '鋪著者' => '鋪著者',
 '鋪著述' => '鋪著述',
 '鋪著錄' => '鋪著錄',
+'镇里' => '鎮裏',
 '镜图里' => '鏡圖裏',
 '钟在寺里' => '鐘在寺裏',
 '狄托' => '鐵托',
@@ -18394,7 +18395,6 @@
 '威爾斯' => '威尔士',
 '威斯伐倫' => '威斯特法伦',
 '字型大小' => '字号',
-'字型檔' => '字库',
 '欄位' => '字段',
 '位元組' => '字节',
 '存在著' => '存在着',
@@ -19852,7 +19852,10 @@
 '見著述' => '见著述',
 '規畫' => '规划',
 '視著' => '视着',
+'視著作' => '视著作',
 '視著名' => '视著名',
+'視著稱' => '视著称',
+'視著者' => '视著者',
 '占士邦' => '詹姆斯·邦德',
 '警戒著' => '警戒着',
 '計畫' => '计划',
diff --git a/maintenance/language/zhtable/simp2trad.manual 
b/maintenance/language/zhtable/simp2trad.manual
index 05f091f..bced265 100644
--- a/maintenance/language/zhtable/simp2trad.manual
+++ b/maintenance/language/zhtable/simp2trad.manual
@@ -201,7 +201,7 @@
 U+0915D酝|U+0919E醞|U+09196醖|
 U+09170酰|U+09170酰|U+091AF醯|
 U+09178酸|U+09178酸|U+075E0痠|
-U+091C7采|U+091C7采|U+063A1採|U+057F0埰|
+U+091C7采|U+091C7采|U+063A1採|U+05BC0寀|
 U+091CC里|U+091CC里|U+088E1裡|U+088CF裏|
 U+0949F钟|U+0937E鍾|U+09418鐘|
 U+094A9钩|U+0920E鈎|U+09264鉤|
diff --git a/maintenance/language/zhtable/simp2trad_noconvert.manual 
b/maintenance/language/zhtable/simp2trad_noconvert.manual
index 8e8df45..4ec46af 100644
--- a/maintenance/language/zhtable/simp2trad_noconvert.manual
+++ b/maintenance/language/zhtable/simp2trad_noconvert.manual
@@ -14,3 +14,4 @@
 薳
 虯
 凈
+垵
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index a81422d..bae5fd8 100644
---

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-4 - change (mediawiki/core)

2016-06-23 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295677

Change subject: Chinese Conversion Table Update 2016-4
..

Chinese Conversion Table Update 2016-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: I69a61766a9a1aa2cdb58d55434606afabba0e9b9
---
M languages/data/ZhConversion.php
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
7 files changed, 51 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/295677/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index b7943ed..87e957d 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3567,6 +3567,8 @@
 '于康震' => '于康震',
 '于广洲' => '于廣洲',
 '于廣洲' => '于廣洲',
+'于建嵘' => '于建嶸',
+'于建嶸' => '于建嶸',
 '于式枚' => '于式枚',
 '于从濂' => '于從濂',
 '于從濂' => '于從濂',
@@ -5141,6 +5143,7 @@
 '吊贺迎送' => '弔賀迎送',
 '吊头' => '弔頭',
 '吊鹤' => '弔鶴',
+'引发' => '引發',
 '引斗' => '引鬥',
 '弘历' => '弘曆',
 '弘历史' => '弘歷史',
@@ -5154,6 +5157,7 @@
 '张柏芝' => '張栢芝',
 '张乐于张徐' => '張樂于張徐',
 '張樂于張徐' => '張樂于張徐',
+'強制' => '強制',
 '强制' => '強制',
 '强制作用' => '強制作用',
 '强奸' => '強姦',
@@ -5262,8 +5266,6 @@
 '心系一' => '心繫一',
 '心系世' => '心繫世',
 '心系中' => '心繫中',
-'心系乔' => '心繫乔',
-'心繫乔' => '心繫乔',
 '心系五' => '心繫五',
 '心系京' => '心繫京',
 '心系人' => '心繫人',
@@ -5288,6 +5290,7 @@
 '心系和' => '心繫和',
 '心系哪' => '心繫哪',
 '心系唐' => '心繫唐',
+'心系乔' => '心繫喬',
 '心系嘱' => '心繫囑',
 '心系四' => '心繫四',
 '心系困' => '心繫困',
@@ -5625,7 +5628,6 @@
 '挌斗' => '挌鬥',
 '挑大梁' => '挑大樑',
 '挑斗' => '挑鬥',
-'振荡' => '振蕩',
 '捉奸徒' => '捉奸徒',
 '捉奸细' => '捉奸細',
 '捉奸贼' => '捉奸賊',
@@ -6070,9 +6072,8 @@
 '李連杰' => '李連杰',
 '材干' => '材幹',
 '村落发' => '村落發',
-'村里' => '村裡',
-'村里長' => '村里長',
-'村里长' => '村里長',
+'村里有' => '村裡有',
+'村里的' => '村裡的',
 '杜老志道' => '杜老誌道',
 '杞宋无征' => '杞宋無徵',
 '束发' => '束髮',
@@ -6627,7 +6628,7 @@
 '营干' => '營幹',
 '烩面' => '燴麵',
 '烬余' => '燼餘',
-'爆发指数' => '爆發指數',
+'爆发' => '爆發',
 '争奇斗妍' => '爭奇鬥妍',
 '争奇斗异' => '爭奇鬥異',
 '争奇斗艳' => '爭奇鬥豔',
@@ -6989,6 +6990,7 @@
 '谷保家商' => '穀保家商',
 '谷仓' => '穀倉',
 '谷圭' => '穀圭',
+'谷城县' => '穀城縣',
 '谷场' => '穀場',
 '谷子' => '穀子',
 '谷日' => '穀日',
@@ -7583,6 +7585,7 @@
 '姜老辣' => '薑老辣',
 '姜茶' => '薑茶',
 '姜蓉' => '薑蓉',
+'姜还是老的辣' => '薑還是老的辣',
 '姜饼' => '薑餅',
 '姜黄' => '薑黃',
 '薙发' => '薙髮',
@@ -8433,7 +8436,6 @@
 '里海茨' => '里海茨',
 '里铺' => '里舖',
 '重回' => '重回',
-'重折' => '重摺',
 '重于' => '重於',
 '重罗面' => '重羅麵',
 '重制' => '重製',
@@ -8674,6 +8676,7 @@
 '陈杰' => '陳杰',
 '陳杰' => '陳杰',
 '陈炼' => '陳鍊',
+'陶制' => '陶製',
 '阳春面' => '陽春麵',
 '阳历' => '陽曆',
 '阳历史' => '陽歷史',
@@ -8725,6 +8728,7 @@
 '雪里红' => '雪裡紅',
 '雪里蕻' => '雪裡蕻',
 '云吞' => '雲吞',
+'云吞面' => '雲吞麵',
 '云笈七签' => '雲笈七籤',
 '云里雾里' => '雲裡霧裡',
 '云游' => '雲遊',
@@ -14287,6 +14291,7 @@
 '鼠标' => '滑鼠',
 '汉诺威' => '漢諾瓦',
 '漢诺威' => '漢諾瓦',
+'乌冬面' => '烏龍麵',
 '烤烟' => '烤菸',
 '烤煙' => '烤菸',
 '无烟日' => '無菸日',
@@ -15006,6 +15011,7 @@
 '來著述' => '來著述',
 '來著錄' => '來著錄',
 '侵占' => '侵佔',
+'促著' => '促着',
 '俄占' => '俄佔',
 '保障著' => '保障着',
 '保障著作' => '保障著作',
@@ -15085,8 +15091,6 @@
 '凶殘' => '兇殘',
 '凶殺' => '兇殺',
 '先占' => '先佔',
-'雪鐵龍' => '先進',
-'雪铁龙' => '先進',
 '光著' => '光着',
 '光著作' => '光著作',
 '光著名' => '光著名',
@@ -15275,6 +15279,7 @@
 '咖哩' => '咖喱',
 '麥克風' => '咪高峰',
 '麦克风' => '咪高峰',
+'咬著' => '咬着',
 '哥特式' => '哥德式',
 '哥斯大黎加' => '哥斯達黎加',
 '哪里' => '哪裏',
@@ -16105,7 +16110,8 @@
 '本著述' => '本著述',
 '本著錄' => '本著錄',
 '里瓦尔多' => '李華度',
-'村里' => '村裏',
+'村里有' => '村裏有',
+'村里的' => '村裏的',
 '杜塞道夫' => '杜塞爾多夫',
 '迪拜' => '杜拜',
 '東協助' => '東協助',
@@ -16343,6 +16349,7 @@
 '為著者' => '為著者',
 '為著述' => '為著述',
 '為著錄' => '為著錄',
+'烏龍麵' => '烏冬麵',
 '菸' => '煙',
 '照占' => '照佔',
 '照著' => '照着',
@@ -17768,6 +17775,7 @@
 '麗著者' => '丽著者',
 '麗著述' => '丽著述',
 '麼著' => '么着',
+'烏龍麵' => '乌冬面',
 '樂著' => '乐着',
 '樂著書' => '乐著书',
 '樂著作' => '乐著作',
@@ -17897,7 +17905,9 @@
 '側著述' => '侧著述',
 '可攜式' => '便携式',
 '攜帶型' => '便携式',
+'促著' => '促着',
 '保護著' => '保护着',
+'保鑣' => '保镖',
 '保障著' => '保障着',
 '保障著書' => '保障著书',
 '保障著作' => '保障著作',
@@ -18233,6 +18243,7 @@
 '味著述' => '味著述',
 '咖哩' => '咖喱',
 '諮' => '咨',
+'咬著' => '咬着',
 '響著' => '响着',
 '響著書' => '响著书',
 '響著作' => '响著作',
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index 6cc3b68..a81422d 100644
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -64,6 +64,7 @@
 澈底 彻底
 仲介 中介
 卯足 铆足
+保鑣 保镖
 逕庭 径庭
 逕到 径到
 逕取 径取
@@ -2183,6 +2184,8 @@
 記錄著记录着
 紀錄著纪录着
 收錄著收录着
+促著 促着
+咬著 咬着
 三十六著   三十六着
 走為上著   走为上着
 記憶體内存
@@ -2665,3 +2668,4 @@
 行人路權   行人路权
 行人路权   行人路权
 塑膠袋塑料袋
+烏龍麵乌冬面
diff --git

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-3 - change (mediawiki/core)

2016-05-07 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/287307

Change subject: Chinese Conversion Table Update 2016-3
..

Chinese Conversion Table Update 2016-3

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: Ie9010f0e58a0949ea64362a2e2690fbcde3e0aad
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
7 files changed, 19 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/287307/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index e4998fc..b7943ed 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3820,7 +3820,6 @@
 '并吞' => '併吞',
 '并拢' => '併攏',
 '并案' => '併案',
-'并火' => '併火',
 '并为一家' => '併為一家',
 '并为一体' => '併為一體',
 '并叠' => '併疊',
@@ -4498,7 +4497,6 @@
 '嘴里' => '嘴裡',
 '恶心' => '噁心',
 '噙齿戴发' => '噙齒戴髮',
-'喷洒' => '噴洒',
 '当啷' => '噹啷',
 '当当' => '噹噹',
 '噜苏' => '嚕囌',
@@ -5507,6 +5505,7 @@
 '所有只' => '所有只',
 '所托' => '所託',
 '扁拟谷盗虫' => '扁擬穀盜蟲',
+'手冢治虫' => '手塚治虫',
 '手塚治虫' => '手塚治虫',
 '手折' => '手摺',
 '手表态' => '手表態',
@@ -6336,15 +6335,9 @@
 '洄游' => '洄遊',
 '洋河大曲' => '洋河大麯',
 '洒家' => '洒家',
-'洒扫' => '洒掃',
-'洒水' => '洒水',
-'洒洒' => '洒洒',
 '洒淅' => '洒淅',
-'洒涤' => '洒滌',
-'洒滌' => '洒滌',
 '洒濯' => '洒濯',
 '洒然' => '洒然',
-'洒脱' => '洒脫',
 '洗炼' => '洗鍊',
 '洗练' => '洗鍊',
 '洗发' => '洗髮',
@@ -6570,7 +6563,6 @@
 '沈阳' => '瀋陽',
 '泸州大曲' => '瀘州大麯',
 '沥干' => '瀝乾',
-'潇洒' => '瀟洒',
 '弥山遍野' => '瀰山遍野',
 '弥漫' => '瀰漫',
 '弥弥' => '瀰瀰',
@@ -6874,7 +6866,6 @@
 '着眼于' => '着眼於',
 '着眼於' => '着眼於',
 '困乏' => '睏乏',
-'困了' => '睏了',
 '困倦' => '睏倦',
 '困觉' => '睏覺',
 '睡游病' => '睡遊病',
@@ -9883,6 +9874,7 @@
 '塏' => '垲',
 '塒' => '埘',
 '塗' => '涂',
+'塚' => '冢',
 '塟' => '葬',
 '塢' => '坞',
 '塤' => '埙',
@@ -10094,7 +10086,6 @@
 '廵' => '巡',
 '廹' => '迫',
 '廻' => '回',
-'廼' => '乃',
 '弒' => '弑',
 '弔' => '吊',
 '弳' => '弪',
@@ -14282,8 +14273,8 @@
 '法属圭亚那' => '法屬蓋亞那',
 '波斯尼亚' => '波士尼亞',
 '波斯尼亞' => '波士尼亞',
-'波斯尼亚和黑塞哥维那' => '波士尼亞赫塞哥維納',
-'波斯尼亞黑塞哥維那' => '波士尼亞赫塞哥維納',
+'波斯尼亚和黑塞哥维那' => '波士尼亞與赫塞哥維納',
+'波斯尼亞和黑塞哥維那' => '波士尼亞與赫塞哥維納',
 '博茨瓦納' => '波札那',
 '博茨瓦纳' => '波札那',
 '波黑' => '波赫',
@@ -14531,6 +14522,7 @@
 '分辨率' => '解析度',
 '解像度' => '解析度',
 '译码' => '解碼',
+'触摸屏' => '觸控螢幕',
 '出租车' => '計程車',
 '约翰逊' => '詹森',
 '诺曼底' => '諾曼第',
@@ -16240,7 +16232,7 @@
 '法里，' => '法裏，',
 '玻里尼西亞' => '波利尼西亞',
 '波士尼亞' => '波斯尼亞',
-'波士尼亞赫塞哥維納' => '波斯尼亞黑塞哥維那',
+'波士尼亞與赫塞哥維納' => '波斯尼亞和黑塞哥維那',
 '宝莱坞' => '波里活',
 '寶萊塢' => '波里活',
 '幫浦' => '泵',
@@ -19150,7 +19142,7 @@
 '沿著述' => '沿著述',
 '玻里尼西亞' => '波利尼西亚',
 '波士尼亞' => '波斯尼亚',
-'波士尼亞赫塞哥維納' => '波斯尼亚和黑塞哥维那',
+'波士尼亞與赫塞哥維納' => '波斯尼亚和黑塞哥维那',
 '鐵達尼號' => '泰坦尼克号',
 '幫浦' => '泵',
 '辛巴威' => '津巴布韦',
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index fe99d8e..6cc3b68 100644
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -2316,7 +2316,7 @@
 模里西斯   毛里求斯
 沙地阿拉伯  沙特阿拉伯
 沙烏地阿拉伯 沙特阿拉伯
-波士尼亞赫塞哥維納  波斯尼亚和黑塞哥维那
+波士尼亞與赫塞哥維納 波斯尼亚和黑塞哥维那
 辛巴威津巴布韦
 宏都拉斯   洪都拉斯
 千里達托貝哥 特立尼达和托巴哥
diff --git a/maintenance/language/zhtable/toHK.manual 
b/maintenance/language/zhtable/toHK.manual
index 997acfc..ec9b3d7 100644
--- a/maintenance/language/zhtable/toHK.manual
+++ b/maintenance/language/zhtable/toHK.manual
@@ -2694,7 +2694,6 @@
 模里西斯   毛里裘斯
 沙地阿拉伯  沙特阿拉伯
 沙烏地阿拉伯 沙特阿拉伯
-波士尼亞赫塞哥維納  波斯尼亞黑塞哥維那
 辛巴威津巴布韋
 宏都拉斯   洪都拉斯
 千里達托貝哥 特立尼達和多巴哥
@@ -2808,6 +2807,7 @@
 塞拉耶佛   薩拉熱窩
 波士尼亞   波斯尼亞
 塞爾維亞與蒙特內哥羅 塞爾維亞和黑山
+波士尼亞與赫塞哥維納 波斯尼亞和黑塞哥維那
 卢塞恩琉森
 亞斯文阿斯旺
 奈及利亞   尼日利亞
diff --git a/maintenance/language/zhtable/toTW.manual 
b/maintenance/language/zhtable/toTW.manual
index 271a055..2a72501 100644
--- a/maintenance/language/zhtable/toTW.manual
+++ b/maintenance/language/zhtable/toTW.manual
@@ -327,8 +327,8 @@
 毛里裘斯   模里西斯
 沙特阿拉伯  沙烏地阿拉伯
 沙地阿拉伯  沙烏地阿拉伯
-波斯尼亚和黑塞哥维那 波士尼亞赫塞哥維納
-波斯尼亞黑塞哥維那  波士尼亞赫塞哥維納
+波斯尼亚和黑塞哥维那 波士尼亞與赫塞哥維納
+波斯尼亞和黑塞哥維那 波士尼亞與赫塞哥維納
 津巴布韦   辛巴威
 津巴布韋   辛巴威
 洪都拉斯   宏都拉斯
@@ -778,3 +778,4 @@
 行人路权   行人路權
 塑料袋塑膠袋
 桃金娘桃金孃
+触摸屏觸控螢幕
diff --git a/maintenance/language/zhtable/trad2simp.manual 
b/maintenance/language/zhtable/trad2simp.manual
index c9d78b7..e5b05ff 100644
--- a/maintenance/language/zhtable/trad2simp.manual
+++ b/maintenance/language/zhtable/trad2simp.manual
@@ -135,6 +135,7 @@
 U+05705圅|U+051FD函|
 U+0577F坿|U+09644附|
 U+0579C垜|U+0579B垛|
+U+0585A塚|U+051A2冢|
 U+0585F塟|U+0846C葬|
 U+05872塲|U+0573A场|
 U+05896墖|U+05854塔|
@@ -200,7 +201,6 @@
 U+05EF5廵|U+05DE1巡|
 U+05EF9廹|U+08FEB迫|

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-2 - change (mediawiki/core)

2016-04-13 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/283376

Change subject: Chinese Conversion Table Update 2016-2
..

Chinese Conversion Table Update 2016-2

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: Ibbfb156d307bff81752d9b5f82733131b8b398de
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
6 files changed, 126 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/283376/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 08a40b8..37973bb 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3220,6 +3220,7 @@
 '不采声' => '不采聲',
 '不采聲' => '不采聲',
 '不锈钢' => '不鏽鋼',
+'不食乾腊' => '不食乾腊',
 '不食干腊' => '不食乾腊',
 '不斗' => '不鬥',
 '丑三' => '丑三',
@@ -3273,6 +3274,7 @@
 '丰容' => '丰容',
 '丰情' => '丰情',
 '丰标' => '丰標',
+'丰標' => '丰標',
 '丰标不凡' => '丰標不凡',
 '丰標不凡' => '丰標不凡',
 '丰神' => '丰神',
@@ -3299,6 +3301,7 @@
 '么爷' => '么爺',
 '么雞' => '么雞',
 '么么小丑' => '么麼小丑',
+'么麼小丑' => '么麼小丑',
 '之一只' => '之一只',
 '之二只' => '之二只',
 '之八九只' => '之八九只',
@@ -3497,6 +3500,7 @@
 '于仁泰' => '于仁泰',
 '于仲文' => '于仲文',
 '于佳卉' => '于佳卉',
+'于來山' => '于來山',
 '于来山' => '于來山',
 '于伟国' => '于偉國',
 '于偉國' => '于偉國',
@@ -3509,17 +3513,20 @@
 '于再清' => '于再清',
 '于冕' => '于冕',
 '于冠华' => '于冠華',
+'于冠華' => '于冠華',
 '于凌奎' => '于凌奎',
 '于凌辰' => '于凌辰',
 '于勒' => '于勒',
 '于化虎' => '于化虎',
 '于占元' => '于占元',
 '于友泽' => '于友澤',
+'于友澤' => '于友澤',
 '于台烟' => '于台煙',
 '于台煙' => '于台煙',
 '于右任' => '于右任',
 '于吉' => '于吉',
 '于和伟' => '于和偉',
+'于和偉' => '于和偉',
 '于品海' => '于品海',
 '于国桢' => '于國楨',
 '于國楨' => '于國楨',
@@ -3530,6 +3537,7 @@
 '于大宝' => '于大寶',
 '于大寶' => '于大寶',
 '于天仁' => '于天仁',
+'于天龍' => '于天龍',
 '于天龙' => '于天龍',
 '于奇库杜克' => '于奇庫杜克',
 '于奇庫杜克' => '于奇庫杜克',
@@ -3543,6 +3551,7 @@
 '于家堡' => '于家堡',
 '于寘' => '于寘',
 '于宝轩' => '于寶軒',
+'于寶軒' => '于寶軒',
 '于小伟' => '于小偉',
 '于小偉' => '于小偉',
 '于小彤' => '于小彤',
@@ -3565,6 +3574,7 @@
 '于志宁' => '于志寧',
 '于志寧' => '于志寧',
 '于忠肃集' => '于忠肅集',
+'于忠肅集' => '于忠肅集',
 '于思' => '于思',
 '于慎行' => '于慎行',
 '于慧' => '于慧',
@@ -3593,6 +3603,7 @@
 '于格' => '于格',
 '于枫' => '于楓',
 '于楓' => '于楓',
+'于榮光' => '于榮光',
 '于荣光' => '于榮光',
 '于樂' => '于樂',
 '于树洁' => '于樹潔',
@@ -3644,6 +3655,7 @@
 '于西翰' => '于西翰',
 '于謙' => '于謙',
 '于谦' => '于謙',
+'于謹' => '于謹',
 '于谨' => '于謹',
 '于貝爾' => '于貝爾',
 '于贝尔' => '于貝爾',
@@ -3662,6 +3674,7 @@
 '于双戈' => '于雙戈',
 '于雙戈' => '于雙戈',
 '于云鹤' => '于雲鶴',
+'于雲鶴' => '于雲鶴',
 '于震' => '于震',
 '于震寰' => '于震寰',
 '于震环' => '于震環',
@@ -3754,9 +3767,11 @@
 '伊斯兰历' => '伊斯蘭曆',
 '伊斯兰历史' => '伊斯蘭歷史',
 '伊东怜' => '伊東怜',
+'伊東怜' => '伊東怜',
 '伊尔汗历表' => '伊爾汗曆表',
 '伊达里子' => '伊達里子',
 '伊适杰' => '伊適杰',
+'伊適杰' => '伊適杰',
 '伊里布' => '伊里布',
 '伊郁' => '伊鬱',
 '伏几' => '伏几',
@@ -3780,6 +3795,7 @@
 '余光中' => '余光中',
 '余光生' => '余光生',
 '余力为' => '余力為',
+'余力為' => '余力為',
 '余威德' => '余威德',
 '余子明' => '余子明',
 '余思敏' => '余思敏',
@@ -3804,7 +3820,6 @@
 '并吞' => '併吞',
 '并拢' => '併攏',
 '并案' => '併案',
-'并流' => '併流',
 '并火' => '併火',
 '并为一家' => '併為一家',
 '并为一体' => '併為一體',
@@ -3909,6 +3924,7 @@
 '俭仆' => '儉僕',
 '俭朴' => '儉樸',
 '俭确之教' => '儉确之教',
+'儉确之教' => '儉确之教',
 '儒略改革历' => '儒略改革曆',
 '儒略改革历史' => '儒略改革歷史',
 '儒略历' => '儒略曆',
@@ -3957,7 +3973,9 @@
 '党姓' => '党姓',
 '党家' => '党家',
 '党怀英' => '党懷英',
+'党懷英' => '党懷英',
 '党进' => '党進',
+'党進' => '党進',
 '党項' => '党項',
 '党项' => '党項',
 '内脏' => '內臟',
@@ -3990,6 +4008,8 @@
 '公仔面' => '公仔麵',
 '公仆' => '公僕',
 '公孙丑' => '公孫丑',
+'公寓里' => '公寓裡',
+'公寓里弄' => '公寓里弄',
 '公干' => '公幹',
 '公历' => '公曆',
 '公历史' => '公歷史',
@@ -4001,6 +4021,7 @@
 '六天后' => '六天後',
 '六年' => '六年',
 '六楼后座' => '六樓后座',
+'六樓后座' => '六樓后座',
 '六谷' => '六穀',
 '六扎' => '六紮',
 '六冲' => '六衝',
@@ -4042,6 +4063,7 @@
 '几椅' => '几椅',
 '几榻' => '几榻',
 '几净窗明' => '几淨窗明',
+'几淨窗明' => '几淨窗明',
 '几筵' => '几筵',
 '几面上' => '几面上',
 '凶征' => '凶徵',
@@ -4063,11 +4085,13 @@
 '分钟里' => '分鐘裡',
 '刑余' => '刑餘',
 '划一桨' => '划一槳',
+'划一槳' => '划一槳',
 '划上' => '划上',
 '划下' => '划下',
 '划不來' => '划不來',
 '划不来' => '划不來',
 '划了一会' => '划了一會',
+'划了一會' => '划了一會',
 '划來划去' => '划來划去',
 '划来划去' => '划來划去',
 '划具' => '划具',
@@ -4084,6 +4108,7 @@
 '划槳' => '划槳',
 '划水' => '划水',
 '划着独木舟' => '划着獨木舟',
+'划着獨木舟' => '划着獨木舟',
 '划着竹筏' => '划着竹筏',
 '划着船' => '划着船',
 '划算' => '划算',
@@ -4145,6 +4170,7 @@
 '刘佳怜' => '劉佳怜',
 '劉佳怜' => '劉佳怜',
 '刘芸后' => '劉芸后',
+'劉芸后' => '劉芸后',
 '力拼' => '力拚',
 '力拼众敌' => '力拼眾敵',
 '力争上游' => '力爭上遊',
@@ -4332,6 +4358,7 @@
 '叶恭弘' => '叶恭弘',
 '叶音' => '叶音',
 '叶韵' => '叶韻',
+'叶韻' => '叶韻',
 '吃板刀面' => '吃板刀麵',
 '吃碗面' => '吃碗麵',
 '吃姜' => '吃薑',
@@ -4443,8 +4470,10 @@
 '启发式' => '啟發式',
 '啷当' => '啷噹',
 '喂了一声' => '喂了一聲',
+'喂了一聲' => '喂了一聲',
 '喂喂' => '喂喂',
 '喂哟' => '喂喲',
+'喂喲' => '喂喲',
 '喂！' => '喂！',
 '喂，' => '喂，',
 '善于' =>

[MediaWiki-commits] [Gerrit] Convert array() syntax to [] in Makefile.py - change (mediawiki/core)

2016-03-11 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/276707

Change subject: Convert array() syntax to [] in Makefile.py
..

Convert array() syntax to [] in Makefile.py

Update Makefile.py for Chinese conversion table to convert array() syntax to [] 
in languages/data/ZhConversion.php .

Change-Id: I10ba5d16ca619f64458feba51e12c3bd5d18435d
---
M maintenance/language/zhtable/Makefile.py
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/276707/1

diff --git a/maintenance/language/zhtable/Makefile.py 
b/maintenance/language/zhtable/Makefile.py
index 999f25c..15a1cb9 100755
--- a/maintenance/language/zhtable/Makefile.py
+++ b/maintenance/language/zhtable/Makefile.py
@@ -417,17 +417,17 @@
 namespace MediaWiki\Languages\Data;
 
 class ZhConversion {
-public static $zh2Hant = array(\n'''
+public static $zh2Hant = [\n'''
 php += PHPArray(toHant) \
-+ '\n);\n\npublic static $zh2Hans = array(\n' \
++ '\n];\n\npublic static $zh2Hans = [\n' \
 + PHPArray(toHans) \
-+ '\n);\n\npublic static $zh2TW = array(\n' \
++ '\n];\n\npublic static $zh2TW = [\n' \
 + PHPArray(toTW) \
-+ '\n);\n\npublic static $zh2HK = array(\n' \
++ '\n];\n\npublic static $zh2HK = [\n' \
 + PHPArray(toHK) \
-+ '\n);\n\npublic static $zh2CN = array(\n' \
++ '\n];\n\npublic static $zh2CN = [\n' \
 + PHPArray(toCN) \
-+ '\n);\n}\n'
++ '\n];\n}\n'
 
 if pyversion[:1] in ['2']:
 f = open(os.path.join('..', '..', '..', 'languages', 'data', 
'ZhConversion.php'), 'wb', encoding='utf8')

-- 
To view, visit https://gerrit.wikimedia.org/r/276707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10ba5d16ca619f64458feba51e12c3bd5d18435d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chiefwei 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-1 - change (mediawiki/core)

2016-03-10 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/276679

Change subject: Chinese Conversion Table Update 2016-1
..

Chinese Conversion Table Update 2016-1

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
 .

Update makefile.py to convert all array() syntax to [].

It is only data changes and only works for Chinese WikiProjects.

Change-Id: I39f9945a38078364a740dbb552f87d4bcf62033c
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/Makefile.py
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/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
9 files changed, 139 insertions(+), 129 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/276679/1

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index d273085..08a40b8 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3237,6 +3237,7 @@
 '世纪钟' => '世紀鐘',
 '世纪钟表' => '世紀鐘錶',
 '丢丑' => '丟醜',
+'并吞下' => '並吞下',
 '并曰入淀' => '並曰入澱',
 '并发动' => '並發動',
 '并发展' => '並發展',
@@ -3709,7 +3710,6 @@
 '井干' => '井幹',
 '井里' => '井裡',
 '亚于' => '亞於',
-'亚美尼亚历' => '亞美尼亞曆',
 '交托' => '交託',
 '交游' => '交遊',
 '交哄' => '交鬨',
@@ -3730,7 +3730,6 @@
 '仁贵' => '仁貴',
 '介胄' => '介冑',
 '他干的' => '他幹的',
-'他钟' => '他鐘',
 '付托' => '付託',
 '仙后' => '仙后',
 '仙后座' => '仙后座',
@@ -3802,7 +3801,7 @@
 '并到' => '併到',
 '并合' => '併合',
 '并名' => '併名',
-'并吞下' => '併吞下',
+'并吞' => '併吞',
 '并拢' => '併攏',
 '并案' => '併案',
 '并流' => '併流',
@@ -3823,7 +3822,6 @@
 '使其斗' => '使其鬥',
 '来于' => '來於',
 '侍仆' => '侍僕',
-'供制' => '供製',
 '依依不舍' => '依依不捨',
 '依托' => '依託',
 '侵并' => '侵併',
@@ -4374,6 +4372,8 @@
 '后稷' => '后稷',
 '后綜' => '后綜',
 '后羿' => '后羿',
+'后苍' => '后蒼',
+'后蒼' => '后蒼',
 '后街' => '后街',
 '后角' => '后角',
 '后丰' => '后豐',
@@ -4404,6 +4404,7 @@
 '呆致致' => '呆緻緻',
 '呆里呆气' => '呆裡呆氣',
 '告札' => '告劄',
+'告里' => '告裡',
 '呦喂' => '呦喂',
 '周后' => '周后',
 '周惠后' => '周惠后',
@@ -4662,12 +4663,10 @@
 '大明历史' => '大明歷史',
 '大历' => '大曆',
 '大本钟' => '大本鐘',
-'大本钟敲' => '大本鐘敲',
 '大历史' => '大歷史',
 '大病初愈' => '大病初癒',
 '大目干连' => '大目乾連',
 '大笨钟' => '大笨鐘',
-'大笨钟敲' => '大笨鐘敲',
 '大蜡' => '大蜡',
 '大衍历' => '大衍曆',
 '大衍历史' => '大衍歷史',
@@ -4973,7 +4972,6 @@
 '年里' => '年裡',
 '年鉴' => '年鑑',
 '并力' => '并力',
-'并吞' => '并吞',
 '并州' => '并州',
 '并日而食' => '并日而食',
 '并迭' => '并迭',
@@ -5090,7 +5088,6 @@
 '吊慰' => '弔慰',
 '吊扣' => '弔扣',
 '吊拷' => '弔拷',
-'吊挂' => '弔掛',
 '吊撒' => '弔撒',
 '吊文' => '弔文',
 '吊旗' => '弔旗',
@@ -5118,7 +5115,9 @@
 '张勋' => '張勳',
 '张杰' => '張杰',
 '張杰' => '張杰',
+'张柏芝' => '張栢芝',
 '张乐于张徐' => '張樂于張徐',
+'强制' => '強制',
 '强制作用' => '強制作用',
 '强奸' => '強姦',
 '强干' => '強幹',
@@ -5171,7 +5170,6 @@
 '复始' => '復始',
 '复活节历表' => '復活節曆表',
 '复苏' => '復甦',
-'征人' => '徵人',
 '征令' => '徵令',
 '征信' => '徵信',
 '征候' => '徵候',
@@ -5399,6 +5397,8 @@
 '恶斗' => '惡鬥',
 '惴栗' => '惴慄',
 '意大利面' => '意大利麵',
+'愛河里花子' => '愛河里花子',
+'爱河里花子' => '愛河里花子',
 '爱困' => '愛睏',
 '感于' => '感於',
 '愿朴' => '愿樸',
@@ -5513,7 +5513,7 @@
 '扛大梁' => '扛大樑',
 '扯面' => '扯麵',
 '扶余' => '扶餘',
-'批准的' => '批准的',
+'批准' => '批准',
 '批准确定' => '批准確定',
 '批复' => '批覆',
 '批注' => '批註',
@@ -5577,16 +5577,8 @@
 '拳局' => '拳跼',
 '拼死拼活' => '拼死拼活',
 '拾沈' => '拾瀋',
-'拿下表' => '拿下錶',
-'拿下钟' => '拿下鐘',
 '拿准' => '拿準',
 '拿破仑' => '拿破崙',
-'挂图' => '挂圖',
-'挂帅' => '挂帥',
-'挂彩' => '挂彩',
-'挂念' => '挂念',
-'挂号' => '挂號',
-'挂车' => '挂車',
 '挌斗' => '挌鬥',
 '挑大梁' => '挑大樑',
 '挑斗' => '挑鬥',
@@ -5663,10 +5655,8 @@
 '掌柜' => '掌柜',
 '排骨面' => '排骨麵',
 '挂名' => '掛名',
-'挂帘' => '掛帘',
 '挂历' => '掛曆',
 '挂钩' => '掛鈎',
-'挂钟' => '掛鐘',
 '挂面' => '掛麵',
 '采下' => '採下',
 '采伐' => '採伐',
@@ -6086,7 +6076,7 @@
 '栗栖溪' => '栗栖溪',
 '校准' => '校準',
 '校舍' => '校舍',
-'核准的' => '核准的',
+'核准' => '核准',
 '格于' => '格於',
 '格范' => '格範',
 '格里历' => '格里曆',
@@ -6599,7 +6589,7 @@
 '争斗' => '爭鬥',
 '爰定祥历' => '爰定祥厤',
 '爽荡' => '爽蕩',
-'尔冬陞' => '爾冬陞',
+'尔冬升' => '爾冬陞',
 '墙里' => '牆裡',
 '片里' => '片裡',
 '片言只语' => '片言隻語',
@@ -6665,7 +6655,9 @@
 '甄后' => '甄后',
 '瓮安' => '甕安',
 '甚于' => '甚於',
+'甜、咸' => '甜、鹹',
 '甜水面' => '甜水麵',
+'甜咸' => '甜鹹',
 '甜面酱' => '甜麵醬',
 '生力面' => '生力麵',
 '生于' => '生於',
@@ -6692,6 +6684,9 @@
 '男仆' => '男僕',
 '界里' => '界裡',
 '畏于' => '畏於',
+'留发展' => '留發展',
+'留发生' => '留發生',
+'留发行' => '留發行',
 '留长发' => '留長髮',
 '留发' => '留髮',
 '毕于' => '畢於',
@@ -6805,8 +6800,6 @@
 '相于' => '相於',
 '相冲' => '相衝',
 '相斗' => '相鬥',
-'看下表' => '看下錶',
-'看下钟' => '看下鐘',
 '看法里' => '看法裡',
 '看准' => '看準',
 '看表面' => '看表面',
@@ -6827,8 +6820,6 @@
 '困觉' => '睏覺',
 '睡游病' => '睡遊病',
 '瞄准' => '瞄準',
-'瞅下表' => '瞅下錶',
-'瞅下钟' => '瞅下鐘',
 '瞎蒙' => '瞎矇',
 '了望' => '瞭望',
 '了然' => '瞭然',
@@ -6864,6 +6855,7 @@
 '确瘠' => '确瘠',
 '碑志' => '碑誌',
 '碗里' => '碗裡',
+'碧河里' => '碧河里',
 '碰钟' => '碰鐘',
 '确系' => '確係',
 '码表' => '碼錶',
@@ -6921,6 +6913,7 @@
 '秦沈客运' => '秦瀋客運',
 '移祸于' => '移禍於',
 '稀松'

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-9 - change (mediawiki/core)

2015-12-06 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257196

Change subject: Chinese Conversion Table Update 2015-9
..

Chinese Conversion Table Update 2015-9

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: Icb47cf7d30a9bf09d55af9e96e34b9b5c6d6c9cf
---
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, 101 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/257196/1

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 9e7d12c..e70f3e6 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -294,6 +294,7 @@
 '卖' => '賣',
 '卢' => '盧',
 '卤' => '鹵',
+'卧' => '臥',
 '卫' => '衛',
 '却' => '卻',
 '厂' => '廠',
@@ -3424,6 +3425,7 @@
 '干股' => '乾股',
 '干肥' => '乾肥',
 '干脆' => '乾脆',
+'干脆面' => '乾脆麵',
 '干花' => '乾花',
 '干刍' => '乾芻',
 '干苔' => '乾苔',
@@ -3564,6 +3566,7 @@
 '于慧' => '于慧',
 '于成龍' => '于成龍',
 '于成龙' => '于成龍',
+'于承惠' => '于承惠',
 '于振' => '于振',
 '于振武' => '于振武',
 '于敏' => '于敏',
@@ -3644,6 +3647,7 @@
 '于赠' => '于贈',
 '于越' => '于越',
 '于軍' => '于軍',
+'于逸堯' => '于逸堯',
 '于道泉' => '于道泉',
 '于远伟' => '于遠偉',
 '于遠偉' => '于遠偉',
@@ -3829,6 +3833,8 @@
 '信托' => '信託',
 '修杰楷' => '修杰楷',
 '修杰麟' => '修杰麟',
+'修筑前' => '修築前',
+'修筑后' => '修築後',
 '修胡刀' => '修鬍刀',
 '俯冲' => '俯衝',
 '个月里' => '個月裡',
@@ -4112,7 +4118,6 @@
 '削面' => '削麵',
 '克剥' => '剋剝',
 '克扣' => '剋扣',
-'克星' => '剋星',
 '克期' => '剋期',
 '克死' => '剋死',
 '克薄' => '剋薄',
@@ -4235,6 +4240,7 @@
 '去山里' => '去山裡',
 '参数只' => '參數只',
 '参数里' => '參數裡',
+'反反复复' => '反反覆覆',
 '反应制得' => '反應製得',
 '反朴' => '反樸',
 '反冲' => '反衝',
@@ -4736,14 +4742,10 @@
 '委托书' => '委託書',
 '奸夫' => '姦夫',
 '奸妇' => '姦婦',
-'奸宄' => '姦宄',
 '奸情' => '姦情',
 '奸杀' => '姦殺',
 '奸污' => '姦污',
 '奸淫' => '姦淫',
-'奸猾' => '姦猾',
-'奸细' => '姦細',
-'奸邪' => '姦邪',
 '威棱' => '威稜',
 '婢仆' => '婢僕',
 '嫁祸于' => '嫁禍於',
@@ -4758,6 +4760,7 @@
 '子里' => '子裡',
 '子里甲' => '子里甲',
 '字汇' => '字彙',
+'字母后' => '字母後',
 '字码表' => '字碼表',
 '字里行间' => '字裡行間',
 '存折' => '存摺',
@@ -5056,8 +5059,11 @@
 '廢后' => '廢后',
 '广征' => '廣徵',
 '广舍' => '廣捨',
+'广播里' => '廣播裡',
 '延历' => '延曆',
 '建于' => '建於',
+'建筑前' => '建築前',
+'建筑后' => '建築後',
 '弄干' => '弄乾',
 '弄丑' => '弄醜',
 '弄脏胸' => '弄髒胸',
@@ -5131,6 +5137,7 @@
 '影后' => '影后',
 '影相吊' => '影相弔',
 '役于' => '役於',
+'往复式' => '往復式',
 '往日无仇' => '往日無讎',
 '往里' => '往裡',
 '待复' => '待覆',
@@ -5405,7 +5412,6 @@
 '欲令智昏' => '慾令智昏',
 '欲壑难填' => '慾壑難填',
 '欲念' => '慾念',
-'欲望' => '慾望',
 '欲海' => '慾海',
 '欲火' => '慾火',
 '欲障' => '慾障',
@@ -5472,6 +5478,7 @@
 '手表面' => '手表面',
 '手里剑' => '手裏劍',
 '手里' => '手裡',
+'手游' => '手遊',
 '手表' => '手錶',
 '手链' => '手鍊',
 '手松' => '手鬆',
@@ -6227,6 +6234,7 @@
 '水来汤里去' => '水來湯裡去',
 '水准' => '水準',
 '水无怜奈' => '水無怜奈',
+'水表示' => '水表示',
 '水表面' => '水表面',
 '水里' => '水裡',
 '水里商工' => '水里商工',
@@ -6499,6 +6507,7 @@
 '沈丹客运' => '瀋丹客運',
 '沈丹线' => '瀋丹線',
 '沈丹铁路' => '瀋丹鐵路',
+'沈丹高' => '瀋丹高',
 '沈北' => '瀋北',
 '沈吉' => '瀋吉',
 '沈大线' => '瀋大線',
@@ -6714,7 +6723,6 @@
 '发松' => '發鬆',
 '发面' => '發麵',
 '白干儿' => '白乾兒',
-'白子里' => '白子里',
 '白术' => '白朮',
 '白朴' => '白樸',
 '白净面皮' => '白淨面皮',
@@ -6735,6 +6743,7 @@
 '百只足夠' => '百只足夠',
 '百周后' => '百周後',
 '百天后' => '百天後',
+'百子里' => '百子里',
 '百年' => '百年',
 '百拙千丑' => '百拙千醜',
 '百科里' => '百科裡',
@@ -6970,6 +6979,7 @@
 '窗明几净' => '窗明几淨',
 '窗帘' => '窗簾',
 '窝里' => '窩裡',
+'窝里斗' => '窩裡鬥',
 '穷于' => '窮於',
 '穷追不舍' => '窮追不捨',
 '穷发' => '窮髮',
@@ -7280,6 +7290,7 @@
 '聚药雄蕊' => '聚葯雄蕊',
 '闻风后' => '聞風後',
 '联系' => '聯繫',
+'声母后' => '聲母後',
 '听于' => '聽於',
 '肉干' => '肉乾',
 '肉欲' => '肉慾',
@@ -7970,11 +7981,13 @@
 '警报钟' => '警報鐘',
 '警示钟' => '警示鐘',
 '警钟' => '警鐘',
+'译制' => '譯製',
 '译注' => '譯註',
 '护发' => '護髮',
 '变征' => '變徵',
 '变丑' => '變醜',
 '仇隙' => '讎隙',
+'赞一个' => '讚一個',
 '赞不绝口' => '讚不絕口',
 '赞佩' => '讚佩',
 '赞呗' => '讚唄',
@@ -8593,7 +8606,6 @@
 '防御' => '防禦',
 '防范' => '防範',
 '防锈' => '防鏽',
-'防台' => '防颱',
 '阻于' => '阻於',
 '阿里' => '阿里',
 '附于' => '附於',
@@ -8683,6 +8695,7 @@
 '电码表' => '電碼表',
 '电冲' => '電衝',
 '电视台风' => '電視台風',
+'电视里' => '電視裡',
 '电表' => '電錶',
 '电钟' => '電鐘',
 '震栗' => '震慄',
@@ -9345,7 +9358,6 @@
 '齿危发秀' => '齒危髮秀',
 '齿落发白' => '齒落髮白',
 '齿发' => '齒髮',
-'出儿' => '齣兒',
 '龙岩' => '龍巖',
 '龙卷' => '龍捲',
 '龙眼干' => '龍眼乾',
@@ -9354,6 +9366,10 @@
 '龙斗虎伤' => '龍鬥虎傷',
 '龜山庄' => '龜山庄',
 '龟鉴' => '龜鑑',
+'，并力' => '，並力',
+'，并力攻' => '，并力攻',
+'，并力討' => '，并力討',
+'，并力讨' => '，并力討',
 '，个中' => '，箇中',
 );
 
@@ -13874,6 +13890,8 @@
 '傅里叶' => '傅立葉',
 '光盘' => '光碟',
 '光驱' => '光碟機',
+'开普勒' => '克卜勒',
+'開普勒' => '克卜勒',
 '克罗地亚' => '克羅埃西亞',
 '克羅地亞' => '克羅埃西亞',
 '克里斯托弗' => '克里斯多福',
@@ -13896,6 +13914,7 @@
 '包豪斯' => '包浩斯',
 '北朝鲜' => '北韓',
 '局域网'

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-8 - change (mediawiki/core)

2015-09-29 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/242064

Change subject: Chinese Conversion Table Update 2015-8
..

Chinese Conversion Table Update 2015-8

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: Ic9a467a79a0a4c2af8092ff8e22200993e801492
---
M includes/ZhConversion.php
M maintenance/language/zhtable/simp2trad.manual
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/toTW.manual
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
11 files changed, 163 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/242064/1

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 893ae04..a74663d 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -239,7 +239,7 @@
 '决' => '決',
 '况' => '況',
 '冻' => '凍',
-'净' => '凈',
+'净' => '淨',
 '凄' => '淒',
 '凉' => '涼',
 '减' => '減',
@@ -3720,7 +3720,7 @@
 '人生天里' => '人生天里',
 '人发指' => '人髮指',
 '什锦面' => '什錦麵',
-'仇仇' => '仇讎',
+'仁贵' => '仁貴',
 '介胄' => '介冑',
 '他干的' => '他幹的',
 '他钟' => '他鐘',
@@ -3846,7 +3846,6 @@
 '倦游' => '倦遊',
 '假里' => '假裡',
 '假托' => '假託',
-'假里白' => '假里白',
 '假发' => '假髮',
 '偎干' => '偎乾',
 '停停当当' => '停停當當',
@@ -4144,7 +4143,6 @@
 '力拼众敌' => '力拼眾敵',
 '力争上游' => '力爭上遊',
 '功勋' => '功勳',
-'功致' => '功緻',
 '加氢精制' => '加氫精制',
 '劣于' => '劣於',
 '助于' => '助於',
@@ -4237,6 +4235,7 @@
 '去山里' => '去山裡',
 '参数只' => '參數只',
 '参数里' => '參數裡',
+'反应制得' => '反應製得',
 '反朴' => '反樸',
 '反冲' => '反衝',
 '反复制' => '反複製',
@@ -4408,6 +4407,7 @@
 '命中注定' => '命中注定',
 '和奸' => '和姦',
 '和制汉' => '和製漢',
+'和制英语' => '和製英語',
 '咎征' => '咎徵',
 '咕咕钟' => '咕咕鐘',
 '咪表' => '咪錶',
@@ -4672,6 +4672,7 @@
 '大只' => '大隻',
 '大风后' => '大風後',
 '天克地冲' => '天克地衝',
+'天台' => '天台',
 '天后' => '天后',
 '天后宫' => '天后宮',
 '天地志狼' => '天地志狼',
@@ -4928,7 +4929,6 @@
 '巡回' => '巡迴',
 '巡游' => '巡遊',
 '工作台' => '工作檯',
-'工致' => '工緻',
 '左冲右突' => '左衝右突',
 '巧干' => '巧幹',
 '巧历' => '巧曆',
@@ -5034,6 +5034,7 @@
 '几只' => '幾隻',
 '几出' => '幾齣',
 '广部' => '广部',
+'庄司' => '庄司',
 '床席' => '床蓆',
 '店里' => '店裡',
 '府干卿' => '府干卿',
@@ -5130,7 +5131,7 @@
 '影后' => '影后',
 '影相吊' => '影相弔',
 '役于' => '役於',
-'往日無仇' => '往日無讎',
+'往日无仇' => '往日無讎',
 '往里' => '往裡',
 '待复' => '待覆',
 '很干' => '很乾',
@@ -5382,6 +5383,7 @@
 '凄酸' => '悽酸',
 '情欲' => '情慾',
 '惇朴' => '惇樸',
+'惠文后' => '惠文后',
 '恶仆' => '惡僕',
 '恶直丑正' => '惡直醜正',
 '恶斗' => '惡鬥',
@@ -5417,6 +5419,8 @@
 '宪法里' => '憲法裡',
 '恳托' => '懇託',
 '懈松' => '懈鬆',
+'应制得' => '應制得',
+'應制得' => '應制得',
 '应征' => '應徵',
 '应钟' => '應鐘',
 '懔栗' => '懍慄',
@@ -5504,7 +5508,7 @@
 '批复' => '批覆',
 '批注' => '批註',
 '批斗' => '批鬥',
-'抑制作用' => '抑制作用',
+'抑制' => '抑制',
 '抑制剂' => '抑制劑',
 '抑郁' => '抑鬱',
 '抓奸' => '抓姦',
@@ -5762,7 +5766,6 @@
 '摭采' => '摭採',
 '摸棱' => '摸稜',
 '摸钟' => '摸鐘',
-'折合' => '摺合',
 '折奏' => '摺奏',
 '折子' => '摺子',
 '折尺' => '摺尺',
@@ -5797,7 +5800,6 @@
 '据云' => '據云',
 '擢发' => '擢髮',
 '擦干' => '擦乾',
-'擦干净' => '擦乾淨',
 '拧干' => '擰乾',
 '摆钟' => '擺鐘',
 '摄制' => '攝製',
@@ -5935,6 +5937,7 @@
 '历始' => '曆始',
 '历室' => '曆室',
 '历尾' => '曆尾',
+'历局' => '曆局',
 '历数书' => '曆數書',
 '历日' => '曆日',
 '历书' => '曆書',
@@ -6074,7 +6077,6 @@
 '栗栖溪' => '栗栖溪',
 '校准' => '校準',
 '校舍' => '校舍',
-'校仇学' => '校讎學',
 '核准的' => '核准的',
 '格于' => '格於',
 '格范' => '格範',
@@ -6130,8 +6132,6 @@
 '标志' => '標誌',
 '模棱' => '模稜',
 '模范' => '模範',
-'模范14棒' => '模范14棒',
-'模范21棒' => '模范21棒',
 '模范七棒' => '模范七棒',
 '模范三军' => '模范三軍',
 '模范三軍' => '模范三軍',
@@ -6178,6 +6178,7 @@
 '台面上' => '檯面上',
 '台面化' => '檯面化',
 '柜台' => '櫃檯',
+'柜里' => '櫃裡',
 '栉发工' => '櫛髮工',
 '欲海难填' => '欲海難填',
 '欺蒙' => '欺矇',
@@ -6540,6 +6541,7 @@
 '为准' => '為準',
 '为鉴' => '為鑑',
 '乌兹冲锋枪' => '烏茲衝鋒槍',
+'乌苏里' => '烏蘇里',
 '乌发' => '烏髮',
 '乌龙面' => '烏龍麵',
 '烘干' => '烘乾',
@@ -6551,7 +6553,6 @@
 '无征不信' => '無徵不信',
 '无业游民' => '無業游民',
 '无梁楼盖' => '無樑樓蓋',
-'無言不仇' => '無言不讎',
 '无余' => '無餘',
 '炼制' => '煉製',
 '煎面' => '煎麵',
@@ -6589,6 +6590,7 @@
 '爽荡' => '爽蕩',
 '尔冬陞' => '爾冬陞',
 '墙里' => '牆裡',
+'片里' => '片裡',
 '片言只语' => '片言隻語',
 '版图里' => '版圖裡',
 '牙签' => '牙籤',
@@ -6860,7 +6862,7 @@
 '磨炼' => '磨鍊',
 '磬钟' => '磬鐘',
 '硗确' => '磽确',
-'砻谷机' => '礱穀機',
+'砻谷' => '礱穀',
 '示范' => '示範',
 '社里' => '社裡',
 '祝赞' => '祝讚',
@@ -6894,7 +6896,6 @@
 '私欲' => '私慾',
 '私斗' => '私鬥',
 '秋游' => '秋遊',
-'秋发' => '秋髮',
 '种丹妮' => '种丹妮',
 '种师中' => '种師中',
 '种师道' => '种師道',
@@ -7035,8 +7036,7 @@
 '算历' => '算曆',
 '算历史' => '算歷史',
 '算准' => '算準',
-'算发' => '算髮',
-'管制法' => '管制法',
+'管制' => '管制',
 '管干' => '管幹',
 '箱里' => '箱裡',
 '节欲' => '節慾',
@@ -7069,6 +7069,7 @@
 '米沈' => '米瀋',
 '米谷' => '米穀',
 '米团' => '米糰',
+'米余' => '米餘',
 '米面' => '米麵',
 '粉签子' => '粉籤子',
 '粗制' => '粗製',
@@

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-7 - change (mediawiki/core)

2015-08-11 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/230743

Change subject: Chinese Conversion Table Update 2015-7
..

Chinese Conversion Table Update 2015-7

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: I4cb1d13903a31241ed50ab1eaf0c6f3bd6435e83
---
M .jscsrc
M .jshintignore
M .jshintrc
M Gruntfile.js
M RELEASE-NOTES-1.26
M autoload.php
M composer.json
M docs/extension.schema.json
M docs/hooks.txt
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/GlobalFunctions.php
M includes/Hooks.php
M includes/HttpFunctions.php
M includes/Linker.php
M includes/MWNamespace.php
M includes/MediaWiki.php
M includes/Message.php
M includes/MovePage.php
M includes/OutputPage.php
M includes/PHPVersionCheck.php
M includes/ProtectionForm.php
M includes/Revision.php
M includes/Sanitizer.php
M includes/Status.php
M includes/Title.php
M includes/User.php
M includes/WatchedItem.php
M includes/XmlSelect.php
M includes/ZhConversion.php
M includes/actions/InfoAction.php
M includes/actions/WatchAction.php
M includes/api/ApiCreateAccount.php
M includes/api/ApiFormatJson.php
M includes/api/ApiLogin.php
M includes/api/ApiMain.php
M includes/api/ApiMessage.php
M includes/api/ApiParse.php
M includes/api/ApiQuery.php
M includes/api/ApiQueryAllMessages.php
M includes/api/ApiQueryInfo.php
M includes/api/ApiStashEdit.php
M includes/api/i18n/ca.json
D includes/api/i18n/ckb.json
M includes/api/i18n/de.json
M includes/api/i18n/en.json
M includes/api/i18n/es.json
M includes/api/i18n/eu.json
M includes/api/i18n/fi.json
M includes/api/i18n/fr.json
M includes/api/i18n/gl.json
M includes/api/i18n/he.json
M includes/api/i18n/hu.json
M includes/api/i18n/ia.json
M includes/api/i18n/ksh.json
M includes/api/i18n/lb.json
M includes/api/i18n/mk.json
M includes/api/i18n/oc.json
M includes/api/i18n/pl.json
M includes/api/i18n/ru.json
M includes/api/i18n/uk.json
M includes/api/i18n/vi.json
M includes/api/i18n/zh-hans.json
M includes/api/i18n/zh-hant.json
M includes/cache/LinkCache.php
M includes/cache/MessageCache.php
M includes/changetags/ChangeTags.php
M includes/clientpool/RedisConnectionPool.php
M includes/content/CssContent.php
M includes/content/CssContentHandler.php
M includes/content/JavaScriptContent.php
M includes/content/JavaScriptContentHandler.php
M includes/context/DerivativeContext.php
D includes/context/MutableContext.php
M includes/context/RequestContext.php
D includes/dao/DBAccessObjectUtils.php
M includes/db/Database.php
M includes/db/DatabaseError.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseSqlite.php
M includes/db/LoadMonitorMySQL.php
M includes/debug/logger/LegacyLogger.php
M includes/debug/logger/LegacySpi.php
M includes/debug/logger/LoggerFactory.php
M includes/debug/logger/MonologSpi.php
M includes/debug/logger/NullSpi.php
M includes/debug/logger/Spi.php
M includes/debug/logger/monolog/LegacyFormatter.php
D includes/debug/logger/monolog/LineFormatter.php
M includes/filebackend/FileBackend.php
M includes/filebackend/SwiftFileBackend.php
D includes/filerepo/FileBackendDBRepoWrapper.php
M includes/filerepo/FileRepo.php
M includes/filerepo/ForeignAPIRepo.php
M includes/filerepo/ForeignDBRepo.php
M includes/filerepo/ForeignDBViaLBRepo.php
M includes/filerepo/LocalRepo.php
M includes/filerepo/file/File.php
M includes/filerepo/file/LocalFile.php
M includes/htmlform/HTMLButtonField.php
M includes/htmlform/HTMLCheckField.php
M includes/htmlform/HTMLForm.php
M includes/htmlform/HTMLFormField.php
M includes/htmlform/HTMLFormFieldWithButton.php
M includes/htmlform/HTMLSelectAndOtherField.php
M includes/htmlform/HTMLSelectNamespace.php
M includes/htmlform/HTMLSelectOrOtherField.php
M includes/htmlform/HTMLTextField.php
D includes/htmlform/HTMLTitleTextField.php
D includes/htmlform/HTMLUserTextField.php
M includes/htmlform/OOUIHTMLForm.php
M includes/htmlform/VFormHTMLForm.php
M includes/installer/DatabaseUpdater.php
M includes/installer/Installer.php
M includes/installer/MysqlInstaller.php
M includes/installer/PostgresInstaller.php
M includes/installer/PostgresUpdater.php
M includes/installer/WebInstallerPage.php
M includes/installer/i18n/bn.json
M includes/installer/i18n/bs.json
M includes/installer/i18n/ce.json
M includes/installer/i18n/en.json
M includes/installer/i18n/eo.json
M includes/installer/i18n/es.json
M includes/installer/i18n/gl.json
M includes/installer/i18n/hy.json
M includes/installer/i18n/ia.json
M includes/installer/i18n/it.json
M includes/installer/i18n/ja.json
M includes/installer/i18n/ko.json
M includes/installer/i18n/ksh.json
M includes/installer/i18n/mg.json
M includes/installer/i18n/mk.json
M includes/installer/i18n/nap.json
M includes/installer/i18n/pl.json
M

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)

2015-07-15 Thread Chiefwei (Code Review) 
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',
-'于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天',

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-5 - change (mediawiki/core)

2015-06-26 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/221058

Change subject: Chinese Conversion Table Update 2015-5
..

Chinese Conversion Table Update 2015-5

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: I0933141b0f06c5b7d7f1fb8153f6433276dc872f
---
M includes/ZhConversion.php
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
5 files changed, 52 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/221058/1

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index b59be8c..46aeda0 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3186,6 +3186,7 @@
 '下签' = '下籤',
 '下课钟' = '下課鐘',
 '不干不净' = '不乾不淨',
+'不干胶' = '不乾膠',
 '不克自制' = '不克自制',
 '不加自制' = '不加自制',
 '不占凶吉' = '不占凶吉',
@@ -3372,7 +3373,6 @@
 '干擦' = '乾擦',
 '干支剌' = '乾支剌',
 '干支支' = '乾支支',
-'干敲梆子不卖油' = '乾敲梆子不賣油',
 '干料' = '乾料',
 '干旱' = '乾旱',
 '干暖' = '乾暖',
@@ -3480,8 +3480,7 @@
 '乱发生' = '亂發生',
 '乱发脾气' = '亂發脾氣',
 '乱发' = '亂髮',
-'乱哄' = '亂鬨',
-'乱哄不过来' = '亂鬨不過來',
+'乱哄哄' = '亂鬨鬨',
 '了然后' = '了然後',
 '事有斗巧' = '事有鬥巧',
 '事里' = '事裡',
@@ -3726,6 +3725,7 @@
 '亮钟' = '亮鐘',
 '人云' = '人云',
 '人如风后入江云' = '人如風後入江雲',
+'人干的' = '人幹的',
 '人欲' = '人慾',
 '人数只' = '人數只',
 '人数里' = '人數裡',
@@ -3734,6 +3734,7 @@
 '什锦面' = '什錦麵',
 '仇仇' = '仇讎',
 '介胄' = '介冑',
+'他干的' = '他幹的',
 '他钟' = '他鐘',
 '付托' = '付託',
 '仙后' = '仙后',
@@ -3846,6 +3847,7 @@
 '个里' = '個裡',
 '个钟' = '個鐘',
 '个钟表' = '個鐘錶',
+'们干的' = '們幹的',
 '幸免' = '倖免',
 '幸存' = '倖存',
 '幸幸' = '倖幸',
@@ -4109,7 +4111,6 @@
 '利于' = '利於',
 '刮来刮去' = '刮來刮去',
 '刮起来' = '刮起來',
-'刮风下雪倒便宜' = '刮風下雪倒便宜',
 '刮胡' = '刮鬍',
 '到山里' = '到山裡',
 '制冷机' = '制冷機',
@@ -4235,7 +4236,6 @@
 '博尔术' = '博爾朮',
 '卜云吉' = '卜云吉',
 '占了卜' = '占了卜',
-'占便宜的是呆' = '占便宜的是獃',
 '印累绶若' = '印纍綬若',
 '印制' = '印製',
 '印鉴' = '印鑑',
@@ -4702,7 +4702,6 @@
 '太后' = '太后',
 '太丑' = '太醜',
 '太阁' = '太閤',
-'夯干' = '夯幹',
 '夸克' = '夸克',
 '夸父' = '夸父',
 '夸特' = '夸特',
@@ -4934,7 +4933,6 @@
 '工作台' = '工作檯',
 '工致' = '工緻',
 '左冲右突' = '左衝右突',
-'巧妇做不得无面馎饦' = '巧婦做不得無麵餺飥',
 '巧干' = '巧幹',
 '巧历' = '巧曆',
 '巧历史' = '巧歷史',
@@ -4996,6 +4994,7 @@
 '干吗' = '幹嗎',
 '干嘛' = '幹嘛',
 '干坏事' = '幹壞事',
+'干大事' = '幹大事',
 '干完' = '幹完',
 '干家' = '幹家',
 '干得' = '幹得',
@@ -5013,7 +5012,8 @@
 '干甚么' = '幹甚麼',
 '干略' = '幹略',
 '干当' = '幹當',
-'干的停当' = '幹的停當',
+'干的事' = '幹的事',
+'干的好事' = '幹的好事',
 '干细胞' = '幹細胞',
 '干线' = '幹線',
 '干练' = '幹練',
@@ -5141,6 +5141,7 @@
 '很凶' = '很兇',
 '很准' = '很準',
 '很丑' = '很醜',
+'很松' = '很鬆',
 '律历志' = '律曆志',
 '后印' = '後印',
 '后台老板' = '後台老板',
@@ -5356,7 +5357,9 @@
 '怪里怪气' = '怪裡怪氣',
 '怫郁' = '怫鬱',
 '恂栗' = '恂慄',
+'恒基' = '恒基',
 '恒生' = '恒生',
+'恒隆' = '恒隆',
 '恕乏价催' = '恕乏价催',
 '息交绝游' = '息交絕遊',
 '息谷' = '息穀',
@@ -6547,6 +6550,7 @@
 '滃郁' = '滃鬱',
 '滑借' = '滑藉',
 '汇丰' = '滙豐',
+'渗漓' = '滲灕',
 '卤了' = '滷了',
 '卤五花' = '滷五花',
 '卤味' = '滷味',
@@ -6590,7 +6594,6 @@
 '澄江县' = '澂江縣',
 '澄澹精致' = '澄澹精致',
 '澒蒙' = '澒濛',
-'泽渗漓而下降' = '澤滲灕而下降',
 '淀乃不耕之地' = '澱乃不耕之地',
 '淀北片' = '澱北片',
 '淀山' = '澱山',
@@ -6659,6 +6662,7 @@
 '烘制' = '烘製',
 '烤干' = '烤乾',
 '烤卤' = '烤滷',
+'烹制' = '烹製',
 '焙干' = '焙乾',
 '无征不信' = '無徵不信',
 '无业游民' = '無業游民',
@@ -6730,7 +6734,6 @@
 '犹如表' = '猶如錶',
 '犹如钟' = '猶如鐘',
 '犹如钟表' = '猶如鐘錶',
-'呆串了皮' = '獃串了皮',
 '狱里' = '獄裡',
 '奖杯' = '獎盃',
 '独裁制' = '獨裁制',
@@ -6743,6 +6746,7 @@
 '玉米面' = '玉米面',
 '王侯后' = '王侯后',
 '王后' = '王后',
+'王添灯' = '王添灯',
 '王田里' = '王田里',
 '王鉴' = '王鑑',
 '王余鱼' = '王餘魚',
@@ -7462,6 +7466,7 @@
 '卧游' = '臥遊',
 '臧谷亡羊' = '臧穀亡羊',
 '临潼斗宝' = '臨潼鬥寶',
+'自干五' = '自乾五',
 '自制一下' = '自制一下',
 '自制下来' = '自制下來',
 '自制不' = '自制不',
@@ -8396,7 +8401,6 @@
 '鄭凱云' = '鄭凱云',
 '配制饲料' = '配制飼料',
 '配图里' = '配圖裡',
-'配水干管' = '配水幹管',
 '配制' = '配製',
 '酒帘' = '酒帘',
 '酒气冲天' = '酒氣衝天',
@@ -8893,6 +8897,7 @@
 '飘荡' = '飄蕩',
 '飘游' = '飄遊',
 '飘飘荡荡' = '飄飄蕩蕩',
+'飘发自由女神' = '飄髮自由女神',
 '飞扎' = '飛紮',
 '飞刍挽粟' = '飛芻輓粟',
 '飞行钟' = '飛行鐘',
@@ -9181,6 +9186,7 @@
 '斗合' = '鬥合',
 '斗嘴' = '鬥嘴',
 '斗地主' = '鬥地主',
+'斗垮' = '鬥垮',
 '斗士' = '鬥士',
 '斗富' = '鬥富',
 '斗巧' = '鬥巧',
@@ -9196,6 +9202,7 @@
 '斗打' = '鬥打',
 '斗批改' = '鬥批改',
 '斗技' = '鬥技',
+'斗败' = '鬥敗',
 '斗文' = '鬥文',
 '斗智' = '鬥智',
 '斗暴' = '鬥暴',
@@ -9211,6 +9218,7 @@
 '斗牛' = '鬥牛',
 '斗犀台' = '鬥犀臺',
 '斗犬' = '鬥犬',
+'斗狗' = '鬥狗',
 '斗狠' = '鬥狠',
 '斗兽' = '鬥獸',
 '斗叠' = '鬥疊',
@@ -9225,6 +9233,7 @@
 '斗草' = '鬥草',
 '斗叶儿' = '鬥葉兒',
 '斗叶子' = '鬥葉子',
+'斗蛐' = '鬥蛐',
 '斗蟋蟀' = '鬥蟋蟀',
 '斗话' = '鬥話',
 '斗艳' = '鬥豔',
@@ -9358,7 +9367,6 @@
 '曲霉' = '麴黴',
 '麹霉' = '麴黴',
 '面人儿' = '麵人兒',
-'面价' = '麵價',
 '面包' = '麵包',
 '面坊' = '麵坊',
 '面坯儿' = '麵坯兒',
@@ -9370,7 +9378,6 @@
 '面条' = '麵條',
 '面汤' = '麵湯',
 '面浆' = '麵漿',
-'面灰' = '麵灰',
 '面疙瘩' = '麵疙瘩',
 '面皮' = '麵皮',
 '面码儿' = '麵碼兒',
@@ -9380,6 +9387,7 @@
 '面团' = '麵糰',
 '面缸' = '麵缸',
 '面茶' = '麵茶',
+'面制品' = '麵製品',
 '面食' = '麵食',
 '面饺' = '麵餃',
 '面饼' = '麵餅',
@@ -13327,7 +13335,6 @@
 '乾崗'

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-4 - change (mediawiki/core)

2015-06-02 Thread Chiefwei (Code Review) 
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 @@
 '集装箱' = '貨櫃',
 '数据库' = '資料庫',
 '數據庫' = '資料庫',
+'信息时代' = '資訊時代',
 '信息论' = '資訊理論',
 '乔布斯' = '賈伯斯',
 '宾西法尼亚' = '賓夕法尼亞',
@@

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-3 - change (mediawiki/core)

2015-04-25 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/206516

Change subject: Chinese Conversion Table Update 2015-3
..

Chinese Conversion Table Update 2015-3

Update the Chinese conversion table routinely to fix bugs reported.

It is only data changes and only works for Chinese WikiProjects.

Change-Id: I8c9a52a3c03031330b8be771f3c74e6007efab73
---
M includes/ZhConversion.php
M maintenance/language/zhtable/simp2trad.manual
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/simpphrases_exclude.manual
M maintenance/language/zhtable/symme_supp.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/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
11 files changed, 71 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/206516/1

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index ba9f448..0eaadf0 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -4347,6 +4347,7 @@
 '吃姜' = '吃薑',
 '吃里扒外' = '吃裡扒外',
 '吃里爬外' = '吃裡爬外',
+'吃面' = '吃麵',
 '各辟' = '各闢',
 '各类钟' = '各類鐘',
 '合伙人' = '合伙人',
@@ -4408,7 +4409,6 @@
 '吾为之范我驰驱' = '吾爲之範我馳驅',
 '吕后' = '呂后',
 '呂后' = '呂后',
-'呆呆兽' = '呆呆獸',
 '呆致致' = '呆緻緻',
 '呆里呆气' = '呆裡呆氣',
 '告札' = '告劄',
@@ -4852,6 +4852,7 @@
 '对表达' = '對表達',
 '导游' = '導遊',
 '小丑' = '小丑',
+'小井里' = '小井里',
 '小价' = '小价',
 '小仆' = '小僕',
 '小几' = '小几',
@@ -5343,7 +5344,6 @@
 '忠人之托' = '忠人之托',
 '忠仆' = '忠僕',
 '忠于' = '忠於',
-'快干' = '快幹',
 '快快当当' = '快快當當',
 '快冲' = '快衝',
 '怒于' = '怒於',
@@ -6108,6 +6108,7 @@
 '未干涉' = '未干涉',
 '未干預' = '未干預',
 '未干预' = '未干預',
+'本庄' = '本庄',
 '本征' = '本徵',
 '本出戏' = '本齣戲',
 '术赤' = '朮赤',
@@ -6343,7 +6344,6 @@
 '汤卤' = '汤滷',
 '汲于' = '汲於',
 '决斗' = '決鬥',
-'沈海蓉' = '沈海蓉',
 '沈淀' = '沈澱',
 '沈郁' = '沈鬱',
 '沉淀' = '沉澱',
@@ -6604,8 +6604,8 @@
 '沈抚' = '瀋撫',
 '沈水' = '瀋水',
 '沈河' = '瀋河',
-'沈海' = '瀋海',
 '沈海铁路' = '瀋海鐵路',
+'沈海高速' = '瀋海高速',
 '沈阳' = '瀋陽',
 '泸州大曲' = '瀘州大麯',
 '潇洒' = '瀟洒',
@@ -6769,7 +6769,6 @@
 '由于' = '由於',
 '甲胄' = '甲冑',
 '甲后路' = '甲后路',
-'电影后' = '电影後',
 '男仆' = '男僕',
 '界里' = '界裡',
 '畏于' = '畏於',
@@ -6897,6 +6896,7 @@
 '看钟' = '看鐘',
 '真凶' = '真兇',
 '真个' = '真箇',
+'真丑' = '真醜',
 '眼干' = '眼乾',
 '眼帘' = '眼帘',
 '眼眶里' = '眼眶裡',
@@ -7058,7 +7058,6 @@
 '空蒙' = '空濛',
 '空荡' = '空蕩',
 '空荡荡' = '空蕩蕩',
-'空谷回音' = '空谷回音',
 '空钟' = '空鐘',
 '空余' = '空餘',
 '窒欲' = '窒慾',
@@ -7370,6 +7369,8 @@
 '聊斋志异' = '聊齋志異',
 '圣人历' = '聖人曆',
 '圣后' = '聖后',
+'圣马尔谷日' = '聖馬爾谷日',
+'聖馬爾谷日' = '聖馬爾谷日',
 '聘雇' = '聘僱',
 '聚药雄蕊' = '聚葯雄蕊',
 '闻风后' = '聞風後',
@@ -7865,6 +7866,7 @@
 '复韵' = '複韻',
 '褒赞' = '褒讚',
 '衬里' = '襯裡',
+'西井里' = '西井里',
 '西周钟' = '西周鐘',
 '西昆' = '西崑',
 '西岳' = '西嶽',
@@ -8187,11 +8189,16 @@
 '迥然回异' = '迥然迴異',
 '迫于' = '迫於',
 '回光返照' = '迴光返照',
-'回向' = '迴向',
 '回圈' = '迴圈',
 '回廊' = '迴廊',
 '回形夹' = '迴形夾',
-'回文' = '迴文',
+'回文序列' = '迴文序列',
+'回文数' = '迴文數',
+'回文构词' = '迴文構詞',
+'回文结构' = '迴文結構',
+'回文联' = '迴文聯',
+'回文诗' = '迴文詩',
+'回文锦' = '迴文錦',
 '回旋' = '迴旋',
 '回环' = '迴環',
 '回纹针' = '迴紋針',
@@ -8206,7 +8213,6 @@
 '回递性' = '迴遞性',
 '回避' = '迴避',
 '回銮' = '迴鑾',
-'回音' = '迴音',
 '回响' = '迴響',
 '回风' = '迴風',
 '迷于' = '迷於',
@@ -8404,7 +8410,6 @@
 '丑女' = '醜女',
 '丑女效颦' = '醜女效顰',
 '丑奴儿' = '醜奴兒',
-'丑婆子' = '醜婆子',
 '丑妇' = '醜婦',
 '丑媳' = '醜媳',
 '丑媳妇' = '醜媳婦',
@@ -8754,6 +8759,7 @@
 '电子表格' = '電子表格',
 '电子钟' = '電子鐘',
 '电子钟表' = '電子鐘錶',
+'电影后' = '電影後',
 '电梯里' = '電梯裡',
 '电波钟' = '電波鐘',
 '电码表' = '電碼表',
@@ -9014,6 +9020,7 @@
 '香山庄' = '香山庄',
 '马干' = '馬乾',
 '馬占山' = '馬占山',
+'马德钟' = '馬德鐘',
 '马斯垂克期' = '馬斯垂克期',
 '馬格里布' = '馬格里布',
 '马格里布' = '馬格里布',
@@ -9151,6 +9158,7 @@
 '斗剑' = '鬥劍',
 '斗力' = '鬥力',
 '斗劲' = '鬥勁',
+'斗勇' = '鬥勇',
 '斗胜' = '鬥勝',
 '斗口' = '鬥口',
 '斗合' = '鬥合',
@@ -14013,6 +14021,7 @@
 '坦桑尼亞' = '坦尚尼亞',
 '端口' = '埠',
 '首席执行官' = '執行長',
+'报道' = '報導',
 '塞舌尔' = '塞席爾',
 '塞舌爾' = '塞席爾',
 '萨拉热窝' = '塞拉耶佛',
@@ -14087,6 +14096,7 @@
 '勃蘭登堡' = '布蘭登堡',
 '布里斯托尔' = '布里斯托',
 '布隆方丹' = '布隆泉',
+'希拉莉' = '希拉蕊',
 '希拉里' = '希拉蕊',
 '希特拉' = '希特勒',
 '巴尔米拉环礁' = '帕邁拉環礁',
@@ -14675,7 +14685,6 @@
 '代表著者' = '代表著者',
 '代表著述' = '代表著述',
 '代表著錄' = '代表著錄',
-'伊斯坦堡' = '伊斯坦布爾',
 '伊斯蘭瑪巴德' = '伊斯蘭堡',
 '埃博拉' = '伊波拉',
 '伏著' = '伏着',
@@ -15489,7 +15498,7 @@
 '布里斯托尔' = '布里斯托',
 '蒲隆地' = '布隆迪',
 '席哈克' = '希拉克',
-'希拉蕊' = '希拉里',
+'希拉蕊' = '希拉莉',
 '希特勒' = '希特拉',
 '帛琉' = '帕勞',
 '巴尔米拉环礁' = '帕邁拉環礁',
@@ -17088,7 +17097,7 @@
 '貞著述' = '貞著述',
 '貞著錄' = '貞著錄',
 '負著' = '負着',
-'貢寮國' = '貢寮國',
+'貢寮' = '貢寮',
 '買凶' = '買兇',
 '費占' = '費佔',
 '费占' = '費佔',
@@ -18458,6 +18467,8 @@
 '布隆泉' = '布隆方丹',
 '蒲隆地' = '布隆迪',
 '席哈克' = '希拉克',
+'希拉莉' = '希拉里',
+'希拉蕊' = '希拉里',
 '希特拉' = '希特勒',
 '帛琉' = '帕劳',
 '派屈克' = '帕特里克',
@@ -19850,6 +19861,7 @@
 '見著稱' = '见著称',
 '見著者' = '见著者',
 '見著述' = '见著述',
+'規畫' = '规划',
 '視著' = '视着',
 '視著名' = '视著名',
 '占士邦' = '詹姆斯·邦德',
@@ -19911,7 +19923,7 @@
 '貞著者' = '贞著者',
 '貞著述' = '贞著述',
 '負著' = '负着',
-'貢寮國' = '贡寮国',
+'貢寮' = '贡寮',
 '帳上' = '账上',
 '帳冊' = '账册',
 '帳務' = '账务',
diff --git

[MediaWiki-commits] [Gerrit] Update the Chinese conversion table for Chinese WikiProjects - change (mediawiki/core)

2015-01-11 Thread Chiefwei (Code Review) 
Chiefwei has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/184218

Change subject: Update the Chinese conversion table for Chinese WikiProjects
..

Update the Chinese conversion table for Chinese WikiProjects

The Chinese conversion table is substantially updated to fix a lot of bugs 
reported in recent years, and the script generating conversion table 
(LanguageZh.php) is also modified to facilitate the maintenance.

Zh-sg and zh-my is set to fallback to zh-cn to improve reading experience, 
since there is only trivial difference among them, just like zh-hk and zh-mo. 
Further optimization for zh-sg and zh-my will be performed in local conversion 
table of Chinese WikiProjects.

Change-Id: I1bb0315d6d7a2c9653905654d933942e362bcc42
---
M includes/ZhConversion.php
M languages/classes/LanguageZh.php
M maintenance/language/zhtable/Makefile.py
M maintenance/language/zhtable/README
M maintenance/language/zhtable/simp2trad.manual
M maintenance/language/zhtable/simp2trad_noconvert.manual
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/simpphrases_exclude.manual
A maintenance/language/zhtable/symme_supp.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/toTrad.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
18 files changed, 8,322 insertions(+), 4,463 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/184218/1


-- 
To view, visit https://gerrit.wikimedia.org/r/184218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bb0315d6d7a2c9653905654d933942e362bcc42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chiefwei chiefwei1...@gmail.com
Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits