Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: Marius Burkard

interface/lib/classes/tools_monitor.inc.php

@@ -184,9 +184,10 @@ function showMemUsage () {
 
 			foreach($data as $key => $value) {
 				if ($key != '') {
+					$memory = $app->functions->formatBytes($value);
 					$html .= '<tr>
                         <td>' . $key . ':</td>
-                        <td>' . $value . '</td>
+                        <td>' . $memory . '</td>
                         </tr>';
 				}
 			}

interface/web/sites/lib/lang/ar_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/bg_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/br_web_vhost_domain.lng

@@ -162,10 +162,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Cota de disco não pode ser configurada para
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/ca_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/cz_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/de_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota kann nicht 0 sein.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/dk_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/el_web_vhost_domain.lng

@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';

interface/web/sites/lib/lang/en_web_vhost_domain.lng

@@ -162,10 +162,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
 $wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
 $wb["backup_format_web_txt"] = 'Backup format for web files';
 $wb["backup_format_db_txt"] = 'Backup format for database';
-$wb["backup_format_web_note_txt"] = 'In "default" mode ISPConfig has the following behaviour: if backup mode is set as web user, then "zip" format is used for web files, otherwise backup mode is set as root user and "tar (gzip)" format is used; database is compressed in "gzip" format. Only "tar" based formats and "rar" preserve file ownership and permissions of web files and guarantee correct restore.';
-$wb["backup_missing_utils_txt"] = 'Note: some utils are missing in the system that may prevent you from using some compression formats. Please, install the following utils to avoid possible backup problems: ';
+$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
 $wb["backup_compression_options_txt"] = 'Compression options';
-$wb["backup_encryption_note_txt"] = "Encryption is available only for the following backup formats: \"7z\", \"RAR\", \"zip\" (not secure). If any other format is used then encryption can't be applied and encryption settings are ignored. You can safely change the password at anytime: the \"Restore\" button will still work for old backups encrypted with a previous password. You don't need to type a password to restore backups using the \"Restore\" button. Password is required when you extract the archives manually. Please, don't forget your password, because it's impossible to restore it.";
+$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
 $wb["backup_encryption_options_txt"] = 'Encryption options';
 $wb["backup_enable_encryption_txt"] = 'Enable encryption';
 $wb["backup_password_txt"] = 'Password';