This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 5f0bb18 Merge branch 'feature/GIT' into develop new 7c4956d Fix translation problems 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 7c4956d2d13100d12921fd6c4a8b9857e648ad44 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Mon May 18 14:49:30 2015 +0200 Fix translation problems Summary of changes: .../main/resources/i18n/scmwebeditor-ui-web_en_GB.properties | 10 +++++++++- .../main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties | 12 ++++++++++-- .../src/main/webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../src/main/webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp | 9 +++++++-- 12 files changed, 35 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.