From c665af29b781f6b74f483caf3debf42482138ea9 Mon Sep 17 00:00:00 2001
From: Philip Tzou <philip@users.mediawiki.org>
Date: Sun, 3 May 2009 05:48:38 +0000
Subject: [PATCH] Update the Chinese conversion tables.

---
 includes/ZhConversion.php           | 12 +++++++++---
 includes/zhtable/simp2trad.manual   |  3 ++-
 includes/zhtable/simpphrases.manual |  3 ++-
 includes/zhtable/toSimp.manual      |  3 ++-
 includes/zhtable/toTrad.manual      |  5 +++--
 includes/zhtable/tradphrases.manual |  6 ++++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 5698e0928a..e18312f83f 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -1317,7 +1317,7 @@ $zh2Hant = array(
 '苍' => '蒼',
 '苎' => '苧',
 '苏' => '蘇',
-'苧' => '苎',
+'苧' => '薴',
 '苹' => '蘋',
 '茎' => '莖',
 '茏' => '蘢',
@@ -4271,6 +4271,7 @@ $zh2Hant = array(
 '天克地冲' => '天克地衝',
 '天后宫' => '天后宮',
 '天后庙道' => '天后廟道',
+'天地志狼' => '天地志狼',
 '天地为范' => '天地為範',
 '天干地支' => '天干地支',
 '天后' => '天後',
@@ -7192,6 +7193,8 @@ $zh2Hant = array(
 '薙发' => '薙髮',
 '薝卜' => '薝蔔',
 '苧悴' => '薴悴',
+'苧烯' => '薴烯',
+'薴烯' => '薴烯',
 '借以' => '藉以',
 '借助' => '藉助',
 '借寇兵' => '藉寇兵',
@@ -8030,6 +8033,7 @@ $zh2Hant = array(
 '铜钟' => '銅鐘',
 '铝制' => '鋁製',
 '铺锦列绣' => '鋪錦列繡',
+'钢之炼金术师' => '鋼之鍊金術師',
 '钢梁' => '鋼樑',
 '钢制' => '鋼製',
 '录着' => '錄著',
@@ -8059,7 +8063,7 @@ $zh2Hant = array(
 '炼汞' => '鍊汞',
 '炼石' => '鍊石',
 '炼贫' => '鍊貧',
-'炼金' => '鍊金',
+'炼金术' => '鍊金術',
 '炼钢' => '鍊鋼',
 '锅庄' => '鍋莊',
 '锻炼出' => '鍛鍊出',
@@ -8111,6 +8115,7 @@ $zh2Hant = array(
 '门帘' => '門帘',
 '门吊儿' => '門弔兒',
 '门里' => '門裡',
+'闫怀礼' => '閆懷禮',
 '开吊' => '開弔',
 '开征' => '開徵',
 '开采' => '開採',
@@ -8125,7 +8130,6 @@ $zh2Hant = array(
 '合府' => '閤府',
 '闺范' => '閨範',
 '阃范' => '閫範',
-'闫怀礼' => '閻懷禮',
 '闯荡' => '闖蕩',
 '闯炼' => '闖鍊',
 '关系' => '關係',
@@ -13736,6 +13740,8 @@ $zh2Hans = array(
 '苦著稱' => '苦著称',
 '苦著者' => '苦著者',
 '苦著述' => '苦著述',
+'苧烯' => '苧烯',
+'薴烯' => '苧烯',
 '獲著' => '获着',
 '獲著書' => '获著书',
 '獲著作' => '获著作',
diff --git a/includes/zhtable/simp2trad.manual b/includes/zhtable/simp2trad.manual
index 8ce2b7acc8..afc34ccaec 100644
--- a/includes/zhtable/simp2trad.manual
+++ b/includes/zhtable/simp2trad.manual
@@ -150,7 +150,8 @@ U+07ef1绱|U+07dd4緔|U+0979d鞝|
 U+07ef7绷|U+07db3綳|U+07e43繃|
 U+07eff绿|U+07da0綠|U+07dd1緑|
 U+07f30缰|U+097c1韁|U+07e6e繮|
-U+082e7苧|U+082ce苎|U+085b4薴|
+U+082ce苎|U+082e7苧|
+U+082e7苧|U+085b4薴|
 U+083bc莼|U+08493蒓|U+084f4蓴|
 U+08bf4说|U+08aaa說|U+08aac説|
 U+08c23谣|U+08b20謠|U+08b21謡|
diff --git a/includes/zhtable/simpphrases.manual b/includes/zhtable/simpphrases.manual
index be4edc6624..a2f6447b7d 100644
--- a/includes/zhtable/simpphrases.manual
+++ b/includes/zhtable/simpphrases.manual
@@ -2219,4 +2219,5 @@
 醯鸡
 醯醋
 醯醢
-醯壶
\ No newline at end of file
+醯壶
+苧烯
\ No newline at end of file
diff --git a/includes/zhtable/toSimp.manual b/includes/zhtable/toSimp.manual
index 9a39cd81d6..85d94494e1 100644
--- a/includes/zhtable/toSimp.manual
+++ b/includes/zhtable/toSimp.manual
@@ -128,4 +128,5 @@
 閻懷禮	闫怀礼
 醯酱	醯酱
 醯鸡	醯鸡
-醯壶	醯壶
\ No newline at end of file
+醯壶	醯壶
+苧烯	苧烯
\ No newline at end of file
diff --git a/includes/zhtable/toTrad.manual b/includes/zhtable/toTrad.manual
index 67073a89c6..41e27eff9a 100644
--- a/includes/zhtable/toTrad.manual
+++ b/includes/zhtable/toTrad.manual
@@ -72,5 +72,6 @@
 頂多	頂多
 馬占山	馬占山
 叱咤樂壇	叱咤樂壇
-闫怀礼	閻懷禮
-变髒	變髒
\ No newline at end of file
+闫怀礼	閆懷禮
+变髒	變髒
+薴烯	薴烯
\ No newline at end of file
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 81b2d5e2c0..3f43767dbd 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -2505,7 +2505,6 @@
 凝鍊
 鍊貧
 鍊度
-鍊金
 鍊形
 鍊師
 鍊石
@@ -2516,6 +2515,7 @@
 闖鍊
 鍊汞
 淬鍊
+鋼之鍊金術師
 索馬里
 范登堡
 世田谷
@@ -3172,4 +3172,6 @@
 叱咤叱叱咤
 正在叱咤
 空餘
-變髒
\ No newline at end of file
+變髒
+天地志狼
+薴烯
\ No newline at end of file
-- 
2.20.1