This is an automated email from the git hooks/post-receive script. New commit to branch feature/en_I18N in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit afa62729f74db6f06bce4bb471104c7ad359b6c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 29 19:59:09 2016 +0200 ui en translate + fix some french (2) --- .../i18n/application-swing_en_GB.properties | 97 +++++++++++----------- .../i18n/application-swing_fr_FR.properties | 4 +- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index b95f9b2..47aa1dd 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -39,7 +39,7 @@ observe.action.choose.tripSeine.message=Select target trip observe.action.choose.tripSeine.title=Move routes to another trip observe.action.close=Close observe.action.close.activity.tip=Close the opened activity -observe.action.close.maree.tip=Clse the opened maree +observe.action.close.maree.tip=Close the opened maree observe.action.close.open=Close observe.action.close.open.tip=Close open data observe.action.close.route.tip=Close road @@ -1061,7 +1061,7 @@ observe.content.baitsComposition.table.proportion.tip=Proportion observe.content.baitsComposition.title=Baits observe.content.basket.cant.delete.message=The current basket can not be deleted since it used by other data. observe.content.basket.cant.delete.title=Can't delete basket -observe.content.basket.invalid.nextFloatline1Length= +observe.content.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s) observe.content.branchLine.cant.delete.message=The current branchline can not be deleted since it used by other data. observe.content.branchLine.cant.delete.title=Can't delete branchline observe.content.branchline.baitHaulingStatus=Bait hauling status @@ -1400,7 +1400,7 @@ observe.content.longlineDetailComposition.branchlinesTable.settingIdentifier.tip observe.content.longlineDetailComposition.branchlinesTable.tracelineLength=Traceline length (m) observe.content.longlineDetailComposition.branchlinesTable.tracelineLength.tip=Traceline length (m) observe.content.longlineDetailComposition.canGenerate=Can generate -observe.content.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount= +observe.content.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount=Template %s is not compliant with the number of baskets per section (%s) observe.content.longlineDetailComposition.message.updating=Updating composition details observe.content.longlineDetailComposition.sectionTemplatesTable.identifier=Identifier observe.content.longlineDetailComposition.sectionTemplatesTable.identifier.tip=Unique section template identifier @@ -1417,7 +1417,7 @@ observe.content.longlineDetailComposition.tab.branchlineDetail=Branchline detail observe.content.longlineDetailComposition.tab.composition=Composition observe.content.longlineDetailComposition.tab.generate=generation observe.content.longlineDetailComposition.title=Detailed composition -observe.content.longlineDetailComposition.title.section.cant.use.firstTemplate= +observe.content.longlineDetailComposition.title.section.cant.use.firstTemplate=Can't use the first template while generating observe.content.longlineGlobalComposition.availableMitigationType=Available mitigations observe.content.longlineGlobalComposition.message.updating=Updating global composition observe.content.longlineGlobalComposition.mitigationType=Mitigation @@ -1450,12 +1450,12 @@ observe.content.measurement.delete.message=Delete selected measurement observe.content.mode.create.tip=Object is in create mode observe.content.mode.read.tip=Object is not editable observe.content.mode.update.tip=Object is in editing mode -observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample= +observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample=If you confirm save, some data could be deleted\!\n\nFollowing species won't be useable in samples\:\n%1$s\nAll samples of those species will be deleted. observe.content.nonTargetCatch.table.catchWeight=Weight observe.content.nonTargetCatch.table.catchWeight.tip=Weight estimated (in t) observe.content.nonTargetCatch.table.comment=Com observe.content.nonTargetCatch.table.comment.tip=Comment -observe.content.nonTargetCatch.table.deleteExtraMessage= +observe.content.nonTargetCatch.table.deleteExtraMessage=\nIf you delete this non target cactch, samples using this species will also be deleted. observe.content.nonTargetCatch.table.meanLength=Length observe.content.nonTargetCatch.table.meanLength.tip=Mean length (in cm) observe.content.nonTargetCatch.table.meanWeight=Mean weight @@ -1626,7 +1626,7 @@ observe.content.targetCatch.table.weightCategory=Weight category observe.content.targetCatch.table.weightCategory.tip=Weight category observe.content.targetCatch.table.well=Well observe.content.targetCatch.table.well.tip=Well -observe.content.targetDiscarded.message.table.will.delete.targetLength= +observe.content.targetDiscarded.message.table.will.delete.targetLength=If you save, some data may be delete\!\n\nFollowing speces won't be useable in samples\: %1$s\nAll samples using thoses species will be deleted. observe.content.targetDiscarded.table.broughtOnDeck=Brought on deck observe.content.targetDiscarded.table.broughtOnDeck.tip=Brought on deck observe.content.targetDiscarded.table.comment=Com @@ -1668,8 +1668,8 @@ observe.content.tdr.deleteData=Delete observe.content.tdr.deleteData.tip=Delete data observe.content.tdr.deployementEnd=Deployement end observe.content.tdr.deployementStart=Deployement start -observe.content.tdr.enableTimestamp= -observe.content.tdr.enableTimestamp.tip= +observe.content.tdr.enableTimestamp=Use timestamp +observe.content.tdr.enableTimestamp.tip=Use timestamp for this recorder observe.content.tdr.exportData=Export observe.content.tdr.exportData.tip=Export data observe.content.tdr.fishingEnd=Fishing End @@ -1697,7 +1697,7 @@ observe.content.tdr.serialNo=Serial No observe.content.tdr.species=Species observe.content.tdr.tab.caracteristics=Caracteristics observe.content.tdr.tab.keyData=Data keys -observe.content.tdr.tab.localisation= +observe.content.tdr.tab.localisation=Localisation observe.content.tdr.tab.species=Associated species observe.content.tdr.tab.timestamp=Timestamps observe.content.tdr.table.data=Data @@ -1859,11 +1859,11 @@ observe.menu.help=Help observe.menu.locale=Languages observe.menu.navigation=Navigation observe.menu.storage=Storage -observe.message.can.not.write.data= -observe.message.cant.add.echantillonRejetThon= -observe.message.cant.add.echantillonTargetCatch= -observe.message.cant.add.nonTargetSample= -observe.message.creating.referentiel= +observe.message.can.not.write.data=You are not allow to write data on this data source. +observe.message.cant.add.echantillonRejetThon=<html><body><strong>Can not add target samples</strong>(no discarded target catch brougth on deck)</body></html> +observe.message.cant.add.echantillonTargetCatch=<html><body><strong>Can not add target samples</strong> (no target catch)</body></html> +observe.message.cant.add.nonTargetSample=<html><body><strong>Can not add non target samples</strong>(no rejected non target catch)</body></html> +observe.message.creating.referentiel=Creating referential. observe.message.db.closed=%1$s was closed observe.message.db.loaded=%1$s was loaded observe.message.db.loading=%1$s loading... @@ -1872,41 +1872,42 @@ observe.message.db.none.loaded.tip=No data source loaded... observe.message.delete=Confirm to delete object\:\n\n '%1$s' - '%2$s'\n observe.message.delete.directory=Delete directory %1$s observe.message.delete.new=Confirm to delete object\:\n\n '%1$s'\n -observe.message.goto.site= -observe.message.h2.server.login= -observe.message.h2.server.password= -observe.message.h2.server.url= -observe.message.help.usage= -observe.message.historical.data= -observe.message.loaded.tip= -observe.message.need.fin.veille.activity= -observe.message.no.activity.for.route= -observe.message.no.activity.for.trip= +observe.message.goto.site=Go to ObServe site (%1$s) +observe.message.h2.server.login=Login +observe.message.h2.server.password=Password +observe.message.h2.server.url=Url +observe.message.help.usage=ObServe Help v %1$s +observe.message.historical.data=Historical data (can be closed, even if not valid) +observe.message.loaded.tip=%1$s is loading,\\You can change data source by clicking here + +observe.message.need.fin.veille.activity=No end watch activity was found in route to close.\nyou can\:\n\n\t- Cancel and go back to route\n\t- Create and go the end watch activity\n\t- Create end watch activity and close route\n\t- Close route without creating the end watch activity. +observe.message.no.activity.for.route=< No activity for current route > +observe.message.no.activity.for.trip=< No activity for current trip > +observe.message.no.report.selected=< No report selected > +observe.message.no.route.for.maree=< No route fo current trip > +observe.message.no.species.selected=No species selected +observe.message.no.trip.for.program=< No trip for current program > +observe.message.no.usage.for.entity=No usage found. +observe.message.quit.invalid.edit=Data are not valid and can't be saved\!\n\nNote\: If you continue, any modification will be lost. +observe.message.quit.valid.edit=Data are modified and valid\! +observe.message.referentiel.editable=Referential is editable. +observe.message.referentiel.home=< Referential > +observe.message.referentiel.no.editable=You are not allowed to edit referential. +observe.message.select.report=Select a report +observe.message.server.info=Local database %1$s is ready in server mode. +observe.message.show.usage.for.delete=Referential %1$s "%2$s" can not be deleted. +observe.message.show.usage.for.delete2=Some data are using this referential, see following references. +observe.message.show.usage.for.desactivated=Referential %1$s "%2$s" will be disabled. +observe.message.show.usage.for.desactivated2=Some data are using this referential, see following reference +observe.message.show.usage.for.desactivated3=Those data need to use another enabled referential to be saved. +observe.message.show.usages=List of usage of referential %1$s\: '%2$s' +observe.message.table.editBean.modified=Current entry is modifed and valid. +observe.message.table.editBean.modified.but.invalid=Current entry is modified but not valid. observe.message.no.local.db.found=Local data source does not exist (location %1$s).\n\nYou can create it or connect to a remote data source. -observe.message.no.report.selected= -observe.message.no.route.for.maree= -observe.message.no.species.selected= -observe.message.no.trip.for.program= -observe.message.no.usage.for.entity= -observe.message.quit.invalid.edit= -observe.message.quit.valid.edit= -observe.message.referentiel.editable= -observe.message.referentiel.home= -observe.message.referentiel.no.editable= observe.message.save.configuration=Save configuration in file %1$s -observe.message.select.report= -observe.message.server.info= -observe.message.show.usage.for.delete= -observe.message.show.usage.for.delete2= -observe.message.show.usage.for.desactivated= -observe.message.show.usage.for.desactivated2= -observe.message.show.usage.for.desactivated3= -observe.message.show.usages= -observe.message.table.editBean.modified= -observe.message.table.editBean.modified.but.invalid= observe.message.updating.floatingObject=Floating object is in edition mode observe.message.updating.referentiel=Referential is in edition mode -observe.message.warning.will.be.delete=%1$s\n\nBe ware, export will replace exisiting data. +observe.message.warning.will.be.delete=%1$s\n\nBe ware, export will replace existing data. observe.modeSaisieEchantillonEnum.byEffectif=By effectif observe.modeSaisieEchantillonEnum.byIndividu=By individu observe.model.version=Model version @@ -2094,7 +2095,7 @@ observe.storage.remote.db=(remote) observe.storage.remote.login=Login observe.storage.remote.password=Password observe.storage.remote.url=Url -observe.storage.remote.useSll=use ssl? +observe.storage.remote.useSll=Use ssl? observe.storage.report.action.migrate=Update policy observe.storage.report.can.migrate=Update if necessary (current version\: %1$s) observe.storage.report.can.not.migrate=No update possible @@ -2103,7 +2104,7 @@ observe.storage.required.rw.on.data=You don't have sufficient credentials to per observe.storage.security.administrateur=Owner of database observe.storage.server.dataBase=Databases observe.storage.server.db=(remote server) -observe.storage.server.sessionExpire=Server connexion is no more active. What to do?\n\n\t - Close server connexion, \n\t - change data source, \n\t - Re-connect to server.\n\n BE WARE \: Local modifications will be lost\! +observe.storage.server.sessionExpire=Server connexion is no more active. You can\n\n\t - Close server connexion, \n\t - Change data source, \n\t - Re-connect to server.\n\n BE WARE \: Local modifications will be lost\! observe.storage.server.sessionExpire.change=Change observe.storage.server.sessionExpire.close=Close observe.storage.server.sessionExpire.reload=Re-connect diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 69f6a0c..817d687 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1879,7 +1879,7 @@ observe.message.h2.server.url=Url d'accès au serveur observe.message.help.usage=Aide d'ObServe v %1$s observe.message.historical.data=Donnée historique (peut-être clôturé même si non valide) observe.message.loaded.tip=La %1$s est chargée,\n\nVous pouvez changer de base en cliquant ici. -observe.message.need.fin.veille.activity=Aucune activité de fin de veille enregistrée sur la route à clotûrer.\nVous pouvez \:\n\n\t- Annuler la fermeture et rester sur la route\n\t- Créer l'activité de fin de veille et vous y rendre\n\t- Créer l'activité de fin de veille, la clôturer puis clôturer la route\n\t- Continuer la clôture de la route sans créer cette activité de fin de veille. +observe.message.need.fin.veille.activity=Aucune activité de fin de veille enregistrée sur la route à clôturer.\nVous pouvez \:\n\n\t- Annuler la fermeture et rester sur la route\n\t- Créer l'activité de fin de veille et vous y rendre\n\t- Créer l'activité de fin de veille, la clôturer puis clôturer la route\n\t- Continuer la clôture de la route sans créer cette activité de fin de veille. observe.message.no.activity.for.route=< Aucune activité pour la route courante > observe.message.no.activity.for.trip=< Aucune activité pour la marée courante > observe.message.no.local.db.found=La base locale n'existe pas (emplacement %1$s).\n\nVous pouvez à ce stade créer la base locale ou vous connecter à une base distante. @@ -1973,7 +1973,7 @@ observe.storage.activityLongline.message.no.active.found=Aucune activité ouvert observe.storage.activityLongline.message.no.active.found.for.other.trip=Aucune activité ouverte sur la marée ouverte observe.storage.activityLongline.message.not.open=L'opération de pêche n'est pas ouverte, aucune modification possible. observe.storage.activityLongline.message.updating=L'activité est en cours de modification. -observe.storage.activityLongline.seaSurfaceTemperature=Température surface (°c) +observe.storage.activityLongline.seaSurfaceTemperature=content.longlineDetailComposition.firstTemplate.template.notCompilant.basketCountTempérature surface (°c) observe.storage.activityLongline.timeStamp=Horodatage observe.storage.activityLongline.title=Activité observe.storage.activityLongline.vesselActivityLongline=Activité bateau -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.