Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 68 insertions, 162 deletions

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 7ffdeab8..58bc98c9 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -1720,7 +1720,6 @@ $zh2Hant = array(
 '躏' => '躪',
 '躜' => '躦',
 '躯' => '軀',
-'軿' => '𫚒',
 '车' => '車',
 '轧' => '軋',
 '轨' => '軌',
@@ -2950,6 +2949,7 @@ $zh2Hant = array(
 '不占卜' => '不占卜',
 '不占吉凶' => '不占吉凶',
 '不占算' => '不占算',
+'不只' => '不只',
 '不好干涉' => '不好干涉',
 '不好干预' => '不好干預',
 '不好干預' => '不好干預',
@@ -3028,6 +3028,7 @@ $zh2Hant = array(
 '中签' => '中籤',
 '中美发表' => '中美發表',
 '中药' => '中藥',
+'中西合并' => '中西合併',
 '中风后' => '中風後',
 '丰儀' => '丰儀',
 '丰仪' => '丰儀',
@@ -3372,6 +3373,7 @@ $zh2Hant = array(
 '于正昇' => '于正昇',
 '于正昌' => '于正昌',
 '于归' => '于歸',
+'于氏' => '于氏',
 '于永波' => '于永波',
 '于江震' => '于江震',
 '于波' => '于波',
@@ -3518,6 +3520,7 @@ $zh2Hant = array(
 '什锦面' => '什錦麵',
 '什么' => '什麼',
 '仇仇' => '仇讎',
+'今天' => '今天',
 '他克制' => '他剋制',
 '他钟' => '他鐘',
 '付托' => '付託',
@@ -3549,6 +3552,7 @@ $zh2Hant = array(
 '伊尔汗历表' => '伊爾汗曆表',
 '伊达里子' => '伊達里子',
 '伊适杰' => '伊適杰',
+'伊里布' => '伊里布',
 '伊郁' => '伊鬱',
 '伏几' => '伏几',
 '伐罪吊民' => '伐罪弔民',
@@ -3897,6 +3901,7 @@ $zh2Hant = array(
 '幸免' => '倖免',
 '幸存' => '倖存',
 '幸幸' => '倖幸',
+'候复' => '候覆',
 '倛丑' => '倛醜',
 '借听于聋' => '借聽於聾',
 '倦游' => '倦遊',
@@ -4051,7 +4056,6 @@ $zh2Hant = array(
 '八出祁山' => '八出祁山',
 '八出逃' => '八出逃',
 '八周后' => '八周後',
-'八大胡同' => '八大胡同',
 '八天后' => '八天後',
 '八字胡' => '八字鬍',
 '八年' => '八年',
@@ -4100,6 +4104,7 @@ $zh2Hant = array(
 '冬山庄' => '冬山庄',
 '冬日里' => '冬日裡',
 '冬游' => '冬遊',
+'冰冷' => '冰冷',
 '冶游' => '冶遊',
 '冷庄子' => '冷莊子',
 '冷面相' => '冷面相',
@@ -4171,6 +4176,7 @@ $zh2Hant = array(
 '划得来' => '划得來',
 '划拳' => '划拳',
 '划桨' => '划槳',
+'划槳' => '划槳',
 '划水' => '划水',
 '划算' => '划算',
 '划船' => '划船',
@@ -4220,6 +4226,7 @@ $zh2Hant = array(
 '克期' => '剋期',
 '克死' => '剋死',
 '克薄' => '剋薄',
+'前天' => '前天',
 '前往' => '前往',
 '前言不答后语' => '前言不答後語',
 '前面店' => '前面店',
@@ -4277,6 +4284,7 @@ $zh2Hant = array(
 '包扎' => '包紮',
 '包庄' => '包莊',
 '匏系' => '匏繫',
+'化学家' => '化學家',
 '北岳' => '北嶽',
 '北回线' => '北迴線',
 '北回铁路' => '北迴鐵路',
@@ -4381,6 +4389,7 @@ $zh2Hant = array(
 '口燥唇干' => '口燥唇乾',
 '口腹之欲' => '口腹之慾',
 '口里' => '口裡',
+'口试' => '口試',
 '口钟' => '口鐘',
 '古书云' => '古書云',
 '古書云' => '古書云',
@@ -4437,6 +4446,7 @@ $zh2Hant = array(
 '可自制' => '可自制',
 '台子女' => '台子女',
 '台子孙' => '台子孫',
+'台州' => '台州',
 '台布景' => '台布景',
 '台历史' => '台歷史',
 '台钟' => '台鐘',
@@ -4467,8 +4477,8 @@ $zh2Hant = array(
 '各辟' => '各闢',
 '各类钟' => '各類鐘',
 '合伙人' => '合伙人',
-'合并' => '合併',
 '合伙' => '合夥',
+'合并' => '合并',
 '合府上' => '合府上',
 '合采' => '合採',
 '合历' => '合曆',
@@ -4491,9 +4501,11 @@ $zh2Hant = array(
 '后北街' => '后北街',
 '后土' => '后土',
 '后妃' => '后妃',
+'后姓' => '后姓',
 '后安路' => '后安路',
 '后平路' => '后平路',
 '后座' => '后座',
+'后母戊' => '后母戊',
 '后海湾' => '后海灣',
 '后海灣' => '后海灣',
 '后瑞站' => '后瑞站',
@@ -4656,6 +4668,7 @@ $zh2Hant = array(
 '国历' => '國曆',
 '国历代' => '國歷代',
 '国历任' => '國歷任',
+'国历来' => '國歷來',
 '国历史' => '國歷史',
 '国历届' => '國歷屆',
 '国历经' => '國歷經',
@@ -4818,6 +4831,7 @@ $zh2Hant = array(
 '天后来' => '天後來',
 '天后半' => '天後半',
 '天后天' => '天後天',
+'天文学家' => '天文學家',
 '天文学钟' => '天文學鐘',
 '天文历表' => '天文曆表',
 '天文钟' => '天文鐘',
@@ -4900,6 +4914,7 @@ $zh2Hant = array(
 '嬴余' => '嬴餘',
 '子之丰兮' => '子之丰兮',
 '子云' => '子云',
+'子晳' => '子晳',
 '字汇' => '字彙',
 '字码表' => '字碼表',
 '字里行间' => '字裡行間',
@@ -5301,12 +5316,14 @@ $zh2Hant = array(
 '往日無仇' => '往日無讎',
 '往里' => '往裡',
 '往复' => '往複',
+'待复' => '待覆',
 '很干' => '很乾',
 '很凶' => '很兇',
 '很丑' => '很醜',
 '律历志' => '律曆志',
 '后印' => '後印',
 '后台老板' => '後台老板',
+'后天' => '後天',
 '后庄' => '後庄',
 '后面店' => '後面店',
 '徐干' => '徐幹',
@@ -5656,11 +5673,12 @@ $zh2Hant = array(
 '扯面' => '扯麵',
 '扶余国' => '扶餘國',
 '批准的' => '批准的',
-'批复' => '批複',
+'批复' => '批覆',
 '批注' => '批註',
 '批斗' => '批鬥',
 '承制' => '承製',
 '抑制作用' => '抑制作用',
+'抑制剂' => '抑制劑',
 '抑郁' => '抑鬱',
 '抓奸' => '抓姦',
 '抓药' => '抓藥',
@@ -5999,6 +6017,7 @@ $zh2Hant = array(
 '数天后' => '數天後',
 '数字钟' => '數字鐘',
 '数字钟表' => '數字鐘錶',
+'数学家' => '數學家',
 '数罪并罚' => '數罪併罰',
 '数与虏确' => '數與虜确',
 '文丑' => '文丑',
@@ -6162,6 +6181,7 @@ $zh2Hant = array(
 '升平' => '昇平',
 '升阳' => '昇陽',
 '昊天不吊' => '昊天不弔',
+'明天' => '明天',
 '明征' => '明徵',
 '明目张胆' => '明目張胆',
 '明窗净几' => '明窗淨几',
@@ -6180,6 +6200,7 @@ $zh2Hant = array(
 '春药' => '春藥',
 '春游' => '春遊',
 '春香斗学' => '春香鬥學',
+'昨天' => '昨天',
 '时钟' => '時鐘',
 '时间里' => '時間裡',
 '晃荡' => '晃蕩',
@@ -6232,6 +6253,7 @@ $zh2Hant = array(
 '更钟' => '更鐘',
 '书呆子' => '書獃子',
 '书签' => '書籤',
+'书面' => '書面',
 '曼谷人' => '曼谷人',
 '曾朴' => '曾樸',
 '最多' => '最多',
@@ -6292,6 +6314,7 @@ $zh2Hant = array(
 '木制' => '木製',
 '木钟' => '木鐘',
 '未干' => '未乾',
+'未干涉' => '未干涉',
 '末药' => '末藥',
 '本征' => '本徵',
 '术赤' => '朮赤',
@@ -6470,7 +6493,6 @@ $zh2Hant = array(
 '归余' => '歸餘',
 '歹斗' => '歹鬥',
 '死于' => '死於',
-'死胡同' => '死胡同',
 '死里求生' => '死裡求生',
 '死里逃生' => '死裡逃生',
 '殖谷' => '殖穀',
@@ -6638,7 +6660,9 @@ $zh2Hant = array(
 '清汤挂面' => '清湯掛麵',
 '减肥药' => '減肥藥',
 '渠冲' => '渠衝',
+'测试' => '測試',
 '港制' => '港製',
+'游离' => '游離',
 '浑朴' => '渾樸',
 '浑个' => '渾箇',
 '凑合着' => '湊合著',
@@ -6847,6 +6871,7 @@ $zh2Hant = array(
 '牛肉面' => '牛肉麵',
 '牛只' => '牛隻',
 '物欲' => '物慾',
+'物理学家' => '物理學家',
 '特别致' => '特别致',
 '特制住' => '特制住',
 '特制定' => '特制定',
@@ -6900,6 +6925,7 @@ $zh2Hant = array(
 '玉历史' => '玉歷史',
 '王侯后' => '王侯后',
 '王后' => '王后',
+'王田里' => '王田里',
 '王庄' => '王莊',
 '王余鱼' => '王餘魚',
 '珍肴异馔' => '珍肴異饌',
@@ -6926,6 +6952,7 @@ $zh2Hant = array(
 '生力面' => '生力麵',
 '生于' => '生於',
 '生殖洄游' => '生殖洄游',
+'生物学家' => '生物學家',
 '生物钟' => '生物鐘',
 '生发生' => '生發生',
 '生华发' => '生華髮',
@@ -6935,6 +6962,7 @@ $zh2Hant = array(
 '产卵洄游' => '產卵洄游',
 '用药' => '用藥',
 '甩发' => '甩髮',
+'田庄英雄' => '田庄英雄',
 '田谷' => '田穀',
 '田庄' => '田莊',
 '田里' => '田裡',
@@ -7178,6 +7206,7 @@ $zh2Hant = array(
 '种师中' => '种師中',
 '种师道' => '种師道',
 '种放' => '种放',
+'科学家' => '科學家',
 '科斗' => '科斗',
 '科范' => '科範',
 '秒表明' => '秒表明',
@@ -7273,6 +7302,7 @@ $zh2Hant = array(
 '笨笨呆呆' => '笨笨呆呆',
 '第四出局' => '第四出局',
 '笔秃墨干' => '筆禿墨乾',
+'笔试' => '筆試',
 '等于' => '等於',
 '笋干' => '筍乾',
 '筑前' => '筑前',
@@ -7360,6 +7390,7 @@ $zh2Hant = array(
 '纪历' => '紀曆',
 '纪历史' => '紀歷史',
 '约占' => '約佔',
+'红后假说' => '紅后假說',
 '红绳系足' => '紅繩繫足',
 '红色长发' => '紅色長髮',
 '红钟' => '紅鐘',
@@ -7562,6 +7593,7 @@ $zh2Hant = array(
 '老板' => '老闆',
 '老面皮' => '老面皮',
 '考征' => '考徵',
+'考试' => '考試',
 '而克制' => '而剋制',
 '耍斗' => '耍鬥',
 '耕佣' => '耕傭',
@@ -7723,7 +7755,6 @@ $zh2Hant = array(
 '茶余' => '茶餘',
 '茶面' => '茶麵',
 '草丛里' => '草叢裡',
-'草广' => '草广',
 '草荐' => '草荐',
 '草药' => '草藥',
 '荐居' => '荐居',
@@ -7960,7 +7991,6 @@ $zh2Hant = array(
 '行凶後' => '行兇後',
 '行于' => '行於',
 '行百里者半于九十' => '行百里者半於九十',
-'胡同' => '衚衕',
 '卫后庄公' => '衛後莊公',
 '卫星钟' => '衛星鐘',
 '冲上' => '衝上',
@@ -8191,6 +8221,7 @@ $zh2Hant = array(
 '言大而夸' => '言大而夸',
 '言辩而确' => '言辯而确',
 '订制' => '訂製',
+'计划' => '計劃',
 '计时表' => '計時錶',
 '托了' => '託了',
 '托事' => '託事',
@@ -8282,6 +8313,7 @@ $zh2Hant = array(
 '谈征' => '談徵',
 '请参阅' => '請參閱',
 '请君入瓮' => '請君入甕',
+'请求' => '請求',
 '请托' => '請託',
 '咨询' => '諮詢',
 '诸余' => '諸餘',
@@ -8466,10 +8498,15 @@ $zh2Hant = array(
 '透辟' => '透闢',
 '这只不' => '這只不',
 '这只允' => '這只允',
+'这只可' => '這只可',
+'这只在' => '這只在',
 '这只容' => '這只容',
 '这只采' => '這只採',
 '这只是' => '這只是',
+'这只会' => '這只會',
 '这只用' => '這只用',
+'这只能' => '這只能',
+'这只需' => '這只需',
 '这伙人' => '這夥人',
 '这里' => '這裡',
 '这钟' => '這鐘',
@@ -8544,7 +8581,8 @@ $zh2Hant = array(
 '游踪' => '遊蹤',
 '游逛' => '遊逛',
 '游错' => '遊錯',
-'游离' => '遊離',
+'游离份子' => '遊離份子',
+'游离票' => '遊離票',
 '游骑兵' => '遊騎兵',
 '游魂' => '遊魂',
 '过于' => '過於',
@@ -8574,8 +8612,14 @@ $zh2Hant = array(
 '还采' => '還採',
 '还冲' => '還衝',
 '邋里邋遢' => '邋裡邋遢',
+'那只可' => '那只可',
+'那只在' => '那只在',
 '那只是' => '那只是',
+'那只会' => '那只會',
 '那只有' => '那只有',
+'那只用' => '那只用',
+'那只能' => '那只能',
+'那只需' => '那只需',
 '那卷' => '那捲',
 '那里' => '那裡',
 '那只' => '那隻',
@@ -9173,6 +9217,7 @@ $zh2Hant = array(
 '余桶' => '餘桶',
 '余业' => '餘業',
 '余款' => '餘款',
+'余欢' => '餘歡',
 '余步' => '餘步',
 '余殃' => '餘殃',
 '余毒' => '餘毒',
@@ -9302,6 +9347,7 @@ $zh2Hant = array(
 '高干预' => '高干預',
 '高干' => '高幹',
 '高度自制' => '高度自制',
+'高涌泉' => '高涌泉',
 '高清愿' => '高清愿',
 '髡发' => '髡髮',
 '髭胡' => '髭鬍',
@@ -9729,7 +9775,6 @@ $zh2Hant = array(
 );
 
 $zh2Hans = array(
-'㑳' => '㑇',
 '㞞' => '𪨊',
 '㠏' => '㟆',
 '㩜' => '㨫',
@@ -9737,33 +9782,11 @@ $zh2Hans = array(
 '䊷' => '䌶',
 '䋙' => '䌺',
 '䋻' => '䌾',
-'䌈' => '𦈖',
 '䝼' => '䞍',
-'䪏' => '𩏼',
-'䪗' => '𩐀',
-'䪘' => '𩏿',
-'䫴' => '𩖗',
-'䬘' => '𩙮',
-'䬝' => '𩙯',
-'䭀' => '𩠇',
-'䭃' => '𩠈',
-'䭿' => '𩧭',
-'䮝' => '𩧰',
-'䮞' => '𩨁',
-'䮠' => '𩧿',
-'䮳' => '𩨏',
-'䮾' => '𩧪',
 '䯀' => '䯅',
 '䰾' => '鲃',
-'䱙' => '𩾈',
-'䱬' => '𩾊',
-'䱰' => '𩾋',
-'䱷' => '䲣',
 '䱽' => '䲝',
 '䲁' => '鳚',
-'䲰' => '𪉂',
-'䴬' => '𪎈',
-'䴴' => '𪎋',
 '丟' => '丢',
 '並' => '并',
 '乾' => '干',
@@ -9922,7 +9945,6 @@ $zh2Hans = array(
 '嗎' => '吗',
 '嗚' => '呜',
 '嗩' => '唢',
-'嗰' => '𠮶',
 '嗶' => '哔',
 '嗹' => '𪡏',
 '嘆' => '叹',
@@ -11722,12 +11744,10 @@ $zh2Hans = array(
 '釤' => '钐',
 '釧' => '钏',
 '釩' => '钒',
-'釳' => '𨰿',
 '釵' => '钗',
 '釷' => '钍',
 '釹' => '钕',
 '釺' => '钎',
-'釾' => '䥺',
 '鈀' => '钯',
 '鈁' => '钫',
 '鈃' => '钘',
@@ -11735,7 +11755,6 @@ $zh2Hans = array(
 '鈇' => '𫓧',
 '鈈' => '钚',
 '鈉' => '钠',
-'鈋' => '𨱂',
 '鈍' => '钝',
 '鈎' => '钩',
 '鈐' => '钤',
@@ -11744,15 +11763,12 @@ $zh2Hans = array(
 '鈔' => '钞',
 '鈕' => '钮',
 '鈞' => '钧',
-'鈠' => '𨱁',
 '鈣' => '钙',
 '鈥' => '钬',
 '鈦' => '钛',
 '鈧' => '钪',
 '鈮' => '铌',
-'鈯' => '𨱄',
 '鈰' => '铈',
-'鈲' => '𨱃',
 '鈳' => '钶',
 '鈴' => '铃',
 '鈷' => '钴',
@@ -11763,7 +11779,6 @@ $zh2Hans = array(
 '鈾' => '铀',
 '鈿' => '钿',
 '鉀' => '钾',
-'鉁' => '𨱅',
 '鉅' => '钜',
 '鉈' => '铊',
 '鉉' => '铉',
@@ -11807,7 +11822,6 @@ $zh2Hans = array(
 '銬' => '铐',
 '銱' => '铞',
 '銳' => '锐',
-'銶' => '𨱇',
 '銷' => '销',
 '銹' => '锈',
 '銻' => '锑',
@@ -11816,7 +11830,6 @@ $zh2Hans = array(
 '鋃' => '锒',
 '鋅' => '锌',
 '鋇' => '钡',
-'鋉' => '𨱈',
 '鋌' => '铤',
 '鋏' => '铗',
 '鋒' => '锋',
@@ -11839,7 +11852,6 @@ $zh2Hans = array(
 '鋸' => '锯',
 '鋼' => '钢',
 '錁' => '锞',
-'錂' => '𨱋',
 '錄' => '录',
 '錆' => '锖',
 '錇' => '锫',
@@ -11869,7 +11881,6 @@ $zh2Hans = array(
 '鍀' => '锝',
 '鍁' => '锨',
 '鍃' => '锪',
-'鍄' => '𨱉',
 '鍆' => '钔',
 '鍇' => '锴',
 '鍈' => '锳',
@@ -11885,7 +11896,6 @@ $zh2Hans = array(
 '鍥' => '锲',
 '鍩' => '锘',
 '鍬' => '锹',
-'鍮' => '𨱎',
 '鍰' => '锾',
 '鍵' => '键',
 '鍶' => '锶',
@@ -11912,19 +11922,15 @@ $zh2Hans = array(
 '鎬' => '镐',
 '鎭' => '鎮',
 '鎮' => '镇',
-'鎯' => '𨱍',
 '鎰' => '镒',
 '鎲' => '镋',
 '鎳' => '镍',
 '鎵' => '镓',
-'鎷' => '𨰾',
 '鎸' => '镌',
 '鎿' => '镎',
 '鏃' => '镞',
-'鏆' => '𨱌',
 '鏇' => '镟',
 '鏈' => '链',
-'鏉' => '𨱒',
 '鏌' => '镆',
 '鏍' => '镙',
 '鏐' => '镠',
@@ -11945,13 +11951,10 @@ $zh2Hans = array(
 '鏵' => '铧',
 '鏷' => '镤',
 '鏹' => '镪',
-'鏺' => '䥽',
 '鏽' => '锈',
 '鐃' => '铙',
 '鐋' => '铴',
 '鐍' => '𫔎',
-'鐎' => '𨱓',
-'鐏' => '𨱔',
 '鐐' => '镣',
 '鐒' => '铹',
 '鐓' => '镦',
@@ -11960,13 +11963,11 @@ $zh2Hans = array(
 '鐙' => '镫',
 '鐝' => '镢',
 '鐠' => '镨',
-'鐥' => '䦅',
 '鐦' => '锎',
 '鐧' => '锏',
 '鐨' => '镄',
 '鐫' => '镌',
 '鐮' => '镰',
-'鐯' => '䦃',
 '鐲' => '镯',
 '鐳' => '镭',
 '鐵' => '铁',
@@ -12006,10 +12007,8 @@ $zh2Hans = array(
 '閉' => '闭',
 '開' => '开',
 '閌' => '闶',
-'閍' => '𨸂',
 '閎' => '闳',
 '閏' => '闰',
-'閐' => '𨸃',
 '閑' => '闲',
 '閒' => '闲',
 '間' => '间',
@@ -12142,7 +12141,6 @@ $zh2Hans = array(
 '頹' => '颓',
 '頻' => '频',
 '頽' => '颓',
-'顃' => '𩖖',
 '顆' => '颗',
 '題' => '题',
 '額' => '额',
@@ -12169,16 +12167,13 @@ $zh2Hans = array(
 '颭' => '飐',
 '颮' => '飑',
 '颯' => '飒',
-'颰' => '𩙥',
 '颱' => '台',
 '颳' => '刮',
 '颶' => '飓',
-'颷' => '𩙪',
 '颸' => '飔',
 '颺' => '飏',
 '颻' => '飖',
 '颼' => '飕',
-'颾' => '𩙫',
 '飀' => '飗',
 '飄' => '飘',
 '飆' => '飙',
@@ -12229,7 +12224,6 @@ $zh2Hans = array(
 '餵' => '喂',
 '餶' => '馉',
 '餷' => '馇',
-'餸' => '𩠌',
 '餺' => '馎',
 '餼' => '饩',
 '餾' => '馏',
@@ -12258,7 +12252,6 @@ $zh2Hans = array(
 '馹' => '驲',
 '駁' => '驳',
 '駃' => '𫘝',
-'駎' => '𩧨',
 '駐' => '驻',
 '駑' => '驽',
 '駒' => '驹',
@@ -12266,18 +12259,14 @@ $zh2Hans = array(
 '駕' => '驾',
 '駘' => '骀',
 '駙' => '驸',
-'駚' => '𩧫',
 '駛' => '驶',
 '駝' => '驼',
 '駟' => '驷',
 '駡' => '骂',
 '駢' => '骈',
-'駧' => '𩧲',
-'駩' => '𩧴',
 '駭' => '骇',
 '駰' => '骃',
 '駱' => '骆',
-'駶' => '𩧺',
 '駸' => '骎',
 '駻' => '𫘣',
 '駿' => '骏',
@@ -12289,16 +12278,11 @@ $zh2Hans = array(
 '騍' => '骒',
 '騎' => '骑',
 '騏' => '骐',
-'騔' => '𩨀',
 '騖' => '骛',
 '騙' => '骗',
-'騚' => '𩨊',
-'騝' => '𩨃',
-'騟' => '𩨈',
 '騠' => '𫘨',
 '騤' => '骙',
 '騧' => '䯄',
-'騪' => '𩨄',
 '騫' => '骞',
 '騭' => '骘',
 '騮' => '骝',
@@ -12314,7 +12298,6 @@ $zh2Hans = array(
 '驄' => '骢',
 '驅' => '驱',
 '驊' => '骅',
-'驋' => '𩧯',
 '驌' => '骕',
 '驍' => '骁',
 '驏' => '骣',
@@ -12352,7 +12335,6 @@ $zh2Hans = array(
 '魛' => '鱽',
 '魟' => '𫚉',
 '魢' => '鱾',
-'魥' => '𩽹',
 '魨' => '鲀',
 '魯' => '鲁',
 '魴' => '鲂',
@@ -12369,13 +12351,10 @@ $zh2Hans = array(
 '鮑' => '鲍',
 '鮒' => '鲋',
 '鮓' => '鲊',
-'鮕' => '𩾀',
 '鮚' => '鲒',
 '鮜' => '鲘',
 '鮝' => '鲞',
 '鮞' => '鲕',
-'鮟' => '𩽾',
-'鮣' => '䲟',
 '鮦' => '鲖',
 '鮪' => '鲔',
 '鮫' => '鲛',
@@ -12384,11 +12363,9 @@ $zh2Hans = array(
 '鮰' => '𫚔',
 '鮳' => '鲓',
 '鮶' => '鲪',
-'鮸' => '𩾃',
 '鮺' => '鲝',
 '鯀' => '鲧',
 '鯁' => '鲠',
-'鯄' => '𩾁',
 '鯆' => '𫚙',
 '鯇' => '鲩',
 '鯉' => '鲤',
@@ -12408,19 +12385,15 @@ $zh2Hans = array(
 '鯪' => '鲮',
 '鯫' => '鲰',
 '鯰' => '鲇',
-'鯱' => '𩾇',
 '鯴' => '鲺',
-'鯶' => '𩽼',
 '鯷' => '鳀',
 '鯽' => '鲫',
 '鯿' => '鳊',
 '鰁' => '鳈',
 '鰂' => '鲗',
 '鰃' => '鳂',
-'鰆' => '䲠',
 '鰈' => '鲽',
 '鰉' => '鳇',
-'鰌' => '䲡',
 '鰍' => '鳅',
 '鰏' => '鲾',
 '鰐' => '鳄',
@@ -12432,7 +12405,6 @@ $zh2Hans = array(
 '鰣' => '鲥',
 '鰤' => '𫚕',
 '鰥' => '鳏',
-'鰧' => '䲢',
 '鰨' => '鳎',
 '鰩' => '鳐',
 '鰭' => '鳍',
@@ -12449,7 +12421,6 @@ $zh2Hans = array(
 '鰾' => '鳔',
 '鱂' => '鳉',
 '鱅' => '鳙',
-'鱇' => '𩾌',
 '鱈' => '鳕',
 '鱉' => '鳖',
 '鱒' => '鳟',
@@ -12479,7 +12450,6 @@ $zh2Hans = array(
 '鳴' => '鸣',
 '鳶' => '鸢',
 '鳷' => '𫛛',
-'鳼' => '𪉃',
 '鳾' => '䴓',
 '鴃' => '𫛞',
 '鴆' => '鸩',
@@ -12489,7 +12459,6 @@ $zh2Hans = array(
 '鴕' => '鸵',
 '鴗' => '𫁡',
 '鴛' => '鸳',
-'鴜' => '𪉈',
 '鴝' => '鸲',
 '鴞' => '鸮',
 '鴟' => '鸱',
@@ -12498,7 +12467,6 @@ $zh2Hans = array(
 '鴨' => '鸭',
 '鴯' => '鸸',
 '鴰' => '鸹',
-'鴲' => '𪉆',
 '鴴' => '鸻',
 '鴷' => '䴕',
 '鴻' => '鸿',
@@ -12510,7 +12478,6 @@ $zh2Hans = array(
 '鵑' => '鹃',
 '鵒' => '鹆',
 '鵓' => '鹁',
-'鵚' => '𪉍',
 '鵜' => '鹈',
 '鵝' => '鹅',
 '鵠' => '鹄',
@@ -12553,14 +12520,12 @@ $zh2Hans = array(
 '鷈' => '䴘',
 '鷊' => '鹝',
 '鷓' => '鹧',
-'鷔' => '𪉑',
 '鷖' => '鹥',
 '鷗' => '鸥',
 '鷙' => '鸷',
 '鷚' => '鹨',
 '鷥' => '鸶',
 '鷦' => '鹪',
-'鷨' => '𪉊',
 '鷫' => '鹔',
 '鷯' => '鹩',
 '鷲' => '鹫',
@@ -12588,13 +12553,10 @@ $zh2Hans = array(
 '鹽' => '盐',
 '麗' => '丽',
 '麥' => '麦',
-'麨' => '𪎊',
 '麩' => '麸',
 '麪' => '面',
 '麫' => '面',
 '麯' => '曲',
-'麲' => '𪎉',
-'麳' => '𪎌',
 '麴' => '曲',
 '麵' => '面',
 '麼' => '么',
@@ -12646,74 +12608,18 @@ $zh2Hans = array(
 '𡻕' => '岁',
 '𤪺' => '㻘',
 '𤫩' => '㻏',
-'𦪙' => '䑽',
 '𧜵' => '䙊',
 '𧝞' => '䘛',
 '𧦧' => '𫍟',
 '𧩙' => '䜥',
 '𧵳' => '䞌',
 '𨋢' => '䢂',
-'𨥛' => '𨱀',
 '𨦫' => '䦀',
 '𨧜' => '䦁',
-'𨧱' => '𨱊',
-'𨫒' => '𨱐',
-'𨮂' => '𨱕',
 '𨯅' => '䥿',
-'𩎢' => '𩏾',
-'𩏪' => '𩏽',
-'𩓣' => '𩖕',
-'𩗀' => '𩙦',
-'𩗡' => '𩙧',
-'𩘀' => '𩙩',
-'𩘝' => '𩙭',
-'𩘹' => '𩙨',
-'𩘺' => '𩙬',
-'𩙈' => '𩙰',
-'𩜦' => '𩠆',
-'𩝔' => '𩠋',
-'𩞯' => '䭪',
-'𩟐' => '𩠅',
-'𩡺' => '𩧦',
-'𩢡' => '𩧬',
-'𩢴' => '𩧵',
-'𩢸' => '𩧳',
-'𩢾' => '𩧮',
-'𩣏' => '𩧶',
 '𩣑' => '䯃',
 '𩣵' => '𩧻',
-'𩣺' => '𩧼',
-'𩤊' => '𩧩',
-'𩤙' => '𩨆',
-'𩤲' => '𩨉',
-'𩤸' => '𩨅',
-'𩥄' => '𩨋',
-'𩥇' => '𩨍',
-'𩥉' => '𩧱',
-'𩥑' => '𩨌',
-'𩧆' => '𩨐',
-'𩵩' => '𩽺',
-'𩵹' => '𩽻',
 '𩶘' => '䲞',
-'𩶰' => '𩽿',
-'𩶱' => '𩽽',
-'𩷰' => '𩾄',
-'𩸃' => '𩾅',
-'𩸦' => '𩾆',
-'𩽇' => '𩾎',
-'𩿪' => '𪉄',
-'𪀦' => '𪉅',
-'𪀾' => '𪉋',
-'𪁈' => '𪉉',
-'𪁖' => '𪉌',
-'𪂆' => '𪉎',
-'𪃍' => '𪉐',
-'𪃏' => '𪉏',
-'𪄆' => '𪉔',
-'𪄕' => '𪉒',
-'𪇳' => '𪉕',
-'𪘀' => '𪚏',
-'𪘯' => '𪚐',
 '𫚒' => '軿',
 '《易乾' => '《易乾',
 '不著痕跡' => '不着痕迹',
@@ -13062,6 +12968,7 @@ $zh2Hans = array(
 '信著者' => '信著者',
 '信著述' => '信著述',
 '修鍊' => '修炼',
+'候覆' => '候复',
 '候著' => '候着',
 '候著書' => '候著书',
 '候著书' => '候著书',
@@ -13118,6 +13025,7 @@ $zh2Hans = array(
 '偷著者' => '偷著者',
 '偷著述' => '偷著述',
 '傢俬' => '傢俬',
+'僧伽吒' => '僧伽吒',
 '光著' => '光着',
 '光著書' => '光著书',
 '光著书' => '光著书',
@@ -13681,6 +13589,7 @@ $zh2Hans = array(
 '當著者' => '当著者',
 '當著述' => '当著述',
 '彰明較著' => '彰明较著',
+'待覆' => '待复',
 '待著' => '待着',
 '待著书' => '待著书',
 '待著書' => '待著书',
@@ -13692,6 +13601,7 @@ $zh2Hans = array(
 '待著称' => '待著称',
 '待著者' => '待著者',
 '待著述' => '待著述',
+'後姓' => '後姓',
 '得著' => '得着',
 '得著書' => '得著书',
 '得著书' => '得著书',
@@ -13880,6 +13790,7 @@ $zh2Hans = array(
 '扛著者' => '扛著者',
 '扛著述' => '扛著述',
 '執著' => '执著',
+'批覆' => '批复',
 '找不著' => '找不着',
 '找得著' => '找得着',
 '抓著' => '抓着',
@@ -14527,6 +14438,7 @@ $zh2Hans = array(
 '猜著稱' => '猜著称',
 '猜著者' => '猜著者',
 '猜著述' => '猜著述',
+'王道乾' => '王道乾',
 '玩著' => '玩着',
 '甜著' => '甜着',
 '甜著書' => '甜著书',
@@ -15089,6 +15001,7 @@ $zh2Hans = array(
 '見著述' => '见著述',
 '視微知著' => '视微知著',
 '言幾析理' => '言幾析理',
+'警戒著' => '警戒着',
 '記著' => '记着',
 '記著書' => '记著书',
 '記著作' => '记著作',
@@ -15638,12 +15551,11 @@ $zh2TW = array(
 '阿塞拜疆' => '亞塞拜然',
 '人工智能' => '人工智慧',
 '接口' => '介面',
-'任意球員' => '任意球員',
-'任意球员' => '任意球員',
 '服务器' => '伺服器',
 '字節' => '位元組',
 '字节' => '位元組',
 '作品裏' => '作品裡',
+'信道' => '信道',
 '优先级' => '優先順序',
 '元兇' => '元凶',
 '元凶' => '元凶',
@@ -15670,7 +15582,6 @@ $zh2TW = array(
 '兇殺' => '凶殺',
 '凶杀' => '凶殺',
 '凶殺' => '凶殺',
-'分布式' => '分散式',
 '打印' => '列印',
 '列支敦士登' => '列支敦斯登',
 '剪彩' => '剪綵',
@@ -15829,6 +15740,7 @@ $zh2TW = array(
 '波斯尼亚和黑塞哥维那' => '波士尼亞赫塞哥維納',
 '博茨瓦纳' => '波札那',
 '博茨瓦納' => '波札那',
+'流程控制' => '流程控制',
 '侯赛因' => '海珊',
 '侯賽因' => '海珊',
 '深淵裏' => '深淵裡',
@@ -15904,7 +15816,6 @@ $zh2TW = array(
 '肚裏' => '肚裡',
 '肯尼亚' => '肯亞',
 '肯雅' => '肯亞',
-'任意球' => '自由球',
 '航天大学' => '航天大學',
 '苦裏' => '苦裡',
 '毛里塔尼亚' => '茅利塔尼亞',
@@ -15913,8 +15824,8 @@ $zh2TW = array(
 '万历' => '萬曆',
 '瓦努阿图' => '萬那杜',
 '瓦努阿圖' => '萬那杜',
-'也門' => '葉門',
 '也门' => '葉門',
+'也門' => '葉門',
 '着' => '著',
 '科摩羅' => '葛摩',
 '科摩罗' => '葛摩',
@@ -15988,11 +15899,11 @@ $zh2TW = array(
 '溫納圖萬' => '那杜',
 '醫院裏' => '醫院裡',
 '酰' => '醯',
-'巨商' => '鉅賈',
 '钩' => '鉤',
 '鈎' => '鉤',
 '钩心斗角' => '鉤心鬥角',
 '鈎心鬥角' => '鉤心鬥角',
+'锎' => '鉲',
 '写保护' => '防寫',
 '阿拉伯联合酋长国' => '阿拉伯聯合大公國',
 '阿拉伯聯合酋長國' => '阿拉伯聯合大公國',
@@ -16817,7 +16728,6 @@ $zh2HK = array(
 '拼著述' => '拼著述',
 '拼著錄' => '拼著錄',
 '拿著' => '拿着',
-'拿破崙' => '拿破侖',
 '拿著作' => '拿著作',
 '拿著名' => '拿著名',
 '拿著稱' => '拿著稱',
@@ -17751,6 +17661,7 @@ $zh2HK = array(
 '語著述' => '語著述',
 '語著錄' => '語著錄',
 '數據機' => '調制解調器',
+'警戒著' => '警戒着',
 '變著' => '變着',
 '變著作' => '變著作',
 '變著名' => '變著名',
@@ -18269,7 +18180,6 @@ $zh2CN = array(
 '甚麽' => '什么',
 '甚麼' => '什么',
 '乙太網' => '以太网',
-'自由球' => '任意球',
 '優先順序' => '优先级',
 '感測' => '传感',
 '伯利茲' => '伯利兹',
@@ -18291,8 +18201,6 @@ $zh2CN = array(
 '全形' => '全角',
 '八進位制' => '八进位制',
 '八進位' => '八进制',
-'公車' => '公共汽车',
-'公車上書' => '公车上书',
 '六進位制' => '六进位制',
 '六進位' => '六进制',
 '記憶體' => '内存',
@@ -18304,7 +18212,6 @@ $zh2CN = array(
 '幾內亞比索' => '几内亚比绍',
 '梵谷' => '凡高',
 '計程車' => '出租车',
-'分散式' => '分布式',
 '解析度' => '分辨率',
 '列支敦斯登' => '列支敦士登',
 '賴比瑞亞' => '利比里亚',
@@ -18366,6 +18273,7 @@ $zh2CN = array(
 '字型大小' => '字号',
 '字型檔' => '字库',
 '欄位' => '字段',
+'字母' => '字母',
 '字元' => '字符',
 '字節' => '字节',
 '位元組' => '字节',
@@ -18381,7 +18289,6 @@ $zh2CN = array(
 '尼日尔' => '尼日尔',
 '章節附註' => '尾注',
 '區域網' => '局域网',
-'鉅賈' => '巨商',
 '巴貝多' => '巴巴多斯',
 '巴布亞紐幾內亞' => '巴布亚新几内亚',
 '布希' => '布什',
@@ -18442,6 +18349,7 @@ $zh2CN = array(
 '波士尼亞赫塞哥維納' => '波斯尼亚和黑塞哥维那',
 '辛巴威' => '津巴布韦',
 '宏都拉斯' => '洪都拉斯',
+'滑鼠蛇' => '滑鼠蛇',
 '滿16進位' => '满16进位',
 '滿二進位' => '满二进位',
 '滿八進位' => '满八进位',
@@ -18487,8 +18395,6 @@ $zh2CN = array(
 '寮國' => '老挝',
 '肯雅' => '肯尼亚',
 '肯亞' => '肯尼亚',
-'自由球员' => '自由球员',
-'自由球員' => '自由球员',
 '單車' => '自行车',
 '太空梭' => '航天飞机',
 '穿梭機' => '航天飞机',