branch develop-5.x updated (bbb31d4 -> 64a0649)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from bbb31d4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 64a0649 Templates de traduction mis à jour (fixes #8967) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 64a06492e663fb32f2cbc9ff95c90b0a1f99b098 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 12:10:43 2017 +0100 Templates de traduction mis à jour (fixes #8967) Summary of changes: .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 +++++++++--------- .../ftl/dataSourceConnectionReport_es.ftl | 74 +++++++++++----------- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_en.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_es.ftl | 18 +++--- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +-- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_en.ftl | 18 +++--- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +-- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 ++++---- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 ++++---- 16 files changed, 157 insertions(+), 157 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 64a06492e663fb32f2cbc9ff95c90b0a1f99b098 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 18 12:10:43 2017 +0100 Templates de traduction mis à jour (fixes #8967) --- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 +++++++++--------- .../ftl/dataSourceConnectionReport_es.ftl | 74 +++++++++++----------- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_en.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_es.ftl | 18 +++--- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +-- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_en.ftl | 18 +++--- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +-- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 ++++---- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 ++++---- 16 files changed, 157 insertions(+), 157 deletions(-) diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl index 0391e0e..5aaccbf 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl @@ -27,7 +27,7 @@ <#elseif connexionStatus.name() == "FAILED"> - <h3>the connection failed for the following reason :</h3> + <h3>The connection failed for the following reason :</h3> <ul> <li>${connexionStatusError}</li> diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl index d5a8df4..b98ce28 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_es.ftl @@ -23,11 +23,11 @@ <body> <#if connexionStatus.name() == "UNTESTED"> - <h3>La conexión no fue validada o ha sido modificada desde el última test de conexión.</h3> + <h3>La conexión no fue validada o ha sido modificada desde el último test de conexión.</h3> <#elseif connexionStatus.name() == "FAILED"> - <h3>La conexión falló por la razon siguiente :</h3> + <h3>La conexión falló por la razon siguiente:</h3> <ul> <li>${connexionStatusError}</li> @@ -35,7 +35,7 @@ <#elseif connexionStatus.name() == "SUCCESS"> - Información sobre la conexión : + Información sobre la conexión: <#import "storageModelDataSourceConfiguration_fr.ftl" as storageInfo> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl index 041b8e5..89106fd 100644 --- a/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl +++ b/application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl @@ -27,7 +27,7 @@ <#elseif connexionStatus.name() == "FAILED"> - <h3>La connexion a échouée pour la raison suivante :</h3> + <h3>La connexion a échoué pour la raison suivante :</h3> <ul> <li>${connexionStatusError}</li> @@ -35,7 +35,7 @@ <#elseif connexionStatus.name() == "SUCCESS"> - Information sur la connexion : + Informations sur la connexion : <#import "storageModelDataSourceConfiguration_fr.ftl" as storageInfo> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl index dd335f3..8193ac6 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl @@ -37,7 +37,7 @@ <hr/> <h3> - Backup location : + Backup location: <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -45,7 +45,7 @@ <#if useSelectData && selectDataModel??> - <h3>Data to export :</h3> + <h3>Data to export:</h3> <ul> <li> @@ -70,7 +70,7 @@ ${selectDataModel.selectDataSize()} trips </#if> - à exporter + to be exported <ul> @@ -103,7 +103,7 @@ </li> - <li>The referential will be exported</li> + <li>The reference data will be exported</li> </ul> </#if> @@ -127,7 +127,7 @@ <h2>Local database backup</h2> <hr/> - <h3>Backup location :</h3> + <h3>Backup location:</h3> <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -138,7 +138,7 @@ <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Referential Import from the last imported referential :</h3> + <h3>Import of reference data from the previous emported reference data:</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -146,7 +146,7 @@ <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Backup import :</h3> + <h3>Backup import:</h3> <ul> <li>${dumpFile.absolutePath}</li> @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -173,7 +173,7 @@ <h2>Remote database connection</h2> <hr/> - <h3>Remote database informations :</h3> + <h3>Remote database information :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Remote connection informations :</h3> + <h3>Remote connection information:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -192,7 +192,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Reference data import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -200,27 +200,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>No referential import</h3> + <h3>No reference data import</h3> </#if> <#if importData> <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Data import from a backup :</h3> + <h3>Data import from a backup:</h3> <ul> <li>${dataSourceModel.dumpFile.absolutePath}</li> @@ -228,13 +228,13 @@ <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Data import from a remote database :</h3> + <h3>Data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Data import from a remote server :</h3> + <h3>Data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -264,7 +264,7 @@ <h2>Remote server connection</h2> <hr/> - <h3>Remote server informations :</h3> + <h3>Remote server informations:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -283,7 +283,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Referential import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -291,27 +291,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>No referential import</h3> + <h3>No reference data import</h3> </#if> <#if importData> <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Referential import from a backup :</h3> + <h3>Reference data import from a backup:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -319,13 +319,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Referential import from a remote database :</h3> + <h3>Reference data import from a remote database:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Referential import from a remote server :</h3> + <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -340,10 +340,10 @@ <h3>Sécurité</h3> <ul> - <li><strong>Owner : </strong>${securityModel.administrateur.name}</li> - <li><strong>Technicians : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Readers : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referentials : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Owner: </strong>${securityModel.administrateur.name}</li> + <li><strong>Technicians: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Readers: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referentials: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> @@ -366,7 +366,7 @@ <#if showMigrationSql> - <li>Show sql update queries</li> + <li>Show SQL update queries</li> </#if> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl index 16a6920..5c55e03 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl @@ -30,14 +30,14 @@ <#elseif remote> Copia de seguridad de la base remota <#elseif server> - Copia de seguridad del servidor + Copia de seguridad del servicio web </#if> </h2> <hr/> <h3> - Ubicación de la copia de seguridad : + Ubicación de la copia de seguridad: <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -45,17 +45,17 @@ <#if useSelectData && selectDataModel??> - <h3>Datos a esportar :</h3> + <h3>Datos a esportar:</h3> <ul> <li> <#if selectDataModel.isDataEmpty()> - No hay datos de observaciones a exporter + No hay datos de observaciones a exportar <#elseif selectDataModel.isDataFull()> - Todos los datos de observador deben ser exportados + Todos los datos del observador deben ser exportados (<#if selectDataModel.selectDataSize() == 1> 1 marea <#else> @@ -115,7 +115,7 @@ <h2>Conexión a la base local</h2> <hr/> - <h3>Ubicación de la base local :</h3> + <h3>Ubicación de la base local:</h3> <ul> <li>${h2Config.directory.absolutePath}</li> @@ -127,7 +127,7 @@ <h2>Copia de seguridad de la base local</h2> <hr/> - <h3>Ubicación de la copia de seguridad :</h3> + <h3>Ubicación de la copia de seguridad:</h3> <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -138,7 +138,7 @@ <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Importación con el último referencial cargado :</h3> + <h3>Importación con el último referencial descargado:</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -146,7 +146,7 @@ <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación con una copia de seguridad :</h3> + <h3>Importación con una copia de seguridad:</h3> <ul> <li>${dumpFile.absolutePath}</li> @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -173,7 +173,7 @@ <h2>Conexión a una base remota</h2> <hr/> - <h3>Informaciones sobre la base remota a utilizar :</h3> + <h3>Informaciones sobre la base remota a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Informaciones sobre la conexión remota a utilisat :</h3> + <h3>Informaciones sobre la conexión remota a utilisar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -192,7 +192,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del reférencial con una copia de seguridad :</h3> + <h3>Importación del reférencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -200,13 +200,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -220,7 +220,7 @@ <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación de datos con una copia de seguridad :</h3> + <h3>Importación de datos con una copia de seguridad:</h3> <ul> <li>${dataSourceModel.dumpFile.absolutePath}</li> @@ -228,13 +228,13 @@ <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación de datos con una base remota :</h3> + <h3>Importación de datos con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación de datos con un servidor remoto :</h3> + <h3>Importación de datos con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -249,10 +249,10 @@ <h3>Seguridad</h3> <ul> - <li><strong>Proprietario : </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Proprietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> @@ -261,10 +261,10 @@ <#elseif dbMode.name() == "USE_SERVER"> <#if !adminAction??> - <h2>Connexion a un servidor remoto</h2> + <h2>Connexion a un servicio web remoto</h2> <hr/> - <h3>Informaciones sobre el servidor remoto a utilizar :</h3> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +273,7 @@ <h2>${adminAction.label}</h2> <hr/> - <h3>Informaciones sobre el servidor remoto a utilizar :</h3> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -283,7 +283,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del referencial con una copia de seguridad :</h3> + <h3>Importación del referencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -291,13 +291,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -311,7 +311,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del referencial con una copia de seguridad :</h3> + <h3>Importación del referencial con una copia de seguridad:</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -319,13 +319,13 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Importación del referencial con una base remota :</h3> + <h3>Importación del referencial con una base remota:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Importación del referencial con un servidor remoto :</h3> + <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -340,10 +340,10 @@ <h3>Seguridad</h3> <ul> - <li><strong>Propietario : </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Propietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> @@ -356,7 +356,7 @@ <#if canMigrate> - <li>Actualización si se necesita (versión actual : ${modelVersion})</li> + <li>Actualización si se necesita (versión actual: ${modelVersion})</li> <#if showMigrationProgression> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index 0d21869..273803e 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Import du référentiel depuis une une base distante :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -170,7 +170,7 @@ <#elseif dbMode.name() == "USE_REMOTE"> <#if !adminAction??> - <h2>Connexion à une base distante</h2> + <h2>Connexion directe à une base distante</h2> <hr/> <h3>Informations sur la base distante à utiliser :</h3> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Informations sur la connexion distance à utiliser :</h3> + <h3>Informations sur la base distante à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -206,7 +206,7 @@ <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> @@ -234,7 +234,7 @@ <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import de données depuis un serveur distant :</h3> + <h3>Import de données depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> @@ -261,10 +261,10 @@ <#elseif dbMode.name() == "USE_SERVER"> <#if !adminAction??> - <h2>Connexion à un serveur distant</h2> + <h2>Connexion à un service web distant</h2> <hr/> - <h3>Informations sur le serveur distant à utiliser :</h3> + <h3>Informations sur le service web à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +273,7 @@ <h2>${adminAction}</h2> <hr/> - <h3>Informations sur le serveur distant à utiliser :</h3> + <h3>Informations sur le service web distant à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -366,7 +366,7 @@ <#if showMigrationSql> - <li>Afficher les requêtes sql lors des mises à jour</li> + <li>Afficher les requêtes SQL lors des mises à jour</li> </#if> diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl index 5cf99dd..7c27d96 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl @@ -27,22 +27,22 @@ <ul> <#if isSqlDataSource() > <#if configuration.h2Database??> - <li><strong>User : </strong>${configuration.username}</li> + <li><strong>User: </strong>${configuration.username}</li> <#elseif configuration.postgresDatabase??> - <li><strong>Jdbc url : </strong>${configuration.jdbcUrl}</li> - <li><strong>User : </strong>${configuration.username}</li> - <li><strong>SSL mode : </strong>${configuration.useSsl?then('Yes', 'No')}</li> + <li><strong>Jdbc URL: </strong>${configuration.jdbcUrl}</li> + <li><strong>User: </strong>${configuration.username}</li> + <li><strong>SSL mode: </strong>${configuration.useSsl?then('Yes', 'No')}</li> </#if> <#else> - <li><strong>Server url : </strong>${configuration.serverUrl}</li> - <li><strong>User : </strong>${configuration.login}</li> + <li><strong>Web service url: </strong>${configuration.serverUrl}</li> + <li><strong>User: </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Database : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> <h3>Rights</h3> - <li><strong>Referential : </strong> + <li><strong>Reference data: </strong> <#if canReadReferential() > Read <#if canWriteReferential() > @@ -54,7 +54,7 @@ No rights </#if> </li> - <li><strong>Données observateur : </strong> + <li><strong>Données observateur: </strong> <#if canReadData() > Read <#if canWriteData() > @@ -70,7 +70,7 @@ <h3>Version</h3> v ${connection.version} <#else> - No datasource has been loaded + No data source loaded </#if> </body> diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl index d147ebc..eba6c39 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl @@ -27,22 +27,22 @@ <ul> <#if isSqlDataSource() > <#if configuration.h2Database??> - <li><strong>Usuario : </strong>${configuration.username}</li> + <li><strong>Usuario: </strong>${configuration.username}</li> <#elseif configuration.postgresDatabase??> - <li><strong>URL jdbc : </strong>${configuration.jdbcUrl}</li> - <li><strong>Usuario : </strong>${configuration.username}</li> - <li><strong>Modo SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> + <li><strong>URL jdbc: </strong>${configuration.jdbcUrl}</li> + <li><strong>Usuario: </strong>${configuration.username}</li> + <li><strong>Modo SSL: </strong>${configuration.useSsl?then('Oui', 'Non')}</li> </#if> <#else> - <li><strong>URL del servidor : </strong>${configuration.serverUrl}</li> - <li><strong>Usuario : </strong>${configuration.login}</li> + <li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li> + <li><strong>Usuario: </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Base de datos : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> <h3>Droits</h3> - <li><strong>Referencial : </strong> + <li><strong>Referencial: </strong> <#if canReadReferential() > Lectura <#if canWriteReferential() > @@ -54,7 +54,7 @@ No tiene derecho </#if> </li> - <li><strong>Datos observador : </strong> + <li><strong>Datos observador: </strong> <#if canReadData() > Lectura <#if canWriteData() > diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl index 43e63c7..39bd10c 100644 --- a/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl @@ -34,10 +34,10 @@ <li><strong>Mode SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> </#if> <#else> - <li><strong>URL du serveur : </strong>${configuration.serverUrl}</li> + <li><strong>URL du service web : </strong>${configuration.serverUrl}</li> <li><strong>Utilisateur : </strong>${configuration.login}</li> <#if configuration.optionalDatabaseName.present> - <li><strong>Base de données : </strong>${configuration.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> </ul> diff --git a/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl index eb18ef8..9bf7e5b 100644 --- a/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl @@ -21,9 +21,9 @@ --> <html> <body> -Droits : +Rights: -<strong> • Referential : </strong> +<strong> • Reference data: </strong> <#if canReadReferential() > Read <#if canWriteReferential() > @@ -35,7 +35,7 @@ Droits : No rights </#if> -<strong> • Données observateur : </strong> +<strong> • Observer data: </strong> <#if canReadData() > Read <#if canWriteData() > @@ -46,7 +46,7 @@ Droits : <#else> No rights </#if> -<Strong> • Version : </Strong> +<Strong> • Version: </Strong> v ${version} </body> diff --git a/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl index 148991b..54e679d 100644 --- a/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl @@ -21,9 +21,9 @@ --> <html> <body> -Droits : +Permisos: -<strong> • Référentiel : </strong> +<strong> • Datos de referencias: </strong> <#if canReadReferential() > Lectura <#if canWriteReferential() > @@ -35,7 +35,7 @@ Droits : No tiene derecho </#if> -<strong> • Données observateur : </strong> +<strong> • Datos observador: </strong> <#if canReadData() > Lectura <#if canWriteData() > @@ -46,7 +46,7 @@ Droits : <#else> No tiene derecho </#if> -<Strong> • Version : </Strong> +<Strong> • Version: </Strong> v ${version} </body> diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl index 3a72026..0dc1b0f 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl @@ -22,16 +22,16 @@ <html> <body> - <h3>Selected datasource type</h3> + <h3>Selected data source type</h3> <#if dbMode.name() == "USE_LOCAL"> - Use a h2 local database + Use a H2 local database <#elseif dbMode.name() == "CREATE_LOCAL"> - Create a h2 local database + Create a H2 local database <#elseif dbMode.name() == "USE_REMOTE"> - Use a postgres remote database + Use a PostgreSQL remote database <#elseif dbMode.name() == "USE_SERVER"> - Use a remote server + Use a remote web service <#else> No datasource type has been selected </#if> @@ -42,17 +42,17 @@ <#if !creationMode??> No creation mode has been selected <#elseif creationMode.name() == "EMPTY"> - Generate a new empty local database. This database won't have referentials and you will have to import one after that... + Generate a new empty local database. This database won't contain reference data and you will have to import them into it after that. <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> Generate a new local database from the last version of the embedded database. <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> Create a new local database from a previous backup. <#elseif creationMode.name() == "IMPORT_LOCAL_STORAGE"> - Generate a new local database and import the referentials of another local database in it. + Generate a new local database and import the reference data from another local database. <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - Generate a new local database and import the referentials of a remote database in it. + Generate a new local database and import the reference data from a remote database. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Generate a new local database and import the referentials of a remote server in it. + Generate a new local database and import the reference data from a remote web service. </#if> <#else> Not required. diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl index 4d88632..2947a21 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl @@ -25,13 +25,13 @@ <h3>Tipo de fuentes de datos seleccionado</h3> <#if dbMode.name() == "USE_LOCAL"> - Utilizar una base local de tipo h2 + Utilizar una base local de tipo H2 <#elseif dbMode.name() == "CREATE_LOCAL"> - Crear una base local de tipo h2 + Crear una base local de tipo H2 <#elseif dbMode.name() == "USE_REMOTE"> Utilizar una base remota de tipo postgres <#elseif dbMode.name() == "USE_SERVER"> - Utilizar un servidor remoto + Utilizar un servicio web remoto <#else> Ningún tipo de fuente de datos seleccionado </#if> @@ -52,7 +52,7 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> Generar una nueva base local e importar el referencial de una otra base remota. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Generar una nueva base local e importar el referencial de un servidor remoto. + Generar una nueva base local e importar el referencial de un servicio web remoto. </#if> <#else> No es necesario. diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl index 524b06c..195d256 100644 --- a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl @@ -25,13 +25,13 @@ <h3>Type de source de données sélectionné</h3> <#if dbMode.name() == "USE_LOCAL"> - Utiliser une base locale de type h2 + Utiliser une base locale de type H2 <#elseif dbMode.name() == "CREATE_LOCAL"> - Creer une base locale de type h2 + Creer une base locale de type H2 <#elseif dbMode.name() == "USE_REMOTE"> Utiliser une base distante de type postgres <#elseif dbMode.name() == "USE_SERVER"> - Utiliser un serveur distant + Utiliser un service web distant <#else> Aucun type de source de données sélectionné </#if> @@ -42,7 +42,7 @@ <#if !creationMode??> Aucun mode de création sélectionné <#elseif creationMode.name() == "EMPTY"> - Générer une nouvelle base locale vide.Cette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... + Générer une nouvelle base locale vide. Cette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel. <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> Générer une nouvelle base locale à partir de la dernière version de la base embarquée. <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> @@ -52,7 +52,7 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. + Générer une nouvelle base locale et y importer le référentiel depuis un service web distant. </#if> <#else> Non requis. diff --git a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl index 8261de5..d4a9dfc 100644 --- a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl +++ b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl @@ -23,25 +23,25 @@ <#if storageModel??> <ul> <#if storageModel.editRemoteConfig> - <li><strong>Jdbc url : </strong>${storageModel.pgConfig.jdbcUrl}</li> - <li><strong>User : </strong>${storageModel.pgConfig.username}</li> - <li><strong>Password : </strong>*****</li> - <li><strong>SSL mode : </strong>${storageModel.pgConfig.useSsl?then('Yes', 'No')}</li> + <li><strong>Jdbc URL: </strong>${storageModel.pgConfig.jdbcUrl}</li> + <li><strong>User: </strong>${storageModel.pgConfig.username}</li> + <li><strong>Password: </strong>*****</li> + <li><strong>SSL mode: </strong>${storageModel.pgConfig.useSsl?then('Yes', 'No')}</li> <#elseif storageModel.editServerConfig> - <li><strong>Server url : </strong>${storageModel.restConfig.serverUrl}</li> - <li><strong>User : </strong>${storageModel.restConfig.login}</li> - <li><strong>Password : </strong>*****</li> + <li><strong>Web service URL: </strong>${storageModel.restConfig.serverUrl}</li> + <li><strong>User: </strong>${storageModel.restConfig.login}</li> + <li><strong>Password: </strong>*****</li> <#if storageModel.restConfig.optionalDatabaseName.present> - <li><strong>Database : </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> + <li><strong>Database alias: </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> </#if> <#else> - <li><strong>User : </strong>${storageModel.h2Config.username}</li> - <li><strong>Password : </strong>*****</li> + <li><strong>User: </strong>${storageModel.h2Config.username}</li> + <li><strong>Password: </strong>*****</li> </#if> - <li><strong>Rights : </strong> + <li><strong>Rights: </strong> <ul> <li> - <em>Referential : </em> + <em>Reference data: </em> <#if storageModel.dataSourceInformation.canReadReferential() > Read <#if storageModel.dataSourceInformation.canWriteReferential() > @@ -54,7 +54,7 @@ </#if> </li> <li> - <em>Données observateur : </em> + <em>Observer data: </em> <#if storageModel.dataSourceInformation.canReadData() > Read <#if storageModel.dataSourceInformation.canWriteData() > diff --git a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl index fda13ce..95ce4f9 100644 --- a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl +++ b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_es.ftl @@ -23,25 +23,25 @@ <#if storageModel??> <ul> <#if storageModel.editRemoteConfig> - <li><strong>URL jdbc : </strong>${storageModel.pgConfig.jdbcUrl}</li> - <li><strong>Usuario : </strong>${storageModel.pgConfig.username}</li> - <li><strong>Contraseña : </strong>*****</li> - <li><strong>Modo SSL : </strong>${storageModel.pgConfig.useSsl?then('Si', 'No')}</li> + <li><strong>URL jdbc: </strong>${storageModel.pgConfig.jdbcUrl}</li> + <li><strong>Usuario: </strong>${storageModel.pgConfig.username}</li> + <li><strong>Contraseña: </strong>*****</li> + <li><strong>Modo SSL: </strong>${storageModel.pgConfig.useSsl?then('Si', 'No')}</li> <#elseif storageModel.editServerConfig> - <li><strong>URL du serveur : </strong>${storageModel.restConfig.serverUrl}</li> - <li><strong>Usuario : </strong>${storageModel.restConfig.login}</li> - <li><strong>Contraseña : </strong>*****</li> + <li><strong>URL del servicio web: </strong>${storageModel.restConfig.serverUrl}</li> + <li><strong>Usuario: </strong>${storageModel.restConfig.login}</li> + <li><strong>Contraseña: </strong>*****</li> <#if storageModel.restConfig.optionalDatabaseName.present> - <li><strong>Base de datos : </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> + <li><strong>Alias de la base: </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> </#if> <#else> - <li><strong>Usuario : </strong>${storageModel.h2Config.username}</li> - <li><strong>Contraseña : </strong>*****</li> + <li><strong>Usuario: </strong>${storageModel.h2Config.username}</li> + <li><strong>Contraseña: </strong>*****</li> </#if> - <li><strong>Derechos : </strong> + <li><strong>Derechos: </strong> <ul> <li> - <em>Referencial : </em> + <em>Referencial: </em> <#if storageModel.dataSourceInformation.canReadReferential() > Lectura <#if storageModel.dataSourceInformation.canWriteReferential() > @@ -54,7 +54,7 @@ </#if> </li> <li> - <em>Données observateur : </em> + <em>Datos observador: </em> <#if storageModel.dataSourceInformation.canReadData() > Lectura <#if storageModel.dataSourceInformation.canWriteData() > -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm