From 9658fb2f8500c7bea70a56b6780e341c97b41eed Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 1 Jun 2017 18:24:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Capitalization=20fix=20=F0=9F=90=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/web/lang/lang.en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index d2127525d..062119280 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -491,7 +491,7 @@ $lang['admin']['message'] = 'Message'; $lang['admin']['refresh'] = 'Refresh'; $lang['admin']['logs'] = 'Logs'; $lang['admin']['forwarding_hosts'] = 'Forwarding Hosts'; -$lang['admin']['forwarding_hosts_hint'] = 'Incoming messages are unconditionally accepted from any hosts listed here. These hosts are then not checked against DNSBLs or subjected to greylisting. Spam received from them is never rejected, but optionally it can be filed into the Junk folder. The most common use for this is to specify mail servers on which you have set up a rule that forwards incoming emails to your Mailcow server.'; +$lang['admin']['forwarding_hosts_hint'] = 'Incoming messages are unconditionally accepted from any hosts listed here. These hosts are then not checked against DNSBLs or subjected to greylisting. Spam received from them is never rejected, but optionally it can be filed into the Junk folder. The most common use for this is to specify mail servers on which you have set up a rule that forwards incoming emails to your mailcow server.'; $lang['admin']['forwarding_hosts_add_hint'] = 'You can either specify IPv4/IPv6 addresses, networks in CIDR notation, host names (which will be resolved to IP addresses), or domain names (which will be resolved to IP addresses by querying SPF records or, in their absence, MX records).'; $lang['admin']['host'] = 'Host'; $lang['admin']['source'] = 'Source'; From 6c73cc6918e9878fe76d01521849a824f3fbd646 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 1 Jun 2017 18:36:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?More=20Capitalization=20Fix=20=E2=9C=8F?= =?UTF-8?q?=E2=9C=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/web/lang/lang.de.php | 2 +- data/web/lang/lang.es.php | 2 +- data/web/lang/lang.it.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php index 1aee2c5f3..4815d6b0f 100644 --- a/data/web/lang/lang.de.php +++ b/data/web/lang/lang.de.php @@ -479,7 +479,7 @@ $lang['admin']['refresh'] = 'Neu laden'; $lang['admin']['logs'] = 'Logs'; $lang['admin']['message'] = 'Nachricht'; $lang['admin']['forwarding_hosts'] = 'Weiterleitungs-Hosts'; -$lang['admin']['forwarding_hosts_hint'] = 'Eingehende Nachrichten werden von den hier gelisteten Hosts bedingungslos akzeptiert. Diese Hosts werden dann nicht mit DNSBLs abgeglichen oder Greylisting unterworfen. Von ihnen empfangener Spam wird nie abgelehnt, optional kann er aber in den Spam-Ordner einsortiert werden. Die übliche Verwendung für diese Funktion ist, um Mailserver anzugeben, auf denen eine Weiterleitung zu Ihrem Mailcow-Server eingerichtet wurde.'; +$lang['admin']['forwarding_hosts_hint'] = 'Eingehende Nachrichten werden von den hier gelisteten Hosts bedingungslos akzeptiert. Diese Hosts werden dann nicht mit DNSBLs abgeglichen oder Greylisting unterworfen. Von ihnen empfangener Spam wird nie abgelehnt, optional kann er aber in den Spam-Ordner einsortiert werden. Die übliche Verwendung für diese Funktion ist, um Mailserver anzugeben, auf denen eine Weiterleitung zu Ihrem mailcow-Server eingerichtet wurde.'; $lang['admin']['forwarding_hosts_add_hint'] = 'Sie können entweder IPv4/IPv6-Adressen, Netzwerke in CIDR-Notation, Hostnamen (die zu IP-Adressen aufgelöst werden), oder Domainnamen (die zu IP-Adressen aufgelöst werden, indem ihr SPF-Record abgefragt wird oder, in dessen Abwesenheit, ihre MX-Records) angeben.'; $lang['admin']['host'] = 'Host'; $lang['admin']['source'] = 'Quelle'; diff --git a/data/web/lang/lang.es.php b/data/web/lang/lang.es.php index 8a318efe3..ef0889981 100644 --- a/data/web/lang/lang.es.php +++ b/data/web/lang/lang.es.php @@ -156,7 +156,7 @@ $lang['start']['start_rc'] = 'Abrir Roundcube'; $lang['start']['start_sogo'] = 'Abrir SOGo'; $lang['start']['mailcow_apps_detail'] = 'Utiliza una aplicación de mailcow para acceder a tus correos, calendario, contactos y más.'; $lang['start']['mailcow_panel'] = 'Iniciar mailcow UI'; -$lang['start']['mailcow_panel_description'] = 'Mailcow UI está disponible para administradores y usuarios de buzón.'; +$lang['start']['mailcow_panel_description'] = 'mailcow UI está disponible para administradores y usuarios de buzón.'; $lang['start']['mailcow_panel_detail'] = 'Administradores del dominio crean, modifican o eliminan buzones y alias, cambia dominios y lee información más detallada sobre sus dominios asignados
Usuarios de buzón son capaces de crear alias de tiempo limitado (spam alias), cambiar su contraseña y la configuración del filtro de spam.'; $lang['start']['recommended_config'] = 'Configuración recomendada (sin ActiveSync)'; diff --git a/data/web/lang/lang.it.php b/data/web/lang/lang.it.php index 8a4f7255b..ebe236da2 100644 --- a/data/web/lang/lang.it.php +++ b/data/web/lang/lang.it.php @@ -400,7 +400,7 @@ $lang['tfa']['set_tfa'] = "Imposta il metodo di autenticazione a due fattori"; $lang['tfa']['yubi_otp'] = "Autenticazione Yubico OTP"; $lang['tfa']['key_id'] = "Identificatore per il tuo YubiKey"; $lang['tfa']['key_id_totp'] = "Identificatore per la tua chiave"; -$lang['tfa']['api_register'] = 'Mailcow usa le Api Yubico Cloud. Richiedi una Chiave API qui'; +$lang['tfa']['api_register'] = 'mailcow usa le Api Yubico Cloud. Richiedi una Chiave API qui'; $lang['tfa']['u2f'] = "Autenticazione U2F"; $lang['tfa']['hotp'] = "Autenticazione HOTP"; $lang['tfa']['totp'] = "Autenticazione TOTP"; @@ -483,7 +483,7 @@ $lang['admin']['no_record'] = 'Nessun risultato'; $lang['admin']['filter_table'] = 'Tabella filtro'; $lang['admin']['empty'] = 'Nessun risultato'; $lang['admin']['forwarding_hosts'] = 'Inoltro degli host'; -$lang['admin']['forwarding_hosts_hint'] = 'I messaggi in entrata sono accettati in maniera incondizionata da tutti gli host elencati qui. Questi host sono quindi non controllati contro DNSBL o sottoposti a greylisting. Spam ricevuti da loro non viene mai rifiutata e sempre archiviata nella cartella Junk. L\'utilizzo più comune per questo è quello di specificare i server di posta elettronica su cui è stata impostata una regola che inoltra le email in arrivo al server Mailcow.'; +$lang['admin']['forwarding_hosts_hint'] = 'I messaggi in entrata sono accettati in maniera incondizionata da tutti gli host elencati qui. Questi host sono quindi non controllati contro DNSBL o sottoposti a greylisting. Spam ricevuti da loro non viene mai rifiutata e sempre archiviata nella cartella Junk. L\'utilizzo più comune per questo è quello di specificare i server di posta elettronica su cui è stata impostata una regola che inoltra le email in arrivo al server mailcow.'; $lang['admin']['forwarding_hosts_add_hint'] = 'È possibile specificare indirizzi IPv4 / IPv6, reti nella notazione CIDR, nomi host (che verranno risolti in indirizzi IP) o nomi di dominio (che verranno risolti agli indirizzi IP richiamando i record SPF o, in assenza, i record MX) .'; $lang['edit']['host'] = 'Host'; $lang['edit']['source'] = 'Sorgente'; From 4c0a1d4fb18c4f616d175c1daca86f978572438a Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Tue, 6 Jun 2017 20:10:39 +0800 Subject: [PATCH 3/3] fixed typo --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d5fa7d276..f3ece3a0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -175,7 +175,7 @@ services: ports: - "${IMAP_PORT:-143}:143" - "${IMAPS_PORT:-993}:993" - - "${POP_PORT-110}:110" + - "${POP_PORT:-110}:110" - "${POPS_PORT:-995}:995" - "${SIEVE_PORT:-4190}:4190" dns: