Merge branch 'develop' into automatic_scoring

diff --cc l10n/po/fr/trivabble.po
index 5818a8bbc306eb2a824421614c88670546299677,33cda7f11e023c5dc9f3135bd0983e78df2636fb..9678513ed9c2e9d9cdd6c532e331ab7ccf71ed67
--- 1/l10n/po/fr/trivabble.po
--- 2/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@@ -232,5 -229,5 +232,8 @@@ msgstr "Astuce suivante
  msgid  "Disable the spell checker"
  msgstr "Désactiver la vérification orthographique"
  
+ msgid "Spell checking is not available for this language."
+ msgstr "La vérification orthographique n'est pas disponible dans cette langue."
++
 +msgid "Score new words"
 +msgstr "Evaluer les points des mots nouveaux"

diff --cc l10n/pot/trivabble.pot
index 10b523a966a7ec6eed4d64086636b46bcdcdb15a,87365a5cffd750c9d6708be2afbcd059cb5f430b..2a1c69428addae8689433e134e60c6846601b646
--- 1/l10n/pot/trivabble.pot
--- 2/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@@ -237,5 -234,5 +237,8 @@@ msgstr "
  msgid "Disable the spell checker"
  msgstr ""
  
+ msgid "Spell checking is not available for this language."
+ msgstr ""
++
 +msgid "Score new words"
 +msgstr ""

diff --cc public/index.html
Simple merge

diff --cc public/trivabble.js
Simple merge