From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 10 Feb 2018 06:23:51 +0000 (+0100)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~2332
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=88b1f0b3a5ebd1a81795dc40d3b9a58a707fc32d

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index b2f289cd34..c8dff0e9fb 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Feb  8 07:23:38 CET 2018
+Sat Feb 10 07:23:38 CET 2018
diff --git a/common.zh_CN.po b/common.zh_CN.po
index 5084bfb73b..0287246689 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -4950,7 +4950,7 @@ msgstr "好的"
 
 #: qcsrc/menu/xonotic/dialog_credits.qh:7
 msgid "Credits"
-msgstr "制作人员"
+msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_credits.qh:8
 msgid "The Xonotic credits"