branch develop updated (402c795 -> 166a59d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 402c795 fixes #7045: [ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons) Merge branch 'feature/7045' into develop new 47706bc fixes #7177 : correction des libellé de la légendes new 166a59d fixes #7177: Erreur de légende pour la cartographie des marées ObserveLL Merge branch 'feature/7177' into develop The 2 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 166a59d21a60dcdc9c2fa060c67618bad6564946 Merge: 402c795 47706bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 14:04:36 2015 +0200 fixes #7177: Erreur de légende pour la cartographie des marées ObserveLL Merge branch 'feature/7177' into develop commit 47706bc35f3fa41235144a0a9255c89392f53385 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 5 15:14:10 2015 +0200 fixes #7177 : correction des libellé de la légendes Summary of changes: .../src/main/resources/i18n/observe-entities_fr_FR.properties | 8 ++++---- .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 47706bc35f3fa41235144a0a9255c89392f53385 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 5 15:14:10 2015 +0200 fixes #7177 : correction des libellé de la légendes --- .../src/main/resources/i18n/observe-entities_fr_FR.properties | 8 ++++---- .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index ead0aa8..7056a1e 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -21,11 +21,11 @@ observe.common.schoolType.libre=Banc libre observe.common.schoolType.objet=Banc objet observe.common.schoolType.undefined=Banc indéterminé observe.map.longLine.activity=point d'activité -observe.map.longLine.activity.hauling.end=Fin de filage -observe.map.longLine.activity.hauling.start=Début de filage +observe.map.longLine.activity.hauling.end=Fin de virage +observe.map.longLine.activity.hauling.start=Début de virage observe.map.longLine.activity.interaction=Rencontre -observe.map.longLine.activity.setting.end=Fin de virage -observe.map.longLine.activity.setting.start=Début de virage +observe.map.longLine.activity.setting.end=Fin de filage +observe.map.longLine.activity.setting.start=Début de filage observe.map.longLine.activity.station=Station océanographique observe.map.longLine.seine.harbour=Au port observe.map.seine.activity=point d'activité diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index e51734d..db614ac 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1276,8 +1276,8 @@ observe.map.export.overwrite.cancel=Annuler observe.map.export.overwrite.ok=Remplacer observe.map.export.overwrite.title=Attention observe.map.export.success=Carte exportée (%s) -observe.map.legend.hauling=Filage -observe.map.legend.setting=Virage +observe.map.legend.hauling=Virage +observe.map.legend.setting=Filage observe.map.legend.tripBetweenTwoDays=Trajet entre deux jours observe.map.legend.tripDay=Trajet d'une journée observe.map.miles=milles -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 166a59d21a60dcdc9c2fa060c67618bad6564946 Merge: 402c795 47706bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 14:04:36 2015 +0200 fixes #7177: Erreur de légende pour la cartographie des marées ObserveLL Merge branch 'feature/7177' into develop .../src/main/resources/i18n/observe-entities_fr_FR.properties | 8 ++++---- .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm