Merge pull request #2 from ppaysant/master

Fix translations

l10n/fr.php

@@ -1,11 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+'Welcome to %s' => 'Bienvenue dans %s',
 'Local My CoRe password' => "Mot de passe My CoRe local",
-"Local My CoRe password Policy Enforcement" => "Stratégie de choix du mot de passe local My CoRe",
+"Local My CoRe password policy enforcement" => "Stratégie de choix du mot de passe local My CoRe",
 "New password" => "Nouveau mot de passe",
 "Confirm password" => "Confirmer le mot de passe",
 "Change password" => "Changer le mot de passe",
-"You're presently connected via \"Janus\", if you want to use sync soft or mobile app, please set a password (this password will be exclusively used with My CoRe)." => "Vous êtes actuellement connecté via \"Janus\", Si vous souhaitez utiliser le logiciel de synchronisation ou une application mobile, merci d'initialiser un mot de passe (ce mot de passe est destiné uniquement au service My CoRe.",
+"You're presently connected through \"Janus\", if you want to use synchronization software or mobile app, please set a password (this password will be exclusively used with My CoRe)." => "Vous êtes actuellement connecté via \"Janus\", si vous souhaitez utiliser le logiciel de synchronisation ou une application mobile, merci d'initialiser un mot de passe (ce mot de passe est destiné uniquement au service My CoRe).",
 "Skip this step, I will set this local My CoRe password later." => "Je souhaite passer cette étape, je pourrai initialiser un mot de passe local à My CoRe plus tard.",
 "The following password restrictions are currently in place:" => "Les contraintes sur le choix d'un mot de passe sont les suivantes :",
 "All passwords are required to be at least %d characters in length and;" => "Chaque mot de passe doit contenir au moins %d caractères et ",
@@ -14,5 +15,8 @@
 "Must contain special characters: %s" => "Doit contenir au moins un des caractères particuliers suivants : %s",
 'Password successfully changed' => "Le mot de passe a été enregistré",
 "Unable to change password" => "Échec à la modification de votre mot de passe",
+'Passwords differs.' => 'Les mots de passe sont différents.',
+'Both password fields must be set.' => 'Les deux champs \"mot de passe\" doivent être renseignés.',
+''
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";

templates/main.php

@@ -8,7 +8,7 @@
     <form id="passwordform" class="section">
         <h2><?php p($l->t('Local My CoRe password'));?></h2>
         <div>
-            <?php p($l->t("You're presently connected via \"Janus\", if you want to use sync soft or mobile app, please set a password (this password will be exclusively used with My CoRe)."));?>
+            <?php p($l->t("You're presently connected through \"Janus\", if you want to use synchronization software or mobile app, please set a password (this password will be exclusively used with My CoRe)."));?>
         </div>
         <input type="password" id="pass1" name="personal-password"
             placeholder="<?php p($l->t('New password'));?>"
@@ -29,10 +29,10 @@
     </form>
 
     <form id="password_policy" class="section">
-        <h2><a name="ppe"></a><?php p($l->t('Local My CoRe password Policy Enforcement')); ?></h2>
+        <h2><a name="ppe"></a><?php p($l->t('Local My CoRe password policy enforcement')); ?></h2>
         <p><?php p($l->t('The following password restrictions are currently in place:')); ?></p>
-        <p><?php p($l->t('All passwords are required to be at least %d characters in length and;', $_['minlength'])); ?></p>
         <ul style="list-style: circle; margin-left: 20px;">
+            <li><?php p($l->t('All passwords are required to be at least %d characters in length and;', $_['minlength'])); ?></li>
             <?php if($_['mixedCase']) { ?>
             <li> <?php p($l->t('Must contain UPPER and lower case characters')); ?></li>
             <?php } ?>