Merge branch 'staging' into reconnect
yflory
commit
7b5a15cef7
|
|
@ -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)")
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -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é (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">découvrez pourquoi</a>). Ils sont stockés dans votre navigateur donc nettoyer votre historique peut les faire disparaître.<br><a href=\"/register/\">Inscrivez-vous</a> ou <a href=\"/login/\">connectez-vous</a> pour les maintenir en vie.<br>",
|
||||
|
|
@ -877,9 +877,9 @@
|
|||
"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>"
|
||||
},
|
||||
"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"
|
||||
"add": "Ajoutez des cartes et tableaux en cliquant sur les boutons <span class=\"fa fa-plus\"></span>",
|
||||
"task": "Déplacez les éléments en les faisant glisser, déposez-les dans la <span class=\"fa fa-trash\"></span> corbeille pour les effacer",
|
||||
"color": "Modifiez les titres, contenus, mots-clés, et couleurs en cliquant sur le bouton <span class=\"fa fa-pencil\"></span> à 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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">find out more</a>). They are stored in your browser so clearing history may make them disappear.<br><a href=\"/register/\">Sign up</a> or <a href=\"/login/\">Log in</a> to keep them alive.<br>",
|
||||
|
|
@ -895,9 +895,9 @@
|
|||
"embed": "Embed images from your disk <span class=\"fa fa-file-image-o\"></span> or your CryptDrive <span class=\"fa fa-image\"></span> and export them as PNG to your disk <span class=\"fa fa-download\"></span> or your CryptDrive <span class=\"fa fa-cloud-upload\"></span>"
|
||||
},
|
||||
"kanban": {
|
||||
"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"
|
||||
"add": "Add new cards and boards by clicking the <span class=\"fa fa-plus\"></span> buttons",
|
||||
"task": "Move items by dragging and dropping, drag to the <span class=\"fa fa-trash\"></span> trash to delete",
|
||||
"color": "Edit titles, content, tags, and colors by clicking on the <span class=\"fa fa-pencil\"></span> 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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -339,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 || [];
|
||||
|
|
|
|||
Loading…
Reference in New Issue