From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 19 Jun 2018 05:24:38 +0000 (+0200)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~2005
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4d0e2b8e1daad46c50c16a8ccab20eafa38ec724

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 9745f6136..ca3e6259b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  3 07:24:16 CEST 2018
+Tue Jun 19 07:24:24 CEST 2018
diff --git a/common.ko.po b/common.ko.po
index 0407c6606..c313d8019 100644
--- a/common.ko.po
+++ b/common.ko.po
@@ -4,9 +4,9 @@
 #
 # Translators:
 # Jisoo Lim <liminj0719@gmail.com>, 2017
-# Kyf Lee (coughingmouse) <coughingmouse@gmail.com>, 2016
-# Kyf Lee (coughingmouse) <coughingmouse@gmail.com>, 2016-2017
-# Kyf Lee (coughingmouse) <coughingmouse@gmail.com>, 2016-2017
+# Kyf Lee <coughingmouse@gmail.com>, 2016
+# Kyf Lee <coughingmouse@gmail.com>, 2016-2017
+# Kyf Lee <coughingmouse@gmail.com>, 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"