branch develop updated (ba46a63 -> 1264013)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from ba46a63 Update readme.md new 1264013 Clean i18n files 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 12640131f2903f997054f89192cfe8e02ef76772 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 12:01:04 2016 +0200 Clean i18n files Summary of changes: .../org/chorem/jtimer/resources/JTimer.properties | 3 --- .../chorem/jtimer/resources/JTimer_fr.properties | 3 --- .../ui/report/resources/ReportView.properties | 1 - .../ui/report/resources/ReportView_fr.properties | 1 - .../resources/TimerTaskTransferHandler.properties | 11 +++++---- .../TimerTaskTransferHandler_fr.properties | 7 +++--- .../resources/ProjectsAndTasksTable.properties | 4 ++-- .../resources/ProjectsAndTasksTable_fr.properties | 4 ++-- .../SwingConnectionInformationHandler.properties | 26 ---------------------- ...SwingConnectionInformationHandler_fr.properties | 26 ---------------------- .../jtimer/entities/TimerTaskHelperTest.java | 4 ++-- 11 files changed, 14 insertions(+), 76 deletions(-) delete mode 100644 src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties delete mode 100644 src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 12640131f2903f997054f89192cfe8e02ef76772 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 12:01:04 2016 +0200 Clean i18n files --- .../org/chorem/jtimer/resources/JTimer.properties | 3 --- .../chorem/jtimer/resources/JTimer_fr.properties | 3 --- .../ui/report/resources/ReportView.properties | 1 - .../ui/report/resources/ReportView_fr.properties | 1 - .../resources/TimerTaskTransferHandler.properties | 11 +++++---- .../TimerTaskTransferHandler_fr.properties | 7 +++--- .../resources/ProjectsAndTasksTable.properties | 4 ++-- .../resources/ProjectsAndTasksTable_fr.properties | 4 ++-- .../SwingConnectionInformationHandler.properties | 26 ---------------------- ...SwingConnectionInformationHandler_fr.properties | 26 ---------------------- .../jtimer/entities/TimerTaskHelperTest.java | 4 ++-- 11 files changed, 14 insertions(+), 76 deletions(-) diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties index 3da1423..7d590ad 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties @@ -162,8 +162,6 @@ input.editProjectMessage=New project name : input.deleteProjectTitle=Confirm input.deleteProjectMessage=Do you want to delete project "%s" ? input.deleteProjectsMessage=Do you want to delete the %d selected projects ? -input.editTaskTitle=Edit task -input.editTaskMessage=New task name : input.deleteTaskTitle=Confirm input.deleteTaskMessage=Do you want to delete task "%s" ? input.deleteTasksMessage=Do you want to delete the %d selected tasks ? @@ -183,7 +181,6 @@ vetoable.common.merge.invalid.types=Can't merge project and task ! vetoable.common.move.invalid.types=Can't move project ! vetoable.saver.empty.name=Empty task name ! vetoable.saver.invalid.characters=Task name contains invalid characters ! -vetoable.ws.chorem.cant.modify.synchronized.project=Can't do this action on a synchronized project ! # Start fail i18n startFail.title=Error diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties index 5d90ca8..1a29065 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties @@ -127,8 +127,6 @@ input.editProjectMessage=Nouveau nom du projet : input.deleteProjectTitle=Confirmation input.deleteProjectMessage=Voulez-vous supprimer le projet "%s" ? input.deleteProjectsMessage=Voulez-vous supprimer les %d projets s\u00E9lectionn\u00E9s ? -input.editTaskTitle=\u00C9dition de la t\u00E2che -input.editTaskMessage=Nouveau nom de la t\u00E2che : input.deleteTaskTitle=Confirmation input.deleteTaskMessage=Voulez-vous supprimer la t\u00E2che "%s" ? input.deleteTasksMessage=Voulez-vous supprimer les %d t\u00E2ches s\u00E9lectionn\u00E9es ? @@ -148,7 +146,6 @@ vetoable.common.merge.invalid.types=Impossible de fusionner un projet et une t\u vetoable.common.move.invalid.types=Impossible de d\u00E9placer un projet ! vetoable.saver.empty.name=Le nom est vide ! vetoable.saver.invalid.characters=Le nom contient des caract\u00E8res invalide ! -vetoable.ws.chorem.cant.modify.synchronized.project=Impossible d'effectuer cette action sur un projet synchronis\u00E9 ! # Start fail i18n startFail.title=Erreur diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties index f40d1f4..39302bd 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties @@ -35,7 +35,6 @@ reportIncludeTime=Include task times reportAnnotationsTime=with time reportIntermediateTotalTime=Include intermediate total times reportProjects=Projects -reportContent=Report reportProjectsList=Projects list currentWeek.Action.icon = date_current.png diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties index f164b1d..da3b387 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties @@ -35,7 +35,6 @@ reportIncludeTime=Afficher les temps reportAnnotationsTime=avec l'heure reportIntermediateTotalTime=Ajout des temps totaux interm\u00E9diaires reportProjects=Projets -reportContent=Rapport reportProjectsList=Liste des projets currentWeek.Action.shortDescription = Semaine courante diff --git a/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties b/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties index c79f49d..1fd93ab 100644 --- a/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties +++ b/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -19,12 +19,11 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�Move UI i18n +# Move UI i18n move.task.title=Move task -move.task.confirmation.message=Do you want to move task '%s'\nto '%s' ? -move.tasks.confirmation.message=Do you want to move %d tasks\nto '%s' ? +move.task.message=Do you want to move task '%s'\nto '%s' ? +move.tasks.message=Do you want to move %d tasks\nto '%s' ? -#�error +# error action.invalidActionTitle=Can't do action action.missingErrorMessage=Error message is missing (%s) -vetoable.ws.chorem.cant.modify.synchronized.project=Can't do this action on a synchonized project diff --git a/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties b/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties index 55692db..b2d23c2 100644 --- a/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -19,12 +19,11 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�Move UI i18n +# Move UI i18n move.task.title=D\u00E9placement de la t\u00E2che move.task.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer la t\u00E2che '%s'\nvers '%s' ? move.tasks.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer %d t\u00E2ches\nvers '%s' ? -#�error +# error action.invalidActionTitle=Impossible d'effectuer cette action action.missingErrorMessage=Message d'erreur manquant (%s) -vetoable.ws.chorem.cant.modify.synchronized.project=Impossible d'effectuer cette action sur un projet synchronis\u00E9 diff --git a/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties b/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties index 62784e2..dcec94b 100644 --- a/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties +++ b/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�Table i18n +# Table i18n projectsAndTaskColumnName = Projects & Tasks todayTimeColumnName = Today totalTimeColumnName = Total diff --git a/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties b/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties index d0d5a2c..14a6669 100644 --- a/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�Table i18n +# Table i18n projectsAndTaskColumnName = Projets et t\u00E2ches todayTimeColumnName = Aujourd'hui totalTimeColumnName = Total diff --git a/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties b/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties deleted file mode 100644 index 564bea6..0000000 --- a/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# jTimer -# %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -# Webservice connection prompt -askInformationMessage=Choose your login to connect to "%s" : -askInformationTitle=Connection information needed -ok=OK -cancel=Cancel diff --git a/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties b/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties deleted file mode 100644 index c01f001..0000000 --- a/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# jTimer -# %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -# Webservice connection prompt -askInformationMessage=Choisissez votre identifiant pour vous connecter \u00E0 "%s" : -askInformationTitle=Information de connexion n\u00E9cessaire -ok=OK -cancel=Annuler diff --git a/src/test/java/org/chorem/jtimer/entities/TimerTaskHelperTest.java b/src/test/java/org/chorem/jtimer/entities/TimerTaskHelperTest.java index 7d8e6da..88eb68f 100644 --- a/src/test/java/org/chorem/jtimer/entities/TimerTaskHelperTest.java +++ b/src/test/java/org/chorem/jtimer/entities/TimerTaskHelperTest.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm