Merge pull request #41 from DEAM0/patch-19

Update prosody.cfg.lua

README.md

@@ -22,7 +22,7 @@ rm /etc/resolv.conf && echo "nameserver 1.1.1.1" > /etc/resolv.conf
 Install git and clone this repository
 
 ```
-apt-get update && apt-get install git && git clone https://github.com/DanWin/mail-hosting && cd mail-hosting
+apt-get update && apt-get install git -y && git clone https://github.com/DanWin/mail-hosting && cd mail-hosting
 ```
 
 Install files and programs
@@ -32,7 +32,7 @@ Install files and programs
 
 Copy (and modify according to your needs) the site files in `etc` to `/etc` after installation has finished. Then restart some services:
 ```
-systemctl daemon-reload && systemctl restart bind9.service && systemctl restart tor@default.service
+systemctl daemon-reload && systemctl restart tor@default.service
 ```
 
 Replace the default .onion domain with your domain:
@@ -42,7 +42,7 @@ sed -i "s/danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion/`cat /v
 
 Replace the default clearnet domain with your domain:
 ```
-sed -i "s/danwin1210.de/YOUR_DOMAIN/g" /etc/prosody/prosody.cfg.lua /etc/postfix/main.cf /etc/dovecot/dovecot.conf /etc/nginx/sites-enabled/mail /etc/nginx/sites-enabled/openpgpkey /var/www/mail/common_config.php
+sed -i "s/danwin1210.de/YOUR_DOMAIN/g" /etc/prosody/prosody.cfg.lua /etc/postfix/main.cf /etc/dovecot/dovecot.conf /etc/nginx/sites-enabled/* /var/www/mail/common_config.php /var/www/mail/www/squirrelmail/config/config.php
 ```
 
 Create a mysql users and databases:
@@ -54,7 +54,7 @@ CREATE USER 'postfix'@'%' IDENTIFIED BY 'MY_PASSWORD';
 CREATE USER 'postfix_readonly'@'%' IDENTIFIED BY 'MY_PASSWORD';
 CREATE USER 'prosody'@'%' IDENTIFIED BY 'MY_PASSWORD';
 GRANT ALL PRIVILEGES ON postfix.* TO 'postfix'@'%';
-GRANT SELECT ON postifx.* TO 'postfix_readonly'@'%';
+GRANT SELECT ON postfix.* TO 'postfix_readonly'@'%';
 GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'%';
 FLUSH PRIVILEGES;
 quit
@@ -75,21 +75,94 @@ rspamadm dkim_keygen -d YOUR_DOMAIN -s $(date +"%Y%m%d")-rsa -b 4096 -t rsa -k /
 rspamadm dkim_keygen -d YOUR_DOMAIN -s $(date +"%Y%m%d")-ed25519 -t ed25519 -k /var/lib/rspamd/dkim/YOUR_DOMAIN-ed25519
 ```
 
+Create a password used for your TURN server and replace all `YOUR_SECRET` in `/etc/prosody/prosody.cfg.lua` with it.
+
 Install [acme.sh](https://github.com/acmesh-official/acme.sh) or [certbot](https://certbot.eff.org/) to obtain a free letsencrypt SSL certificate, then update the path to this new certificate in the following files:
 ```
 nano /etc/prosody/prosody.cfg.lua /etc/dovecot/dovecot.conf /etc/postfix/main.cf /etc/nginx/nginx.conf /etc/nginx/sites-enabled/mail /etc/nginx/sites-enabled/openpgpkey
 ```
 
+Add your other servers IP under `unrestricted access to these IPs` in `/etc/rc.local`
+
 Create database tables, activate firewall and enable cron:
 ```
+postmap /etc/postfix/header_checks
 cd /var/www/mail && php setup.php && chmod +x /etc/rc.local && /etc/rc.local && systemctl enable mail-cron.timer
 ```
 
-To send emails to the regular internet, it is necessary to have a static IP to retain a reputation with an IP+Domain mapping. If you try sending via Tor, your emails will most certainly get blocked by spam fitlers. For this reason we need to setup a proxy server which will hold no user data itself, but simply act as a gateway to reach the less anonymous part of the internet.
+Generate a wireguard keypair and add the public key generated here to the primary mail server wireguard config:
+```
+export PRIV=$(wg genkey)
+sed -i "s~YOUR_PRIVATE_KEY~$PRIV~g" /etc/wireguard/wg0.conf
+echo $PRIV | wg pubkey
+```
+
+Replace `YOUR_IP` with the IP of your other server, then enable and start wireguard:
+```
+nano /etc/wireguard/wg0.conf
+systemctl enable wg-quick@wg0 && systemctl start wg-quick@wg0
+```
+
+Final step is to reboot the server and check that everything is working.
 
 ### Proxy server:
 
-TODO
+To send emails to the regular internet, it is necessary to have a static IP to retain a reputation with an IP+Domain mapping. If you try sending via Tor, your emails will most certainly get blocked by spam filters. For this reason we need to setup a proxy server which will hold no user data itself, but simply act as a gateway to reach the less anonymous part of the internet.
+
+Uninstall packages that may interfere with this setup:
+```
+DEBIAN_FRONTEND=noninteractive apt-get purge -y apache2* dnsmasq* eatmydata exim4* imagemagick-6-common mysql-client* mysql-server* nginx* libnginx-mod* php7* resolvconf && systemctl disable systemd-resolved.service && systemctl stop systemd-resolved.service
+```
+
+If you have problems resolving hostnames after this step, temporarily switch to a public nameserver like 1.1.1.1 (from CloudFlare) or 8.8.8.8 (from Google)
+
+```
+rm /etc/resolv.conf && echo "nameserver 1.1.1.1" > /etc/resolv.conf
+```
+
+Install git and clone this repository
+```
+apt-get update && apt-get install git -y && git clone https://github.com/DanWin/mail-hosting && cd mail-hosting
+```
+
+Install files and programs
+```
+./install_binaries_proxy.sh
+```
+
+Copy (and modify according to your needs) the site files in `etc_clearnet_proxy` to `/etc` after installation has finished.
+
+Add the password for your TURN server you created for prosody in the main server and replace `YOUR_AUTH_SECRET` in `/etc/turnserver.conf` with it.
+
+Install [acme.sh](https://github.com/acmesh-official/acme.sh) or [certbot](https://certbot.eff.org/) to obtain a free letsencrypt SSL certificate, then update the path to this new certificate in the following files:
+```
+nano /etc/postfix/main.cf /etc/nginx/nginx.conf /etc/turnserver.conf
+```
+
+Replace `YOUR_PASSWORD` in `/etc/postfix/sql/mysql_tls_policy_out.cf` with the one you've generated previously on the other server.
+
+Generate a wireguard keypair and add the public key generated here to the primary mail server wireguard config:
+```
+export PRIV=$(wg genkey)
+sed -i "s~YOUR_PRIVATE_KEY~$PRIV~g" /etc/wireguard/wg0.conf
+echo $PRIV | wg pubkey
+```
+
+Replace `YOUR_IP` with the IP of your other server and `ens3` with your network interface name, then enable and start wireguard:
+```
+nano /etc/wireguard/wg0.conf
+systemctl enable wg-quick@wg0 && systemctl start wg-quick@wg0
+```
+
+Edit and create your admin user with the following script:
+```
+nano /var/www/mail/tools/create_admin.php
+php /var/www/mail/tools/create_admin.php
+```
+
+Copy the file `/etc/postfix/danwin1210-mail.crt` from your main server to the same location on the proxy server.
+
+Final step is to reboot the server and check that everything is working.
 
 ### General Domain settings
 
@@ -97,13 +170,57 @@ Add the following DNS records to your domain, with the IPs of your proxy server:
 ```
 @    IN    TXT    "v=spf1 ip4:your.ip.v4.address ip6:your:ip:v6:address -all"
 _dmarc    IN    TXT "v=DMARC1;p=quarantine;adkim=r;aspf=r;fo=1;rua=mailto:postmaster@yourdomain;ruf=mailto:postmaster@yourdomain;rf=afrf;ri=86400;pct=100"
+_adsp._domainkey	IN	TXT	"dkim=all;"
+_domainkey	IN	TXT "o=-;r=postmaster@yourdomain"
+*._report._dmarc	IN	TXT "v=DMARC1"
+_mta-sts    IN  TXT "v=STSv1; id=2024060601"
+_smtp._tls  IN  TXT "v=TLSRPTv1; rua=mailto:postmaster@yourdomain"
+_imaps._tcp	IN	SRV	0 0 993 yourdomain.
+_submission._tcp	IN	SRV	0 0 587 yourdomain.
 @	IN	MX	0 yourdomain.
+@	IN	A	your.ip.v4.address
+@	IN	AAAA	your:ip:v6:address
+www	IN	A	your.ip.v4.address
+www	IN	AAAA	your:ip:v6:address
+mta-sts	IN	A	your.ip.v4.address
+mta-sts	IN	AAAA	your:ip:v6:address
+conference	IN	A	your.ip.v4.address
+conference	IN	AAAA	your:ip:v6:address
+proxy	IN	A	your.ip.v4.address
+proxy	IN	AAAA	your:ip:v6:address
+upload	IN	A	your.ip.v4.address
+upload	IN	AAAA	your:ip:v6:address
+_xmpp-server._tcp.conference	IN	SRV	5 0 5269 yourdomain.
+_xmpp-server._tcp.conference	IN	SRV	0 0 5269 your_onion_domain.
+_xmpp-client._tcp	IN	SRV	5 0 5222 yourdomain.
+_xmpp-client._tcp	IN	SRV	0 0 5222 your_onion_domain.
+_xmpps-client._tcp	IN	SRV	5 0 5223 yourdomain.
+_xmpps-client._tcp	IN	SRV	0 0 5223 your_onion_domain.
+_xmpp-server._tcp	IN	SRV	5 0 5269 yourdomain.
+_xmpp-server._tcp	IN	SRV	0 0 5269 your_onion_domain.
+_stun._udp	IN	SRV	0 0 3478 yourdomain.
+_turn._udp	IN	SRV	0 0 3478 yourdomain.
+_stun._tcp	IN	SRV	0 0 3478 yourdomain.
+_stuns._tcp	IN	SRV	0 0 3479 yourdomain.
+_turn._tcp	IN	SRV	0 0 3478 yourdomain.
+_turns._tcp	IN	SRV	0 0 5349 yourdomain.
+_xmppconnect	IN	TXT	"_xmpp-client-xbosh=https://yourdomain:5281/http-bind"
+_xmppconnect	IN	TXT	"_xmpp-client-websocket=wss://yourdomain:5281/xmpp-websocket"
 ```
 
-Set the PTR record of your servers IPs to your domain. This can usually be done from your hosting panels configuration, but may not be available with every hosting provider, where you can then request them to do it via a support ticket.
+Set the PTR record of your proxy servers IPs to your domain. This can usually be done from your hosting panels configuration, but may not be available with every hosting provider, where you can then request them to do it via a support ticket.
 
 Consider registering your domain with [DNSWL](https://www.dnswl.org/), [SNDS](https://sendersupport.olc.protection.outlook.com/snds/), [Google Postmaster Tools](https://postmaster.google.com/) and [YahooCFL](https://senders.yahooinc.com/complaint-feedback-loop/) for valuable insights into your delivery.
 
+Consider enabling DNSSEC on your domain, when available by your Domain registrar. Some registrars may charge extra for it. Once enabled, you can also enable DANE, which increases security. Use [TLSA Record Genearator](https://ssl-tools.net/tlsa-generator) to help you create an appropriate DNS record.
+
+Consider adding your domain to [HSTS Preload List](https://hstspreload.org/) which will prevent browsers from even trying to access your domain on the insecure http:// protocol and automatically upgreade to https://
+
+### Final configuration steps
+
+Follow [SnappyMail installation instructions](https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#now-access-the-admin-page) to finish setting it up at yourdomain/mail/snappymail/?admin
+
+
 
 Translating:
 ------------

common_config.php

@@ -27,6 +27,7 @@ const DBUSER_PROSODY = 'prosody'; // Database user
 const DBPASS_PROSODY = 'YOUR_PASSWORD'; // Database password
 const DBNAME_PROSODY = 'prosody'; // Database
 const REGISTRATION_ENABLED = true; // Whether registration is enabled
+const DEFAULT_QUOTA = 50 * 1024 * 1024; // Default mailbox quota in bytes
 
 const LANGUAGES = [
 	'cs' => ['name' => 'čeština', 'locale' => 'cs_CZ', 'flag' => '🇨🇿', 'show_in_menu' => true, 'dir' => 'ltr'],
@@ -351,3 +352,13 @@ function alt_links(): void
 		echo '<meta property="og:locale:alternate" content="'.$data['locale'].'">';
 	}
 }
+
+function bytes_to_human_readable(int $bytes) : string {
+	$suffix = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+	$size_class=(int) log($bytes, 1024);
+	if($size_class!==0){
+		return sprintf('%1.1f', $bytes / pow(1024, $size_class)) . $suffix[$size_class];
+	}else{
+		return $bytes . $suffix[0];
+	}
+}

cron.php

@@ -37,8 +37,8 @@ while ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
 			exec( 'rm -r ' . escapeshellarg( $snapmail_files ) );
 		}
 		$files = glob( '/var/local/squirrelmail/data/' . $local_basename . '@' . $domain_basename . '.{pref,abook,sig}', GLOB_BRACE );
-		if ( $tmp[ 'domain' ] === 'danwin1210.de' ) {
+		if ( $tmp[ 'domain' ] === CLEARNET_SERVER ) {
-			$files = array_merge( $files, glob( '/var/local/squirrelmail/data/' . $local_basename . '{@danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion,}.{pref,abook,sig}', GLOB_BRACE ) );
+			$files = array_merge( $files, glob( '/var/local/squirrelmail/data/' . $local_basename . '{@'.ONION_SERVER.',}.{pref,abook,sig}', GLOB_BRACE ) );
 			$delete_prosody->execute( [ $tmp[ 'local_part' ], $tmp[ 'domain' ] ] );
 			$delete_prosody_archive->execute( [ $tmp[ 'local_part' ], $tmp[ 'domain' ] ] );
 		}

etc/dovecot/dovecot.conf

@@ -14,9 +14,11 @@ mail_debug = no
 verbose_ssl = no
 mail_location = maildir:/var/mail/vmail/%d/%n
 mail_home = /var/mail/vmail/%d/%n
-mail_plugins = $mail_plugins mail_crypt quota zlib
+mail_plugins = mail_crypt quota zlib
 mailbox_list_index = yes
 mail_always_cache_fields = date.save
+imap_hibernate_timeout = 5s
+mail_attribute_dict = file:%h/dovecot-attributes
 
 #plugin setup
 plugin {
@@ -34,6 +36,9 @@ plugin {
   quota_vsizes = yes
   last_login_dict = proxy::lastlogin
   last_login_key = last-login/%u
+  sieve = file:~/sieve;active=~/.dovecot.sieve
+  sieve_plugins = sieve_imapsieve
+  imapsieve_url = sieve://danwin1210.de
 }
 
 #auth settings
@@ -47,8 +52,8 @@ auth_mechanisms = plain login
 
 #TLS parameters
 ssl = required
-ssl_cert = </etc/acme.sh/danwin1210.de_ecc/fullchain.cer
+ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem
-ssl_key = </etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key
+ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key
 ssl_client_ca_dir = /etc/ssl/certs
 ssl_dh = </etc/dovecot/dh.pem
 ssl_min_protocol = TLSv1.2
@@ -57,14 +62,17 @@ ssl_curve_list = X448:X25519:secp521r1:secp384r1
 ssl_prefer_server_ciphers = yes
 
 #protocol setup
-protocols = "imap pop3 lmtp"
+protocols = "imap pop3 lmtp sieve"
 protocol imap {
-  mail_plugins = $mail_plugins imap_quota imap_zlib last_login
+  mail_plugins = $mail_plugins imap_quota imap_zlib imap_sieve last_login
+  imap_metadata = yes
 }
-protocol pop3 {
+protocol lmtp {
-  mail_plugins = $mail_plugins last_login
+  mail_plugins = mail_crypt quota zlib sieve last_login
+}
+protocol sieve {
+  mail_plugins =
 }
-
 #service setup
 service anvil {
   unix_listener anvil-auth-penalty {
@@ -102,6 +110,9 @@ service auth-worker {
 service imap {
   service_count = 1000
   client_limit = 1
+  unix_listener imap-master {
+    user = $default_internal_user
+  }
 }
 service imap-login {
   inet_listener imap {
@@ -109,7 +120,7 @@ service imap-login {
   }
   service_count = 1000
   vsz_limit = 1G
-  process_min_avail = 4
+  process_min_avail = 1
 }
 service lmtp {
   unix_listener /var/spool/postfix/private/dovecot-lmtp {
@@ -161,17 +172,20 @@ dict {
 namespace inbox {
   inbox = yes
   mailbox Drafts {
+    auto = subscribe
     special_use = \Drafts
   }
   mailbox Junk {
     special_use = \Junk
   }
   mailbox Trash {
+    auto = subscribe
     special_use = \Trash
     autoexpunge = 30d
   }
 
   mailbox Sent {
+    auto = subscribe
     special_use = \Sent
   }
   mailbox "Sent Messages" {

etc/nginx/fastcgi.conf

@@ -0,0 +1,29 @@
+
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+fastcgi_param  HTTP_HOST          $host;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  REMOTE_USER        $remote_user;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $php_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;
+fastcgi_hide_header "X-Powered-By";

etc/nginx/nginx.conf

@@ -4,6 +4,7 @@ pid /run/nginx.pid;
 pcre_jit on;
 worker_rlimit_nofile 30000;
 worker_shutdown_timeout 1m;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 7680;
@@ -51,8 +52,8 @@ http {
 	ssl_early_data off;
 	ssl_stapling on;
 	ssl_stapling_verify on;
-	ssl_certificate /etc/acme.sh/danwin1210.de_ecc/fullchain.cer;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 	ssl_dhparam /etc/nginx/dh4096.pem;
 
 	##
@@ -80,7 +81,6 @@ http {
 	proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection $connection_upgrade;
 	proxy_ignore_client_abort on;
-	proxy_read_timeout 3600; #wait up to 60 minutes for e.g. database import
 
 	##
 	# Gzip Settings
@@ -114,6 +114,12 @@ http {
 	}
 	expires $expires;
 
+	map $server_port $php_port {
+		80  80;
+		443  443;
+		default 80;
+	}
+
 	include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites-enabled/*;
 }

etc/nginx/sites-enabled/mail

@@ -45,14 +45,13 @@ server {
 	add_header Referrer-Policy no-referrer always;
 	add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), geolocation=(), fullscreen=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=(), clipboard-read=(), clipboard-write=(), gamepad=(), speaker-selection=(), conversion-measurement=(), focus-without-user-activation=(), hid=(), idle-detection=(), sync-script=(), vertical-scroll=(), serial=(), trust-token-redemption=(), interest-cohort=(), otp-credentials=()" always;
 	add_header Onion-Location http://danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion$request_uri always;
-	add_header Expect-CT "max-age=86400, enforce" always;
 	add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 	add_header Cross-Origin-Embedder-Policy require-corp always;
 	add_header Cross-Origin-Opener-Policy same-origin always;
 	add_header Cross-Origin-Resource-Policy same-origin always;
-        listen [::]:443 ssl proxy_protocol http2;
+	listen [::]:443 ssl http2 fastopen=100 backlog=2048 ipv6only=off default_server;
-	ssl_certificate /etc/acme.sh/danwin1210.de_ecc/fullchain.cer;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 	root /var/www/html;
 	index index.php;
 	server_name danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion danwin1210.de;
@@ -70,7 +69,6 @@ server {
 		add_header Referrer-Policy no-referrer always;
 		add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), geolocation=(), fullscreen=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=(), clipboard-read=(), clipboard-write=(), gamepad=(), speaker-selection=(), conversion-measurement=(), focus-without-user-activation=(), hid=(), idle-detection=(), sync-script=(), vertical-scroll=(), serial=(), trust-token-redemption=(), interest-cohort=(), otp-credentials=()" always;
 		add_header Onion-Location http://danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion$request_uri always;
-		add_header Expect-CT "max-age=86400, enforce" always;
 		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 		add_header Cross-Origin-Embedder-Policy require-corp always;
 		add_header Cross-Origin-Opener-Policy same-origin always;
@@ -82,7 +80,6 @@ server {
 	location ~ \.php$ {
 		add_header Referrer-Policy no-referrer always;
 		add_header Onion-Location http://danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion$request_uri always;
-		add_header Expect-CT "max-age=86400, enforce" always;
 		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 		include snippets/fastcgi-php.conf;
 		fastcgi_pass unix:/run/php/php8.2-fpm.sock;

etc/nginx/sites-enabled/mta-sts

@@ -0,0 +1,18 @@
+server {
+	listen [::]:443 ssl http2;
+	server_name mta-sts.danwin1210.de;
+	add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+	location / {
+		return 404;
+	}
+	location = /.well-known/mta-sts.txt {
+		default_type text/plain;
+		return 200 "version: STSv1
+mode: enforce
+mx: danwin1210.de
+max_age: 86400
+";
+	}
+}

etc/nginx/sites-enabled/openpgpkey

@@ -1,6 +1,5 @@
 server {
-	listen [::]:443 ssl proxy_protocol http2;
+	listen [::]:443 ssl http2;
-	add_header Expect-CT "max-age=86400, enforce" always;
 	add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 	root /var/www/html;
 	location / {
@@ -16,6 +15,6 @@ server {
 		fastcgi_pass unix:/run/php/php8.2-fpm.sock;
 		expires off;
 	}
-	ssl_certificate /etc/acme.sh/danwin1210.de_ecc/fullchain.cer;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 }

etc/postfix/header_checks

@@ -1,2 +1,2 @@
-/^To:.*@[^@]*\.de-mail\.de/ REJECT "Sorry, you tried contacting a De-Mail Address. This is a special System by the German government, not compatible with E-Mail. More info here: https://www.cio.bund.de/Web/DE/Innovative-Vorhaben/De-Mail/de_mail_node.html"
+/^To:.*@[^@]*\.de-mail\.de/ REJECT "Sorry, you tried contacting a De-Mail Address. This is a special System by the German government, not compatible with E-Mail. More info here: https://de-mail.info/"
 /^(To|From).*@example\.com/    REJECT

etc/postfix/helo_checks

@@ -1 +0,0 @@
-DESKTOPRaihan REJECT

etc/postfix/main.cf

@@ -24,8 +24,8 @@ compatibility_level = 3.6
 smtputf8_autodetect_classes = all
 
 # TLS parameters
-smtpd_tls_cert_file = /etc/acme.sh/danwin1210.de_ecc/fullchain.cer
+smtpd_tls_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
-smtpd_tls_key_file = /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key
+smtpd_tls_key_file = /etc/ssl/private/ssl-cert-snakeoil.key
 smtpd_tls_ciphers = HIGH
 smtpd_tls_mandatory_ciphers = HIGH
 smtp_tls_ciphers = HIGH
@@ -68,7 +68,6 @@ smtpd_recipient_restrictions = check_policy_service inet:127.0.0.1:12340, permit
 smtpd_sender_restrictions = reject_sender_login_mismatch, check_sender_access inline:{{<> = REJECT}}, permit_sasl_authenticated
 smtpd_relay_restrictions = permit_sasl_authenticated, permit_auth_destination, reject_unauth_destination
 smtpd_sender_login_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_auth_maps.cf
-smtpd_helo_restrictions = check_helo_access hash:/etc/postfix/helo_checks
 
 # anti-spam settings
 smtpd_milters = inet:127.0.0.1:11332
@@ -76,7 +75,6 @@ non_smtpd_milters = inet:127.0.0.1:11332
 milter_default_action = tempfail
 milter_protocol = 6
 header_checks = regexp:/etc/postfix/header_checks
-body_checks = regexp:/etc/postfix/body_checks
 disable_vrfy_command = yes
 smtpd_discard_ehlo_keywords = silent-discard, dsn
 smtpd_delay_reject = yes

etc/prosody/prosody.cfg.lua

@@ -124,8 +124,8 @@ pidfile = "/run/prosody/prosody.pid";
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 ssl = {
-	key = "/etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key";
+	key = "/etc/ssl/private/ssl-cert-snakeoil.key";
-	certificate = "/etc/acme.sh/danwin1210.de_ecc/fullchain.cer";
+	certificate = "/etc/ssl/certs/ssl-cert-snakeoil.pem";
 	dhparam = "/etc/prosody/dh4096.pem";
 	curve = "X448:X25519:secp521r1:secp384r1:secp256k1";
 	ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!RSA:!PSK:!SRP:!3DES:!aNULL:!SHA:!MD5:!CAMELLIA:!ECDHE-RSA-AES256-SHA384:!ECDHE-RSA-AES128-SHA256:!DHE-RSA-AES128-SHA256:!DHE-RSA-AES256-SHA256";
@@ -238,7 +238,7 @@ aliases = {
 	["danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion"] = "danwin1210.de";
 }
 alias_response = "User $alias can be contacted at $target";
-defautl_storage = "sql"
+default_storage = "sql"
 interfaces = { "0.0.0.0", "::" } -- Listen address
 contact_info = {
   abuse = { "https://danwin1210.de/contact.php", "mailto:daniel@danwin1210.de" };
@@ -247,7 +247,7 @@ contact_info = {
   security = { "https://danwin1210.de/contact.php", "mailto:daniel@danwin1210.de" };
   support = { "https://danwin1210.de/contact.php", "mailto:daniel@danwin1210.de" };
 }
-data_path = "/srv/var/lib/prosody"
+data_path = "/var/lib/prosody"
 legacy_ssl_ports = {5223}
 external_services = {
     {

etc/rc.local

@@ -36,7 +36,7 @@ ip6tables -A OUTPUT -o lo -j ACCEPT
 iptables -A INPUT -i lo -j ACCEPT
 ip6tables -A INPUT -i lo -j ACCEPT
 #unrestricted access to these IPs
-for clearnet in 127.0.0.0/8; do(
+for clearnet in 127.0.0.0/8 10.9.0.0/24; do(
 iptables -t nat -A OUTPUT -d $clearnet -j RETURN
 iptables -A OUTPUT -d $clearnet -j ACCEPT
 ) done

etc/resolv.conf

@@ -0,0 +1,2 @@
+nameserver 127.0.0.1
+options edns0 trust-ad

etc_clearnet_proxy/nginx/nginx.conf

@@ -4,6 +4,7 @@ pid /run/nginx.pid;
 pcre_jit on;
 worker_rlimit_nofile 30000;
 worker_shutdown_timeout 1m;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 20000;
@@ -50,8 +51,8 @@ http {
 	ssl_early_data off;
 	ssl_stapling on;
 	ssl_stapling_verify on;
-	ssl_certificate /etc/acme.sh/danwin1210.de_ecc/fullchain.cer;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 	ssl_dhparam /etc/nginx/dh4096.pem;
 
 	##
@@ -65,18 +66,10 @@ http {
 	resolver 127.0.0.1 [::1];
 	resolver_timeout 2s;
 	root /var/www/html;
-	proxy_cache_path /var/lib/nginx/cache levels=2 keys_zone=cache:10m inactive=30d max_size=1g;
-	proxy_cache_revalidate on;
-	proxy_cache_use_stale http_503 timeout updating error;
-	proxy_no_cache $http_pragma $http_authorization;
-	proxy_cache_bypass $cookie_nocache $arg_nocache;
 	map $http_upgrade $connection_upgrade {
 		default upgrade;
 		'' '';
 	}
-	proxy_cache_lock_timeout 2m;
-	proxy_cache_lock_age 2m;
-	proxy_cache cache;
 	proxy_http_version 1.1;
 	proxy_buffer_size 8k;
 	proxy_buffering on;
@@ -87,8 +80,6 @@ http {
 	proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection $connection_upgrade;
 	proxy_ignore_client_abort on;
-	proxy_cache_key $server_name$request_method$host$request_uri;
-	proxy_read_timeout 3600; #wait up to 60 minutes for e.g. database import
 
 	##
 	# Gzip Settings
@@ -119,22 +110,17 @@ stream {
 	ssl_ecdh_curve X448:X25519:secp521r1:secp384r1:secp256k1;
 	ssl_ciphers HIGH:!PSK:!RSA:!aNULL:!MD5:!SHA:!CAMELLIA:!AES+SHA256:!AES+SHA384;
 	ssl_session_cache shared:SSLSTREAM:10m;
-	ssl_certificate /etc/acme.sh/danwin1210.de_ecc/fullchain.cer;
+	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key;
+	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 	ssl_dhparam /etc/nginx/dh4096.pem;
 	#smtp
 	server {
 		listen [::]:25 fastopen=100 ipv6only=off;
 		proxy_pass smtp_backend_servers;
-		deny 51.254.78.246;
 	}
 	server {
 		listen [::]:587 fastopen=100 ipv6only=off;
 		proxy_pass smtp_auth_backend_servers;
-		deny 49.70.67.204;
-		deny 87.246.7.212;
-		deny 37.49.225.155;
-		deny 103.151.123.103;
 	}
 	server {
 		listen [::]:465 fastopen=100 ipv6only=off;
@@ -166,93 +152,59 @@ stream {
 	#xmpp
 	server {
 		listen [::]:5269 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5269;
+		proxy_pass 10.9.0.2:5269;
 	}
 	server {
 		listen [::]:5000 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5000;
+		proxy_pass 10.9.0.2:5000;
 	}
 	server {
 		listen [::]:5222 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5222;
+		proxy_pass 10.9.0.2:5222;
 	}
 	server {
 		listen [::]:5223 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5223;
+		proxy_pass 10.9.0.2:5223;
 	}
 	server {
 		listen [::]:5280 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5280;
+		proxy_pass 10.9.0.2:5280;
 	}
 	server {
 		listen [::]:5281 fastopen=100 ipv6only=off;
-		proxy_pass 10.9.0.3:5281;
+		proxy_pass 10.9.0.2:5281;
 	}
 	#https
 	server {
 		listen [::]:443 fastopen=100 ipv6only=off;
-#		limit_conn addr 2;
-#		proxy_upload_rate 4k;
-		proxy_protocol on;
 		proxy_pass https_backend_servers;
 	}
 	#upstream servers
 	upstream https_backend_servers {
 		server 10.9.0.2:443;
-		server 10.9.0.3:443;
-		server 10.9.0.4:443;
-		server 10.9.0.5:443;
 	}
 	upstream imaps_backend_servers {
 		server 10.9.0.2:993;
-		server 10.9.0.3:993;
-		server 10.9.0.4:993;
-		server 10.9.0.5:993;
 	}
 	upstream imap_backend_servers {
 		server 10.9.0.2:143;
-		server 10.9.0.3:143;
-		server 10.9.0.4:143;
-		server 10.9.0.5:143;
 	}
 	upstream pop3s_backend_servers {
 		server 10.9.0.2:995;
-		server 10.9.0.3:995;
-		server 10.9.0.4:995;
-		server 10.9.0.5:995;
 	}
 	upstream pop3_backend_servers {
 		server 10.9.0.2:110;
-		server 10.9.0.3:110;
-		server 10.9.0.4:110;
-		server 10.9.0.5:110;
-	}
-	upstream dns_backend_server {
-		server [::1]:53;
-		server 127.0.0.1:53;
 	}
 	upstream smtp_backend_servers {
 		server 10.9.0.2:25;
-		server 10.9.0.3:25;
-		server 10.9.0.4:25;
-		server 10.9.0.5:25;
 	}
 	upstream smtp_auth_backend_servers {
 		server 10.9.0.2:587;
-		server 10.9.0.3:587;
-		server 10.9.0.4:587;
-		server 10.9.0.5:587;
 	}
 	upstream smtps_backend_servers {
 		server 10.9.0.2:465;
-		server 10.9.0.3:465;
-		server 10.9.0.4:465;
-		server 10.9.0.5:465;
 	}
 	upstream mysql_backend_servers {
 		server 10.9.0.2:3306;
-		server 10.9.0.3:3306;
-		server 10.9.0.4:3306;
-		server 10.9.0.5:3306;
 	}
 }

etc_clearnet_proxy/postfix/main.cf

@@ -15,8 +15,8 @@ readme_directory = no
 compatibility_level=3.6
 
 # TLS parameters
-smtpd_tls_cert_file=/etc/acme.sh/danwin1210.de_ecc/fullchain.cer
+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-smtpd_tls_key_file=/etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key
+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 smtpd_tls_ciphers = HIGH

etc_clearnet_proxy/resolv.conf

@@ -0,0 +1,2 @@
+nameserver 127.0.0.1
+options edns0 trust-ad

etc_clearnet_proxy/turnserver.conf

@@ -457,7 +457,7 @@ realm=danwin1210.de
 # Use PEM file format.
 #
 #cert=/usr/local/etc/turn_server_cert.pem
-cert=/etc/acme.sh/danwin1210.de_ecc/fullchain.cer
+cert=/etc/ssl/certs/ssl-cert-snakeoil.pem
 
 # Private key file.
 # Use an absolute path or path relative to the
@@ -465,7 +465,7 @@ cert=/etc/acme.sh/danwin1210.de_ecc/fullchain.cer
 # Use PEM file format.
 #
 #pkey=/usr/local/etc/turn_server_pkey.pem
-pkey=/etc/acme.sh/danwin1210.de_ecc/danwin1210.de.key
+pkey=/etc/ssl/private/ssl-cert-snakeoil.key
 
 # Private key file password, if it is in encoded format.
 # This option has no default value.

install_binaries.sh

@@ -8,10 +8,10 @@ workingdir=$(pwd)
 
 # install all required packages
 DEBIAN_FRONTEND=noninteractive apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y apt-transport-tor bash-completion bind9 ca-certificates clamav-daemon clamav-freshclam curl dovecot-imapd dovecot-lmtpd dovecot-pop3d git gnupg haveged iptables libsasl2-modules locales locales-all logrotate lsb-release mariadb-server mercurial nano nginx openssl php8.2-cli php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-gnupg php8.2-imap php8.2-intl php8.2-mbstring php8.2-mysql php8.2-pspell php8.2-readline postfix postfix-mysql prosody redis rspamd tor vim wget unzip brotli wireguard wireguard-tools
+DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y apt-transport-tor bash-completion bind9 ca-certificates clamav-daemon clamav-freshclam curl dovecot-imapd dovecot-lmtpd dovecot-managesieved dovecot-mysql dovecot-pop3d dovecot-sieve git gnupg haveged iptables libnginx-mod-http-brotli-filter libsasl2-modules locales locales-all logrotate lsb-release lua-dbi-mysql lua-event lua-unbound mariadb-server mercurial nano nginx openssl patch php8.2-cli php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-gnupg php8.2-imap php8.2-intl php8.2-mbstring php8.2-mysql php8.2-pspell php8.2-readline php8.2-tidy php8.2-uuid php8.2-xml php8.2-zip postfix postfix-mysql prosody redis rng-tools5 rspamd tor vim wget unzip wireguard wireguard-tools
 
 # install composer
-curl -sSL https://github.com/composer/composer/releases/download/2.7.6/composer.phar > /usr/bin/composer
+curl -sSL https://github.com/composer/composer/releases/download/2.8.3/composer.phar > /usr/bin/composer
 chmod +x /usr/bin/composer
 composer self-update
 
@@ -32,10 +32,17 @@ if [ ! -e /etc/postfix/danwin1210-mail.chain ]; then
 	openssl req -x509 -nodes -days 3650 -newkey ed448 -subj "/" -keyout /etc/postfix/danwin1210-mail.key -out /etc/postfix/danwin1210-mail.crt && cat /etc/postfix/danwin1210-mail.key >> /etc/postfix/danwin1210-mail.chain && cat /etc/postfix/danwin1210-mail.crt >> /etc/postfix/danwin1210-mail.chain
 fi
 
-# Nginx
+# dhparams
-if [ ! -e /etc/nginx/dh4096.pem ]; then
+for file in /etc/nginx/dh4096.pem /etc/dovecot/dh.pem /etc/prosody/dh4096.pem; do
-	openssl dhparam -out /etc/nginx/dh4096.pem 4096
+	if [ ! -e "$file" ]; then
+		openssl dhparam -out "$file" 4096
 	fi
+done
+
+# vmail user
+id -u vmail > /dev/null 2>&1 || (groupadd -g 5000 -r vmail && useradd -g 5000 -M -r -s /bin/false -u 5000 vmail -d /var/mail/vmail)
+mkdir -p /var/mail/vmail
+chown vmail: /var/mail/vmail
 
 #install scripts
 mkdir -p /var/www/mail
@@ -45,7 +52,7 @@ chown _rspamd: /var/lib/rspamd/dkim
 if [ ! -e /var/www/html/mail ]; then
 	ln -s ../mail/www /var/www/html/mail
 fi
-cp -r composer.json cron.php setup.php www /var/www/mail/
+cp -r composer.json cron.php setup.php www tools locale /var/www/mail/
 cd /var/www/mail/
 composer install --no-dev
 
@@ -57,20 +64,57 @@ if [ ! -e /var/www/mail/www/squirrelmail ]; then
 	git clone https://github.com/RealityRipple/squirrelmail .
 	mkdir -p /var/local/squirrelmail/data /var/local/squirrelmail/attach
 	chown www-data:www-data -R /var/local/squirrelmail
+	cd $workingdir
+	cp squirrelmail_config.php /var/www/mail/www/squirrelmail/config/config.php
 else
 	cd /var/www/mail/www/squirrelmail
 	git fetch --all
 	git pull
 fi
 
+if [ ! -e /var/www/mail/www/squirrelmail/plugins/check_quota/ ]; then
+	cd /var/www/mail/www/squirrelmail/plugins/
+	wget https://www.squirrelmail.org/plugins/check_quota-2.2-1.4.0.tar.gz
+	tar -zxf check_quota-2.2-1.4.0.tar.gz
+	rm check_quota-2.2-1.4.0.tar.gz
+	cd $workingdir
+	cp squirrelmail_plugin_hooks.php /var/www/mail/www/squirrelmail/config/plugin_hooks.php
+	patch -p1 -d /var/www/html/mail/squirrelmail/plugins/check_quota/ < squirrelmail_check_quota.patch
+fi
+
 # install snappymail
 mkdir -p /var/www/mail/www/snappymail
 cd /var/www/mail/www/snappymail
 VERSION=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep tag_name | cut -d '"' -f 4)
 wget https://github.com/the-djmaze/snappymail/releases/download/${VERSION}/snappymail-${VERSION:1}.zip
 unzip -o snappymail-${VERSION:1}.zip
+rm snappymail-${VERSION:1}.zip
 mkdir -p /var/local/snappymail
 chown www-data:www-data -R /var/local/snappymail
+if [ ! -e include.php ]; then
+	cp _include.php include.php
+	echo "define('APP_DATA_FOLDER_PATH', '/var/local/snappymail/');" >> include.php
+	echo "define('SNAPPYMAIL_UPDATE_PLUGINS', 1);" >> include.php
+fi
+
+# install converse.js
+rm -rf /srv/conversejs
+mkdir -p /srv/conversejs
+cd /srv/conversejs
+VERSION=$(curl -s https://api.github.com/repos/conversejs/converse.js/releases/latest | grep tag_name | cut -d '"' -f 4)
+wget https://github.com/conversejs/converse.js/releases/download/${VERSION}/converse.js-${VERSION:1}.tgz
+tar xzf converse.js-${VERSION:1}.tgz --strip-components=1
+rm converse.js-${VERSION:1}.tgz
+
+rm -f /etc/nginx/sites-enabled/default
+
+# install prosody modules
+if [ ! -e /srv/prosody-modules ]; then
+	hg clone https://hg.prosody.im/prosody-modules/ /srv/prosody-modules
+else
+	cd /srv/prosody-modules
+	hg pull --update
+fi
 
 # copy configuration file
 cd $workingdir

install_binaries_proxy.sh

@@ -5,4 +5,13 @@ export LANG=C.UTF-8
 export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
 # install all required packages
 DEBIAN_FRONTEND=noninteractive apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y bash-completion bind9 ca-certificates coturn curl git gnupg haveged iptables libsasl2-modules logrotate lsb-release nano nginx openssl postfix postfix-mysql postfix-mta-sts-resolver vim wget wireguard wireguard-tools
+DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y bash-completion bind9 ca-certificates coturn curl git gnupg haveged iptables libnginx-mod-stream libnginx-mod-http-brotli-filter libsasl2-modules logrotate lsb-release nano nginx openssl postfix postfix-mysql postfix-mta-sts-resolver rng-tools5 vim wget wireguard wireguard-tools
+
+# dhparams
+for file in /etc/nginx/dh4096.pem; do
+	if [ ! -e "$file" ]; then
+		openssl dhparam -out "$file" 4096
+	fi
+done
+
+rm -f /etc/nginx/sites-enabled/default

locale/cs_CZ/LC_MESSAGES/mail-hosting.po

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
 "PO-Revision-Date: 2023-11-21 23:40+0000\n"
 "Last-Translator: Dai Duong Le <daiduonglebusiness@gmail.com>\n"
-"Language-Team: Czech <https://weblate.danwin1210.de/projects/DanWin/"
+"Language-Team: Czech <https://weblate.danwin1210.de/projects/DanWin/mail-"
-"mail-hosting/cs/>\n"
+"hosting/cs/>\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,25 +26,36 @@ msgid ""
 "deleting it."
 msgstr "Zdá se, že %s nemá žádné účty, ale má adresář. Zvažte jeho smazání."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Odstraněno: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr "Soubor nalezen v umístění adresáře pošty: \"%s\". Zvažte jeho smazání."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "%s does not seem to have any accounts, but has a directory. Consider "
+#| "deleting it."
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr "Zdá se, že %s nemá žádné účty, ale má adresář. Zvažte jeho smazání."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Žádné připojení k databázi MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Přepiš:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -53,11 +64,11 @@ msgstr ""
 "Jejda, e-mail „%s“ nevypadá jako platná e-mailová adresa, a proto nebyl "
 "přidán do seznamu pro přeposílání."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Nemáš oprávnění spravovat tuto doménu."
 
-#: common_config.php:298
+#: common_config.php:338
 #, fuzzy
 #| msgid "Invalid email address."
 msgid "Invalid email address."
@@ -88,6 +99,10 @@ msgstr "Databáze byla úspěšně nastavena."
 msgid "Error setting up database:"
 msgstr "Chyba při nastavování databáze:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -114,12 +129,12 @@ msgstr "Registrovat"
 msgid "Manage account"
 msgstr "Spravovat účet"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -170,34 +185,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -223,7 +238,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Neplatné uživatelské jméno. Nesmí obsahovat +, ', \" nebo /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Hesla jsou prázdná nebo se neshodují"
 
@@ -239,11 +254,11 @@ msgstr "Zadaná e-mailová adresa není platná"
 msgid "The username you specified is reserved"
 msgstr "Zadané uživatelské jméno je rezervováno"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Omlouvám se, tento uživatel již existuje"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Nová poštovní schránka byla úspěšně vytvořena!"
 
@@ -258,19 +273,19 @@ msgstr ""
 "Zaregistruj se a získejte bezplatnou a anonymní e-mailovou adresu a účet "
 "XMPP/Jabber"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Uživatelské jméno"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Heslo"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Heslo znovu"
 
@@ -306,21 +321,26 @@ msgstr ""
 "stejných údajů. Tvoje Jabber ID je user@%1$s a lze se k němu připojit přímo "
 "z clearnetu nebo přes skrytou službu Tor (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 "Pro tvoje e-maily budeš mít k dispozici 50 MB místa na disku. Pokud "
 "potřebuješ více místa, <a href=\"%1$s\">kontaktuj mě</a>. Tvoje e-mailová "
 "adresa bude %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -329,17 +349,17 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 #, fuzzy
 #| msgid "Edit account"
 msgid "add it to your account"
 msgstr "Upravit účet"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -355,30 +375,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Nastavení e-mailu"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) nebo 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) nebo 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) nebo 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Autentizace: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -387,26 +407,26 @@ msgstr ""
 "Můžeš se také připojit na stejné porty přes adresu Tor onion %s, ale budeš "
 "muset přijmout certifikát SSL platný pouze pro doménu clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Nastavení XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Doména: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Připojit server: %s (volitelné pro torifikaci)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Proxy přenosu souborů: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -436,7 +456,7 @@ msgstr "Neplatné uživatelské jméno"
 msgid "Incorrect username or password"
 msgstr "Nesprávné uživatelské jméno nebo heslo"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Heslo bylo úspěšně aktualizováno"
 
@@ -544,16 +564,16 @@ msgstr "2FA kód"
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Přihlášen jako %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Přihlásit se"
 
@@ -575,11 +595,11 @@ msgstr ""
 "řádek nebo oddělené čárkami. Když zaškrtneš políčko „uchovat místní kopii“, "
 "tvoje pošta bude zasílána pouze na tvé přesměrovací adresy."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Předat na"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Ponechte si místní kopii"
 
@@ -601,11 +621,11 @@ msgstr ""
 "požádat svého korespondenta, aby od svého poskytovatele požadoval podporu "
 "šifrování pro bezpečnější internet."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Vynutit šifrování pro příchozí poštu"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Vynutit šifrování pro odchozí poštu"
 
@@ -613,8 +633,8 @@ msgstr "Vynutit šifrování pro odchozí poštu"
 msgid "Update settings"
 msgstr "Aktualizovat nastavení"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Změnit heslo"
 
@@ -852,49 +872,49 @@ msgstr "Alias byl úspěšně přidán."
 msgid "Successfully updated alias."
 msgstr "Alias byl úspěšně aktualizován."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Poštovní schránka byla úspěšně aktualizována."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Dvoufaktorové ověřování bylo úspěšně zakázáno"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr "E-mail a XMPP - správa administrace"
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 "Umožnit vlastníkům domén spravovat jejich e-mailovou doménu a uživatelské "
 "účty."
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Spravovat administrátory"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr "Spravovat alias domén"
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr "Spravovat svůj účet správce"
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Spravovat domény"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Správa aliasů"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Správa poštovních schránek"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
@@ -902,7 +922,7 @@ msgstr ""
 "Vítejte v rozhraní pro správu správce. Zde můžete nakonfigurovat své domény "
 "a účty. Vyberte možnost z nabídky."
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
@@ -910,219 +930,219 @@ msgstr ""
 "Jejda, zdá se, že stránka, kterou jsi se pokusil otevřít, neexistuje nebo k "
 "ní nemáš oprávnění."
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Vytvořit nového správce"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Administrátor"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktivní"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Naposledy změněno"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Upravit účet"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Deaktivovat účet"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Upravit"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Upravit účet správce %s"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadministrátoři mohou spravovat ostatní administrátory"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr "Spravované domény"
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Uložit"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Smazat administrátora"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr "Jejda, zdá se, že tento správce neexistuje."
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr "Vytvořit nový účet správce"
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr "Přidat správce"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr "Vytvořit novou doménu"
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Doména"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Upravit doménu"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Delete admin"
 msgid "Deleting"
 msgstr "Smazat administrátora"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Přidat doménu"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Upravit doménu %s"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Odstranit doménu"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr "Vytvořte nový alias domény"
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr "Alias Domény"
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr "Cílová doména"
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr "Upravit alias domény"
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr "Přidat alias domény"
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr "Upravit alias domény %s"
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr "Odstranit alias domény"
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr "Jejda, tento alias domény zřejmě neexistuje."
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Vytvořit nový alias"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr "Cíl"
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Upravit alias"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr "Vynutit šifrování"
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Přidat alias"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Upravit alias %s"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Odstranit alias"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr "Jejda, zdá se, že tento alias neexistuje."
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr "Vytvořit novou poštovní schránku"
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr "Upravit poštovní schránku"
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr "Upravit poštovní schránku %s"
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr "Uložit schránku"
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr "Odstranit schránku / Zakázat dvoufaktorové ověřování"
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr "Zakázat dvoufaktorové ověřování"
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr "Jejda, zdá se, že tato poštovní schránka neexistuje."
 
@@ -1148,6 +1168,6 @@ msgstr "Jejda, zdá se, že tato poštovní schránka neexistuje."
 #~ "Pokud můžeš, použij pro ochranu soukromí šifrování pošty PGP. To brání "
 #~ "ostatním ve čtení tvých e-mailů (včetně mě a/nebo LEA). Oficiální domov "
 #~ "GnuPGs: <a href=\"https://gnupg.org\" target=\"_blank\" rel=\"noopener "
-#~ "noreferrer\">https://gnupg.org</a> GUI systému Windows: <a href="
+#~ "noreferrer\">https://gnupg.org</a> GUI systému Windows: <a "
-#~ "\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "href=\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener "
-#~ "\">https://gpg4usb.org</a>"
+#~ "noreferrer\">https://gpg4usb.org</a>"

locale/de_DE/LC_MESSAGES/mail-hosting.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
-"PO-Revision-Date: 2023-11-30 17:37+0000\n"
+"PO-Revision-Date: 2024-07-08 13:50+0000\n"
 "Last-Translator: Weblate Admin <daniel@danwin1210.de>\n"
 "Language-Team: German <https://weblate.danwin1210.de/projects/DanWin/"
 "mail-hosting/de/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.2\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: tools/delete_leftover_files.php:14
 #, php-format
@@ -28,27 +28,37 @@ msgstr ""
 "%s scheint keine Konten zu haben, aber ein Verzeichnis. Denk darüber nach es "
 "zu löschen."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Gelöscht: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 "Datei im Mailverzeichnis \"%s\" gefunden. Denke darüber nach diese zu "
 "löschen."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+"%s scheint keine Konten zu haben, aber ein snappymail Verzeichnis. Denk "
+"darüber nach es zu löschen."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Keine Verbindung zur MySQL Datenbank!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopiere:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -57,11 +67,11 @@ msgstr ""
 "Ups, die E-Mail \"%s\" sieht nicht nach einer gültigen E-Mail Adresse aus "
 "und wurde deshalb nicht zur Weiterleitungsliste hinzugefügt."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Du darfst diese Domain nicht verwalten."
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr "Ungültige E-Mail Adresse."
 
@@ -90,6 +100,10 @@ msgstr "Datenbank wurde erfolgreich erstellt."
 msgid "Error setting up database:"
 msgstr "Fehler beim Erstellen der Datenbank:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr "Fehler beim Hinzufügen der primären Domain:"
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 msgid "E-Mail and XMPP - Terms of Service"
 msgstr "E-Mail und XMPP - Nutzungsbedingungen"
@@ -113,12 +127,12 @@ msgstr "Registrieren"
 msgid "Manage account"
 msgstr "Konto verwalten"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr "SquirrelMail"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr "SnappyMail"
@@ -181,20 +195,20 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr "Du bist für die Sicherheit deines Kontos und Passworts verantwortlich."
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
-"Dein E-Mail-Konto hat standardmäßig nur 50MB Speicherplatz. Wenn du mehr "
+"Dein E-Mail-Konto hat standardmäßig %1$s Speicherplatz. Wenn du mehr "
-"benötigst, kannst du %s, und ich werde es kostenlos erhöhen."
+"benötigst, kannst du %$2s, und ich werde es kostenlos erhöhen."
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr "schreib mir"
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
@@ -204,20 +218,20 @@ msgstr ""
 "deine Nachrichten und Dateien für bis zu 1 Woche halten können. Bis zu 100 "
 "MB Dateispeicher ist pro Benutzer verfügbar."
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 "Ich behalte das Recht vor, dein Konto ohne vorherige Ankündigung zu "
 "blockieren oder zu löschen."
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 "Ich behalte das Recht vor, diese Bedingungen ohne vorherige Ankündigung zu "
 "ändern."
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 "Anhaltende Verstöße können die Schließung der Registrierung erforderlich "
@@ -246,7 +260,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Ungültiger Nutzername. Dieser darf keine +, ', \" oder / enthalten."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Passwörter leer oder stimmen nicht überein"
 
@@ -262,11 +276,11 @@ msgstr "Deine angegebene E-Mail Adresse ist nicht gültig"
 msgid "The username you specified is reserved"
 msgstr "Dein eingegebener Nutzername ist reserviert"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Sorry, dieser Nutzer existiert bereits"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Neue Mailbox erfolgreich erstellt!"
 
@@ -281,19 +295,19 @@ msgstr ""
 "Registriere dich für eine kostenloses und anonyme E-Mail Adresse und ein "
 "XMPP/Jabber Konto"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Nutzername"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Passwort"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Passwort erneut"
 
@@ -330,16 +344,21 @@ msgstr ""
 "Konto mit den gleichen Daten. Deine Jabber ID ist user@%1$s und kann direkt "
 "über Clearnet zu verbunden werden, oder über den Tor hidden service (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, php-format
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
-"Du wirst 50MB Speicherplatz für deine E-Mails haben. Wenn du mehr Speicher "
+"Du wirst %1$s Speicherplatz für deine E-Mails haben. Wenn du mehr Speicher "
-"brauchst, %1$s einfach. Deine E-Mail Adresse wird %2$s sein"
+"brauchst, %2$s einfach."
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr "Deine E-Mail Adresse wird user@%s sein"
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -353,15 +372,15 @@ msgstr ""
 "du deinen PGP-Schlüssel generiert hast, kannst du %2$s um von automatischer "
 "Erkennung in Mail-Clients über WKD Gebrauch zu machen."
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr "GnuPG herunterladen"
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr "ihn zu deinem Konto hinzufügen"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -390,30 +409,30 @@ msgstr ""
 "vertraust. Alternativ kannst du einfach deinen Lieblings Desktop Mail-Client "
 "verwenden und mit den unten angegebenen Einstellungen konfigurieren."
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "E-Mail Einrichtung"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) oder 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) oder 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) oder 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Authentifizierung: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -423,26 +442,26 @@ msgstr ""
 "verbinden, aber du wirst ein Zertifikat akzeptieren müssen, welches nur für "
 "die Clearnet-Domain gültig ist."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "XMPP-Einrichtung"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Domain: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Verbindungs-Server: %s (Optional für Torifzierung)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Datentransfer-Proxy: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -472,7 +491,7 @@ msgstr "Ungültiger Nutzername"
 msgid "Incorrect username or password"
 msgstr "Ungültiger Nutzername oder Passwort"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Passwort erfolgreich aktualisiert"
 
@@ -581,16 +600,16 @@ msgstr "2FA Code"
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Angemeldet als %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Abmelden"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Anmelden"
 
@@ -613,11 +632,11 @@ msgstr ""
 "\"Lokale Kopie behalten\" deaktivierst, wird deine E-Mail nur an die "
 "Weiterleitungsadressen gesendet."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Lokale Kopie behalten"
 
@@ -640,11 +659,11 @@ msgstr ""
 "Falle, dass sie von ihrem E-Mail Provider Unterstützung für Verschlüsselung, "
 "für ein sichereres Internet, einfordern sollen."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Verschlüsselung für eingehende E-Mails erzwingen"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Verschlüsselung für ausgehende E-Mails erzwingen"
 
@@ -652,8 +671,8 @@ msgstr "Verschlüsselung für ausgehende E-Mails erzwingen"
 msgid "Update settings"
 msgstr "Einstellungen aktualisieren"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -892,47 +911,47 @@ msgstr "Alias erfolgreich hinzugefügt."
 msgid "Successfully updated alias."
 msgstr "Alias erfolgreich aktualisiert."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Mailbox erfolgreich aktualisiert."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Zwei-Faktor Authentifizierung erfolgreich deaktiviert"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr "E-Mail und XMPP - Admin Verwaltung"
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr "Lässt Domain-Inhaber ihre E-Mail Domain und Nutzer-Konten verwalten."
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Admins verwalten"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr "Alias-Domains verwalten"
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr "Verwalte dein Konto"
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Domains verwalten"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Aliase verwalten"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Mailboxen verwalten"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
@@ -940,7 +959,7 @@ msgstr ""
 "Wilkommen in der Admin-Verwaltungsoberfläche. Hier kannst du deine Domain(s) "
 "und Konten konfigurieren. Bitte wähle eine Option vom Menü."
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
@@ -948,215 +967,215 @@ msgstr ""
 "Ups, es scheint dass die Seite, auf die du versucht hast zuzugreifen "
 "entweder nicht existiert, oder du keine Berechtigung hast darauf zuzugreifen."
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Neuen Admin erstellen"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Admin"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktiv"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Konto bearbeiten"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Adminkonto %s bearbeiten"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadmins können andere Admins verwalten"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr "Verwaltete Domains"
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Admin löschen"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr "Ups, dieser Admin scheint nicht zu existieren."
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr "Neues Admin-Konto erstellen"
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr "Admin hinzufügen"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr "Neue Domain erstellen"
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Domain"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Domain bearbeiten"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 msgid "Deleting"
 msgstr "Wird gelöscht"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Domain hinzufügen"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Domain %s bearbeiten"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Domain löschen"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr "Neue Alias-Domain erstellen"
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr "Alias-Domain"
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr "Ziel-Domain"
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr "Alias-Domain bearbeiten"
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr "Alias-Domain hinzufügen"
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr "Alias-Domain %s bearbeiten"
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr "Alias-Domain löschen"
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr "Ups, diese Alias-Domain schient nicht zu existieren."
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Neuen Alias erstellen"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr "Ziel"
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Alias bearbeiten"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr "Verschlüsselung erzwingen"
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Alias hinzufügen"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Alias %s bearbeiten"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Alias löschen"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr "Ups, dieses Alias schient nicht zu existieren."
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr "Neue Mailbox erstellen"
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr "Mailbox bearbeiten"
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr "Wird deaktiviert"
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr "Mailbox hinzufügen"
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr "Mailbox %s bearbeiten"
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr "Mailbox speichern"
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr "Mailbox löschen / Zwei-Faktor Autorisierung deaktivieren"
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr "Zwei-Faktor Autorisierung deaktivieren"
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr "Mailbox löschen"
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr "Ups, diese Mailbox schient nicht zu existieren."
 

locale/mail-hosting.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,36 +24,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr ""
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr ""
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr ""
 
@@ -82,6 +90,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 msgid "E-Mail and XMPP - Terms of Service"
 msgstr ""
@@ -105,12 +117,12 @@ msgstr ""
 msgid "Manage account"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -161,34 +173,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -214,7 +226,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr ""
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr ""
 
@@ -230,11 +242,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr ""
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr ""
 
@@ -247,19 +259,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr ""
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr ""
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr ""
 
@@ -292,14 +304,19 @@ msgid ""
 "from clearnet or via Tor hidden service (%2$s)."
 msgstr ""
 
-#: www/index.php:25
+#: www/index.php:26
 #, php-format
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -308,15 +325,15 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr ""
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -332,56 +349,56 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr ""
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr ""
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr ""
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr ""
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr ""
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
 "will have to accept an SSL certificate only valid for the clearnet domain."
 msgstr ""
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr ""
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr ""
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr ""
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr ""
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -409,7 +426,7 @@ msgstr ""
 msgid "Incorrect username or password"
 msgstr ""
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr ""
 
@@ -502,16 +519,16 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr ""
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr ""
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr ""
 
@@ -530,11 +547,11 @@ msgid ""
 "checkbox, your mail will only be sent to your forwarding addresses."
 msgstr ""
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr ""
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr ""
 
@@ -551,11 +568,11 @@ msgid ""
 "provider for a safer internet."
 msgstr ""
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr ""
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr ""
 
@@ -563,8 +580,8 @@ msgstr ""
 msgid "Update settings"
 msgstr ""
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr ""
 
@@ -781,266 +798,266 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr ""
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr ""
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr ""
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 msgid "Disabled"
 msgstr ""
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr ""
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr ""
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 msgid "Deleting"
 msgstr ""
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""

locale/pl_PL/LC_MESSAGES/mail-hosting.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
 "PO-Revision-Date: 2023-05-01 02:04+0000\n"
 "Last-Translator: big cat <biggiecat@danwin1210.de>\n"
 "Language-Team: Polish <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -27,36 +27,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Usunięto: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Brak połączenia z bazą MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopiuj:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 #, fuzzy
 #| msgid "Invalid email address."
 msgid "Invalid email address."
@@ -87,6 +95,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -112,12 +124,12 @@ msgstr "Zarejestruj się"
 msgid "Manage account"
 msgstr "Zarządzaj kontem"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -168,34 +180,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -221,7 +233,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Nieprawidłowa nazwa użytkownika. Nie może zawierać + , ' , \" lub /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Hasła puste albo nie są takie same"
 
@@ -237,11 +249,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Ten użytkownik już istnieje"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr ""
 
@@ -254,19 +266,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Hasło"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Powtórz hasło"
 
@@ -302,20 +314,25 @@ msgstr ""
 "tego samego loginu i hasła. Twoje ID Jabber to user@%1$s i możesz się z nim "
 "połączyć poprzez clearnet lub Tor (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 "Otrzymasz 50MB miejsca na twoje maile. Jeżeli potrzebujesz więcej miejsca, "
 "<a href=\"%1$s\">skontaktuj się ze mną</a>. Twój adres E-Mail będzie na %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -324,17 +341,17 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 #, fuzzy
 #| msgid "Edit account"
 msgid "add it to your account"
 msgstr "Edytuj konto"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -350,30 +367,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Konfiguracja E-Mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) lub 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) lub 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) lub 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Uwierzytelnienie: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -382,26 +399,26 @@ msgstr ""
 "Możesz również połączyć się na tych samych portach przez Tor %s, lecz "
 "będziesz musiał zaakceptować certyfikat SSL ważny tylko dla domeny clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Konfiguracja XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Domena: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, fuzzy, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Serwer połączenia: %s (opcjonalnie dla Tor)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Proxy przesyłania plików: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -430,7 +447,7 @@ msgstr "Nieprawidłowa nazwa użytkownika"
 msgid "Incorrect username or password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Pomyślnie zaktualizowano hasło"
 
@@ -535,16 +552,16 @@ msgstr "Kod 2FA"
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Zalogowano jako %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -563,11 +580,11 @@ msgid ""
 "checkbox, your mail will only be sent to your forwarding addresses."
 msgstr ""
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Przekieruj do"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr ""
 
@@ -584,11 +601,11 @@ msgid ""
 "provider for a safer internet."
 msgstr ""
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Wymuś szyfrowanie dla przychodzących maili"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Wymuś szyfrowanie dla wychodzących maili"
 
@@ -596,8 +613,8 @@ msgstr "Wymuś szyfrowanie dla wychodzących maili"
 msgid "Update settings"
 msgstr "Zaktualizuj ustawienia"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Zmień hasło"
 
@@ -815,272 +832,272 @@ msgstr "Pomyślnie dodano alias."
 msgid "Successfully updated alias."
 msgstr "Pomyślnie zaktualizowano alias."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Pomyślnie wyłaczono weryfikację dwuetapową"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Zarządzaj adminami"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Zarządzaj domenami"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Zarządzaj aliasami"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Zarządzaj skrzynkami"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Stwórz nowego admina"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Admin"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktywny"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Ostatnio zmodyfikowany"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Edytuj konto"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Wyłącz konto"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Edytuj"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Edytuj konto admin %s"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadmini mogą zarządzać innymi adminami"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Usuń admina"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 #, fuzzy
 msgid "Add admin"
 msgstr "Dodaj admina"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Domena"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Edytuj domenę"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Delete admin"
 msgid "Deleting"
 msgstr "Usuń admina"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Dodaj domenę"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Edytuj domenę %s"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Usuń domenę"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Stwórz nowy alias"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Edytuj alias"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Dodaj alias"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Edytuj alias %s"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Usuń alias"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 
@@ -1095,6 +1112,6 @@ msgstr ""
 #~ "W ramach prywatności, używaj szyfrowania maili PGP jeżeli możesz. To "
 #~ "zapobiega odczytywaniu twoich maili przez innych (w tym mnie i/lub LEA). "
 #~ "Oficjalna strona GnuPG: <a href=\"https://gnupg.org\" target=\"_blank\" "
-#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> GUI Windows: <a href="
+#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> GUI Windows: <a "
-#~ "\"https://gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "href=\"https://gpg4usb.org\" target=\"_blank\" rel=\"noopener "
-#~ "\">https://gpg4usb.org</a>"
+#~ "noreferrer\">https://gpg4usb.org</a>"

locale/ru_RU/LC_MESSAGES/mail-hosting.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
 "PO-Revision-Date: 2023-08-14 07:26+0000\n"
 "Last-Translator: Goatli <goatli@porcod.io>\n"
 "Language-Team: Russian <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.18.2\n"
 
 #: tools/delete_leftover_files.php:14
@@ -27,36 +27,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr ""
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Код с картинки:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr ""
 
@@ -85,6 +93,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -110,12 +122,12 @@ msgstr "Регистрация"
 msgid "Manage account"
 msgstr "Настройки учетной записи"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -166,34 +178,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -219,7 +231,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr ""
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Вы не заполнили пароли или они не совпадают"
 
@@ -235,11 +247,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Такой пользователь уже есть, выберите другое имя"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Поздравляем, почтовый ящик успешно создан!"
 
@@ -252,19 +264,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Пароль"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Повторите пароль"
 
@@ -302,21 +314,26 @@ msgstr ""
 "доступно из под одной учетной записи. Ваш Jabber ID это user@%1$s он "
 "доступен как через обычный интернет, так и через Tor сеть (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 "Вам будет выделено 50МБ свободного места для ваших писем. Если вам "
 "понадобится больше места, пожалуйста <a href=\"%1$s\">свяжитесь со мной</a>. "
 "Ваш домен E-Mail будет выглядеть как %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -325,15 +342,15 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr ""
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -349,30 +366,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Настройки E-Mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) или 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) или 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) или 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Аутентификация: ОБЫЧНАЯ, ЛОГИН"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -382,26 +399,26 @@ msgstr ""
 "необходимо будет принять SSL-сертификат как для обычного интернета "
 "(clearnet)."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Настройки XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Домен: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr ""
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr ""
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -429,7 +446,7 @@ msgstr "Неверное имя пользователя"
 msgid "Incorrect username or password"
 msgstr "Неверное имя пользователя или пароль"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Пароль обновлен"
 
@@ -539,16 +556,16 @@ msgstr "2FA Код"
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Пользователь %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Выход"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Войти"
 
@@ -571,11 +588,11 @@ msgstr ""
 "галочку с поля \"сохранять копию\" то ваши письма будут поступать только на "
 "ваши адреса, которые вы указали для пересылки."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Переслать на"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Сохранять копию"
 
@@ -598,11 +615,11 @@ msgstr ""
 "поддержку шифрования TLS/SSL у своего поставщика услуг электронной почты, "
 "для защиты от чтения ваших писем третьими лицами."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Включить шифрование входящей почты"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Включить шифрование исходящей почты"
 
@@ -610,8 +627,8 @@ msgstr "Включить шифрование исходящей почты"
 msgid "Update settings"
 msgstr "Обновить настройки"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Изменить пароль"
 
@@ -718,8 +735,8 @@ msgid ""
 "Warning: This will permanently delete the alias domain \"%s\". It cannot be "
 "reversed. Are you absolutely sure?"
 msgstr ""
-"Предупреждение: Это приведет к безвозвратному удалению псевдонима домена \"%s"
+"Предупреждение: Это приведет к безвозвратному удалению псевдонима домена "
-"\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
+"\"%s\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
 
 #: www/admin.php:85
 msgid "Yes, I want to permanently delete this alias domain"
@@ -742,8 +759,8 @@ msgid ""
 "Warning: This will permanently delete the mailbox \"%s\". It cannot be "
 "reversed. Are you absolutely sure?"
 msgstr ""
-"Предупреждение: Это приведет к безвозвратному удалению почтового ящика \"%s"
+"Предупреждение: Это приведет к безвозвратному удалению почтового ящика "
-"\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
+"\"%s\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
 
 #: www/admin.php:95
 msgid "Yes, I want to permanently delete this mailbox"
@@ -848,271 +865,271 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr "Псевдоним успешно обновлен."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Почтовый ящик успешно обновлен."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Двухфакторная аутентификация успешно отключена"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr ""
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Отключить аккаунт"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Редактировать"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr ""
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Settings"
 msgid "Deleting"
 msgstr "Настройки"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 

locale/tr_TR/LC_MESSAGES/mail-hosting.po

@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
-"PO-Revision-Date: 2023-05-04 00:26+0000\n"
+"PO-Revision-Date: 2024-11-11 22:48+0000\n"
-"Last-Translator: Haydar Erdoğan <bygenc19@gmail.com>\n"
+"Last-Translator: Türk Dil Devrimi <bygenc19@gmail.com>\n"
-"Language-Team: Turkish <https://weblate.danwin1210.de/projects/DanWin/mail-"
+"Language-Team: Turkish <https://weblate.danwin1210.de/projects/DanWin/"
-"hosting/tr/>\n"
+"mail-hosting/tr/>\n"
-"Language: tr\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.8.3\n"
 
 #: tools/delete_leftover_files.php:14
 #, php-format
@@ -26,36 +26,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr ""
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopyala:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr ""
 
@@ -84,6 +92,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Manage account"
@@ -109,12 +121,12 @@ msgstr "Kayıt ol"
 msgid "Manage account"
 msgstr "Hesabı yönet"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -165,34 +177,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
-msgstr ""
+msgstr "bana ulaşın"
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -218,7 +230,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr ""
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Parolalar eşleşmiyor"
 
@@ -234,11 +246,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr ""
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr ""
 
@@ -251,19 +263,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Kullanıcı adı"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Şifre"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Şifre Tekrar"
 
@@ -274,7 +286,7 @@ msgstr ""
 
 #: www/register.php:120
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Gizlilik Politikası"
 
 #: www/index.php:6 www/index.php:15 www/index.php:19
 msgid "E-Mail and XMPP"
@@ -299,21 +311,26 @@ msgstr ""
 "Jabber hesabı alırsınız. Jabber kimliğiniz user@%1$s şeklindedir ve doğrudan "
 "clearnet'ten veya Tor gizli hizmeti (%2$s) üzerinden bağlanabilir."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 "Postalarınız için 50 MB boş disk alanınız olacak. Daha fazla alana "
 "ihtiyacınız varsa <a href=\"%1$s\">benimle iletişime geçin</a>. E-Mail "
 "adresiniz %2$s olacak"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -322,15 +339,15 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr ""
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -346,30 +363,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "E-Posta Kurulumu"
 
-#: www/index.php:30
+#: www/index.php:33
 #, fuzzy, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, fuzzy, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, fuzzy, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Kimlik doğrulama: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -379,26 +396,26 @@ msgstr ""
 "bağlanabilirsiniz, ancak yalnızca clearnet etki alanı için geçerli bir SSL "
 "sertifikasını kabul etmeniz gerekecektir."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "XMPP kurulumu"
 
-#: www/index.php:37
+#: www/index.php:40
 #, fuzzy, php-format
 msgid "Domain: %s"
 msgstr "Domain: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Sunucuyu bağla: %s (torifikasyon için isteğe bağlı)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Dosya aktarım proxy'si: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -428,7 +445,7 @@ msgstr "Geçersiz kullanıcı adı"
 msgid "Incorrect username or password"
 msgstr "Yanlış kullanıcı adı ya da parola"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Parola başarıyla güncellendi"
 
@@ -537,16 +554,16 @@ msgstr "2FA kodu"
 msgid "Confirm"
 msgstr "Onayla"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "%s olarak giriş yaptı"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Çıkış Yap"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Giriş"
 
@@ -569,11 +586,11 @@ msgstr ""
 "kopyasını sakla\" onay kutusunu devre dışı bıraktığınızda, postalarınız "
 "yalnızca yönlendirme adreslerinize gönderilecektir."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "İlet"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Yerel bir kopya tutun"
 
@@ -595,11 +612,11 @@ msgstr ""
 "okumasını mümkün kıldığını unutmayın. Muhabirinizden daha güvenli bir "
 "internet için sağlayıcılarından şifreleme desteği talep etmesini isteyin."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Gelen posta için şifrelemeyi zorunlu kıl"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Giden posta için şifreleme uygula"
 
@@ -607,8 +624,8 @@ msgstr "Giden posta için şifreleme uygula"
 msgid "Update settings"
 msgstr "Ayarları güncelle"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Şifre değiştir"
 
@@ -650,7 +667,7 @@ msgstr "2FA ve uçtan uca şifreleme için PGP anahtarı ekleyin"
 
 #: www/manage_account.php:389
 msgid "PGP key"
-msgstr "PGP anahtarı"
+msgstr "Özel Anahtar"
 
 #: www/manage_account.php:394
 msgid "Update PGP key"
@@ -846,271 +863,271 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr ""
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr ""
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Yönetici"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Hesabı devre dışı bırak"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Düzenle"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Settings"
 msgid "Deleting"
 msgstr "Ayarlar"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 
@@ -1128,6 +1145,6 @@ msgstr ""
 #~ "Gizlilik için, yapabiliyorsanız lütfen PGP posta şifreleme kullanın. Bu, "
 #~ "başkalarının (ben ve/veya LEA dahil) postalarınızı okumasını engeller. "
 #~ "GnuPG'lerin resmi evi: <a href=\"https://gnupg.org\" target=\"_blank\" "
-#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> Windows GUI: <a href="
+#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> Windows GUI: <a "
-#~ "\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
+#~ "href=\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener "
-#~ "\">https://gpg4usb.org</a>"
+#~ "noreferrer\">https://gpg4usb.org</a>"

locale/uk_UA/LC_MESSAGES/mail-hosting.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:47+0200\n"
 "PO-Revision-Date: 2023-10-14 18:51+0000\n"
 "Last-Translator: Анонім <g2014test@yandex.com>\n"
 "Language-Team: Ukrainian <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.0.2\n"
 
 #: tools/delete_leftover_files.php:14
@@ -29,27 +29,40 @@ msgstr ""
 "Здається, у %s немає облікових записів, але є каталог. Подумайте про те, щоб "
 "видалити його."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Видалено: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 "Файл знайдено в поштовому каталозі за адресою: \"%s\". Подумайте про те, щоб "
 "видалити його."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "%s does not seem to have any accounts, but has a directory. Consider "
+#| "deleting it."
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+"Здається, у %s немає облікових записів, але є каталог. Подумайте про те, щоб "
+"видалити його."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Немає підключення до бази даних MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Перепишіть:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -58,11 +71,11 @@ msgstr ""
 "На жаль, «%s» не схоже на дійсну адресу електронної пошти і, отже, не було "
 "додане до списку переадресації."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Вам заборонено керувати цим доменом."
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr "Неправильна адреса електронної пошти."
 
@@ -91,6 +104,10 @@ msgstr "База даних успішно налаштована."
 msgid "Error setting up database:"
 msgstr "Помилка під час налаштування бази даних:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 msgid "E-Mail and XMPP - Terms of Service"
 msgstr "E-Mail і XMPP – Умови надання послуг"
@@ -114,12 +131,12 @@ msgstr "Реєстрація"
 msgid "Manage account"
 msgstr "Управління обліковим записом"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -181,21 +198,24 @@ msgid "You are responsible for the security of your account and password."
 msgstr ""
 "Ви несете відповідальність за безпеку свого облікового запису та пароля."
 
-#: www/terms.php:32
+#: www/terms.php:33
-#, php-format
+#, fuzzy, php-format
+#| msgid ""
+#| "Your email account only has 50MB of disk space by default. If you need "
+#| "more, you can %s, and I will increase it for free."
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
+"Your email account has %1$s of disk space by default. If you need more, you "
-"you can %s, and I will increase it for free."
+"can %2$s, and I will increase it for free."
 msgstr ""
 "За замовчуванням в обліковому записі електронної пошти доступно лише 50 МБ "
 "дискового простору. Якщо Вам потрібно більше, Ви можете %s, і я збільшу його "
 "безкоштовно."
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr "зв'язатися зі мною"
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
@@ -205,19 +225,19 @@ msgstr ""
 "HTTP, що дозволяє зберігати Ваші повідомлення і файли до 1 тижня. Кожному "
 "користувачу доступно до 100 МБ файлового сховища."
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 "Я залишаю за собою право заблокувати або видалити Ваш обліковий запис без "
 "попереднього повідомлення."
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 "Я залишаю за собою право змінювати ці умови без попереднього повідомлення."
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -243,7 +263,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Неправильне ім'я користувача. Воно може не містити +, ', \" або /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Паролі порожні або не збігаються"
 
@@ -259,11 +279,11 @@ msgstr "Вказана Вами адреса електронної пошти
 msgid "The username you specified is reserved"
 msgstr "Вказане Вами ім'я користувача зарезервовано"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Вибачте, такий користувач вже існує"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Нову поштову скриньку успішно створено!"
 
@@ -278,19 +298,19 @@ msgstr ""
 "Зареєструйтесь для отримання безплатної та анонімної електронної пошти та "
 "XMPP/Jabber"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Ім'я користувача"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
-#: www/admin.php:1025
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Пароль"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Повторіть пароль"
 
@@ -327,16 +347,24 @@ msgstr ""
 "нього можна підключитися безпосередньо з clearnet або через приховану службу "
 "Tor (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
-#, php-format
+#, fuzzy, php-format
+#| msgid ""
+#| "You will have 50MB of disk space available for your mails. If you need "
+#| "more space, %1$s. Your E-Mail address will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
+"You will have %1$s disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"space, %2$s."
 msgstr ""
 "Вам буде доступно 50 МБ дискового простору для Ваших листів. Якщо Вам "
 "потрібно більше місця, %1$s. Ваша електронна адреса буде на @%2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be user@%s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -350,15 +378,15 @@ msgstr ""
 "створення ключа PGP Ви можете %2$s, щоб використовувати автоматичне "
 "виявлення WKD для поштових клієнтів."
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr "завантажити GnuPG"
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr "додати його до свого облікового запису"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -386,30 +414,30 @@ msgstr ""
 "просто скористатися улюбленим десктопним поштовим клієнтом і налаштувати "
 "його за допомогою наведених нижче налаштувань."
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Налаштування e-mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Порт 465 (SSL/TLS) або 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Порт 993 (SSL/TLS) або 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Порт 995 (SSL/TLS) або 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Аутентифікація: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -418,26 +446,26 @@ msgstr ""
 "Ви також можете підключитися до тих самих портів через Tor onion адресу %s, "
 "але Вам доведеться прийняти сертифікат SSL, дійсний лише для домену clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Налаштування XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Домен: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr ""
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr ""
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -465,7 +493,7 @@ msgstr ""
 msgid "Incorrect username or password"
 msgstr ""
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr ""
 
@@ -558,16 +586,16 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr ""
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr ""
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Увійти"
 
@@ -586,11 +614,11 @@ msgid ""
 "checkbox, your mail will only be sent to your forwarding addresses."
 msgstr ""
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr ""
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr ""
 
@@ -607,11 +635,11 @@ msgid ""
 "provider for a safer internet."
 msgstr ""
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr ""
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr ""
 
@@ -619,8 +647,8 @@ msgstr ""
 msgid "Update settings"
 msgstr ""
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
-#: www/admin.php:1036
+#: www/admin.php:1034
 msgid "Change password"
 msgstr ""
 
@@ -837,266 +865,266 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr ""
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr ""
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr ""
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
-#: www/admin.php:1001
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
-#: www/admin.php:909
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 msgid "Disabled"
 msgstr ""
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
-#: www/admin.php:922
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Редагувати"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr ""
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 msgid "Deleting"
 msgstr ""
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""

setup.php

@@ -60,3 +60,13 @@ try{
 		echo $e->getMessage() . PHP_EOL;
 	}
 }
+try {
+	$stmt = $db->prepare( 'INSERT IGNORE INTO domain (domain, created, modified) VALUES (?, NOW(), NOW())' );
+	$stmt->execute( [ CLEARNET_SERVER ] );
+	$stmt->execute( [ ONION_SERVER ] );
+	$stmt = $db->prepare( 'INSERT IGNORE INTO alias_domain (alias_domain, target_domain, created, modified) VALUES (?, ?, NOW(), NOW())' );
+	$stmt->execute( [ ONION_SERVER, CLEARNET_SERVER ] );
+} catch( PDOException $e ) {
+	echo _('Error adding primary domain:') . PHP_EOL;
+	echo $e->getMessage() . PHP_EOL;
+}

squirrelmail_check_quota.patch

@@ -0,0 +1,458 @@
+diff -ruN check_quota_old/config.php check_quota/config.php
+--- check_quota_old/config.php	1970-01-01 01:00:00.000000000 +0100
++++ check_quota/config.php	2023-05-22 08:47:49.000000000 +0200
+@@ -0,0 +1,409 @@
++<?php
++
++/*
++ * This is the configuration file for Check Quota Plugin.
++ * You can edit the options here to suit your needs.
++ * Please make sure you read the INSTALL file before configuring 
++ * these options.
++*/
++
++global $settings;
++$settings = array();
++
++
++/*******************************
++ * Quota Configuration Options *
++ *******************************/
++
++/*
++ * Use UNIX (filesystem), IMAP-based or cPanel (experimental) quotas?
++ * If you use UNIX (filesystem) quotas, you should set this to 0.
++ * If you use IMAP-based quotas, you should set this to 1.
++ * If you use cPanel quotas, you should set this to 2.
++ *
++ * Default: UNIX (filesystem) quotas
++ * 0: UNIX / 1: IMAP / 2: cPanel
++*/
++
++$settings['quota_type'] = 1;
++
++
++/*
++ * If you are using UNIX (filesystem) quotas, set the path 
++ * to the "sudo" binary here.  See INSTALL for instructions.
++*/
++
++$settings['sudo_binary'] = '/usr/bin/sudo';
++
++
++/*
++ * If you are using UNIX quotas, set the path to the "quota"
++ *  binary here.  See INSTALL for instructions.
++*/
++
++$settings['quota_binary'] = '/usr/bin/quota';
++
++
++/*
++ * If you are using UNIX quotas and your IMAP server and web server
++ * are on different physical machines (i.e. you want to check UNIX
++ * quotas remotely) set this to 1.  See INSTALL for instructions.
++ *
++ * This setting is only used for UNIX quotas.
++ *
++ * Default: Check on local server
++ * 0: Check on local server / 1: Check on remote server
++*/
++
++$settings['check_unix_on_remote_server'] = 0;
++
++
++/*
++ * If you are using UNIX quotas and your IMAP server and web server 
++ * are on different physical machines (i.e. you want to check UNIX 
++ * quotas remotely) set the path to the "ssh" binary here.  See INSTALL 
++ * for instructions.
++ *
++ * This setting is only used for remote UNIX quotas.
++*/
++
++$settings['ssh_binary'] = '/usr/bin/ssh';
++
++
++/*
++ * If you are using UNIX quotas and your IMAP server and web server 
++ * are on different physical machines (i.e. you want to check UNIX
++ * quotas remotely) set the username that will check quotas on your 
++ * IMAP server here.  See INSTALL for instructions.
++ *
++ * This setting is only used for remote UNIX quotas.
++*/
++
++$settings['remote_unix_user'] = 'cquotauser';
++
++
++/*
++ * If you are using UNIX quotas and your IMAP server and web server
++ * are on different physical machines (i.e. you want to check UNIX
++ * quotas remotely) set the IP address or hostname of your IMAP 
++ * server here.  See INSTALL for instructions.
++ *
++ * This setting is only used for remote UNIX quotas.
++*/
++
++$settings['remote_unix_server'] = '192.168.1.1';
++
++
++/*
++ * If you are using cPanel quotas, set the path to the "du" binary 
++ * here.  See INSTALL for instructions.
++*/
++
++$settings['du_binary'] = '/usr/bin/du';
++
++
++/*
++ * If you are using cPanel quotas, set the cPanel root path here.
++ * See INSTALL for instructions.
++*/
++
++$settings['cpanel_root'] = '/path/to/cpanel/root';
++
++
++/*
++ * If you want to use a separate IMAP connection when checking your
++ * quota, set this variable to 1, else, set it to 0
++ *
++ * This will be a waste of resources if there already is an open
++ * IMAP connection to your server. So, most probably you will not need
++ * to adjust this variable in most occasions.
++ *
++ * Default: Do not use separate IMAP connection
++ * 0: Do not use separate connection / 1: Use separate connection
++*/
++
++$settings['use_separate_imap_connection'] = 0;
++
++/***************************
++ * General Display Options *
++ ***************************/
++
++/*
++ * Which graph type do you prefer?
++ *
++ * You have three options here.  You can use HTML tables, GD images, 
++ * or Flash graphics.
++ *
++ * GD images can only be generated if you have GD support built into
++ * PHP (--with-gd).  For more information on how to install GD support
++ * in PHP, see: 
++ *
++ * http://www.php.net/manual/ref.image.php
++ *
++ * If your server doesn't have GD png, gif or jpg support but you enable GD
++ * graphics, the plugin will revert to HTML tables.
++ *
++ * As SquirrelMail is a pure PHP-driven webmail program, and some people do
++ * not have GD support in PHP, default is HTML tables.
++ *
++ * You will get the most satisfying graph output with GD or Flash graphs.
++ *
++ * Default: Use HTML
++ * 0: Use HTML / 1: Use GD / 2: Use Flash 
++*/
++
++$settings['graph_type'] = 0;
++
++
++/*
++ * Will the quota information be shown above or below the folders list?
++ *
++ * Default: Above
++ * 0: Below / 1: Above
++*/
++
++$settings['info_above_folders_list'] = 1;
++
++
++/*
++ * Font size for quota information displayed on the folder pane.
++ * Must be a positive or negative integer value.
++ *
++ * Default: -2
++*/
++
++$settings['font_size'] = -2;
++
++
++/*
++ * Alignment for the graph and text information on the folder pane.  
++ * This can be "left", "center" or "right".
++ *
++ * Default: "left"
++*/
++
++$settings['graph_alignment'] = 'left';  
++
++
++/*
++ * Whether or not to use horizontal rules to seperate quota information
++ * from other information on the folder pane.
++ *
++ * Default: No
++ * 0: No / 1: Yes
++*/
++
++$settings['use_hr'] = 0;
++
++
++/*
++ * Whether or not to show the introductory "Quota Usage" text for 
++ * size-based quotas and the "File Usage" text for count-based quotas 
++ * displayed on the folder pane.
++ *
++ * Default: On
++ * 0: Off / 1: On
++*/
++
++$settings['show_intro_texts'] = 1;
++
++
++/*
++ * Show the quota details above or below the quota graph?
++ *
++ * Default: Below
++ * 0: Below / 1: Above
++*/
++
++$settings['details_above_graph'] = 0;
++
++
++/*
++ * Whether to show used space (in KB, MB or GB depending on usage) for
++ * size-based quotas and file count for count-based quotas instead of
++ * percent usage in the information displayed on the folder pane.
++ * 
++ * Default: Show percent   
++ * 0: Show percent / 1: Show size/count
++*/
++
++$settings['show_quantity_instead_of_percent'] = 0;
++
++
++/*
++ * Quota percent thresholds.  If the user's usage is more than one 
++ * of these, the graph will use a different color and you also have 
++ * the option to show a warning in the SquirrelMail "MOTD" display 
++ * area when the user logs in.
++ *
++ * These must be positive integers.
++ *
++ * Defaults: Yellow: 70% / Red: 90%
++*/
++ 
++$settings['yellow_alert_limit'] = 70;
++$settings['red_alert_limit'] = 90;
++
++
++/*
++ * Yellow alert login warning option.  When turned on and when the 
++ * user's usage exceeds the yellow alert threshold (see above), a 
++ * warning message will be displayed in the SquirrelMail "MOTD" area
++ * when he/she logs on.
++ *
++ * Default: On
++ * 0: Off / 1: On
++*/
++
++$settings['show_yellow_alert_motd'] = 1;
++
++
++/*
++ * Red alert login warning option.  When turned on and when the 
++ * user's usage exceeds the red alert threshold (see above), a 
++ * warning message will be displayed in the SquirrelMail "MOTD" area
++ * when he/she logs on.
++ *
++ * Default: On
++ * 0: Off / 1: On
++*/
++
++$settings['show_red_alert_motd'] = 1;
++
++
++/*
++ * If your quotas are set based on 1 MB = 1000 KB, you may want to 
++ * turn this option on.  Otherwise, 1 MB = 1024 KB will be used for 
++ * all quota calculations, which is the generally accepted convention.
++ *
++ * Default: Off
++ * 0: Off (1MB = 1024KB) / 1: On (1MB = 1000KB)
++*/
++
++$settings['use_1000KB_per_MB'] = 0;
++
++
++/*
++ * Whether or not to show filesystem names.  This setting 
++ * is only used for UNIX (filesystem) quotas.
++ *
++ * This is useful when you have more than one filesystem 
++ * which have quotas for your users.                  
++ * 
++ * When set to "1" filesystem aliases override filesystem names.
++ * 
++ * Default: Off
++ * 0: Off
++ * 1: Show filesystem name or alias if an alias is set for that filesystem   
++*/                  
++ 
++$settings['show_filesystems'] = 0;
++
++
++/********************
++ * Override Options *
++ ********************/
++ 
++/*
++ * You can use this list to map different names to your filesystems.  For
++ * example, you can display "Mail Folder" instead of the filesystem name 
++ * "/dev/hda4".  Leave this empty if you don't want to set up any such 
++ * aliases.  If "show_filesystems" is set to "0" this list will have no 
++ * meaning.
++ *
++ * This setting is only used for UNIX quotas.
++ *
++ * If you use this setting, make sure to replace "/dev/hda8" and "/dev/sda1"
++ * below with the filesystems that are appropriate on your system.
++*/
++
++$settings['fs_alias'] = array (
++                               '/dev/hda8' => 'Mail',
++                               '/dev/sda6' => 'Data',
++                              );
++
++
++/*
++ * You can use this list to exclude some filesystems in your quota output.
++ * This allows you to only show quota information for the filesystem that
++ * your mail accounts reside on, to avoid confusion.
++ *
++ * You don't need to add filesystems which do not have any
++ * quota support here.
++ *
++ * You will need to write the exact filesystem name and, if you want to
++ * hide that filesystem, you will need to set its value to 1.  If you want
++ * to show that filesystem, you can remove its entry from this list, or
++ * you can set its value to 0.
++ *
++ * This setting is only used for UNIX quotas.
++ *
++ * If you use this setting, make sure to replace "/dev/hda8" and "/dev/sda1"
++ * below with the filesystems that are appropriate on your system.
++*/
++
++$settings['exclude_fs'] = array (
++                                 '/dev/hda8' => 1,
++                                 '/dev/sda6' => 0,
++                                );
++
++
++/*
++ * Some IMAP servers use dynamic quotas, so the users may not be able to
++ * see their true quotas.  In this situation you can override the max quota
++ * information returned by the plugin with these variables.  For size-based
++ * quotas, change "imap_size_quota", for count-based quotas, change
++ * "imap_count_quota".
++ *
++ * Leave blank for server returned quota information to be displayed.
++ *
++ * This setting is only used for IMAP quotas.
++ * 
++ * NOTE: Values must be entered in Kilobytes.
++*/
++ 
++$settings['imap_size_quota']  = '';
++$settings['imap_count_quota'] = '';
++
++
++/*
++ * As cPanel quotas work differently from UNIX or IMAP quotas, we have to
++ * use "du" to calculate these type of quotas.  Using "du" can be very
++ * exhaustive for a slow or loaded server.  So as a default, we calculate
++ * cPanel quotas only once for a logged in user.  To refresh the quota
++ * information the user has to log out and log in again.  This option
++ * overrides this behavior and refreshes cPanel quota information on every
++ * refresh of the folders list.
++ *
++ * CAUTION: enabling this may place unnecessarily high load on your server.
++ *
++ * cPanel quota information is always refreshed on the troubleshooting page,
++ * regardless of this option.
++ *
++ * This setting is only used for cPanel quotas.
++ *
++ * Default: Off
++ * 0: Off; calculate quota once at time of login
++ * 1: Always refresh cPanel information
++*/
++
++$settings['always_refresh_cpanel'] = 0;
++
++ 
++/********************
++ * Troubleshooting  *
++ ********************/
++
++/*
++ * Turn this on to see troubleshooting output from server for help
++ * debugging your Check Quota settings.  This will add a link to 
++ * the "Options" page with the name "Check Quota Troubleshooting".  
++ * You should always turn this off when Check Quota is working as 
++ * intended.
++ *
++ * Default: Off
++ * 0: Off / 1: On
++*/
++
++$settings['troubleshoot'] = 1;
++
+diff -ruN check_quota_old/functions.php check_quota/functions.php
+--- check_quota_old/functions.php	2007-08-04 16:58:53.000000000 +0200
++++ check_quota/functions.php	2023-05-22 08:14:04.000000000 +0200
+@@ -143,10 +143,11 @@
+   */
+ function check_quota_motd($args)
+ {
++  global $currentHookName;
+   if ( !sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) || empty($just_logged_in) )
+     return FALSE;
+ 
+-  if ( get_current_hook_name($args) != 'right_main_after_header' || !sqGetGlobalVar('check_quota_motd_displayed', $check_quota_motd_displayed, SQ_SESSION) || empty($check_quota_motd_displayed) )
++  if ( $currentHookName !== 'right_main_after_header' || !sqGetGlobalVar('check_quota_motd_displayed', $check_quota_motd_displayed, SQ_SESSION) || empty($check_quota_motd_displayed) )
+   {
+     global $check_quota;
+ 
+@@ -214,7 +215,7 @@
+     * settings and checks the user's quota.
+     *
+     */
+-  function CheckQuota()
++  function __construct()
+   {
+     $this->reset_debug();
+     $this->load_settings();
+@@ -230,7 +231,6 @@
+     global $settings;
+ 
+     include_once(SM_PATH . 'plugins/check_quota/config.php');
+-
+     $this->settings = $settings;
+     unset ($settings);
+   }  
+diff -ruN check_quota_old/troubleshoot.php check_quota/troubleshoot.php
+--- check_quota_old/troubleshoot.php	2007-08-06 11:16:29.000000000 +0200
++++ check_quota/troubleshoot.php	2023-05-22 07:55:31.000000000 +0200
+@@ -42,7 +42,7 @@
+ if ( empty($check_quota->settings['troubleshoot']) )
+ {
+   unset($check_quota);
+-  exit();
++//  exit();
+ }
+ 
+ $cq_to = '<tr><td colspan="2" bgcolor="' . $color[4] . '" align="center"><font color="' . $color[8] . '"><b>';

squirrelmail_config.php

@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * SquirrelMail Configuration File
+ * Created using the configure script, conf.pl
+ */
+
+$config_version = '1.5.0';
+$config_use_color = 1;
+
+$org_name      = "SquirrelMail";
+$org_logo      = SM_PATH . 'images/sm_logo.png';
+$org_logo_width  = '308';
+$org_logo_height = '111';
+$org_title     = "SquirrelMail";
+$signout_page  = '';
+$frame_top     = '_top';
+
+$provider_uri     = '';
+
+$provider_name     = '';
+
+$motd = "";
+
+$squirrelmail_default_language = 'en_US';
+$default_charset          = 'utf-8';
+$show_alternative_names   = true;
+$aggressive_decoding   = true;
+$lossy_encoding        = false;
+
+$domain                 = 'danwin1210.de';
+$imapServerAddress      = 'danwin1210.de';
+$imapPort               = 993;
+$useSendmail            = false;
+$smtpServerAddress      = 'danwin1210.de';
+$smtpPort               = 465;
+$sendmail_path          = '/usr/sbin/sendmail';
+$sendmail_args          = '-i -t';
+$pop_before_smtp        = false;
+$pop_before_smtp_host   = '';
+$imap_server_type       = 'dovecot';
+$invert_time            = false;
+$optional_delimiter     = 'detect';
+$encode_header_key      = '';
+
+$default_folder_prefix          = '';
+$trash_folder                   = 'Trash';
+$sent_folder                    = 'Sent';
+$draft_folder                   = 'Drafts';
+$default_move_to_trash          = true;
+$default_move_to_sent           = true;
+$default_save_as_draft          = true;
+$show_prefix_option             = false;
+$list_special_folders_first     = true;
+$use_special_folder_color       = true;
+$auto_expunge                   = true;
+$default_sub_of_inbox           = false;
+$show_contain_subfolders_option = false;
+$default_unseen_notify          = 2;
+$default_unseen_type            = 1;
+$auto_create_special            = true;
+$delete_folder                  = false;
+$noselect_fix_enable            = false;
+
+$data_dir                 = '/var/local/squirrelmail/data/';
+$attachment_dir           = '/var/local/squirrelmail/attach/';
+$dir_hash_level           = 0;
+$default_left_size        = '150';
+$force_username_lowercase = true;
+$default_use_priority     = false;
+$hide_sm_attributions     = false;
+$default_use_mdn          = false;
+$edit_identity            = false;
+$edit_name                = true;
+$edit_reply_to            = true;
+$hide_auth_header         = true;
+$disable_thread_sort      = false;
+$disable_server_sort      = false;
+$allow_charset_search     = true;
+$allow_advanced_search    = 0;
+
+$time_zone_type           = 0;
+
+$config_location_base     = '';
+
+$disable_plugins          = false;
+$disable_plugins_user     = '';
+
+$plugins[] = 'check_quota';
+
+$user_theme_default = 0;
+$user_themes[0]['PATH'] = 'none';
+$user_themes[0]['NAME'] = 'Default';
+$user_themes[1]['PATH'] = SM_PATH . 'css/blue_gradient/';
+$user_themes[1]['NAME'] = 'Blue Options';
+$user_themes[2]['PATH'] = SM_PATH . 'css/alien_glow/';
+$user_themes[2]['NAME'] = 'Alien Glow';
+$user_themes[3]['PATH'] = SM_PATH . 'css/autumn/';
+$user_themes[3]['NAME'] = 'Autumn';
+$user_themes[4]['PATH'] = SM_PATH . 'css/autumn2/';
+$user_themes[4]['NAME'] = 'Autumn2';
+$user_themes[5]['PATH'] = SM_PATH . 'css/black_bean_burrito/';
+$user_themes[5]['NAME'] = 'Black Bean Burrito';
+$user_themes[6]['PATH'] = SM_PATH . 'css/blue_grey/';
+$user_themes[6]['NAME'] = 'Blue Grey';
+$user_themes[7]['PATH'] = SM_PATH . 'css/blue_on_blue/';
+$user_themes[7]['NAME'] = 'Blue On Blue';
+$user_themes[8]['PATH'] = SM_PATH . 'css/bluesnews/';
+$user_themes[8]['NAME'] = 'Bluesnews';
+$user_themes[9]['PATH'] = SM_PATH . 'css/bluesome/';
+$user_themes[9]['NAME'] = 'Bluesome';
+$user_themes[10]['PATH'] = SM_PATH . 'css/bluesteel/';
+$user_themes[10]['NAME'] = 'Bluesteel';
+
+$icon_theme_def = 1;
+$icon_theme_fallback = 3;
+$icon_themes[0]['PATH'] = 'none';
+$icon_themes[0]['NAME'] = 'No Icons';
+$icon_themes[1]['PATH'] = 'template';
+$icon_themes[1]['NAME'] = 'Template Default Icons';
+$icon_themes[2]['PATH'] = SM_PATH . 'images/themes/default/';
+$icon_themes[2]['NAME'] = 'Default Icon Set';
+$icon_themes[3]['PATH'] = SM_PATH . 'images/themes/xp/';
+$icon_themes[3]['NAME'] = 'XP Style Icons';
+
+$templateset_default = 'default';
+$templateset_fallback = 'default';
+$rpc_templateset = 'default_rpc';
+$aTemplateSet[0]['ID'] = 'default';
+$aTemplateSet[0]['NAME'] = 'Default';
+$aTemplateSet[1]['ID'] = 'default_advanced';
+$aTemplateSet[1]['NAME'] = 'Advanced';
+
+$default_fontsize = '';
+$default_fontset = '';
+
+$fontsets = array();
+$fontsets['verasans'] = 'bitstream vera sans,verdana,sans-serif';
+$fontsets['sans'] = 'helvetica,arial,sans-serif';
+$fontsets['comicsans'] = 'comic sans ms,sans-serif';
+$fontsets['tahoma'] = 'tahoma,sans-serif';
+$fontsets['serif'] = 'serif';
+
+$default_use_javascript_addr_book = false;
+$addrbook_dsn = '';
+$addrbook_table = 'address';
+
+$prefs_dsn = '';
+$prefs_table = 'userprefs';
+$prefs_user_field = 'user';
+$prefs_user_size = 128;
+$prefs_key_field = 'prefkey';
+$prefs_key_size = 64;
+$prefs_val_field = 'prefval';
+$prefs_val_size = 65536;
+
+$addrbook_global_dsn = '';
+$addrbook_global_table = 'global_abook';
+$addrbook_global_writeable = false;
+$addrbook_global_listing = false;
+
+$abook_global_file = '';
+$abook_global_file_writeable = false;
+
+$abook_global_file_listing = true;
+
+$abook_file_line_length = 2048;
+
+$no_list_for_subscribe = false;
+$smtp_auth_mech        = 'plain';
+$smtp_sitewide_user    = '';
+$smtp_sitewide_pass    = '';
+$imap_auth_mech        = 'plain';
+$use_imap_tls          = 1;
+$use_smtp_tls          = 1;
+$display_imap_login_error = false;
+$session_name          = 'SQMSESSID';
+$only_secure_cookies     = true;
+$disable_security_tokens = false;
+$check_referrer          = '';
+$use_transparent_security_image = true;
+$allow_svg_display = false;
+$block_svg_download = false;
+$fix_broken_base64_encoded_messages = false;
+
+$use_iframe = false;
+$ask_user_info = false;
+$use_icons = false;
+
+$use_php_recode = false;
+$use_php_iconv = true;
+
+$buffer_output = false;
+
+$allow_remote_configtest = false;
+$secured_config = true;
+$sq_https_port = 443;
+$sq_ignore_http_x_forwarded_headers = true;
+$sm_debug_mode = SM_DEBUG_MODE_OFF;
+

squirrelmail_plugin_hooks.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * SquirrelMail Plugin Hook Registration File
+ * Auto-generated using the configure script, conf.pl
+ */
+
+global $squirrelmail_plugin_hooks;
+
+$squirrelmail_plugin_hooks['left_main_before']['check_quota'] 
+    = 'check_quota_graph_before_do';
+$squirrelmail_plugin_hooks['left_main_after']['check_quota'] 
+    = 'check_quota_graph_after_do';
+$squirrelmail_plugin_hooks['right_main_after_header']['check_quota'] 
+    = 'check_quota_motd_do';
+$squirrelmail_plugin_hooks['template_construct_left_main.tpl']['check_quota'] 
+    = 'check_quota_graph_do';
+$squirrelmail_plugin_hooks['template_construct_motd.tpl']['check_quota'] 
+    = 'check_quota_motd_do';
+$squirrelmail_plugin_hooks['optpage_register_block']['check_quota'] 
+    = 'check_quota_optpage_register_block_do';
+$squirrelmail_plugin_hooks['configtest']['check_quota'] 
+    = 'check_quota_check_configuration_do';
+
+

tools/create_admin.php

@@ -0,0 +1,9 @@
+<?php
+const ADMIN_USER='admin';
+const ADMIN_PASS='YOUR_PASSWORD';
+
+require_once __DIR__ . '/../common_config.php';
+$db = get_db_instance();
+$hash = password_hash( ADMIN_PASS, PASSWORD_ARGON2ID );
+$stmt = $db->prepare( 'INSERT INTO admin (password_hash_type, password, superadmin, username, created, modified) VALUES ("{ARGON2ID}", ?, 1, ?, NOW(), NOW());' );
+$stmt->execute( [ $hash, ADMIN_USER ] );

www/admin.php

@@ -289,12 +289,11 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
 						$additional = preg_split( "/[\s,]+/", $_POST[ 'alias_to' ] );
 						$alias_goto .= validate_email_list( $additional, $msg );
 					}
-					$quota = 1024 * 1024 * 1024;
 					$alias_goto = rtrim( $alias_goto, ',' );
 					$stmt = $db->prepare( 'UPDATE alias SET goto = ?, enforce_tls_in = ?, active = ? WHERE address = ?;' );
 					$stmt->execute( [ $alias_goto, ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), $_POST[ 'user' ] ] );
 					$stmt = $db->prepare( 'UPDATE mailbox SET enforce_tls_in = ?, enforce_tls_out = ?, active = ?, quota = ?, modified = NOW() WHERE username = ?;' );
-					$stmt->execute( [ ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), $quota, $_POST[ 'user' ] ] );
+					$stmt->execute( [ ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), DEFAULT_QUOTA, $_POST[ 'user' ] ] );
 					$msg .= '<div class="green" role="alert">'.htmlspecialchars(_('Successfully updated mailbox.')).'</div>';
 				}
 			} elseif ( $_POST[ 'action' ] === 'save_new_mailbox' && ! empty( $_POST[ 'user' ] ) ) {
@@ -316,7 +315,6 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
 						$user = $parser->getLocalPart();
 						$domain = $parser->getDomainPart();
 						$hash = password_hash( $_POST[ 'pwd' ], PASSWORD_ARGON2ID );
-						$quota = 50 * 1024 * 1024;
 						$alias_goto = '';
 						if ( isset( $_POST[ 'alias_keep_copy' ] ) ) {
 							$alias_goto .= $email . ',';
@@ -329,7 +327,7 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
 						$stmt = $db->prepare( 'INSERT INTO alias (address, goto, domain, created, modified, enforce_tls_in, active) VALUES (?, ?, ?, NOW(), NOW(), ?, ?);' );
 						$stmt->execute( [ $email, $alias_goto, $domain, ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ) ] );
 						$stmt = $db->prepare( 'INSERT INTO mailbox (username, password, quota, local_part, domain, created, modified, password_hash_type, openpgpkey_wkd, enforce_tls_in, enforce_tls_out, active) VALUES(?, ?, ?, ?, ?, NOW(), NOW(), ?, ?, ?, ?, ?);' );
-						$stmt->execute( [ $email, $hash, $quota, $user, $domain, '{ARGON2ID}', z_base32_encode( hash( 'sha1', mb_strtolower( $user ), true ) ), ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ) ] );
+						$stmt->execute( [ $email, $hash, DEFAULT_QUOTA, $user, $domain, '{ARGON2ID}', z_base32_encode( hash( 'sha1', mb_strtolower( $user ), true ) ), ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ) ] );
 						$msg .= '<div class="green" role="alert">'.htmlspecialchars(_('Successfully created new mailbox!')).'</div>';
 					}
 				}

www/index.php

@@ -22,7 +22,10 @@ global $language, $dir, $locale;
 <p><?php echo htmlspecialchars(_('Info')); ?> | <a href="<?php echo ROOT_URL; ?>register.php"><?php echo htmlspecialchars(_('Register')); ?></a> | <a href="<?php echo ROOT_URL; ?>manage_account.php"><?php echo htmlspecialchars(_('Manage account')); ?></a> | <a href="<?php echo ROOT_URL; ?>squirrelmail/src/login.php" target="_blank"><?php echo htmlspecialchars(_('SquirrelMail')); ?></a> | <a href="<?php echo ROOT_URL; ?>snappymail/" target="_blank"><?php echo htmlspecialchars(_('SnappyMail')); ?></a> | <a href="<?php echo WEB_XMPP_URL; ?>" target="_blank" rel="noopener"><?php echo htmlspecialchars(_('Web-XMPP')); ?></a></p>
 <h2><?php echo htmlspecialchars(_('What you will get')); ?></h2>
 <p><?php printf(htmlspecialchars(_('You get a free anonymous E-Mail address and an XMPP/Jabber account using the same details. Your Jabber ID is user@%1$s and can be connected to directly from clearnet or via Tor hidden service (%2$s).')), CLEARNET_SERVER, ONION_SERVER); ?></p>
-<p><?php printf(htmlspecialchars(_('You will have 50MB of disk space available for your mails. If you need more space, %1$s. Your E-Mail address will be %2$s')), '<a href="'.CONTACT_URL.'">'.htmlspecialchars(_('contact me')).'</a>', CLEARNET_SERVER); ?></p>
+<?php if(DEFAULT_QUOTA > 0) { ?>
+<p><?php printf(htmlspecialchars(_('You will have %1$s disk space available for your mails. If you need more space, %2$s.')), bytes_to_human_readable(DEFAULT_QUOTA), '<a href="'.CONTACT_URL.'">'.htmlspecialchars(_('contact me')).'</a>'); ?></p>
+<?php } ?>
+<p><?php printf(htmlspecialchars(_('Your E-Mail address will be user@%s')), CLEARNET_SERVER); ?></p>
 <p><?php printf(htmlspecialchars(_('For privacy, please use PGP mail encryption, if you can. This prevents others from reading your mails to protect your privacy. You can %1$s or similar software for it. Once you have generated your PGP key, you can %2$s to make use of WKD automatic discovery for mail clients.')), '<a href="https://gnupg.org/download/index.html" target="_blank" rel="noopener noreferrer">'.htmlspecialchars(_('download GnuPG')).'</a>', '<a href="manage_account.php">'.htmlspecialchars(_('add it to your account')).'</a>'); ?></p>
 <p><?php printf(htmlspecialchars(_('You can choose between two Web-Mail clients installed on the server. %1$s is a very old mail client which works without any JavaScript and is thus the most popular mail client among darknet users. However, it hasn\'t been under development for many years and does not support all features that mail has to offer. You may see strange attachments that should have been inlined in your email, such as PGP/MIME encrypted email messages. A more modern client is %2$s, which also supports PGP encryption within your browser and is more similar to what you may be used to from other mail services. SnappyMail requires JavaScript though, so SquirrelMail is for you if you do not trust executing JavaScript in your browser. Alternatively, you can simply use your favourite desktop mail client and configure it with the settings given below.')), '<a href="squirrelmail/src/login.php">'.htmlspecialchars(_('SquirrelMail')).'</a>', '<a href="snappymail/">'.htmlspecialchars(_('SnappyMail')).'</a>'); ?></p>
 <h2><?php echo htmlspecialchars(_('E-Mail Setup')); ?></h2>

www/manage_account.php

@@ -49,7 +49,7 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
 			if ( $ok ) {
 				$db = get_db_instance();
 				$user = $match[ 1 ];
-				$domain = $match[ 3 ] ?? 'danwin1210.de';
+				$domain = $match[ 3 ] ?? CLEARNET_SERVER;
 				$stmt = $db->prepare( 'SELECT target_domain FROM alias_domain WHERE alias_domain = ? AND active=1;' );
 				$stmt->execute( [ $domain ] );
 				if ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {

www/register.php

@@ -31,7 +31,7 @@ if ( isset( $_POST[ 'user' ] ) ) {
 		$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Invalid username. It may not contain a +, \', " or /.')).'</div>';
 	}
 	$user = mb_strtolower( $match[ 1 ] ?? '' );
-	$domain = $match[ 3 ] ?? 'danwin1210.de';
+	$domain = $match[ 3 ] ?? CLEARNET_SERVER;
 	if ( $ok && ( empty( $_POST[ 'pwd' ] ) || empty( $_POST[ 'pwd2' ] ) || $_POST[ 'pwd' ] !== $_POST[ 'pwd2' ] ) ) {
 		$ok = false;
 		$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Passwords empty or don\'t match')).'</div>';
@@ -69,8 +69,8 @@ if ( isset( $_POST[ 'user' ] ) ) {
 			$hash = password_hash( $_POST[ 'pwd' ], PASSWORD_ARGON2ID );
 			$stmt = $db->prepare( 'INSERT INTO alias (address, goto, domain, created, modified) VALUES (?, ?, ?, NOW(), NOW());' );
 			$stmt->execute( [ "$user@$domain", "$user@$domain", $domain ] );
-			$stmt = $db->prepare( 'INSERT INTO mailbox (username, password, quota, local_part, domain, created, modified, password_hash_type, openpgpkey_wkd) VALUES(?, ?, 51200000, ?, ?, NOW(), NOW(), ?, ?);' );
+			$stmt = $db->prepare( 'INSERT INTO mailbox (username, password, quota, local_part, domain, created, modified, password_hash_type, openpgpkey_wkd) VALUES(?, ?, ?, ?, ?, NOW(), NOW(), ?, ?);' );
-			$stmt->execute( [ "$user@$domain", $hash, $user, $domain, '{ARGON2ID}', z_base32_encode( hash( 'sha1', mb_strtolower( $user ), true ) ) ] );
+			$stmt->execute( [ "$user@$domain", $hash, DEFAULT_QUOTA, $user, $domain, '{ARGON2ID}', z_base32_encode( hash( 'sha1', mb_strtolower( $user ), true ) ) ] );
 			$msg .= '<div class="green" role="alert">'.htmlspecialchars(_('Successfully created new mailbox!')).'</div>';
 		}
 	}

www/terms.php

@@ -29,7 +29,9 @@ global $language, $dir, $locale;
 <li><?php echo htmlspecialchars(_('Please refrain from sending threats of violence or any harmful content. Dealing with law enforcement requests related to such incidents consumes a significant amount of time.')); ?></li>
 <li><?php echo htmlspecialchars(_('If you lose your password, I will not reset it unless you can prove ownership of the account. You could do so by signing an email with the same PGP key that you use in your account.')); ?></li>
 <li><?php echo htmlspecialchars(_('You are responsible for the security of your account and password.')); ?></li>
-<li><?php printf(htmlspecialchars(_('Your email account only has 50MB of disk space by default. If you need more, you can %s, and I will increase it for free.')), '<a href="'.CONTACT_URL.'">'.htmlspecialchars(_('contact me')).'</a>'); ?></li>
+<?php if(DEFAULT_QUOTA > 0) { ?>
+<li><?php printf(htmlspecialchars(_('Your email account has %1$s of disk space by default. If you need more, you can %2$s, and I will increase it for free.')), bytes_to_human_readable(DEFAULT_QUOTA), '<a href="'.CONTACT_URL.'">'.htmlspecialchars(_('contact me')).'</a>'); ?></li>
+<?php } ?>
 <li><?php echo htmlspecialchars(_('The XMPP service provides message archiving and HTTP upload, which can keep your messages and files for up to 1 week. Up to 100MB of file storage is available per user.')); ?></li>
 <li><?php echo htmlspecialchars(_('I reserve the right to block or delete your account without prior notice.')); ?></li>
 <li><?php echo htmlspecialchars(_('I reserve the right to change these terms without prior notice.')); ?></li>