From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 17 Jun 2017 05:24:37 +0000 (+0200)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~2733
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=62aed91040d8d6b5ba55fef191ad8413cd98e4a6;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 95e7fe594..7a383ef8f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  4 07:23:50 CEST 2017
+Sat Jun 17 07:24:20 CEST 2017
diff --git a/common.pl.po b/common.pl.po
index 9361db6d4..bee24ccf8 100644
--- a/common.pl.po
+++ b/common.pl.po
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
-"%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: qcsrc/client/hud/hud_config.qc:233