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

2018-01-17 18:40:09 +01:00
parent c5ebbe1a56 a91a047d73
commit 08ae327386
4 changed files with 29 additions and 3 deletions
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -581,6 +581,7 @@ define(function () {
    out.upload_mustLogin = "You must be logged in to upload files";
    out.download_button = "Decrypt & Download";
    out.download_mt_button = "Download";
+    out.download_resourceNotAvailable = "The requested resource was not available...";

    out.todo_title = "CryptTodo";
    out.todo_newTodoNamePlaceholder = "Describe your task...";