Merge branch 'terencehill/race_cleanups' into 'master'

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e82268d6526270d46f35ead73425fac23788b4b..8bc8c2217cc2bb2879d13035e8089d79758bc78c 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Mar  1 07:23:49 CET 2021
+Thu Mar 11 07:23:42 CET 2021

diff --git a/common.fr.po b/common.fr.po
index 443ea6b8de39766d397a12914da8349ab6a43bc3..b0bdca0506bf7b6926c65387185f0e862aa9e3fa 100644 (file)
--- 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: 2021-02-28 07:23+0100\n"
-"PO-Revision-Date: 2021-02-28 10:44+0000\n"
+"PO-Revision-Date: 2021-03-10 11:28+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"
@@ -5577,6 +5577,8 @@ msgstr "%02d:%02d:%02d"
 #: qcsrc/menu/command/menu_cmd.qc:48
 msgid "Usage:^3 menu_cmd <command> [<item>], where possible commands are:"
 msgstr ""
+"Utilisation : ^3 menu_cmd <command> [<item>], où les commandes possibles "
+"sont :"
 
 #: qcsrc/menu/command/menu_cmd.qc:49
 msgid "  <sync> reloads all cvars on the current menu page"
@@ -5587,12 +5589,16 @@ msgid ""
 "  <directmenu> shows the menu window named <item> (or the menu window "
 "containing an item named <item>)"
 msgstr ""
+"  <directmenu> affiche la fenêtre de menu nommée <item> (ou la fenêtre de "
+"menu contenant un élément nommé <item>)"
 
 #: qcsrc/menu/command/menu_cmd.qc:51
 msgid ""
 "   if <item> is not specified it shows the list of available items in the "
 "console"
 msgstr ""
+"   si <item> n'est pas spécifié cela affiche la liste des éléments "
+"disponibles dans la console"
 
 #: qcsrc/menu/command/menu_cmd.qc:52
 msgid "  <dumptree> dumps the state of the menu as a tree to the console"

diff --git a/common.he.po b/common.he.po
index 05e18f3a84161db01493a75c4f00ac37f996bb74..0ef4d2800400684058afc46f588dc5c6391d656e 100644 (file)
--- a/common.he.po
+++ b/common.he.po
@@ -5,8 +5,8 @@
 # Translators:
 # nad le <nadavlevi726@gmail.com>, 2018
 # Omer I.S., 2020
-# Omer I.S. <omeritzicschwartz@gmail.com>, 2020
-# Omer I.S. <omeritzicschwartz@gmail.com>, 2020
+# Omeritzics Games <omeritzicschwartz@gmail.com>, 2020
+# Omeritzics Games <omeritzicschwartz@gmail.com>, 2020
 # Roi Asher Gerszkoviez <gerszkoviez@gmail.com>, 2020
 # Tal Leibman <leibman2@gmail.com>, 2019
 msgid ""

diff --git a/languages.txt b/languages.txt
index afaa9587c7ddddd16b5f1c8ab5566340f0457520..c9b8524b6833220c56c323c51ca6f96bdb5578f1 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -4,7 +4,7 @@ de_CH "German (Switzerland)" "Deutsch (Schweiz)" 99%
 en    "English" "English" 100%
 en_AU "English (Australia)" "English (Australia)" 74%
 es    "Spanish" "Español" 99%
-fr    "French" "Français" 99%
+fr    "French" "Français" 100%
 ga    "Irish" "Irish" 31%
 it    "Italian" "Italiano" 99%
 hu    "Hungarian" "Magyar" 46%