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

Merge branch 'staging' into framework

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-10-06 14:50:35 +03:00
parent 9509d538e0 888028c542
commit f0eb58ee95
27 changed files with 3411 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,9 @@ define(function () {
out.poll_removeUser = "Are you sure you'd like to remove this user?";
out.poll_titleHint = "Title";
out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged.";
out.poll_descriptionHint = "Describe your poll, and use the ✓ (publish) button when you're done.\n" +
"The description can be written using markdown syntax and you can embed media elements from your CryptDrive.\n" +
"Anyone with the link can change the description, but this is discouraged.";
out.poll_remove = "Remove";
out.poll_edit = "Edit";
@@ -260,6 +262,15 @@ define(function () {
out.poll_show_help_button = "Show help";
out.poll_hide_help_button = "Hide help";
out.poll_bookmark_col = 'Bookmark this column so that it is always unlocked and displayed at the beginning for you';
out.poll_bookmarked_col = 'This is your bookmarked column. It will always be unlocked and displayed at the beginning for you.';
out.poll_total = 'TOTAL';
out.poll_comment_list = "Comments";
out.poll_comment_add = "Add a comment";
out.poll_comment_submit = "Send";
out.poll_comment_remove = "Delete this comment";
// Canvas
out.canvas_clear = "Clear";
out.canvas_delete = "Delete selection";
@@ -385,6 +396,7 @@ define(function () {
out.fc_remove = "Delete permanently";
out.fc_empty = "Empty the trash";
out.fc_prop = "Properties";
out.fc_hashtag = "Tags";
out.fc_sizeInKilobytes = "Size in Kilobytes";
// fileObject.js (logs)
out.fo_moveUnsortedError = "You can't move a folder to the list of unsorted pads";