Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
@@ -422,6 +422,7 @@ define(function () {
|
||||
// Settings
|
||||
out.settings_cat_account = "Account";
|
||||
out.settings_cat_drive = "CryptDrive";
|
||||
out.settings_cat_code = "Code";
|
||||
out.settings_title = "Settings";
|
||||
out.settings_save = "Save";
|
||||
|
||||
@@ -468,6 +469,9 @@ define(function () {
|
||||
out.settings_logoutEverywhere = "Force log out of all other web sessions";
|
||||
out.settings_logoutEverywhereConfirm = "Are you sure? You will need to log in with all your devices.";
|
||||
|
||||
out.settings_codeIndentation = 'Code editor indentation (spaces)';
|
||||
out.settings_codeUseTabs = "Indent using tabs (instead of spaces)";
|
||||
|
||||
out.upload_title = "File upload";
|
||||
out.upload_serverError = "Server Error: unable to upload your file at this time.";
|
||||
out.upload_uploadPending = "You already have an upload in progress. Cancel it and upload your new file?";
|
||||
|
||||
Reference in New Issue
Block a user