[pollen] branch develop updated (cfc2bbe -> 64880d1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git discards cfc2bbe add translate new 64880d1 add translate This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cfc2bbe) \ N -- N -- N refs/heads/develop (64880d1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 64880d1a8066c9395e63fe04d53741c18b85864b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 15:37:10 2014 +0200 add translate Summary of changes: pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 http://git.chorem.org/pollen.git commit 64880d1a8066c9395e63fe04d53741c18b85864b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 15:37:10 2014 +0200 add translate --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + 2 files changed, 2 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index db8306a..fe25db8 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -80,6 +80,7 @@ var translateEN = { 'poll.saved' : 'Poll saved.', 'poll.created.printLink' : 'You can modify your poll to using this address when you are not connected: {{url}}', 'poll.cloned' : 'Poll cloned', +'poll.closed' : 'Poll closed', 'poll.deleted' : 'Poll deleted', 'poll.restricted.name' : 'Name', 'poll.restricted.mail' : 'E-mail', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 98f0a06..923a402 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -80,6 +80,7 @@ var translateFR = { 'poll.saved' : 'Sondage sauvegardé', 'poll.created.printLink' : 'Garder le lien suivant pour pouvoir modifier votre sondage plus tard, lorsque vous n\'êtes pas connecté : {{url}}', 'poll.cloned' : 'Sondage cloné', +'poll.closed' : 'Sondage clos', 'poll.deleted' : 'Sondage supprimé', 'poll.restricted.name' : 'Nom du votant', 'poll.restricted.mail' : 'Courriel du votant', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm