From 99d8ead3338901342e6a1bf429082796d35666d0 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@gmail.com>
Date: Mon, 30 Nov 2020 07:24:08 +0100
Subject: [PATCH] Transifex autosync

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

diff --git a/.tx/merge-base b/.tx/merge-base
index a497322d2..256958e3a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Nov 28 07:23:30 CET 2020
+Mon Nov 30 07:23:45 CET 2020
diff --git a/common.ast.po b/common.ast.po
index feb714ffa..a329fa73b 100644
--- a/common.ast.po
+++ b/common.ast.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-22 07:23+0100\n"
-"PO-Revision-Date: 2020-11-28 00:12+0000\n"
+"PO-Revision-Date: 2020-11-29 22:30+0000\n"
 "Last-Translator: Tornes Ḷḷume <tornes.llume@openmailbox.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ast/)\n"
@@ -2597,7 +2597,7 @@ msgstr ""
 #: qcsrc/common/notifications/all.inc:327
 #, c-format
 msgid "^BG%s^K1 switched to the %s%s"
-msgstr "^BG%s^K1 cambió al %s%s"
+msgstr "^BG%1$s^K1 cambió al %3$s%2$s"
 
 #: qcsrc/common/notifications/all.inc:328
 #, c-format
diff --git a/common.fr.po b/common.fr.po
index da582f931..25afff14f 100644
--- a/common.fr.po
+++ b/common.fr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-22 07:23+0100\n"
-"PO-Revision-Date: 2020-11-22 09:54+0000\n"
+"PO-Revision-Date: 2020-11-29 12:40+0000\n"
 "Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/team-xonotic/xonotic/"
 "language/fr/)\n"
@@ -1073,7 +1073,7 @@ msgstr "mi"
 
 #: qcsrc/client/hud/panel/strafehud.qc:912
 msgid "nmi"
-msgstr "nmi"
+msgstr "M"
 
 #: qcsrc/client/hud/panel/timer.qc:71
 msgid "WARMUP"
@@ -8417,7 +8417,7 @@ msgstr "Adoucir les effets de réticule"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:125
 msgid "Perform hit tests for the crosshair"
-msgstr "Vérifier la ligne de visée du réticule"
+msgstr "Tester la ligne de tir du réticule"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:129
 msgid "Blur if obstructed by an obstacle"
-- 
2.39.2