From tchemit@users.chorem.org Tue Sep 18 17:10:23 2012
From: tchemit@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3644 - in trunk: .
	lima-swing/src/main/java/org/chorem/lima/ui/home
	lima-swing/src/main/resources/i18n
Date: Tue, 18 Sep 2012 17:10:23 +0200
Message-ID: <20120918151023.C66D615A1A@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6854107785799165253=="

--===============6854107785799165253==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2012-09-18 17:10:23 +0200 (Tue, 18 Sep 2012)
New Revision: 3644

Url: http://chorem.org/repositories/revision/lima/3644

Log:
add C?\195?\169dric as contributor
fixes #687: Patch textes (patch apply, thanks!)


Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactio=
nsPane.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-swing/src/main/java/org/chorem/lima/ui/home/FinancialTra=
nsactionsPane.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransacti=
onsPane.java	2012-09-18 14:56:35 UTC (rev 3643)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransacti=
onsPane.java	2012-09-18 15:10:23 UTC (rev 3644)
@@ -101,26 +101,26 @@
         log.debug("Rafra=C3=AEchissement financial transaction pane");
        =20
         String htmlBegin =3D "<font face=3D'sans-serif' size=3D3>"
-                           + "<p style=3Dvertical-align:'bottom', horizontal=
-align:'center'>";
+            + "<p style=3Dvertical-align:'bottom', horizontal-align:'center'=
>";
         String htmlEnd =3D "</p></font>";
=20
         try {
=20
             List<FiscalPeriod> unblockedFiscalPeriods =3D
-                    fiscalPeriodService.getAllUnblockedFiscalPeriods();
+                fiscalPeriodService.getAllUnblockedFiscalPeriods();
             List<EntryBook> entryBooks =3D entryBookService.getAllEntryBooks=
();
            =20
             //Au moins un exercice ouvert et un journal ouvert
             if (unblockedFiscalPeriods.size() !=3D 0 && entryBooks.size() !=
=3D 0) {
-                List<FinancialTransaction> financialTransactionsUnbal =3D
-                        financialTransactionService.
-                                getAllInexactFinancialTransactions(unblocked=
FiscalPeriods.get(0));
-                if (financialTransactionsUnbal.size() > 0) {
+                List<FinancialTransaction> financialTransactionsInexact =3D
+                    financialTransactionService.
+                        getAllInexactFinancialTransactions(unblockedFiscalPe=
riods.get(0));
+                if (financialTransactionsInexact.size() > 0) {
                     setBackground(RED_BACKGROUND);
-                    String transactionsString =3D financialTransactionsUnbal=
.size()
-                                                + " " + _("lima.ui.home.tran=
saction.unbalanced")
+                    String transactionsString =3D financialTransactionsInexa=
ct.size()
+                                                + " " + _("lima.ui.home.tran=
saction.inexact")
                                                 + "<br/><br/><a href=3D'#fin=
ancialtransactionunbalanced'>"
-                                                + _("lima.ui.home.transactio=
n.modifiy.unbalanced") + "</a>";
+                                                + _("lima.ui.home.transactio=
n.modifiy.inexact") + "</a>";
                     //set Text
                     setText(htmlBegin + transactionsString + htmlEnd);
                 } else {

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2012=
-09-18 14:56:35 UTC (rev 3643)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2012=
-09-18 15:10:23 UTC (rev 3644)
@@ -170,7 +170,7 @@
 lima.message.help.usage=3DOptions (set with --option <key> <value>\:
 lima.misc.supportemail.description=3DSupport email
 lima.openejb.remotemode.description=3D
-lima.opening.accounts=3D
+lima.opening.accounts=3DImport accounts from\:
 lima.preferences=3DPreferences
 lima.reports=3DReports
 lima.reports.account.noaccount=3D
@@ -226,13 +226,13 @@
 lima.ui.account.updateaccounttitle=3D
 lima.ui.common.amountcredit=3D
 lima.ui.common.amountdebit=3D
-lima.ui.common.cancel=3D
-lima.ui.common.error=3D
-lima.ui.common.ok=3D
-lima.ui.common.refresh=3D
-lima.ui.common.remove=3D
+lima.ui.common.cancel=3DCancel
+lima.ui.common.error=3DError
+lima.ui.common.ok=3DOk
+lima.ui.common.refresh=3DRefresh
+lima.ui.common.remove=3DRemove
 lima.ui.common.solde=3D
-lima.ui.common.update=3D
+lima.ui.common.update=3DUpdate
 lima.ui.entrybook.add=3D
 lima.ui.entrybook.code=3D
 lima.ui.entrybook.default=3D
@@ -285,32 +285,32 @@
 lima.ui.fiscalperiod.entrybooks.create=3D
 lima.ui.fiscalperiod.fiscalperiod=3D
 lima.ui.fiscalperiod.open=3D
-lima.ui.home.account=3D
-lima.ui.home.chartaccounts.create=3D
-lima.ui.home.chartaccounts.modify=3D
-lima.ui.home.chartaccounts.nothing=3D
-lima.ui.home.chartaccounts.state1_2=3D
-lima.ui.home.chartaccounts.state2_2=3D
-lima.ui.home.daily=3D
-lima.ui.home.entrybooks=3D
-lima.ui.home.entrybooks.create=3D
-lima.ui.home.entrybooks.modify=3D
-lima.ui.home.entrybooks.nothing=3D
-lima.ui.home.entrybooks.state.single=3D
-lima.ui.home.entrybooks.state1_2.plural=3D
-lima.ui.home.entrybooks.state2_2.plural=3D
+lima.ui.home.account=3DChart of accounts
+lima.ui.home.chartaccounts.create=3DCreate the chart of accounts
+lima.ui.home.chartaccounts.modify=3DEdit the chart of accounts
+lima.ui.home.chartaccounts.nothing=3DNo account set\!
+lima.ui.home.chartaccounts.state1_2=3DThe chart of accounts has
+lima.ui.home.chartaccounts.state2_2=3Daccounts
+lima.ui.home.daily=3DDaily tasks
+lima.ui.home.entrybooks=3DBooks
+lima.ui.home.entrybooks.create=3DCreate books
+lima.ui.home.entrybooks.modify=3DEdit books
+lima.ui.home.entrybooks.nothing=3DNo book
+lima.ui.home.entrybooks.state.single=3DThe book is\:
+lima.ui.home.entrybooks.state1_2.plural=3DThe
+lima.ui.home.entrybooks.state2_2.plural=3Dbooks are\:
 lima.ui.home.fiscalperiod.closed=3D
 lima.ui.home.fiscalperiod.create=3D
 lima.ui.home.fiscalperiod.modify=3D
 lima.ui.home.fiscalperiod.noopen=3D
 lima.ui.home.fiscalperiod.opened=3D
-lima.ui.home.fiscalyear=3D
-lima.ui.home.transaction.balanced=3D
-lima.ui.home.transaction.create=3D
-lima.ui.home.transaction.modifiy.balanced=3D
-lima.ui.home.transaction.modifiy.unbalanced=3D
-lima.ui.home.transaction.nothing=3D
-lima.ui.home.transaction.unbalanced=3D
+lima.ui.home.fiscalyear=3DFiscal year
+lima.ui.home.transaction.balanced=3Dmoves, all balanced
+lima.ui.home.transaction.create=3DAdd moves
+lima.ui.home.transaction.inexact=3Dmoves are not valid\!
+lima.ui.home.transaction.modifiy.balanced=3DEdit moves
+lima.ui.home.transaction.modifiy.inexact=3DEdit incorrect moves
+lima.ui.home.transaction.nothing=3DNo move
 lima.ui.importexport.accountcharts=3DAccounts chart
 lima.ui.importexport.all=3DAll
 lima.ui.importexport.csv=3DImport/Export CSV
@@ -327,7 +327,7 @@
 lima.ui.importexport.import.vatpdfimport=3DThe PDF has been imported. It can=
 be found inside the Lima resources directory
 lima.ui.importexport.importcsv=3D
 lima.ui.importexport.importebp=3D
-lima.ui.importexport.importerror=3D
+lima.ui.importexport.importerror=3DAn error has occured during import
 lima.ui.importexport.importtitle=3D
 lima.ui.importexport.vatstatements=3DVAT chart
 lima.ui.importexport.wait=3DJob in progress=E2=80=A6
@@ -353,11 +353,11 @@
 lima.ui.lettering.selectSolde=3DBalance
 lima.ui.mainview.title=3DLutin Invoice Monitoring and Accounting
 lima.ui.opening.accounts=3D<html><center>Select a default, <br/>import your =
personnal<br/> or cancel to create your own account chart.</center></html>
-lima.ui.opening.close=3D
-lima.ui.opening.end=3D
-lima.ui.opening.entrybook=3D<html>Tick  box to import default accounts chart=
\:<br/> Achats, Ventes, Tr=C3=A9sorerie, Op=C3=A9ration diverses</html>
-lima.ui.opening.import=3DImport a CSV Save
-lima.ui.opening.next=3D
+lima.ui.opening.close=3DClose
+lima.ui.opening.end=3DFinish
+lima.ui.opening.entrybook=3D<html>Tick box to import default accounts chart\=
:<br/> Achats, Ventes, Tr=C3=A9sorerie, Op=C3=A9ration diverses</html>
+lima.ui.opening.import=3DImport a CSV backup
+lima.ui.opening.next=3DNext
 lima.ui.opening.title=3D
 lima.ui.opening.welcome=3D<html><center>Welcome to Lima<br/>this assistant h=
elp you to start your business accounting in the blink of an eye<br/>OR impor=
t instantanly your already existing save in CSV format<br/><br/><br/><br/></c=
enter></html>
 lima.vatreport.listerror=3DCan't get entries list

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2012=
-09-18 14:56:35 UTC (rev 3643)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2012=
-09-18 15:10:23 UTC (rev 3644)
@@ -169,7 +169,7 @@
 lima.message.help.usage=3DOptions (set with --option <key> <value>\:
 lima.misc.supportemail.description=3DAdresse email de support
 lima.openejb.remotemode.description=3D
-lima.opening.accounts=3D
+lima.opening.accounts=3DImporter le plan de comptes depuis \:
 lima.preferences=3DPr=C3=A9f=C3=A9rences
 lima.reports=3DRapports
 lima.reports.account.noaccount=3D
@@ -228,6 +228,7 @@
 lima.ui.common.cancel=3DAnnuler
 lima.ui.common.error=3DErreur
 lima.ui.common.ok=3DOk
+lima.ui.common.refresh=3DActualiser
 lima.ui.common.refresh=3DRafra=C3=AEchir
 lima.ui.common.remove=3DSupprimer
 lima.ui.common.solde=3DSolde
@@ -304,12 +305,12 @@
 lima.ui.home.fiscalperiod.noopen=3DAucun exercice ouvert \!
 lima.ui.home.fiscalperiod.opened=3Dexercices ouverts
 lima.ui.home.fiscalyear=3DExercices
-lima.ui.home.transaction.balanced=3Dtransactions, toutes sont =C3=A9quilibr=
=C3=A9es
+lima.ui.home.transaction.balanced=3D=C3=A9critures, toutes sont =C3=A9quilib=
r=C3=A9es
 lima.ui.home.transaction.create=3DAjouter des =C3=A9critures
+lima.ui.home.transaction.inexact=3D=C3=A9critures ne sont pas valides \!
 lima.ui.home.transaction.modifiy.balanced=3DModifier les =C3=A9critures
-lima.ui.home.transaction.modifiy.unbalanced=3DModifier les =C3=A9critures in=
correctes
+lima.ui.home.transaction.modifiy.inexact=3DModifier les =C3=A9critures incor=
rectes
 lima.ui.home.transaction.nothing=3DAucune =C3=A9criture
-lima.ui.home.transaction.unbalanced=3Dtransactions ne sont pas =C3=A9quilibr=
=C3=A9es \!
 lima.ui.importexport.accountcharts=3DPlan des comptes
 lima.ui.importexport.all=3DTout
 lima.ui.importexport.csv=3DImport/Export CSV
@@ -326,6 +327,7 @@
 lima.ui.importexport.import.vatpdfimport=3DLe PDF a bien =C3=A9t=C3=A9 impor=
t=C3=A9 dans le r=C3=A9pertoire des ressources de Lima
 lima.ui.importexport.importcsv=3DImport/Export CSV
 lima.ui.importexport.importebp=3DImport/Export EBP
+lima.ui.importexport.importerror=3DUne erreur est survenue lors de l'import
 lima.ui.importexport.importerror=3DEchec de l'import
 lima.ui.importexport.importtitle=3DErreur d'import
 lima.ui.importexport.vatstatements=3DPlan TVA
@@ -344,7 +346,7 @@
 lima.ui.lettering.checkLettredEntry=3DLettr=C3=A9es
 lima.ui.lettering.checkNoLettredEntry=3DNon-lettr=C3=A9es
 lima.ui.lettering.endFinancialPeriod=3DA
-lima.ui.lettering.entry=3DEcritures
+lima.ui.lettering.entry=3D=C3=89critures
 lima.ui.lettering.period=3DP=C3=A9riodes
 lima.ui.lettering.selectCredit=3DCr=C3=A9dit
 lima.ui.lettering.selectDebit=3DD=C3=A9bit
@@ -353,7 +355,7 @@
 lima.ui.mainview.title=3DLutin Invoice Monitoring and Accounting
 lima.ui.opening.accounts=3D<html><center>Veuillez s=C3=A9lectionner un plan =
par d=C3=A9fault, <br/>importer un plan personnalis=C3=A9<br/> ou annuler pou=
r cr=C3=A9er votre propre plan.</center></html>
 lima.ui.opening.close=3DFermer
-lima.ui.opening.end=3D
+lima.ui.opening.end=3DTerminer
 lima.ui.opening.entrybook=3D<html>Cochez la case pour importer les journaux =
par d=C3=A9faut \:<br/> Achats, Ventes, Tr=C3=A9sorerie, Op=C3=A9ration diver=
ses</html>
 lima.ui.opening.import=3DImporter une sauvegarde CSV
 lima.ui.opening.next=3DSuivant

Modified: trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pom.xml	2012-09-18 14:56:35 UTC (rev 3643)
+++ trunk/pom.xml	2012-09-18 15:10:23 UTC (rev 3644)
@@ -312,6 +312,16 @@
=20
   <contributors>
     <contributor>
+      <name>C=C3=A9dric Houbart</name>
+      <email>cedric@scil.coop</email>
+      <organization>scil.coop</organization>
+      <organizationUrl>http://www.scil.coop/</organizationUrl>
+      <timezone>Europe/Paris</timezone>
+      <roles>
+        <role>D=C3=A9veloppeur</role>
+      </roles>
+    </contributor>
+    <contributor>
       <name>R=C3=A9mi Chapelet</name>
       <email>chapelet@codelutin.com</email>
       <organization>Code Lutin</organization>


--===============6854107785799165253==--