Merge branch 'staging' into locks

www/common/translations/messages.js

@@ -59,7 +59,7 @@ define(function () {
     out.deletedFromServer = "Pad deleted from the server";
 
     out.mustLogin = "You must be logged in to access this page";
-    out.disabledApp = "This application has been disabled. Contact the administrator of this CryptPad to have more information.";
+    out.disabledApp = "This application has been disabled. Contact the administrator of this CryptPad for more information.";
 
     out.realtime_unrecoverableError = "An unrecoverable error has occured. Click OK to reload.";
 
@@ -380,7 +380,6 @@ define(function () {
     out.contacts_typeHere = "Type a message here...";
     out.contacts_warning = "Everything you type here is persistent and available to all the existing and future users of this pad. Be careful with sensitive information!";
     out.contacts_padTitle = "Chat";
-    out.contacts_mustLogin = "You must be logged in to add contacts";
 
     out.contacts_info1 = "These are your contacts. From here, you can:";
     out.contacts_info2 = "Click your contact's icon to chat with them";
@@ -650,6 +649,10 @@ 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_driveDuplicateTitle = "Duplicated owned pads";
+    out.settings_driveDuplicateHint = "When you move your owned pads to a shared folder, a copy is kept in your CryptDrive to ensure that you retain your control over it. You can hide duplicated files. Only the shared version will be visible, unless deleted, in which case the original will be displayed in its previous location.";
+    out.settings_driveDuplicateLabel = "Hide duplicates";
+
     out.settings_codeIndentation = 'Code editor indentation (spaces)';
     out.settings_codeUseTabs = "Indent using tabs (instead of spaces)";
     out.settings_codeFontSize = "Font size in the code editor";
@@ -657,6 +660,9 @@ define(function () {
     out.settings_padWidth = "Editor's maximum width";
     out.settings_padWidthHint = "Rich text pads use by default the maximum available width on your screen and it can be difficult to read. You can reduce the editor's width here.";
     out.settings_padWidthLabel = "Reduce the editor's width";
+    out.settings_padSpellcheckTitle = "Spellcheck";
+    out.settings_padSpellcheckHint = "This option allows you to enable spellcheck in rich text pads. Spelling errors will be underlined in red and you'll have to hold your Ctrl or Meta key while right-clicking to see the correct options.";
+    out.settings_padSpellcheckLabel = "Enable spellcheck in rich text pads";
 
     out.settings_creationSkip = "Skip the pad creation screen";
     out.settings_creationSkipHint = "The pad creation screen offers new options to create a pad, providing you more control and security over your data. However, it may slow down your workflow by adding one additional step so, here, you have the option to skip this screen and use the default settings selected above.";
@@ -666,10 +672,11 @@ define(function () {
     out.settings_templateSkip = "Skip the template selection modal";
     out.settings_templateSkipHint = "When you create a new empty pad, if you have stored templates for this type of pad, a modal appears to ask if you want to use a template. Here you can choose to never show this modal and so to never use a template.";
 
-    out.settings_ownDriveTitle = "Drive migration"; // XXX
-    out.settings_ownDriveHint = "Migrating your drive to the new version will give you access to new features..."; // XXX
-    out.settings_ownDriveButton = "Migrate"; // XXX
-    out.settings_ownDriveConfirm = "Are you sure?"; // XXX
+    out.settings_ownDriveTitle = "Enable latest account features";
+    out.settings_ownDriveHint = "For technical reasons, older accounts do not have access to all of our latest features. A free upgrade to a new account will prepare your CryptDrive for upcoming features without disrupting your usual activities.";
+    out.settings_ownDriveButton = "Upgrade your account";
+    out.settings_ownDriveConfirm = "Upgrading your account may take some time. You will need to log back in on all your devices. Are you sure?";
+    out.settings_ownDrivePending = "Your account is being upgraded. Please do not close or reload this page until the process has completed.";
 
     out.settings_changePasswordTitle = "Change your password";
     out.settings_changePasswordHint = "Change your account's password. Enter your current password, and confirm the new password by typing it twice.<br>" +