From 0803cf2d65e0669c54eea17a6bfc7f9c93b354ba Mon Sep 17 00:00:00 2001
From: Liangent <liangent@gmail.com>
Date: Sat, 12 May 2012 21:48:58 +0800
Subject: [PATCH] =?utf8?q?Update=20Chinese=20conversion=20table:=20?=
 =?utf8?q?=E6=B5=B7=E6=B7=80=E5=B1=B1=E5=BE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Iae9c711ff66a2694c5f1e120fd84e602ca7ceb21
---
 includes/ZhConversion.php           | 12 +++++++-----
 includes/zhtable/tradphrases.manual |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 58bc98c989..2a2d31e210 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3273,8 +3273,8 @@ $zh2Hant = array(
 '于伟国' => '于偉國',
 '于偉國' => '于偉國',
 '于光新' => '于光新',
-'于光远' => '于光遠',
 '于光遠' => '于光遠',
+'于光远' => '于光遠',
 '于克-蘭多縣' => '于克-蘭多縣',
 '于克-兰多县' => '于克-蘭多縣',
 '于克勒' => '于克勒',
@@ -3444,8 +3444,8 @@ $zh2Hant = array(
 '于风政' => '于風政',
 '于風政' => '于風政',
 '于飞' => '于飛',
-'于飛島' => '于飛島',
 '于飞岛' => '于飛島',
+'于飛島' => '于飛島',
 '于余曲折' => '于餘曲折',
 '于鬯' => '于鬯',
 '于魁智' => '于魁智',
@@ -6283,8 +6283,8 @@ $zh2Hant = array(
 '有只用' => '有只用',
 '有够赞' => '有夠讚',
 '有征伐' => '有征伐',
-'有征戰' => '有征戰',
 '有征战' => '有征戰',
+'有征戰' => '有征戰',
 '有征服' => '有征服',
 '有征讨' => '有征討',
 '有征討' => '有征討',
@@ -6610,6 +6610,8 @@ $zh2Hant = array(
 '浮松' => '浮鬆',
 '海上布雷' => '海上佈雷',
 'æµ·å¹²' => 'æµ·ä¹¾',
+'海淀山后' => '海淀山後',
+'海淀山後' => '海淀山後',
 '海湾布雷' => '海灣佈雷',
 '涂善妮' => '涂善妮',
 '涂坤' => '涂坤',
@@ -15595,8 +15597,8 @@ $zh2TW = array(
 '卡塔尔' => '卡達',
 '打印機' => '印表機',
 '打印机' => '印表機',
-'厄立特里亞' => '厄利垂亞',
 '厄立特里亚' => '厄利垂亞',
+'厄立特里亞' => '厄利垂亞',
 '厄瓜多尔' => '厄瓜多',
 '厄瓜多爾' => '厄瓜多',
 '斯威士兰' => '史瓦濟蘭',
@@ -18450,8 +18452,8 @@ $zh2SG = array(
 '方便面' => '快速面',
 '零钱' => '散钱',
 '散紙' => '散钱',
-'榴蓮' => '榴梿',
 '榴莲' => '榴梿',
+'榴蓮' => '榴梿',
 '笨豬跳' => '绑紧跳',
 '蹦极跳' => '绑紧跳',
 '笑星' => '谐星',
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index ee3bc69f4f..922b7dedfb 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -3501,6 +3501,7 @@
 藍澱
 皆可作澱
 澱山
+海淀山後
 澱澱
 掛鈎
 薴悴
-- 
2.20.1