Skip to content

Commit b973ff1

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents e36880d + 99768b5 commit b973ff1

File tree

2,345 files changed

+27964
-5325
lines changed

Some content is hidden

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

2,345 files changed

+27964
-5325
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2468,7 +2468,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
24682468
-- Dumping data for table `sys_config`
24692469
--
24702470

2471-
INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
2471+
INSERT INTO sys_config VALUES ('db','db_version','3.1a1');
24722472
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
24732473

24742474
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/config.inc.php.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.1dev');
59+
define('ISPC_APP_VERSION', '3.1a1');
6060
define('DEVSYSTEM', 0);
6161

6262

‎interface/lib/lang/ar.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
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.';
152153
?>

‎interface/lib/lang/bg.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
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.';
152153
?>

‎interface/lib/lang/br.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
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.';
152153
?>

‎interface/lib/lang/ca.lng‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
<?php
2+
$wb['conf_format_dateshort'] = 'd-m-Y';
3+
$wb['conf_format_datelong'] = 'l dS of F Y';
4+
$wb['conf_format_timeshort'] = 'H:i';
5+
$wb['conf_format_timelong'] = 'H:i:s';
6+
$wb['conf_format_datetime'] = 'd-m-Y H:i';
7+
$wb['number_format_decimals'] = '4';
8+
$wb['number_format_decimals_client'] = '2';
9+
$wb['number_format_dec_point'] = ',';
10+
$wb['number_format_thousands_sep'] = '';
11+
$wb['error_301'] = 'Vous navez pas accès à ce module';
12+
$wb['error_302'] = 'Module invalide.';
13+
$wb['error_1001'] = 'Le nom dutilisateur et/ou le not de passe ne doivent pas être vides !';
14+
$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe sont faux !';
15+
$wb['error_1003'] = 'L\'utilisateur est désactivé !';
16+
$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
17+
$wb['error_no_view_permission'] = 'Vous n\'avez pas la permission de voir cet enregistrement ou il nexiste pas.';
18+
$wb['error_no_delete_permission'] = 'Vous n\'avez pas la permission de supprimer cet enregistrement !';
19+
$wb['page_txt'] = 'Page';
20+
$wb['page_of_txt'] = 'de';
21+
$wb['page_and_txt'] = 'et';
22+
$wb['page_next_txt'] = 'Suivant';
23+
$wb['page_back_txt'] = 'Précédent';
24+
$wb['delete_txt'] = 'Supprimer';
25+
$wb['filter_txt'] = 'Filtrer';
26+
$wb['add_new_record_txt'] = 'Ajouter une entrée';
27+
$wb['btn_save_txt'] = 'Enregistrer';
28+
$wb['btn_cancel_txt'] = 'Retour';
29+
$wb['top_menu_system'] = 'Système';
30+
$wb['top_menu_client'] = 'Client';
31+
$wb['top_menu_email'] = 'Courriel';
32+
$wb['top_menu_monitor'] = 'Suivi';
33+
$wb['top_menu_sites'] = 'Sites';
34+
$wb['top_menu_dns'] = 'DNS';
35+
$wb['top_menu_tools'] = 'Outils';
36+
$wb['top_menu_help'] = 'Aide';
37+
$wb['top_menu_billing'] = 'Facturation';
38+
$wb['top_menu_domain'] = 'Domaines';
39+
$wb['top_menu_dashboard'] = 'Accueil';
40+
$wb['top_menu_vm'] = 'VServer';
41+
$wb['toolsarea_head_txt'] = 'Outils';
42+
$wb['latest_news_txt'] = 'Dernières actus';
43+
$wb['daynamesmin_su'] = 'Di';
44+
$wb['daynamesmin_mo'] = 'Lu';
45+
$wb['daynamesmin_tu'] = 'Ma';
46+
$wb['daynamesmin_we'] = 'Me';
47+
$wb['daynamesmin_th'] = 'Je';
48+
$wb['daynamesmin_fr'] = 'Ve';
49+
$wb['daynamesmin_sa'] = 'Sa';
50+
$wb['daynames_sunday'] = 'Dimanche';
51+
$wb['daynames_monday'] = 'Lundi';
52+
$wb['daynames_tuesday'] = 'Mardi';
53+
$wb['daynames_wednesday'] = 'Mercredi';
54+
$wb['daynames_thursday'] = 'Jeudi';
55+
$wb['daynames_friday'] = 'Vendredi';
56+
$wb['daynames_saturday'] = 'Samedi';
57+
$wb['monthnamesshort_jan'] = 'Jan';
58+
$wb['monthnamesshort_feb'] = 'Fev';
59+
$wb['monthnamesshort_mar'] = 'Mar';
60+
$wb['monthnamesshort_apr'] = 'Avr';
61+
$wb['monthnamesshort_may'] = 'Mai';
62+
$wb['monthnamesshort_jun'] = 'Juin';
63+
$wb['monthnamesshort_jul'] = 'Juil';
64+
$wb['monthnamesshort_aug'] = 'Aout';
65+
$wb['monthnamesshort_sep'] = 'Sep';
66+
$wb['monthnamesshort_oct'] = 'Oct';
67+
$wb['monthnamesshort_nov'] = 'Nov';
68+
$wb['monthnamesshort_dec'] = 'Dec';
69+
$wb['datepicker_nextText'] = 'Suivant';
70+
$wb['datepicker_prevText'] = 'Précédent';
71+
$wb['logout_txt'] = 'Se déconnecter';
72+
$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
73+
$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
74+
$wb['top_menu_mailuser'] = 'Mailuser';
75+
$wb['globalsearch_resultslimit_of_txt'] = 'de';
76+
$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
77+
$wb['globalsearch_noresults_text_txt'] = 'Aucun resultat.';
78+
$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
79+
$wb['globalsearch_searchfield_watermark_txt'] = 'Rechercher';
80+
$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
81+
$wb['global_tabchange_warning_txt'] = 'Les données seront modifiées si vous cliquez sur OK. Cliquez sur annuler pour ne rien modifier.';
82+
$wb['global_tabchange_discard_txt'] = 'Vous avez des données modifiées non enregistrées dans cet onglet. Les modifications seront perdues si vous continuez.';
83+
$wb['datalog_changes_txt'] = 'Les modifications n\'ont pas encore été appliquées à tous les serveurs:';
84+
$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu\'à 1 minute. Merci de patienter.';
85+
$wb['datalog_status_i_web_database'] = 'Créer une nouvelle base de données';
86+
$wb['datalog_status_u_web_database'] = 'Modifier une base de données';
87+
$wb['datalog_status_d_web_database'] = 'Supprimer une base de données';
88+
$wb['datalog_status_i_web_database_user'] = 'Créer un utilisateur de base de données';
89+
$wb['datalog_status_u_web_database_user'] = 'Modifier un utilisateur de base de données';
90+
$wb['datalog_status_d_web_database_user'] = 'Supprimer un utilisateur de base de données';
91+
$wb['datalog_status_i_web_domain'] = 'Créer un nouveau site';
92+
$wb['datalog_status_u_web_domain'] = 'Mettre à jour la configuration du site';
93+
$wb['datalog_status_d_web_domain'] = 'Supprimer le site';
94+
$wb['datalog_status_i_ftp_user'] = 'Créer un utilisateur FTP';
95+
$wb['datalog_status_u_ftp_user'] = 'Modifier un utilisateur FTP';
96+
$wb['datalog_status_d_ftp_user'] = 'Supprimer un utilisateur FTP';
97+
$wb['datalog_status_i_mail_domain'] = 'Créer un domaine courriel';
98+
$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine courriel';
99+
$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine courriel';
100+
$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur courriel';
101+
$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur courriel';
102+
$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur courriel';
103+
$wb['datalog_status_i_spamfilter_users'] = 'Créer un filtre anti-spam';
104+
$wb['datalog_status_u_spamfilter_users'] = 'Modifier un filtre anti-spam';
105+
$wb['datalog_status_d_spamfilter_users'] = 'Supprimer un filtre anti-spam';
106+
$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse courriel';
107+
$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse courriel';
108+
$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse courriel';
109+
$wb['datalog_status_i_dns_rr'] = 'Créer un enregistrement DNS';
110+
$wb['datalog_status_u_dns_rr'] = 'Modifier un enregistrement DNS';
111+
$wb['datalog_status_d_dns_rr'] = 'Supprimer un enregistrement DNS';
112+
$wb['datalog_status_i_dns_soa'] = 'Créer une zone DNS';
113+
$wb['datalog_status_u_dns_soa'] = 'Modifier une zone DNS';
114+
$wb['datalog_status_d_dns_soa'] = 'Supprimer une zone DNS';
115+
$wb['datalog_status_i_cron'] = 'Créer une tâche cron';
116+
$wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
117+
$wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
118+
$wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
119+
$wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
120+
$wb['datalog_status_d_mail_get'] = 'Supprimer un compte mail récupérateur';
121+
$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d\'envoi';
122+
$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d\'envoi';
123+
$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d\'envoi';
124+
$wb['datalog_status_i_shell_user'] = 'Créer un utilisateur Shell';
125+
$wb['datalog_status_u_shell_user'] = 'Modifier un utilisateur Shell';
126+
$wb['datalog_status_d_shell_user'] = 'Supprimer un utilisateur Shell';
127+
$wb['datalog_status_i_web_folder'] = 'Créer un dossier protégé';
128+
$wb['datalog_status_u_web_folder'] = 'Modifier un dossier protégé';
129+
$wb['datalog_status_d_web_folder'] = 'Supprimer un dossier protégé';
130+
$wb['datalog_status_i_web_folder_user'] = 'Créer un utilisateur de dossier protégé';
131+
$wb['datalog_status_u_web_folder_user'] = 'Modifier un utilisateur de dossier protégé';
132+
$wb['datalog_status_d_web_folder_user'] = 'Supprimer un utilisateur de dossier protégé';
133+
$wb['login_as_txt'] = 'Connexion en tant que';
134+
$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
135+
$wb['no_destination_perm'] = 'Vous n\'avez pas de permission pour cette 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'] = 'Mme.';
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'] = 'Oui';
141+
$wb['no_txt'] = 'Non';
142+
$wb['None'] = 'None';
143+
$wb['strength_1'] = 'Faible';
144+
$wb['strength_2'] = 'Moyen';
145+
$wb['strength_3'] = 'Bon';
146+
$wb['strength_4'] = 'Fort';
147+
$wb['strength_5'] = 'Très fort';
148+
$wb['weak_password_txt'] = 'Le mot de passe choisi ne rencontre pas les minimas requis : {chars} caractères minimums et une force de \\"{strength}\\".';
149+
$wb['weak_password_length_txt'] = 'Le mot de passe choisi ne rencontre pas les minimas requis : {chars} caractères minimums.';
150+
$wb['security_check1_txt'] = 'Vérifier les permissions de sécurité:';
151+
$wb['security_check2_txt'] = 'Echec';
152+
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
153+
?>

‎interface/lib/lang/cz.lng‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,3 @@ $wb['security_check1_txt'] = 'Check for security permission:';
151151
$wb['security_check2_txt'] = 'failed.';
152152
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
153153
?>
154-
155-

‎interface/lib/lang/de.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ $wb['top_menu_dashboard'] = 'Übersicht';
4343
$wb['latest_news_txt'] = 'Neuigkeiten';
4444
$wb['err_csrf_attempt_blocked'] = 'CSRF-Versuch blockiert.';
4545
$wb['top_menu_vm'] = 'vServer';
46-
$wb['err_csrf_attempt_blocked'] = 'CSRF-Versuch blockiert.';
4746
$wb['daynamesmin_su'] = 'So';
4847
$wb['daynamesmin_mo'] = 'Mo';
4948
$wb['daynamesmin_tu'] = 'Di';

‎interface/lib/lang/el.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
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.';
152153
?>

‎interface/lib/lang/es.lng‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ $wb['top_menu_dns'] = 'DNS';
3636
$wb['top_menu_tools'] = 'Herramientas';
3737
$wb['top_menu_help'] = 'Ayuda';
3838
$wb['top_menu_billing'] = 'Pagos';
39-
$wb['top_menu_mailuser'] = 'Usuario de correo';
39+
$wb['top_menu_mailuser'] = 'Correo';
4040
$wb['top_menu_domain'] = 'Dominios';
4141
$wb['top_menu_dashboard'] = 'Inicio';
4242
$wb['top_menu_vm'] = 'VServer';
4343
$wb['toolsarea_head_txt'] = 'Herramientas';
4444
$wb['latest_news_txt'] = 'Últimas noticias';
45-
$wb['logout_txt'] = 'Salir -';
45+
$wb['logout_txt'] = 'SALIR';
4646
$wb['daynamesmin_su'] = 'Dom';
4747
$wb['daynamesmin_mo'] = 'Lun';
4848
$wb['daynamesmin_tu'] = 'Mar';
@@ -71,10 +71,6 @@ $wb['monthnamesshort_nov'] = 'Nov';
7171
$wb['monthnamesshort_dec'] = 'Dic';
7272
$wb['datepicker_nextText'] = 'Siguiente';
7373
$wb['datepicker_prevText'] = 'Anterior';
74-
$wb['logout_txt'] = 'SALIR';
75-
$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
76-
$wb['number_format_decimals_client'] = '2';
77-
$wb['top_menu_mailuser'] = 'Correo';
7874
$wb['submit_confirmation'] = 'Realmente desea realizar esta acción?';
7975
$wb['globalsearch_resultslimit_of_txt'] = 'de';
8076
$wb['globalsearch_resultslimit_results_txt'] = 'resultados';
@@ -146,12 +142,11 @@ $wb['yes_txt'] = 'Sí';
146142
$wb['no_txt'] = 'No';
147143
$wb['None'] = 'Ninguno';
148144
$wb['strength_1'] = 'Débil';
149-
$wb['Firewall'] = 'Cortafuegos';
150145
$wb['strength_2'] = 'Aceptable';
151146
$wb['strength_3'] = 'Buena';
152147
$wb['strength_4'] = 'Fuerte';
153148
$wb['strength_5'] = 'Muy fuerte';
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}\".';
149+
$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}\\".';
155150
$wb['weak_password_length_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres.';
156151
$wb['security_check1_txt'] = 'Verificar permisos de seguridad:';
157152
$wb['security_check2_txt'] = 'ha fallado.';

0 commit comments

Comments
 (0)