[Git][ultreiaio/ird-observe][develop-7.x] Spanish translations - See #1173 - Observe-commits

19 Nov 2018


      Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe


Commits:
5b166504 by tchemit at 2018-11-19T17:40:17Z
Spanish translations - See #1173

- - - - -


10 changed files:

- client-configuration/pom.xml
- client-core/pom.xml
- client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java
- dto/pom.xml
- dto/src/main/i18n/getters/java-enumeration.getter
- observe-i18n/pom.xml
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- pom.xml


Changes:

=====================================
client-configuration/pom.xml
=====================================
@@ -201,6 +201,47 @@
               <artifactId>services</artifactId>
               <version>${project.version}</version>
             </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-gis</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-temperature</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-number</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-select</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-validator</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-dto</artifactId>
+              <version>${observeToolkitVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-validation</artifactId>
+              <version>${observeToolkitVersion}</version>
+              <scope>compile</scope>
+            </dependency>
           </dependencies>
         </plugin>
       </plugins>


=====================================
client-core/pom.xml
=====================================
@@ -718,6 +718,47 @@
               <artifactId>client-configuration</artifactId>
               <version>${project.version}</version>
             </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-gis</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-temperature</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-number</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-select</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-validator</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-dto</artifactId>
+              <version>${observeToolkitVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-validation</artifactId>
+              <version>${observeToolkitVersion}</version>
+              <scope>compile</scope>
+            </dependency>
           </dependencies>
         </plugin>
 


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java
=====================================
@@ -29,10 +29,10 @@ import fr.ird.observe.client.ui.ObserveUICallback;
 import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport;
 import fr.ird.observe.client.ui.util.UIHelper;
 import io.ultreia.java4all.i18n.I18n;
+import io.ultreia.java4all.i18n.editor.model.Project;
+import io.ultreia.java4all.i18n.editor.ui.ProjectUI;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.nuiton.i18n.editor.model.Project;
-import org.nuiton.i18n.editor.ui.ProjectUI;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;


=====================================
dto/pom.xml
=====================================
@@ -232,6 +232,49 @@
             </execution>
 
           </executions>
+          <dependencies>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-gis</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-temperature</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-number</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-select</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-validator</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+              <scope>compile</scope>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-dto</artifactId>
+              <version>${observeToolkitVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-validation</artifactId>
+              <version>${observeToolkitVersion}</version>
+              <scope>compile</scope>
+            </dependency>
+          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>


=====================================
dto/src/main/i18n/getters/java-enumeration.getter
=====================================
@@ -10,6 +10,8 @@ observe.constant.NonTargetCatchReleaseStatus.M
 observe.constant.NonTargetCatchReleaseStatus.P
 observe.constant.NonTargetCatchReleaseStatus.S
 observe.constant.NonTargetCatchReleaseStatus.U
+observe.constant.ObserveModelType.LL.description
+observe.constant.ObserveModelType.PS.description
 observe.constant.Ownership.autreVessel
 observe.constant.Ownership.ceVessel
 observe.constant.Ownership.unknown


=====================================
observe-i18n/pom.xml
=====================================
@@ -61,6 +61,19 @@
           <groupId>io.ultreia.java4all.i18n</groupId>
           <artifactId>i18n-maven-plugin</artifactId>
           <dependencies>
+
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-dto</artifactId>
+              <version>${observeToolkitVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>fr.ird.observe.toolkit</groupId>
+              <artifactId>common-validation</artifactId>
+              <version>${observeToolkitVersion}</version>
+              <scope>compile</scope>
+            </dependency>
+
             <dependency>
             <groupId>io.ultreia.java4all.jaxx</groupId>
             <artifactId>jaxx-widgets-about</artifactId>


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activities
 observe.common.ActivityLonglineDto.type=Activity
 observe.common.ActivityLonglineDto.types=Activities
 observe.common.ActivityLonglineDto.vesselActivityLongline=Vessel activity
-observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD
+observe.common.ActivitySeineDto.action.addFloatingObject=Declare a new floatting object (FOB)
 observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity
 observe.common.ActivitySeineDto.action.addSet=Add a Set
 observe.common.ActivitySeineDto.action.addSet.tip=Add the set to the activity
@@ -654,7 +654,7 @@ observe.common.FloatingObjectDto.notComputed=Not computed
 observe.common.FloatingObjectDto.objectOperation=Object operation
 observe.common.FloatingObjectDto.supportVesselName=Support vessel name
 observe.common.FloatingObjectDto.table.type=Type
-observe.common.FloatingObjectDto.title=DCP
+observe.common.FloatingObjectDto.title=Floatting object
 observe.common.FloatingObjectDto.type=Floating object
 observe.common.FloatingObjectDto.types=Floating objects
 observe.common.FloatingObjectPartDto.title=Floating object parts
@@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Security
 observe.constant.StorageStep.ROLES.description=Applya security on database roles
 observe.constant.StorageStep.SELECT_DATA=Data selection
 observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup
-observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
+observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon associated to object
 observe.constant.TypeTransmittingBuoyOperation.pose=Posing
 observe.constant.TypeTransmittingBuoyOperation.recuperation=Grab
 observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
@@ -2171,7 +2171,7 @@ observe.type.action.save=Save %s
 observe.type.action.view=View selected %s
 observe.type.activityLongline.unsaved=New activity
 observe.type.activitySeine.unsaved=New activity
-observe.type.floatingObject.unsaved=New DCP
+observe.type.floatingObject.unsaved=New floating object (FOB)
 observe.type.list=List of %s
 observe.type.management=Management of %s
 observe.type.reference.common=Common Referential


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Actividades
 observe.common.ActivityLonglineDto.type=Actividad
 observe.common.ActivityLonglineDto.types=Actividades
 observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco
-observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB
+observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un objeto flotante (FOB)
 observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad
 observe.common.ActivitySeineDto.action.addSet=Añadir un lance
 observe.common.ActivitySeineDto.action.addSet.tip=Añadir el lance de la actividad
@@ -954,8 +954,8 @@ observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da
 observe.common.ObjectMaterialDto.legacyCode=Código antiguo
 observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar
 observe.common.ObjectMaterialDto.objectMaterialType=Tipo
-observe.common.ObjectMaterialDto.parent=Parent \#TODO
-observe.common.ObjectMaterialDto.parentCode=Parent \#TODO
+observe.common.ObjectMaterialDto.parent=Padre
+observe.common.ObjectMaterialDto.parentCode=Padre
 observe.common.ObjectMaterialDto.standardCode=Código estándar
 observe.common.ObjectMaterialDto.type=Componente del objeto flotante
 observe.common.ObjectMaterialDto.types=Componentes del objeto flotante
@@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Seguridad
 observe.constant.StorageStep.ROLES.description=Configuración de la seguridad
 observe.constant.StorageStep.SELECT_DATA=Selección de datos
 observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad
-observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
+observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Objeto sin baliza
 observe.constant.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
 observe.constant.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
 observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
@@ -2171,7 +2171,7 @@ observe.type.action.save=Guardar las modificaciones sobre el elemento de tipo '%
 observe.type.action.view=Ver los detalles del objeto de tipo '%s' seleccionado
 observe.type.activityLongline.unsaved=Nueva actividad
 observe.type.activitySeine.unsaved=Nueva actividad
-observe.type.floatingObject.unsaved=Nuevo FOB
+observe.type.floatingObject.unsaved=Nuevo objeto flotante (FOB)
 observe.type.list=Lista de %s
 observe.type.management=Gestión de %s
 observe.type.reference.common=Referencial común


=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
@@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activités
 observe.common.ActivityLonglineDto.type=Activité
 observe.common.ActivityLonglineDto.types=Activités
 observe.common.ActivityLonglineDto.vesselActivityLongline=Activité bateau
-observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP
+observe.common.ActivitySeineDto.action.addFloatingObject=Déclarer un objet flottant (FOB)
 observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité
 observe.common.ActivitySeineDto.action.addSet=Ajouter la calée
 observe.common.ActivitySeineDto.action.addSet.tip=Ajouter la calée de l'activité
@@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Sécurité
 observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité
 observe.constant.StorageStep.SELECT_DATA=Sélection données
 observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde
-observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
+observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée à l'objet
 observe.constant.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
 observe.constant.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
 observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
@@ -2171,7 +2171,7 @@ observe.type.action.save=Sauver les modifications sur l'objet de type '%s'
 observe.type.action.view=Voir les détails de l'objet de type '%s' sélectionné
 observe.type.activityLongline.unsaved=Nouvelle activité
 observe.type.activitySeine.unsaved=Nouvelle activité
-observe.type.floatingObject.unsaved=Nouveau DCP
+observe.type.floatingObject.unsaved=Nouvel objet flottant (FOB)
 observe.type.list=Liste des %s
 observe.type.management=Gestion des %s
 observe.type.reference.common=Référentiel commun


=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2018.8.8</version>
+    <version>2018.8.10</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -155,7 +155,7 @@
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
 
-    <observeToolkitVersion>3.7.13</observeToolkitVersion>
+    <observeToolkitVersion>3.7.14</observeToolkitVersion>
     <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
     <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
@@ -164,7 +164,7 @@
     <!--can't use 1.4.197 (date has changed + blob also-->
     <lib.version.h2>1.4.196</lib.version.h2>
     <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
-    <!--<lib.version.java4all.i18n>4.0-beta-6-SNAPSHOT</lib.version.java4all.i18n>-->
+    <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
 
     <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
     <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5b1665046f8b3588d8d733a1218a...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5b1665046f8b3588d8d733a1218a...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop-7.x] Spanish translations - See #1173

Tony CHEMIT

tags

participants (1)