Merge branch 'develop' into custon_board_layout

diff --cc l10n/po/fr/trivabble.po
index a626f2070fe86a261380ad528545060570554482,4c8af5f68df09ab75dd70ecb8a4d9c9f2f7498aa..22e779ccf08a35b7527ef6cb46316ab236c8d1f0
--- 1/l10n/po/fr/trivabble.po
--- 2/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@@ -262,10 -262,18 +262,26 @@@ msgstr "Chronométrer la partie
  msgid  "To measure playing time, activate the timer."
  msgstr "Pour mesurer les temps de jeu, activez le chronomètre."
  
+ msgid  "Cell captions:"
+ msgstr "Légendes des cellules :"
+ 
+ msgid  "Clip when overflow"
+ msgstr "Raccourcies en cas de débordement"
+ 
+ msgid  "Dots when overflow"
+ msgstr "Pointillés en cas de débordement"
+ 
+ msgid  "No caption"
+ msgstr "Pas de légende"
+ 
+ msgid  "Short caption"
+ msgstr "Légendes courtes"
+ 
 +msgid  "Board label:"
 +msgstr "Type du plateau"
 +
 +msgid  "Are you sure you want to change board to {0}? This will put all the tiles back in the bag and start another game."
 +msgstr "Êtes-vous sûr·e de vouloir de changer le type du plateau à {0} ? Cela remettra toutes les lettres du jeu dans le sac et commencera une nouvelle partie."
++
 +msgid  "Can't find board '{0}'. Change board or start a new game."
 +msgstr "Impossible de trouver le plateau de type '{0}'. Changez de type de plateau ou démarrez une nouvelle partie."

diff --cc l10n/pot/trivabble.pot
index a2b2f2b44ef68eafeb87e7e725bd3eb8c29c6df9,8a367871e84744f76eacb07f99cc71328b670642..3781b8db99490800e2d6db2b8da57bf0e8997654
--- 1/l10n/pot/trivabble.pot
--- 2/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@@ -267,11 -267,17 +267,26 @@@ msgstr "
  msgid  "To measure playing time, activate the timer."
  msgstr ""
  
+ msgid  "Cell captions:"
+ msgstr ""
+ 
+ msgid  "Clip when overflow"
+ msgstr ""
+ 
+ msgid  "Dots when overflow"
+ msgstr ""
+ 
+ msgid  "No caption"
+ msgstr ""
+ 
+ msgid  "Short caption"
+ msgstr ""
++
 +msgid  "Board label:"
 +msgstr ""
 +
 +msgid  "Are you sure you want to change board to {0}? This will put all the tiles back in the bag and start another game."
 +msgstr ""
 +
 +msgid  "Can't find board '{0}'. Change board or start a new game."
 +msgstr ""

diff --cc public/index.html
Simple merge

diff --cc public/trivabble.js
index 53125e53688899001260b4bd9d418884de57b1ac,5dff925840b20c5a99bcdc478722d8a3a81e8d52..93699afc24ec4d68249392416a55965dcc112346
--- 1/public/trivabble.js
--- 2/public/trivabble.js
+++ b/public/trivabble.js
@@@ -148,15 -153,12 +155,14 @@@
      }
  
      const SettingsTypes = {
-         SpellCheckerEnabledOnce: "boolean",
+         BoardLang: "string",
          DisableSpellChecker: "boolean",
          GameNumber: "number",
 +        BoardLang: "string",
 +        BoardLabel: "string",
          Lang: "string",
          PlayerName: "string",
-         Timer: "number",
-         TimerEnable: "boolean",
+         SpellCheckerEnabledOnce: "boolean",
          TimerGameDate: "number",
          TimerTurnDate: "number"
      };