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

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index ccb93bf82..253653cf7 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Nov  6 07:23:23 CET 2021
+Sun Nov  7 07:23:48 CET 2021
diff --git a/common.zh_CN.po b/common.zh_CN.po
index 484105c7e..1ac7c6e10 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -12,6 +12,7 @@
 # Liang Liu <dxkliu@126.com>, 2019
 # Losier Blackheath <losier.cc@gmail.com>, 2018
 # Matthew Wu, 2021
+# Matthew Wu, 2021
 # moetale <moetale@outlook.com>, 2021
 # sapphireliu <balancedliu@gmail.com>, 2014
 # CodingJellyfish <dumaosen_main01@outlook.com>, 2018-2020