Skip to content

Commit 7a22194

Browse files
author
thom
committed
Resolve merge conflict
2 parents 1e0edca + ca5966f commit 7a22194

File tree

114 files changed

+532
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+532
-404
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2832,7 +2832,7 @@ public function make_ispconfig_ssl_cert() {
28322832
$check_acme_file = $acme_cert_dir . '/cert.pem';
28332833
}
28342834
}
2835-
if ((!@is_dir($acme_cert_dir) || !@file_exists($check_acme_file) || !@file_exists($ssl_crt_file)) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
2835+
if ((!@is_dir($acme_cert_dir) || !@file_exists($check_acme_file) || !@file_exists($ssl_crt_file) || md5_file($check_acme_file) != md5_file($ssl_crt_file)) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
28362836

28372837
// This script is needed earlier to check and open http port 80 or standalone might fail
28382838
// Make executable and temporary symlink latest letsencrypt pre, post and renew hook script before install

interface/lib/lang/bg.lng

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -74,91 +74,91 @@ $wb['submit_confirmation'] = 'Наистина ли си съгласен с т
7474
$wb['top_menu_mailuser'] = 'Mailuser';
7575
$wb['globalsearch_resultslimit_of_txt'] = 'of';
7676
$wb['globalsearch_resultslimit_results_txt'] = 'results';
77-
$wb['globalsearch_noresults_text_txt'] = 'No results.';
78-
$wb['globalsearch_noresults_limit_txt'] = '0 results';
79-
$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
80-
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
81-
$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
82-
$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
83-
$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
84-
$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
85-
$wb['datalog_status_i_web_database'] = 'Create new database';
86-
$wb['datalog_status_u_web_database'] = 'Update database';
87-
$wb['datalog_status_d_web_database'] = 'Delete database';
88-
$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
89-
$wb['datalog_status_u_web_database_user'] = 'Update database user';
90-
$wb['datalog_status_d_web_database_user'] = 'Delete database user';
91-
$wb['datalog_status_i_web_domain'] = 'Create new website';
92-
$wb['datalog_status_u_web_domain'] = 'Update website settings';
93-
$wb['datalog_status_d_web_domain'] = 'Delete website';
94-
$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
95-
$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
96-
$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
97-
$wb['datalog_status_i_mail_domain'] = 'Create email domain';
98-
$wb['datalog_status_u_mail_domain'] = 'Update email domain';
99-
$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
100-
$wb['datalog_status_i_mail_user'] = 'Create email user';
101-
$wb['datalog_status_u_mail_user'] = 'Update email user';
102-
$wb['datalog_status_d_mail_user'] = 'Delete email user';
103-
$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
104-
$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
105-
$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
106-
$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
107-
$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
108-
$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
109-
$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
110-
$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
111-
$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
112-
$wb['datalog_status_i_cron'] = 'Create cron job';
113-
$wb['datalog_status_u_cron'] = 'Update cron job';
114-
$wb['datalog_status_d_cron'] = 'Delete cron job';
115-
$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
116-
$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
117-
$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
118-
$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
119-
$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
120-
$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
121-
$wb['datalog_status_i_shell_user'] = 'Create shell user';
122-
$wb['datalog_status_u_shell_user'] = 'Update shell user';
123-
$wb['datalog_status_d_shell_user'] = 'Delete shell user';
124-
$wb['datalog_status_i_web_folder'] = 'Create folder protection';
125-
$wb['datalog_status_u_web_folder'] = 'Update folder protection';
126-
$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
127-
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
128-
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
129-
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
130-
$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
131-
$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
132-
$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
133-
$wb['login_as_txt'] = 'Log in as';
134-
$wb['no_domain_perm'] = 'You have no permission for this domain.';
135-
$wb['no_destination_perm'] = 'You have no permission for this destination.';
136-
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
137-
$wb['gender_m_txt'] = 'Mr.';
138-
$wb['gender_f_txt'] = 'Ms.';
139-
$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has records in the billing module, therefore he cannot be deleted.';
140-
$wb['yes_txt'] = 'Yes';
141-
$wb['no_txt'] = 'No';
142-
$wb['None'] = 'None';
143-
$wb['strength_1'] = 'Weak';
144-
$wb['strength_2'] = 'Fair';
145-
$wb['strength_3'] = 'Good';
146-
$wb['strength_4'] = 'Strong';
147-
$wb['strength_5'] = 'Very Strong';
77+
$wb['globalsearch_noresults_text_txt'] = 'Няма намерени резултати.';
78+
$wb['globalsearch_noresults_limit_txt'] = '0 резултата';
79+
$wb['globalsearch_searchfield_watermark_txt'] = 'Търсене';
80+
$wb['globalsearch_suggestions_text_txt'] = 'Предложения';
81+
$wb['global_tabchange_warning_txt'] = 'Промените в тази секция бъдат запазени ако натиснете OK. При отмяна ще бъдат отхвърлени.';
82+
$wb['global_tabchange_discard_txt'] = 'Направили сте промени, които не са запазени. Промените ще бъдат отхвърлени, ако продължите.';
83+
$wb['datalog_changes_txt'] = 'Следните промени все още не са отразени на всички сървъри:';
84+
$wb['datalog_changes_end_txt'] = 'Запазването на промените може да отнеме до една минута. Моля, бъдете търпеливи.';
85+
$wb['datalog_status_i_web_database'] = 'Създай нова база данни';
86+
$wb['datalog_status_u_web_database'] = 'Обнови база данни';
87+
$wb['datalog_status_d_web_database'] = 'Изтрий база данни';
88+
$wb['datalog_status_i_web_database_user'] = 'Създай потребител за база данни';
89+
$wb['datalog_status_u_web_database_user'] = 'Обнови потребител за база данни';
90+
$wb['datalog_status_d_web_database_user'] = 'Изтрий потребител за база данни';
91+
$wb['datalog_status_i_web_domain'] = 'Създай нов уебсайт';
92+
$wb['datalog_status_u_web_domain'] = 'Обнови уебсайт настройките';
93+
$wb['datalog_status_d_web_domain'] = 'Изтрий уебсайт';
94+
$wb['datalog_status_i_ftp_user'] = 'Създай FTP потребител';
95+
$wb['datalog_status_u_ftp_user'] = 'Обнови FTP потребител';
96+
$wb['datalog_status_d_ftp_user'] = 'Изтрий FTP потребител';
97+
$wb['datalog_status_i_mail_domain'] = 'Създай имейл домейн';
98+
$wb['datalog_status_u_mail_domain'] = 'Обнови имейл домейн';
99+
$wb['datalog_status_d_mail_domain'] = 'Изтрий имейл домейн';
100+
$wb['datalog_status_i_mail_user'] = 'Създай имейл потребител';
101+
$wb['datalog_status_u_mail_user'] = 'Обнови имейл потребител';
102+
$wb['datalog_status_d_mail_user'] = 'Изтрий имейл потребител';
103+
$wb['datalog_status_i_mail_forwarding'] = 'Създай имейл адрес';
104+
$wb['datalog_status_u_mail_forwarding'] = 'Обнови имейл адрес';
105+
$wb['datalog_status_d_mail_forwarding'] = 'Изтрий имейл адрес';
106+
$wb['datalog_status_i_dns_rr'] = 'Създай DNS запис';
107+
$wb['datalog_status_u_dns_rr'] = 'Обнови DNS запис';
108+
$wb['datalog_status_d_dns_rr'] = 'Изтрий DNS запис';
109+
$wb['datalog_status_i_dns_soa'] = 'Създай DNS зона';
110+
$wb['datalog_status_u_dns_soa'] = 'Обнови DNS зона';
111+
$wb['datalog_status_d_dns_soa'] = 'Изтрий DNS зона';
112+
$wb['datalog_status_i_cron'] = 'Създай автоматична задача';
113+
$wb['datalog_status_u_cron'] = 'Обнови автоматична задача';
114+
$wb['datalog_status_d_cron'] = 'Изтрий автоматична задача';
115+
$wb['datalog_status_i_mail_get'] = 'Създай имейл акаунт за извличане на поща';
116+
$wb['datalog_status_u_mail_get'] = 'Обнови имейл акаунт за извличане на поща';
117+
$wb['datalog_status_d_mail_get'] = 'Изтрий имейл акаунт за извличане на поща';
118+
$wb['datalog_status_i_mail_mailinglist'] = 'Създай пощенски списък';
119+
$wb['datalog_status_u_mail_mailinglist'] = 'Обнови пощенски списък';
120+
$wb['datalog_status_d_mail_mailinglist'] = 'Изтрий пощенски списък';
121+
$wb['datalog_status_i_shell_user'] = 'Създай shell потребител';
122+
$wb['datalog_status_u_shell_user'] = 'Обнови shell потребител';
123+
$wb['datalog_status_d_shell_user'] = 'Изтрий shell потребител';
124+
$wb['datalog_status_i_web_folder'] = 'Създай защитена директория';
125+
$wb['datalog_status_u_web_folder'] = 'Обнови защитена директория';
126+
$wb['datalog_status_d_web_folder'] = 'Изтрий защитена директория';
127+
$wb['datalog_status_i_web_folder_user'] = 'Създай потребител за защитена директория';
128+
$wb['datalog_status_u_web_folder_user'] = 'Обнови потребител за защитена директория';
129+
$wb['datalog_status_d_web_folder_user'] = 'Изтрий потребител за защитена директория';
130+
$wb['datalog_status_i_spamfilter_users'] = 'Създай спам филтър настройки';
131+
$wb['datalog_status_u_spamfilter_users'] = 'Обнови спам филтър настройки';
132+
$wb['datalog_status_d_spamfilter_users'] = 'Изтрий спам филтър настройки';
133+
$wb['login_as_txt'] = 'Логнат като';
134+
$wb['no_domain_perm'] = 'Нямате права върху този домейн.';
135+
$wb['no_destination_perm'] = 'Нямате права върху тази дестинация.';
136+
$wb['client_you_are_locked'] = 'Нямате права да променяте каквито и да било настройки.';
137+
$wb['gender_m_txt'] = 'Г-н';
138+
$wb['gender_f_txt'] = 'Г-жа';
139+
$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'Този клиент не може да бъде изтрит, тъй като за него съществуват записи в билинг системата.';
140+
$wb['yes_txt'] = 'Да';
141+
$wb['no_txt'] = 'Не';
142+
$wb['None'] = 'Без';
143+
$wb['strength_1'] = 'Слаба';
144+
$wb['strength_2'] = 'Лесна';
145+
$wb['strength_3'] = 'Добра';
146+
$wb['strength_4'] = 'Сложна';
147+
$wb['strength_5'] = 'Много сложна';
148148
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
149149
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
150150
$wb['security_check1_txt'] = 'Check for security permission:';
151151
$wb['security_check2_txt'] = 'failed.';
152-
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
153-
$wb['select_directive_snippet_txt'] = 'Directive Snippets';
154-
$wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
155-
$wb['datalog_status_i_xmpp_domain'] = 'Create XMPP domain';
156-
$wb['datalog_status_u_xmpp_domain'] = 'Update XMPP domain';
157-
$wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
158-
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
159-
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160-
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
152+
$wb['err_csrf_attempt_blocked'] = 'CSRF опитът е блокиран.';
153+
$wb['select_directive_snippet_txt'] = 'Извлечения от директивите';
154+
$wb['select_master_directive_snippet_txt'] = 'Мастър Извлечения от директивите';
155+
$wb['datalog_status_i_xmpp_domain'] = 'Създай XMPP домейн';
156+
$wb['datalog_status_u_xmpp_domain'] = 'Обнови XMPP домейн';
157+
$wb['datalog_status_d_xmpp_domain'] = 'Изтрий XMPP домейн';
158+
$wb['datalog_status_i_xmpp_user'] = 'Създай XMPP потребител';
159+
$wb['datalog_status_u_xmpp_user'] = 'Обнови XMPP потребител';
160+
$wb['datalog_status_d_xmpp_user'] = 'Изтрий XMPP потребител';
161161
$wb['unlimited_txt'] = 'Неограничен';
162162
$wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
163163
$wb['datalog_changes_close_txt'] = 'Close';
164-
?>
164+
?>

interface/lib/lang/es.lng

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ $wb['security_check1_txt'] = 'Verificar permisos de seguridad:';
152152
$wb['security_check2_txt'] = 'ha fallado.';
153153
$wb['select_directive_snippet_txt'] = 'Directive Snippets';
154154
$wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
155-
$wb['datalog_status_i_xmpp_domain'] = 'Create XMPP domain';
156-
$wb['datalog_status_u_xmpp_domain'] = 'Update XMPP domain';
157-
$wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
158-
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
159-
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160-
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
155+
$wb['datalog_status_i_xmpp_domain'] = 'Crear dominio XMPP';
156+
$wb['datalog_status_u_xmpp_domain'] = 'Actualizar dominio XMPP';
157+
$wb['datalog_status_d_xmpp_domain'] = 'Borrar dominio XMPP';
158+
$wb['datalog_status_i_xmpp_user'] = 'Crear usuario XMPP';
159+
$wb['datalog_status_u_xmpp_user'] = 'Actualizar usuario XMPP';
160+
$wb['datalog_status_d_xmpp_user'] = 'Borrar usuario XMPP';
161161
$wb['unlimited_txt'] = 'Ilimitado';
162162
$wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
163-
$wb['datalog_changes_close_txt'] = 'Close';
164-
?>
163+
$wb['datalog_changes_close_txt'] = 'Cerrar';
164+
?>

interface/lib/lang/it.lng

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -142,23 +142,23 @@ $wb['weak_password_txt'] = 'La password indicata non segue le impostazioni di si
142142
$wb['weak_password_length_txt'] = 'La password indicata non segue le impostazioni di sicurezza. Deve essere lunga almeno {chars} caratteri.';
143143
$wb['security_check1_txt'] = 'Verifica permessi di sicurezza:';
144144
$wb['security_check2_txt'] = 'fallito.';
145-
$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
146-
$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
147-
$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
148-
$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
149-
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
150-
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
151-
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
152-
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
153-
$wb['select_directive_snippet_txt'] = 'Directive Snippets';
145+
$wb['global_tabchange_warning_txt'] = 'Cliccando OK le modifiche effettuate in questo tab verranno salvate. Cancel per non salvare le modifiche.';
146+
$wb['datalog_status_i_mail_get'] = 'Crea account mail fetcher';
147+
$wb['datalog_status_u_mail_get'] = 'Aggiorna account mail fetcher';
148+
$wb['datalog_status_d_mail_get'] = 'Elimina account mail fetcher';
149+
$wb['datalog_status_i_web_folder_user'] = 'Crea protezione cartella';
150+
$wb['datalog_status_u_web_folder_user'] = 'Aggiorna protezione cartella';
151+
$wb['datalog_status_d_web_folder_user'] = 'Elimina protezione cartella';
152+
$wb['err_csrf_attempt_blocked'] = 'Tentativo CSRF bloccato.';
153+
$wb['select_directive_snippet_txt'] = 'Snippets direttiva';
154154
$wb['select_master_directive_snippet_txt'] = 'Master Directive Snippets';
155-
$wb['datalog_status_i_xmpp_domain'] = 'Create XMPP domain';
156-
$wb['datalog_status_u_xmpp_domain'] = 'Update XMPP domain';
157-
$wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
158-
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
159-
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160-
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
155+
$wb['datalog_status_i_xmpp_domain'] = 'Crea dominio XMPP';
156+
$wb['datalog_status_u_xmpp_domain'] = 'Aggiorna dominio XMPP';
157+
$wb['datalog_status_d_xmpp_domain'] = 'Elimina dominio XMPP';
158+
$wb['datalog_status_i_xmpp_user'] = 'Crea utente XMPP';
159+
$wb['datalog_status_u_xmpp_user'] = 'Aggiorna utente XMPP';
160+
$wb['datalog_status_d_xmpp_user'] = 'Elimina utente XMPP';
161161
$wb['unlimited_txt'] = 'illimitati';
162162
$wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
163-
$wb['datalog_changes_close_txt'] = 'Close';
164-
?>
163+
$wb['datalog_changes_close_txt'] = 'Chiudi';
164+
?>

interface/lib/lang/nl.lng

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ $wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has
140140
$wb['yes_txt'] = 'Ja';
141141
$wb['no_txt'] = 'Nee';
142142
$wb['None'] = 'Geen';
143-
$wb['strength_1'] = 'Weak';
143+
$wb['strength_1'] = 'Zwak';
144144
$wb['strength_2'] = 'Fair';
145-
$wb['strength_3'] = 'Good';
146-
$wb['strength_4'] = 'Strong';
147-
$wb['strength_5'] = 'Very Strong';
145+
$wb['strength_3'] = 'Goed';
146+
$wb['strength_4'] = 'Sterk';
147+
$wb['strength_5'] = 'Zeer sterk';
148148
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
149149
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
150150
$wb['security_check1_txt'] = 'Check for security permission:';
@@ -160,5 +160,5 @@ $wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160160
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
161161
$wb['unlimited_txt'] = 'Ongelimiteerd';
162162
$wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
163-
$wb['datalog_changes_close_txt'] = 'Close';
164-
?>
163+
$wb['datalog_changes_close_txt'] = 'Sluiten';
164+
?>

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
7373
$wb['No'] = 'No';
7474
$wb['min_password_length_txt'] = 'Minimum password length';
7575
$wb['min_password_strength_txt'] = 'Minimum password strength';
76+
$wb['ssh_authentication_txt'] = 'Allowed SSH authentication';
77+
$wb['ssh_authentication_password_key'] = 'Password & Key';
78+
$wb['ssh_authentication_password'] = 'Password';
79+
$wb['ssh_authentication_key'] = 'Key';
7680
$wb['company_name_txt'] = 'Company Name for the page title';
7781
$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
7882
$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ $wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
7373
$wb['No'] = 'No';
7474
$wb['min_password_length_txt'] = 'Minimum password length';
7575
$wb['min_password_strength_txt'] = 'Minimum password strength';
76+
$wb['ssh_authentication_txt'] = 'Allowed SSH authentication';
77+
$wb['ssh_authentication_password_key'] = 'Password & Key';
78+
$wb['ssh_authentication_password'] = 'Password';
79+
$wb['ssh_authentication_key'] = 'Key';
7680
$wb['company_name_txt'] = 'Company Name for the page title';
7781
$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
7882
$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';

0 commit comments

Comments
 (0)