Skip to content

Commit c08d872

Browse files
author
Till Brehm
committed
Merge branch '5705-backup-information' into 'stable-3.1'
Resolve "Information on backup compression & encryption" Closes #5705 See merge request ispconfig/ispconfig3!1117
2 parents 8fde67e + 4a42c7a commit c08d872

27 files changed

+67
-92
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Cota de disco não pode ser configurada para
162162
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
163163
$wb["backup_format_web_txt"] = 'Backup format for web files';
164164
$wb["backup_format_db_txt"] = 'Backup format for database';
165-
$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.';
166-
$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: ';
165+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
167166
$wb["backup_compression_options_txt"] = 'Compression options';
168-
$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.";
167+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
169168
$wb["backup_encryption_options_txt"] = 'Encryption options';
170169
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
171170
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota kann nicht 0 sein.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
162162
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
163163
$wb["backup_format_web_txt"] = 'Backup format for web files';
164164
$wb["backup_format_db_txt"] = 'Backup format for database';
165-
$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.';
166-
$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: ';
165+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
167166
$wb["backup_compression_options_txt"] = 'Compression options';
168-
$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.";
167+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
169168
$wb["backup_encryption_options_txt"] = 'Encryption options';
170169
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
171170
$wb["backup_password_txt"] = 'Password';

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ $wb['limit_web_quota_not_0_txt'] = 'Harddisk Quota cannot be set to 0.';
157157
$wb['proxy_protocol_txt'] = 'Enable PROXY Protocol';
158158
$wb["backup_format_web_txt"] = 'Backup format for web files';
159159
$wb["backup_format_db_txt"] = 'Backup format for database';
160-
$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.';
161-
$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: ';
160+
$wb["backup_missing_utils_txt"] = 'The following formats can not be used because they are not installed on the webserver: ';
162161
$wb["backup_compression_options_txt"] = 'Compression options';
163-
$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.";
162+
$wb["backup_encryption_note_txt"] = "Encryption is only available for 7z, RAR, and zip (not secure).";
164163
$wb["backup_encryption_options_txt"] = 'Encryption options';
165164
$wb["backup_enable_encryption_txt"] = 'Enable encryption';
166165
$wb["backup_password_txt"] = 'Password';

0 commit comments

Comments
 (0)