branch develop updated (b0277f06 -> 34e324fb)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from b0277f06 refs #199 : Il faut garder la possibilité de saisir les valeurs des choix comme sur la version 3.1.4 new 34e324fb correction de la traduction anglaise The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 34e324fbd0dad704acd94035d2102d717a4cfe95 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 30 15:36:47 2018 +0200 correction de la traduction anglaise Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 34e324fbd0dad704acd94035d2102d717a4cfe95 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 30 15:36:47 2018 +0200 correction de la traduction anglaise --- pollen-ui-riot-js/src/main/web/i18n/en.json | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 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 850209d5..4880471c 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -440,10 +440,11 @@ "userProfile_deleteAccount": "Delete your account", "userProfile_deleteUserMessage": "Delete your account? All the polls you created will be deleted; your votes and comments will be anonymized.", "userProfile_identity": "Identity", - "userProfile_saveIdentity": "Save", - "userProfile_updatedIdentity": "Your identity has been updated", "userProfile_name": "Name", "userProfile_name_placeholder": "Enter your user name", + "userProfile_saveIdentity": "Save", + "userProfile_updatedIdentity": "Your identity has been updated", + "userProfile_email": "Email Address", "userProfile_passwordChange": "Password change", "userProfile_oldPassword": "Old password", "userProfile_oldPassword_placeholder": "Enter your old password", @@ -461,6 +462,7 @@ "userProfile_deleteAvatar": "Delete", "userProfile_deleteAvatarMessage": "Delete your avatar?", "userProfile_uploadAvatar": "Upload", + "userProfile_getProviderAvatar": "or use your avatar from external accounts", "userProfile_fileSizeMax_message": "File \"{0}\" for size {1} can't be over {2}.", "userProfile_fileNotImage_message": "The file \"{0}\" is not an image.", "choice_description_placeholder": "You can enter a description for this choice", @@ -651,5 +653,16 @@ "emailAddressList_deleteEmailAddress": "Delete the email address", "emailAddressList_deleteEmailAddressMessage": "Delete the email address {0}?", "emailAddressList_newAddressPlaceholder": "Enter a new email address", - "emailAddressList_addEmailAddress": "Add a new email address" + "emailAddressList_addEmailAddress": "Add a new email address", + "emailAddressList_addPgpPublicKey": "Add a encryption key", + "emailAddressList_editPgpPublicKey": "Edit the encryption key", + "emailAddressList_pgpPublicKey": "PGP public key", + "emailAddressList_pgpPublicKeyPlaceHolder": "-----BEGIN PGP PUBLIC KEY BLOCK-----", + "emailAddressList_cancelPgpPublicKey": "Cancel", + "emailAddressList_removePgpPublicKey": "Remove the key", + "emailAddressList_removePgpPublicKey_ask": "Remove the PGP public key ?", + "emailAddressList_savePgpPublicKey": "save the key", + "emailAddressList_sendPgpPublicKey": "send the key", + "emailAddressList_updatedPgpPublicKey": "the PGP public key is save with success.", + "emailAddressList_removedPgpPublicKey": "the PGP public key is remove with success." } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm