Finally merged them all.

diff --git a/.tx/merge-base b/.tx/merge-base
index 45b2986479a9572866eecfff3cad8dbc672374a1..b274f04ae1736e9b4d0aad58d732e55abba70a88 100644 (file)
--- 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 3e42d5b8f0c1234eb84a9e3662a9c515c7ea8f57..a35519a1179b6fbb2e81ddacc8c05cb3cb6e47c1 100644 (file)
--- 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"