From 30498a47525dbaab6624981d31a00a1f093228c8 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Sun, 23 Aug 2020 20:13:43 +0200
Subject: Merge translation files from master branch.

---
 tde-i18n-zh_TW/messages/tdelibs/timezones.po | 124 ++++++++++++++-------------
 1 file changed, 64 insertions(+), 60 deletions(-)

(limited to 'tde-i18n-zh_TW/messages/tdelibs')

diff --git a/tde-i18n-zh_TW/messages/tdelibs/timezones.po b/tde-i18n-zh_TW/messages/tdelibs/timezones.po
index dba7af72a4f..baac89947d9 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/timezones.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/timezones.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: timezones\n"
-"POT-Creation-Date: 2020-05-11 04:01+0200\n"
+"POT-Creation-Date: 2020-08-23 18:42+0200\n"
 "PO-Revision-Date: 2006-02-13 13:01+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -459,235 +459,236 @@ msgid "America/Glace_Bay"
 msgstr "美洲/Glace_Bay"
 
 #: TIMEZONES:106
-msgid "America/Godthab"
-msgstr "美洲/Godthab"
-
-#: TIMEZONES:107
 msgid "America/Goose_Bay"
 msgstr "美洲/Goose_Bay"
 
-#: TIMEZONES:108
+#: TIMEZONES:107
 msgid "America/Grand_Turk"
 msgstr "美洲/Grand_Turk"
 
-#: TIMEZONES:109
+#: TIMEZONES:108
 msgid "America/Grenada"
 msgstr "美洲/格瑞納達(Grenada)"
 
-#: TIMEZONES:110
+#: TIMEZONES:109
 msgid "America/Guadeloupe"
 msgstr "美洲/Guadeloupe"
 
-#: TIMEZONES:111
+#: TIMEZONES:110
 msgid "America/Guatemala"
 msgstr "美洲/Guatemala"
 
-#: TIMEZONES:112
+#: TIMEZONES:111
 msgid "America/Guayaquil"
 msgstr "美洲/Guayaquil"
 
-#: TIMEZONES:113
+#: TIMEZONES:112
 msgid "America/Guyana"
 msgstr "美洲/Guyana"
 
-#: TIMEZONES:114
+#: TIMEZONES:113
 msgid "America/Halifax"
 msgstr "美洲/Halifax"
 
-#: TIMEZONES:115
+#: TIMEZONES:114
 msgid "America/Havana"
 msgstr "美洲/哈瓦那(Havana)"
 
-#: TIMEZONES:116
+#: TIMEZONES:115
 msgid "America/Hermosillo"
 msgstr "美洲/Hermosillo"
 
-#: TIMEZONES:117
+#: TIMEZONES:116
 #, fuzzy
 msgid "America/Indiana/Indianapolis"
 msgstr "美洲/Indianapolis"
 
-#: TIMEZONES:118
+#: TIMEZONES:117
 msgid "America/Indiana/Knox"
 msgstr "美洲/Indiana/Knox"
 
-#: TIMEZONES:119
+#: TIMEZONES:118
 msgid "America/Indiana/Marengo"
 msgstr "美洲/Indiana/Marengo"
 
-#: TIMEZONES:120
+#: TIMEZONES:119
 #, fuzzy
 msgid "America/Indiana/Petersburg"
 msgstr "美洲/Indiana/Marengo"
 
-#: TIMEZONES:121
+#: TIMEZONES:120
 #, fuzzy
 msgid "America/Indiana/Tell_City"
 msgstr "美洲/Indiana/Vevay"
 
-#: TIMEZONES:122
+#: TIMEZONES:121
 msgid "America/Indiana/Vevay"
 msgstr "美洲/Indiana/Vevay"
 
-#: TIMEZONES:123
+#: TIMEZONES:122
 #, fuzzy
 msgid "America/Indiana/Vincennes"
 msgstr "美洲/Indiana/Vevay"
 
-#: TIMEZONES:124
+#: TIMEZONES:123
 #, fuzzy
 msgid "America/Indiana/Winamac"
 msgstr "美洲/Indiana/Knox"
 
-#: TIMEZONES:125
+#: TIMEZONES:124
 msgid "America/Inuvik"
 msgstr "美洲/Inuvik"
 
-#: TIMEZONES:126
+#: TIMEZONES:125
 msgid "America/Iqaluit"
 msgstr "美洲/Iqaluit"
 
-#: TIMEZONES:127
+#: TIMEZONES:126
 msgid "America/Jamaica"
 msgstr "美洲/牙買加(Jamaica)"
 
-#: TIMEZONES:128
+#: TIMEZONES:127
 msgid "America/Juneau"
 msgstr "美洲/Juneau"
 
-#: TIMEZONES:129
+#: TIMEZONES:128
 #, fuzzy
 msgid "America/Kentucky/Louisville"
 msgstr "美洲/Louisville"
 
-#: TIMEZONES:130
+#: TIMEZONES:129
 msgid "America/Kentucky/Monticello"
 msgstr "美洲/Kentucky/Monticello"
 
-#: TIMEZONES:131
+#: TIMEZONES:130
 #, fuzzy
 msgid "America/Kralendijk"
 msgstr "美洲/格瑞納達(Grenada)"
 
-#: TIMEZONES:132
+#: TIMEZONES:131
 msgid "America/La_Paz"
 msgstr "美洲/La_Paz"
 
-#: TIMEZONES:133
+#: TIMEZONES:132
 msgid "America/Lima"
 msgstr "美洲/Lima"
 
-#: TIMEZONES:134
+#: TIMEZONES:133
 msgid "America/Los_Angeles"
 msgstr "美洲/洛杉磯(Los_Angeles)"
 
-#: TIMEZONES:135
+#: TIMEZONES:134
 #, fuzzy
 msgid "America/Lower_Princes"
 msgstr "美洲/太子港(Port-au-Prince)"
 
-#: TIMEZONES:136
+#: TIMEZONES:135
 msgid "America/Maceio"
 msgstr "美洲/Maceio"
 
-#: TIMEZONES:137
+#: TIMEZONES:136
 msgid "America/Managua"
 msgstr "美洲/馬那瓜(Managua)"
 
-#: TIMEZONES:138
+#: TIMEZONES:137
 msgid "America/Manaus"
 msgstr "美洲/Manaus"
 
-#: TIMEZONES:139
+#: TIMEZONES:138
 #, fuzzy
 msgid "America/Marigot"
 msgstr "美洲/Maceio"
 
-#: TIMEZONES:140
+#: TIMEZONES:139
 msgid "America/Martinique"
 msgstr "美洲/Martinique"
 
-#: TIMEZONES:141
+#: TIMEZONES:140
 #, fuzzy
 msgid "America/Matamoros"
 msgstr "美洲/Manaus"
 
-#: TIMEZONES:142
+#: TIMEZONES:141
 msgid "America/Mazatlan"
 msgstr "美洲/Mazatlan"
 
-#: TIMEZONES:143
+#: TIMEZONES:142
 msgid "America/Menominee"
 msgstr "美洲/Menominee"
 
-#: TIMEZONES:144
+#: TIMEZONES:143
 msgid "America/Merida"
 msgstr "美洲/Merida"
 
-#: TIMEZONES:145
+#: TIMEZONES:144
 #, fuzzy
 msgid "America/Metlakatla"
 msgstr "美洲/Mazatlan"
 
-#: TIMEZONES:146
+#: TIMEZONES:145
 msgid "America/Mexico_City"
 msgstr "美洲/墨西哥城(Mexico_City)"
 
-#: TIMEZONES:147
+#: TIMEZONES:146
 msgid "America/Miquelon"
 msgstr "美洲/Miquelon"
 
-#: TIMEZONES:148
+#: TIMEZONES:147
 #, fuzzy
 msgid "America/Moncton"
 msgstr "美洲/Edmonton"
 
-#: TIMEZONES:149
+#: TIMEZONES:148
 msgid "America/Monterrey"
 msgstr "美洲/蒙特雷(Monterrey)"
 
-#: TIMEZONES:150
+#: TIMEZONES:149
 msgid "America/Montevideo"
 msgstr "美洲/蒙特維的亞(Montevideo)"
 
-#: TIMEZONES:151
+#: TIMEZONES:150
 msgid "America/Montserrat"
 msgstr "美洲/Montserrat"
 
-#: TIMEZONES:152
+#: TIMEZONES:151
 msgid "America/Nassau"
 msgstr "美洲/Nassau"
 
-#: TIMEZONES:153
+#: TIMEZONES:152
 msgid "America/New_York"
 msgstr "美洲/紐約(New_York)"
 
-#: TIMEZONES:154
+#: TIMEZONES:153
 msgid "America/Nipigon"
 msgstr "美洲/Nipigon"
 
-#: TIMEZONES:155
+#: TIMEZONES:154
 msgid "America/Nome"
 msgstr "美洲/諾姆岬(Nome)"
 
-#: TIMEZONES:156
+#: TIMEZONES:155
 msgid "America/Noronha"
 msgstr "美洲/Noronha"
 
-#: TIMEZONES:157
+#: TIMEZONES:156
 #, fuzzy
 msgid "America/North_Dakota/Beulah"
 msgstr "美洲/North_Dakota/Center"
 
-#: TIMEZONES:158
+#: TIMEZONES:157
 msgid "America/North_Dakota/Center"
 msgstr "美洲/North_Dakota/Center"
 
-#: TIMEZONES:159
+#: TIMEZONES:158
 #, fuzzy
 msgid "America/North_Dakota/New_Salem"
 msgstr "美洲/North_Dakota/Center"
 
+#: TIMEZONES:159
+#, fuzzy
+msgid "America/Nuuk"
+msgstr "美洲/Jujuy"
+
 #: TIMEZONES:160
 #, fuzzy
 msgid "America/Ojinaga"
@@ -1791,6 +1792,9 @@ msgstr "太平洋/Wake"
 msgid "Pacific/Wallis"
 msgstr "太平洋/Wallis"
 
+#~ msgid "America/Godthab"
+#~ msgstr "美洲/Godthab"
+
 #~ msgid "Africa/Timbuktu"
 #~ msgstr "非洲/Timbuktu"
 
@@ -1803,9 +1807,6 @@ msgstr "太平洋/Wallis"
 #~ msgid "America/Cordoba"
 #~ msgstr "美洲/Cordoba"
 
-#~ msgid "America/Jujuy"
-#~ msgstr "美洲/Jujuy"
-
 #~ msgid "America/Mendoza"
 #~ msgstr "美洲/Mendoza"
 
@@ -1847,3 +1848,6 @@ msgstr "太平洋/Wallis"
 
 #~ msgid "Pacific/Yap"
 #~ msgstr "太平洋/Yap"
+
+#~ msgid "America/Jujuy"
+#~ msgstr "美洲/Jujuy"
-- 
cgit v1.2.1