Merge translation files from master branch.

2 files changed, 132 insertions, 125 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/kcmusb.po b/tde-i18n-zh_TW/messages/tdebase/kcmusb.po
index 4162ac7ee38..bd964c6c70b 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kcmusb.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kcmusb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmusb\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-12-30 19:52+0100\n"
 "PO-Revision-Date: 2005-10-29 15:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -132,8 +132,8 @@ msgstr "<tr><td><i>ISO要求</i></td><td>%1</td></tr>"
 #: usbdevices.cpp:482
 #, fuzzy
 msgid ""
-"Could not open one or more USB controller, Make sure you have read access to "
-"all BSD controllers that shoudl be listed here."
+"Could not open one or more USB controller. Make sure you have read access to "
+"all USB controllers that should be listed here."
 msgstr ""
 "無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取權"
 "限。"
@@ -330,6 +330,14 @@ msgstr "原廠設定子集"
 msgid "Vendor specific"
 msgstr "原廠設定"
 
+#, fuzzy
+#~ msgid ""
+#~ "Could not open one or more USB controller, Make sure you have read access "
+#~ "to all BSD controllers that shoudl be listed here."
+#~ msgstr ""
+#~ "無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取"
+#~ "權限。"
+
 #~ msgid ""
 #~ "Could not open one or more USB controller. Make sure, you have read "
 #~ "access to all USB controllers that should be listed here."
diff --git a/tde-i18n-zh_TW/messages/tdelibs/timezones.po b/tde-i18n-zh_TW/messages/tdelibs/timezones.po
index baac89947d9..b8f368ba09d 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-08-23 18:42+0200\n"
+"POT-Creation-Date: 2020-12-30 19:52+0100\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"
@@ -1306,492 +1306,491 @@ msgid "Australia/Broken_Hill"
 msgstr "澳洲/Broken_Hill"
 
 #: TIMEZONES:308
-#, fuzzy
-msgid "Australia/Currie"
-msgstr "澳洲/Brisbane"
-
-#: TIMEZONES:309
 msgid "Australia/Darwin"
 msgstr "澳洲/Darwin"
 
-#: TIMEZONES:310
+#: TIMEZONES:309
 #, fuzzy
 msgid "Australia/Eucla"
 msgstr "澳洲/Adelaide"
 
-#: TIMEZONES:311
+#: TIMEZONES:310
 msgid "Australia/Hobart"
 msgstr "澳洲/Hobart"
 
-#: TIMEZONES:312
+#: TIMEZONES:311
 msgid "Australia/Lindeman"
 msgstr "澳洲/Lindeman"
 
-#: TIMEZONES:313
+#: TIMEZONES:312
 msgid "Australia/Lord_Howe"
 msgstr "澳洲/Lord_Howe"
 
-#: TIMEZONES:314
+#: TIMEZONES:313
 msgid "Australia/Melbourne"
 msgstr "澳洲/墨爾本(Melbourne)"
 
-#: TIMEZONES:315
+#: TIMEZONES:314
 msgid "Australia/Perth"
 msgstr "澳洲/Perth"
 
-#: TIMEZONES:316
+#: TIMEZONES:315
 msgid "Australia/Sydney"
 msgstr "澳洲/雪梨(Sydney)"
 
-#: TIMEZONES:317
+#: TIMEZONES:316
 msgid "Europe/Amsterdam"
 msgstr "歐洲/阿姆斯特丹(Amsterdam)"
 
-#: TIMEZONES:318
+#: TIMEZONES:317
 msgid "Europe/Andorra"
 msgstr "歐洲/安道爾(Andorra)"
 
-#: TIMEZONES:319
+#: TIMEZONES:318
 #, fuzzy
 msgid "Europe/Astrakhan"
 msgstr "歐洲/雅典(Athens)"
 
-#: TIMEZONES:320
+#: TIMEZONES:319
 msgid "Europe/Athens"
 msgstr "歐洲/雅典(Athens)"
 
-#: TIMEZONES:321
+#: TIMEZONES:320
 msgid "Europe/Belgrade"
 msgstr "歐洲/貝爾格勒(Belgrade)"
 
-#: TIMEZONES:322
+#: TIMEZONES:321
 msgid "Europe/Berlin"
 msgstr "歐洲/柏林(Berlin)"
 
-#: TIMEZONES:323
+#: TIMEZONES:322
 msgid "Europe/Bratislava"
 msgstr "歐洲/Bratislava"
 
-#: TIMEZONES:324
+#: TIMEZONES:323
 msgid "Europe/Brussels"
 msgstr "歐洲/Brussels"
 
-#: TIMEZONES:325
+#: TIMEZONES:324
 msgid "Europe/Bucharest"
 msgstr "歐洲/Bucharest"
 
-#: TIMEZONES:326
+#: TIMEZONES:325
 msgid "Europe/Budapest"
 msgstr "歐洲/布達佩斯(Budapest)"
 
-#: TIMEZONES:327
+#: TIMEZONES:326
 #, fuzzy
 msgid "Europe/Busingen"
 msgstr "歐洲/Brussels"
 
-#: TIMEZONES:328
+#: TIMEZONES:327
 msgid "Europe/Chisinau"
 msgstr "歐洲/Chisinau"
 
-#: TIMEZONES:329
+#: TIMEZONES:328
 msgid "Europe/Copenhagen"
 msgstr "歐洲/哥本哈根(Copenhagen)"
 
-#: TIMEZONES:330
+#: TIMEZONES:329
 msgid "Europe/Dublin"
 msgstr "歐洲/都柏林(Dublin)"
 
-#: TIMEZONES:331
+#: TIMEZONES:330
 msgid "Europe/Gibraltar"
 msgstr "歐洲/直布羅陀(Gibraltar)"
 
-#: TIMEZONES:332
+#: TIMEZONES:331
 #, fuzzy
 msgid "Europe/Guernsey"
 msgstr "歐洲/雅典(Athens)"
 
-#: TIMEZONES:333
+#: TIMEZONES:332
 msgid "Europe/Helsinki"
 msgstr "歐洲/赫爾辛基(Helsinki)"
 
-#: TIMEZONES:334
+#: TIMEZONES:333
 #, fuzzy
 msgid "Europe/Isle_of_Man"
 msgstr "歐洲/Oslo"
 
-#: TIMEZONES:335
+#: TIMEZONES:334
 msgid "Europe/Istanbul"
 msgstr "歐洲/Istanbul"
 
-#: TIMEZONES:336
+#: TIMEZONES:335
 #, fuzzy
 msgid "Europe/Jersey"
 msgstr "歐洲/巴黎(Paris)"
 
-#: TIMEZONES:337
+#: TIMEZONES:336
 msgid "Europe/Kaliningrad"
 msgstr "歐洲/Kaliningrad"
 
-#: TIMEZONES:338
+#: TIMEZONES:337
 msgid "Europe/Kiev"
 msgstr "歐洲/Kiev"
 
-#: TIMEZONES:339
+#: TIMEZONES:338
 #, fuzzy
 msgid "Europe/Kirov"
 msgstr "歐洲/Kiev"
 
-#: TIMEZONES:340
+#: TIMEZONES:339
 msgid "Europe/Lisbon"
 msgstr "歐洲/里斯本(Lisbon)"
 
-#: TIMEZONES:341
+#: TIMEZONES:340
 msgid "Europe/Ljubljana"
 msgstr "歐洲/Ljubljana"
 
-#: TIMEZONES:342
+#: TIMEZONES:341
 msgid "Europe/London"
 msgstr "歐洲/倫敦(London)"
 
-#: TIMEZONES:343
+#: TIMEZONES:342
 msgid "Europe/Luxembourg"
 msgstr "歐洲/盧森堡(Luxembourg)"
 
-#: TIMEZONES:344
+#: TIMEZONES:343
 msgid "Europe/Madrid"
 msgstr "歐洲/馬德里(Madrid)"
 
-#: TIMEZONES:345
+#: TIMEZONES:344
 msgid "Europe/Malta"
 msgstr "歐洲/馬爾他(Malta)"
 
-#: TIMEZONES:346
+#: TIMEZONES:345
 msgid "Europe/Mariehamn"
 msgstr "歐洲/Mariehamn"
 
-#: TIMEZONES:347
+#: TIMEZONES:346
 msgid "Europe/Minsk"
 msgstr "歐洲/Minsk"
 
-#: TIMEZONES:348
+#: TIMEZONES:347
 msgid "Europe/Monaco"
 msgstr "歐洲/摩納哥(Monaco)"
 
-#: TIMEZONES:349
+#: TIMEZONES:348
 msgid "Europe/Moscow"
 msgstr "歐洲/莫斯科(Moscow)"
 
-#: TIMEZONES:350
+#: TIMEZONES:349
 msgid "Europe/Oslo"
 msgstr "歐洲/Oslo"
 
-#: TIMEZONES:351
+#: TIMEZONES:350
 msgid "Europe/Paris"
 msgstr "歐洲/巴黎(Paris)"
 
-#: TIMEZONES:352
+#: TIMEZONES:351
 #, fuzzy
 msgid "Europe/Podgorica"
 msgstr "歐洲/安道爾(Andorra)"
 
-#: TIMEZONES:353
+#: TIMEZONES:352
 msgid "Europe/Prague"
 msgstr "歐洲/布拉格(Prague)"
 
-#: TIMEZONES:354
+#: TIMEZONES:353
 msgid "Europe/Riga"
 msgstr "歐洲/Riga"
 
-#: TIMEZONES:355
+#: TIMEZONES:354
 msgid "Europe/Rome"
 msgstr "歐洲/羅馬(Rome)"
 
-#: TIMEZONES:356
+#: TIMEZONES:355
 msgid "Europe/Samara"
 msgstr "歐洲/Samara"
 
-#: TIMEZONES:357
+#: TIMEZONES:356
 msgid "Europe/San_Marino"
 msgstr "歐洲/San_Marino"
 
-#: TIMEZONES:358
+#: TIMEZONES:357
 msgid "Europe/Sarajevo"
 msgstr "歐洲/Sarajevo"
 
-#: TIMEZONES:359
+#: TIMEZONES:358
 #, fuzzy
 msgid "Europe/Saratov"
 msgstr "歐洲/Sarajevo"
 
-#: TIMEZONES:360
+#: TIMEZONES:359
 msgid "Europe/Simferopol"
 msgstr "歐洲/Simferopol"
 
-#: TIMEZONES:361
+#: TIMEZONES:360
 msgid "Europe/Skopje"
 msgstr "歐洲/Skopje"
 
-#: TIMEZONES:362
+#: TIMEZONES:361
 msgid "Europe/Sofia"
 msgstr "歐洲/索非亞(Sofia)"
 
-#: TIMEZONES:363
+#: TIMEZONES:362
 msgid "Europe/Stockholm"
 msgstr "歐洲/斯德哥爾摩(Stockholm)"
 
-#: TIMEZONES:364
+#: TIMEZONES:363
 msgid "Europe/Tallinn"
 msgstr "歐洲/Tallinn"
 
-#: TIMEZONES:365
+#: TIMEZONES:364
 msgid "Europe/Tirane"
 msgstr "歐洲/Tirane"
 
-#: TIMEZONES:366
+#: TIMEZONES:365
 #, fuzzy
 msgid "Europe/Ulyanovsk"
 msgstr "歐洲/Minsk"
 
-#: TIMEZONES:367
+#: TIMEZONES:366
 msgid "Europe/Uzhgorod"
 msgstr "歐洲/Uzhgorod"
 
-#: TIMEZONES:368
+#: TIMEZONES:367
 msgid "Europe/Vaduz"
 msgstr "歐洲/Vaduz"
 
-#: TIMEZONES:369
+#: TIMEZONES:368
 msgid "Europe/Vatican"
 msgstr "歐洲/梵蒂岡(Vatican)"
 
-#: TIMEZONES:370
+#: TIMEZONES:369
 msgid "Europe/Vienna"
 msgstr "歐洲/維也納(Vienna)"
 
-#: TIMEZONES:371
+#: TIMEZONES:370
 msgid "Europe/Vilnius"
 msgstr "歐洲/Vilnius"
 
-#: TIMEZONES:372
+#: TIMEZONES:371
 #, fuzzy
 msgid "Europe/Volgograd"
 msgstr "歐洲/貝爾格勒(Belgrade)"
 
-#: TIMEZONES:373
+#: TIMEZONES:372
 msgid "Europe/Warsaw"
 msgstr "歐洲/Warsaw"
 
-#: TIMEZONES:374
+#: TIMEZONES:373
 msgid "Europe/Zagreb"
 msgstr "歐洲/Zagreb"
 
-#: TIMEZONES:375
+#: TIMEZONES:374
 msgid "Europe/Zaporozhye"
 msgstr "歐洲/Zaporozhye"
 
-#: TIMEZONES:376
+#: TIMEZONES:375
 msgid "Europe/Zurich"
 msgstr "歐洲/蘇黎士(Zurich)"
 
-#: TIMEZONES:377
+#: TIMEZONES:376
 msgid "Indian/Antananarivo"
 msgstr "印度洋/Antananarivo"
 
-#: TIMEZONES:378
+#: TIMEZONES:377
 msgid "Indian/Chagos"
 msgstr "印度洋/Chagos"
 
-#: TIMEZONES:379
+#: TIMEZONES:378
 msgid "Indian/Christmas"
 msgstr "印度洋/Christmas"
 
-#: TIMEZONES:380
+#: TIMEZONES:379
 msgid "Indian/Cocos"
 msgstr "印度洋/Cocos"
 
-#: TIMEZONES:381
+#: TIMEZONES:380
 msgid "Indian/Comoro"
 msgstr "印度洋/Comoro"
 
-#: TIMEZONES:382
+#: TIMEZONES:381
 msgid "Indian/Kerguelen"
 msgstr "印度洋/Kerguelen"
 
-#: TIMEZONES:383
+#: TIMEZONES:382
 msgid "Indian/Mahe"
 msgstr "印度洋/Mahe"
 
-#: TIMEZONES:384
+#: TIMEZONES:383
 msgid "Indian/Maldives"
 msgstr "印度洋/馬爾地夫(Maldives)"
 
-#: TIMEZONES:385
+#: TIMEZONES:384
 msgid "Indian/Mauritius"
 msgstr "印度洋/毛里西斯(Mauritius)"
 
-#: TIMEZONES:386
+#: TIMEZONES:385
 msgid "Indian/Mayotte"
 msgstr "印度洋/Mayotte"
 
-#: TIMEZONES:387
+#: TIMEZONES:386
 msgid "Indian/Reunion"
 msgstr "印度洋/Reunion"
 
-#: TIMEZONES:388
+#: TIMEZONES:387
 msgid "Pacific/Apia"
 msgstr "太平洋/Apia"
 
-#: TIMEZONES:389
+#: TIMEZONES:388
 msgid "Pacific/Auckland"
 msgstr "太平洋/Auckland"
 
-#: TIMEZONES:390
+#: TIMEZONES:389
 #, fuzzy
 msgid "Pacific/Bougainville"
 msgstr "太平洋/檀香山(Honolulu)"
 
-#: TIMEZONES:391
+#: TIMEZONES:390
 msgid "Pacific/Chatham"
 msgstr "太平洋/Chatham"
 
-#: TIMEZONES:392
+#: TIMEZONES:391
 #, fuzzy
 msgid "Pacific/Chuuk"
 msgstr "太平洋/Truk"
 
-#: TIMEZONES:393
+#: TIMEZONES:392
 msgid "Pacific/Easter"
 msgstr "太平洋/Easter"
 
-#: TIMEZONES:394
+#: TIMEZONES:393
 msgid "Pacific/Efate"
 msgstr "太平洋/Efate"
 
-#: TIMEZONES:395
+#: TIMEZONES:394
 msgid "Pacific/Enderbury"
 msgstr "太平洋/Enderbury"
 
-#: TIMEZONES:396
+#: TIMEZONES:395
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/Fakaofo"
 
-#: TIMEZONES:397
+#: TIMEZONES:396
 msgid "Pacific/Fiji"
 msgstr "太平洋/斐濟(Fiji)"
 
-#: TIMEZONES:398
+#: TIMEZONES:397
 msgid "Pacific/Funafuti"
 msgstr "太平洋/Funafuti"
 
-#: TIMEZONES:399
+#: TIMEZONES:398
 msgid "Pacific/Galapagos"
 msgstr "太平洋/Galapagos"
 
-#: TIMEZONES:400
+#: TIMEZONES:399
 msgid "Pacific/Gambier"
 msgstr "太平洋/Gambier"
 
-#: TIMEZONES:401
+#: TIMEZONES:400
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/Guadalcanal"
 
-#: TIMEZONES:402
+#: TIMEZONES:401
 msgid "Pacific/Guam"
 msgstr "太平洋/關島(Guam)"
 
-#: TIMEZONES:403
+#: TIMEZONES:402
 msgid "Pacific/Honolulu"
 msgstr "太平洋/檀香山(Honolulu)"
 
-#: TIMEZONES:404
+#: TIMEZONES:403
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/Kiritimati"
 
-#: TIMEZONES:405
+#: TIMEZONES:404
 msgid "Pacific/Kosrae"
 msgstr "太平洋/Kosrae"
 
-#: TIMEZONES:406
+#: TIMEZONES:405
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/Kwajalein"
 
-#: TIMEZONES:407
+#: TIMEZONES:406
 msgid "Pacific/Majuro"
 msgstr "太平洋/Majuro"
 
-#: TIMEZONES:408
+#: TIMEZONES:407
 msgid "Pacific/Marquesas"
 msgstr "太平洋/Marquesas"
 
-#: TIMEZONES:409
+#: TIMEZONES:408
 msgid "Pacific/Midway"
 msgstr "太平洋/Midway"
 
-#: TIMEZONES:410
+#: TIMEZONES:409
 msgid "Pacific/Nauru"
 msgstr "太平洋/Nauru"
 
-#: TIMEZONES:411
+#: TIMEZONES:410
 msgid "Pacific/Niue"
 msgstr "太平洋/Niue"
 
-#: TIMEZONES:412
+#: TIMEZONES:411
 msgid "Pacific/Norfolk"
 msgstr "太平洋/諾福克(Norfolk)"
 
-#: TIMEZONES:413
+#: TIMEZONES:412
 msgid "Pacific/Noumea"
 msgstr "太平洋/Noumea"
 
-#: TIMEZONES:414
+#: TIMEZONES:413
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/Pago_Pago"
 
-#: TIMEZONES:415
+#: TIMEZONES:414
 msgid "Pacific/Palau"
 msgstr "太平洋/Palau"
 
-#: TIMEZONES:416
+#: TIMEZONES:415
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/Pitcairn"
 
-#: TIMEZONES:417
+#: TIMEZONES:416
 #, fuzzy
 msgid "Pacific/Pohnpei"
 msgstr "太平洋/Ponape"
 
-#: TIMEZONES:418
+#: TIMEZONES:417
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/Port_Moresby"
 
-#: TIMEZONES:419
+#: TIMEZONES:418
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/Rarotonga"
 
-#: TIMEZONES:420
+#: TIMEZONES:419
 msgid "Pacific/Saipan"
 msgstr "太平洋/塞班島(Saipan)"
 
-#: TIMEZONES:421
+#: TIMEZONES:420
 msgid "Pacific/Tahiti"
 msgstr "太平洋/Tahiti"
 
-#: TIMEZONES:422
+#: TIMEZONES:421
 msgid "Pacific/Tarawa"
 msgstr "太平洋/Tarawa"
 
-#: TIMEZONES:423
+#: TIMEZONES:422
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/Tongatapu"
 
-#: TIMEZONES:424
+#: TIMEZONES:423
 msgid "Pacific/Wake"
 msgstr "太平洋/Wake"
 
-#: TIMEZONES:425
+#: TIMEZONES:424
 msgid "Pacific/Wallis"
 msgstr "太平洋/Wallis"
 
+#, fuzzy
+#~ msgid "Australia/Currie"
+#~ msgstr "澳洲/Brisbane"
+
 #~ msgid "America/Godthab"
 #~ msgstr "美洲/Godthab"