From: Rudolf Polzer <divVerent@gmail.com>
Date: Thu, 29 Oct 2020 06:23:51 +0000 (+0100)
Subject: Transifex autosync
X-Git-Tag: xonotic-v0.8.5~708
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd50b46ae8e74d0bb9449585243a3e3695bdda66;p=xonotic%2Fxonotic-data.pk3dir.git

Transifex autosync
---

diff --git a/.tx/merge-base b/.tx/merge-base
index c356e57e0..ec77f851f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Oct 26 07:23:34 CET 2020
+Thu Oct 29 07:23:29 CET 2020
diff --git a/common.fr.po b/common.fr.po
index 5db1139f1..227918883 100644
--- a/common.fr.po
+++ b/common.fr.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Aodren Le Gloanec <aodren.legloanec@gmail.com>, 2020
+# Gwlanbzh <aodren.legloanec@gmail.com>, 2020
 # Calinou, 2013-2014
 # Calinou <calinou9999@gmail.com>, 2012
 # Hugo Locurcio, 2014