From: Rudolf Polzer <divVerent@gmail.com>
Date: Mon, 3 Aug 2020 05:24:03 +0000 (+0200)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~791
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37e404b90ba91c995eea11bc8227e0d5aef510c1;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 8e5f2c73f..5c250465b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  1 07:23:42 CEST 2020
+Mon Aug  3 07:23:42 CEST 2020
diff --git a/common.zh_CN.po b/common.zh_CN.po
index ec6eaa065..4f3851f0c 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -10,8 +10,8 @@
 # Liang Liu <dxkliu@126.com>, 2019
 # Losier Blackheath <losier.cc@gmail.com>, 2018
 # sapphireliu <balancedliu@gmail.com>, 2014
-# 杜茂森 <dumaosen_main01@outlook.com>, 2018-2020
-# 杜茂森 <dumaosen_main01@outlook.com>, 2018
+# CodingJellyfish <dumaosen_main01@outlook.com>, 2018-2020
+# CodingJellyfish <dumaosen_main01@outlook.com>, 2018
 # 韬 刘 <jiegushijia@gmail.com>, 2019
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-07 07:23+0200\n"
 "PO-Revision-Date: 2020-07-25 11:27+0000\n"
-"Last-Translator: 杜茂森 <dumaosen_main01@outlook.com>\n"
+"Last-Translator: CodingJellyfish <dumaosen_main01@outlook.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/zh_CN/)\n"
 "Language: zh_CN\n"