diff --git a/.github/workflows/pr_to_nightly.yml b/.github/workflows/pr_to_nightly.yml index 54dbda343..57aac7816 100644 --- a/.github/workflows/pr_to_nightly.yml +++ b/.github/workflows/pr_to_nightly.yml @@ -12,7 +12,7 @@ jobs: with: fetch-depth: 0 - name: Run the Action - uses: devops-infra/action-pull-request@v0.5.3 + uses: devops-infra/action-pull-request@v0.5.5 with: github_token: ${{ secrets.PRTONIGHTLY_ACTION_PAT }} title: Automatic PR to nightly from ${{ github.event.repository.updated_at}} diff --git a/data/Dockerfiles/clamd/Dockerfile b/data/Dockerfiles/clamd/Dockerfile index 91716b84d..f381e0efd 100644 --- a/data/Dockerfiles/clamd/Dockerfile +++ b/data/Dockerfiles/clamd/Dockerfile @@ -1,4 +1,4 @@ -FROM clamav/clamav:1.0_base +FROM clamav/clamav:1.0.1-1_base LABEL maintainer "André Peters " diff --git a/data/Dockerfiles/netfilter/server.py b/data/Dockerfiles/netfilter/server.py index 1ccc150ee..0b0e2a41e 100644 --- a/data/Dockerfiles/netfilter/server.py +++ b/data/Dockerfiles/netfilter/server.py @@ -359,21 +359,28 @@ def snat4(snat_target): chain = iptc.Chain(table, 'POSTROUTING') table.autocommit = False new_rule = get_snat4_rule() - for position, rule in enumerate(chain.rules): - match = all(( - new_rule.get_src() == rule.get_src(), - new_rule.get_dst() == rule.get_dst(), - new_rule.target.parameters == rule.target.parameters, - new_rule.target.name == rule.target.name - )) - if position == 0: - if not match: - logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') - chain.insert_rule(new_rule) - else: - if match: - logInfo(f'Remove rule for source network {new_rule.src} to SNAT target {snat_target} from POSTROUTING chain at position {position}') - chain.delete_rule(rule) + + if not chain.rules: + # if there are no rules in the chain, insert the new rule directly + logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') + chain.insert_rule(new_rule) + else: + for position, rule in enumerate(chain.rules): + match = all(( + new_rule.get_src() == rule.get_src(), + new_rule.get_dst() == rule.get_dst(), + new_rule.target.parameters == rule.target.parameters, + new_rule.target.name == rule.target.name + )) + if position == 0: + if not match: + logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') + chain.insert_rule(new_rule) + else: + if match: + logInfo(f'Remove rule for source network {new_rule.src} to SNAT target {snat_target} from POSTROUTING chain at position {position}') + chain.delete_rule(rule) + table.commit() table.autocommit = True except: diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index 05081c6dd..c8713e047 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -12,7 +12,7 @@ ARG MEMCACHED_PECL_VERSION=3.2.0 # renovate: datasource=github-tags depName=phpredis/phpredis versioning=semver-coerced ARG REDIS_PECL_VERSION=5.3.7 # renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced -ARG COMPOSER_VERSION=2.5.1 +ARG COMPOSER_VERSION=2.5.4 RUN apk add -U --no-cache autoconf \ aspell-dev \ diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index 9fc9234e1..e286ab553 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -3,7 +3,7 @@ function init_db_schema() { try { global $pdo; - $db_version = "06012023_1924"; + $db_version = "14022023_1000"; $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); @@ -225,22 +225,22 @@ function init_db_schema() { ), "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" ), - "templates" => array( - "cols" => array( - "id" => "INT NOT NULL AUTO_INCREMENT", - "template" => "VARCHAR(255) NOT NULL", - "type" => "VARCHAR(255) NOT NULL", - "attributes" => "JSON", - "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)", - "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP" - ), - "keys" => array( - "primary" => array( - "" => array("id") - ) - ), - "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" - ), + "templates" => array( + "cols" => array( + "id" => "INT NOT NULL AUTO_INCREMENT", + "template" => "VARCHAR(255) NOT NULL", + "type" => "VARCHAR(255) NOT NULL", + "attributes" => "JSON", + "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)", + "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP" + ), + "keys" => array( + "primary" => array( + "" => array("id") + ) + ), + "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC" + ), "domain" => array( // Todo: Move some attributes to json "cols" => array( @@ -1076,7 +1076,7 @@ function init_db_schema() { } } - // Migrate tls_enforce_* options + // Migrate tls_enforce_* options if ($table == 'mailbox') { $stmt = $pdo->query("SHOW TABLES LIKE 'mailbox'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); @@ -1096,7 +1096,7 @@ function init_db_schema() { $stmt = $pdo->query("SHOW TABLES LIKE '" . $table . "'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); if ($num_results != 0) { - $stmt = $pdo->prepare("SELECT CONCAT('ALTER TABLE ', `table_schema`, '.', `table_name`, ' DROP FOREIGN KEY ', `constraint_name`, ';') AS `FKEY_DROP` FROM `information_schema`.`table_constraints` + $stmt = $pdo->prepare("SELECT CONCAT('ALTER TABLE `', `table_schema`, '`.', `table_name`, ' DROP FOREIGN KEY ', `constraint_name`, ';') AS `FKEY_DROP` FROM `information_schema`.`table_constraints` WHERE `constraint_type` = 'FOREIGN KEY' AND `table_name` = :table;"); $stmt->execute(array(':table' => $table)); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -1322,95 +1322,95 @@ function init_db_schema() { // Fix domain_admins $pdo->query("DELETE FROM `domain_admins` WHERE `domain` = 'ALL';"); - // add default templates - $default_domain_template = array( - "template" => "Default", - "type" => "domain", - "attributes" => array( - "tags" => array(), - "max_num_aliases_for_domain" => 400, - "max_num_mboxes_for_domain" => 10, - "def_quota_for_mbox" => 3072 * 1048576, - "max_quota_for_mbox" => 10240 * 1048576, - "max_quota_for_domain" => 10240 * 1048576, - "rl_frame" => "s", - "rl_value" => "", - "active" => 1, - "gal" => 1, - "backupmx" => 0, - "relay_all_recipients" => 0, - "relay_unknown_only" => 0, - "dkim_selector" => "dkim", - "key_size" => 2048, - "max_quota_for_domain" => 10240 * 1048576, - ) - ); - $default_mailbox_template = array( - "template" => "Default", - "type" => "mailbox", - "attributes" => array( - "tags" => array(), - "quota" => 0, - "quarantine_notification" => strval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['quarantine_notification']), - "quarantine_category" => strval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['quarantine_category']), - "rl_frame" => "s", - "rl_value" => "", - "force_pw_update" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['force_pw_update']), - "sogo_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['sogo_access']), - "active" => 1, - "tls_enforce_in" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['tls_enforce_in']), - "tls_enforce_out" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['tls_enforce_out']), - "imap_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['imap_access']), - "pop3_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['pop3_access']), - "smtp_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['smtp_access']), - "sieve_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['sieve_access']), - "acl_spam_alias" => 1, - "acl_tls_policy" => 1, - "acl_spam_score" => 1, - "acl_spam_policy" => 1, - "acl_delimiter_action" => 1, - "acl_syncjobs" => 0, - "acl_eas_reset" => 1, - "acl_sogo_profile_reset" => 0, - "acl_pushover" => 1, - "acl_quarantine" => 1, - "acl_quarantine_attachments" => 1, - "acl_quarantine_notification" => 1, - "acl_quarantine_category" => 1, - "acl_app_passwds" => 1, - ) - ); - $stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template"); - $stmt->execute(array( - ":type" => "domain", - ":template" => $default_domain_template["template"] - )); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - if (empty($row)){ - $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`) - VALUES (:type, :template, :attributes)"); - $stmt->execute(array( - ":type" => "domain", - ":template" => $default_domain_template["template"], - ":attributes" => json_encode($default_domain_template["attributes"]) - )); - } - $stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template"); - $stmt->execute(array( - ":type" => "mailbox", - ":template" => $default_mailbox_template["template"] - )); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - if (empty($row)){ - $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`) - VALUES (:type, :template, :attributes)"); - $stmt->execute(array( - ":type" => "mailbox", - ":template" => $default_mailbox_template["template"], - ":attributes" => json_encode($default_mailbox_template["attributes"]) - )); - } - + // add default templates + $default_domain_template = array( + "template" => "Default", + "type" => "domain", + "attributes" => array( + "tags" => array(), + "max_num_aliases_for_domain" => 400, + "max_num_mboxes_for_domain" => 10, + "def_quota_for_mbox" => 3072 * 1048576, + "max_quota_for_mbox" => 10240 * 1048576, + "max_quota_for_domain" => 10240 * 1048576, + "rl_frame" => "s", + "rl_value" => "", + "active" => 1, + "gal" => 1, + "backupmx" => 0, + "relay_all_recipients" => 0, + "relay_unknown_only" => 0, + "dkim_selector" => "dkim", + "key_size" => 2048, + "max_quota_for_domain" => 10240 * 1048576, + ) + ); + $default_mailbox_template = array( + "template" => "Default", + "type" => "mailbox", + "attributes" => array( + "tags" => array(), + "quota" => 0, + "quarantine_notification" => strval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['quarantine_notification']), + "quarantine_category" => strval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['quarantine_category']), + "rl_frame" => "s", + "rl_value" => "", + "force_pw_update" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['force_pw_update']), + "sogo_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['sogo_access']), + "active" => 1, + "tls_enforce_in" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['tls_enforce_in']), + "tls_enforce_out" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['tls_enforce_out']), + "imap_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['imap_access']), + "pop3_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['pop3_access']), + "smtp_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['smtp_access']), + "sieve_access" => intval($GLOBALS['MAILBOX_DEFAULT_ATTRIBUTES']['sieve_access']), + "acl_spam_alias" => 1, + "acl_tls_policy" => 1, + "acl_spam_score" => 1, + "acl_spam_policy" => 1, + "acl_delimiter_action" => 1, + "acl_syncjobs" => 0, + "acl_eas_reset" => 1, + "acl_sogo_profile_reset" => 0, + "acl_pushover" => 1, + "acl_quarantine" => 1, + "acl_quarantine_attachments" => 1, + "acl_quarantine_notification" => 1, + "acl_quarantine_category" => 1, + "acl_app_passwds" => 1, + ) + ); + $stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template"); + $stmt->execute(array( + ":type" => "domain", + ":template" => $default_domain_template["template"] + )); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + if (empty($row)){ + $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`) + VALUES (:type, :template, :attributes)"); + $stmt->execute(array( + ":type" => "domain", + ":template" => $default_domain_template["template"], + ":attributes" => json_encode($default_domain_template["attributes"]) + )); + } + $stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template"); + $stmt->execute(array( + ":type" => "mailbox", + ":template" => $default_mailbox_template["template"] + )); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + if (empty($row)){ + $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`) + VALUES (:type, :template, :attributes)"); + $stmt->execute(array( + ":type" => "mailbox", + ":template" => $default_mailbox_template["template"], + ":attributes" => json_encode($default_mailbox_template["attributes"]) + )); + } + if (php_sapi_name() == "cli") { echo "DB initialization completed" . PHP_EOL; } else { diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 2ef846883..f4039268f 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -926,9 +926,12 @@ jQuery(function($){ ' ' + lang.remove + '' + ''; } - item.in_use = '
' + + item.in_use = { + sortBy: item.percent_in_use, + value: '
' + '
' + item.percent_in_use + '%' + '
'; + 'style="min-width:2em;width:' + item.percent_in_use + '%">' + item.percent_in_use + '%' + '
' + }; item.username = escapeHtml(item.username); if (Array.isArray(item.tags)){ @@ -994,10 +997,11 @@ jQuery(function($){ }, { title: lang.in_use, - data: 'in_use', + data: 'in_use.value', defaultContent: '', responsivePriority: 9, - className: 'dt-data-w100' + className: 'dt-data-w100', + orderData: 24 }, { title: lang.fname, @@ -1102,7 +1106,12 @@ jQuery(function($){ { title: "", data: 'quota.sortBy', - responsivePriority: 8, + defaultContent: '', + className: "d-none" + }, + { + title: "", + data: 'in_use.sortBy', defaultContent: '', className: "d-none" }, diff --git a/data/web/lang/lang.cs-cz.json b/data/web/lang/lang.cs-cz.json index d1f2bb07e..5e119fbd6 100644 --- a/data/web/lang/lang.cs-cz.json +++ b/data/web/lang/lang.cs-cz.json @@ -650,7 +650,7 @@ }, "login": { "delayed": "Přihlášení zpožděno o %s sekund.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Přihlásit", "mobileconfig_info": "Ke stažení profilového souboru se přihlaste jako uživatel schránky.", "other_logins": "Přihlášení klíčem", diff --git a/data/web/lang/lang.da-dk.json b/data/web/lang/lang.da-dk.json index fa50ff598..180800801 100644 --- a/data/web/lang/lang.da-dk.json +++ b/data/web/lang/lang.da-dk.json @@ -586,7 +586,7 @@ }, "login": { "delayed": "Login blev forsinket med% s sekunder.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Login", "mobileconfig_info": "Log ind som postkassebruger for at downloade den anmodede Apple-forbindelsesprofil.", "other_logins": "Nøgle login", diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json index 3d1e2d597..8ff1cf062 100644 --- a/data/web/lang/lang.de-de.json +++ b/data/web/lang/lang.de-de.json @@ -710,7 +710,7 @@ }, "login": { "delayed": "Login wurde zur Sicherheit um %s Sekunde/n verzögert.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Anmelden", "mobileconfig_info": "Bitte als Mailbox-Benutzer einloggen, um das Verbindungsprofil herunterzuladen.", "other_logins": "Key Login", diff --git a/data/web/lang/lang.en-gb.json b/data/web/lang/lang.en-gb.json index 02db0b0df..bfac011ec 100644 --- a/data/web/lang/lang.en-gb.json +++ b/data/web/lang/lang.en-gb.json @@ -710,7 +710,7 @@ }, "login": { "delayed": "Login was delayed by %s seconds.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Login", "mobileconfig_info": "Please login as mailbox user to download the requested Apple connection profile.", "other_logins": "Key login", diff --git a/data/web/lang/lang.fr-fr.json b/data/web/lang/lang.fr-fr.json index 8afc57387..4db773e08 100644 --- a/data/web/lang/lang.fr-fr.json +++ b/data/web/lang/lang.fr-fr.json @@ -612,7 +612,7 @@ }, "login": { "delayed": "La connexion a été retardée de %s secondes.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Connexion", "mobileconfig_info": "Veuillez vous connecter en tant qu’utilisateur de la boîte pour télécharger le profil de connexion Apple demandé.", "other_logins": "Clé d'authentification", diff --git a/data/web/lang/lang.it-it.json b/data/web/lang/lang.it-it.json index 8bfa9738a..d8d6978c0 100644 --- a/data/web/lang/lang.it-it.json +++ b/data/web/lang/lang.it-it.json @@ -674,7 +674,7 @@ }, "login": { "delayed": "L'accesso è stato ritardato di %s secondi.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Login", "mobileconfig_info": "Please login as mailbox user to download the requested Apple connection profile.", "other_logins": "Key login", diff --git a/data/web/lang/lang.lv-lv.json b/data/web/lang/lang.lv-lv.json index b03848a42..962b90005 100644 --- a/data/web/lang/lang.lv-lv.json +++ b/data/web/lang/lang.lv-lv.json @@ -3,7 +3,8 @@ "bcc_maps": "BCC kartes", "filters": "Filtri", "recipient_maps": "Saņēmēja kartes", - "syncjobs": "Sinhronizācijas uzdevumi" + "syncjobs": "Sinhronizācijas uzdevumi", + "spam_score": "Mēstules novērtējums" }, "add": { "activate_filter_warn": "Visi pārējie filtri tiks deaktivizēti, kad aktīvs ir atzīmēts.", @@ -104,10 +105,10 @@ "host": "Hosts", "import": "Importēt", "import_private_key": "Importēt privātu atslēgu", - "in_use_by": "Tiek lietots ar", + "in_use_by": "Izmanto", "inactive": "Neaktīvs", "link": "Saite", - "loading": "Lūdzu uzgaidiet...", + "loading": "Lūgums uzgaidīt...", "logo_info": "Jūsu attēls augšējā navigācijas joslā tiks palielināts līdz 40 pikseļiem un maks. sākumlapas platums par 250 pikseļi. Ir ļoti ieteicama pielāgojama grafikaYour image will be scaled to a height of 40px for the top navigation bar and a max. width of 250px for the start page. Ir ļoti ieteicama pielāgojamā grafika", "main_name": "\"mailcow UI\" nosaukums", "merged_vars_hint": "Pelēkās rindas tika apvienotas vars.(local.)inc.php un nevar tikt modificētas.", @@ -144,7 +145,10 @@ "ui_texts": "UI etiķetes un teksti", "unchanged_if_empty": "Ja nav veiktas izmaiņas, atstājiet tukšu", "upload": "Augšupielādēt", - "username": "Lietotājvārds" + "username": "Lietotājvārds", + "generate": "izveidot", + "message": "Ziņojums", + "last_applied": "Pēdējoreiz pielietots" }, "danger": { "access_denied": "Piekļuve liegta, vai nepareizi dati", @@ -170,7 +174,7 @@ "is_alias": "%s jau ir zināms alias", "is_alias_or_mailbox": "%s jau ir zināms alias, pastkastes vai alias addrese izvērsta no alias domēna.", "is_spam_alias": "%s ir jau zināms spam alias", - "last_key": "Pēdējā atslēga nevar būt dzēsta", + "last_key": "Pēdējo atslēgu nevar izdzēst, tā vietā jāatspējo divpakāpju pārbaude.", "login_failed": "Ielogošanās neveiksmīga", "mailbox_invalid": "Pastkastes vārds ir nederīgs", "mailbox_quota_exceeded": "Kvota pārsniedz domēna limitu (max. %d MiB)", @@ -262,7 +266,8 @@ "title": "Labot priekšmetu", "unchanged_if_empty": "Ja neizmainīts atstājiet tukšu", "username": "Lietotājvārds", - "validate_save": "Apstiprināt un saglabāt" + "validate_save": "Apstiprināt un saglabāt", + "last_modified": "Pēdējoreiz mainīts" }, "footer": { "cancel": "Atcelt", @@ -314,21 +319,21 @@ "bcc_destinations": "BCC galamērķi/s", "bcc_info": "BCC kartes tiek izmantotas, lai klusu pārsūtītu visu ziņojumu kopijas uz citu adresi. Saņēmēja kartes tipa ieraksts tiek izmantots, kad vietējais galamērķis darbojas kā pasta adresāts. Sūtītāja kartes atbilst vienam un tam pašam principam.
\r\n   Vietējais galamērķis netiks informēts par piegādes neveiksmi. ", "bcc_local_dest": "Vietējais galamērķis", - "bcc_map_type": "BCC tips", + "bcc_map_type": "BCC veids", "bcc_maps": "BCC kartes", "bcc_rcpt_map": "saņēmēja karte", "bcc_sender_map": "Sūtītāja karte", "bcc_to_rcpt": "Pārslēdzieties uz adresāta kartes tipu", "bcc_to_sender": "Pārslēgties uz sūtītāja kartes tipu", "bcc_type": "BCC tips", - "deactivate": "Deaktivizēt", + "deactivate": "Deaktivēt", "description": "Apraksts", "dkim_key_length": "DKIM atslēgas garums (bits)", "domain": "Domēns", "domain_admins": "Domēna administratori", "domain_aliases": "Domēna aliases", "domain_quota": "Kvota", - "domain_quota_total": "Kopējā domēna kvota", + "domain_quota_total": "Kopējais domēna ierobežojums", "domains": "Domēns", "edit": "Labot", "empty": "Nav rezultātu", @@ -341,7 +346,7 @@ "inactive": "Neaktīvs", "kind": "Veids", "last_run": "Pēdējā norise", - "last_run_reset": "Nākamais grafiks", + "last_run_reset": "Ievietot sarakstā kā nākamo", "mailbox_quota": "Maks. pastkastes izmērs", "mailboxes": "Pastkaste", "max_aliases": "Maks. iespejamās aliases", @@ -374,7 +379,13 @@ "tls_enforce_out": "Piespiest TLS izejošajiem", "toggle_all": "Pārslēgt visu", "username": "Lietotājvārds", - "waiting": "Gaidīšana" + "waiting": "Gaidīšana", + "last_modified": "Pēdējoreiz mainīts", + "booking_0_short": "Vienmēŗ bezmaksas", + "daily": "Ik dienu", + "hourly": "Ik stundu", + "last_mail_login": "Pēdējā pieteikšanās pastkastē", + "mailbox": "Pastkaste" }, "quarantine": { "action": "Darbības", @@ -547,5 +558,14 @@ "waiting": "Waiting", "week": "Nedēļa", "weeks": "Nedēļas" + }, + "datatables": { + "paginate": { + "first": "Pirmā", + "last": "Pēdējā" + } + }, + "debug": { + "last_modified": "Pēdējoreiz mainīts" } } diff --git a/data/web/lang/lang.nl-nl.json b/data/web/lang/lang.nl-nl.json index 547c7bb72..774627cae 100644 --- a/data/web/lang/lang.nl-nl.json +++ b/data/web/lang/lang.nl-nl.json @@ -598,7 +598,7 @@ }, "login": { "delayed": "Aanmelding vertraagd met %s seconden.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Aanmelden", "mobileconfig_info": "Log in als mailboxgebruiker om het Apple-verbindingsprofiel te downloaden.", "other_logins": "Meld aan met key", diff --git a/data/web/lang/lang.ro-ro.json b/data/web/lang/lang.ro-ro.json index fe0d2064b..8e6e1d454 100644 --- a/data/web/lang/lang.ro-ro.json +++ b/data/web/lang/lang.ro-ro.json @@ -656,7 +656,7 @@ }, "login": { "delayed": "Conectarea a fost întârziată cu %s secunde.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Autentificare", "mobileconfig_info": "Autentificați-vă cu adresa de email pentru a descărca profilul de conexiune Apple.", "other_logins": "Autentificare cu cheie", diff --git a/data/web/lang/lang.ru-ru.json b/data/web/lang/lang.ru-ru.json index 60aba927c..65dd4bae1 100644 --- a/data/web/lang/lang.ru-ru.json +++ b/data/web/lang/lang.ru-ru.json @@ -37,7 +37,7 @@ "add_domain_only": "Только добавить домен", "add_domain_restart": "Добавить домен и перезапустить SOGo", "alias_address": "Псевдоним/ы", - "alias_address_info": "Укажите почтовые адреса разделенные запятыми или, если хотите пересылать все сообщения для домена владельцам псевдонима то: @example.com. Только домены mailcow разрешены.", + "alias_address_info": "Адрес(а) электронной почты (через запятую) или @example.com (для перехвата всех писем для домена). только домены mailcow.", "alias_domain": "Псевдоним домена", "alias_domain_info": "Действительные имена доменов, раздёленные запятыми.", "app_name": "Название приложения", @@ -335,7 +335,8 @@ "username": "Имя пользователя", "validate_license_now": "Получить лицензию на основе GUID с сервера лицензий", "verify": "Проверить", - "yes": "✓" + "yes": "✓", + "queue_unban": "разблокировать" }, "danger": { "access_denied": "Доступ запрещён, или указаны неверные данные", @@ -654,7 +655,7 @@ }, "login": { "delayed": "Вход был отложен на %s секунд.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Войти", "mobileconfig_info": "Пожалуйста, войдите в систему как пользователь почтового аккаунта для загрузки профиля подключения Apple.", "other_logins": "Вход с помощью ключа", diff --git a/data/web/lang/lang.sk-sk.json b/data/web/lang/lang.sk-sk.json index f2f236815..2b93650fc 100644 --- a/data/web/lang/lang.sk-sk.json +++ b/data/web/lang/lang.sk-sk.json @@ -657,7 +657,7 @@ }, "login": { "delayed": "Prihlásenie bolo oneskorené o %s sekúnd.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Prihlásenie", "mobileconfig_info": "Prosím, prihláste sa ako mailový používateľ pre stiahnutie požadovaného Apple profilu.", "other_logins": "Prihlásenie kľúčom", diff --git a/data/web/lang/lang.sv-se.json b/data/web/lang/lang.sv-se.json index 4cc84619a..31bc0ab33 100644 --- a/data/web/lang/lang.sv-se.json +++ b/data/web/lang/lang.sv-se.json @@ -618,7 +618,7 @@ }, "login": { "delayed": "Av säkerhetsskäl har inloggning inaktiverats i %s sekunder.", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Logga in", "mobileconfig_info": "Logga in som en användare av brevlåda för att ladda ner den begärda Apple-anslutningsprofilen.", "other_logins": "Loggain med nyckel", diff --git a/data/web/lang/lang.uk-ua.json b/data/web/lang/lang.uk-ua.json index e3acb8b59..0a5c71b87 100644 --- a/data/web/lang/lang.uk-ua.json +++ b/data/web/lang/lang.uk-ua.json @@ -656,7 +656,7 @@ "awaiting_tfa_confirmation": "В очікуванні підтвердження TFA" }, "login": { - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "Увійти", "other_logins": "Вхід за допомогою ключа", "password": "Пароль", diff --git a/data/web/lang/lang.zh-cn.json b/data/web/lang/lang.zh-cn.json index 5d05ef626..e57ea2a7f 100644 --- a/data/web/lang/lang.zh-cn.json +++ b/data/web/lang/lang.zh-cn.json @@ -661,7 +661,7 @@ }, "login": { "delayed": "请在 %s 秒后重新登录。", - "fido2_webauthn": "使用 FIDO2/WebAuthn 登录", + "fido2_webauthn": "使用 FIDO2/WebAuthn Login 登录", "login": "登录", "mobileconfig_info": "请使用邮箱用户登录以下载 Apple 连接描述文件。", "other_logins": "Key 登录", diff --git a/data/web/lang/lang.zh-tw.json b/data/web/lang/lang.zh-tw.json index f9c81c668..916188dbc 100644 --- a/data/web/lang/lang.zh-tw.json +++ b/data/web/lang/lang.zh-tw.json @@ -655,7 +655,7 @@ }, "login": { "delayed": "請在 %s 秒後重新登入。", - "fido2_webauthn": "FIDO2/WebAuthn", + "fido2_webauthn": "FIDO2/WebAuthn Login", "login": "登入", "mobileconfig_info": "請使用信箱使用者登入以下載 Apple 連接描述檔案。", "other_logins": "金鑰登入", diff --git a/data/web/templates/index.twig b/data/web/templates/index.twig index e90a720a1..45054b5f5 100644 --- a/data/web/templates/index.twig +++ b/data/web/templates/index.twig @@ -38,15 +38,8 @@
-
-
- - - -
-
+ + {% if not oauth2_request %}