branch feature/1181-internationalisation created (now 26677aa)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1181-internationalisation in repository lima. See http://git.chorem.org/lima.git at 26677aa fixes #1181 Ajout de clefs i18n This branch includes the following new commits: new 4732f93 fixes #1181 Ajout de clefs i18n new 26677aa fixes #1181 Ajout de clefs i18n The 2 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 26677aa9b9c2aa81b4c9bf58149b415158fe9577 Author: dcosse <cosse@codelutin.com> Date: Sat Feb 28 02:00:27 2015 +0100 fixes #1181 Ajout de clefs i18n commit 4732f93079d56bedcd9a57264250e899d03e7cce Author: dcosse <cosse@codelutin.com> Date: Sat Feb 28 01:59:04 2015 +0100 fixes #1181 Ajout de clefs i18n -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1181-internationalisation in repository lima. See http://git.chorem.org/lima.git commit 4732f93079d56bedcd9a57264250e899d03e7cce Author: dcosse <cosse@codelutin.com> Date: Sat Feb 28 01:59:04 2015 +0100 fixes #1181 Ajout de clefs i18n --- .../chorem/lima/business/LimaServiceConfig.java | 2 +- .../resources/i18n/lima-business_en_GB.properties | 8 +- .../resources/i18n/lima-business_fr_FR.properties | 25 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 644 ++++++++++----------- .../resources/i18n/lima-swing_fr_FR.properties | 3 +- .../chorem/lima/web/service/DocumentService.java | 4 +- 7 files changed, 342 insertions(+), 346 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java index fd36487..d37b45b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java @@ -442,7 +442,7 @@ public class LimaServiceConfig { GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.documentReportModelPath", n("lima.config.documentReport.generalEntrybook.documentReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml", String.class, false, false), GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath", n("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml", String.class, false, false), - GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath", n("blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false), + GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath", n("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false), ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.documentReportModelPath", n("lima.config.documentReport.entrybook.documentReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml", String.class, false, false), ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.entryBookModelPath", n("lima.config.documentReport.entrybook.entryBookModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml", String.class, false, false), diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index 7fd8ad5..6e9baaf 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -1,5 +1,4 @@ application.version= -blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-Business.defaultaccountingrules.updateentryerror=Can't update entry \: financialperiod of this entrybook is closed lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Can't update financialtransaction \: this financialperiod of new entrybook is closed lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Can't update financialtransaction \: the new financialperiod of this entrybook is closed @@ -136,6 +135,7 @@ lima.config.documentReport.entrybook.entryBookModelPath.description= lima.config.documentReport.entrybook.financialPeriodModelPath.description= lima.config.documentReport.entrybook.transactionReportModelPath.description= lima.config.documentReport.generalEntrybook.documentReportModelPath.description= +lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description= lima.config.documentReport.generalLedger.documentReportModelPath.description= lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description= @@ -151,8 +151,8 @@ lima.financialtransaction.account= lima.fiscalperiod.fiscalperiod= lima.importexport.import.alreadyExistFinancialStatement= lima.lettering.accountRegularization= -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= +lima.reports.account.noAccount= +lima.reports.account.noAccountTitle= lima.reports.accounts= lima.services.application.version= lima.table.credit= @@ -160,7 +160,7 @@ lima.table.date= lima.table.debit= lima.table.decription= lima.table.description= -lima.table.entrybook= +lima.table.entryBook= lima.table.letter= lima.table.number= lima.table.voucher= diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index fe80f59..9d7eeaa 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -1,5 +1,4 @@ application.version= -blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-Business.defaultaccountingrules.updateentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Impossible de mettre à jour la transaction \: la période financière de ce nouveau journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Impossible de mettre à jour la transaction \: la période financière de ce journal est bloquée @@ -151,18 +150,16 @@ lima.financialtransaction.account= lima.fiscalperiod.fiscalperiod= lima.importexport.import.alreadyExistFinancialStatement= lima.lettering.accountRegularization= -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= -lima.reports.accounts= -lima.services.application.version= -lima.table.credit= -lima.table.date= -lima.table.debit= -lima.table.decription= -lima.table.description= -lima.table.entrybook= -lima.table.letter= -lima.table.number= -lima.table.voucher= +lima.reports.account.noAccount= +lima.reports.account.noAccountTitle= +lima.reports.accounts=Comptes +lima.table.credit=Credit +lima.table.date=Date +lima.table.debit=Débit +lima.table.description=Description +lima.table.entryBook=Journal +lima.table.letter=Lettre +lima.table.number=Numéro de compte +lima.table.voucher=Pièce comptable lima.ui.importexport.import.exceptions.reason=Reason\:% llima.importexport.import.alreadyExistFinancialStatement= diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index c38c9a2..f9149f7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -730,7 +730,7 @@ public class LimaSwingConfig extends ApplicationConfig { GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath", "", - n("blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), + n("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false), diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index f8e6fe0..ef77207 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -1,28 +1,27 @@ -blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= -lima.account= -lima.account.add= -lima.account.add.error.InvalidAccountNumber= -lima.account.add.error.alreadyExist= -lima.account.add.form= -lima.account.error.invalidAccountNumber= -lima.account.error.notNumberAccountNumber= -lima.account.import= -lima.account.import.description= -lima.account.number= -lima.account.remove.confirm= -lima.account.remove.confirm.title= -lima.account.remove.error.usedAccount= -lima.account.update.error.invalidAccountNumber= -lima.account.update.form= -lima.accounts= +lima.account=Account +lima.account.add=Add account (Ctrl+A) +lima.account.add.error.InvalidAccountNumber=Invalid account number\:%1$s +lima.account.add.error.alreadyExist=Account %1$s already exist +lima.account.add.form=Add account +lima.account.error.invalidAccountNumber=Master account is not a digit between 1 to 8 \: %s +lima.account.error.notNumberAccountNumber=Account number that does not start with 4 has to be numeric +lima.account.import=Import +lima.account.import.description=Choose an accounting plan +lima.account.number=Account number +lima.account.remove.confirm=Do you really want to remove %s account ? +lima.account.remove.confirm.title=Delete account +lima.account.remove.error.usedAccount=There are financial statement on this account +lima.account.update.error.invalidAccountNumber=Invalid account number\: %1$s +lima.account.update.form=Update account +lima.accounts=Accounts lima.action.commandline.help=Show help in console lima.balance=Balance lima.cancel=Cancel lima.chart.accounts=Accounts chart lima.chart.accounts.base=Base accountchart lima.chart.accounts.developed=Developped accountchart -lima.chart.accounts.import.csv= -lima.chart.accounts.import.ebp= +lima.chart.accounts.import.csv=CSV customized accounting plan +lima.chart.accounts.import.ebp=EBP customized accounting plan lima.chart.accounts.shortened=Shorthened accountchart lima.closed=Closed lima.code=Code @@ -30,67 +29,67 @@ lima.config.category.directories=Directories lima.config.category.directories.description=Directories used by LIMA lima.config.category.other=Other lima.config.category.other.description=Other configuration properties -lima.config.category.table= -lima.config.category.table.description= -lima.config.cell.background.description= -lima.config.cell.background.label= -lima.config.cell.error.background.description= -lima.config.cell.error.background.label= -lima.config.cell.error.foreground.description= -lima.config.cell.error.foreground.label= -lima.config.cell.foreground.description= -lima.config.cell.foreground.label= -lima.config.cell.mandatory.background.description= -lima.config.cell.mandatory.background.label= -lima.config.cell.mandatory.foreground.description= -lima.config.cell.mandatory.foreground.label= -lima.config.cell.pair.background.description= -lima.config.cell.pair.background.label= -lima.config.cell.pair.error.background.description= -lima.config.cell.pair.error.background.label= -lima.config.cell.pair.error.foreground.description= -lima.config.cell.pair.error.foreground.label= -lima.config.cell.pair.foreground.description= -lima.config.cell.pair.foreground.label= -lima.config.cell.pair.mandatory.background.description= -lima.config.cell.pair.mandatory.background.label= -lima.config.cell.pair.mandatory.foreground.description= -lima.config.cell.pair.mandatory.foreground.label= -lima.config.cell.pair.selected.background.description= -lima.config.cell.pair.selected.background.label= -lima.config.cell.pair.selected.error.background.description= -lima.config.cell.pair.selected.error.background.label= -lima.config.cell.pair.selected.error.foreground.description= -lima.config.cell.pair.selected.error.foreground.label= -lima.config.cell.pair.selected.foreground.description= -lima.config.cell.pair.selected.foreground.label= -lima.config.cell.pair.selected.mandatory.background.description= -lima.config.cell.pair.selected.mandatory.background.label= -lima.config.cell.pair.selected.mandatory.foreground.description= -lima.config.cell.pair.selected.mandatory.foreground.label= -lima.config.cell.selected.background.description= -lima.config.cell.selected.background.label= -lima.config.cell.selected.error.background.description= -lima.config.cell.selected.error.background.label= -lima.config.cell.selected.error.foreground.description= -lima.config.cell.selected.error.foreground.label= -lima.config.cell.selected.foreground.description= -lima.config.cell.selected.foreground.label= -lima.config.cell.selected.mandatory.background.description= -lima.config.cell.selected.mandatory.background.label= -lima.config.cell.selected.mandatory.foreground.description= -lima.config.cell.selected.mandatory.foreground.label= -lima.config.color.selection.focus= -lima.config.color.selection.focus.description= -lima.config.color.selection.focus.label= -lima.config.configFileName.description= -lima.config.configFileName.label= -lima.config.currency.description= -lima.config.currency.label= -lima.config.data.dir.description= -lima.config.data.dir.label= -lima.config.decimalSeparator.description= -lima.config.decimalSeparator.label= +lima.config.category.table=Table +lima.config.category.table.description=Table properties +lima.config.cell.background.description=Background cell color +lima.config.cell.background.label=Background color +lima.config.cell.error.background.description=Background color for invalid cell +lima.config.cell.error.background.label=Background color for invalid cell +lima.config.cell.error.foreground.description=Text error for invalid cell +lima.config.cell.error.foreground.label=Text error for invalid cell +lima.config.cell.foreground.description=Cell color +lima.config.cell.foreground.label=Cell color +lima.config.cell.mandatory.background.description=Background color for required empty cell +lima.config.cell.mandatory.background.label=Backroud color from required empty cell +lima.config.cell.mandatory.foreground.description=Text color from required empty cell +lima.config.cell.mandatory.foreground.label=Text color from required empty cell +lima.config.cell.pair.background.description=Background color for pairing cell +lima.config.cell.pair.background.label=Background color for pairing cell +lima.config.cell.pair.error.background.description=Background color for pairing cell with error +lima.config.cell.pair.error.background.label=Background color for pairing cell with error +lima.config.cell.pair.error.foreground.description=Text color for pairing cell with error +lima.config.cell.pair.error.foreground.label=Text color for pairing cell with error +lima.config.cell.pair.foreground.description=Text color for pairing cell +lima.config.cell.pair.foreground.label=Text color for pairing cell +lima.config.cell.pair.mandatory.background.description=Background color for required pairing cell with error +lima.config.cell.pair.mandatory.background.label=Background color for required pairing cell with error +lima.config.cell.pair.mandatory.foreground.description=Text color for required pairing cell with error +lima.config.cell.pair.mandatory.foreground.label=Text color for required pairing cell with error +lima.config.cell.pair.selected.background.description=Background color for selected pair line +lima.config.cell.pair.selected.background.label=Background color for selected pair line +lima.config.cell.pair.selected.error.background.description=Background color for selected cell with error and within pair line +lima.config.cell.pair.selected.error.background.label=Background color for selected error cell within pair line +lima.config.cell.pair.selected.error.foreground.description=Text color for selected cell with error and within pair line +lima.config.cell.pair.selected.error.foreground.label=Text color for selected error cell within pair line +lima.config.cell.pair.selected.foreground.description=Text color for selected cell within pair line +lima.config.cell.pair.selected.foreground.label=Text color for selected pair line cell +lima.config.cell.pair.selected.mandatory.background.description=Background color for required cell +lima.config.cell.pair.selected.mandatory.background.label=Background color for required cell +lima.config.cell.pair.selected.mandatory.foreground.description=Text color for required cell +lima.config.cell.pair.selected.mandatory.foreground.label=Text color for required cell +lima.config.cell.selected.background.description=Background color cell +lima.config.cell.selected.background.label=Background color cell +lima.config.cell.selected.error.background.description=Error background color for selected cell +lima.config.cell.selected.error.background.label=Error background color for selected cell +lima.config.cell.selected.error.foreground.description=Error text color for selected cell +lima.config.cell.selected.error.foreground.label=Error text color for selected cell +lima.config.cell.selected.foreground.description=Selected cell text color +lima.config.cell.selected.foreground.label=Selected cell text color +lima.config.cell.selected.mandatory.background.description=Selected required cell background color +lima.config.cell.selected.mandatory.background.label=Selected required cell background color +lima.config.cell.selected.mandatory.foreground.description=Selected required cell text color +lima.config.cell.selected.mandatory.foreground.label=Selected required cell text color +lima.config.color.selection.focus=selected border color +lima.config.color.selection.focus.description=selected border color +lima.config.color.selection.focus.label=selected border color +lima.config.configFileName.description=Config file name +lima.config.configFileName.label=Config file +lima.config.currency.description=Show currency symbol +lima.config.currency.label=currency +lima.config.data.dir.description=LIMA data directory +lima.config.data.dir.label=Data directory +lima.config.decimalSeparator.description=Decimal separator +lima.config.decimalSeparator.label=Decimal separator lima.config.documentReport.account.documentReportModelPath.description= lima.config.documentReport.balance.balanceAccountReportModelPath.description= lima.config.documentReport.balance.balanceSubAccountReportModelPath.description= @@ -103,46 +102,47 @@ lima.config.documentReport.entrybook.entryBookModelPath.description= lima.config.documentReport.entrybook.financialPeriodModelPath.description= lima.config.documentReport.entrybook.transactionReportModelPath.description= lima.config.documentReport.generalEntrybook.documentReportModelPath.description= +lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description= -lima.config.host.address.description= -lima.config.host.address.label= -lima.config.i18n.dir.description= -lima.config.i18n.dir.label= +lima.config.host.address.description=Host address +lima.config.host.address.label=Host +lima.config.i18n.dir.description=Translation directory +lima.config.i18n.dir.label=Translation directory lima.config.locale.description=Localization used by LIMA -lima.config.locale.label= +lima.config.locale.label=Local lima.config.reports.dir.description= lima.config.resources.dir.description= lima.config.resources.dir.label= -lima.config.scale.description= -lima.config.scale.label= +lima.config.scale.description=Scale for numbers +lima.config.scale.label=Scale for number lima.config.selectAllEditingCell.description= -lima.config.selectAllEditingCell.label= -lima.config.state.file.description= -lima.config.state.file.label= -lima.config.thousandSeparator.description= -lima.config.thousandSeparator.label= -lima.config.ui.launchUi.description= -lima.config.ui.launchUi.label= +lima.config.selectAllEditingCell.label=Select all when editing +lima.config.state.file.description=LIMA state file +lima.config.state.file.label=LIMA state file +lima.config.thousandSeparator.description=Thousand separator +lima.config.thousandSeparator.label=Thousand separator +lima.config.ui.launchUi.description=Start LIMA as client otherwise as server +lima.config.ui.launchUi.label=Client mode lima.confirmation=Confirmation lima.copy=Copy -lima.date= -lima.date.begin= -lima.date.end= -lima.dates.interval= -lima.dates.interval.in= -lima.dates.interval.to= +lima.date=Date +lima.date.begin=Begin +lima.date.end=End +lima.dates.interval=Date range +lima.dates.interval.in=From +lima.dates.interval.to=to lima.documents=Documents… -lima.email.support.description= -lima.email.support.label= +lima.email.support.description=Mail for support +lima.email.support.label=support lima.entries=Entries -lima.entries.add.entry.error.afterLastFiscalPeriod= -lima.entries.add.entry.error.beforeFirstFiscalPeriod= -lima.entries.add.entry.error.lockedEntryBook= -lima.entries.add.entry.error.lockedFinancialPeriod= -lima.entries.add.transaction.error.afterLastFiscalPeriod= -lima.entries.add.transaction.error.beforeFirstFiscalPeriod= -lima.entries.add.transaction.error.lockedEntryBook= -lima.entries.add.transaction.error.lockedFinancialPeriod= +lima.entries.add.entry.error.afterLastFiscalPeriod=Add entry failed, financial transaction date is after last fiscal period date +lima.entries.add.entry.error.beforeFirstFiscalPeriod=Add entry failed, financial transaction date is before first fiscal period date +lima.entries.add.entry.error.lockedEntryBook=Add entry failed, closed entry book +lima.entries.add.entry.error.lockedFinancialPeriod=Add entry failed close financial period +lima.entries.add.transaction.error.afterLastFiscalPeriod=Add financial transaction failed, financial transaction date is after last fiscal period date +lima.entries.add.transaction.error.beforeFirstFiscalPeriod=Add financial transaction failed, financial transaction date is before first fiscal period date +lima.entries.add.transaction.error.lockedEntryBook=Add financial transaction failed, closed entry book +lima.entries.add.transaction.error.lockedFinancialPeriod=Add financial transaction failed, closed financial period lima.entries.addEntry=New entry lima.entries.addTransaction=New transaction lima.entries.assign.entries=Assign this value in all entries in transaction @@ -150,212 +150,212 @@ lima.entries.assign.error.lockedEntryBook= lima.entries.balance=Balance transaction with this entry lima.entries.copy.entry=Copy entry lima.entries.copy.transaction=Copy transaction -lima.entries.enter= -lima.entries.entryBook= -lima.entries.financialPeriod= -lima.entries.fiscalYear= -lima.entries.letter.closed.entryBook.error= +lima.entries.enter=Add entries +lima.entries.entryBook=Entry book +lima.entries.financialPeriod=Financial period +lima.entries.fiscalYear=fiscal year +lima.entries.letter.closed.entryBook.error=Entry book close %2$s (%1$s) for period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY. lima.entries.letter.unbalanced.error= lima.entries.lettering=Lettering lima.entries.paste.entry=Paste entry -lima.entries.paste.entry.error.afterLastFiscalPeriod= -lima.entries.paste.entry.error.beforeFirstFiscalPeriod= -lima.entries.paste.entry.error.lockedEntryBook= -lima.entries.paste.entry.error.lockedFinancialPeriod= +lima.entries.paste.entry.error.afterLastFiscalPeriod=Past entry failed, financial transaction date is after last fiscal period date +lima.entries.paste.entry.error.beforeFirstFiscalPeriod=Past entry failed, financial transaction date is before first fiscal period date +lima.entries.paste.entry.error.lockedEntryBook=Past entry failed, entry book closed +lima.entries.paste.entry.error.lockedFinancialPeriod=Past entry failed, financial period closed lima.entries.paste.transaction=Paste transaction -lima.entries.paste.transaction.error.afterLastFiscalPeriod= -lima.entries.paste.transaction.error.beforeFirstFiscalPeriod= -lima.entries.paste.transaction.error.lockedEntryBook= -lima.entries.paste.transaction.error.lockedFinancialPeriod= +lima.entries.paste.transaction.error.afterLastFiscalPeriod=Past financial transaction failed, financial transaction date is after last fiscal period date +lima.entries.paste.transaction.error.beforeFirstFiscalPeriod=Past financial transaction failed, financial transaction date is before first fiscal period date +lima.entries.paste.transaction.error.lockedEntryBook=Past financial transaction failed, entry book closed +lima.entries.paste.transaction.error.lockedFinancialPeriod=Past financial transaction failed, financial period closed lima.entries.remove.entry=Delete entry -lima.entries.remove.entry.confirm= -lima.entries.remove.entry.error.lockedEntryBook= -lima.entries.remove.entry.error.lockedFinancialPeriod= -lima.entries.remove.entry.title= -lima.entries.remove.transaction=Delete transaction -lima.entries.remove.transaction.confirm= -lima.entries.remove.transaction.error.lockedEntryBook= -lima.entries.remove.transaction.error.lockedFinancialPeriod= -lima.entries.remove.transaction.title= -lima.entries.search= -lima.entries.unbalanced= +lima.entries.remove.entry.confirm=Do you really want to remove this entry ? +lima.entries.remove.entry.error.lockedEntryBook=Delete entry failed, entry book is closed +lima.entries.remove.entry.error.lockedFinancialPeriod=Delete entry failed, financial period is closed +lima.entries.remove.entry.title=Delete +lima.entries.remove.transaction=Delete transaction (Ctrl+Del) +lima.entries.remove.transaction.confirm=Do you really want to remove this transaction ? +lima.entries.remove.transaction.error.lockedEntryBook=Delete financial transaction failed, entry book is closed +lima.entries.remove.transaction.error.lockedFinancialPeriod=Delete financial transaction failed, financial period is closed +lima.entries.remove.transaction.title=Delete +lima.entries.search=Entries search +lima.entries.unbalanced=Unbalanced entries lima.entry=Entry -lima.entry.account= -lima.entry.credit= -lima.entry.debit= -lima.entry.description= -lima.entry.letter= -lima.entry.remove.confirm= +lima.entry.account=Account +lima.entry.credit=Credit +lima.entry.debit=Debit +lima.entry.description=Description +lima.entry.letter=Letter +lima.entry.remove.confirm=Do you really want to remove this financial transaction line ? lima.entry.update.closed.entryBook.error= lima.entryBook=EntryBook -lima.entryBook.add= -lima.entryBook.alreadyExistEntryBook= -lima.entryBook.code= -lima.entryBook.default= +lima.entryBook.add=Add entry book (Ctrl+A) +lima.entryBook.alreadyExistEntryBook=Already existing entry book +lima.entryBook.code=Code +lima.entryBook.default=Default entry book lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. -lima.entryBook.error.lockedEntryBook= -lima.entryBook.form= -lima.entryBook.import= -lima.entryBook.import.form= -lima.entryBook.label= -lima.entryBook.remove= -lima.entryBook.remove.confirm= -lima.entryBook.remove.title= -lima.entryBook.update= +lima.entryBook.error.lockedEntryBook=Closed entry book %2$s (%1$s) for period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY. +lima.entryBook.form=Entry book +lima.entryBook.import=Importer +lima.entryBook.import.form=Import +lima.entryBook.label=Label +lima.entryBook.remove=Delete +lima.entryBook.remove.confirm=Do you really want to remove this entry book ? +lima.entryBook.remove.title=Delete entry book +lima.entryBook.update=Update (Ctrl+M) lima.entryBooks=EntryBooks lima.error=Error -lima.error.message= -lima.error.noFiscalPeriodFound= +lima.error.message=<html><body><b>Error come out</b>\:<br/>%s</body></html> +lima.error.noFiscalPeriodFound=Any fiscal period found lima.error.notAllowedLabel= -lima.export.exceptions= -lima.export.failed= -lima.export.terminated= -lima.file= -lima.filer.condition.sensitive.case= +lima.export.exceptions=Export failed. +lima.export.failed=Export faild \! +lima.export.terminated=Successful export +lima.file=File +lima.filer.condition.sensitive.case=Case sensitive lima.filter=Filter -lima.filter.account= -lima.filter.condition.all= -lima.filter.condition.one= -lima.filter.credit= -lima.filter.date.interval= -lima.filter.date.one= -lima.filter.debit= -lima.filter.description= -lima.filter.entryBook= -lima.filter.financialPeriod= -lima.filter.fiscalPeriod= -lima.filter.letter= -lima.filter.voucher= -lima.financialPeriod= -lima.financialPeriod.begin= -lima.financialPeriod.block= -lima.financialPeriod.block.confirm= -lima.financialPeriod.block.error.noLockedPreviousEntryBook.main= -lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook= -lima.financialPeriod.block.error.unbalanced.main= -lima.financialPeriod.block.error.unbalanced.transaction= -lima.financialPeriod.block.error.unfilled.entry= -lima.financialPeriod.block.error.unfilled.main= +lima.filter.account=Add account filter +lima.filter.condition.all=Valid all criteria +lima.filter.condition.one=Valid at least one criteria +lima.filter.credit=Add filter on credit +lima.filter.date.interval=Filter on date range +lima.filter.date.one=Filter for one date +lima.filter.debit=Filter for debit +lima.filter.description=Add filter on description +lima.filter.entryBook=Add filter on entry book +lima.filter.financialPeriod=Add filter on financial period +lima.filter.fiscalPeriod=Add filter on fiscal period +lima.filter.letter=Add filter on letter +lima.filter.voucher=Add filter on voucher +lima.financialPeriod=Financial period +lima.financialPeriod.begin=Begin +lima.financialPeriod.block=Close fiscal period (Ctrl+C) +lima.financialPeriod.block.confirm=Do you relly want to close this fiscal period ? this action can not be reverted \! +lima.financialPeriod.block.error.noLockedPreviousEntryBook.main=Failed to close this fiscal period. Previous fiscal period must be closed\! +lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook=period from %1$te %1$tB %1$tY to %2$te %2$tB %2$tY +lima.financialPeriod.block.error.unbalanced.main=Faild to close fiscal period. Unbalanced financial transaction remains \: +lima.financialPeriod.block.error.unbalanced.transaction=financial transaction date %1$te/%1$tm/%1$tY, debit\:%2$s - credit\:%3$s +lima.financialPeriod.block.error.unfilled.entry=entry date %1$te/%1$tm/%1$tY for %2$s \: +lima.financialPeriod.block.error.unfilled.main=Failed to close period. Required filed not fill up\:lima.financialPeriod.block.error.unfilled.noAccount\=account required lima.financialPeriod.block.error.unfilled.noAccount= -lima.financialPeriod.block.error.unfilled.noDescription= -lima.financialPeriod.block.error.unfilled.noVoucher= -lima.financialPeriod.block.error.withoutEntryBook.main= -lima.financialPeriod.block.error.withoutEntryBook.transaction= -lima.financialPeriod.block.title= -lima.financialPeriod.closed= -lima.financialPeriod.end= -lima.financialPeriod.entryBook= -lima.financialPeriod.open= -lima.financialPeriod.status= -lima.financialPeriods= -lima.financialStatement=Financialstatement chart +lima.financialPeriod.block.error.unfilled.noDescription=account required +lima.financialPeriod.block.error.unfilled.noVoucher=voucher required +lima.financialPeriod.block.error.withoutEntryBook.main=Failed to close financial period. Financial transaction with required Entry book +lima.financialPeriod.block.error.withoutEntryBook.transaction=transaction with date %1$te/%1$tm/%1$tY and sold %2$s, +lima.financialPeriod.block.title=Close +lima.financialPeriod.closed=Close +lima.financialPeriod.end=End +lima.financialPeriod.entryBook=Entry book +lima.financialPeriod.open=Open +lima.financialPeriod.status=Status +lima.financialPeriods=Financial periods +lima.financialStatement=Financial statement chart lima.financialStatement.accounts=Account list on debit and on credit -lima.financialStatement.base=Base financialstatement chart +lima.financialStatement.base=Base financial statement chart lima.financialStatement.check=Check accounts passing to movement -lima.financialStatement.creditAccounts= -lima.financialStatement.debitAccounts= -lima.financialStatement.delete=Delete actual financialstatement chart before import new -lima.financialStatement.developed=Developped financialstatement chart -lima.financialStatement.error.alreadyExistFinancialStatement= +lima.financialStatement.creditAccounts=Account credit list +lima.financialStatement.debitAccounts=Account debit list +lima.financialStatement.delete=Delete actual financial statement chart before import new +lima.financialStatement.developed=Developped financial statement chart +lima.financialStatement.error.alreadyExistFinancialStatement=Failed\! Financial statement %s already exist lima.financialStatement.header.add=Add category -lima.financialStatement.header.form= +lima.financialStatement.header.form=Category lima.financialStatement.headerAmount=Calculate amount on header -lima.financialStatement.import.form= +lima.financialStatement.import.form=Import lima.financialStatement.label=Label lima.financialStatement.movement.add=Add movement -lima.financialStatement.movement.form= +lima.financialStatement.movement.form=Group lima.financialStatement.nothing=NO financialstatement chart lima.financialStatement.provisionDeprecationAccounts= -lima.financialStatement.remove.confirm= +lima.financialStatement.remove.confirm=Do you really want to remove this financial statement ? lima.financialStatement.shortened=Shortened financialstatement chart lima.financialStatement.subAmount=Calculate a subamount -lima.financialStatements= -lima.financialStatements.check= -lima.financialStatements.check.nothing= -lima.financialStatements.check.warn= -lima.financialTransaction.date= +lima.financialStatements=Financial statements +lima.financialStatements.check=chack account +lima.financialStatements.check.nothing=Not found \: %s - %s +lima.financialStatements.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financial statement.\n Some account marked not found is normally.\n\n +lima.financialTransaction.date=Date lima.financialTransaction.day=Day -lima.financialTransaction.nextFinancialPeriod= -lima.financialTransaction.previousFinancialPeriod= -lima.financialTransaction.remove.confirm= +lima.financialTransaction.nextFinancialPeriod=Next fiancial period +lima.financialTransaction.previousFinancialPeriod=Previous financial period +lima.financialTransaction.remove.confirm=Do you really want to remove this financial transaction? lima.financialTransaction.statusTextDebitCredit=<html>Debit\: <b>%s</b> - Credit\: <b>%s</b> - Balance\: <b>%s</b> lima.financialTransaction.statusTextDebitCreditError=<html>Debit\: <b>%s</b> - Credit\: <b>%s</b> - Balance\: <b><font color\=\#ff4000>%s</font></b> -lima.financialTransaction.update.error.afterLastFiscalPeriod= -lima.financialTransaction.update.error.beforeFirstFiscalPeriod= -lima.financialTransaction.update.error.lockedEntryBook= -lima.financialTransaction.update.error.lockedFinancialPeriod= -lima.financialTransaction.voucher= -lima.fiscalPeriod= -lima.fiscalPeriod.add= -lima.fiscalPeriod.add.confirm.moreThan12= -lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= -lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod= -lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod= -lima.fiscalPeriod.add.form= -lima.fiscalPeriod.begin= -lima.fiscalPeriod.block= -lima.fiscalPeriod.block.addRetainedEarnings= -lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist= -lima.fiscalPeriod.block.cantBalanceNotBook= -lima.fiscalPeriod.block.cantBlockNotBalance= -lima.fiscalPeriod.block.confirmation= -lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod= -lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod= -lima.fiscalPeriod.block.newYear= -lima.fiscalPeriod.block.retainedEarnings= -lima.fiscalPeriod.block.title= -lima.fiscalPeriod.closed= -lima.fiscalPeriod.delete= +lima.financialTransaction.update.error.afterLastFiscalPeriod=Update financial transaction failed, financial transaction date is after last fiscal period date +lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Update financial transaction failed, financial transaction date is before first fiscal period date +lima.financialTransaction.update.error.lockedEntryBook=Update financial transaction failed, locked entry book. +lima.financialTransaction.update.error.lockedFinancialPeriod=Update financial transaction failed, locked financial period. +lima.financialTransaction.voucher=Voucher +lima.fiscalPeriod=Fiscal period +lima.fiscalPeriod.add=Add fiscal period +lima.fiscalPeriod.add.confirm.moreThan12=Fiscal period is not 12 month long, do you really want to continue ? +lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Ending date (%2$te/%2$tm/%2$tY) must be gretter that begin one (%1$te/%1$tm/%1$tY) +lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=%1s fiscal periods already exist +lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=Fiscal period dete must follows the last one %1$te/%1$tm/%1$tY +lima.fiscalPeriod.add.form=Add new fiscal period +lima.fiscalPeriod.begin=From +lima.fiscalPeriod.block=Close (Ctrl+c) +lima.fiscalPeriod.block.addRetainedEarnings=Do you want to push to new fiscal period ? +lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist=Failed to create new fiscal period, no next fiscal period \! +lima.fiscalPeriod.block.cantBalanceNotBook=Failed to create new fiscal period, entry book is required \! +lima.fiscalPeriod.block.cantBlockNotBalance=Faild, unbalanced fiscal period. +lima.fiscalPeriod.block.confirmation=Do you really want to close this fiscal period ? This action can no be reverted \! +lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=Fiscal period already closed +lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=Previous fiscal period must be closed +lima.fiscalPeriod.block.newYear=Do you want to create new fiscal year +lima.fiscalPeriod.block.retainedEarnings=Push next +lima.fiscalPeriod.block.title=Close fiscal period +lima.fiscalPeriod.closed=Close +lima.fiscalPeriod.delete=Delete fiscal period (Del) lima.fiscalPeriod.delete.confirmation= lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod= lima.fiscalPeriod.delete.title= -lima.fiscalPeriod.end= -lima.fiscalPeriod.entryBooks.create= +lima.fiscalPeriod.end=End +lima.fiscalPeriod.entryBooks.create=Create an entry book lima.fiscalPeriod.error.beginAfterEndFiscalPeriod= lima.fiscalPeriod.error.lockedFinancialPeriod= lima.fiscalPeriod.error.moreOneUnlockFiscalPeriod= lima.fiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod= -lima.fiscalPeriod.form= -lima.fiscalPeriod.open= -lima.fiscalPeriod.status= -lima.fiscalPeriod.update= -lima.fiscalPeriod.update.form= -lima.fiscalYears= -lima.help= -lima.help.about= +lima.fiscalPeriod.form=Fiscal period +lima.fiscalPeriod.open=Open +lima.fiscalPeriod.status=Status +lima.fiscalPeriod.update=Update ending date (Ctrl+M) +lima.fiscalPeriod.update.form=Update fiscal period +lima.fiscalYears=Fiscal year +lima.help=Help +lima.help.about=About lima.help.about.title=About Lima... lima.help.about.title.description=Open sources accounting software lima.help.about.translate.content=<h3>How to translate Lima</h3>You can help us to translate or improve label in Lima.<br/><ul><li>Get the <strong>lima-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. lima.help.about.translate.title=Translate Lima -lima.help.i18n= -lima.help.i18n.fr= -lima.help.i18n.uk= -lima.help.site= +lima.help.i18n=Langage +lima.help.i18n.fr=French +lima.help.i18n.uk=English +lima.help.site=Go to lima web site lima.home=Home -lima.home.accounts= -lima.home.accounts.create= -lima.home.accounts.info= -lima.home.accounts.modify= -lima.home.accounts.nothing= -lima.home.entries= -lima.home.entries.balanced= -lima.home.entries.create= -lima.home.entries.error= -lima.home.entries.error.modify= -lima.home.entries.modify= -lima.home.entries.nothing= -lima.home.entryBooks= -lima.home.entryBooks.create= -lima.home.entryBooks.info= -lima.home.entryBooks.info.one= -lima.home.entryBooks.modify= -lima.home.entryBooks.nothing= -lima.home.fiscalYears= -lima.home.fiscalYears.closed= -lima.home.fiscalYears.create= -lima.home.fiscalYears.modify= -lima.home.fiscalYears.noOpen= -lima.home.fiscalYears.opened= +lima.home.accounts=Accounts +lima.home.accounts.create=Create account +lima.home.accounts.info=There are %s accounts +lima.home.accounts.modify=Update Account ? +lima.home.accounts.nothing=Any account \! +lima.home.entries=Entries +lima.home.entries.balanced=Unbalanced Entries +lima.home.entries.create=Add entry +lima.home.entries.error=un-validate %s entry +lima.home.entries.error.modify=Update un-valid entries +lima.home.entries.modify=Updade entries +lima.home.entries.nothing=Any entries +lima.home.entryBooks=Entry books +lima.home.entryBooks.create=Add entry book +lima.home.entryBooks.info=%s entry books \: +lima.home.entryBooks.info.one=Entry book \: +lima.home.entryBooks.modify=Update entry book +lima.home.entryBooks.nothing=Any open entry book \! +lima.home.fiscalYears=Fiscal year +lima.home.fiscalYears.closed=%s close fiscal years +lima.home.fiscalYears.create=Add fiscal year +lima.home.fiscalYears.modify=Update fiscal year +lima.home.fiscalYears.noOpen=Any open fiscal year +lima.home.fiscalYears.opened=%s open fiscal year lima.identity=Identity lima.identity.address=Address lima.identity.address2=Address (next) @@ -368,72 +368,72 @@ lima.identity.name=Name lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code -lima.import.error= -lima.import.error.extractFile= -lima.import.error.noDataToImport= -lima.import.error.unknown= -lima.import.line= -lima.import.report= -lima.import.terminated= -lima.import.title= +lima.import.error=Import Failed +lima.import.error.extractFile=Un-valid file +lima.import.error.noDataToImport=Any data to import +lima.import.error.unknown=Unknown error +lima.import.line=line +lima.import.report=%d created\n %d ignored\n %d updated +lima.import.terminated=Import finished +lima.import.title=Failed lima.importExport.account=Accounts import completed. lima.importExport.all=All lima.importExport.csv=Import/Export CSV lima.importExport.ebp=Import/Export EBP lima.importExport.encoding.choice= lima.importExport.entry=Entries import completed. -lima.importExport.entryBook= -lima.importExport.entryBooks.default= +lima.importExport.entryBook=entry book completed. +lima.importExport.entryBooks.default=Default entry book lima.importExport.export=Export lima.importExport.financialStatement=Financial transactions import completed. -lima.importExport.financialTransaction= +lima.importExport.financialTransaction=financial transaction completed. lima.importExport.fiscalPeriod=Fiscal periods import completed. lima.importExport.identity=Identity import completed. -lima.importExport.import= +lima.importExport.import=Import lima.importExport.vatStatement=VTA transactions import completed. lima.importExport.wait=Job in progress… lima.info=Information lima.init.closed=Lima closed at %1$s -lima.init.errorclosing= +lima.init.errorclosing=Fail to closed lima.label=Label -lima.launch.accounting= -lima.launch.finished= -lima.launch.services= -lima.launch.webServer= +lima.launch.accounting=Launch accounts +lima.launch.finished=completed +lima.launch.services=start services +lima.launch.webServer=start web server lima.lettering.account=Accounts -lima.lettering.account.aAll= -lima.lettering.account.back= -lima.lettering.account.next= +lima.lettering.account.aAll=All +lima.lettering.account.back=← +lima.lettering.account.next=→ lima.lettering.checkAll=All -lima.lettering.checkLettredEntry= -lima.lettering.checkNoLettredEntry= +lima.lettering.checkLettredEntry=Lettered +lima.lettering.checkNoLettredEntry=Not lettered lima.lettering.entry=Entries -lima.lettering.equalize= -lima.lettering.lettered= +lima.lettering.equalize=Balanced (Ctrl+B) +lima.lettering.lettered=Lettered (Ctrl+L) lima.lettering.period=Periods -lima.lettering.period.begin= -lima.lettering.period.end= -lima.lettering.refresh= +lima.lettering.period.begin=From +lima.lettering.period.end=TO +lima.lettering.refresh=Refresh (F5) lima.lettering.roundAndCreateEntry.error.lockedEntryBook= lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod= -lima.lettering.selection.credit= -lima.lettering.selection.debit= -lima.lettering.selection.sold= -lima.lettering.unLettered= +lima.lettering.selection.credit=Credit +lima.lettering.selection.debit=Debit +lima.lettering.selection.sold=Balance +lima.lettering.unLettered=Remove lettering lima.lookAndFeel.nimbus.warning= -lima.message.help.usage= +lima.message.help.usage=Options (set with --option <key> <value>\: lima.new=New -lima.noAffect= +lima.noAffect=N.R lima.ok=Ok lima.open=Open -lima.openEjb.remote.mode.description= -lima.openEjb.remote.mode.label= -lima.opening= +lima.openEjb.remote.mode.description=Server started +lima.openEjb.remote.mode.label=Server started +lima.opening=Launching lima.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> lima.opening.close=Close lima.opening.end=Finish -lima.opening.entryBook= -lima.opening.fiscalPeriod= +lima.opening.entryBook=Select it to import default entry books +lima.opening.fiscalPeriod=Create fiscal period lima.opening.import=Import a CSV backup lima.opening.next=Next lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> @@ -441,29 +441,29 @@ lima.paste=Paste lima.preferences=Preferences lima.quit=Exit lima.refresh=Refresh -lima.refresh.shortcut= +lima.refresh.shortcut=Refresh (F5) lima.remove=Remove -lima.remove.shortcut= +lima.remove.shortcut=Delete (Del) lima.retainedEarnings.wait= lima.search=Search lima.structure=Structure lima.table.account=Account lima.table.balance=Balance lima.table.credit=Credit -lima.table.date= +lima.table.date=Date lima.table.debit=Debit lima.table.debitCredit= lima.table.description=Description -lima.table.entryBook= +lima.table.entryBook=Entry book lima.table.label=Label lima.table.letter=Letter lima.table.number=Account Number lima.table.provisionDeprecation= lima.table.voucher=Voucher -lima.title= +lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction lima.update=Modify -lima.update.shortcut= +lima.update.shortcut=Update (Ctrl+M) lima.vatStatement=VAT statement chart lima.vatStatement.accounts=List of accounts lima.vatStatement.base=Base VAT statement chart @@ -482,4 +482,4 @@ lima.vatStatement.remove.confirm= lima.vatStatement.remove.title= lima.vatStatement.shortened=Shortened vat statement chart lima.vatStatements= -lima.wait= +lima.wait=Work in progress diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 282493f..4f374b8 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -1,4 +1,3 @@ -blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.account=Compte lima.account.add=Nouveau compte (Ctrl+A) lima.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide @@ -198,7 +197,7 @@ lima.entry.remove.confirm=Voulez-vous supprimer cette ligne de transaction? lima.entry.update.closed.entryBook.error=Impossible de modifier cette écriture car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entryBook=Journal lima.entryBook.add=Ajout de journal (Ctrl+A) -lima.entryBook.alreadyExistEntryBook=Un journal avec comme code % existe déjà. +lima.entryBook.alreadyExistEntryBook=Un journal avec comme code %s existe déjà. lima.entryBook.code=Code lima.entryBook.default=Journaux par défault lima.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java index 9650726..be8e168 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java @@ -363,7 +363,7 @@ public class DocumentService { beginDate, endDate); List<Entry> entries = results.getListEntry(); - String[] columnNames = {t("lima.table.number"), t("lima.table.date"), t("lima.table.entrybook"), + String[] columnNames = {t("lima.table.number"), t("lima.table.date"), t("lima.table.entryBook"), t("lima.table.voucher"), t("lima.table.description"), t("lima.table.letter"), t("lima.table.debit"), t("lima.table.credit")}; @@ -400,7 +400,7 @@ public class DocumentService { "</body>\n"; } else { - JOptionPane.showMessageDialog(null, t("lima.reports.account.noaccount"), t("lima.reports.account.noaccounttitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, t("lima.reports.account.noAccount"), t("lima.reports.account.noAccountTitle"), JOptionPane.INFORMATION_MESSAGE); } accountReport += "</html>"; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1181-internationalisation in repository lima. See http://git.chorem.org/lima.git commit 26677aa9b9c2aa81b4c9bf58149b415158fe9577 Author: dcosse <cosse@codelutin.com> Date: Sat Feb 28 02:00:27 2015 +0100 fixes #1181 Ajout de clefs i18n --- lima-web/src/main/resources/i18n/lima-web_en_GB.properties | 3 +++ lima-web/src/main/resources/i18n/lima-web_fr_FR.properties | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lima-web/src/main/resources/i18n/lima-web_en_GB.properties b/lima-web/src/main/resources/i18n/lima-web_en_GB.properties index a609e70..e3f70dd 100644 --- a/lima-web/src/main/resources/i18n/lima-web_en_GB.properties +++ b/lima-web/src/main/resources/i18n/lima-web_en_GB.properties @@ -42,6 +42,8 @@ lima-business.document.voucher= lima-business.document.zipcode= lima.financialtransaction.account= lima.fiscalperiod.fiscalperiod= +lima.reports.account.noAccount= +lima.reports.account.noAccountTitle= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= @@ -49,6 +51,7 @@ lima.table.credit= lima.table.date= lima.table.debit= lima.table.description= +lima.table.entryBook= lima.table.entrybook= lima.table.letter= lima.table.number= diff --git a/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties b/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties index a609e70..e3f70dd 100644 --- a/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties +++ b/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties @@ -42,6 +42,8 @@ lima-business.document.voucher= lima-business.document.zipcode= lima.financialtransaction.account= lima.fiscalperiod.fiscalperiod= +lima.reports.account.noAccount= +lima.reports.account.noAccountTitle= lima.reports.account.noaccount= lima.reports.account.noaccounttitle= lima.reports.accounts= @@ -49,6 +51,7 @@ lima.table.credit= lima.table.date= lima.table.debit= lima.table.description= +lima.table.entryBook= lima.table.entrybook= lima.table.letter= lima.table.number= -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm