From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 16 Nov 2018 06:24:22 +0000 (+0100)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~1714
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=314e90960336ef340dc7eb34ae375a091ac60645;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 5c0773e31..27c806745 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov 15 07:24:15 CET 2018
+Fri Nov 16 07:24:08 CET 2018
diff --git a/common.zh_CN.po b/common.zh_CN.po
index 683515a76..1a5ec83bc 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -10,6 +10,7 @@
 # Losier Blackheath <losier.cc@gmail.com>, 2018
 # sapphireliu <balancedliu@gmail.com>, 2014
 # 杜茂森 <dumaosen_main01@outlook.com>, 2018
+# 杜茂森 <dumaosen_main01@outlook.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"