Commit 5c613fce authored by Benoit Lavenier's avatar Benoit Lavenier

Merge branch 'master' into 'master'

Master

See merge request !1
parents 052a69e8 76b73c32
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -32,16 +32,16 @@
"ORGANIZATION_ACCOUNT_HELP": "If you represent a company, association, etc.<br/>No universal dividend will be created by this account."
},
"EVENT": {
"MEMBER_WITHOUT_PROFILE": "To obtain your certification more quickly, fill in <a ui-sref=\"app.user_edit_profile\">your user profile</a>. Members will more easily put their trust in a verifiable identity."
"MEMBER_WITHOUT_PROFILE": "To obtain your certifications quicker, fill in <a ui-sref=\"app.user_edit_profile\">your user profile</a>. Members will more easily put their trust in a verifiable identity."
},
"ERROR": {
"WS_CONNECTION_FAILED": "Cesium can not receive notifications because of a technical error (connection to the Cesium + data node).<br/><br/>If the problem persists, please <b>choose another data node</b> in Cesium+ settings."
"WS_CONNECTION_FAILED": "Cesium cannot receive notifications because of a technical error (connection to the Cesium + data node).<br/><br/>If the problem persists, please <b>choose another data node</b> in Cesium+ settings."
}
},
"WOT": {
"BTN_SUGGEST_CERTIFICATIONS_DOTS": "Suggest identities to certify...",
"BTN_ASK_CERTIFICATIONS_DOTS": "Ask members to certify me...",
"BTN_ASK_CERTIFICATION": "Ask a certification",
"BTN_ASK_CERTIFICATION": "Ask for a certification",
"SUGGEST_CERTIFICATIONS_MODAL": {
"TITLE": "Suggest certifications",
"HELP": "Select your suggestions"
......@@ -51,9 +51,9 @@
"HELP": "Select recipients"
},
"CONFIRM": {
"SUGGEST_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer ces suggestions de certification</b> ?",
"ASK_CERTIFICATION": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> ?",
"ASK_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> à ces personnes ?"
"SUGGEST_CERTIFICATIONS": "Are you sure you want to<b>send these certification suggestions</b> ?",
"ASK_CERTIFICATION": "Are you sure you want to <b>request a certification</b> ?",
"ASK_CERTIFICATIONS": "Are you sure you want to <b>request a certification</b> from these members ?"
}
},
"COMMENTS": {
......@@ -102,7 +102,7 @@
"TO": "To",
"OBJECT": "Object",
"OBJECT_HELP": "Object",
"ENCRYPTED_HELP": "Please note this message will be encrypted before sending so that only the recipient can read it and be sure you are the author.",
"ENCRYPTED_HELP": "Please note this message will be encrypted before sending so that only the recipient can read it and be sure you are its author.",
"MESSAGE": "Message",
"MESSAGE_HELP": "Message content",
"CONTENT_CONFIRMATION": "No message content.<br/><br/>Are your sure you want to send this message?"
......@@ -132,7 +132,7 @@
"USER_NOT_RECIPIENT": "You are not the recipient of this message: unable to read it.",
"NOT_AUTHENTICATED_MESSAGE": "The authenticity of the message is not certain or its content is corrupted.",
"REMOVE_MESSAGE_FAILED": "Error while deleting message",
"MESSAGE_CONTENT_TOO_LONG": "Value too long ({{maxLength}} characters max).",
"MESSAGE_CONTENT_TOO_LONG": "Content exceeds character limit ({{maxLength}} characters max).",
"MARK_AS_READ_FAILED": "Unable to mark the message as 'read'.",
"LOAD_NOTIFICATIONS_FAILED": "Error while loading messages notifications.",
"REMOVE_All_MESSAGES_FAILED": "Error while removing all messages.",
......@@ -224,7 +224,7 @@
"TITLE": "Avatar",
"SELECT_FILE_HELP": "<b>Choose an image file</b>, by clicking on the button below:",
"BTN_SELECT_FILE": "Choose an image",
"RESIZE_HELP": "<b>Re-crop the image</b> if necessary. A click on the image allows to move it. Click on the area at the bottom left to zoom in.",
"RESIZE_HELP": "<b>Re-crop the image</b> if necessary. A click on the image allows you to move it. Click on the area at the bottom left to zoom in.",
"RESULT_HELP": "<b>Here is the result</b> as seen on your profile:"
},
"ERROR": {
......@@ -237,12 +237,12 @@
"PROFILE_SAVED": "Profile saved"
},
"HELP": {
"WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>."
"WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>:it is also visible to <b>people not logged in</b>."
}
},
"LOCATION": {
"BTN_GEOLOC_ADDRESS": "Find my address on the map",
"USE_GEO_POINT": "geo-locate (recommended)?",
"USE_GEO_POINT": "Geo-locate (recommended)?",
"LOADING_LOCATION": "Searching address...",
"LOCATION_DIVIDER": "Localisation",
"ADDRESS": "Address",
......@@ -278,10 +278,10 @@
"NOTIFICATIONS": {
"DIVIDER": "Notifications",
"HELP_TEXT": "Enable the types of notifications you want to receive:",
"ENABLE_TX_SENT": "Notify the validation of <b>sent payments</b>?",
"ENABLE_TX_RECEIVED": "Notify the validation of <b>received payments</b>?",
"ENABLE_CERT_SENT": "Notify the validation of <b>sent certifications</b>?",
"ENABLE_CERT_RECEIVED": "Notify the validation des <b>received certifications</b>?"
"ENABLE_TX_SENT": "Notify of successful <b>sent payments</b>?",
"ENABLE_TX_RECEIVED": "Notify of successful <b>incoming payments</b>?",
"ENABLE_CERT_SENT": "Notify of successful <b>sent certifications</b>?",
"ENABLE_CERT_RECEIVED": "Notify of successful <b>received certifications</b>?"
},
"CONFIRM": {
"ASK_ENABLE_TITLE": "New features",
......@@ -297,9 +297,9 @@
"NODE_STARTED": "Your node ES API <b>{{params[0]}}</b> is UP",
"NODE_BMA_DOWN": "Node <b>{{params[0]}}:{{params[1]}}</b> (used by your ES API) is <b>unreachable</b>.",
"NODE_BMA_UP": "Node <b>{{params[0]}}:{{params[1]}}</b> is reachable again.",
"MEMBER_JOIN": "You are now a <b>member</b> of currency <b>{{params[0]}}</b>!",
"MEMBER_LEAVE": "You are <b>not a member anymore</b> of currency <b>{{params[0]}}</b>!",
"MEMBER_EXCLUDE": "You are <b>not more member</b> of the currency <b>{{params[0]}}</b>, for lack of renewal or lack of certifications.",
"MEMBER_JOIN": "You are now a <b>member</b> of the currency <b>{{params[0]}}</b>!",
"MEMBER_LEAVE": "You are <b>no longer a member</b> of the currency <b>{{params[0]}}</b>!",
"MEMBER_EXCLUDE": "You are <b>no longer a member</b> of the currency <b>{{params[0]}}</b>, from lack of renewal or lack of certifications.",
"MEMBER_REVOKE": "Your account has been revoked. It will no longer be a member of the currency <b>{{params[0]}}</b>.",
"MEMBER_ACTIVE": "Your membership to <b>{{params[0]}}</b> has been <b>renewed successfully</b>.",
"TX_SENT": "Your payment to <span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid}\" ><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> was executed.",
......
......@@ -32,16 +32,16 @@
"ORGANIZATION_ACCOUNT_HELP": "If you represent a company, association, etc.<br/>No universal dividend will be created by this account."
},
"EVENT": {
"MEMBER_WITHOUT_PROFILE": "To obtain your certification more quickly, fill in <a ui-sref=\"app.user_edit_profile\">your user profile</a>. Members will more easily put their trust in a verifiable identity."
"MEMBER_WITHOUT_PROFILE": "To obtain your certifications quicker, fill in <a ui-sref=\"app.user_edit_profile\">your user profile</a>. Members will more easily put their trust in a verifiable identity."
},
"ERROR": {
"WS_CONNECTION_FAILED": "Cesium can not receive notifications because of a technical error (connection to the Cesium + data node).<br/><br/>If the problem persists, please <b>choose another data node</b> in Cesium+ settings."
"WS_CONNECTION_FAILED": "Cesium cannot receive notifications because of a technical error (connection to the Cesium + data node).<br/><br/>If the problem persists, please <b>choose another data node</b> in Cesium+ settings."
}
},
"WOT": {
"BTN_SUGGEST_CERTIFICATIONS_DOTS": "Suggest identities to certify...",
"BTN_ASK_CERTIFICATIONS_DOTS": "Ask members to certify me...",
"BTN_ASK_CERTIFICATION": "Ask a certification",
"BTN_ASK_CERTIFICATION": "Ask for a certification",
"SUGGEST_CERTIFICATIONS_MODAL": {
"TITLE": "Suggest certifications",
"HELP": "Select your suggestions"
......@@ -51,9 +51,9 @@
"HELP": "Select recipients"
},
"CONFIRM": {
"SUGGEST_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer ces suggestions de certification</b> ?",
"ASK_CERTIFICATION": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> ?",
"ASK_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> à ces personnes ?"
"SUGGEST_CERTIFICATIONS": "Are you sure you want to<b>send these certification suggestions</b> ?",
"ASK_CERTIFICATION": "Are you sure you want to <b>request a certification</b> ?",
"ASK_CERTIFICATIONS": "Are you sure you want to <b>request a certification</b> from these members ?"
}
},
"COMMENTS": {
......@@ -102,7 +102,7 @@
"TO": "To",
"OBJECT": "Object",
"OBJECT_HELP": "Object",
"ENCRYPTED_HELP": "Please note this message will be encrypted before sending so that only the recipient can read it and be sure you are the author.",
"ENCRYPTED_HELP": "Please note this message will be encrypted before sending so that only the recipient can read it and be sure you are its author.",
"MESSAGE": "Message",
"MESSAGE_HELP": "Message content",
"CONTENT_CONFIRMATION": "No message content.<br/><br/>Are your sure you want to send this message?"
......@@ -132,7 +132,7 @@
"USER_NOT_RECIPIENT": "You are not the recipient of this message: unable to read it.",
"NOT_AUTHENTICATED_MESSAGE": "The authenticity of the message is not certain or its content is corrupted.",
"REMOVE_MESSAGE_FAILED": "Error while deleting message",
"MESSAGE_CONTENT_TOO_LONG": "Value too long ({{maxLength}} characters max).",
"MESSAGE_CONTENT_TOO_LONG": "Content exceeds character limit ({{maxLength}} characters max).",
"MARK_AS_READ_FAILED": "Unable to mark the message as 'read'.",
"LOAD_NOTIFICATIONS_FAILED": "Error while loading messages notifications.",
"REMOVE_All_MESSAGES_FAILED": "Error while removing all messages.",
......@@ -224,7 +224,7 @@
"TITLE": "Avatar",
"SELECT_FILE_HELP": "<b>Choose an image file</b>, by clicking on the button below:",
"BTN_SELECT_FILE": "Choose an image",
"RESIZE_HELP": "<b>Re-crop the image</b> if necessary. A click on the image allows to move it. Click on the area at the bottom left to zoom in.",
"RESIZE_HELP": "<b>Re-crop the image</b> if necessary. A click on the image allows you to move it. Click on the area at the bottom left to zoom in.",
"RESULT_HELP": "<b>Here is the result</b> as seen on your profile:"
},
"ERROR": {
......@@ -237,12 +237,12 @@
"PROFILE_SAVED": "Profile saved"
},
"HELP": {
"WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: visible including by <b>not logged in people</b>."
"WARNING_PUBLIC_DATA": "Please note that the information published here <b>is public</b>: it is also visible by <b>people not logged in</b>."
}
},
"LOCATION": {
"BTN_GEOLOC_ADDRESS": "Find my address on the map",
"USE_GEO_POINT": "geo-locate (recommended)?",
"USE_GEO_POINT": "Geo-locate (recommended)?",
"LOADING_LOCATION": "Searching address...",
"LOCATION_DIVIDER": "Localisation",
"ADDRESS": "Address",
......@@ -278,10 +278,10 @@
"NOTIFICATIONS": {
"DIVIDER": "Notifications",
"HELP_TEXT": "Enable the types of notifications you want to receive:",
"ENABLE_TX_SENT": "Notify the validation of <b>sent payments</b>?",
"ENABLE_TX_RECEIVED": "Notify the validation of <b>received payments</b>?",
"ENABLE_CERT_SENT": "Notify the validation of <b>sent certifications</b>?",
"ENABLE_CERT_RECEIVED": "Notify the validation des <b>received certifications</b>?"
"ENABLE_TX_SENT": "Notify of successful <b>sent payments</b>?",
"ENABLE_TX_RECEIVED": "Notify of successful <b>incoming payments</b>?",
"ENABLE_CERT_SENT": "Notify of successful <b>sent certifications</b>?",
"ENABLE_CERT_RECEIVED": "Notify of successful <b>received certifications</b>?"
},
"CONFIRM": {
"ASK_ENABLE_TITLE": "New features",
......@@ -297,9 +297,9 @@
"NODE_STARTED": "Your node ES API <b>{{params[0]}}</b> is UP",
"NODE_BMA_DOWN": "Node <b>{{params[0]}}:{{params[1]}}</b> (used by your ES API) is <b>unreachable</b>.",
"NODE_BMA_UP": "Node <b>{{params[0]}}:{{params[1]}}</b> is reachable again.",
"MEMBER_JOIN": "You are now a <b>member</b> of currency <b>{{params[0]}}</b>!",
"MEMBER_LEAVE": "You are <b>not a member anymore</b> of currency <b>{{params[0]}}</b>!",
"MEMBER_EXCLUDE": "You are <b>not more member</b> of the currency <b>{{params[0]}}</b>, for lack of renewal or lack of certifications.",
"MEMBER_JOIN": "You are now a <b>member</b> of the currency <b>{{params[0]}}</b>!",
"MEMBER_LEAVE": "You are <b>no longer a member</b> of the currency <b>{{params[0]}}</b>!",
"MEMBER_EXCLUDE": "You are <b>no longer a member</b> of the currency <b>{{params[0]}}</b>, from lack of renewal or lack of certifications.",
"MEMBER_REVOKE": "Your account has been revoked. It will no longer be a member of the currency <b>{{params[0]}}</b>.",
"MEMBER_ACTIVE": "Your membership to <b>{{params[0]}}</b> has been <b>renewed successfully</b>.",
"TX_SENT": "Your payment to <span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid}\" ><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> was executed.",
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment