From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 14 Feb 2014 12:27:03 +0000 (+0100)
Subject: Finally merged them all.
X-Git-Tag: xonotic-v0.8.0~126^2~16^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cff9142d7732b7722fc7878fa6a98a4548823e43;p=xonotic%2Fxonotic-data.pk3dir.git

Finally merged them all.
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 45b298647..b274f04ae 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 13:06:18 CET 2014
+Fri Feb 14 13:26:38 CET 2014
diff --git a/common.pl.po b/common.pl.po
index 3e42d5b8f..a35519a11 100644
--- a/common.pl.po
+++ b/common.pl.po
@@ -4,17 +4,16 @@
 #
 # Translators:
 # Sertomas, 2014
-# Sertomas, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-14 12:09+0100\n"
-"PO-Revision-Date: 2014-02-14 11:09+0000\n"
+"PO-Revision-Date: 2014-02-14 12:23+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/xonotic/"
-"language/pl_PL/)\n"
-"Language: pl_PL\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/xonotic/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"