From cb629436589869f0ac041eb6afb583e778f8e115 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 29 Jun 2017 07:25:15 +0200
Subject: [PATCH] Transifex autosync

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 92b03d7f7..bae0563ae 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 18 07:23:51 CEST 2017
+Thu Jun 29 07:24:55 CEST 2017
diff --git a/common.pl.po b/common.pl.po
index bee24ccf8..a1c9eb46f 100644
--- a/common.pl.po
+++ b/common.pl.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-30 07:23+0200\n"
-"PO-Revision-Date: 2017-04-05 18:45+0000\n"
-"Last-Translator: Kriss Chr <kriss7475@gmail.com>\n"
+"PO-Revision-Date: 2017-06-28 19:15+0000\n"
+"Last-Translator: Amadeusz Sławiński <amade@asmblr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/team-xonotic/xonotic/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -9236,7 +9236,7 @@ msgid ""
 "^1ERROR: Texture compression is required but not supported.\n"
 "^1Expect visual problems.\n"
 msgstr ""
-"^1BŁĄÐ:: Kompresja z tekstury jest wymagana, ale nie wspomagana.\n"
+"^1BŁĄD:: Kompresja z tekstury jest wymagana, ale nie wspomagana.\n"
 "^1Oczekuj problemów wizualnych.\n"
 
 #: qcsrc/menu/xonotic/util.qc:780
-- 
2.39.2