From: Rudolf Polzer <divVerent@gmail.com>
Date: Wed, 24 Feb 2021 06:24:13 +0000 (+0100)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~566
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcac2a931209d977910ac79cf4e382f2f03cddef;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 3ce0b6ee3..3700eb596 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 12 07:23:41 CET 2021
+Wed Feb 24 07:23:53 CET 2021
diff --git a/common.zh_TW.po b/common.zh_TW.po
index 7e2c859b6..0c10ece04 100644
--- a/common.zh_TW.po
+++ b/common.zh_TW.po
@@ -4,10 +4,10 @@
 #
 # Translators:
 # Arm Coon <armcoon@gmail.com>, 2016-2017
-# 黃柏諺 <s8321414@gmail.com>, 2015
+# Jeff Huang <s8321414@gmail.com>, 2015
 # msn1018927464 <msn1018927464@hotmail.com>, 2015
 # msn1018927464 <msn1018927464@hotmail.com>, 2015
-# 黃柏諺 <s8321414@gmail.com>, 2015
+# Jeff Huang <s8321414@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"