X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fdata%2FZhConversion.php;h=a3cd6223c403cf6d27c517341da14c0e11b2ef5a;hb=856bf52037a00c47c8123488dcf01bd3a1071f36;hp=a15d9105fe04accf2daec7ecf00865b0802243c9;hpb=4a975b8099ee11b15421d03be02206935a8422f1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index a15d9105fe..a3cd6223c4 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -542,7 +542,6 @@ public static $zh2Hant = [
 '帼' => '幗',
 '幂' => '冪',
 '并' => '並',
-'幺' => '么',
 '广' => '廣',
 '庄' => '莊',
 '庆' => '慶',
@@ -3110,7 +3109,6 @@ public static $zh2Hant = [
 '一干部下' => '一干部下',
 '一年' => '一年',
 '一年里' => '一年裡',
-'一别头' => '一彆頭',
 '一斗斗' => '一斗斗',
 '一树百获' => '一樹百穫',
 '一准' => '一準',
@@ -3162,6 +3160,7 @@ public static $zh2Hant = [
 '上梁山' => '上梁山',
 '上梁' => '上樑',
 '上台面' => '上檯面',
+'上签了' => '上簽了',
 '上签名' => '上簽名',
 '上签字' => '上簽字',
 '上签定' => '上簽定',
@@ -3179,6 +3178,7 @@ public static $zh2Hant = [
 '下于' => '下於',
 '下梁' => '下樑',
 '下注解' => '下注解',
+'下签了' => '下簽了',
 '下签名' => '下簽名',
 '下签字' => '下簽字',
 '下签定' => '下簽定',
@@ -3255,6 +3255,7 @@ public static $zh2Hant = [
 '中庄子' => '中庄子',
 '中文里' => '中文裡',
 '中于' => '中於',
+'中签了' => '中簽了',
 '中签名' => '中簽名',
 '中签字' => '中簽字',
 '中签定' => '中簽定',
@@ -3287,20 +3288,34 @@ public static $zh2Hant = [
 '主钟差' => '主鐘差',
 '主钟曲线' => '主鐘曲線',
 '乃系' => '乃係',
-'么么唱唱' => '么么唱唱',
 '么九' => '么九',
-'么儿' => '么兒',
+'么二三' => '么二三',
+'么元' => '么元',
+'么兒' => '么兒',
 '么半' => '么半',
+'么叔' => '么叔',
 '么喝' => '么喝',
 '么女' => '么女',
 '么妹' => '么妹',
+'么姓' => '么姓',
+'么姨' => '么姨',
+'么娘' => '么娘',
+'么媽' => '么媽',
+'么孃' => '么孃',
 '么子' => '么子',
+'么小' => '么小',
 '么弟' => '么弟',
 '么正' => '么正',
-'么爷' => '么爺',
+'么氏' => '么氏',
+'么爸' => '么爸',
+'么爹' => '么爹',
+'么爺' => '么爺',
+'么篇' => '么篇',
+'么舅' => '么舅',
+'么蛾子' => '么蛾子',
 '么雞' => '么雞',
-'么么小丑' => '么麼小丑',
-'么麼小丑' => '么麼小丑',
+'么鳳' => '么鳳',
+'么麼' => '么麼',
 '之一只' => '之一只',
 '之二只' => '之二只',
 '之八九只' => '之八九只',
@@ -3342,7 +3357,6 @@ public static $zh2Hant = [
 '干嚎' => '乾嚎',
 '干回付' => '乾回付',
 '干圆洁净' => '乾圓潔淨',
-'干地' => '乾地',
 '干坞' => '乾塢',
 '干女' => '乾女',
 '干奴才' => '乾奴才',
@@ -4124,11 +4138,12 @@ public static $zh2Hant = [
 '划過' => '划過',
 '划龍舟' => '划龍舟',
 '划龙舟' => '划龍舟',
+'划龍船' => '划龍船',
+'划龙船' => '划龍船',
 '判断发' => '判斷發',
 '别辟' => '別闢',
 '利欲' => '利慾',
 '利于' => '利於',
-'刮来刮去' => '刮來刮去',
 '刮起来' => '刮起來',
 '刮胡' => '刮鬍',
 '到山里' => '到山裡',
@@ -4430,7 +4445,6 @@ public static $zh2Hant = [
 '吸干' => '吸乾',
 '吹干' => '吹乾',
 '吹发' => '吹髮',
-'吹胡' => '吹鬍',
 '吾为之范我驰驱' => '吾爲之範我馳驅',
 '吕后' => '呂后',
 '呂后' => '呂后',
@@ -4460,6 +4474,8 @@ public static $zh2Hant = [
 '哀挽' => '哀輓',
 '品鉴' => '品鑑',
 '哄堂大笑' => '哄堂大笑',
+'哈啰喂' => '哈囉喂',
+'哈囉喂' => '哈囉喂',
 '員山庄' => '員山庄',
 '哪里' => '哪裡',
 '唁吊' => '唁弔',
@@ -4483,7 +4499,6 @@ public static $zh2Hant = [
 '喂！' => '喂！',
 '喂，' => '喂，',
 '善于' => '善於',
-'喜向往' => '喜向往',
 '喜欢表' => '喜歡錶',
 '喜欢钟' => '喜歡鐘',
 '喜欢钟表' => '喜歡鐘錶',
@@ -4494,6 +4509,8 @@ public static $zh2Hant = [
 '乔岳' => '喬嶽',
 '单于' => '單于',
 '單于' => '單于',
+'单向' => '單向',
+'單向' => '單向',
 '单单于' => '單單於',
 '单干' => '單幹',
 '单打独斗' => '單打獨鬥',
@@ -4583,7 +4600,6 @@ public static $zh2Hant = [
 '在于' => '在於',
 '地图里' => '地圖裡',
 '地心历表' => '地心曆表',
-'地方志' => '地方志',
 '地志' => '地誌',
 '地丑德齐' => '地醜德齊',
 '坏于' => '坏於',
@@ -4722,7 +4738,6 @@ public static $zh2Hant = [
 '天后宫' => '天后宮',
 '天地志狼' => '天地志狼',
 '天地为范' => '天地為範',
-'天干地支' => '天干地支',
 '天后来' => '天後來',
 '天后半' => '天後半',
 '天后天' => '天後天',
@@ -4777,6 +4792,7 @@ public static $zh2Hant = [
 '妖气冲天' => '妖氣衝天',
 '妆台' => '妝檯',
 '始于' => '始於',
+'姓么' => '姓么',
 '委托' => '委託',
 '委托书' => '委託書',
 '奸夫' => '姦夫',
@@ -4866,7 +4882,6 @@ public static $zh2Hant = [
 '封為后' => '封為后',
 '封面里' => '封面裡',
 '射雕' => '射鵰',
-'专向往' => '專向往',
 '专辑里' => '專輯裡',
 '尊后' => '尊后',
 '对不准' => '對不準',
@@ -4947,6 +4962,7 @@ public static $zh2Hant = [
 '山里的' => '山裡的',
 '山谷' => '山谷',
 '山重水复' => '山重水複',
+'岩松了' => '岩松了',
 '岫岩' => '岫巖',
 '岱岳' => '岱嶽',
 '峇里海' => '峇里海',
@@ -4987,6 +5003,7 @@ public static $zh2Hant = [
 '已占卜' => '已占卜',
 '已占算' => '已占算',
 '巴尔干' => '巴爾幹',
+'巴而术' => '巴而朮',
 '巷里' => '巷裡',
 '市里的' => '市裡的',
 '布谷' => '布穀',
@@ -5011,6 +5028,7 @@ public static $zh2Hant = [
 '年代里' => '年代裡',
 '年历' => '年曆',
 '年历史' => '年歷史',
+'年历次' => '年歷次',
 '年谷' => '年穀',
 '年里' => '年裡',
 '年鉴' => '年鑑',
@@ -5166,8 +5184,6 @@ public static $zh2Hant = [
 '强奸' => '強姦',
 '强干' => '強幹',
 '强于' => '強於',
-'别口气' => '彆口氣',
-'别强' => '彆強',
 '别扭' => '彆扭',
 '别拗' => '彆拗',
 '别气' => '彆氣',
@@ -5403,6 +5419,7 @@ public static $zh2Hant = [
 '怠于' => '怠於',
 '急于' => '急於',
 '急冲而下' => '急衝而下',
+'性别扭曲' => '性別扭曲',
 '性征' => '性徵',
 '性欲' => '性慾',
 '怨气冲天' => '怨氣衝天',
@@ -5573,7 +5590,6 @@ public static $zh2Hant = [
 '抓奸' => '抓姦',
 '抓斗' => '抓鬥',
 '抗御' => '抗禦',
-'折向往' => '折向往',
 '折子戏' => '折子戲',
 '折子戲' => '折子戲',
 '折戟沈河' => '折戟沈河',
@@ -5682,6 +5698,7 @@ public static $zh2Hant = [
 '卷款' => '捲款',
 '卷毛' => '捲毛',
 '卷烟盒' => '捲煙盒',
+'卷瓣' => '捲瓣',
 '卷积云' => '捲積雲',
 '卷筒' => '捲筒',
 '卷帘' => '捲簾',
@@ -5927,10 +5944,8 @@ public static $zh2Hant = [
 '断发' => '斷髮',
 '断发文身' => '斷髮文身',
 '方便面' => '方便麵',
-'方向往' => '方向往',
-'方志恒' => '方志恒',
+'方向' => '方向',
 '方法里' => '方法裡',
-'方志' => '方誌',
 '于后' => '於後',
 '于征' => '於徵',
 '于海上' => '於海上',
@@ -6071,6 +6086,7 @@ public static $zh2Hant = [
 '本庄' => '本庄',
 '本征' => '本徵',
 '本出戏' => '本齣戲',
+'术虎高' => '朮虎高',
 '术赤' => '朮赤',
 '朱庆余' => '朱慶餘',
 '朱理安历' => '朱理安曆',
@@ -6625,6 +6641,7 @@ public static $zh2Hant = [
 '煮面' => '煮麵',
 '熊杰' => '熊杰',
 '荧郁' => '熒鬱',
+'熬制' => '熬製',
 '炖制' => '燉製',
 '燎发' => '燎髮',
 '烧干' => '燒乾',
@@ -6791,7 +6808,6 @@ public static $zh2Hant = [
 '白里透红' => '白裡透紅',
 '白面包青天' => '白面包青天',
 '白发' => '白髮',
-'白胡' => '白鬍',
 '白霉' => '白黴',
 '百个' => '百個',
 '百只可' => '百只可',
@@ -6836,7 +6852,6 @@ public static $zh2Hant = [
 '皮里阳秋' => '皮裡陽秋',
 '皮制' => '皮製',
 '皮松' => '皮鬆',
-'皱别' => '皺彆',
 '皱折' => '皺摺',
 '盆吊' => '盆弔',
 '盈余' => '盈餘',
@@ -7224,7 +7239,6 @@ public static $zh2Hant = [
 '编码表' => '編碼表',
 '编钟' => '編鐘',
 '编余' => '編餘',
-'编发' => '編髮',
 '缓征' => '緩徵',
 '缓冲' => '緩衝',
 '致密' => '緻密',
@@ -7272,6 +7286,7 @@ public static $zh2Hant = [
 '系紧' => '繫緊',
 '系绳' => '繫繩',
 '系累' => '繫纍',
+'系膜' => '繫膜',
 '系舟' => '繫舟',
 '系船' => '繫船',
 '系辞' => '繫辭',
@@ -7327,6 +7342,7 @@ public static $zh2Hant = [
 '耍斗' => '耍鬥',
 '耕获' => '耕穫',
 '耳余' => '耳餘',
+'耶律术烈' => '耶律朮烈',
 '耿于' => '耿於',
 '聊斋志异' => '聊齋志異',
 '圣人历' => '聖人曆',
@@ -7468,7 +7484,6 @@ public static $zh2Hant = [
 '艸木丰丰' => '艸木丰丰',
 '芒果干' => '芒果乾',
 '花不要采' => '花不要採',
-'花卷' => '花捲',
 '花盆里' => '花盆裡',
 '花菴词选' => '花菴詞選',
 '花药' => '花葯',
@@ -7512,6 +7527,7 @@ public static $zh2Hant = [
 '庄里' => '莊裡',
 '茎干' => '莖幹',
 '莜面' => '莜麵',
+'莪术' => '莪朮',
 '莽荡' => '莽蕩',
 '菜干' => '菜乾',
 '菜坛' => '菜罈',
@@ -7851,7 +7867,10 @@ public static $zh2Hant = [
 '西昆' => '西崑',
 '西岳' => '西嶽',
 '西历' => '西曆',
+'西历代' => '西歷代',
+'西历任' => '西歷任',
 '西历史' => '西歷史',
+'西历次' => '西歷次',
 '西湖里' => '西湖里',
 '西西里' => '西西里',
 '西谷米' => '西谷米',
@@ -8154,7 +8173,8 @@ public static $zh2Hant = [
 '轻松松' => '輕鬆鬆',
 '轮奸' => '輪姦',
 '轮回' => '輪迴',
-'转向往' => '轉向往',
+'轉向' => '轉向',
+'转向' => '轉向',
 '转托' => '轉託',
 '转斗千里' => '轉鬥千里',
 '辛丑' => '辛丑',
@@ -8627,7 +8647,6 @@ public static $zh2Hant = [
 '长发公主' => '長髮公主',
 '长发妹' => '長髮妹',
 '长发姑娘' => '長髮姑娘',
-'长胡' => '長鬍',
 '门帘' => '門帘',
 '门吊儿' => '門弔兒',
 '门里' => '門裡',
@@ -8872,7 +8891,6 @@ public static $zh2Hant = [
 '台风后' => '颱風後',
 '刮了' => '颳了',
 '刮倒' => '颳倒',
-'刮去' => '颳去',
 '刮大风' => '颳大風',
 '刮得' => '颳得',
 '刮走' => '颳走',
@@ -13448,11 +13466,11 @@ public static $zh2Hans = [
 '乾，健也' => '乾，健也',
 '乾，天也' => '乾，天也',
 '五箇山' => '五箇山',
-'什么' => '什么',
 '仇讎' => '仇雠',
 '以微知著' => '以微知著',
 '仰屋著書' => '仰屋著书',
 '彷彿' => '仿佛',
+'伊東豊雄' => '伊东丰雄',
 '夥計' => '伙计',
 '佛頭著糞' => '佛头著粪',
 '偵蒐' => '侦搜',
@@ -13525,7 +13543,6 @@ public static $zh2Hans = [
 '覆核' => '复核',
 '覆检' => '复检',
 '復甦' => '复苏',
-'多么' => '多么',
 '大麴' => '大曲',
 '天道为乾' => '天道为乾',
 '天道為乾' => '天道为乾',
@@ -13556,13 +13573,12 @@ public static $zh2Hans = [
 '年陞' => '年升',
 '么九' => '幺九',
 '么二三' => '幺二三',
+'么兒' => '幺儿',
 '么元' => '幺元',
 '么鳳' => '幺凤',
 '么半' => '幺半',
-'么半群' => '幺半群',
-'么廝' => '幺厮',
-'幺厮' => '幺厮',
 '么叔' => '幺叔',
+'么喝' => '幺喝',
 '么女' => '幺女',
 '么媽' => '幺妈',
 '么妹' => '幺妹',
@@ -13570,22 +13586,20 @@ public static $zh2Hans = [
 '么姨' => '幺姨',
 '么娘' => '幺娘',
 '么孃' => '幺娘',
-'幺孃' => '幺娘',
 '么子' => '幺子',
 '么小' => '幺小',
 '么弟' => '幺弟',
 '么正' => '幺正',
 '么氏' => '幺氏',
+'么爺' => '幺爷',
 '么爸' => '幺爸',
 '么爹' => '幺爹',
 '么篇' => '幺篇',
 '么舅' => '幺舅',
 '么蛾子' => '幺蛾子',
-'么謙' => '幺谦',
+'么雞' => '幺鸡',
 '么麼' => '幺麽',
-'么麽' => '幺麽',
 '幺麽' => '幺麽',
-'么麽小丑' => '幺麽小丑',
 '慶餘' => '庆馀',
 '康乾' => '康乾',
 '张法乾' => '张法乾',
@@ -13594,7 +13608,6 @@ public static $zh2Hans = [
 '待覆' => '待复',
 '後姓' => '後姓',
 '慫慂' => '怂恿',
-'怎么' => '怎么',
 '恩威並著' => '恩威并著',
 '噁心' => '恶心',
 '情蒐' => '情搜',
@@ -13821,11 +13834,8 @@ public static $zh2Hans = [
 '躊躇滿志' => '踌躇滿志',
 '較著' => '较著',
 '近角聪信' => '近角聪信',
-'这么' => '这么',
 '造麴' => '造曲',
 '遺著' => '遗著',
-'那么' => '那么',
-'那麽' => '那麽',
 '郭子乾' => '郭子乾',
 '酒麴' => '酒曲',
 '醉瀋' => '醉渖',
@@ -13889,9 +13899,8 @@ public static $zh2Hans = [
 '鬱氏' => '鬱氏',
 '魏徵' => '魏徵',
 '魚乾乾' => '鱼干干',
+'麼氏' => '麽氏',
 '麽氏' => '麽氏',
-'麼麼' => '麽麽',
-'麽麽' => '麽麽',
 '黃麴毒素' => '黄曲毒素',
 '黃潤乾' => '黄润乾',
 '黄润乾' => '黄润乾',
@@ -13940,6 +13949,7 @@ public static $zh2TW = [
 '落車' => '下車',
 '不來梅' => '不萊梅',
 '不来梅' => '不萊梅',
+'幺' => '么',
 '以太网' => '乙太網',
 '九杆' => '九桿',
 '了結他' => '了結他',
@@ -14723,6 +14733,7 @@ public static $zh2HK = [
 'C肝' => '丙肝',
 '并发布' => '並發佈',
 '中文里' => '中文裏',
+'幺' => '么',
 '乘著' => '乘着',
 '乘著作' => '乘著作',
 '乘著名' => '乘著名',
@@ -16589,7 +16600,7 @@ public static $zh2HK = [
 '著法' => '着法',
 '著涼' => '着涼',
 '著火' => '着火',
-'著甚麽' => '着甚麽',
+'著甚麼' => '着甚麼',
 '著眼' => '着眼',
 '著祂' => '着祂',
 '著筆' => '着筆',
@@ -18216,6 +18227,7 @@ public static $zh2CN = [
 '叫著稱' => '叫著称',
 '叫著者' => '叫著者',
 '叫著述' => '叫著述',
+'台北韓' => '台北韩',
 '桌上型電腦' => '台式电脑',
 '撞球' => '台球',
 '台帳' => '台账',
@@ -19420,8 +19432,8 @@ public static $zh2CN = [
 '著絲' => '着丝',
 '著麼' => '着么',
 '著人' => '着人',
-'著什麼' => '着什么',
-'著甚麽' => '着什么',
+'著什' => '着什',
+'著甚麼' => '着什么',
 '著他' => '着他',
 '著令' => '着令',
 '著位' => '着位',
@@ -20066,6 +20078,7 @@ public static $zh2CN = [
 '軟體' => '软件',
 '軟體動物' => '软体动物',
 '軟體家具' => '软体家具',
+'軟體生物' => '软体生物',
 '軟碟機' => '软驱',
 '載著' => '载着',
 '載著書' => '载著书',