Merge branch 'Various_3.1_fixes' into 'stable-3.1'

Various 3.1 fixes



See merge request !477

Author: Till Brehm

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

@@ -41,7 +41,7 @@ $wb['DNS srv functions'] = 'Fonctions SRV DNS';
 $wb['DNS txt functions'] = 'Fonctions TXT DNS';
 $wb['Mail mailing list functions'] = 'Fonctions Mailinglist Mail';
 $wb['generate_password_txt'] = 'Générer un mot de passe';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['repeat_password_txt'] = 'Répéter le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
 ?>

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

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

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

@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 $wb['mailinglist_txt'] = 'Mailing list';
 ?>

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

@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 $wb['mailinglist_txt'] = 'Mailing list';
 ?>

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

@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Générer mot de passe';
 $wb['repeat_password_txt'] = 'Retaper le mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas';
 $wb['password_match_txt'] = 'Les mots de passe correspondent';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Courriel non valide';
 $wb['mailinglist_txt'] = 'Liste de diffusion';
 ?>

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

@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 $wb['mailinglist_txt'] = 'Mailing list';
 ?>

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

@@ -17,6 +17,6 @@ $wb['generate_password_txt'] = 'Generate Password';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb["listname_error_unique"] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb["listname_error_unique"] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb["email_error_isemail"] = 'Email address is invalid.';
 ?>

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

@@ -16,7 +16,7 @@ $wb['generate_password_txt'] = 'Generate Password';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['listname_error_unique'] = 'There is already a mailinglist with name on the server. Please choose a different listname.';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 $wb['mailinglist_txt'] = 'Mailing list';
 ?>

interface/web/mail/lib/lang/fr_mail_backup_list.lng

@@ -12,5 +12,5 @@ $wb['delete_backup_txt'] = 'Delete Backup';
 $wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
 $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
-$wb['filesize_txt'] = 'Filesize';
+$wb['filesize_txt'] = 'Taille de fichier';
 ?>

interface/web/mail/lib/lang/fr_mail_mailinglist.lng

@@ -13,10 +13,10 @@ $wb['client_txt'] = 'Client';
 $wb['email_txt'] = 'E-mail';
 $wb['password_txt'] = 'Mot de passe';
 $wb['generate_password_txt'] = 'Générer un mot de passe';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
-$wb['email_error_isemail'] = 'Email address is invalid.';
+$wb['repeat_password_txt'] = 'Répéter le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['listname_error_unique'] = 'Une liste avec le même nom existe déjà sur le serveur. Veuillez choisir un nom différent.';
+$wb['email_error_isemail'] = 'Adresse E-Mail invalide.';
 $wb['mailinglist_txt'] = 'Liste de distribution';
 ?>