Merge branch 'staging' into degraded

customize.dist/src/less2/include/toolbar.less

@@ -278,6 +278,7 @@
                 cursor: pointer;
             }
             &> p {
+                text-align: center;
                 margin: 20px;
             }
             &> div {

lib/hk-util.js

@@ -893,6 +893,7 @@ HK.onChannelMessage = function (Env, Server, channel, msgStruct, cb) {
         // more straightforward and reliable.
         if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) {
             // Reject duplicate checkpoints
+            // XXX not an error? the checkpoint is already here so we can assume it's stored
             return void cb('DUPLICATE');
         }
     }

www/common/common-ui-elements.js

@@ -1936,7 +1936,7 @@ define([
             $body: $('body')
         });
         var $modal = modal.$modal;
-        var $title = $('<h3>').text(Messages.fm_newFile);
+        var $title = $('<h3>').html("<i class='fa fa-plus'></i> " + Messages.fm_newButton);
         var $description = $('<p>').html(Messages.creation_newPadModalDescription);
         $modal.find('.cp-modal').append($title);
         $modal.find('.cp-modal').append($description);

www/common/drive-ui.js

@@ -3067,14 +3067,14 @@ define([
                 'class': 'cp-app-drive-element-row cp-app-drive-new-ghost'
             }).prepend($addIcon.clone()).appendTo($list);
             $element.append($('<span>', {'class': 'cp-app-drive-element-name'})
-                .text(Messages.fm_newFile));
+                .text(Messages.fm_newButton));
             $element.click(function () {
                 var modal = UI.createModal({
                     id: 'cp-app-drive-new-ghost-dialog',
                     $body: $('body')
                 });
                 var $modal = modal.$modal;
-                var $title = $('<h3>').text(Messages.fm_newFile);
+                var $title = $('<h3>').html("<i class='fa fa-plus'></i> " + Messages.fm_newButton);
                 var $description = $('<p>').text(Messages.fm_newButtonTitle);
                 $modal.find('.cp-modal').append($title);
                 $modal.find('.cp-modal').append($description);

www/common/translations/messages.fr.json

@@ -493,7 +493,7 @@
     "mdToolbar_check": "Liste de tâches",
     "mdToolbar_code": "Code",
     "home_host": "Ceci est une instance communautaire et indépendante de CryptPad.",
-    "main_catch_phrase": "Outils collaboratifs,<br>chiffrés et open source",
+    "main_catch_phrase": "Outils collaboratifs<br>chiffrés de bout en bout et open source",
     "footer_aboutUs": "À propos",
     "about": "À propos",
     "privacy": "Charte de confidentialité",

www/common/translations/messages.json

@@ -508,7 +508,7 @@
     "mdToolbar_code": "Code",
     "mdToolbar_toc": "Table of Contents",
     "home_host": "This is an independent community instance of CryptPad.",
-    "main_catch_phrase": "Collaboration suite,<br>encrypted and open-source",
+    "main_catch_phrase": "Collaboration suite<br>end-to-end encrypted and open-source",
     "footer_aboutUs": "About us",
     "about": "About",
     "privacy": "Privacy Policy",