branch develop updated (5f0bb18 -> 7c4956d)
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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 7c4956d2d13100d12921fd6c4a8b9857e648ad44 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Mon May 18 14:49:30 2015 +0200 Fix translation problems --- .../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(-) diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties index 38a32f0..5710443 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties @@ -49,7 +49,7 @@ scm.privateScmAccess=You try to access a Private SCM. Please login scm.redirection=Redirection... scm.reset=Reset scm.resetTitle=Go back to the last revision of the file -scm.rstNotValidMessage=The rst is not valid, do you still want to continue ? +scm.rstNotValidMessage=The RST is not valid, do you still want to continue ? scm.saveAndContinue=Save and Continue Editing scm.saveAndContinueTitle=Commit modifications and continue editing the file. scm.saveAndQuit=Save and quit @@ -59,7 +59,15 @@ scm.stayLogin=Keep me logged scm.submit=Submit scm.text=Text scm.thankUsing=Thank you using SCMWebEditor +scm.titles.badRstFile=RST not valid +scm.titles.error=Error... +scm.titles.logout=Logout... +scm.titles.privateScm=Private repository +scm.titles.success=Success +scm.titles.swe=SCMWebEditor +scm.titles.upload=Upload a file scm.upload=Upload +scm.upload.close=Close scm.uploadFile=File Url scm.uploadPath=Path on Repository scm.uploadSuccess=File upload successful diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties index 944f445..49696e6 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties @@ -49,7 +49,7 @@ scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. scm.redirection=Redirection... scm.reset=Réinitialiser scm.resetTitle=Retour à la dernière révision du fichier -scm.rstNotValidMessage=The Rst n'est pas valide, voulez-vous continuer ? +scm.rstNotValidMessage=Le RST n'est pas valide, voulez-vous continuer ? scm.saveAndContinue=Sauvegarder et continuer scm.saveAndContinueTitle=Enregister les modifications sur le dépôt et continuer d'éditer le fichier scm.saveAndQuit=Sauvegarder et quitter @@ -59,7 +59,15 @@ scm.stayLogin=Rester connecté scm.submit=Envoyer scm.text=Texte scm.thankUsing=merci d'avoir utilisé SCMWebEditor -scm.upload=Ajouter un fichier +scm.titles.badRstFile=RST non valide +scm.titles.error=Erreur... +scm.titles.logout=Déconnexion... +scm.titles.privateScm=Dépôt privé +scm.titles.success=Réussi +scm.titles.swe=SCMWebEditor +scm.titles.upload=Ajouter un fichier +scm.upload=Ajouter un fichier +scm.upload.close=Fermer scm.uploadFile=Url du fichier scm.uploadPath=Répertoire sur le dépôt scm.uploadSuccess=Fichier téléchargé avec succès diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp index f7fb747..fb30518 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp @@ -29,7 +29,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Error...</title> + <title><s:text name="scm.titles.error"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp index c640e60..415ddc8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp @@ -27,7 +27,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>RST is not valid</title> + <title><s:text name="scm.titles.badRstFile"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp index 508c8c4..1d161f9 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp @@ -28,7 +28,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Error...</title> + <title><s:text name="scm.title.error"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp index 98ad770..c956f8b 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp @@ -28,7 +28,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Error</title> + <title><s:text name="scm.titles.error"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp index 500b150..51957f3 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp @@ -28,7 +28,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Logout...</title> + <title><s:text name="scm.titles.logout"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 6c99e38..e4058b8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -29,7 +29,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title>SCMWebEditor</title> + <title><s:text name="scm.titles.swe"/></title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <script type="text/javascript" src="js/selectLanguage.js"></script> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp index 2545120..b5dd78a 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp @@ -34,7 +34,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> - <title>SCM Web Editor</title> + <title><s:text name="scm.titles.swe"/></title> <script type="text/javascript" src="js/branches.js"></script> <script type="text/javascript" src="js/scmDetector.js"></script> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp index de9beb9..fdc0672 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp @@ -29,7 +29,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Private Scm</title> + <title><s:text name="scm.titles.privateScm"/></title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp index 773c53f..9211882 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp @@ -31,7 +31,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>UploadFile</title> + <title><s:text name="scm.titles.upload"/></title> <link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> <script type="text/javascript" src="js/branches.js"></script> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp index c8ae876..33fa0d1 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp @@ -27,13 +27,18 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Success</title> + <link rel="stylesheet" type="text/css" href="css/main.css"> + <title><s:text name="scm.titles.success"/></title> </head> <body> <p><s:text name="scm.uploadSuccess"/></p> +<s:set id="close"> + <s:text name="scm.upload.close"/> +</s:set> + <form> - <input type="button" value="close" onclick="window.close()"> + <s:submit type="button" value="%{close}" onclick="window.close()"/> </form> </body> </html> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm