diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /includes/ZhConversion.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'includes/ZhConversion.php')
| -rw-r--r-- | includes/ZhConversion.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index df98836f..651b1140 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -2,7 +2,7 @@ /** * Simplified / Traditional Chinese conversion tables * - * Automatically generated using code and data in includes/zhtable/ + * Automatically generated using code and data in maintenance/language/zhtable/ * Do not modify directly! * * @file @@ -7578,6 +7578,7 @@ $zh2Hant = array( '管人吊脚儿事' => '管人弔腳兒事', '管制法' => '管制法', '管干' => '管幹', +'箱里' => '箱裡', '节欲' => '節慾', '节余' => '節餘', '范例' => '範例', |