Skip to content

Commit a5714c3

Browse files
author
Marius Cramer
committed
Merge branch 'stable-3.0.5'
2 parents fe9b73c + c8509bf commit a5714c3

File tree

383 files changed

+5000
-4954
lines changed

Some content is hidden

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

383 files changed

+5000
-4954
lines changed

‎install/install.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@
115115
include_once $cmd_opt['autoinstall'];
116116
} elseif($path_parts['extension'] == 'ini') {
117117
$tmp = ini_to_array(file_get_contents('autoinstall.ini'));
118+
if(!is_array($tmp['install'])) $tmp['install'] = array();
119+
if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
120+
if(!is_array($tmp['expert'])) $tmp['expert'] = array();
121+
if(!is_array($tmp['update'])) $tmp['update'] = array();
118122
$autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
119123
unset($tmp);
120124
}

‎install/update.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@
120120
include_once $cmd_opt['autoinstall'];
121121
} elseif($path_parts['extension'] == 'ini') {
122122
$tmp = ini_to_array(file_get_contents('autoinstall.ini'));
123+
if(!is_array($tmp['install'])) $tmp['install'] = array();
124+
if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
125+
if(!is_array($tmp['expert'])) $tmp['expert'] = array();
126+
if(!is_array($tmp['update'])) $tmp['update'] = array();
123127
$autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
124128
unset($tmp);
125129
}

‎interface/lib/lang/es.lng‎

Lines changed: 105 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,62 @@
11
<?php
2-
$wb['conf_format_dateshort'] = 'd-m-Y';
2+
$wb['conf_format_dateshort'] = 'd-m-Y ';
3+
$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
34
$wb['conf_format_datelong'] = 'l dS of F Y';
45
$wb['conf_format_timeshort'] = 'H:i';
56
$wb['conf_format_timelong'] = 'H:i:s';
6-
$wb['conf_format_datetime'] = 'Y-m-d H:i';
7-
$wb['number_format_decimals'] = '2';
7+
$wb['conf_format_datetime'] = 'd-m-Y H:i';
8+
$wb['number_format_decimals'] = '4';
9+
$wb['number_format_decimals_client'] = '2';
810
$wb['number_format_dec_point'] = '.';
911
$wb['number_format_thousands_sep'] = '';
10-
$wb['error_301'] = 'Modulo no permitido para el usuario actual.';
11-
$wb['error_302'] = 'Modulo inválido.';
12-
$wb['error_1001'] = '¡El usuario y contraseña no pueden estar vacíos!';
13-
$wb['error_1002'] = '¡El usuario y contraseña no son correctos!';
14-
$wb['error_1003'] = '¡El usuario está desactivado!';
15-
$wb['delete_confirmation'] = '¿Realmente quiere borrar este registro?';
16-
$wb['error_no_view_permission'] = 'Este registro no existe o no tiene permiso para verlo';
17-
$wb['error_no_delete_permission'] = '¡No puede borrar este registro, no tiene permiso!';
12+
$wb['error_301'] = 'Módulo no permitido para el usuario actual.';
13+
$wb['error_302'] = 'Módulo inválido.';
14+
$wb['error_1001'] = 'El nombre de usuario y contraseña no puede estar vacío!';
15+
$wb['error_1002'] = 'El nombre de usuario y/o contraseña no son correctos!';
16+
$wb['error_1003'] = 'El nombre de usuario esta desactivado!';
17+
$wb['delete_confirmation'] = 'Realmente desea borrar esta entrada?';
18+
$wb['error_no_view_permission'] = 'Usted no posee los permisos para eliminar esta entrada o la entrada no existe!';
19+
$wb['error_no_delete_permission'] = 'Usted no posee los permisos para eliminar esta entrada!';
1820
$wb['page_txt'] = 'Página';
1921
$wb['page_of_txt'] = 'de';
22+
$wb['page_and_txt'] = 'y';
2023
$wb['page_next_txt'] = 'Siguiente';
21-
$wb['page_back_txt'] = 'Anterior';
22-
$wb['delete_txt'] = 'Eliminar';
23-
$wb['filter_txt'] = 'Filtrar';
24-
$wb['add_new_record_txt'] = 'Añadir un nuevo registro';
24+
$wb['page_back_txt'] = 'Volver';
25+
$wb['delete_txt'] = 'Borrar';
26+
$wb['filter_txt'] = 'Filtro';
27+
$wb['add_new_record_txt'] = 'Nueva entrada';
2528
$wb['btn_save_txt'] = 'Guardar';
26-
$wb['btn_cancel_txt'] = 'Cancelar';
27-
$wb['toolsarea_head_txt'] = 'Herramientas';
28-
$wb['page_and_txt'] = 'y';
29+
$wb['btn_cancel_txt'] = 'Volver';
2930
$wb['top_menu_system'] = 'Sistema';
30-
$wb['top_menu_client'] = 'Cliente';
31-
$wb['top_menu_email'] = 'Correo';
32-
$wb['top_menu_monitor'] = 'Monitoreo';
31+
$wb['top_menu_client'] = 'Clientes';
32+
$wb['top_menu_email'] = 'Correos';
33+
$wb['top_menu_monitor'] = 'Monitor';
3334
$wb['top_menu_sites'] = 'Sitios';
3435
$wb['top_menu_dns'] = 'DNS';
3536
$wb['top_menu_tools'] = 'Herramientas';
3637
$wb['top_menu_help'] = 'Ayuda';
37-
$wb['top_menu_billing'] = 'Cobros';
38+
$wb['top_menu_billing'] = 'Pagos';
39+
$wb['top_menu_mailuser'] = 'Usuario de correo';
3840
$wb['top_menu_domain'] = 'Dominios';
3941
$wb['top_menu_dashboard'] = 'Inicio';
40-
$wb['latest_news_txt'] = 'Noticias';
4142
$wb['top_menu_vm'] = 'VServer';
42-
$wb['daynamesmin_su'] = 'Do';
43-
$wb['daynamesmin_mo'] = 'Lu';
44-
$wb['daynamesmin_tu'] = 'Ma';
45-
$wb['daynamesmin_we'] = 'Mi';
46-
$wb['daynamesmin_th'] = 'Ju';
47-
$wb['daynamesmin_fr'] = 'Vi';
48-
$wb['daynamesmin_sa'] = 'Sa';
43+
$wb['toolsarea_head_txt'] = 'Herramientas';
44+
$wb['latest_news_txt'] = 'Últimas noticias';
45+
$wb['logout_txt'] = 'Salir -';
46+
$wb['daynamesmin_su'] = 'Dom';
47+
$wb['daynamesmin_mo'] = 'Lun';
48+
$wb['daynamesmin_tu'] = 'Mar';
49+
$wb['daynamesmin_we'] = 'Mié';
50+
$wb['daynamesmin_th'] = 'Jue';
51+
$wb['daynamesmin_fr'] = 'Vie';
52+
$wb['daynamesmin_sa'] = 'Sáb';
4953
$wb['daynames_sunday'] = 'Domingo';
5054
$wb['daynames_monday'] = 'Lunes';
5155
$wb['daynames_tuesday'] = 'Martes';
52-
$wb['daynames_wednesday'] = 'Miercoles';
56+
$wb['daynames_wednesday'] = 'Miércoles';
5357
$wb['daynames_thursday'] = 'Jueves';
5458
$wb['daynames_friday'] = 'Viernes';
55-
$wb['daynames_saturday'] = 'Sabado';
59+
$wb['daynames_saturday'] = 'Sábado';
5660
$wb['monthnamesshort_jan'] = 'Ene';
5761
$wb['monthnamesshort_feb'] = 'Feb';
5862
$wb['monthnamesshort_mar'] = 'Mar';
@@ -64,90 +68,91 @@ $wb['monthnamesshort_aug'] = 'Ago';
6468
$wb['monthnamesshort_sep'] = 'Sep';
6569
$wb['monthnamesshort_oct'] = 'Oct';
6670
$wb['monthnamesshort_nov'] = 'Nov';
67-
$wb['monthnamesshort_dec'] = 'Dec';
68-
$wb['datepicker_nextText'] = 'Próximo';
71+
$wb['monthnamesshort_dec'] = 'Dic';
72+
$wb['datepicker_nextText'] = 'Siguiente';
6973
$wb['datepicker_prevText'] = 'Anterior';
7074
$wb['logout_txt'] = 'SALIR';
7175
$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
72-
$wb['submit_confirmation'] = '¿Realmente desea realizar esta acción?';
7376
$wb['number_format_decimals_client'] = '2';
7477
$wb['top_menu_mailuser'] = 'Correo';
78+
$wb['submit_confirmation'] = 'Realmente desea realizar esta acción?';
7579
$wb['globalsearch_resultslimit_of_txt'] = 'de';
7680
$wb['globalsearch_resultslimit_results_txt'] = 'resultados';
7781
$wb['globalsearch_noresults_text_txt'] = 'Sin resultados.';
7882
$wb['globalsearch_noresults_limit_txt'] = '0 resultados';
7983
$wb['globalsearch_searchfield_watermark_txt'] = 'Buscar';
8084
$wb['globalsearch_suggestions_text_txt'] = 'Sugerencias';
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_spamfilter_users'] = 'Create spam filter settings';
104-
$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
105-
$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
106-
$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
107-
$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
108-
$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
109-
$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
110-
$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
111-
$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
112-
$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
113-
$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
114-
$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
115-
$wb['datalog_status_i_cron'] = 'Create cron job';
116-
$wb['datalog_status_u_cron'] = 'Update cron job';
117-
$wb['datalog_status_d_cron'] = 'Delete cron job';
118-
$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
119-
$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
120-
$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
121-
$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
122-
$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
123-
$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
124-
$wb['datalog_status_i_shell_user'] = 'Create shell user';
125-
$wb['datalog_status_u_shell_user'] = 'Update shell user';
126-
$wb['datalog_status_d_shell_user'] = 'Delete shell user';
127-
$wb['datalog_status_i_web_folder'] = 'Create folder protection';
128-
$wb['datalog_status_u_web_folder'] = 'Update folder protection';
129-
$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
130-
$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
131-
$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
132-
$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
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.';
85+
$wb['global_tabchange_warning_txt'] = 'Los datos modificados en esta pestaña serán guardados si presiona en OK. Si cancela serán descartados.';
86+
$wb['global_tabchange_discard_txt'] = 'En esta pestaña existen cambios sin guardar. Los cambios serán descartados si continúa.';
87+
$wb['datalog_changes_txt'] = 'Los siguientes cambios aún no se ingresan en los servidores:';
88+
$wb['datalog_changes_end_txt'] = 'El ingreso de actualizaciones puede tomar más de un minuto. Por favor sea paciente.';
89+
$wb['datalog_status_i_web_database'] = 'Añadir base de datos';
90+
$wb['datalog_status_u_web_database'] = 'Actualizar base de datos';
91+
$wb['datalog_status_d_web_database'] = 'Borrar base de datos';
92+
$wb['datalog_status_i_web_database_user'] = 'Añadir usuario para base de datos';
93+
$wb['datalog_status_u_web_database_user'] = 'Actualizar usuario de base de datos';
94+
$wb['datalog_status_d_web_database_user'] = 'Borrar usuario de base de datos';
95+
$wb['datalog_status_i_web_domain'] = 'Añadir sitio web';
96+
$wb['datalog_status_u_web_domain'] = 'Actualizar opciones de sitio web';
97+
$wb['datalog_status_d_web_domain'] = 'Borrar sitio web';
98+
$wb['datalog_status_i_ftp_user'] = 'Añadir usuario para FTP';
99+
$wb['datalog_status_u_ftp_user'] = 'Actualizar usuario de FTP';
100+
$wb['datalog_status_d_ftp_user'] = 'Borrar usuario de FTP';
101+
$wb['datalog_status_i_mail_domain'] = 'Añadir dominio para correo';
102+
$wb['datalog_status_u_mail_domain'] = 'Actualizar dominio para correo';
103+
$wb['datalog_status_d_mail_domain'] = 'Borrar dominio para correo';
104+
$wb['datalog_status_i_mail_user'] = 'Añadir usuario de correo';
105+
$wb['datalog_status_u_mail_user'] = 'Actualizar usuario de correo';
106+
$wb['datalog_status_d_mail_user'] = 'Borrar usuario de correo';
107+
$wb['datalog_status_i_spamfilter_users'] = 'Añadir opción de filtro de spam';
108+
$wb['datalog_status_u_spamfilter_users'] = 'Actualizar opción de filtro de spam';
109+
$wb['datalog_status_d_spamfilter_users'] = 'Borrar opción de filtro de spam';
110+
$wb['datalog_status_i_mail_forwarding'] = 'Añadir dirección de correo';
111+
$wb['datalog_status_u_mail_forwarding'] = 'Actualizar dirección de correo';
112+
$wb['datalog_status_d_mail_forwarding'] = 'Borrar dirección de correo';
113+
$wb['datalog_status_i_dns_rr'] = 'Añadir registro de DNS';
114+
$wb['datalog_status_u_dns_rr'] = 'Actualizar registro de DNS';
115+
$wb['datalog_status_d_dns_rr'] = 'Borrar registro de DNS';
116+
$wb['datalog_status_i_dns_soa'] = 'Añadir zona de DNS';
117+
$wb['datalog_status_u_dns_soa'] = 'Actualizar zona de DNS';
118+
$wb['datalog_status_d_dns_soa'] = 'Borrar zona de DNS';
119+
$wb['datalog_status_i_cron'] = 'Añadir cron job';
120+
$wb['datalog_status_u_cron'] = 'Actualizar cron job';
121+
$wb['datalog_status_d_cron'] = 'Borrar cron job';
122+
$wb['datalog_status_i_mail_get'] = 'Añadir cuenta de rescatador de correo';
123+
$wb['datalog_status_u_mail_get'] = 'Actualizar cuenta de rescatador de correo';
124+
$wb['datalog_status_d_mail_get'] = 'Borrar cuenta de rescatador de correo';
125+
$wb['datalog_status_i_mail_mailinglist'] = 'Añadir lista de correos';
126+
$wb['datalog_status_u_mail_mailinglist'] = 'Actualizar lista de correos';
127+
$wb['datalog_status_d_mail_mailinglist'] = 'Borrar lista de correos';
128+
$wb['datalog_status_i_shell_user'] = 'Añadir usuario para shell';
129+
$wb['datalog_status_u_shell_user'] = 'Actualizar usuario de shell';
130+
$wb['datalog_status_d_shell_user'] = 'Borrar usuario de shell';
131+
$wb['datalog_status_i_web_folder'] = 'Añadir protección en carpeta';
132+
$wb['datalog_status_u_web_folder'] = 'Actualizar protección en carpeta';
133+
$wb['datalog_status_d_web_folder'] = 'Borrar protección en carpeta';
134+
$wb['datalog_status_i_web_folder_user'] = 'Añadir usuario para carpeta protegida';
135+
$wb['datalog_status_u_web_folder_user'] = 'Actualizar usuario de carpeta protegida';
136+
$wb['datalog_status_d_web_folder_user'] = 'Borrar usuario de carpeta protegida';
137+
$wb['err_csrf_attempt_blocked'] = 'Intento de CSRF bloqueado.';
138+
$wb['login_as_txt'] = 'Entrar como';
139+
$wb['no_domain_perm'] = 'Usted no tiene permisos en este dominio.';
140+
$wb['no_destination_perm'] = 'Usted no tiene permisos en esta ubicación.';
141+
$wb['client_you_are_locked'] = 'Usted no tiene permisos para modificar las configuraciones.';
142+
$wb['gender_m_txt'] = 'Sr.';
143+
$wb['gender_f_txt'] = 'Sra.';
144+
$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'Este cliente tiene registros en el módulo de facturación, por lo tanto, no se puede eliminar.';
140145
$wb['yes_txt'] = 'Sí';
141146
$wb['no_txt'] = 'No';
142147
$wb['None'] = 'Ninguno';
143148
$wb['strength_1'] = 'Débil';
144-
$wb['strength_2'] = 'Pasable';
149+
$wb['Firewall'] = 'Cortafuegos';
150+
$wb['strength_2'] = 'Aceptable';
145151
$wb['strength_3'] = 'Buena';
146152
$wb['strength_4'] = 'Fuerte';
147153
$wb['strength_5'] = 'Muy fuerte';
148-
$wb['weak_password_txt'] = 'La contraseña elegida no cumple las directrices de seguridad. Debe tener al menos {chars} caracteres y una fortaleza \"{strength}\".';
149-
$wb['weak_password_length_txt'] = 'La contraseña elegida no cumple las directrices de seguridad. Debe tener al menos {chars} caracteres.';
150-
$wb['Firewall'] = 'Cortafuegos';
151-
$wb['security_check1_txt'] = 'Check for security permission:';
152-
$wb['security_check2_txt'] = 'failed.';
154+
$wb['weak_password_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres y tener una fortaleza \"{strength}\".';
155+
$wb['weak_password_length_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres.';
156+
$wb['security_check1_txt'] = 'Verificar permisos de seguridad:';
157+
$wb['security_check2_txt'] = 'ha fallado.';
153158
?>

0 commit comments

Comments
 (0)