From 22c67e0e9eace9b3a6beb13abd84851de827e1cb Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 12 Aug 2021 19:34:23 +0530 Subject: [PATCH 1/3] WIP unify usage of anonymous/non-registered/unregistered as 'guest' --- www/common/translations/messages.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index ce2f0ab57..e967f3e7c 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
or press Escape 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", @@ -79,7 +79,7 @@ "exportButton": "Export", "exportButtonTitle": "Export this pad to a local file", "exportPrompt": "What would you like to name your file?", - "changeNamePrompt": "Change your name (leave empty to be anonymous): ", + "changeNamePrompt": "Change your name (leave empty to be known as 'Guest'): ", "user_rename": "Change display name", "user_displayName": "Display name", "user_accountName": "Account name", @@ -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 the terms of service", "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": "

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.

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 non-financial ways to contribute.

", "register_notes_title": "Important notes", - "register_notes": "", + "register_notes": "", "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": "

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.

", "whatis_apps": "A full suite of applications", From 74ec0454b8780715a8aa2ba5d5397455ba51a950 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 18 Aug 2021 08:16:25 +0530 Subject: [PATCH 2/3] undo changes to a string that is set to be removed --- www/common/translations/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index e967f3e7c..92de2a243 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -79,7 +79,7 @@ "exportButton": "Export", "exportButtonTitle": "Export this pad to a local file", "exportPrompt": "What would you like to name your file?", - "changeNamePrompt": "Change your name (leave empty to be known as 'Guest'): ", + "changeNamePrompt": "Change your name (leave empty to be anonymous): ", "user_rename": "Change display name", "user_displayName": "Display name", "user_accountName": "Account name", From 00eda9dcac70e601fb3003197111e5ef31e81849 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 17 Aug 2021 14:21:58 +0200 Subject: [PATCH 3/3] Translated using Weblate (Russian) Currently translated at 49.0% (678 of 1382 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/ --- www/common/translations/messages.ru.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json index 56245dd92..975dd48f7 100644 --- a/www/common/translations/messages.ru.json +++ b/www/common/translations/messages.ru.json @@ -13,7 +13,8 @@ "todo": "Список дел", "contacts": "Адресная книга", "sheet": "Таблица", - "teams": "Команды" + "teams": "Команды", + "form": "Формы" }, "button_newpad": "Новая документ с форматированием", "button_newcode": "Новый документ с кодом", @@ -31,13 +32,13 @@ "inactiveError": "Этот документ был удалён из-за длительной неактивности. Нажмите Esc чтобы создать новый.", "chainpadError": "Во время обновления вашей информации произошла критическая ошибка. Документ пока доступен только для чтения чтобы вы не потеряли свою информацию.
Нажмите Esc чтобы продолжать чтение или перезагрузите страницу и начните заново.", "invalidHashError": "Запрошенный вами документ имеет неправильный адрес URL.", - "errorCopy": " Вы можете только скопировать содержимое в другое место, нажав Esc.
Если вы закроете страницу, всё содержимое будет утеряно!", + "errorCopy": "Вы все еще можете получить доступ к содержимому, нажав Esc.
Если вы закроете это окно, содержимое будет утеряно.", "errorRedirectToHome": "Нажмите Esc чтобы перейти к вашему хранилищу.", "newVersionError": "Доступна новая версия CryptPad.
Перезагрузите чтобы использовать новую версию или нажмите Esc, чтобы использовать вашу информацию в оффлайн-режиме.", "loading": "Загрузка...", "error": "Ошибка", "saved": "Сохранено", - "deleted": "Документ удалён из вашего CryptDrive", + "deleted": "Удалено", "deletedFromServer": "Документ удалён с сервера", "mustLogin": "Вам нужно войти, чтобы получить доступ к этой странице", "disabledApp": "Приложение было отключено. Свяжитесь с администратором этого CryptPad.", @@ -91,7 +92,7 @@ "userAccountButton": "Ваш профиль", "newButton": "Создать", "uploadButton": "Загрузить файлы", - "uploadButtonTitle": "Загрузить новый файл в эту папку", + "uploadButtonTitle": "Загрузить новый файл в ваш CryptDrive", "saveTemplateButton": "Сохранить как образец", "saveTemplatePrompt": "Выбрать название для образца", "templateSaved": "Образец сохранен!", @@ -120,7 +121,7 @@ "filePicker_description": "Выберите файл из вашего CryptDrive чтобы вставить его или выберите новый", "filePicker_filter": "Филтровать файлы по именам", "tags_title": "Теги (только для вас)", - "tags_add": "Обновить теги страницы", + "tags_add": "Обновить теги выбранных документов", "tags_notShared": "Ваши теги не разделяются с другими пользователями", "button_newsheet": "Новый Лист", "newButtonTitle": "создать новую запись",