Merge branch 'develop' into laser_pointer

diff --cc l10n/po/fr/trivabble.po
index 86cddd596b3a76990ee5071e540e60219e1bfcaf,9edcab65cd6845d15330edc9c1351ab005b693ce..28ae52cd53cab99eb0c11a95825b88fcd7a9145c
--- 1/l10n/po/fr/trivabble.po
--- 2/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 5a2b4d1bd66df51c74e740fb921d056efd0561db,484ac7447cc91ed9700c2b3c58357e7fd76858b2..5bd1347602e1426198b18be7de06e4d29553f92e
--- 1/l10n/pot/trivabble.pot
--- 2/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 ""

diff --cc public/trivabble.css
Simple merge

diff --cc public/trivabble.js
Simple merge