代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/gnome-control-center 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
diff --git a/panels/datetime/backward b/panels/datetime/backward
index 8594be6..3fe71fc 100644
--- a/panels/datetime/backward
+++ b/panels/datetime/backward
@@ -35,7 +35,6 @@ Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu
-Link Asia/Macau Asia/Macao
Link Asia/Yangon Asia/Rangoon
Link Asia/Ho_Chi_Minh Asia/Saigon
Link Asia/Jerusalem Asia/Tel_Aviv
@@ -125,4 +124,4 @@ Link Pacific/Pago_Pago US/Samoa
Link Etc/UTC UTC
Link Etc/UTC Universal
Link Europe/Moscow W-SU
-Link Etc/UTC Zulu
\ No newline at end of file
+Link Etc/UTC Zulu
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index c1e6aaa..f562556 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -405,7 +405,6 @@ translated_city_name (TzLocation *loc)
{
g_autofree gchar *zone_translated = NULL;
g_auto(GStrv) split_translated = NULL;
- g_autofree gchar *country = NULL;
gchar *name;
gint length;
@@ -418,11 +417,9 @@ translated_city_name (TzLocation *loc)
length = g_strv_length (split_translated);
- country = gnome_get_country_from_code (loc->country, NULL);
- /* Translators: "city, country" */
- name = g_strdup_printf (C_("timezone loc", "%s, %s"),
- split_translated[length-1],
- country);
+ /* Translators: "city" */
+ name = g_strdup_printf (C_("timezone loc", "%s"),
+ split_translated[length-1]);
return name;
}
diff --git a/panels/datetime/po-timezones/zh_CN.po b/panels/datetime/po-timezones/zh_CN.po
index 38b053f..6bd84e9 100644
--- a/panels/datetime/po-timezones/zh_CN.po
+++ b/panels/datetime/po-timezones/zh_CN.po
@@ -1755,10 +1755,6 @@ msgstr "亚洲/科威特"
msgid "Asia/Macao"
msgstr "亚洲/澳门"
-#: timezones.h:530
-msgid "Asia/Macau"
-msgstr "亚洲/澳门"
-
#: timezones.h:531
msgid "Asia/Magadan"
msgstr "亚洲/马加丹"
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。