From 139725e4fa281096fc930ffab6e38089cfe767c8 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 13 Mar 2020 15:12:40 +0100 Subject: [PATCH 1/7] Translated using Weblate (French) Currently translated at 100.0% (1240 of 1240 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index fedbacd64..a538d19ce 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -347,7 +347,7 @@ "fm_info_root": "Créez ici autant de dossiers que vous le souhaitez pour trier vos fichiers.", "fm_info_unsorted": "Contient tous les pads que vous avez ouvert et qui ne sont pas triés dans \"Documents\" ou déplacés vers la \"Corbeille\".", "fm_info_template": "Contient tous les fichiers que vous avez sauvés en tant que modèle afin de les réutiliser lors de la création d'un nouveau pad.", - "fm_info_recent": "Liste les derniers pads que vous avez modifiés ou ouverts.", + "fm_info_recent": "Ces pads on été récemment ouverts ou modifiés par vous ou vos collaborateurs.", "fm_info_trash": "Vider la corbeille permet de libérer de l'espace dans votre CryptDrive.", "fm_info_allFiles": "Contient tous les fichiers de \"Documents\", \"Fichiers non triés\" et \"Corbeille\". Vous ne pouvez pas supprimer ou déplacer des fichiers depuis cet endroit.", "fm_info_anonymous": "Vous n'êtes pas connecté, ces pads seront donc supprimés après 3 mois d'inactivité (découvrez pourquoi). Ils sont stockés dans votre navigateur donc nettoyer votre historique peut les faire disparaître.
Inscrivez-vous ou connectez-vous pour les maintenir en vie.
", @@ -877,9 +877,9 @@ "embed": "Intégrez des images de votre disque ou de votre CryptDrive et exporter le contenu en tant que PNG sur votre disque ou votre CryptDrive " }, "kanban": { - "add": "Ajoutez un tableau en utilisant le bouton 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" + "add": "Ajoutez des cartes et tableaux en cliquant sur les boutons ", + "task": "Déplacez les éléments en les faisant glisser, déposez-les dans la corbeille pour les effacer", + "color": "Modifiez les titres, contenus, mots-clés, et couleurs en cliquant sur le bouton à côté du titre des tableaux et des cartes" } }, "driveReadmeTitle": "Qu'est-ce que CryptPad ?", @@ -1326,5 +1326,15 @@ "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.", - "teams": "Équipes" + "teams": "Équipes", + "kanban_editBoard": "Modifier ce tableau", + "kanban_editCard": "Modifier cette carte", + "kanban_clearFilter": "Enlever le filtre", + "kanban_conflicts": "En cours d'édition :", + "kanban_noTags": "Pas de mots-clés", + "kanban_tags": "Filtrer par mot-clé", + "kanban_delete": "Supprimer", + "kanban_color": "Couleur", + "kanban_body": "Contenu", + "kanban_title": "Titre" } From d2135e5533f5edfff2aa177b30dc0b115625f190 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 13 Mar 2020 15:12:40 +0100 Subject: [PATCH 2/7] Translated using Weblate (English) Currently translated at 100.0% (1240 of 1240 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1240 of 1240 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1239 of 1239 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1238 of 1238 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1237 of 1237 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1236 of 1236 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1235 of 1235 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1234 of 1234 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1233 of 1233 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1232 of 1232 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1231 of 1231 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 5ea7dd932..3eb6fb755 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -354,7 +354,7 @@ "fm_info_root": "Create as many nested folders here as you want to sort your files.", "fm_info_unsorted": "Contains all the files you've visited that are not yet sorted in \"Documents\" or moved to the \"Trash\".", "fm_info_template": "Contains all the pads stored as templates and that you can re-use when you create a new pad.", - "fm_info_recent": "List the recently modified or opened pads.", + "fm_info_recent": "These pads have recently been opened or modified by you or people you collaborate with.", "fm_info_trash": "Empty your trash to free space in your CryptDrive.", "fm_info_allFiles": "Contains all the files from \"Documents\", \"Unsorted\" and \"Trash\". You can't move or remove files from here.", "fm_info_anonymous": "You are not logged in so your pads will expire after 3 months (find out more). They are stored in your browser so clearing history may make them disappear.
Sign up or Log in to keep them alive.
", @@ -895,9 +895,9 @@ "embed": "Embed images from your disk or your CryptDrive and export them as PNG to your disk or your CryptDrive " }, "kanban": { - "add": "Add new boards using the 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" + "add": "Add new cards and boards by clicking the buttons", + "task": "Move items by dragging and dropping, drag to the trash to delete", + "color": "Edit titles, content, tags, and colors by clicking on the button next to card and board titles" } }, "driveReadmeTitle": "What is CryptPad?", @@ -1326,5 +1326,15 @@ "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.", - "teams": "Teams" + "teams": "Teams", + "kanban_title": "Title", + "kanban_body": "Content", + "kanban_color": "Color", + "kanban_delete": "Delete", + "kanban_tags": "Filter by tag", + "kanban_noTags": "No tags", + "kanban_conflicts": "Currently editing:", + "kanban_clearFilter": "Clear filter", + "kanban_editCard": "Edit this card", + "kanban_editBoard": "Edit this board" } From ed4de6a007aeb260728484bf1f9148f5dde37cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 13 Mar 2020 14:13:44 +0000 Subject: [PATCH 3/7] remove // XXX related to translation keys --- www/kanban/inner.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 88fbf6ea4..0ed6704b7 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -56,17 +56,6 @@ define([ var onCursorUpdate = Util.mkEvent(); var remoteCursors = {}; - Messages.kanban_title = "Title"; // XXX - Messages.kanban_body = "Body"; // XXX - Messages.kanban_color = "Color"; // XXX - Messages.kanban_submit = "Submit"; // XXX - Messages.kanban_delete = "Delete"; // XXX - Messages.kanban_tags = "Filter tags"; // XXX - Messages.kanban_noTags = "No tags"; // XXX - Messages.kanban_conflicts = "Currently editing:"; // XXX - Messages.kanban_clearFilter = "clear filter"; // XXX - Messages.kanban_editCard = "edit this card" // XXX - Messages.kanban_editBoard = "edit this board" // XXX // XXX // Conflicts From 1e545049b5891266f7d63edd959cbbc0ce6fad03 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 13 Mar 2020 15:18:45 +0100 Subject: [PATCH 4/7] Translated using Weblate (French) Currently translated at 100.0% (1240 of 1240 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index a538d19ce..00eb48e80 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -877,9 +877,9 @@ "embed": "Intégrez des images de votre disque ou de votre CryptDrive et exporter le contenu en tant que PNG sur votre disque ou votre CryptDrive " }, "kanban": { - "add": "Ajoutez des cartes et tableaux en cliquant sur les boutons ", - "task": "Déplacez les éléments en les faisant glisser, déposez-les dans la corbeille pour les effacer", - "color": "Modifiez les titres, contenus, mots-clés, et couleurs en cliquant sur le bouton à côté du titre des tableaux et des cartes" + "add": "Ajoutez des cartes et tableaux en cliquant sur les boutons ", + "task": "Déplacez les éléments en les faisant glisser, déposez-les dans la corbeille pour les effacer", + "color": "Modifiez les titres, contenus, mots-clés, et couleurs en cliquant sur le bouton à côté du titre des tableaux et des cartes" } }, "driveReadmeTitle": "Qu'est-ce que CryptPad ?", From 3a6884f56617a679ad3803b1f2d728aa58f386d4 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 13 Mar 2020 15:18:45 +0100 Subject: [PATCH 5/7] Translated using Weblate (English) Currently translated at 100.0% (1240 of 1240 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 3eb6fb755..9449ab37d 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -895,9 +895,9 @@ "embed": "Embed images from your disk or your CryptDrive and export them as PNG to your disk or your CryptDrive " }, "kanban": { - "add": "Add new cards and boards by clicking the buttons", - "task": "Move items by dragging and dropping, drag to the trash to delete", - "color": "Edit titles, content, tags, and colors by clicking on the button next to card and board titles" + "add": "Add new cards and boards by clicking the buttons", + "task": "Move items by dragging and dropping, drag to the trash to delete", + "color": "Edit titles, content, tags, and colors by clicking on the button next to card and board titles" } }, "driveReadmeTitle": "What is CryptPad?", From 5d59b5579914c409956b23b766c7555dadb2fc2f Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 13 Mar 2020 10:40:03 -0400 Subject: [PATCH 6/7] lint compliance --- www/kanban/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 0ed6704b7..6aca4ac67 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -328,7 +328,7 @@ define([ className: 'danger left', name: Messages.kanban_delete, confirm: true, - onClick: function (button) { + onClick: function (/*button*/) { var boards = kanban.options.boards || {}; if (isBoard) { var list = boards.list || []; From a2b6501adb6efbff263496f58076a94897a05bf7 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 13 Mar 2020 10:41:15 -0400 Subject: [PATCH 7/7] update package and footer version and add a dependency --- customize.dist/pages.js | 2 +- package-lock.json | 7 ++++++- package.json | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 117ddac87..d782e4a16 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -107,7 +107,7 @@ define([ ])*/ ]) ]), - h('div.cp-version-footer', "CryptPad v3.13.0 (NorthernWhiteRhino)") + h('div.cp-version-footer', "CryptPad v3.14.0 (OrienteCaveRat)") ]); }; diff --git a/package-lock.json b/package-lock.json index 6cafde975..def1ecc92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "3.13.0", + "version": "3.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1244,6 +1244,11 @@ "mime-types": "~2.1.24" } }, + "ulimit": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz", + "integrity": "sha1-K1H53IOBrkECY2zsXrM4wmMFiKA=" + }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", diff --git a/package.json b/package.json index 51bfec3f7..1ee33e03b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "3.13.0", + "version": "3.14.0", "license": "AGPL-3.0+", "repository": { "type": "git", @@ -24,6 +24,7 @@ "sortify": "^1.0.4", "stream-to-pull-stream": "^1.7.2", "tweetnacl": "~0.12.2", + "ulimit": "0.0.2", "ws": "^3.3.1" }, "devDependencies": {