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 fa88c97cac1c2a4200ab89d826f93a885c81bcc0 Author: dcosse <cosse@codelutin.com> Date: Sat Feb 28 03:09:40 2015 +0100 fixes #1181 Ajout de nouvelles traductions --- .../resources/i18n/lima-business_en_GB.properties | 132 +++++---------------- .../resources/i18n/lima-business_fr_FR.properties | 99 ++-------------- .../resources/i18n/lima-callao_en_GB.properties | 31 +++-- .../resources/i18n/lima-swing_en_GB.properties | 58 ++++----- .../resources/i18n/lima-swing_fr_FR.properties | 4 +- .../src/main/resources/lima-config.properties | 2 +- .../chorem/lima/web/service/DocumentService.java | 4 +- .../main/resources/i18n/lima-web_en_GB.properties | 2 + .../main/resources/i18n/lima-web_fr_FR.properties | 2 + 9 files changed, 93 insertions(+), 241 deletions(-) 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 6e9baaf..cb7f451 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,38 +1,15 @@ -application.version= -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 -lima-Business.defaultaccountingrules.updatenewentryerror=Can't update entry \: financialperiod of this entrybook is closed -lima-business.account.accountalreardyexist=An account already exists with this number \: %s -lima-business.common.failed=FAILED \: %s \n -lima-business.defaultaccountingrules.allentrybookclosed=All EntryBook of this financialperiod are closed -lima-business.defaultaccountingrules.blockerrorequillibrate=Can't block financialperiod/entrybook contain financialtransaction not equilibrate -lima-business.defaultaccountingrules.dateaftererror=The date is after the fiscal period -lima-business.defaultaccountingrules.datebeforeerror=The date is before the fiscal period -lima-business.defaultaccountingrules.deleteaccounterror=Can't delete Account with entries -lima-business.defaultaccountingrules.deleteentrybookerror=Can't delete entryBook with financialtransaction -lima-business.defaultaccountingrules.enddateerror=The end date is before the begin date -lima-business.defaultaccountingrules.financialnewdateblocked=The financial period of the new date is blocked -lima-business.defaultaccountingrules.financialperiodblocked=The financial period is blocked -lima-business.defaultaccountingrules.financialtransactionblocked=The financial period of this transaction is blocked -lima-business.defaultaccountingrules.invalidaccountnumber=Invalid Account Number \: %d -lima-business.defaultaccountingrules.missingelements=Can't block financialperiod / missing elements in transactions for this FinancialPeriod/EntryBook -lima-business.defaultaccountingrules.missingentrybook=Can't block financialperiod / missing EntryBook in transactions -lima-business.document.account= -lima-business.document.accountnumber=Account N° +application.version=Version +lima-business.document.account=Account lima-business.document.accounts=Accounts -lima-business.document.adress= -lima-business.document.adresssuite= -lima-business.document.amount= +lima-business.document.address=Address +lima-business.document.addressMore=Address (more) +lima-business.document.amount=Amount lima-business.document.amounts=Amounts lima-business.document.amountsperiod=Amounts %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=Business N° -lima-business.document.carryback=Carry Back -lima-business.document.carryforward=reporterÀ -lima-business.document.city= +lima-business.document.city=City lima-business.document.classificationcode=Classification Code -lima-business.document.createdate=Editing Date %1$tm/%1$te/%1$tY at %1$tH\:%1$tM lima-business.document.credit=Credit lima-business.document.date=Date lima-business.document.date.begin=Begin date @@ -41,13 +18,9 @@ lima-business.document.dateformat=%1$tm/%1$te/%1$tY lima-business.document.debit=Debit lima-business.document.description=Description lima-business.document.entries=Entries -lima-business.document.entryBooks=Entry books -lima-business.document.entrybook=EntryBook -lima-business.document.entrybooks= -lima-business.document.entrybooktitle=%s\n%2$tB %2$tY -lima-business.document.financialTransactions=Financial transactions +lima-business.document.entrybook=Entry book +lima-business.document.entrybooks=Entry books lima-business.document.financialstatement=FinancialStatement -lima-business.document.fiscalPeriods=Fiscal periods lima-business.document.generalentrybook=General EntryBook lima-business.document.grossamount=Gross Amount lima-business.document.label=Label @@ -56,74 +29,26 @@ lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Credit movement lima-business.document.movementdebit=Debit movement lima-business.document.netamount=Net Amount -lima-business.document.pagenumber=Page N° %d lima-business.document.period1=Periode from lima-business.document.period1format=%1$tm/%1$te/%1$tY lima-business.document.period2=to lima-business.document.period2format=%1$tm/%1$te/%1$tY lima-business.document.provisiondeprecationamount=Provision Deprecation Amount -lima-business.document.society= +lima-business.document.society=Society lima-business.document.solde=Solde lima-business.document.soldecredit=Credit solde lima-business.document.soldedebit=Debit solde -lima-business.document.unknow=POA lima-business.document.vat=VAT form lima-business.document.vatnumber=VAT N° lima-business.document.voucher=Voucher lima-business.document.zipcode=Zipcode -lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this code \: %s -lima-business.financialstatement.check.nothing=Not found \: %s - %s \n -lima-business.financialstatement.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-business.financialtransaction.retainedearnings.description=Retained earnings lima-business.financialtransaction.retainedearnings.voucher=According to general meeting -lima-business.fiscalperiod.fiscalperiodalreadyblocked=Fiscal Period already blocked -lima-business.fiscalperiod.newfinancialperioderror=Can't set financial period on the following fiscal year -lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=The last financial period from the fiscal period is blocked -lima-business.franceaccountingrules.accountnumbernotnumeric=Account Number is not numeric \: %s -lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %s -lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this -lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked -lima-business.franceaccountingrules.fiscalperiodnotempty=The fiscal period is not empty \! -lima-business.franceaccountingrules.lastFiscalPeriodCantBlocked= -lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=The new fiscal period must adjoining the last -lima-business.import.FinancialTransaction.error.LockedEntryBook= -lima-business.import.FinancialTransaction.error.LockedFinancialPeriod= -lima-business.import.FiscalPeriod.error.beginAfterEndFiscalPeriod= -lima-business.import.FiscalPeriod.error.moreOneUnlockFiscalPeriod= -lima-business.import.FiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod= -lima-business.import.account.InvalidAccountNumber= -lima-business.import.account.added= -lima-business.import.account.alreadyExist= -lima-business.import.account.alreadyexist= -lima-business.import.accountInvalidAccountNumber= -lima-business.import.accountadded=SUCCES \: Account %s - %s added\n -lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n -lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n lima-business.import.ebpmissingaccount=FAILED \: Account %s doesn't exist.\nCreate all accounts before import entries. -lima-business.import.ebpnoentry=FAILED \: This file contains no entries. -lima-business.import.ebpnoheader=FAILED \: This file has no header datas. -lima-business.import.entries.error.FinancialPeriod= -lima-business.import.entries.error.LockedEntryBook= -lima-business.import.entries.error.lockedEntryBook= -lima-business.import.entries.error.lockedFinancialPeriod= +lima-business.import.entries.error.lockedEntryBook=Locked entry book +lima-business.import.entries.error.lockedFinancialPeriod=locked fiancial period lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n -lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" -lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n -lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n -lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n -lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s has master \: %s which not exist \n -lima-business.import.financialstatementalreadyexist=FAILED \: The financial statement %s already exists \!\n -lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n -lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscal period %s - %s already exists \!\n -lima-business.import.fiscalperiodscloseperiodicentrybooks= -lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n -lima-business.import.lineformatmismatch=Line format is invalid. lima-business.import.noaccount=ERROR \: This file contains no account -lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n -lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n -lima-business.import.vatstatementadded=SUCCESS \: The vatStatement %s is created \n -lima-business.import.vatstatementalnomaster=FAILED \: The vatStatement %s has master \: %s which not exist \n -lima-business.import.vatstatementalreadyexist=FAILED \: The vatStatement %s already exists \!\n lima.config.configFileName.description=Filename of Lima's configuration lima.config.data.dir.description=Data directory of Lima lima.config.documentReport.account.documentReportModelPath.description= @@ -146,22 +71,19 @@ lima.config.reportvatpdfurl.description= lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address -lima.configFileName.description= -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= -llima.importexport.import.alreadyExistFinancialStatement= +lima.configFileName.description=Descriontion +lima.financialtransaction.account=Account +lima.fiscalperiod.fiscalperiod=Fiscal period +lima.importexport.import.alreadyExistFinancialStatement=Same financial statement exists +lima.lettering.accountRegularization=Regulatory account +lima.reports.account.noAccount=Any account present +lima.reports.account.noAccountTitle=Any account present +lima.reports.accounts=Accounts +lima.table.credit=Credit +lima.table.date=Date +lima.table.debit=Debit +lima.table.description=Description +lima.table.entryBook=Entry book +lima.table.letter=Letter +lima.table.number=Account number +lima.table.voucher=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 9d7eeaa..3df07d9 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,51 +1,26 @@ -application.version= -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 -lima-Business.defaultaccountingrules.updatenewentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce nouveau journal est bloquée -lima-business.account.accountalreardyexist=Un compte existe déjà avec ce numéro \: %s -lima-business.common.failed=Échec \: %s \n -lima-business.defaultaccountingrules.allentrybookclosed=Tous les journaux de cette période financière sont fermés -lima-business.defaultaccountingrules.dateaftererror=La date est postérieure à la période fiscale -lima-business.defaultaccountingrules.datebeforeerror=La date est antérieure à la période fiscale -lima-business.defaultaccountingrules.deleteaccounterror=Impossible de supprimer un comte contenant des entrées -lima-business.defaultaccountingrules.deleteentrybookerror=Impossible de supprimer un journal contenant des transactions -lima-business.defaultaccountingrules.enddateerror=La date de fin est antérieure à la date de début -lima-business.defaultaccountingrules.financialnewdateblocked=La période financière de cette nouvelle date est bloquée -lima-business.defaultaccountingrules.financialperiodblocked=La période financière est bloquée -lima-business.defaultaccountingrules.financialtransactionblocked=La période financière de cette transaction est bloquée -lima-business.defaultaccountingrules.invalidaccountnumber=Numéro de compte invalide \: %d +application.version=Version lima-business.document.account=Compte -lima-business.document.accountnumber=N° Compte lima-business.document.accounts=Comptes -lima-business.document.adress=Adresse -lima-business.document.adresssuite=Adresse - suite +lima-business.document.address=Adresse +lima-business.document.addressMore=Adresse - suite lima-business.document.amount=Total lima-business.document.amounts=Totaux lima-business.document.amountsperiod=Totaux %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=N° Siret -lima-business.document.carryback=Report -lima-business.document.carryforward=À reporter -lima-business.document.charge=Charge lima-business.document.city=Ville lima-business.document.classificationcode=NAF -lima-business.document.createdate=Date de tirage %1$te/%1$tm/%1$tY à %1$tH\:%1$tM lima-business.document.credit=Crédit lima-business.document.date=Date -lima-business.document.date.begin=Date de début \: -lima-business.document.date.end=Date de fin \: +lima-business.document.date.begin=Date de début\: +lima-business.document.date.end=Date de fin\: lima-business.document.dateformat=%1$te/%1$tm/%1$tY lima-business.document.debit=Débit lima-business.document.description=Description lima-business.document.entries=entrées -lima-business.document.entryBooks= lima-business.document.entrybook=Journal lima-business.document.entrybooks=Journaux -lima-business.document.entrybooktitle=%s\n%2$tB %2$tY -lima-business.document.financialTransactions=transactions financières lima-business.document.financialstatement=Bilan et compte de résultat -lima-business.document.fiscalPeriods=Périodes ficales lima-business.document.generalentrybook=Journal Général lima-business.document.grossamount=Brut lima-business.document.label=Libellé @@ -54,12 +29,10 @@ lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Mouvement Créditeur lima-business.document.movementdebit=Mouvement Débiteur lima-business.document.netamount=Net -lima-business.document.pagenumber=N° page %d -lima-business.document.period1=Période du +lima-business.document.period1=Période du lima-business.document.period1format=%1$te/%1$tm/%1$tY lima-business.document.period2=au lima-business.document.period2format=%1$te/%1$tm/%1$tY -lima-business.document.product=Produit lima-business.document.provisiondeprecationamount=Amortissements et provisions lima-business.document.society=Nom lima-business.document.solde=Solde @@ -69,56 +42,12 @@ lima-business.document.vat=Déclaration de TVA lima-business.document.vatnumber=N° TVA lima-business.document.voucher=Pièce comptable lima-business.document.zipcode=Code postal -lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce code \: %s lima-business.financialtransaction.retainedearnings.description=Report à nouveau lima-business.financialtransaction.retainedearnings.voucher=Selon décision AG -lima-business.fiscalperiod.fiscalperiodalreadyblocked=La période fiscale est déjà bloquée -lima-business.fiscalperiod.newfinancialperioderror=Impossible de définir la période financière sur la période fiscale suivante -lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=La dernière période financière de la période fiscale est bloquée -lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de compte n'est pas numérique \: %s -lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s -lima-business.franceaccountingrules.antefiscalperiodnotblocked=Le nombre maximal d'exercices ouverts est déjà ateint -lima-business.franceaccountingrules.fiscalperiodnotempty=La période fiscale à supprimer n'est pas vide \! -lima-business.franceaccountingrules.lastFiscalPeriodCantBlocked=Impossible de clore la dernière période fiscale ouverte -lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédente -lima-business.import.FinancialTransaction.error.LockedEntryBook=Impossible de mettre à jour la transaction \: la période financière de ce nouveau journal est bloquée -lima-business.import.FinancialTransaction.error.LockedFinancialPeriod=La période financière est bloquée -lima-business.import.FiscalPeriod.error.beginAfterEndFiscalPeriod=La date de début doit être avant la date de fin -lima-business.import.FiscalPeriod.error.moreOneUnlockFiscalPeriod=Seul deux exercices non clôturés sont autorisés -lima-business.import.FiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod=la date de début doit suivre la date de fin du précédent exercice -lima-business.import.account.InvalidAccountNumber=Le numéro de compt %1$s n'est pas valide\n -lima-business.import.account.added=Succès \: Compte %s - %s ajouté\n -lima-business.import.account.alreadyExist=Le compte %1$s - existe déjà \n -lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n -lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n -lima-business.import.closedPeriodicEntryBook.error.NotLockedPreviousEntryBook=Les périodes financières précédentes pour ce journal doivent être bloquées avant -lima-business.import.closedPeriodicEntryBook.error.unbalanced=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées -lima-business.import.closedPeriodicEntryBook.error.unfilled=Impossible de bloquer la période financière / il manque des éléments dans des transactions -lima-business.import.closedPeriodicEntryBook.error.withoutEntryBook=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) -lima-business.import.closedperiodicentrybookupdated=Succès \: La période financière %s - %s - %s est ajoutée \! \n lima-business.import.ebpmissingaccount=Échec \: Compte %s inexistant. \nCréer tous les comptes avant d'importer les écritures. -lima-business.import.ebpnoentry=Échec \: Ce fichier ne contient aucune entrée. -lima-business.import.ebpnoheader=Échec \: Ce fichier ne contient aucun entête. lima-business.import.entries.error.lockedEntryBook= lima-business.import.entries.error.lockedFinancialPeriod= -lima-business.import.entriesoutofdatesrange=Attention \: Cette entrée %s ne fait partie d'aucune période ouverte. Entrée non importée \!\n -lima-business.import.entryadded=Succès \: Entrée %s %s ajoutée \n -lima-business.import.entrybookalreadyexist=Échec \: Le journal %s exist déjà \!\n -lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a été créé \!\n -lima-business.import.financialstatementadded=Succès \: Mouvement %s ajoutée \n -lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s possède le master \: %s inexistant \n -lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist déjà \!\n -lima-business.import.fiscalperiodadded=Succès \: Exercice %s - %s ajoutée \! \n -lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe déjà \!\n -lima-business.import.fiscalperiodscloseperiodicentrybooks= -lima-business.import.identityadded=Succès \: Identité %s ajoutée \! \n -lima-business.import.lineformatmismatch=Le format de la ligne est incorrect. -lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. -lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n -lima-business.import.transactionadded=Succès \: Transaction, %s, %s, ajoutée\n -lima-business.import.vatstatementadded=Succès \: Plan de TVA %s ajoutée \n -lima-business.import.vatstatementalnomaster=u00C9chec \: Le plan %s possède le master \: %s inexsitant \n -lima-business.import.vatstatementalreadyexist=u00C9chec \: Le plan %s exist déjà \!\n +lima-business.import.entriesoutofdatesrange=Attention \: Cette entrée %s ne fait partie d'aucune période ouverte. Entrée non importée lima-business.import.noaccount\=Erreur \: Ce fichier ne contient aucun compte. lima.config.configFileName.description=Nom du fichier de configuration de Lima lima.config.data.dir.description=Répertoire des données de Lima lima.config.documentReport.account.accountModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'account' @@ -146,12 +75,12 @@ lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur lima.configFileName.description= -lima.financialtransaction.account= -lima.fiscalperiod.fiscalperiod= -lima.importexport.import.alreadyExistFinancialStatement= -lima.lettering.accountRegularization= -lima.reports.account.noAccount= -lima.reports.account.noAccountTitle= +lima.financialtransaction.account=compte +lima.fiscalperiod.fiscalperiod=Période fiscale +lima.importexport.import.alreadyExistFinancialStatement=Transaction financière exitante +lima.lettering.accountRegularization=Compte de régulation +lima.reports.account.noAccount=Aucun compte présent +lima.reports.account.noAccountTitle=Aucun compte lima.reports.accounts=Comptes lima.table.credit=Credit lima.table.date=Date @@ -161,5 +90,3 @@ 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-callao/src/main/resources/i18n/lima-callao_en_GB.properties b/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties index 39a29a4..5f15eb0 100644 --- a/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties +++ b/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties @@ -1,19 +1,18 @@ -lima.BigDecimal.date.operand.notequal= -lima.enum.BigDecimal.operand.equal= -lima.enum.BigDecimal.operand.lower= -lima.enum.BigDecimal.operand.lowerorequal= -lima.enum.BigDecimal.operand.notequal= -lima.enum.BigDecimal.operand.upper= -lima.enum.BigDecimal.operand.upperorequal= +lima.enum.BigDecimal.operand.equal=\= +lima.enum.BigDecimal.operand.lower=< +lima.enum.BigDecimal.operand.lowerorequal=<\= +lima.enum.BigDecimal.operand.notequal=≠ +lima.enum.BigDecimal.operand.upper=> +lima.enum.BigDecimal.operand.upperorequal=>\= lima.enum.comboboxamount.both=All lima.enum.comboboxamount.credit=Credit lima.enum.comboboxamount.debit=Debit -lima.enum.date.operand.after= -lima.enum.date.operand.different= -lima.enum.date.operand.previous= -lima.enum.date.operand.same= -lima.enum.string.operand.begin= -lima.enum.string.operand.contain= -lima.enum.string.operand.ending= -lima.enum.string.operand.equal= -lima.string.date.operand.notequal= +lima.enum.date.operand.after=after the +lima.enum.date.operand.different=not same as +lima.enum.date.operand.previous=before the +lima.enum.date.operand.same=the +lima.enum.string.operand.begin=Start with +lima.enum.string.operand.contain=Contains +lima.enum.string.operand.ending=Ending with +lima.enum.string.operand.equal=Equal to +lima.string.date.operand.notequal=Not same as 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 ef77207..7e44fda 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 @@ -3,7 +3,7 @@ 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.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 @@ -219,7 +219,7 @@ 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.debit=Add 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 @@ -232,11 +232,11 @@ 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.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.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.noAccount=has any account 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 @@ -270,8 +270,8 @@ lima.financialStatement.remove.confirm=Do you really want to remove this financi lima.financialStatement.shortened=Shortened financialstatement chart lima.financialStatement.subAmount=Calculate a subamount lima.financialStatements=Financial statements -lima.financialStatements.check=chack account -lima.financialStatements.check.nothing=Not found \: %s - %s +lima.financialStatements.check=check 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 @@ -306,9 +306,9 @@ 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.delete.confirmation=Do you really want to remove fiscal period ? +lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Failed to remove fiscal period with financial transactions (%1$s). +lima.fiscalPeriod.delete.title=Remove fiscal period lima.fiscalPeriod.end=End lima.fiscalPeriod.entryBooks.create=Create an entry book lima.fiscalPeriod.error.beginAfterEndFiscalPeriod= @@ -325,7 +325,7 @@ 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.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=Langage lima.help.i18n.fr=French @@ -340,14 +340,14 @@ 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.error=%s invalid entry +lima.home.entries.error.modify=Update invalid 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.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 @@ -369,7 +369,7 @@ lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code lima.import.error=Import Failed -lima.import.error.extractFile=Un-valid file +lima.import.error.extractFile=Invalid file lima.import.error.noDataToImport=Any data to import lima.import.error.unknown=Unknown error lima.import.line=line @@ -396,10 +396,10 @@ lima.info=Information lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Fail to closed lima.label=Label -lima.launch.accounting=Launch accounts +lima.launch.accounting=Loading accounts lima.launch.finished=completed -lima.launch.services=start services -lima.launch.webServer=start web server +lima.launch.services=starting services +lima.launch.webServer=starting web server lima.lettering.account=Accounts lima.lettering.account.aAll=All lima.lettering.account.back=← @@ -436,7 +436,7 @@ 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> +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 instantly your already existing save in CSV format<br/><br/><br/><br/></center></html> lima.paste=Paste lima.preferences=Preferences lima.quit=Exit @@ -452,13 +452,13 @@ lima.table.balance=Balance lima.table.credit=Credit lima.table.date=Date lima.table.debit=Debit -lima.table.debitCredit= +lima.table.debitCredit=Debit and Credit lima.table.description=Description lima.table.entryBook=Entry book lima.table.label=Label lima.table.letter=Letter lima.table.number=Account Number -lima.table.provisionDeprecation= +lima.table.provisionDeprecation=Provision Deprecation lima.table.voucher=Voucher lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction @@ -469,17 +469,17 @@ lima.vatStatement.accounts=List of accounts lima.vatStatement.base=Base VAT statement chart lima.vatStatement.boxName=PDF BoxName lima.vatStatement.delete=Delete actual VAT statement chart before import new -lima.vatStatement.delete.parent= +lima.vatStatement.delete.parent=Remove parent lima.vatStatement.developed=Developped VAT statement chart lima.vatStatement.error.alreadyExistVatStatement= -lima.vatStatement.import= +lima.vatStatement.import=Impport CSV lima.vatStatement.label=Label -lima.vatStatement.master= -lima.vatStatement.movement= +lima.vatStatement.master=Master VAT statement +lima.vatStatement.movement=Movement lima.vatStatement.movement.add=Add movement lima.vatStatement.nothing=No vat statement chart -lima.vatStatement.remove.confirm= -lima.vatStatement.remove.title= +lima.vatStatement.remove.confirm=Do you realy want to remove line ? +lima.vatStatement.remove.title=Remove line ? lima.vatStatement.shortened=Shortened vat statement chart -lima.vatStatements= +lima.vatStatements=VAT statements 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 4f374b8..f83c08b 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 @@ -47,7 +47,7 @@ lima.config.cell.pair.background.label=Couleur de fond paire lima.config.cell.pair.error.background.description=Couleur de fond d'une ligne paire lima.config.cell.pair.error.background.label=Couleur de fond paire lima.config.cell.pair.error.foreground.description=Couleur du texte d'une ligne paire en erreur -lima.config.cell.pair.error.foreground.label=Couleur du texte paire en erreur +lima.config.cell.pair.error.foreground.label=Couleur du texte paire en erreur lima.config.cell.pair.foreground.description=Couleur du texte d'une ligne paire lima.config.cell.pair.foreground.label=Couleur du texte paire lima.config.cell.pair.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire dans une ligne paire @@ -282,7 +282,7 @@ lima.financialStatement.shortened=Plan BCR abrégé lima.financialStatement.subAmount=Calculer un sous-total lima.financialStatements=Plan BCR lima.financialStatements.check=Vérification des comptes aux postes -lima.financialStatements.check.nothing=Introuvable \: %s - %s +lima.financialStatements.check.nothing=Introuvable\: %s - %s lima.financialStatements.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable. lima.financialTransaction.date=Date lima.financialTransaction.day=Jour diff --git a/lima-swing/src/main/resources/lima-config.properties b/lima-swing/src/main/resources/lima-config.properties index 7ac7506..849faf6 100644 --- a/lima-swing/src/main/resources/lima-config.properties +++ b/lima-swing/src/main/resources/lima-config.properties @@ -21,7 +21,7 @@ ### application.name=Lima application.version=${project.version} -application.site.url=http://maven-site.chorem.org/lima/ +application.site.url=http://lima.chorem.org/v/develop/ #licence.name=${project.licenses[0].license.name} #licence.url=${project.licenses.0.url} 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 be8e168..70b53e5 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 @@ -493,11 +493,11 @@ public class DocumentService { "<i>" + (StringUtils.isNotEmpty(identity.getDescription()) ? identity.getDescription() : " - ") + "</i>", }; headerTitle += constructTableLine(columnsDescription); - String [] columnsAdressOne = {boldItalicBegin + t("lima-business.document.adress") + boldItalicEnd, + String [] columnsAdressOne = {boldItalicBegin + t("lima-business.document.address") + boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getAddress()) ? identity.getAddress() : " - ") + "</i>", }; headerTitle += constructTableLine(columnsAdressOne); - String [] columnsAdressTwo = {boldItalicBegin + t("lima-business.document.adresssuite") + boldItalicEnd, + String [] columnsAdressTwo = {boldItalicBegin + t("lima-business.document.addressMore") + boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getAddress2()) ? identity.getAddress2() : " - ") + "</i>", }; headerTitle += constructTableLine(columnsAdressTwo); 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 e3f70dd..32f9a50 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 @@ -1,5 +1,7 @@ lima-business.document.account= lima-business.document.accountnumber= +lima-business.document.address= +lima-business.document.addressMore= lima-business.document.adress= lima-business.document.adresssuite= lima-business.document.amount= 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 e3f70dd..32f9a50 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 @@ -1,5 +1,7 @@ lima-business.document.account= lima-business.document.accountnumber= +lima-business.document.address= +lima-business.document.addressMore= lima-business.document.adress= lima-business.document.adresssuite= lima-business.document.amount= -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.