web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Big manual merge

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-04 11:20:17 +02:00
parent e7d09c1ddb fb13e656b7
commit 0d1f19f5d4
71 changed files with 3489 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
customize.dist/translations/messages.js
View File

@@ -13,6 +13,7 @@ define(function () {
out.type.whiteboard = 'Whiteboard';
out.type.file = 'File';
out.type.media = 'Media';
out.type.todo = "Todo";
out.type.contacts = 'Contacts';
out.button_newpad = 'New Rich Text pad';
@@ -245,6 +246,7 @@ define(function () {
out.canvas_opacity = "Opacity";
out.canvas_opacityLabel = "opacity: {0}";
out.canvas_widthLabel = "Width: {0}";
out.canvas_saveToDrive = "Save this image as a file in your CryptDrive";
// Profile
out.profileButton = "Profile"; // dropdown menu
@@ -282,6 +284,10 @@ define(function () {
out.contacts_info3 = "Double-click their icon to view their profile";
out.contacts_info4 = "Either participant can clear permanently a chat history";
out.contacts_removeHistoryTitle = 'Clean the chat history';
out.contacts_confirmRemoveHistory = 'Are you sure you want to permanently remove your chat history? Data cannot be restored';
out.contacts_removeHistoryServerError = 'There was an error while removing your chat history. Try again later';
// File manager
out.fm_rootName = "Documents";
@@ -470,6 +476,13 @@ define(function () {
out.download_button = "Decrypt & Download";
out.download_mt_button = "Download";
out.todo_title = "CryptTodo";
out.todo_newTodoNamePlaceholder = "Describe your task...";
out.todo_newTodoNameTitle = "Add this task to your todo list";
out.todo_markAsCompleteTitle = "Mark this task as complete";
out.todo_markAsIncompleteTitle = "Mark this task as incomplete";
out.todo_removeTaskTitle = "Remove this task from your todo list";
// general warnings
out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. <a href='/about.html#pinning'>Learn more...</a>";