git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/lang/lang.en.json b/mailcow/src/mailcow-dockerized/data/web/lang/lang.en.json
index d5494e5..aae79c7 100644
--- a/mailcow/src/mailcow-dockerized/data/web/lang/lang.en.json
+++ b/mailcow/src/mailcow-dockerized/data/web/lang/lang.en.json
@@ -28,11 +28,7 @@
"spam_score": "Spam score",
"syncjobs": "Sync jobs",
"tls_policy": "TLS policy",
- "unlimited_quota": "Unlimited quota for mailboxes",
- "xmpp_admin": "Promote XMPP user to administrator",
- "xmpp_domain_access": "Configure XMPP domain access",
- "xmpp_mailbox_access": "Configure XMPP user access",
- "xmpp_prefix": "Change XMPP subdomain (prefix)"
+ "unlimited_quota": "Unlimited quota for mailboxes"
},
"add": {
"activate_filter_warn": "All other filters will be deactivated, when active is checked.",
@@ -46,9 +42,10 @@
"alias_domain_info": "<small>Valid domain names only (comma-separated).</small>",
"app_name": "App name",
"app_password": "Add app password",
+ "app_passwd_protocols": "Allowed protocols for app password",
"automap": "Try to automap folders (\"Sent items\", \"Sent\" => \"Sent\" etc.)",
"backup_mx_options": "Relay options",
- "bcc_dest_format": "BCC destination must be a single valid email address.<br> If you need to send a copy to multiple addresses, create an Alias and use it here.",
+ "bcc_dest_format": "BCC destination must be a single valid email address.<br>If you need to send a copy to multiple addresses, create an alias and use it here.",
"comment_info": "A private comment is not visible to the user, while a public comment is shown as tooltip when hovering it in a user's overview",
"custom_params": "Custom parameters",
"custom_params_hint": "Right: --param=xy, wrong: --param xy",
@@ -109,13 +106,7 @@
"timeout2": "Timeout for connection to local host",
"username": "Username",
"validate": "Validate",
- "validation_success": "Validated successfully",
- "xmpp": "Activate XMPP for this domain",
- "xmpp_access": "XMPP access",
- "xmpp_access_info": "XMPP must be enabled for this domain.",
- "xmpp_admin": "XMPP administrator",
- "xmpp_admin_info": "<b>Danger:</b> Promotes a user to an XMPP administrator of this domain.",
- "xmpp_info": "This function will enable chat functionality for this domain."
+ "validation_success": "Validated successfully"
},
"admin": {
"access": "Access",
@@ -471,9 +462,6 @@
"username_invalid": "Username %s cannot be used",
"validity_missing": "Please assign a period of validity",
"value_missing": "Please provide all values",
- "xmpp_map_write_error": "Could not write XMPP map: %s",
- "xmpp_reload_failed": "XMPP could not be reloaded",
- "xmpp_restart_failed": "XMPP could not be restarted",
"yotp_verification_failed": "Yubico OTP verification failed: %s"
},
"debug": {
@@ -501,9 +489,7 @@
"success": "Success",
"system_containers": "System & Containers",
"uptime": "Uptime",
- "username": "Username",
- "xmpp_dead": "XMPP is starting, disabled or died.",
- "xmpp_status": "XMPP status"
+ "username": "Username"
},
"diagnostics": {
"cname_from_a": "Value derived from A/AAAA record. This is supported as long as the record points to the correct resource.",
@@ -527,9 +513,10 @@
"allowed_protocols": "Allowed protocols",
"app_name": "App name",
"app_passwd": "App password",
+ "app_passwd_protocols": "Allowed protocols for app password",
"automap": "Try to automap folders (\"Sent items\", \"Sent\" => \"Sent\" etc.)",
"backup_mx_options": "Relay options",
- "bcc_dest_format": "BCC destination must be a single valid email address.<br> If you need to send a copy to multiple addresses, create an Alias and use it here.",
+ "bcc_dest_format": "BCC destination must be a single valid email address.<br>If you need to send a copy to multiple addresses, create an alias and use it here.",
"client_id": "Client ID",
"client_secret": "Client secret",
"comment_info": "A private comment is not visible to the user, while a public comment is shown as tooltip when hovering it in a user's overview",
@@ -550,7 +537,7 @@
"extended_sender_acl": "External sender addresses",
"extended_sender_acl_info": "A DKIM domain key should be imported, if available.<br>\r\n Remember to add this server to the corresponding SPF TXT record.<br>\r\n Whenever a domain or alias domain is added to this server, that overlaps with an external address, the external address is removed.<br>\r\n Use @domain.tld to allow to send as *@domain.tld.",
"force_pw_update": "Force password update at next login",
- "force_pw_update_info": "This user will only be able to login to %s.",
+ "force_pw_update_info": "This user will only be able to login to %s. App passwords remain useable.",
"full_name": "Full name",
"gal": "Global Address List",
"gal_info": "The GAL contains all objects of a domain and cannot be edited by any user. Free/busy information in SOGo is missing, if disabled! <b>Restart SOGo to apply changes.</b>",
@@ -609,8 +596,8 @@
"sieve_desc": "Short description",
"sieve_type": "Filter type",
"skipcrossduplicates": "Skip duplicate messages across folders (first come, first serve)",
- "sogo_access": "Grant access to SOGo",
- "sogo_access_info": "Grant or permit access to SOGo. This setting does neither affect access to all other services nor does it delete or change a user's existing SOGo profile.",
+ "sogo_access": "Grant direct login access to SOGo",
+ "sogo_access_info": "Single-sign-on from within the mail UI remains working. This setting does neither affect access to all other services nor does it delete or change a user's existing SOGo profile.",
"sogo_visible": "Alias is visible in SOGo",
"sogo_visible_info": "This option only affects objects, that can be displayed in SOGo (shared or non-shared alias addresses pointing to at least one local mailbox). If hidden, an alias will not appear as selectable sender in SOGo.",
"spam_alias": "Create or change time limited alias addresses",
@@ -626,16 +613,7 @@
"title": "Edit object",
"unchanged_if_empty": "If unchanged leave blank",
"username": "Username",
- "validate_save": "Validate and save",
- "xmpp": "Activate XMPP for this domain",
- "xmpp_access": "XMPP access",
- "xmpp_access_info": "XMPP must be enabled for this domain.",
- "xmpp_admin": "XMPP administrator",
- "xmpp_admin_info": "<b>Danger:</b> Promotes a user to an XMPP administrator of this domain.",
- "xmpp_example_jid": "<b>Example JID</b> (login with mailbox password)",
- "xmpp_info": "This function will enable chat functionality for this domain.",
- "xmpp_prefix": "XMPP prefix for domain (\"im\" to use <b>im</b>.example.org)",
- "xmpp_prefix_info": "To request certificates for XMPP, two CNAME DNS records should point from <b>im</b>.example.org as well as <b>*.im</b>.example.org to <b>%s</b>. Please also run the DNS check for this domain after enabling XMPP."
+ "validate_save": "Validate and save"
},
"fido2": {
"confirm": "Confirm",
@@ -648,6 +626,7 @@
"register_status": "Registration status",
"rename": "Rename",
"set_fido2": "Register FIDO2 device",
+ "set_fido2_touchid": "Register Touch ID on Apple M1",
"set_fn": "Set friendly name",
"start_fido2_validation": "Start FIDO2 validation"
},
@@ -715,7 +694,7 @@
"all_domains": "All Domains",
"allow_from_smtp": "Only allow these IPs to use <b>SMTP</b>",
"allow_from_smtp_info": "Leave empty to allow all senders.<br>IPv4/IPv6 addresses and networks.",
- "allowed_protocols": "Allowed protocols",
+ "allowed_protocols": "Allowed protocols for direct user access (does not affect app password protocols)",
"backup_mx": "Relay domain",
"bcc": "BCC",
"bcc_destination": "BCC destination",
@@ -730,11 +709,11 @@
"bcc_to_rcpt": "Switch to recipient map type",
"bcc_to_sender": "Switch to sender map type",
"bcc_type": "BCC type",
- "booking_0": "Always show as free",
+ "booking_null": "Always show as free",
"booking_0_short": "Always free",
"booking_custom": "Hard-limit to a custom amount of bookings",
"booking_custom_short": "Hard limit",
- "booking_lt0": "Unlimited, but show as busy when booked",
+ "booking_ltnull": "Unlimited, but show as busy when booked",
"booking_lt0_short": "Soft limit",
"catch_all": "Catch-All",
"daily": "Daily",
@@ -819,6 +798,15 @@
"stats": "Statistics",
"status": "Status",
"sync_jobs": "Sync jobs",
+ "syncjob_check_log": "Check log",
+ "syncjob_last_run_result": "Last run result",
+ "syncjob_EX_OK": "Success",
+ "syncjob_EXIT_CONNECTION_FAILURE": "Connection problem",
+ "syncjob_EXIT_TLS_FAILURE": "Problem with encrypted connection",
+ "syncjob_EXIT_AUTHENTICATION_FAILURE": "Authentication problem",
+ "syncjob_EXIT_OVERQUOTA": "Target mailbox is over quota",
+ "syncjob_EXIT_CONNECTION_FAILURE_HOST1": "Can't connect to remote server",
+ "syncjob_EXIT_AUTHENTICATION_FAILURE_USER1": "Wrong username or password",
"table_size": "Table size",
"table_size_show_n": "Show %s items",
"target_address": "Goto address",
@@ -991,10 +979,7 @@
"verified_fido2_login": "Verified FIDO2 login",
"verified_totp_login": "Verified TOTP login",
"verified_u2f_login": "Verified U2F login",
- "verified_yotp_login": "Verified Yubico OTP login",
- "xmpp_maps_updated": "XMPP maps were updated",
- "xmpp_reloaded": "XMPP service was reloaded",
- "xmpp_restarted": "XMPP service was restarted"
+ "verified_yotp_login": "Verified Yubico OTP login"
},
"tfa": {
"api_register": "%s uses the Yubico Cloud API. Please get an API key for your key <a href=\"https://upgrade.yubico.com/getapikey/\" target=\"_blank\">here</a>",
@@ -1036,13 +1021,16 @@
"alias_valid_until": "Valid until",
"aliases_also_send_as": "Also allowed to send as user",
"aliases_send_as_all": "Do not check sender access for the following domain(s) and its alias domains",
- "app_hint": "App passwords are alternative passwords for your <b>IMAP and SMTP</b> login. The username remains unchanged.<br>SOGo (including ActiveSync) is not available through app passwords.",
+ "app_hint": "App passwords are alternative passwords for your IMAP, SMTP, CalDAV, CardDAV and EAS login. The username remains unchanged. SOGo webmail is not available through app passwords.",
+ "allowed_protocols": "Allowed protocols",
"app_name": "App name",
"app_passwds": "App passwords",
"apple_connection_profile": "Apple connection profile",
"apple_connection_profile_complete": "This connection profile includes IMAP and SMTP parameters as well as CalDAV (calendars) and CardDAV (contacts) paths for an Apple device.",
"apple_connection_profile_mailonly": "This connection profile includes IMAP and SMTP configuration parameters for an Apple device.",
+ "apple_connection_profile_with_app_password": "A new app password is generated and added to the profile so that no password needs to be entered when setting up your device. Please do not share the file as it grants full access to your mailbox.",
"change_password": "Change password",
+ "change_password_hint_app_passwords": "Your account has {{number_of_app_passwords}} app passwords that will not be changed. To manage these, go to the App passwords tab.",
"clear_recent_successful_connections": "Clear seen successful connections",
"client_configuration": "Show configuration guides for email clients and smartphones",
"create_app_passwd": "Create app password",
@@ -1053,6 +1041,7 @@
"delete_ays": "Please confirm the deletion process.",
"direct_aliases": "Direct alias addresses",
"direct_aliases_desc": "Direct alias addresses are affected by spam filter and TLS policy settings.",
+ "direct_protocol_access": "This mailbox user has <b>direct, external access</b> to the following protocols and applications. This setting is controlled by your administrator. App passwords can be created to grant access to individual protocols and applications.<br>The \"Login to webmail\" button provides single-sign-on to SOGo and is always available.",
"eas_reset": "Reset ActiveSync device cache",
"eas_reset_help": "In many cases a device cache reset will help to recover a broken ActiveSync profile.<br><b>Attention:</b> All elements will be redownloaded!",
"eas_reset_now": "Reset now",
@@ -1146,6 +1135,15 @@
"spamfilter_yellow": "Yellow: this message may be spam, will be tagged as spam and moved to your junk folder",
"status": "Status",
"sync_jobs": "Sync jobs",
+ "syncjob_check_log": "Check log",
+ "syncjob_last_run_result": "Last run result",
+ "syncjob_EX_OK": "Success",
+ "syncjob_EXIT_CONNECTION_FAILURE": "Connection problem",
+ "syncjob_EXIT_TLS_FAILURE": "Problem with encrypted connection",
+ "syncjob_EXIT_AUTHENTICATION_FAILURE": "Authentication problem",
+ "syncjob_EXIT_OVERQUOTA": "Target mailbox is over quota",
+ "syncjob_EXIT_CONNECTION_FAILURE_HOST1": "Can't connect to remote server",
+ "syncjob_EXIT_AUTHENTICATION_FAILURE_USER1": "Wrong username or password",
"tag_handling": "Set handling for tagged mail",
"tag_help_example": "Example for a tagged email address: me<b>+Facebook</b>@example.org",
"tag_help_explain": "In subfolder: a new subfolder named after the tag will be created below INBOX (\"INBOX/Facebook\").<br>\r\nIn subject: the tags name will be prepended to the mails subject, example: \"[Facebook] My News\".",
@@ -1165,6 +1163,7 @@
"week": "week",
"weekly": "Weekly",
"weeks": "weeks",
+ "with_app_password": "with app password",
"year": "year",
"years": "years"
},