From 9ae4f4f296d80160bac09a82642bd830fb21148f Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 15 Nov 2018 07:24:28 +0100
Subject: [PATCH] Transifex autosync

---
 .tx/merge-base  | 2 +-
 common.zh_CN.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tx/merge-base b/.tx/merge-base
index 514e41c68..5c0773e31 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 11 07:24:12 CET 2018
+Thu Nov 15 07:24:15 CET 2018
diff --git a/common.zh_CN.po b/common.zh_CN.po
index 669d4a45c..683515a76 100644
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -9,7 +9,7 @@
 # kalawore <kalawore@outlook.com>, 2015
 # 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"
-- 
2.39.2