Merge "Rename RESTBase1/Parsoid3 `bodyOnly` parameter to `body_only`"

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 893ae04..9e7d12c 100644 (file)
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -239,7 +239,7 @@ $zh2Hant = array(
 '决' => '決',
 '况' => '況',
 '冻' => '凍',
-'净' => '凈',
+'净' => '淨',
 '凄' => '淒',
 '凉' => '涼',
 '减' => '減',
@@ -3720,7 +3720,7 @@ $zh2Hant = array(
 '人生天里' => '人生天里',
 '人发指' => '人髮指',
 '什锦面' => '什錦麵',
-'ä»\87ä»\87' => 'ä»\87è®\8e',
+'ä»\81è´µ' => 'ä»\81è²´',
 '介胄' => '介冑',
 '他干的' => '他幹的',
 '他钟' => '他鐘',
@@ -3846,7 +3846,6 @@ $zh2Hant = array(
 '倦游' => '倦遊',
 '假里' => '假裡',
 '假托' => '假託',
-'假里白' => '假里白',
 '假发' => '假髮',
 '偎干' => '偎乾',
 '停停当当' => '停停當當',
@@ -4144,7 +4143,6 @@ $zh2Hant = array(
 '力拼众敌' => '力拼眾敵',
 '力争上游' => '力爭上遊',
 '功勋' => '功勳',
-'功致' => '功緻',
 '加氢精制' => '加氫精制',
 '劣于' => '劣於',
 '助于' => '助於',
@@ -4237,6 +4235,7 @@ $zh2Hant = array(
 '去山里' => '去山裡',
 '参数只' => '參數只',
 '参数里' => '參數裡',
+'反应制得' => '反應製得',
 '反朴' => '反樸',
 '反冲' => '反衝',
 '反复制' => '反複製',
@@ -4408,6 +4407,7 @@ $zh2Hant = array(
 '命中注定' => '命中注定',
 '和奸' => '和姦',
 '和制汉' => '和製漢',
+'和制英语' => '和製英語',
 '咎征' => '咎徵',
 '咕咕钟' => '咕咕鐘',
 '咪表' => '咪錶',
@@ -4672,6 +4672,7 @@ $zh2Hant = array(
 '大只' => '大隻',
 '大风后' => '大風後',
 '天克地冲' => '天克地衝',
+'天台' => '天台',
 '天后' => '天后',
 '天后宫' => '天后宮',
 '天地志狼' => '天地志狼',
@@ -4928,7 +4929,6 @@ $zh2Hant = array(
 '巡回' => '巡迴',
 '巡游' => '巡遊',
 '工作台' => '工作檯',
-'工致' => '工緻',
 '左冲右突' => '左衝右突',
 '巧干' => '巧幹',
 '巧历' => '巧曆',
@@ -5034,6 +5034,7 @@ $zh2Hant = array(
 '几只' => '幾隻',
 '几出' => '幾齣',
 '广部' => '广部',
+'庄司' => '庄司',
 '床席' => '床蓆',
 '店里' => '店裡',
 '府干卿' => '府干卿',
@@ -5130,7 +5131,7 @@ $zh2Hant = array(
 '影后' => '影后',
 '影相吊' => '影相弔',
 '役于' => '役於',
-'往日無仇' => '往日無讎',
+'往日无仇' => '往日無讎',
 '往里' => '往裡',
 '待复' => '待覆',
 '很干' => '很乾',
@@ -5382,6 +5383,7 @@ $zh2Hant = array(
 '凄酸' => '悽酸',
 '情欲' => '情慾',
 '惇朴' => '惇樸',
+'惠文后' => '惠文后',
 '恶仆' => '惡僕',
 '恶直丑正' => '惡直醜正',
 '恶斗' => '惡鬥',
@@ -5417,6 +5419,8 @@ $zh2Hant = array(
 '宪法里' => '憲法裡',
 '恳托' => '懇託',
 '懈松' => '懈鬆',
+'应制得' => '應制得',
+'應制得' => '應制得',
 '应征' => '應徵',
 '应钟' => '應鐘',
 '懔栗' => '懍慄',
@@ -5504,8 +5508,7 @@ $zh2Hant = array(
 '批复' => '批覆',
 '批注' => '批註',
 '批斗' => '批鬥',
-'抑制作用' => '抑制作用',
-'抑制剂' => '抑制劑',
+'抑制' => '抑制',
 '抑郁' => '抑鬱',
 '抓奸' => '抓姦',
 '抓斗' => '抓鬥',
@@ -5762,7 +5765,6 @@ $zh2Hant = array(
 '摭采' => '摭採',
 '摸棱' => '摸稜',
 '摸钟' => '摸鐘',
-'折合' => '摺合',
 '折奏' => '摺奏',
 '折子' => '摺子',
 '折尺' => '摺尺',
@@ -5797,7 +5799,6 @@ $zh2Hant = array(
 '据云' => '據云',
 '擢发' => '擢髮',
 '擦干' => '擦乾',
-'擦干净' => '擦乾淨',
 '拧干' => '擰乾',
 '摆钟' => '擺鐘',
 '摄制' => '攝製',
@@ -5935,6 +5936,7 @@ $zh2Hant = array(
 '历始' => '曆始',
 '历室' => '曆室',
 '历尾' => '曆尾',
+'历局' => '曆局',
 '历数书' => '曆數書',
 '历日' => '曆日',
 '历书' => '曆書',
@@ -6074,7 +6076,6 @@ $zh2Hant = array(
 '栗栖溪' => '栗栖溪',
 '校准' => '校準',
 '校舍' => '校舍',
-'校仇学' => '校讎學',
 '核准的' => '核准的',
 '格于' => '格於',
 '格范' => '格範',
@@ -6130,8 +6131,6 @@ $zh2Hant = array(
 '标志' => '標誌',
 '模棱' => '模稜',
 '模范' => '模範',
-'模范14棒' => '模范14棒',
-'模范21棒' => '模范21棒',
 '模范七棒' => '模范七棒',
 '模范三军' => '模范三軍',
 '模范三軍' => '模范三軍',
@@ -6178,6 +6177,7 @@ $zh2Hant = array(
 '台面上' => '檯面上',
 '台面化' => '檯面化',
 '柜台' => '櫃檯',
+'柜里' => '櫃裡',
 '栉发工' => '櫛髮工',
 '欲海难填' => '欲海難填',
 '欺蒙' => '欺矇',
@@ -6540,6 +6540,7 @@ $zh2Hant = array(
 '为准' => '為準',
 '为鉴' => '為鑑',
 '乌兹冲锋枪' => '烏茲衝鋒槍',
+'乌苏里' => '烏蘇里',
 '乌发' => '烏髮',
 '乌龙面' => '烏龍麵',
 '烘干' => '烘乾',
@@ -6551,7 +6552,6 @@ $zh2Hant = array(
 '无征不信' => '無徵不信',
 '无业游民' => '無業游民',
 '无梁楼盖' => '無樑樓蓋',
-'無言不仇' => '無言不讎',
 '无余' => '無餘',
 '炼制' => '煉製',
 '煎面' => '煎麵',
@@ -6589,6 +6589,7 @@ $zh2Hant = array(
 '爽荡' => '爽蕩',
 '尔冬陞' => '爾冬陞',
 '墙里' => '牆裡',
+'片里' => '片裡',
 '片言只语' => '片言隻語',
 '版图里' => '版圖裡',
 '牙签' => '牙籤',
@@ -6860,7 +6861,7 @@ $zh2Hant = array(
 '磨炼' => '磨鍊',
 '磬钟' => '磬鐘',
 '硗确' => '磽确',
-'砻谷机' => '礱穀機',
+'砻谷' => '礱穀',
 '示范' => '示範',
 '社里' => '社裡',
 '祝赞' => '祝讚',
@@ -6894,7 +6895,6 @@ $zh2Hant = array(
 '私欲' => '私慾',
 '私斗' => '私鬥',
 '秋游' => '秋遊',
-'秋发' => '秋髮',
 '种丹妮' => '种丹妮',
 '种师中' => '种師中',
 '种师道' => '种師道',
@@ -7035,8 +7035,7 @@ $zh2Hant = array(
 '算历' => '算曆',
 '算历史' => '算歷史',
 '算准' => '算準',
-'算发' => '算髮',
-'管制法' => '管制法',
+'管制' => '管制',
 '管干' => '管幹',
 '箱里' => '箱裡',
 '节欲' => '節慾',
@@ -7069,6 +7068,7 @@ $zh2Hant = array(
 '米沈' => '米瀋',
 '米谷' => '米穀',
 '米团' => '米糰',
+'米余' => '米餘',
 '米面' => '米麵',
 '粉签子' => '粉籤子',
 '粗制' => '粗製',
@@ -7408,6 +7408,7 @@ $zh2Hant = array(
 '艷后' => '艷后',
 '艸木丰丰' => '艸木丰丰',
 '芒果干' => '芒果乾',
+'花不要采' => '花不要採',
 '花卷' => '花捲',
 '花盆里' => '花盆裡',
 '花菴词选' => '花菴詞選',
@@ -7421,7 +7422,7 @@ $zh2Hant = array(
 '苦于' => '苦於',
 '苦里' => '苦裡',
 '苦斗' => '苦鬥',
-'è\8b\8e麻' => '苧麻',
+'è\8b§麻' => '苧麻',
 '茂都淀' => '茂都澱',
 '范文同' => '范文同',
 '范文正公' => '范文正公',
@@ -7477,6 +7478,8 @@ $zh2Hant = array(
 '落发' => '落髮',
 '叶叶琴' => '葉叶琴',
 '叶叶琹' => '葉叶琹',
+'叶阳后' => '葉陽后',
+'葉陽后' => '葉陽后',
 '葡萄干' => '葡萄乾',
 '董氏封发' => '董氏封髮',
 '葫芦里卖甚么药' => '葫蘆裡賣甚麼藥',
@@ -7554,7 +7557,6 @@ $zh2Hant = array(
 '借此' => '藉此',
 '借由' => '藉由',
 '借箸代筹' => '藉箸代籌',
-'借词' => '藉詞',
 '借资' => '藉資',
 '蓝淀' => '藍澱',
 '藏于' => '藏於',
@@ -7675,6 +7677,7 @@ $zh2Hant = array(
 '裁制' => '裁製',
 '里水镇' => '裏水鎮',
 '里海' => '裏海',
+'里白' => '裏白',
 '里运河' => '裏運河',
 '补于' => '補於',
 '补注' => '補註',
@@ -7706,6 +7709,7 @@ $zh2Hant = array(
 '制图' => '製圖',
 '制得' => '製得',
 '制成' => '製成',
+'制毒' => '製毒',
 '制法' => '製法',
 '制浆' => '製漿',
 '制片' => '製片',
@@ -7715,6 +7719,8 @@ $zh2Hant = array(
 '制纸' => '製紙',
 '制药' => '製藥',
 '制衣' => '製衣',
+'制表键' => '製表鍵',
+'制贩' => '製販',
 '制造' => '製造',
 '制革' => '製革',
 '制鞋' => '製鞋',
@@ -7792,7 +7798,6 @@ $zh2Hant = array(
 '见素抱朴' => '見素抱樸',
 '见钟不打' => '見鐘不打',
 '规范' => '規範',
-'視如寇仇' => '視如寇讎',
 '视于' => '視於',
 '观采' => '觀採',
 '角抵' => '角牴',
@@ -7824,7 +7829,6 @@ $zh2Hant = array(
 '托命' => '託命',
 '托咎' => '託咎',
 '托梦' => '託夢',
-'托大' => '託大',
 '托孤' => '託孤',
 '托庇' => '託庇',
 '托故' => '託故',
@@ -7970,7 +7974,6 @@ $zh2Hant = array(
 '护发' => '護髮',
 '变征' => '變徵',
 '变丑' => '變醜',
-'仇正' => '讎正',
 '仇隙' => '讎隙',
 '赞不绝口' => '讚不絕口',
 '赞佩' => '讚佩',
@@ -8004,6 +8007,8 @@ $zh2Hant = array(
 '贵征' => '貴徵',
 '买凶' => '買兇',
 '买断发' => '買斷發',
+'費米面' => '費米面',
+'费米面' => '費米面',
 '贻范' => '貽範',
 '賈后' => '賈后',
 '贾后' => '賈后',
@@ -8027,6 +8032,7 @@ $zh2Hant = array(
 '走回路' => '走回路',
 '起哄' => '起鬨',
 '超级杯' => '超級盃',
+'超赞' => '超讚',
 '赶制' => '趕製',
 '赶面棍' => '趕麵棍',
 '赵威后' => '趙威后',
@@ -8088,7 +8094,7 @@ $zh2Hant = array(
 '农民历' => '農民曆',
 '农民历史' => '農民歷史',
 '迂回' => '迂迴',
-'近日無仇' => '近日無讎',
+'近日无仇' => '近日無讎',
 '返朴' => '返樸',
 '迥然回异' => '迥然迴異',
 '迫于' => '迫於',
@@ -8196,6 +8202,7 @@ $zh2Hant = array(
 '游必有方' => '遊必有方',
 '游憩' => '遊憩',
 '游戏' => '遊戲',
+'游戏里' => '遊戲裡',
 '游手好闲' => '遊手好閒',
 '游方' => '遊方',
 '游星' => '遊星',
@@ -8231,6 +8238,7 @@ $zh2Hant = array(
 '游魂' => '遊魂',
 '过于' => '過於',
 '过水面' => '過水麵',
+'遏制' => '遏制',
 '道范' => '道範',
 '逊于' => '遜於',
 '递回' => '遞迴',
@@ -8384,6 +8392,7 @@ $zh2Hant = array(
 '金仆姑' => '金僕姑',
 '金城里' => '金城里',
 '金范' => '金範',
+'金圣叹' => '金聖歎',
 '金表情' => '金表情',
 '金表态' => '金表態',
 '金表扬' => '金表揚',
@@ -8664,9 +8673,11 @@ $zh2Hant = array(
 '零只' => '零隻',
 '零余' => '零餘',
 '电子表格' => '電子表格',
+'电子制表' => '電子製表',
 '电子钟' => '電子鐘',
 '电子钟表' => '電子鐘錶',
 '电影后' => '電影後',
+'电影里' => '電影裡',
 '电梯里' => '電梯裡',
 '电波钟' => '電波鐘',
 '电码表' => '電碼表',
@@ -8950,6 +8961,7 @@ $zh2Hant = array(
 '体征' => '體徵',
 '体范' => '體範',
 '体系' => '體系',
+'体里' => '體裡',
 '高几' => '高几',
 '高后' => '高后',
 '高干扰' => '高干擾',
@@ -11012,6 +11024,7 @@ $zh2Hans = array(
 '統' => '统',
 '絲' => '丝',
 '絳' => '绛',
+'絶' => '绝',
 '絹' => '绢',
 '絺' => '𫄨',
 '綀' => '𦈌',
@@ -13550,8 +13563,10 @@ $zh2Hans = array(
 '於菟' => '於菟',
 '於賢德' => '於贤德',
 '於除鞬' => '於除鞬',
+'施讎' => '施雠',
 '旋乾轉坤' => '旋乾转坤',
 '旋乾转坤' => '旋乾转坤',
+'無言不讎' => '无言不雠',
 '曠若發矇' => '旷若发矇',
 '崑崙' => '昆仑',
 '崑劇' => '昆剧',
@@ -13757,6 +13772,7 @@ $zh2Hans = array(
 '讎夷' => '雠夷',
 '讎定' => '雠定',
 '讎校' => '雠校',
+'讎正' => '雠正',
 '讎問' => '雠问',
 '項鍊' => '项链',
 '飛昇' => '飞升',
@@ -13782,15 +13798,25 @@ $zh2Hans = array(
 );
 
 $zh2TW = array(
+'0字节' => '0位元組',
 '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桿',
 '甲型肝炎' => 'A型肝炎',
 '甲肝' => 'A肝',
@@ -13826,6 +13852,7 @@ $zh2TW = array(
 '阿斯旺' => '亞斯文',
 '人工智能' => '人工智慧',
 '人机交互' => '人機互動',
+'行人路' => '人行道',
 '石勒苏益格' => '什勒斯維希',
 '石勒蘇益格' => '什勒斯維希',
 '界面' => '介面',
@@ -13939,6 +13966,7 @@ $zh2TW = array(
 '端口' => '埠',
 '首席执行官' => '執行長',
 '报道' => '報導',
+'塑料袋' => '塑膠袋',
 '塞舌尔' => '塞席爾',
 '塞舌爾' => '塞席爾',
 '萨拉热窝' => '塞拉耶佛',
@@ -14391,6 +14419,8 @@ $zh2TW = array(
 '荧光' => '螢光',
 '荧屏' => '螢屏',
 '屏幕' => '螢幕',
+'行人路权' => '行人路權',
+'行人路權' => '行人路權',
 '流動網絡' => '行動網路',
 '移动网络' => '行動網路',
 '流動電話' => '行動電話',
@@ -14544,6 +14574,16 @@ $zh2TW = array(
 );
 
 $zh2HK = array(
+'0字节' => '0位元組',
+'1字节' => '1位元組',
+'2字节' => '2位元組',
+'3字节' => '3位元組',
+'4字节' => '4位元組',
+'5字节' => '5位元組',
+'6字节' => '6位元組',
+'7字节' => '7位元組',
+'8字节' => '8位元組',
+'9字节' => '9位元組',
 'IP地址' => 'IP位址',
 '·威尔士' => '·威爾士',
 '·威爾士' => '·威爾士',
@@ -14665,8 +14705,6 @@ $zh2HK = array(
 '布雷；' => '佈雷；',
 '布点' => '佈點',
 '布點' => '佈點',
-'字節' => '位元組',
-'字节' => '位元組',
 '低著' => '低着',
 '低著作' => '低著作',
 '低著名' => '低著名',
@@ -15054,7 +15092,6 @@ $zh2HK = array(
 '卡普里亚蒂' => '卡佩雅蒂',
 '喀拉蚩' => '卡拉奇',
 '卡斯楚' => '卡斯特羅',
-'臥' => '卧',
 '印著' => '印着',
 '印著作' => '印著作',
 '印著名' => '印著名',
@@ -15443,9 +15480,9 @@ $zh2HK = array(
 '幹著名' => '幹著名',
 '幹著稱' => '幹著稱',
 '幾內亞比索' => '幾內亞比紹',
-'庫德人' => '库爾德人',
-'庫德族' => '库爾德族',
 '店里' => '店裏',
+'庫德人' => '庫爾德人',
+'庫德族' => '庫爾德族',
 '坎城' => '康城',
 '戛纳' => '康城',
 '庙里' => '廟裏',
@@ -15970,6 +16007,9 @@ $zh2HK = array(
 '村里' => '村裏',
 '杜塞道夫' => '杜塞爾多夫',
 '迪拜' => '杜拜',
+'東協助' => '東協助',
+'東協會' => '東協會',
+'東協議' => '東協議',
 '東南亞國家協會' => '東南亞國家聯盟',
 '亚细安' => '東盟',
 '東協' => '東盟',
@@ -16031,6 +16071,7 @@ $zh2HK = array(
 '机器人' => '機械人',
 '機器人' => '機械人',
 '柜台' => '櫃枱',
+'柜里' => '櫃裏',
 '历史里' => '歷史裏',
 '死里求生' => '死裏求生',
 '死里逃生' => '死裏逃生',
@@ -16721,6 +16762,7 @@ $zh2HK = array(
 '膠著者' => '膠著者',
 '膠著述' => '膠著述',
 '膠著錄' => '膠著錄',
+'塑料袋' => '膠袋',
 '臨著' => '臨着',
 '臨著作' => '臨著作',
 '臨著名' => '臨著名',
@@ -16828,6 +16870,7 @@ $zh2HK = array(
 '蜜里调油' => '蜜裏調油',
 '荧屏' => '螢屏',
 '屏幕' => '螢幕',
+'人行道' => '行人路',
 '行家里手' => '行家裏手',
 '首席执行官' => '行政總裁',
 '行著' => '行着',
@@ -17170,6 +17213,7 @@ $zh2HK = array(
 '遇著者' => '遇著者',
 '遇著述' => '遇著述',
 '遇著錄' => '遇著錄',
+'游戏里' => '遊戲裏',
 '遍布' => '遍佈',
 '遍佈著' => '遍佈着',
 '遍布著' => '遍佈着',
@@ -17359,6 +17403,7 @@ $zh2HK = array(
 '云里雾里' => '雲裏霧裏',
 '莱特湾' => '雷伊泰灣',
 '萊特灣' => '雷伊泰灣',
+'电影里' => '電影裏',
 '晶体管' => '電晶體',
 '晶體管' => '電晶體',
 '电梯里' => '電梯裏',
@@ -17462,6 +17507,7 @@ $zh2HK = array(
 '騙著述' => '騙著述',
 '騙著錄' => '騙著錄',
 '驶著' => '驶着',
+'体里' => '體裏',
 '高畫質' => '高清',
 '高著' => '高着',
 '高著作' => '高著作',
@@ -17585,6 +17631,9 @@ $zh2CN = array(
 '邱吉爾' => '丘吉尔',
 'C型肝炎' => '丙型肝炎',
 'C肝' => '丙肝',
+'東協會' => '东协会',
+'東協助' => '东协助',
+'東協議' => '东协议',
 '東南亞國家協會' => '东南亚国家联盟',
 '亚细安' => '东盟',
 '東協' => '东盟',
@@ -17666,6 +17715,7 @@ $zh2CN = array(
 '亮著者' => '亮著者',
 '亮著述' => '亮著述',
 '人工智慧' => '人工智能',
+'行人路' => '人行道',
 '甚麼' => '什么',
 '甚麽' => '什么',
 '仗著' => '仗着',
@@ -18183,6 +18233,7 @@ $zh2CN = array(
 '吉里巴斯' => '基里巴斯',
 '堂姊' => '堂姐',
 '坎培拉' => '堪培拉',
+'塑膠袋' => '塑料袋',
 '塞爾維亞與蒙特內哥羅' => '塞尔维亚和黑山',
 '塞拉利昂' => '塞拉利昂',
 '塞普勒斯' => '塞浦路斯',
@@ -19631,6 +19682,8 @@ $zh2CN = array(
 '蘸著稱' => '蘸著称',
 '蘸著者' => '蘸著者',
 '蘸著述' => '蘸著述',
+'行人路权' => '行人路权',
+'行人路權' => '行人路权',
 '行著' => '行着',
 '行著書' => '行著书',
 '行著作' => '行著作',

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index a79f4ce..589c39f 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -315,7 +315,7 @@ class MovePageForm extends UnlistedSpecialPage {
                                'infusable' => true,
                        ) ),
                        array(
-                               'label' => $this->msg( 'move-new-title' )->text(),
+                               'label' => $this->msg( 'newtitle' )->text(),
                                'align' => 'top',
                        )
                );

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 815d959..2ad59e4 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2282,7 +2282,7 @@
        "cant-move-to-user-page": "You do not have permission to move a page to a user page (except to a user subpage).",
        "cant-move-category-page": "You do not have permission to move category pages.",
        "cant-move-to-category-page": "You do not have permission to move a page to a category page.",
-       "move-new-title": "New title:",
+       "newtitle": "New title:",
        "move-watch": "Watch source page and target page",
        "movepagebtn": "Move page",
        "pagemovedsub": "Move succeeded",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 5243baa..54bb0c3 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2442,7 +2442,7 @@
        "lockedbyandtime": "Used as part of the message when a database is locked through [[Special:LockDB]]. Parameters:\n* $1 is the user that locked the database.\n* $2 is the date on which the lock was made\n* $3 is the time at which the lock was made",
        "move-page": "Used as page title of [[Special:MovePage]] to move pages.\n\nSee example: [[Special:MovePage/Portal:En]].\n\nParameters:\n* $1 - the name of the page to be moved (without link)\n{{Identical|Move}}",
        "movepage-summary": "{{doc-specialpagesummary|movepage}}",
-       "move-page-legend": "Legend of the fieldset around the input form of [[Special:MovePage/testpage]].\n\nSee also:\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|movereason|label for textarea}}\n* {{msg-mw|movetalk|label for checkbox}}\n* {{msg-mw|move-leave-redirect|label for checkbox}}\n* {{msg-mw|fix-double-redirects|label for checkbox}}\n* {{msg-mw|move-subpages|label for checkbox}}\n* {{msg-mw|move-talk-subpages|label for checkbox}}\n* {{msg-mw|move-watch|label for checkbox}}\n{{Identical|Move page}}",
+       "move-page-legend": "Legend of the fieldset around the input form of [[Special:MovePage/testpage]].\n\nSee also:\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|movereason|label for textarea}}\n* {{msg-mw|movetalk|label for checkbox}}\n* {{msg-mw|move-leave-redirect|label for checkbox}}\n* {{msg-mw|fix-double-redirects|label for checkbox}}\n* {{msg-mw|move-subpages|label for checkbox}}\n* {{msg-mw|move-talk-subpages|label for checkbox}}\n* {{msg-mw|move-watch|label for checkbox}}\n{{Identical|Move page}}",
        "movepagetext": "Introduction shown when moving a page ([[Special:MovePage]]).\n\nSpecial pages mentioned: {{msg-mw|Doubleredirects}}, {{msg-mw|Brokenredirects}}\n\nSee also:\n* {{msg-mw|Movepagetext-noredirectfixer}}",
        "movepagetext-noredirectfixer": "A variant of the following message ''Movepagetext'' displayed when the automatic redirect fixer is not enabled.\n\nSpecial pages mentioned: {{msg-mw|Doubleredirects}}, {{msg-mw|Brokenredirects}}\n\nSee also:\n* {{msg-mw|Movepagetext}}",
        "movepagetalktext": "Text on the special 'Move page'. This text only appears if the talk page is not empty.",
@@ -2455,8 +2455,8 @@
        "cant-move-to-user-page": "Used as error message.\n\nSee also:\n* {{msg-mw|cant-move-user-page}}\n* {{msg-mw|cant-move-category-page}}\n* {{msg-mw|cant-move-to-category-page}}\n* {{msg-mw|movenotallowedfile}}\n* {{msg-mw|movenotallowed}}\n* {{msg-mw|movenologintext}}",
        "cant-move-category-page": "Used as error message.\n\nSee also:\n* {{msg-mw|cant-move-user-page}}\n* {{msg-mw|cant-move-to-user-page}}\n* {{msg-mw|cant-move-to-category-page}}\n* {{msg-mw|movenotallowedfile}}\n* {{msg-mw|movenotallowed}}\n* {{msg-mw|movenologintext}}",
        "cant-move-to-category-page": "Used as error message.\n\nSee also:\n* {{msg-mw|cant-move-user-page}}\n* {{msg-mw|cant-move-to-user-page}}\n* {{msg-mw|cant-move-category-page}}\n* {{msg-mw|movenotallowedfile}}\n* {{msg-mw|movenotallowed}}\n* {{msg-mw|movenologintext}}",
-       "move-new-title": "Used in the special page \"[[Special:MovePage]]\". The text for the inputbox to give the new page title.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
-       "move-watch": "The text of the checkbox to watch the pages you are moving from and to. If checked, both the destination page and the original page will be added to the watchlist, even if you decide not to leave a redirect behind.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}",
+       "newtitle": "Used in the special page \"[[Special:MovePage]]\". The text for the inputbox to give the new page title.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
+       "move-watch": "The text of the checkbox to watch the pages you are moving from and to. If checked, both the destination page and the original page will be added to the watchlist, even if you decide not to leave a redirect behind.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}",
        "movepagebtn": "Button label on the special 'Move page'.\n\n{{Identical|Move page}}",
        "pagemovedsub": "Message displayed as aheader of the body, after successfully moving a page from source to target name.",
        "movepage-moved": "Message displayed after successfully moving a page from source to target name.\n\nParameters:\n* $1 - the source page as a link with display name\n* $2 - the target page as a link with display name\n* $3 - (optional) the source page name without a link\n* $4 - (optional) the target page name without a link\nSee also:\n* {{msg-mw|Movepage-moved-redirect}}\n* {{msg-mw|Movepage-moved-noredirect}}",
@@ -2464,9 +2464,9 @@
        "movepage-moved-noredirect": "The message is shown after pagemove if checkbox \"{{int:move-leave-redirect}}\" was unselected before moving.\n\nSee also:\n* {{msg-mw|Movepage-moved}}\n* {{msg-mw|Movepage-moved-redirect}}",
        "articleexists": "Used as error message when moving a page.\n\nSee also:\n* {{msg-mw|Badarticleerror}}\n* {{msg-mw|Bad-target-model}}",
        "cantmove-titleprotected": "Used as error message when moving a page.",
-       "movetalk": "The text of the checkbox to watch the associated talk page to the page you are moving. This only appears when the talk page is not empty. Used in [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
-       "move-subpages": "The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any subpages will be moved with the main page to a new title.\n\nParameters:\n* $1 - ...\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
-       "move-talk-subpages": "The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any talk subpages will be moved with the talk page to a new title.\n\nParameters:\n* $1 - ...\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
+       "movetalk": "The text of the checkbox to watch the associated talk page to the page you are moving. This only appears when the talk page is not empty. Used in [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
+       "move-subpages": "The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any subpages will be moved with the main page to a new title.\n\nParameters:\n* $1 - ...\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
+       "move-talk-subpages": "The text of an option on the special page [[Special:MovePage|MovePage]]. If this option is ticked, any talk subpages will be moved with the talk page to a new title.\n\nParameters:\n* $1 - ...\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
        "movepage-page-exists": "Used as error message when moving page.\n* $1 - page title",
        "movepage-page-moved": "Used as success message when moving page.\n\nCan be followed by {{msg-mw|Movepage-max-pages}}.\n\nParameters:\n* $1 - old page title (with link)\n* $2 - new page title (with link)\nSee also:\n* {{msg-mw|Movepage-page-unmoved}}",
        "movepage-page-unmoved": "Used as error message when moving page. Parameters:\n* $1 - old page title (with link)\n* $2 - new page title (with link)\nSee also:\n* {{msg-mw|Movepage-page-moved}}",
@@ -2476,7 +2476,7 @@
        "movesubpage": "This is a section header on [[Special:MovePage]], below is a list of subpages.\n\nParameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}",
        "movesubpagetext": "Used in [[Special:MovePage]]. Parameters:\n* $1 - number of subpages\nSee also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}",
        "movenosubpage": "See also:\n* {{msg-mw|movesubpage|section header}}\n* {{msg-mw|movenosubpage|without subpage}}\n* {{msg-mw|movesubpagetext|with subpages}}",
-       "movereason": "Used in [[Special:MovePage]]. The text for the inputbox to give a reason for the page move.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}\n{{Identical|Reason}}",
+       "movereason": "Used in [[Special:MovePage]]. The text for the inputbox to give a reason for the page move.\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Fix-double-redirects|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}\n{{Identical|Reason}}",
        "move-redirect-text": "{{ignored}}The text that's added to a redirected page when that redirect is created.",
        "category-move-redirect-override": "{{ignored}}The text that's added to a redirected category page when that redirect is created.",
        "revertmove": "{{Identical|Revert}}",
@@ -2495,8 +2495,8 @@
        "nonfile-cannot-move-to-file": "Used as error message.\n\nSee also:\n* {{msg-mw|Imagenocrossnamespace}}\n* {{msg-mw|Nonfile-cannot-move-to-file}}",
        "imagetypemismatch": "Used as error message.\n\nSee also:\n* {{msg-mw|imageinvalidfilename}}\n* {{msg-mw|imagenocrossnamespace}}",
        "imageinvalidfilename": "Used as error message.\n\nSee also:\n* {{msg-mw|imagetypemismatch}}\n* {{msg-mw|imagenocrossnamespace}}",
-       "fix-double-redirects": "This is a checkbox in [[Special:MovePage]] which allows to move all redirects from the old title to the new title. Used in [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
-       "move-leave-redirect": "Used as label for checkbox in the Move Pages form on [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|move-page-legend|legend for the form}}\n* {{msg-mw|move-new-title|label for new title}}\n* {{msg-mw|movereason|label for textarea}}\n* {{msg-mw|movetalk|label for checkbox}}\n* {{msg-mw|fix-double-redirects|label for checkbox}}\n* {{msg-mw|move-subpages|label for checkbox}}\n* {{msg-mw|move-talk-subpages|label for checkbox}}\n* {{msg-mw|move-watch|label for checkbox}}",
+       "fix-double-redirects": "This is a checkbox in [[Special:MovePage]] which allows to move all redirects from the old title to the new title. Used in [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|Move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|Movereason|label for textarea}}\n* {{msg-mw|Movetalk|label for checkbox}}\n* {{msg-mw|Move-leave-redirect|label for checkbox}}\n* {{msg-mw|Move-subpages|label for checkbox}}\n* {{msg-mw|Move-talk-subpages|label for checkbox}}\n* {{msg-mw|Move-watch|label for checkbox}}",
+       "move-leave-redirect": "Used as label for checkbox in the Move Pages form on [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|move-page-legend|legend for the form}}\n* {{msg-mw|newtitle|label for new title}}\n* {{msg-mw|movereason|label for textarea}}\n* {{msg-mw|movetalk|label for checkbox}}\n* {{msg-mw|fix-double-redirects|label for checkbox}}\n* {{msg-mw|move-subpages|label for checkbox}}\n* {{msg-mw|move-talk-subpages|label for checkbox}}\n* {{msg-mw|move-watch|label for checkbox}}",
        "protectedpagemovewarning": "{{Related|Semiprotectedpagewarning}}",
        "semiprotectedpagemovewarning": "{{Related|Semiprotectedpagewarning}}",
        "move-over-sharedrepo": "Notice when a file with that filename already exists on a shared repository, such as Wikimedia Commons.\n\nParameters:\n* $1 - the destination page title",

diff --git a/maintenance/language/zhtable/simp2trad.manual b/maintenance/language/zhtable/simp2trad.manual
index 5518a88..86de029 100644 (file)
--- a/maintenance/language/zhtable/simp2trad.manual
+++ b/maintenance/language/zhtable/simp2trad.manual
@@ -25,6 +25,7 @@ U+0514B克|U+0514B克|U+0524B剋|
 U+0515A党|U+09EE8黨|U+0515A党|
 U+051AC冬|U+051AC冬|U+09F15鼕|
 U+051B2冲|U+06C96沖|U+0885D衝|
+U+051C0净|U+06DE8淨|
 U+051C4凄|U+06DD2淒|U+060BD悽|
 U+051C6准|U+051C6准|U+06E96準|
 U+051E0几|U+05E7E幾|U+051E0几|

diff --git a/maintenance/language/zhtable/simp2trad_noconvert.manual b/maintenance/language/zhtable/simp2trad_noconvert.manual
index d9326f2..8e8df45 100644 (file)
--- a/maintenance/language/zhtable/simp2trad_noconvert.manual
+++ b/maintenance/language/zhtable/simp2trad_noconvert.manual
@@ -13,3 +13,4 @@
 灡
 薳
 虯
+凈

diff --git a/maintenance/language/zhtable/simpphrases.manual b/maintenance/language/zhtable/simpphrases.manual
index 3477c0a..17d2f21 100644 (file)
--- a/maintenance/language/zhtable/simpphrases.manual
+++ b/maintenance/language/zhtable/simpphrases.manual
@@ -223,6 +223,9 @@
 校雠
 雠夷
 雠问
+雠正
+施雠
+无言不雠
 甚夥
 吴克羣
 宏碁

diff --git a/maintenance/language/zhtable/toCN.manual b/maintenance/language/zhtable/toCN.manual
index 3a00bd4..7f94ede 100644 (file)
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -2585,6 +2585,9 @@ A型肝炎        甲型肝炎
 尖峰時段   高峰时段
 咖哩 咖喱
 東協 东盟
+東協會      东协会
+東協助      东协助
+東協議      东协议
 亚细安      东盟
 大英國協   英联邦
 共和联邦   英联邦
@@ -2651,3 +2654,7 @@ A型肝炎        甲型肝炎
 東南亞國家協會  东南亚国家联盟
 獨立國協   独联体
 獨立國家國協     独立国家联合体
+行人路      人行道
+行人路權   行人路权
+行人路权   行人路权
+塑膠袋      塑料袋

diff --git a/maintenance/language/zhtable/toHK.manual b/maintenance/language/zhtable/toHK.manual
index 525100e..acbce96 100644 (file)
--- a/maintenance/language/zhtable/toHK.manual
+++ b/maintenance/language/zhtable/toHK.manual
@@ -1,7 +1,6 @@
 裡    裏
 鉤    鈎
 檯    枱
-臥    卧
 醯    酰
 菸    煙
 汙    污
@@ -423,6 +422,7 @@
 慌里慌张   慌裏慌張
 怀里 懷裏
 戏里 戲裏
+游戏里      遊戲裏
 房里 房裏
 手里 手裏
 手里剑      手裏劍
@@ -590,6 +590,9 @@
 月裡来      月裏來
 分钟里      分鐘裏
 小时里      小時裏
+体里 體裏
+柜里 櫃裏
+电影里      電影裏
 苑裡 苑裡
 霄裡 霄裡
 岸裡 岸裡
@@ -2601,8 +2604,16 @@
 径启 逕啟
 径迎 逕迎
 印表機      打印機
-字节 位元組
-字節 位元組
+0字节        0位元組
+1字节        1位元組
+2字节        2位元組
+3字节        3位元組
+4字节        4位元組
+5字节        5位元組
+6字节        6位元組
+7字节        7位元組
+8字节        8位元組
+9字节        9位元組
 列印 打印
 硬件 硬件
 硬體 硬件
@@ -2938,6 +2949,9 @@ IP地址  IP位址
 尖峰時間   繁忙時間
 尖峰時段   繁忙時段
 東協 東盟
+東協會      東協會
+東協助      東協助
+東協議      東協議
 亚细安      東盟
 大英國協   英聯邦
 共和联邦   英聯邦
@@ -2992,8 +3006,10 @@ IP地址 IP位址
 賈伯斯      喬布斯
 宝莱坞      波里活
 寶萊塢      波里活
-庫德æ\97\8f      åº\93爾德族
-庫德人      åº\93爾德人
+庫德æ\97\8f      庫爾德族
+庫德人      庫爾德人
 東南亞國家協會  東南亞國家聯盟
 獨立國協   獨聯體
 獨立國家國協     獨立國家聯合體
+人行道      行人路
+塑料袋      膠袋

diff --git a/maintenance/language/zhtable/toTW.manual b/maintenance/language/zhtable/toTW.manual
index 22456a7..57f9ab5 100644 (file)
--- a/maintenance/language/zhtable/toTW.manual
+++ b/maintenance/language/zhtable/toTW.manual
@@ -211,6 +211,16 @@
 打印 列印
 攻打 攻打 #分詞用
 打印度      打印度
+0字节        0位元組
+1字节        1位元組
+2字节        2位元組
+3字节        3位元組
+4字节        4位元組
+5字节        5位元組
+6字节        6位元組
+7字节        7位元組
+8字节        8位元組
+9字节        9位元組
 硬件 硬體
 二极管      二極體
 二極管      二極體
@@ -758,3 +768,7 @@ IP地址    IP位址
 波里活      寶萊塢
 库尔德族   庫德族
 库尔德人   庫德人
+行人路      人行道
+行人路權   行人路權
+行人路权   行人路權
+塑料袋      塑膠袋

diff --git a/maintenance/language/zhtable/toTrad.manual b/maintenance/language/zhtable/toTrad.manual
index 13a0b98..b30fdd6 100644 (file)
--- a/maintenance/language/zhtable/toTrad.manual
+++ b/maintenance/language/zhtable/toTrad.manual
@@ -4,10 +4,9 @@
 ’    』
 ’s   ’s
 手塚治虫   手塚治虫
-無言不仇   無言不讎
-視如寇仇   視如寇讎
-往日無仇   往日無讎
-近日無仇   近日無讎
+寇仇 寇讎
+往日无仇   往日無讎
+近日无仇   近日無讎
 李連杰      李連杰
 杰倫 杰倫
 杰威爾      杰威爾
@@ -204,6 +203,7 @@
 天神之后   天神之后
 豔后 豔后
 后綜 后綜
+葉陽后      葉陽后
 壽天里      壽天里
 貴子里      貴子里
 東湖里      東湖里
@@ -465,6 +465,7 @@
 7余   7餘
 8余   8餘
 9余   9餘
+米余 米餘
 带余 帶餘
 余干 餘干
 余江 餘江
@@ -527,3 +528,4 @@
 龙岩 龍巖
 扑冬 撲鼕
 冬冬鼓      鼕鼕鼓
+苧麻 苧麻

diff --git a/maintenance/language/zhtable/trad2simp.manual b/maintenance/language/zhtable/trad2simp.manual
index c479f35..03c42d9 100644 (file)
--- a/maintenance/language/zhtable/trad2simp.manual
+++ b/maintenance/language/zhtable/trad2simp.manual
@@ -30,6 +30,7 @@ U+03D31㴱|U+06DF1深|
 U+03F1D㼝|U+07897碗|
 U+03F5E㽞|U+07559留|
 U+03FDC㿜|U+0762A瘪|
+U+04039䀹|U+25174𥅴|
 U+04230䈰|U+07B72筲|
 U+04280䊀|U+07CCA糊|
 U+045EC䗬|U+08702蜂|
@@ -456,6 +457,7 @@ U+07D25紥|U+0624E扎|
 U+07D2E紮|U+0624E扎|
 U+07D43絃|U+05F26弦|
 U+07D4F絏|U+07EC1绁|
+U+07D76絶|U+07EDD绝|
 U+07D89綉|U+07EE3绣|
 U+07D91綑|U+06346捆|
 U+07DAB綫|U+07EBF线|

diff --git a/maintenance/language/zhtable/tradphrases.manual b/maintenance/language/zhtable/tradphrases.manual
index b97ca6e..8e1e90d 100644 (file)
--- a/maintenance/language/zhtable/tradphrases.manual
+++ b/maintenance/language/zhtable/tradphrases.manual
@@ -372,6 +372,7 @@
 開採
 揪採
 樵採
+改採
 採訪
 採辦
 採補
@@ -423,6 +424,7 @@
 採運
 採風
 採血
+花不要採
 官地為寀
 寮寀
 蔘綏
@@ -556,7 +558,6 @@
 截髮
 解髮佯狂
 淨髮
-秋髮
 噙齒戴髮
 青山一髮
 晞髮
@@ -571,7 +572,6 @@
 絲髮
 絲恩髮怨
 蒜髮
-算髮
 有髮頭陀寺
 髮箋
 髮屋
@@ -641,8 +641,6 @@
 模范棒棒堂
 模范三軍
 模范七棒
-模范14棒
-模范21棒
 顏範
 儀範
 典範
@@ -712,7 +710,7 @@
 田穀
 脫穀機
 年穀
-礱穀機
+礱穀
 穀米
 穀旦
 穀圭
@@ -1221,8 +1219,6 @@
 澄澹精致
 呆緻緻
 光緻緻
-工緻
-功緻
 縝緻
 堅緻
 种放
@@ -1235,6 +1231,7 @@
 中庄子
 田庄英雄
 本庄
+庄司
 厂部
 衝量
 衝車
@@ -2106,9 +2103,11 @@
 祝讚
 詩讚
 賞讚
+讚嘆
 讚唄
 點讚
 點個讚
+超讚
 飛紮
 紮裹
 紮腳
@@ -2955,11 +2954,11 @@
 百科裡
 歷史裡
 戲裡
+遊戲裡
 作品裡
 專輯裡
 年代裡
 棺材裡
-假里白
 天里村
 上天里
 天里昂
@@ -3069,6 +3068,12 @@
 月裡來
 分鐘裡
 小時裡
+體裡
+櫃裡
+片裡
+電影裡
+裏白 #植物常用名
+烏蘇里 #分詞用
 首發
 夸脫
 風采
@@ -3322,6 +3327,8 @@
 趙威后
 聖后
 陳有后
+惠文后
+葉陽后
 于冠華
 于雲鶴
 于忠肅集
@@ -3483,7 +3490,6 @@
 涌水塘
 后姓
 計劃
-抑制劑
 党姓
 党家
 种丹妮
@@ -3497,7 +3503,6 @@
 宋王臺
 臺佟
 臺靜農
-改採
 林鵞峰
 沙羡
 最多只
@@ -3549,6 +3554,7 @@
 羅馬歷史
 羅馬歷代
 曆數書
+曆局
 你誇
 誇你
 誇我
@@ -3579,7 +3585,6 @@
 自誇
 誇稱
 誇讚
-讚嘆
 布穀鳥
 黎克特制
 筆桿
@@ -3711,8 +3716,20 @@
 烹製
 醃製
 和製漢
+和製英語
 壓製機
 壓製出
+應制得
+反應製得
+製表鍵
+電子製表
+製毒
+製販
+遏制 #以下分詞用
+管制
+抑制
+控制
+限制
 體徵
 綜合徵
 价川
@@ -3807,6 +3824,7 @@
 呦喂
 水表面
 表面包
+費米面
 松口鎮
 沙瑯
 琺瑯
@@ -3818,3 +3836,6 @@
 風颳
 颳大風
 黃白術
+仁貴 #分詞用
+金聖歎
+天台 #分詞用

diff --git a/maintenance/language/zhtable/tradphrases_exclude.manual b/maintenance/language/zhtable/tradphrases_exclude.manual
index 1f8a6e0..380fdd6 100644 (file)
--- a/maintenance/language/zhtable/tradphrases_exclude.manual
+++ b/maintenance/language/zhtable/tradphrases_exclude.manual
@@ -704,3 +704,9 @@
 作姦犯科
 游牧民族
 穀道
+託大
+藉詞
+摺合
+仇讎
+讎正
+校讎學

diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php
index 23afabd..ae0d325 100644 (file)
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -198,7 +198,14 @@ class ResourcesTest extends MediaWikiTestCase {
                                                        $media,
                                                        $file,
                                                        // XXX: Wrapped in an object to keep it out of PHPUnit output
-                                                       (object)array( 'cssText' => $readStyleFile->invoke( $module, $file, $flip, $data['context'] ) ),
+                                                       (object)array(
+                                                               'cssText' => $readStyleFile->invoke(
+                                                                       $module,
+                                                                       $file,
+                                                                       $flip,
+                                                                       $data['context']
+                                                               )
+                                                       ),
                                                );
                                        }
                                }