branch develop updated (dffa193 -> 312c31e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from dffa193 fixes #6348: [ERGO] Icônes de l'applicatif new 432ffe8 remove bad file new 312c31e update documentation site url 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 312c31e3de863bc6d7bb3c5fb77e0222cc5ab6f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 22 09:41:51 2014 +0100 update documentation site url commit 432ffe8091001776cfe36f2c90f0226c39989b29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 22 08:52:49 2014 +0100 remove bad file Summary of changes: .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../ifremer/tutti/ui/swing/action/ShowAboutAction.java | 3 +-- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- tutti-ui-swing/src/main/resources/test.shp | Bin 448188 -> 0 bytes 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 tutti-ui-swing/src/main/resources/test.shp -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit 432ffe8091001776cfe36f2c90f0226c39989b29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 22 08:52:49 2014 +0100 remove bad file --- tutti-ui-swing/src/main/resources/test.shp | Bin 448188 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tutti-ui-swing/src/main/resources/test.shp b/tutti-ui-swing/src/main/resources/test.shp deleted file mode 100644 index 63e155c..0000000 Binary files a/tutti-ui-swing/src/main/resources/test.shp and /dev/null differ -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit 312c31e3de863bc6d7bb3c5fb77e0222cc5ab6f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 22 09:41:51 2014 +0100 update documentation site url --- .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java | 3 +-- tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index eeb15c0..1535075 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -184,7 +184,7 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { SITE_URL( "tutti.site.url", n("tutti.config.option.site.url.description"), - "https://doc.codelutin.com/tutti", + "https://tutti.codelutin.com", URL.class), ORGANIZATION_NAME( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java index ee7374b..f92894a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java @@ -110,8 +110,7 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { about = new AboutPanel(); about.setTitle(t("tutti.about.title")); - about.setAboutText(t("tutti.about.message", - config.getVersion())); + about.setAboutText(t("tutti.about.message")); int currentYear = Calendar.getInstance().get(Calendar.YEAR); int inceptionYear = config.getInceptionYear(); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 516d354..332b2d7 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -2,7 +2,7 @@ application.action.create.error= application.error.ui.business.warning= swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de l'application tutti.about.bottomText=Copyright %s - %s - version %s -tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l' [...] +tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l' [...] tutti.about.title=À propos de Tutti tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">tutti-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séparateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. tutti.about.translate.title=Traduire Tutti -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm