From: Laurent Mazet <mazet@softndesign.org>
Date: Wed, 12 Aug 2020 05:46:35 +0000 (+0200)
Subject: Merge branch 'develop' into laser_pointer
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=6872d289fec7c6ebe6c88abd15206cd10034e44e;p=trivabble.git

Merge branch 'develop' into laser_pointer
---

6872d289fec7c6ebe6c88abd15206cd10034e44e
diff --cc l10n/po/fr/trivabble.po
index 86cddd5,9edcab6..28ae52c
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@@ -166,5 -166,8 +166,11 @@@ msgstr "Vous avez changé la langue du 
  msgid  "{0} changed the language of the board to {1}"
  msgstr "{0} a changé la langue du plateau en {1}"
  
+ msgid  "Configuration"
+ msgstr "Options de configuration"
+ 
+ msgid  "Configuration window"
+ msgstr "Fenêtre de configuration"
++
 +msgid  "Look at:"
 +msgstr "Regardez ici :"
diff --cc l10n/pot/trivabble.pot
index 5a2b4d1,484ac74..5bd1347
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@@ -172,5 -172,8 +172,10 @@@ msgstr "
  msgid  "{0} changed the language of the board to {1}"
  msgstr ""
  
+ msgid  "Configuration"
+ msgstr ""
+ 
+ msgid  "Configuration window"
++
 +msgid  "Look at:"
  msgstr ""