Skip to content

Commit d0726f0

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 3acf5fa + 1345c2e commit d0726f0

31 files changed

+84
-84
lines changed

‎interface/web/admin/lib/lang/fr_remote_user.lng‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $wb['DNS srv functions'] = 'Fonctions SRV DNS';
4141
$wb['DNS txt functions'] = 'Fonctions TXT DNS';
4242
$wb['Mail mailing list functions'] = 'Fonctions Mailinglist Mail';
4343
$wb['generate_password_txt'] = 'Générer un mot de passe';
44-
$wb['repeat_password_txt'] = 'Repeat Password';
45-
$wb['password_mismatch_txt'] = 'The passwords do not match.';
46-
$wb['password_match_txt'] = 'The passwords do match.';
44+
$wb['repeat_password_txt'] = 'Répéter le mot de passe';
45+
$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
46+
$wb['password_match_txt'] = 'Les mots de passe correspondent.';
4747
?>

‎interface/web/admin/lib/lang/fr_users.lng‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ $wb['username_unique'] = 'Le nom d’utilisateur entré existe déja.';
2626
$wb['password_strength_txt'] = 'Force du mot de passe';
2727
$wb['startmodule_err'] = 'Le module de départ nexiste pas.';
2828
$wb['generate_password_txt'] = 'Générer un mot de passe';
29-
$wb['repeat_password_txt'] = 'Repeat Password';
30-
$wb['password_mismatch_txt'] = 'The passwords do not match.';
31-
$wb['password_match_txt'] = 'The passwords do match.';
32-
$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
33-
$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
34-
$wb['lost_password_function_txt'] = 'Forgot password function is available';
29+
$wb['repeat_password_txt'] = 'Répéter le mot de passe';
30+
$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
31+
$wb['password_match_txt'] = 'Les mots de passe correspondent.';
32+
$wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par <b>web</b> ou <b>web</b> suivi d\'un nombre.';
33+
$wb['client_not_admin_err'] = 'Un utilisateur affilié à un client ne peut pas être changé en type admin';
34+
$wb['lost_password_function_txt'] = 'La fonction mot de passe oublié est disponible';
3535
?>

‎interface/web/admin/system_config_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function onShowEnd() {
9090
$handle = @opendir(ISPC_WEB_PATH.'/dashboard/dashlets');
9191
while ($file = @readdir($handle)) {
9292
if ($file != '.' && $file != '..' && !is_dir(ISPC_WEB_PATH.'/dashboard/dashlets/'.$file)) {
93-
$available_dashlets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.substr($file, 0, -4).']<pre class="addPlaceholderContent" style="display:none;">['.substr($file, 0, -4).'],</pre></a> ';
93+
$available_dashlets_txt .= '<a href="javascript:void(0);" class="addPlaceholder '.substr($file, 0, -4).'">['.substr($file, 0, -4).']</a>';
9494
}
9595
}
9696

‎interface/web/admin/templates/system_config_misc_edit.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ <h1><tmpl_var name="list_head_txt"></h1>
3434
<div class="col-sm-9"><input type="text" name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" class="form-control" /></div></div>
3535
<div class="form-group">
3636
<label for="admin_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='admin_dashlets_left_txt'}</label>
37-
<div class="col-sm-6"><input type="text" name="admin_dashlets_left" id="admin_dashlets_left" value="{tmpl_var name='admin_dashlets_left'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
37+
<div class="col-sm-9"><input type="text" name="admin_dashlets_left" id="admin_dashlets_left" value="{tmpl_var name='admin_dashlets_left'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
3838
</div></div>
3939
<div class="form-group">
4040
<label for="admin_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='admin_dashlets_right_txt'}</label>
41-
<div class="col-sm-6"><input type="text" name="admin_dashlets_right" id="admin_dashlets_right" value="{tmpl_var name='admin_dashlets_right'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
41+
<div class="col-sm-9"><input type="text" name="admin_dashlets_right" id="admin_dashlets_right" value="{tmpl_var name='admin_dashlets_right'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
4242
</div></div>
4343
<div class="form-group">
4444
<label for="reseller_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='reseller_dashlets_left_txt'}</label>
45-
<div class="col-sm-6"><input type="text" name="reseller_dashlets_left" id="reseller_dashlets_left" value="{tmpl_var name='reseller_dashlets_left'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
45+
<div class="col-sm-9"><input type="text" name="reseller_dashlets_left" id="reseller_dashlets_left" value="{tmpl_var name='reseller_dashlets_left'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
4646
</div></div>
4747
<div class="form-group">
4848
<label for="reseller_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='reseller_dashlets_right_txt'}</label>
49-
<div class="col-sm-6"><input type="text" name="reseller_dashlets_right" id="reseller_dashlets_right" value="{tmpl_var name='reseller_dashlets_right'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
49+
<div class="col-sm-9"><input type="text" name="reseller_dashlets_right" id="reseller_dashlets_right" value="{tmpl_var name='reseller_dashlets_right'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
5050
</div></div>
5151
<div class="form-group">
5252
<label for="client_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='client_dashlets_left_txt'}</label>
53-
<div class="col-sm-6"><input type="text" name="client_dashlets_left" id="client_dashlets_left" value="{tmpl_var name='client_dashlets_left'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
53+
<div class="col-sm-9"><input type="text" name="client_dashlets_left" id="client_dashlets_left" value="{tmpl_var name='client_dashlets_left'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
5454
</div></div>
5555
<div class="form-group">
5656
<label for="client_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='client_dashlets_right_txt'}</label>
57-
<div class="col-sm-6"><input type="text" name="client_dashlets_right" id="client_dashlets_right" value="{tmpl_var name='client_dashlets_right'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
57+
<div class="col-sm-9"><input type="text" name="client_dashlets_right" id="client_dashlets_right" value="{tmpl_var name='client_dashlets_right'}" size="" maxlength="" class="form-control" />{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
5858
</div></div>
5959
<div class="form-group">
6060
<label class="col-sm-3 control-label">{tmpl_var name='tab_change_discard_txt'}</label>

‎interface/web/mail/lib/lang/ar_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
1616
$wb['repeat_password_txt'] = 'Repeat Password';
1717
$wb['password_mismatch_txt'] = 'The passwords do not match.';
1818
$wb['password_match_txt'] = 'The passwords do match.';
19-
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
19+
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2020
$wb['email_error_isemail'] = 'Email address is invalid.';
2121
$wb['mailinglist_txt'] = 'Mailing list';
2222
?>

‎interface/web/mail/lib/lang/bg_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
1616
$wb['repeat_password_txt'] = 'Repeat Password';
1717
$wb['password_mismatch_txt'] = 'The passwords do not match.';
1818
$wb['password_match_txt'] = 'The passwords do match.';
19-
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
19+
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2020
$wb['email_error_isemail'] = 'Email address is invalid.';
2121
$wb['mailinglist_txt'] = 'Mailing list';
2222
?>

‎interface/web/mail/lib/lang/ca_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Générer mot de passe';
1616
$wb['repeat_password_txt'] = 'Retaper le mot de passe';
1717
$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas';
1818
$wb['password_match_txt'] = 'Les mots de passe correspondent';
19-
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
19+
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2020
$wb['email_error_isemail'] = 'Courriel non valide';
2121
$wb['mailinglist_txt'] = 'Liste de diffusion';
2222
?>

‎interface/web/mail/lib/lang/el_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
1616
$wb['repeat_password_txt'] = 'Repeat Password';
1717
$wb['password_mismatch_txt'] = 'The passwords do not match.';
1818
$wb['password_match_txt'] = 'The passwords do match.';
19-
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
19+
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2020
$wb['email_error_isemail'] = 'Email address is invalid.';
2121
$wb['mailinglist_txt'] = 'Mailing list';
2222
?>

‎interface/web/mail/lib/lang/en_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ $wb['generate_password_txt'] = 'Generate Password';
1717
$wb['repeat_password_txt'] = 'Repeat Password';
1818
$wb['password_mismatch_txt'] = 'The passwords do not match.';
1919
$wb['password_match_txt'] = 'The passwords do match.';
20-
$wb["listname_error_unique"] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
20+
$wb["listname_error_unique"] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2121
$wb["email_error_isemail"] = 'Email address is invalid.';
2222
?>

‎interface/web/mail/lib/lang/fi_mail_mailinglist.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
1616
$wb['repeat_password_txt'] = 'Repeat Password';
1717
$wb['password_mismatch_txt'] = 'The passwords do not match.';
1818
$wb['password_match_txt'] = 'The passwords do match.';
19-
$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
19+
$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
2020
$wb['email_error_isemail'] = 'Email address is invalid.';
2121
$wb['mailinglist_txt'] = 'Mailing list';
2222
?>

0 commit comments

Comments
 (0)