(zh) Fix country names and some typos

Different Chinese variants have different official translations
for countries worldwide. This commit fixes (hopefully) most of them
in countries.zh.po.

This commit also has minor fixes in mirror/list.wml.

1 files changed, 22 insertions, 21 deletions

diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 95fdf076c26..d9b19a19f0c 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -4,15 +4,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2017-08-07 17:58+0800\n"
+"PO-Revision-Date: 2019-06-26 01:13+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
-"Language: \n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.2.1\n"
+"POT-Creation-Date: \n"
 
 #: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
@@ -36,15 +37,15 @@ msgstr "奧地利"
 
 #: ../../english/template/debian/countries.wml:126
 msgid "Australia"
-msgstr "澳洲"
+msgstr "[CN:澳大利亚:][HKTW:澳洲:]"
 
 #: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
-msgstr "波士尼亞與赫塞哥維納"
+msgstr "[CNHK:波斯尼亚和黑塞哥维那:][TW:波士尼亞與赫塞哥維納:]"
 
 #: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
-msgstr "孟加拉"
+msgstr "[CN:孟加拉国:][HKTW:孟加拉:]"
 
 #: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
@@ -88,7 +89,7 @@ msgstr "哥倫比亞"
 
 #: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
-msgstr "哥斯達尼加"
+msgstr "[CNHK:哥斯达黎加:][TW:哥斯大黎加:]"
 
 #: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
@@ -104,7 +105,7 @@ msgstr "丹麥"
 
 #: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
-msgstr "多米尼加共和國"
+msgstr "[CNHK:多米尼加共和國:][TW:多明尼加共和國:]"
 
 #: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
@@ -148,11 +149,11 @@ msgstr "英國"
 
 #: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
-msgstr "格瑞那達"
+msgstr "[CNHK:格林纳达:][TW:格瑞那達:]"
 
 #: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
-msgstr "喬治亞"
+msgstr "[CNHK:格鲁吉亚:][TW:喬治亞:]"
 
 #: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
@@ -164,7 +165,7 @@ msgstr "希臘"
 
 #: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
-msgstr "瓜地馬拉"
+msgstr "[CNHK:危地马拉:][TW:瓜地馬拉:]"
 
 #: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
@@ -184,7 +185,7 @@ msgstr "匈牙利"
 
 #: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
-msgstr "印尼"
+msgstr "印度尼西亚"
 
 #: ../../english/template/debian/countries.wml:240
 msgid "Iran"
@@ -220,7 +221,7 @@ msgstr "日本"
 
 #: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
-msgstr "肯亞"
+msgstr "[CN:肯尼亚:][HK:肯雅:][TW:肯亞:]"
 
 #: ../../english/template/debian/countries.wml:267
 msgid "Korea"
@@ -232,7 +233,7 @@ msgstr "科威特"
 
 #: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
-msgstr "哈薩克"
+msgstr "[CN:哈萨克斯坦:][HKTW:哈薩克:]"
 
 #: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
@@ -260,7 +261,7 @@ msgstr "摩爾多瓦"
 
 #: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
-msgstr "蒙特內哥羅"
+msgstr "[CNHK:黑山:][TW:蒙特內哥羅:]"
 
 #: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
@@ -276,7 +277,7 @@ msgstr "蒙古"
 
 #: ../../english/template/debian/countries.wml:306
 msgid "Malta"
-msgstr "馬爾他"
+msgstr "[CN:马耳他:][HKTW:馬爾他:]"
 
 #: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
@@ -380,11 +381,11 @@ msgstr "泰國"
 
 #: ../../english/template/debian/countries.wml:384
 msgid "Tajikistan"
-msgstr "塔吉克斯坦"
+msgstr "[CN:塔吉克斯坦:][HKTW:塔吉克:]"
 
 #: ../../english/template/debian/countries.wml:387
 msgid "Tunisia"
-msgstr "突尼西亞"
+msgstr "[CN:突尼斯:][HKTW:突尼西亞:]"
 
 #: ../../english/template/debian/countries.wml:390
 msgid "Turkey"
@@ -408,7 +409,7 @@ msgstr "烏拉圭"
 
 #: ../../english/template/debian/countries.wml:405
 msgid "Uzbekistan"
-msgstr "烏茲別克斯坦"
+msgstr "[CN:乌兹别克斯坦:][HKTW:烏茲別克:]"
 
 #: ../../english/template/debian/countries.wml:408
 msgid "Venezuela"
@@ -420,7 +421,7 @@ msgstr "越南"
 
 #: ../../english/template/debian/countries.wml:414
 msgid "Vanuatu"
-msgstr "瓦努阿图"
+msgstr "[CNHK:瓦努阿图:][TW:萬那杜:]"
 
 #: ../../english/template/debian/countries.wml:417
 msgid "South Africa"