Merge branch 'staging' into donkey

customize.dist/pages.js

@@ -32,6 +32,7 @@ define([
         });
         return select;
     };
+    languageSelector = languageSelector; // jshint
 
     var footerCol = function (title, L, literal) {
         return h('div.col-6.col-sm-3', [
@@ -68,7 +69,7 @@ define([
                     footerCol(null, [
                         h('div.cp-bio-foot', [
                             h('p', Msg.main_footerText),
-                            languageSelector()
+                            //languageSelector()
                         ])
                     ], ''),
                     footerCol('footer_applications', [
@@ -94,7 +95,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v2.1.0 (Badger)")
+            h('div.cp-version-footer', "CryptPad v2.2.0 (Coati)")
         ]);
     };
 

customize.dist/translations/messages.fr.js

@@ -1002,6 +1002,11 @@ define(function () {
         embed: 'Intégrez des images de votre disque <span class="fa fa-file-image-o"></span> ou de votre CryptDrive <span class="fa fa-image"></span> et exporter le contenu en tant que PNG sur votre disque <span class="fa fa-download"></span> ou votre CryptDrive <span class="fa fa-cloud-upload"></span>'
     };
 
+    out.help.kanban = {
+        add: 'Ajoutez un tableau en utilisant le bouton <span class="fa fa-plus"></span> dans le coin supérieur-droit',
+        task: 'Déplacez les éléments en les faisant glisser d\'un tableau à l\'autre',
+        color: 'Modifiez les couleurs en cliquant sur les parties colorées à côté du titre de chaque tableau'
+    };
 
     out.initialState = [
         '<p>',

customize.dist/translations/messages.js

@@ -254,7 +254,7 @@ define(function () {
     out.kanban_item = "Item {0}"; // Item number for initial content
     out.kanban_todo = "To Do";
     out.kanban_done = "Done";
-    out.kanban_working = "Working";
+    out.kanban_working = "In progress";
     out.kanban_deleteBoard = "Are you sure you want to delete this board?";
     out.kanban_addBoard = "Add a board";
     out.kanban_removeItem = "Remove this item";
@@ -1046,7 +1046,9 @@ define(function () {
     };
 
     out.help.kanban = {
-        //add: ''
+        add: 'Add new boards using the <span class="fa fa-plus"></span> button in the top-right corner',
+        task: 'Move items by dragging and dropping them from one board to another',
+        color: 'Change the colors by clicking on the colored part next to the board titles',
     };
 
     out.initialState = [