From 72acee6df8c19e0014f4162492c436da58588f59 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 6 Mar 2020 17:04:17 +0100 Subject: [PATCH 1/3] Translated using Weblate (English) Currently translated at 100.0% (1230 of 1230 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 34072bf33..5ea7dd932 100644 --- a/www/common/translations/messages.json +++ b/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" } From f60a9dc575fdef7e98bd6b6d76a5d62f5c975912 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 6 Mar 2020 17:04:18 +0100 Subject: [PATCH 2/3] Translated using Weblate (French) Currently translated at 100.0% (1230 of 1230 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 6147e6e56..fedbacd64 100644 --- a/www/common/translations/messages.fr.json +++ b/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" } From 5a88f6c526b7377972c780692bd15280a2600541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 6 Mar 2020 16:22:22 +0000 Subject: [PATCH 3/3] change order of icons in context menu --- www/common/drive-ui.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 4b0139500..c46669e8d 100644 --- a/www/common/drive-ui.js +++ b/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