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

Merge branch 'staging' into foldersColor

Browse Source
This commit is contained in:
yflory
2019-06-18 15:36:22 +02:00
parent e9598de655 7c15076300
commit 2c661310c7
95 changed files with 4016 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
www/common/translations/messages.json
View File

@@ -278,13 +278,8 @@
"profile_create": "Create a profile",
"profile_description": "Description",
"profile_fieldSaved": "New value saved: {0}",
"profile_inviteButton": "Connect",
"profile_inviteButtonTitle": "Create a link that will invite this user to connect with you.",
"profile_inviteExplanation": "Clicking <strong>OK</strong> will create a link to a secure messaging session that <em>only {0} will be able to redeem.</em><br><br>The link will be copied to your clipboard and can be shared publicly.",
"profile_viewMyProfile": "View my profile",
"userlist_addAsFriendTitle": "Send \"{0}\" a friend request",
"userlist_thisIsYou": "This is you (\"{0}\")",
"userlist_pending": "Pending...",
"contacts_title": "Contacts",
"contacts_addError": "Error while adding that contact to the list",
"contacts_added": "Contact invite accepted.",
@@ -388,6 +383,8 @@
"fc_color": "Change color",
"fc_open": "Open",
"fc_open_ro": "Open (read-only)",
"fc_expandAll": "Expand All",
"fc_collapseAll": "Collapse All",
"fc_delete": "Move to trash",
"fc_delete_owned": "Delete from the server",
"fc_restore": "Restore",
@@ -1067,5 +1064,16 @@
"profile_addLink": "Add a link to your website",
"profile_info": "Other users can find your profile through your avatar in document user lists.",
"profile_friendRequestSent": "Friend request pending...",
"profile_friend": "{0} is your friend"
"profile_friend": "{0} is your friend",
"notification_padShared": "{0} has shared a pad with you: <b>{1}</b>",
"notification_fileShared": "{0} has shared a file with you: <b>{1}</b>",
"notification_folderShared": "{0} has shared a folder with you: <b>{1}</b>",
"share_selectAll": "Select all",
"share_deselectAll": "Deselect all",
"share_filterFriend": "Search by name",
"share_linkFriends": "Share with friends",
"share_withFriends": "Share",
"notifications_dismiss": "Dismiss",
"fm_info_sharedFolderHistory": "This is only the history of your shared folder: <b>{0}</b><br/>Your CryptDrive will stay in read-only mode while you navigate.",
"share_description": "Choose what you'd like to share and either get the link or send it directly to your CryptPad friends."
}