98 lines
2.9 KiB
Diff
98 lines
2.9 KiB
Diff
From c9de14ddd586a9e4660ae6ae0c43665ef023e0b0 Mon Sep 17 00:00:00 2001
|
|
From: huzunhao <huzunhao2@huawei.com>
|
|
Date: Sat, 21 Dec 2019 18:09:08 +0800
|
|
Subject: [PATCH] libweather: modify Macau to Macao
|
|
|
|
reason:modify Macau to Macao
|
|
|
|
Signed-off-by: huzunhao <huzunhao2@huawei.com>
|
|
---
|
|
data/Locations.xml | 14 +++++++-------
|
|
po-locations/zh_CN.po | 12 ++++++------
|
|
2 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/data/Locations.xml b/data/Locations.xml
|
|
index 77f0539..0dcc3d8 100644
|
|
--- a/data/Locations.xml
|
|
+++ b/data/Locations.xml
|
|
@@ -5097,31 +5097,31 @@
|
|
</country>
|
|
<country>
|
|
<!-- MO - Macao, aka "Macao Special Administrative Region of
|
|
- China". (The spellings "Macao" and "Macau" are both widely
|
|
+ China". (The spellings "Macao" and "Macao" are both widely
|
|
used. The "u" spelling is currently slightly more popular in
|
|
English.)
|
|
-->
|
|
- <_name msgctxt="Country">Macau</_name>
|
|
+ <_name msgctxt="Country">Macao</_name>
|
|
<iso-code>MO</iso-code>
|
|
<fips-code>MC</fips-code>
|
|
<timezones>
|
|
- <timezone id="Asia/Macau" />
|
|
+ <timezone id="Asia/Macao" />
|
|
</timezones>
|
|
- <tz-hint>Asia/Macau</tz-hint>
|
|
+ <tz-hint>Asia/Macao</tz-hint>
|
|
<location>
|
|
<name>Taipa</name>
|
|
<code>VMMC</code>
|
|
<coordinates>22.166667 113.566667</coordinates>
|
|
</location>
|
|
<city>
|
|
- <!-- The capital of Macau.
|
|
+ <!-- The capital of Macao.
|
|
The local name in Chinese is "Aomen / 澳门".
|
|
-->
|
|
- <_name msgctxt="City in Macau">Macau</_name>
|
|
+ <_name msgctxt="City in Macao">Macao</_name>
|
|
<coordinates>22.200556 113.546111</coordinates>
|
|
</city>
|
|
<city>
|
|
- <!-- A city in Macau.
|
|
+ <!-- A city in Macao.
|
|
The local name in Chinese is "Dangzai / 氹仔".
|
|
-->
|
|
<_name>Taipa</_name>
|
|
diff --git a/po-locations/zh_CN.po b/po-locations/zh_CN.po
|
|
index 1e43088..4ef886b 100644
|
|
--- a/po-locations/zh_CN.po
|
|
+++ b/po-locations/zh_CN.po
|
|
@@ -627,12 +627,12 @@ msgid "Luxembourg"
|
|
msgstr "卢森堡"
|
|
|
|
#. MO - Macao, aka "Macao Special Administrative Region of
|
|
-#. China". (The spellings "Macao" and "Macau" are both widely
|
|
+#. China". (The spellings "Macao" and "Macao" are both widely
|
|
#. used. The "u" spelling is currently slightly more popular in
|
|
#. English.)
|
|
#.
|
|
msgctxt "Country"
|
|
-msgid "Macau"
|
|
+msgid "Macao"
|
|
msgstr "中国澳门"
|
|
|
|
#. MK - The Former Yugoslav Republic of Macedonia
|
|
@@ -8959,14 +8959,14 @@ msgctxt "City in Luxembourg"
|
|
msgid "Luxembourg"
|
|
msgstr "卢森堡"
|
|
|
|
-#. The capital of Macau.
|
|
+#. The capital of Macao.
|
|
#. The local name in Chinese is "Aomen / 澳门".
|
|
#.
|
|
-msgctxt "City in Macau"
|
|
-msgid "Macau"
|
|
+msgctxt "City in Macao"
|
|
+msgid "Macao"
|
|
msgstr "澳门"
|
|
|
|
-#. A city in Macau.
|
|
+#. A city in Macao.
|
|
#. The local name in Chinese is "Dangzai / 氹仔".
|
|
#.
|
|
msgid "Taipa"
|
|
--
|
|
2.19.1
|
|
|