This is an automated email from the git hooks/post-receive script. New commit to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit aa85995120122bfe8cd0a84099f3ef6457ad882e Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 11:22:15 2017 +0200 refs #1 séparaion des langues --- pollen-ui-riot-js/src/main/web/i18n/en.json | 20 +++++++++++++++++++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 16119427..c6ab170c 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -12,6 +12,7 @@ "main_editPoll" : "Poll edition", "main_userProfile" : "My profile", "main_favoriteLists" : "List of favorites", + "main_emailOrProviderAccountAlreadyUsed": "The email address of the account you are connecting with is already used by another Pollen account.", "pagination_all": "All", "pagination_resultsPerPage": "Results per page", "summary_choices": "Choices", @@ -198,6 +199,7 @@ "signin_password_placeholder": "Enter your password", "signin_lostpassword": "Lost password?", "signin_connexion": "Connect", + "signin_signinWithProvider": "Or sign in with your account:", "signin_error_signin_emailOrPasswordInvalid": "Email or password invalid", "signin_error_signin_banned": "Bloked account", "signin_error_signin_emailNotValidated": "You must validate your account before connecting. Check your emails, we sent you an activation link.", @@ -222,6 +224,7 @@ "header_myParticipatedPolls": "Participated polls", "header_polls": "Polls", "header_users": "Users", + "header_loginProviders": "Login providers", "header_myFavoriteLists": "My favorite lists", "header_createOtherPoll": "New standard poll", "header_createDatePoll": "New date poll", @@ -387,6 +390,10 @@ "userProfile_repeatPassword_placeholder": "Confirm your new password", "userProfile_repeatPassword_error": "The two passwords are not identical.", "userProfile_savePassword": "Save", + "userProfile_updatedPassword": "Your password has been updated", + "userProfile_loginProviders": "External accounts", + "userProfile_linkProvider": "Link an external account to connect to Pollen:", + "userProfile_unlinkProviderMessage": "Unlink this external account? You will not be able to connect to your Pollen account with this external account.", "choice_description_placeholder": "You can enter a description for this choice", "date-picker_today": "Today", "date-picker_dateplaceholder": "Date", @@ -532,5 +539,16 @@ "feedback_description": "Thank to details below your bug report ou your observation", "feedback_descriptionNotBlank": "Observation must be not blank", "feedback_uploadScreenShot": "Screenshot", - "feedback_create_success": "Observation has benn send." + "feedback_create_success": "Observation has been send.", + "loginProviders_title": "Login provider", + "loginProviders_name": "Name", + "loginProviders_key": "Client key", + "loginProviders_secret": "Secret code", + "loginProviders_permissions": "Permissions", + "loginProviders_active": "Active", + "loginProviders_newProvider": "New provider", + "loginProviders_deleteMessage": "Are you sure you want to delete this provider?", + "loginProviders_emptyName": "The name is mandatory", + "loginProviders_emptyKey": "The client key is mandatory", + "loginProviders_emptySecret": "The secret code is mandatory" } diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 00ac76f8..6f528757 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -12,6 +12,7 @@ "main_editPoll" : "Edition du sondage", "main_userProfile" : "Mon profil", "main_favoriteLists" : "Listes de votants", + "main_emailOrProviderAccountAlreadyUsed": "L'adresse email du compte avec lequel vous essayez de vous connecter, est déjà utilisée par un autre compte Pollen.", "pagination_all": "Tous", "pagination_resultsPerPage": "Résultats par page", "summary_choices": "Choix", @@ -198,6 +199,7 @@ "signin_password_placeholder": "Entrez votre mot de passe", "signin_lostpassword": "Mot de passe perdu ?", "signin_connexion": "Se connecter", + "signin_signinWithProvider": "Ou connectez vous avec votre compte :", "signin_error_signin_emailOrPasswordInvalid": "Courriel ou mot de passe invalide", "signin_error_signin_banned": "Compte bloqué", "signin_error_signin_emailNotValidated": "Vous devez valider votre compte avant de pouvoir vous connecter. Relevez vos emails, nous vous avons envoyé un lien de validation.", @@ -222,6 +224,7 @@ "header_myParticipatedPolls": "Mes participations", "header_polls": "Sondages", "header_users": "Utilisateurs", + "header_loginProviders": "Tiers de connexion", "header_myFavoriteLists": "Mes listes de votants", "header_createOtherPoll": "Nouveau sondage standard", "header_createDatePoll": "Nouveau sondage de dates", @@ -387,6 +390,10 @@ "userProfile_repeatPassword_placeholder": "Répétez votre mot de passe", "userProfile_repeatPassword_error": "Les deux mots de passe ne sont pas identiques.", "userProfile_savePassword": "Enregistrer", + "userProfile_updatedPassword": "Votre mot de passe a été mis à jour", + "userProfile_loginProviders": "Comptes externes", + "userProfile_linkProvider": "Associez un compte externe pour vous connecter à Pollen :", + "userProfile_unlinkProviderMessage": "Désassossier ce compte externe ? Vous ne pourrez plus vous connectez à votre compte Pollen avec ce compte externe.", "choice_description_placeholder": "Vous pouvez saisir une description pour ce choix", "date-picker_today": "Aujourd'hui", "date-picker_dateplaceholder": "Date", @@ -532,5 +539,16 @@ "feedback_description": "Merci de détailler ci-dessous votre rapport de bug ou votre remarque", "feedback_descriptionNotBlank": "La description ne doit pas être blanc", "feedback_uploadScreenShot": "Copie d'écran", - "feedback_create_success": "La remarque est envoyée." + "feedback_create_success": "La remarque est envoyée.", + "loginProviders_title": "Tiers pour la connexion", + "loginProviders_name": "Nom", + "loginProviders_key": "Clé client", + "loginProviders_secret": "Code secret", + "loginProviders_permissions": "Permissions", + "loginProviders_active": "Actif", + "loginProviders_newProvider": "Nouveau tiers", + "loginProviders_deleteMessage": "Êtes-vous sûr de vouloir supprimer ce tier ?", + "loginProviders_emptyName": "Le nom est obligatoire", + "loginProviders_emptyKey": "La clé client est obligatoire", + "loginProviders_emptySecret": "Le code secret est obligatoire" } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.