blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'soon' into staging

Browse source
This commit is contained in:
ansuz 2020-04-03 10:49:51 -04:00
commit 2b3f6e3464
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/storage/file.js
View file

@ -1044,7 +1044,7 @@ module.exports.create = function (conf, _cb) {
getWeakLock: function (channelName, _cb) {
var cb = Util.once(Util.mkAsync(_cb));
if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); }
//if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); } // XXX
schedule.unordered(channelName, cb);
},

2
www/common/translations/messages.fr.json
View file

@ -945,7 +945,7 @@
"creation_expiration": "Date d'expiration",
"creation_passwordValue": "Mot de passe",
"creation_propertiesTitle": "Disponibilité",
"creation_appMenuName": "Mode avancé (Ctrl + E)",
"creation_appMenuName": "Nouveau pad (Ctrl + E)",
"creation_newPadModalDescription": "Cliquez sur un type de pad pour le créer. Vous pouvez aussi appuyer sur <b>Tab</b> pour sélectionner un type et appuyer sur <b>Entrée</b> pour valider.",
"creation_newPadModalDescriptionAdvanced": "Cochez la case si vous souhaitez voir l'écran de création de pads (pour les pads avec propriétaire ou à durée de vie). Vous pouvez appuyer sur <b>Espace</b> pour changer sa valeur.",
"creation_newPadModalAdvanced": "Afficher l'écran de création de pads",

2
www/common/translations/messages.json
View file

@ -963,7 +963,7 @@
"creation_expiration": "Expiration time",
"creation_passwordValue": "Password",
"creation_propertiesTitle": "Availability",
"creation_appMenuName": "Advanced mode (Ctrl + E)",
"creation_appMenuName": "New pad (Ctrl + E)",
"creation_newPadModalDescription": "Click on a pad type to create it. You can also press <b>Tab</b> to select the type and press <b>Enter</b> to confirm.",
"creation_newPadModalDescriptionAdvanced": "You can check the box (or press <b>Space</b> to change its value) if you want to display the pad creation screen (for owned pads, expiring pads, etc.).",
"creation_newPadModalAdvanced": "Display the pad creation screen",