Author: kcardineaud Date: 2011-07-21 10:19:04 +0200 (Thu, 21 Jul 2011) New Revision: 182 Url: http://nuiton.org/repositories/revision/scmwebeditor/182 Log: Fix some name in i18n proterties files Modified: trunk/pom.xml trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/pom.xml 2011-07-21 08:19:04 UTC (rev 182) @@ -198,7 +198,7 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> - <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>scmwebeditor-i18n</i18n.bundleOutputName> <i18n.bundleOutputPackage/> @@ -233,7 +233,7 @@ <artifactId>maven-i18n-plugin</artifactId> <version>${nuitonI18nVersion}</version> <configuration> - <bundles>fr_FR</bundles> + <bundles>fr_FR,en_GB</bundles> </configuration> <executions> <execution> Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,45 +1,45 @@ -scm.outConnection.search=Search -scm.outConnection.scmPath=SCM path \: -scm.welcome=Welcome on SCMWebEditor -scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. -scm.outConnection.enterRepo=Please enter your repository address. +scm.FileInEditor=File in editor \: +scm.badPathOrFileName=Bad repository path or file name\! Please correct it. +scm.badUsernameOrPassword=Bad username or password +scm.beTransferred=You should be transferred automatically to the new page. If not please +scm.clickHere=click here +scm.commitMessage=Commit message +scm.commitMessageTitle=let a message for commit +scm.erreurRepo=Error on repository +scm.exit=Exit +scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.exitTitle=Exit ScmWebEditor without saving. +scm.formTransferred=You should be transferred automatically to the form page. If not please scm.info.ProblemWithRst=For any Problem with RestruturedText visit scm.info.rstWebsite=RST documentation website scm.language=Language -scm.text=Text +scm.logAs=You are log as \: +scm.loginButton=Login +scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. scm.modificationViewer.noJavascript=Javascript is not activated. You can't only use Save and Quit or upload button. -scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. -scm.commitMessage=Commit message -scm.username=Username +scm.mustBeLog=You must be login to see this repository. +scm.outConnection.enterRepo=Please enter your repository address. +scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. +scm.outConnection.scmPath=SCM path \: +scm.outConnection.search=Search scm.password=Password -scm.commitMessageTitle=let a message for commit -scm.FileInEditor=File in editor \: -scm.usernameTitle=Repository username scm.passwordTitle=Repository password -scm.logAs=You are log as \: +scm.preview=Preview +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.saveAndContinue=Save and Continue Editing scm.saveAndContinueTitle=Commit modifications and continue editing the file. scm.saveAndQuit=Save and quit scm.saveAndQuitTitle=Save this file and go back to previous page. -scm.preview=Preview -scm.reset=Reset -scm.resetTitle=Go back to the last revision of the file -scm.exit=Exit -scm.exitTitle=Exit ScmWebEditor without saving. -scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.text=Text +scm.thankUsing=Thank you using SCMWebEditor scm.upload=Upload -scm.uploadTitle=Upload a file on the repository scm.uploadFile=File Url scm.uploadPath=Path on Repository -scm.badUsernameOrPassword=Bad username or password -scm.erreurRepo=Error on repository scm.uploadSuccess=File upload successful -scm.mustBeLog=You must be login to see this repository. -scm.loginButton=Login -scm.privateScmAccess=You try to access a Private SCM. Please login -scm.thankUsing=Thank you using SCMWebEditor -scm.beTransferred=You should be transferred automatically to the new page. If not please -scm.clickHere=click here -scm.redirection=Redirection... -badPathOrFileName=Bad repository path or file name! Please correct it. -scm.formTransferred=You should be transferred automatically to the form page. If not please \ No newline at end of file +scm.uploadTitle=Upload a file on the repository +scm.username=Username +scm.usernameTitle=Repository username +scm.welcome=Welcome on SCMWebEditor Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,5 +1,5 @@ -badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.FileInEditor=Fichier dans l''editeur \: +scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non scm.clickHere=cliquez ici Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-21 08:19:04 UTC (rev 182) @@ -15,7 +15,7 @@ </head> <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p><s:text name="badPathOrFileName" /></p> +<p><s:text name="scm.badPathOrFileName" /></p> <p><s:text name="scm.formTransferred" /> <a href="<%=request.getAttribute("projectUrl")%>"> <s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p>