This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 618568a75d85afca3301d69baa4b17ed91617437 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 3 18:07:23 2016 +0100 refs #880: Fix labels --- .../org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties | 4 ++-- .../org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties index 2ac1837..b3fafeb 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties @@ -41,8 +41,8 @@ chooseResumeOption.Action.shortDescription=Resume task without counting elapsed chooseResumeOption.Action.icon=go-jump.png chooseAssignOption.Action.text=Assign -chooseAssignOption.Action.shortDescription=Assign time to another task +chooseAssignOption.Action.shortDescription=Assign idle time to another task chooseAssignOption.Action.icon=document-revert-3.png -validAssignOption.Action.text=OK +validAssignOption.Action.text=Assign and resume current task diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties index b8914b7..9f9eb6d 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties @@ -37,6 +37,6 @@ chooseResumeOption.Action.text=Reprendre chooseResumeOption.Action.shortDescription=Reprendre la t\u00E2che en ne comptant pas le temps \u00E9coul\u00E9 chooseAssignOption.Action.text=Assigner -chooseAssignOption.Action.shortDescription=Assigner le temps \u00E0 une autre t\u00E2che +chooseAssignOption.Action.shortDescription=Assigner le temps d'inactivit\u00E9 \u00E0 une autre t\u00E2che -validAssignOption.Action.text=OK +validAssignOption.Action.text=Assigner et reprendre la t\u00E2che en cours -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.