Merge branch 'soon' into staging

pull/1/head
ansuz 5 years ago
commit 8bfd8f8462

@ -856,7 +856,7 @@
"help": { "help": {
"title": "Getting started", "title": "Getting started",
"generic": { "generic": {
"more": "Learn more about how CryptPad can work for you by reading our <a href=\"/faq.html\" target=\"_blank\">FAQ</a>", "more": "Learn more about how CryptPad can work for you by reading our <a href=\"/faq.html\" target=\"_blank\">FAQ</a>.",
"share": "Share this document with the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> button, and manage access rights with <i class=\"fa fa-unlock-alt\"></i> <b>Access</b>.", "share": "Share this document with the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> button, and manage access rights with <i class=\"fa fa-unlock-alt\"></i> <b>Access</b>.",
"save": "All your changes are synced automatically so you never need to save" "save": "All your changes are synced automatically so you never need to save"
}, },
@ -1379,5 +1379,8 @@
"slide_backCol": "Background color", "slide_backCol": "Background color",
"slide_textCol": "Text color", "slide_textCol": "Text color",
"support_languagesPreamble": "The support team speaks the following languages:", "support_languagesPreamble": "The support team speaks the following languages:",
"settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar." "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar.",
"info_imprintFlavour": "<a>Legal information about the administrators of this instance</a>.",
"user_about": "About CryptPad",
"info_privacyFlavour": "Our <a>privacy policy</a> describes how we treat your data."
} }

Loading…
Cancel
Save