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

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 5c250465b..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug  3 07:23:42 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020
diff --git a/common.zh_CN.po b/common.zh_CN.po
index 4f3851f0c..910bf2ea5 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -6,6 +6,7 @@
 # Antoni Das <Antonidas159@gmail.com>, 2015
 # Antoni Das <Antonidas159@gmail.com>, 2015,2017
 # sapphireliu <balancedliu@gmail.com>, 2014
+# CodingJellyfish <dumaosen_main01@outlook.com>, 2018
 # kalawore <kalawore@outlook.com>, 2015
 # Liang Liu <dxkliu@126.com>, 2019
 # Losier Blackheath <losier.cc@gmail.com>, 2018