From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 11 Jul 2019 05:24:53 +0000 (+0200)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~1468
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=696e71af49cf769b09056c748c1ae591cce30ead;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 3d55aa93a..6e3edcfd2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul  7 07:25:26 CEST 2019
+Thu Jul 11 07:24:38 CEST 2019
diff --git a/common.zh_TW.po b/common.zh_TW.po
index 3073c6475..c405cc1ce 100644
--- a/common.zh_TW.po
+++ b/common.zh_TW.po
@@ -4,7 +4,7 @@
 #
 # Translators:
 # Arm Coon <armcoon@gmail.com>, 2016-2017
-# Jeff Huang <s8321414@gmail.com>, 2015
+# 黃柏諺 <s8321414@gmail.com>, 2015
 # msn1018927464 <msn1018927464@hotmail.com>, 2015
 # msn1018927464 <msn1018927464@hotmail.com>, 2015
 msgid ""