diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 9b4020fc4..3f04c2484 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -28,7 +28,7 @@
     "onLogout": "You are logged out, {0}click here{1} to log in<br>or press <em>Escape</em> to access your pad in read-only mode.",
     "padNotPinned": "This pad will expire after 3 months of inactivity, {0}login{1} or {2}register{3} to preserve it.",
     "padNotPinnedVariable": "This pad will expire after {4} days of inactivity, {0}login{1} or {2}register{3} to preserve it.",
-    "anonymousStoreDisabled": "The webmaster of this CryptPad instance has disabled the store for anonymous users. You have to log in to be able to use CryptDrive.",
+    "anonymousStoreDisabled": "The administrator of this CryptPad instance has disabled storage for guests. Log in to access your own CryptDrive.",
     "expiredError": "This pad has reached its expiration time and is no longer available.",
     "deletedError": "This document has been deleted and is no longer available.",
     "inactiveError": "This pad has been deleted due to inactivity. Press Esc to create a new pad.",
@@ -53,7 +53,7 @@
     "forgotten": "Moved to the trash",
     "errorState": "Critical error: {0}",
     "readonly": "Read only",
-    "anonymous": "Anonymous",
+    "anonymous": "Guest",
     "users": "Users",
     "viewer": "viewer",
     "viewers": "viewers",
@@ -339,7 +339,7 @@
     "login_invalUser": "Username required",
     "login_invalPass": "Password required",
     "login_unhandledError": "An unexpected error occurred :(",
-    "register_importRecent": "Import documents from your unregistered session",
+    "register_importRecent": "Import documents from your guest session",
     "register_acceptTerms": "I accept <a>the terms of service</a>",
     "register_passwordsDontMatch": "Passwords do not match!",
     "register_passwordTooShort": "Passwords must be at least {0} characters long.",
@@ -520,7 +520,7 @@
     "whatis_drive": "Organization with CryptDrive",
     "features": "Features",
     "features_title": "Features",
-    "features_anon": "Non-registered",
+    "features_anon": "Guest",
     "features_registered": "Registered",
     "features_premium": "Premium",
     "features_f_apps": "Access to all the applications",
@@ -532,7 +532,7 @@
     "features_f_cryptdrive0_note": "Ability to store visited pads in your browser to be able to open them later",
     "features_f_storage0": "Limited storage time",
     "features_f_storage0_note": "Documents are deleted after {0} days of inactivity",
-    "features_f_anon": "All anonymous user features",
+    "features_f_anon": "All guest user features",
     "features_f_anon_note": "With additional functionality",
     "features_f_cryptdrive1": "Complete CryptDrive functionality",
     "features_f_cryptdrive1_note": "Folders, shared folders, templates, tags",
@@ -884,7 +884,7 @@
     "oo_exportInProgress": "Export in progress",
     "oo_sheetMigration_loading": "Upgrading your spreadsheet to the latest version. Please wait approximately 1 minute.",
     "oo_sheetMigration_complete": "Updated version available, press OK to reload.",
-    "oo_sheetMigration_anonymousEditor": "Editing this spreadsheet is disabled for non-registered users until it is upgraded to the latest version by a registered user.",
+    "oo_sheetMigration_anonymousEditor": "Editing this spreadsheet is disabled for guests until it is upgraded to the latest version by a registered user.",
     "imprint": "Legal notice",
     "settings_cat_security": "Confidentiality",
     "settings_safeLinksTitle": "Safe Links",
@@ -1108,7 +1108,7 @@
     "home_support_title": "Support CryptPad",
     "home_support": "<p>The development team does not profit from user data in any way. This is part of a vision for online services that respect privacy. Unlike the big platforms that pretend to be \"free\" while making profits from personal information, we aim to build a sustainable model funded willingly by users.</p><p>You can support the project by making a one-time or recurring donation through our Open Collective. Our budget is transparent and updates are published regularly. There are also a number of <a>non-financial ways to contribute</a>.</p>",
     "register_notes_title": "Important notes",
-    "register_notes": "<ul class=\"cp-notes-list\"><li>Your password is the secret key that encrypts all of your documents. <span class=\"red\">If you lose it there is no way we can recover your data.</span></li><li>If you are using a shared computer, <span class=\"red\">remember to log out</span> when you are done. Only closing the browser window leaves your account exposed. </li><li>To keep the documents you created and/or stored without being logged in, tick \"Import documents from your anonymous session\". </li></ul>",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>Your password is the secret key that encrypts all of your documents. <span class=\"red\">If you lose it there is no way we can recover your data.</span></li><li>If you are using a shared computer, <span class=\"red\">remember to log out</span> when you are done. Only closing the browser window leaves your account exposed. </li><li>To keep the documents you created and/or stored without being logged in, tick \"Import documents from your guest session\". </li></ul>",
     "register_warning_note": "Due to the encrypted nature of CryptPad, the service administrators will not be able to recover data in case you forget your username and/or password. Please save them in a safe place.",
     "whatis_collaboration_info": "<p>CryptPad is built to enable collaboration. It synchronizes changes to documents in real time. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.</p>",
     "whatis_apps": "A full suite of applications",