From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 20 Jun 2018 05:24:39 +0000 (+0200)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~2001
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61ce1916c940a94a258adc2799885ed0ea096253;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index ca3e6259b..ca7140deb 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jun 19 07:24:24 CEST 2018
+Wed Jun 20 07:24:25 CEST 2018
diff --git a/common.ko.po b/common.ko.po
index c313d8019..4d65b2712 100644
--- a/common.ko.po
+++ b/common.ko.po
@@ -7,6 +7,7 @@
 # Kyf Lee <coughingmouse@gmail.com>, 2016
 # Kyf Lee <coughingmouse@gmail.com>, 2016-2017
 # Kyf Lee <coughingmouse@gmail.com>, 2016-2017
+# Kyf Lee <coughingmouse@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"