Merge "Add 皮膚 for better word segmentation."

diff --combined includes/ZhConversion.php
index 875e66d,91da815..b98f521
--- 1/includes/ZhConversion.php
--- 2/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@@ -7061,6 -7061,7 +7061,7 @@@ $zh2Hant = array
  '皇庄' => '皇莊',
  '皓发' => '皓髮',
  '皮制服' => '皮制服',
+ '皮肤' => '皮膚',
  '皮里春秋' => '皮裡春秋',
  '皮里阳秋' => '皮裡陽秋',
  '皮制' => '皮製',
@@@ -8409,7 -8410,6 +8410,7 @@@
  '跌扑' => '跌扑',
  '跌荡' => '跌蕩',
  '路签' => '路籤',
 +'路面' => '路面',
  '跳梁小丑' => '跳樑小丑',
  '跳荡' => '跳蕩',
  '跳表' => '跳錶',
@@@ -18193,6 -18193,7 +18194,6 @@@ $zh2CN = array
  '攜帶型' => '便携式',
  '資訊理論' => '信息论',
  '母音' => '元音',
 -'游標' => '光标',
  '光碟' => '光盘',
  '光碟機' => '光驱',
  '柯林頓' => '克林顿',
@@@ -18455,4 -18456,4 +18456,4 @@@ $zh2SG = array
  '笨豬跳' => '绑紧跳',
  '蹦极跳' => '绑紧跳',
  '笑星' => '谐星',
 -);
 +);

diff --combined includes/zhtable/tradphrases.manual
index c9eac10,98432eb..9a9534f
--- 1/includes/zhtable/tradphrases.manual
--- 2/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@@ -3032,6 -3032,7 +3032,7 @@@
  細如髮
  繫於一髮
  膚髮
+ 皮膚
  生華髮
  蒼髮
  被髮佯狂
@@@ -3983,7 -3984,6 +3984,7 @@@
  棺材裡
  注釋
  月面
 +路面
  修杰楷
  修杰麟
  學裡