- Lima-commits - mailman.cloud.codelutin.com

r3658 - in trunk: . lima-callao lima-swing/src/license
by tchemit＠users.chorem.org Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-18 00:18:21 +0100 (Tue, 18 Dec 2012) New Revision: 3658 Url: http://chorem.org/projects/lima/repository/revisions/3658 Log: fixes #867: Updates eugene-maven-plugin to 2.6 fixes #868: Updates nuiton-utils to 2.6.5 fixes #869: Updates jaxx to 2.5.8 fixes #870: Updates openEJB to 4.5.1 fixes #871: Updates Jetty to 8.1.8.v20121106 fixes #872: Updates slf4j to 1.7.2 Modified: trunk/lima-callao/pom.xml trunk/lima-swing/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-11-16 16:06:53 UTC (rev 3657) +++ trunk/lima-callao/pom.xml 2012-12-17 23:18:21 UTC (rev 3658) @@ -71,7 +71,7 @@  <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-swing/src/license/THIRD-PARTY.properties 2012-11-16 16:06:53 UTC (rev 3657) +++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2012-12-17 23:18:21 UTC (rev 3658) @@ -2,30 +2,31 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License +# - Apache 2 # - Apache 2.0 # - Apache License 2.0 # - Apache Software License - Version 2.0 -# - BSD License -# - BSD style +# - BSD # - CDDL 1.1 -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL +# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - Eclipse Public License - v 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE +# - GNU Lesser General Public License +# - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for Java Transaction API Classes # - License Agreement for JavaMail(TM) API # - MIT License # - MPL 1.1 # - Mozilla Public License +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://asm.ow2.org/license.html @@ -36,10 +37,9 @@ # Please fill the missing licenses for dependencies : # # -#Wed May 16 15:30:23 CEST 2012 +#Tue Dec 18 00:06:41 CET 2012 antlr--antlr--2.7.6=ANTLR 2 License commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 -commons-net--commons-net--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:06:53 UTC (rev 3657) +++ trunk/pom.xml 2012-12-17 23:18:21 UTC (rev 3658) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.4</version> + <version>3.4.6</version> </parent> <groupId>org.chorem</groupId> @@ -109,7 +109,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.168</version> + <version>1.3.170</version> <scope>runtime</scope> </dependency> @@ -235,13 +235,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.5.v20120716</version> + <version>${jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.5.v20120716</version> + <version>${jettyVersion}</version> </dependency>  @@ -383,14 +383,15 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.5</jaxxVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> + <eugenePluginVersion>2.6</eugenePluginVersion> + <topiaVersion>2.7.1</topiaVersion> + <jaxxVersion>2.5.8</jaxxVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <openEjbVersion>4.0.0</openEjbVersion> - <slf4jVersion>1.6.6</slf4jVersion> + <openEjbVersion>4.5.1</openEjbVersion> + <slf4jVersion>1.7.2</slf4jVersion> <swingxVersion>1.6.4</swingxVersion> + <jettyVersion>${jettyPluginVersion}</jettyVersion>  <license.licenseName>gpl_v3</license.licenseName> @@ -403,7 +404,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> </plugin>

1 0

r3657 - trunk
by tchemit＠users.chorem.org Nov. 16, 2012

Nov. 16, 2012

Author: tchemit Date: 2012-11-16 17:06:53 +0100 (Fri, 16 Nov 2012) New Revision: 3657 Url: http://chorem.org/repositories/revision/lima/3657 Log: updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:45:34 UTC (rev 3656) +++ trunk/pom.xml 2012-11-16 16:06:53 UTC (rev 3657) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3656 - trunk
by tchemit＠users.chorem.org Oct. 30, 2012

Oct. 30, 2012

Author: tchemit Date: 2012-10-30 08:45:34 +0100 (Tue, 30 Oct 2012) New Revision: 3656 Url: http://chorem.org/repositories/revision/lima/3656 Log: Update mavenpom4redmine to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:45:08 UTC (rev 3655) +++ trunk/pom.xml 2012-10-30 07:45:34 UTC (rev 3656) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3655 - trunk
by tchemit＠users.chorem.org Oct. 26, 2012

Oct. 26, 2012

Author: tchemit Date: 2012-10-26 13:45:08 +0200 (Fri, 26 Oct 2012) New Revision: 3655 Url: http://chorem.org/repositories/revision/lima/3655 Log: Update mavenpom4redmine to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) +++ trunk/pom.xml 2012-10-26 11:45:08 UTC (rev 3655) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3654 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org Oct. 16, 2012

Oct. 16, 2012

Author: tchemit Date: 2012-10-16 10:44:20 +0200 (Tue, 16 Oct 2012) New Revision: 3654 Url: http://chorem.org/repositories/revision/lima/3654 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-10-16 08:44:18 UTC (rev 3653) +++ trunk/lima-business/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-rc-2</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-10-16 08:44:18 UTC (rev 3653) +++ trunk/lima-business-api/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-rc-2</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-10-16 08:44:18 UTC (rev 3653) +++ trunk/lima-callao/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-rc-2</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-10-16 08:44:18 UTC (rev 3653) +++ trunk/lima-swing/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-rc-2</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-16 08:44:18 UTC (rev 3653) +++ trunk/pom.xml 2012-10-16 08:44:20 UTC (rev 3654) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-rc-2</version> + <version>0.6-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -446,11 +446,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6-rc-2</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6-rc-2 + scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.6-rc-2</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <distributionManagement>

1 0

r3653 - in tags: . lima-0.6-rc-2
by tchemit＠users.chorem.org Oct. 16, 2012

Oct. 16, 2012

Author: tchemit Date: 2012-10-16 10:44:18 +0200 (Tue, 16 Oct 2012) New Revision: 3653 Url: http://chorem.org/repositories/revision/lima/3653 Log: [maven-release-plugin] copy for tag lima-0.6-rc-2 Added: tags/lima-0.6-rc-2/ Property changes on: tags/lima-0.6-rc-2 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3652 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org Oct. 16, 2012

Oct. 16, 2012

Author: tchemit Date: 2012-10-16 10:44:16 +0200 (Tue, 16 Oct 2012) New Revision: 3652 Url: http://chorem.org/repositories/revision/lima/3652 Log: [maven-release-plugin] prepare release lima-0.6-rc-2 Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-10-12 09:32:09 UTC (rev 3651) +++ trunk/lima-business/pom.xml 2012-10-16 08:44:16 UTC (rev 3652) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-rc-2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-10-12 09:32:09 UTC (rev 3651) +++ trunk/lima-business-api/pom.xml 2012-10-16 08:44:16 UTC (rev 3652) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-rc-2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-10-12 09:32:09 UTC (rev 3651) +++ trunk/lima-callao/pom.xml 2012-10-16 08:44:16 UTC (rev 3652) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-rc-2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-10-12 09:32:09 UTC (rev 3651) +++ trunk/lima-swing/pom.xml 2012-10-16 08:44:16 UTC (rev 3652) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-rc-2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-12 09:32:09 UTC (rev 3651) +++ trunk/pom.xml 2012-10-16 08:44:16 UTC (rev 3652) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-rc-2</version> <modules> <module>lima-callao</module> @@ -446,11 +446,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6-rc-2</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/trunk + scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6-rc-2 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.6-rc-2</url> </scm> <distributionManagement>

1 0

r3651 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org Oct. 12, 2012

Oct. 12, 2012

Author: echatellier Date: 2012-10-12 11:32:09 +0200 (Fri, 12 Oct 2012) New Revision: 3651 Url: http://chorem.org/repositories/revision/lima/3651 Log: fixes #776 : Suppression de lignes de transaction ou de transaction impossible Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-10-11 02:51:19 UTC (rev 3650) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-10-12 09:32:09 UTC (rev 3651) @@ -604,8 +604,9 @@ entry.getFinancialTransaction()); EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - //delete - entryDAO.delete(entry); + Entry entryOld = entryDAO.findByTopiaId(entry.getTopiaId()); + entryOld.getFinancialTransaction().removeEntry(entryOld); + entryDAO.delete(entryOld); } catch (TopiaException ex) { throw new LimaException("Can't remove entry", ex);

1 0

r3650 - trunk
by tchemit＠users.chorem.org Oct. 11, 2012

Oct. 11, 2012

Author: tchemit Date: 2012-10-11 04:51:19 +0200 (Thu, 11 Oct 2012) New Revision: 3650 Url: http://chorem.org/repositories/revision/lima/3650 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) +++ trunk/pom.xml 2012-10-11 02:51:19 UTC (rev 3650) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7</version> + <version>3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3649 - in trunk: . lima-business lima-callao lima-swing lima-swing/src/main/assembly lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/resources/i18n
by tchemit＠users.chorem.org Sept. 18, 2012

Sept. 18, 2012

Author: tchemit Date: 2012-09-18 19:14:25 +0200 (Tue, 18 Sep 2012) New Revision: 3649 Url: http://chorem.org/repositories/revision/lima/3649 Log: refs #754: Possibilit?\195?\169 de s?\195?\169lectionner la langue anglaise alors que la traduction n'est pas pr?\195?\169sente (ajout onglet pour aider ?\195?\160 la traduction) Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/assembly/bin.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-business/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -137,7 +137,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-callao/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -110,7 +110,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -191,7 +191,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>scan-sources</id> @@ -212,6 +212,10 @@ <goals> <goal>bundle</goal> </goals> + <configuration> + <generateCsvFile>true</generateCsvFile> + <bundleCsvFile>${project.build.directory}/lima-i18n.csv</bundleCsvFile> + </configuration> </execution> </executions> </plugin> Modified: trunk/lima-swing/src/main/assembly/bin.xml =================================================================== --- trunk/lima-swing/src/main/assembly/bin.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/assembly/bin.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -86,5 +86,12 @@ <include>*.properties</include> </includes> </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>i18n</outputDirectory> + <includes> + <include>lima-i18n.csv</include> + </includes> + </fileSet> </fileSets> </assembly> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-09-18 17:14:25 UTC (rev 3649) @@ -58,10 +58,16 @@ import org.nuiton.util.DesktopUtil; import org.nuiton.widget.SwingSession; -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JEditorPane; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTextArea; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.plaf.BorderUIResource; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -111,7 +117,7 @@ } //Get xml lima state file - protected File getLimaStateFile(){ + protected File getLimaStateFile() { LimaConfig limaConfig = LimaConfig.getInstance(); @@ -236,6 +242,19 @@ about.setIconPath("/icons/lima.png"); about.setLicenseFile("META-INF/lima-LICENSE.txt"); about.setThirdpartyFile("META-INF/lima-THIRD-PARTY.txt"); + + JScrollPane component = new JScrollPane(); + JEditorPane translateArea = new JEditorPane(); + translateArea.setContentType("text/html"); + translateArea.setEditable(false); + if (translateArea.getFont() != null) { + translateArea.setFont(translateArea.getFont().deriveFont((float) 11)); + } + translateArea.setBorder(null); + String text = _("lima.about.translate.content"); + translateArea.setText(text); + component.getViewport().add(translateArea); + about.getTabs().add(_("lima.title.about.translate"), component); about.init(); about.showInDialog(ui, true); } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 17:14:25 UTC (rev 3649) @@ -2,6 +2,7 @@ -= lima-business.document.entrybooks= lima-business.document.generalentrybook= +lima.about.translate.content=<h3>How to translate Lima</h3>You can help us to translate or improve label in Lima. <ul><li>Get the lima-i18n.csv file in the i18n directory</li><li>open it in Libre office (separator caracter is Tab)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul> We will apply the patch before next release. lima.accountsreports.listerror=Can't get entries list lima.action.commandline.help=Show help in console lima.action.fullscreen=Full screen @@ -209,6 +210,7 @@ lima.table.voucher=Voucher lima.title.about=About Lima... lima.title.about.description=Open sources accounting software +lima.title.about.translate=Translate Lima lima.tooltip.filter=<html>Regular expression \: - accounts interval i..j - accounts list i,j,k - Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries Select many rows with combination ctrl + click</html> lima.ui.account.addaccount= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 17:14:25 UTC (rev 3649) @@ -2,6 +2,7 @@ -= lima-business.document.entrybooks= lima-business.document.generalentrybook= +lima.about.translate.content=<h2>Comment traduire Lima</h2>Vous pouvez nous aider à traduire Lima.<hr/> <ul><li>Récupérer le fichier lima-i18n.csv dans le répertoire i18n</li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul> Nous intégrerons vos modifications avant la prochaine version. lima.accountsreports.listerror=Erreur lors de la récupération des données de la liste lima.action.commandline.help=Afficher l'aide en console lima.action.fullscreen=Plein Ecran @@ -208,6 +209,7 @@ lima.table.voucher=Pièce comptable lima.title.about=À propos de Lima... lima.title.about.description=Logiciel de comptabilité Libre +lima.title.about.translate=traduire Lima lima.tooltip.filter=<html>Expression régulière \: - intervalle de compte i..j - liste de compte i,j,k - Exclure un compte -i</html> lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> lima.ui.account.addaccount=Nouveau compte Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -387,7 +387,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> <jaxxVersion>2.5.5</jaxxVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> <swingxVersion>1.6.4</swingxVersion> @@ -410,7 +410,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin>

1 0