Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/common/drive-ui.js

@@ -352,10 +352,6 @@ define([
                     'tabindex': '-1',
                     'data-icon': faAccess,
                 }, Messages.accessButton)),
-                h('li', h('a.cp-app-drive-context-properties.dropdown-item', {
-                    'tabindex': '-1',
-                    'data-icon': faProperties,
-                }, Messages.fc_prop)),
                 $separator.clone()[0],
                 h('li', h('a.cp-app-drive-context-newfolder.dropdown-item.cp-app-drive-context-editable', {
                     'tabindex': '-1',
@@ -445,6 +441,10 @@ define([
                     'tabindex': '-1',
                     'data-icon': faCopy,
                 }, Messages.makeACopy)),
+                h('li', h('a.cp-app-drive-context-download.dropdown-item', {
+                    'tabindex': '-1',
+                    'data-icon': faDownload,
+                }, Messages.download_mt_button)),
                 h('li', h('a.cp-app-drive-context-delete.dropdown-item.cp-app-drive-context-editable', {
                     'tabindex': '-1',
                     'data-icon': faTrash,
@@ -462,10 +462,10 @@ define([
                     'data-icon': faDelete,
                 }, Messages.fc_remove_sharedfolder)),
                 $separator.clone()[0],
-                h('li', h('a.cp-app-drive-context-download.dropdown-item', {
+                h('li', h('a.cp-app-drive-context-properties.dropdown-item', {
                     'tabindex': '-1',
-                    'data-icon': faDownload,
-                }, Messages.download_mt_button)),
+                    'data-icon': faProperties,
+                }, Messages.fc_prop))
             ])
         ]);
         // add icons to the contextmenu options

www/common/translations/messages.fr.json

@@ -1325,5 +1325,6 @@
     "access_allow": "Liste",
     "access_main": "Accès",
     "logoutEverywhere": "Se déconnecter partout",
-    "allow_text": "L'utilisation d'une liste d'accès signifie que seuls les utilisateurs et propriétaires sélectionnés pourront accéder à ce document."
+    "allow_text": "L'utilisation d'une liste d'accès signifie que seuls les utilisateurs et propriétaires sélectionnés pourront accéder à ce document.",
+    "teams": "Équipes"
 }

www/common/translations/messages.json

@@ -1325,5 +1325,6 @@
     "access_muteRequests": "Mute access requests for this pad",
     "owner_text": "The owner(s) of a pad are the only users authorised to: add/remove owners, restrict access to the pad with an access list, or delete the pad.",
     "logoutEverywhere": "Log out everywhere",
-    "allow_text": "Using an access list means that only selected users and owners will be able to access this document."
+    "allow_text": "Using an access list means that only selected users and owners will be able to access this document.",
+    "teams": "Teams"
 }