[Observe-commits] 01/01: Fix i18n

This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 448144b5f512b763e6b4ecdeb636c3f3d9c34254 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 13 08:40:12 2017 +0100 Fix i18n --- ...pplication-swing-configuration_en_GB.properties | 6 +-- ...pplication-swing-configuration_es_ES.properties | 24 ++++----- ...pplication-swing-configuration_fr_FR.properties | 10 ++-- .../application-swing-decoration_en_GB.properties | 30 ----------- .../application-swing-decoration_es_ES.properties | 42 +++------------ .../application-swing-decoration_fr_FR.properties | 30 ----------- .../i18n/application-swing_en_GB.properties | 29 +++++----- .../i18n/application-swing_es_ES.properties | 61 +++++++++++----------- .../i18n/application-swing_fr_FR.properties | 29 +++++----- 9 files changed, 84 insertions(+), 177 deletions(-) diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index 6ee062e..6aac714 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -1,6 +1,6 @@ ObserveSwingApplicationConfig.description=ObServe configuration observe.action.commandline.configure.ui=Configure application -observe.action.commandline.create.id=Générer des topiaIds.\nDeux paramètres sont nécessaires \: le FQN de la classe et le nombre d'id à générer. +observe.action.commandline.create.id=Generate topia ids. observe.action.commandline.disable.main.ui=Do NOT launch main gui observe.action.commandline.help=Show help observe.action.commandline.help.ui=Show gui help @@ -27,7 +27,7 @@ observe.config.defaultResourcesDirectory.description=Default user resources dire observe.config.defaultTmpDirectory.description=Default temporary directory used by application and clean at each launch. observe.config.defaultValidationReportDirectory.description=Default validation report directory observe.config.devMode=Dev mode -observe.config.h2.can.migrate.description=Flag to know if you can migrate h2 data sources +observe.config.h2.can.migrate.description=Flag to know if you can migrate H2 data sources observe.config.h2.login.description=H2 Login observe.config.h2.password.description=H2 Password observe.config.h2.serverPort.description=Server port number @@ -82,6 +82,6 @@ observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) observe.config.ui.treeOpenNodes=Opened data from last session observe.config.validation.speedEnable=Force validation of activities speed -observe.config.validation.speedMaxValue=Max speed value used in activities speed validation +observe.config.validation.speedMaxValue=Max speed allowed in activities speed validation observe.message.save.configuration=Save configuration in file %1$s observe.model.version=Model version diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index 9a29a6f..04f92ba 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -8,11 +8,11 @@ observe.action.commandline.launch.admin.ui=Ejecutar una operación de administra observe.action.commandline.launch.h2.server.mode=Ejecutar ObServe en modo servidor observe.action.commandline.launch.obstuna.admin.ui=Ejecutar una operación de administración sobre Obstuna observe.action.commandline.use.jmx=Mostrar el soporte JMX -observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application \#TODO -observe.config.backup.delay=Delay in minutes between local data source backup \#TODO -observe.config.backup.use=To activate auto backup of local source \#TODO +observe.config.backup.atClose=Realizar una copia de seguridad de la base de datos local al cerrar la aplicación +observe.config.backup.delay=Minutos entre cada copia de seguridad de la base de datos local +observe.config.backup.use=Para activar la copia de seguridad automática observe.config.configFileName.description=Nombre del archivo de configuración -observe.config.coordinate.format=Position format (DMD, DD, DMS) \#TODO +observe.config.coordinate.format=Formato de posición (GMG, GD, GMS) observe.config.db.locale=Idioma del referencial observe.config.defaultBackupDirectory.description=Carpeta por defecto para copia de seguridad de bases locales observe.config.defaultCreationMode=Modo de creación de la base local por defecto @@ -27,11 +27,11 @@ observe.config.defaultResourcesDirectory.description=Directorio de almacenamient observe.config.defaultTmpDirectory.description=Directorio temporal por defecto observe.config.defaultValidationReportDirectory.description=Directorio por defecto de almacenamiento de los informes de validación observe.config.devMode=Modo desarrollador -observe.config.h2.can.migrate.description=Autorizar la actualización de las bases locales (h2) -observe.config.h2.login.description=Login h2 -observe.config.h2.password.description=Contraseña h2 -observe.config.h2.serverPort.description=Puerto del servidor h2 -observe.config.importDirectory.description=Répertoire où chercher les imports \#TODO +observe.config.h2.can.migrate.description=Autorizar la actualización de las bases locales (H2) +observe.config.h2.login.description=Login H2 +observe.config.h2.password.description=Contraseña H2 +observe.config.h2.serverPort.description=Puerto del servidor H2 +observe.config.importDirectory.description=Directorio para buscar copias de seguridad observe.config.logConfigurationFile.description=Archivo de configuration de los logs observe.config.map.background.description=Color del fondo del mapa observe.config.map.layer1.description=Archivo (shapeFiles) del primer calco del mapa @@ -81,7 +81,7 @@ observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar observe.config.ui.showTimeEditorSlider=Para mostrar la regla de edición de las horas observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración de la fuente de datos remota observe.config.ui.treeOpenNodes=Nudos abiertos del arbol abiertos cuando se cerró la base por última vez -observe.config.validation.speedEnable=Force validation of activities speedTODO -observe.config.validation.speedMaxValue=Max speed value used in activities speed validationTODO +observe.config.validation.speedEnable=Forzar a la validación de velocidad de actividades +observe.config.validation.speedMaxValue=Valor máximo de velocidad permitido en la validación de velocidad de actividades observe.message.save.configuration=Guardar la configuración en el archivo %1$s -observe.model.version=Versión del modelo de datos +observe.model.version=Versión del modelo diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 58a6ef2..cc11777 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -27,10 +27,10 @@ observe.config.defaultResourcesDirectory.description=Le répertoire où sont sto observe.config.defaultTmpDirectory.description=Le répertoire temporaire par défaut observe.config.defaultValidationReportDirectory.description=Le répertoire par défaut où sont stockés les rapports de validation observe.config.devMode=Mode développeur -observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases locales (h2) -observe.config.h2.login.description=Le login h2 -observe.config.h2.password.description=Le mot de passe h2 -observe.config.h2.serverPort.description=Port du serveur h2 +observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases locales (H2) +observe.config.h2.login.description=Le login H2 +observe.config.h2.password.description=Le mot de passe H2 +observe.config.h2.serverPort.description=Port du serveur H2 observe.config.importDirectory.description=Répertoire où chercher les imports observe.config.logConfigurationFile.description=Fichier de configuration des logs observe.config.map.background.description=Couleur du fond de carte @@ -84,4 +84,4 @@ observe.config.ui.treeOpenNodes=Noeuds de l'arbre ouverts lors de la dernière f observe.config.validation.speedEnable=Forcer la validation des vitesses d'activités observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités observe.message.save.configuration=Sauvegarde de la configuration dans le fichier %1$s -observe.model.version=Version du modèle de données +observe.model.version=Version du modèle diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index bcd9f8c..65c5ae6 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -4,42 +4,14 @@ observe.common.gps.gpsPoint=Gps point observe.common.haulingIdentifier=Hauling identifier observe.common.homeId=Home id observe.common.inconnu=Unknown -observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula observe.common.nocode=Nocode observe.common.none=None -observe.common.observerLabel=Observer label -observe.common.ocean/label1=Ocean -observe.common.ocean/label2=Ocean -observe.common.ocean/label3=Ocean -observe.common.ocean/label4=Ocean -observe.common.ocean/label5=Ocean -observe.common.ocean/label6=Ocean -observe.common.ocean/label7=Ocean -observe.common.ocean/label8=Ocean observe.common.program=Program observe.common.scientificLabel=Scientific label -observe.common.setLongline=Set -observe.common.setSeine=Set observe.common.settingIdentifier=Setting observe.common.sex=Sex observe.common.species/scientificLabel=Scientific label -observe.common.vessel/label1=Vessel -observe.common.vessel/label2=Vessel -observe.common.vessel/label3=Vessel -observe.common.vessel/label4=Vessel -observe.common.vessel/label5=Vessel -observe.common.vessel/label6=Vessel -observe.common.vessel/label7=Vessel -observe.common.vessel/label8=Vessel -observe.common.vesselActivitySeine/label1=Vessel activity -observe.common.vesselActivitySeine/label2=Vessel activity -observe.common.vesselActivitySeine/label3=Vessel activity -observe.common.vesselActivitySeine/label4=Vessel activity -observe.common.vesselActivitySeine/label5=Vessel activity -observe.common.vesselActivitySeine/label6=Vessel activity -observe.common.vesselActivitySeine/label7=Vessel activity -observe.common.vesselActivitySeine/label8=Vessel activity observe.type.activityLongline=Activity observe.type.activityLonglineEncounter=Encounter observe.type.activityLonglineEncounters=Encounters @@ -47,8 +19,6 @@ observe.type.activityLonglineSensorUsed=Sensor used observe.type.activityLonglineSensorUseds=Sensors used observe.type.activityLonglines=Activitys observe.type.activitySeine=Activity -observe.type.activitySeineObservedSystem=Observed system -observe.type.activitySeineObservedSystems=Observeds system observe.type.activitySeines=Activitys observe.type.baitHaulingStatus=Bait hauling status observe.type.baitHaulingStatuses=Baits hauling status diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index 209d731..c7996a7 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -4,42 +4,14 @@ observe.common.gps.gpsPoint=Punto GPS observe.common.haulingIdentifier=Arrastre observe.common.homeId=Identificador observe.common.inconnu=desconocido -observe.common.label=Título -observe.common.lengthWeightFormula=Relación Peso +observe.common.lengthWeightFormula=Relación de peso observe.common.nocode=codigo ausente observe.common.none=Ninguno -observe.common.observerLabel=Observador -observe.common.ocean/label1=Oceano -observe.common.ocean/label2=Oceano -observe.common.ocean/label3=Oceano -observe.common.ocean/label4=Oceano -observe.common.ocean/label5=Oceano -observe.common.ocean/label6=Oceano -observe.common.ocean/label7=Oceano -observe.common.ocean/label8=Oceano observe.common.program=Programa -observe.common.scientificLabel=Título científico -observe.common.setLongline=Operación de pesca -observe.common.setSeine=Lance +observe.common.scientificLabel=Texto científico observe.common.settingIdentifier=Calada observe.common.sex=Sexo observe.common.species/scientificLabel=Especie -observe.common.vessel/label1=Buque -observe.common.vessel/label2=Buque -observe.common.vessel/label3=Buque -observe.common.vessel/label4=Buque -observe.common.vessel/label5=Buque -observe.common.vessel/label6=Buque -observe.common.vessel/label7=Buque -observe.common.vessel/label8=Buque -observe.common.vesselActivitySeine/label1=Actividad buque -observe.common.vesselActivitySeine/label2=Actividad buque -observe.common.vesselActivitySeine/label3=Actividad buque -observe.common.vesselActivitySeine/label4=Actividad buque -observe.common.vesselActivitySeine/label5=Actividad buque -observe.common.vesselActivitySeine/label6=Actividad buque -observe.common.vesselActivitySeine/label7=Actividad buque -observe.common.vesselActivitySeine/label8=Actividad buque observe.type.activityLongline=Actividad observe.type.activityLonglineEncounter=Encuentro observe.type.activityLonglineEncounters=Encuentros @@ -47,8 +19,6 @@ observe.type.activityLonglineSensorUsed=Sensor utilizado observe.type.activityLonglineSensorUseds=Sensores utilizados observe.type.activityLonglines=Actividades observe.type.activitySeine=Actividad -observe.type.activitySeineObservedSystem=Sistema observado -observe.type.activitySeineObservedSystems=Sistemas observados observe.type.activitySeines=Actividades observe.type.baitHaulingStatus=Estatuto del cebo en el arrastre observe.type.baitHaulingStatuses=Estatutos del cebo en el arrastre @@ -250,10 +220,10 @@ observe.type.tripSeines=Mareas observe.type.tripType=Tipo de marea observe.type.tripTypes=Tipos de marea observe.type.vessel=Buque -observe.type.vesselActivityLongline=Actividad buque \#TODO-SP -observe.type.vesselActivityLonglines=Actividades buque \#TODO-SP -observe.type.vesselActivitySeine=Actividad buque \#TODO-SP -observe.type.vesselActivitySeines=Actividades buque \#TODO-SP +observe.type.vesselActivityLongline=Actividad del barco (Palangre) +observe.type.vesselActivityLonglines=Actividades barco (Palangre) +observe.type.vesselActivitySeine=Actividad del barco (Cerca) +observe.type.vesselActivitySeines=Actividades barco (Cerca) observe.type.vesselSizeCategories=Categorías de buque observe.type.vesselSizeCategory=Categoría de buque observe.type.vesselType=Tipo de pesquería diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index e0071fb..f11aac4 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -4,42 +4,14 @@ observe.common.gps.gpsPoint=Point GPS observe.common.haulingIdentifier=Virage observe.common.homeId=Identifiant observe.common.inconnu=inconnu -observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.nocode=code absent observe.common.none=Aucun -observe.common.observerLabel=Observateur -observe.common.ocean/label1=Océan -observe.common.ocean/label2=Océan -observe.common.ocean/label3=Océan -observe.common.ocean/label4=Océan -observe.common.ocean/label5=Océan -observe.common.ocean/label6=Océan -observe.common.ocean/label7=Océan -observe.common.ocean/label8=Océan observe.common.program=Programme observe.common.scientificLabel=Libellé scientifique -observe.common.setLongline=Opération de pêche -observe.common.setSeine=Calée observe.common.settingIdentifier=Filage observe.common.sex=Sexe observe.common.species/scientificLabel=Espèce -observe.common.vessel/label1=Bateau -observe.common.vessel/label2=Bateau -observe.common.vessel/label3=Bateau -observe.common.vessel/label4=Bateau -observe.common.vessel/label5=Bateau -observe.common.vessel/label6=Bateau -observe.common.vessel/label7=Bateau -observe.common.vessel/label8=Bateau -observe.common.vesselActivitySeine/label1=Activité bateau -observe.common.vesselActivitySeine/label2=Activité bateau -observe.common.vesselActivitySeine/label3=Activité bateau -observe.common.vesselActivitySeine/label4=Activité bateau -observe.common.vesselActivitySeine/label5=Activité bateau -observe.common.vesselActivitySeine/label6=Activité bateau -observe.common.vesselActivitySeine/label7=Activité bateau -observe.common.vesselActivitySeine/label8=Activité bateau observe.type.activityLongline=Activité observe.type.activityLonglineEncounter=Rencontre observe.type.activityLonglineEncounters=Rencontres @@ -47,8 +19,6 @@ observe.type.activityLonglineSensorUsed=Sonde utilisée observe.type.activityLonglineSensorUseds=Sondes utilisées observe.type.activityLonglines=Activités observe.type.activitySeine=Activité -observe.type.activitySeineObservedSystem=Système observé -observe.type.activitySeineObservedSystems=Systèmes observés observe.type.activitySeines=Activités observe.type.baitHaulingStatus=Statut de l'appât au virage observe.type.baitHaulingStatuses=Statuts de l'appât au virage 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 7f5c463..a89af06 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 @@ -528,7 +528,7 @@ observe.common.yearService=Year service observe.config.category.application=Application observe.config.category.application.description=Application options observe.config.category.expert=Expert -observe.config.category.expert.description=Export mode options +observe.config.category.expert.description=Expert mode options observe.config.category.observation=Qualification of observations observe.config.category.observation.description=Qualification of observations observe.config.category.speciesList.longline=Species lists for longline @@ -1057,7 +1057,7 @@ observe.content.sensorUsed.exportData.tip=Export data file observe.content.sensorUsed.importData=Import observe.content.sensorUsed.importData.tip=Import the data file observe.content.sensorUsed.message.data.exported=the data file was exported at %s. -observe.content.sensorUsed.replace.data.message=Confirm to replace existing data file «%s» +observe.content.sensorUsed.replace.data.message=Confirm replacement of existing data file «%s» observe.content.sensorUsed.sensorBrand=Brand observe.content.sensorUsed.sensorDataFormat=Data format observe.content.sensorUsed.sensorSerialNo=Serial no @@ -1282,9 +1282,9 @@ observe.converter.error.no.convertor=could not convert decimal %s using converto observe.converter.error.noValue=No value to convert using convertor %s observe.entity.message.updating=object '%1$s' is in editing mode. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY=Generate an empty data base. -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base.\nThis database won't any any referential, so you will need to import a referential later to use it. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz) -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from \na data base backup +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base @@ -1297,16 +1297,16 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CRE observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2) observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Use local database observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2) -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Use a remote database -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (type Postgresql) -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Use a remote server -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Use a remote server (type ObserveWeb) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Use a direct connection to a remote database +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=sans service web (moins performant) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Use a remote web service +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Use a remote ObServe web service to connect to a central database with better performances than with a direct connection observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED=Connexion failed -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED.description=The connexion failed for following reason\:\n %1$s +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED.description=The connexion failed for following reason\: observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS=Connexion success -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS.description=connexion details\:\n%1$s. +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS.description=connexion details\: observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED=None validate connexion -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED.description=Connexion was never validate, \nor was modified after last validate test. +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED.description=Connexion was never validate, observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONFIG=Configuration observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONFIG.description=Configure operations observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONSOLIDATE=Consolidate data @@ -1453,7 +1453,7 @@ 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.loaded.tip=%1$s is loading,\nYou 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 > @@ -1470,7 +1470,7 @@ 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 be deleted if you choose a replacement. +observe.message.show.usage.for.delete=Referential %1$s "%2$s" can not be deleted without a preliminary replacement. observe.message.show.usage.for.delete2=Some data are using this referential, see following references. observe.message.show.usage.for.delete3=Choose a replacement reference to be able to delete. observe.message.show.usage.for.desactivated=Referential %1$s "%2$s" will be disabled. @@ -1546,7 +1546,6 @@ observe.storage.activitySeine.tab.general=General caracteristics observe.storage.activitySeine.tab.measurements=Measurements observe.storage.activitySeine.tab.observedSystem=Observed systems observe.storage.activitySeine.title=Activity -observe.storage.activitySeineObservedSystem.title=Observed systems observe.storage.activitySeines.title=Activities observe.storage.config.data.mode=Data import mode observe.storage.config.data.storage=Data source cConfiguration @@ -1556,7 +1555,7 @@ observe.storage.config.left.storage=Left data source configuration observe.storage.config.referentiel.mode=Referential import mode observe.storage.config.referentiel.storage=Central data source configuration observe.storage.config.right.storage=Right data source configuration -observe.storage.config.source.storage=Data source configuration +observe.storage.config.source.storage=Configuration of data source to update observe.storage.config.target.storage=Configuration of target data source observe.storage.error.badUrl=The url format is not valid (%s) observe.storage.error.dbVersionMismatch=Version of remote database (%s) is not compiliant with the model version (%s) diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 6aba201..fb84520 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -174,7 +174,7 @@ observe.actions.report=Cuadros de síntesis observe.actions.report.config=Configuración de los informes observe.actions.report.copy.options=Opciones de copia en el portapapeles observe.actions.report.description=Generar los cuadros de síntesis del informe de fin del embarque -observe.actions.report.model.type=Model type to use \#TODO +observe.actions.report.model.type=Tipo de modelo a utilizar observe.actions.report.report.description=Descripción del informe seleccionado observe.actions.report.result=Resultados del informe observe.actions.report.select=Selección del informe @@ -317,12 +317,12 @@ observe.actions.validate.validator.scope.header.tip=El tipo del mensaje observe.admin.resume.no.operation.done=Ninguna operación realizada observe.admin.resume.operation.canceled=operación cancelada observe.admin.resume.operation.done=operacion realizada -observe.admin.resume.operation.failed=la operación no realizada -observe.admin.resume.operation.need.fix=la operación nesista correcciones +observe.admin.resume.operation.failed=operación no realizada +observe.admin.resume.operation.need.fix=la operación necesita correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... -observe.backup.done=[%s] Fin de la sauvegarde automatique (en %s) \#TODO -observe.backup.start=[%s] Début de la sauvegarde automatique \#TODO +observe.backup.done=[%s] Copia de seguridad automática realizada (en %s) +observe.backup.start=[%s] Inicio de copia de seguridad automática observe.choice.cancel=Cancelar observe.choice.confirm.delete=Eliminar observe.choice.confirm.replace=Reemplazar @@ -386,7 +386,7 @@ observe.common.exist.on.remote=%1$s (ya existe) observe.common.faoCode=Codigo FAO observe.common.file=Archivo observe.common.firstName=Número -observe.common.flagCountry=Badera +observe.common.flagCountry=Bandera observe.common.formsUrl=URL de los formularios observe.common.gaugeLabel=Texto «Capacidad» observe.common.gearType=Tipo de arte de pesca @@ -525,20 +525,20 @@ observe.common.well=Cuba observe.common.wind=Fuerza del viento observe.common.wormsId=Worms observe.common.yearService=año de entrada en servicio -observe.config.category.application=Application \#TODO -observe.config.category.application.description=Application options \#TODO -observe.config.category.expert=Expert \#TODO -observe.config.category.expert.description=Expert mode \#TODO +observe.config.category.application=Aplicación +observe.config.category.application.description=Opciones de la aplicación +observe.config.category.expert=Experto +observe.config.category.expert.description=Opciones de modo experto observe.config.category.observation=Calificación de las observaciones observe.config.category.observation.description=Gestion de los indicadores de calificación de los programas observe.config.category.speciesList.longline=Configuración de las listas de especies (Palangre) observe.config.category.speciesList.longline.description=Elegir las listas de especies a utilizar en los formularios de una marea de tipo palengre observe.config.category.speciesList.seine=Configuración de las listas de especies (Pesca al cerco) observe.config.category.speciesList.seine.description=Elegir las listas de especies a utilizar en los formularios de una marea de tipo pesca al cerco -observe.config.category.technical=Technical \#TODO -observe.config.category.technical.description=Technical informations \#TODO -observe.config.category.ui=Otro \#TODO -observe.config.category.ui.description=Otras opciones \#TODO +observe.config.category.technical=Técnico +observe.config.category.technical.description=Información técnica +observe.config.category.ui=GUI +observe.config.category.ui.description=Configuración GUI observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.closeAndCreate=Cerrar y crear @@ -1057,7 +1057,7 @@ observe.content.sensorUsed.exportData.tip=Exportar el archivo de datos registrad observe.content.sensorUsed.importData=Importar observe.content.sensorUsed.importData.tip=Importar un archivo de datos observe.content.sensorUsed.message.data.exported=El archivo de datos ha sido exportado (%s). -observe.content.sensorUsed.replace.data.message=Confirm to replace existing data file «%s» \#TODO +observe.content.sensorUsed.replace.data.message=Confirmar la sustitución del archivo existente «%s» observe.content.sensorUsed.sensorBrand=Marca observe.content.sensorUsed.sensorDataFormat=Formato de datos observe.content.sensorUsed.sensorSerialNo=Número de serie @@ -1225,7 +1225,7 @@ observe.content.tdr.meanFishingDepth=Profundidad media de pesca (m) observe.content.tdr.medianDeployementDepth=Profundidad mediana de despliegue (m) observe.content.tdr.medianFishingDepth=Profundidad mediana de pesca (m) observe.content.tdr.minFishingDepth=Profundidad minimal de pesca (m) -observe.content.tdr.replace.data.message=Confirm to replace existing data file «%s» \#TODO +observe.content.tdr.replace.data.message=Confirmar la sustitución del archivo existente «%s» observe.content.tdr.section=Sección observe.content.tdr.selectedSpecies=Especies seleccionadas observe.content.tdr.sensorBrand=Marca @@ -1294,13 +1294,13 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMo observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto. observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo H2 observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo h2 -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utilizar una base remota -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Utilizar una base remota de tipo postgres -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utilizar un servidor remoto -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servidor remoto +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo H2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utilizar una conexión directa a une base remota +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (PostgreSQL)\= without web service (less efficient)\=Utilizar una base remota de tipo PostgreSQL\= sin servicio web (menos eficiente) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utilizar un servicio web remoto +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servicio web remoto para obtener un mejor rendimiento observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED=Conexión falló observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED.description=La conexión falló por la razón siguiente \:\n %1$s observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS=Conexión con éxito @@ -1470,9 +1470,9 @@ observe.message.referentiel.home=< Referencial > observe.message.referentiel.no.editable=No tiene permisos para editar el referencial. observe.message.select.report=Seleccione informe observe.message.server.info=Información modo servidor -observe.message.show.usage.for.delete=El referencial %1$s "%2$s" no se puede eliminar. \#TODO +observe.message.show.usage.for.delete=El referencial %1$s "%2$s" no se puede eliminar sin hacer una sustitución antes. observe.message.show.usage.for.delete2=Los objetos están usando actualmente las referencias que se enumeran a continuación. -observe.message.show.usage.for.delete3=Choose a replacement reference to be able to delete. \#TODO +observe.message.show.usage.for.delete3=Elija una referencia de reemplazo para poder borrar. observe.message.show.usage.for.desactivated=El referencial %1$s "%2$s" se desactivará. observe.message.show.usage.for.desactivated2=Los objetos están usando actualmente las referencias que se enumeran a continuación.. observe.message.show.usage.for.desactivated3=Estos objetos deben usar otro referencial (no desactivado) para poder actualizarse. @@ -1546,7 +1546,6 @@ observe.storage.activitySeine.tab.general=Características generales observe.storage.activitySeine.tab.measurements=Medidas observe.storage.activitySeine.tab.observedSystem=Sistema observado observe.storage.activitySeine.title=Actividad -observe.storage.activitySeineObservedSystem.title=Sistema observado observe.storage.activitySeines.title=Actividades observe.storage.config.data.mode=Modo de importación de los datos observe.storage.config.data.storage=Configuración de la base de datos @@ -1556,8 +1555,8 @@ observe.storage.config.left.storage=Configuración de la base de la izquierda observe.storage.config.referentiel.mode=Modo de importación del referencial observe.storage.config.referentiel.storage=Configuración de la base de referencia observe.storage.config.right.storage=Configuration de la base de la derecha -observe.storage.config.source.storage=Configuración de la base origen -observe.storage.config.target.storage=Configuration de la base destination \#TODO +observe.storage.config.source.storage=Configuración de la base para actualizar +observe.storage.config.target.storage=Configuración de la base de datos de destino observe.storage.error.badUrl=Error en el formato de la dirección (URL) %s observe.storage.error.dbVersionMismatch=La versión de la base remota (%s) no es compatible con la versión del modelo (%s). observe.storage.error.rest.database.unknownForUser=La base de datos "%s" no está configurada para el usuario "%s" @@ -1657,7 +1656,7 @@ observe.title.can.not.export.obstuna=Impossible exportar los datos de obstuna... observe.title.choose.db.dump=Seleccionar una copia de seguridad de base local observe.title.choose.db.dump.directory=Seleccionar e directorio de destinación de la copia de seguridad observe.title.choose.reportFile=Seleccionar el archivo de definición de los informes -observe.title.confirmReplace=Confirm to replace \#TODO +observe.title.confirmReplace=Confirmar para reemplazar observe.title.connect.existingDB=Conexión a una fuente de datos que ya existe observe.title.connect.localDB=Conexión a una fuente de datos local observe.title.connect.remoteDB=Conexión a una fuente de datos distante @@ -1700,9 +1699,9 @@ observe.type.setLongline.unsaved=Nuevo lance observe.type.setSeine.unsaved=Nuevo lance observe.type.tripLongline.unsaved=Nueva marea observe.type.tripSeine.unsaved=Nueva marea -observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ? \#TODO -observe.usage.replaceTitle=Objet de remplacement \#TODO -observe.usage.usageTitle=Références trouvées \#TODO +observe.usage.action.shouldReplace=Reemplaza referencial desactivado? +observe.usage.replaceTitle=Objeto de sustitución +observe.usage.usageTitle=Referencias encontradas observe.validator.field.tip=Propriedad '%1$s' observe.validator.message.tip=Mensaje \: %1$s observe.validator.scope.tip=Tipo de mensaje \: '%1$s' 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 fb51c3e..151eea8 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 @@ -537,7 +537,7 @@ observe.config.category.speciesList.seine=Configuration des listes d'espèces (S observe.config.category.speciesList.seine.description=Choisir les listes d'espèces à utiliser dans les formulaire d'une marée de type senne observe.config.category.technical=Technique observe.config.category.technical.description=Informations techniques -observe.config.category.ui=Interface graphiques +observe.config.category.ui=Interface graphique observe.config.category.ui.description=Configuration des interfaces graphiques observe.content.action.activity=Créer une nouvelle activité observe.content.action.activity.tip=Créer une nouvelle activité pour la route courante @@ -1282,11 +1282,11 @@ observe.converter.error.no.convertor=Impossible de convertir le décimal %s depu observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s observe.entity.message.updating=L'objet '%1$s' est en cours de modification. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY=Générer une base vide -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide.\nCette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz) -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir\nd'une précédente sauvegarde de l'application +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée -observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir\nde la dernière version de la base embarquée. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante @@ -1294,19 +1294,19 @@ observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMo observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Creer une base locale de type h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Creer une base locale de type H2 observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type h2 -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type postgres -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utiliser un serveur distant -observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utiliser un serveur distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type H2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante en connexion directe +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type PostgreSQL en connexion directe +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utiliser un service web distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utiliser un service web ObServe distant pour se connecter à une base centrale avec de meilleures performances qu'en connexion directe observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED=Connexion échouée -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED.description=La connexion a échouée pour la raison suivante \:\n %1$s +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.FAILED.description=La connexion a échouée pour la raison suivante \: observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS=Connexion réussie -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS.description=Information sur la connexion \:\n%1$s. +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.SUCCESS.description=Information sur la connexion \: observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED=Connexion non validée -observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée, \nou a été modifiée depuis le dernier test de connexion. +observe.enum.fr.ird.observe.application.swing.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée, observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONFIG=Configuration observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONFIG.description=Configuration des opérations et sources de données à utiliser. observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.CONSOLIDATE=Calculer les données @@ -1546,7 +1546,6 @@ observe.storage.activitySeine.tab.general=Caractéristiques générales observe.storage.activitySeine.tab.measurements=Mesures observe.storage.activitySeine.tab.observedSystem=Systèmes observés observe.storage.activitySeine.title=Activité -observe.storage.activitySeineObservedSystem.title=Système observé observe.storage.activitySeines.title=Activités observe.storage.config.data.mode=Mode d'import des données observe.storage.config.data.storage=Configuration de la base de données @@ -1556,7 +1555,7 @@ observe.storage.config.left.storage=Configuration de la base de gauche observe.storage.config.referentiel.mode=Mode d'import du référentiel observe.storage.config.referentiel.storage=Configuration de la base de référence observe.storage.config.right.storage=Configuration de la base de droite -observe.storage.config.source.storage=Configuration de la base source +observe.storage.config.source.storage=Configuration de la base à mettre à jour observe.storage.config.target.storage=Configuration de la base destination observe.storage.error.badUrl=Erreur dans le format de l'URL %s observe.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.