Index: trunk/grails-app/i18n/messages.properties
===================================================================
--- trunk/grails-app/i18n/messages.properties	(revision 859)
+++ trunk/grails-app/i18n/messages.properties	(revision 860)
@@ -215,8 +215,16 @@
 
 # Task Actions
-task.status.resolved=Resolved.
+task.status.resolved=Resolved
 task.status.resolved.help=Indicate that root cause is known and has been completely resolved.
-task.status.unresolved=Unresolved.
-task.status.unresolved.help=Indicate that this task requires further attention, root cause is either unknown or unresolved.
+task.status.unresolved=Unresolved
+task.status.unresolved.help=Indicate that this task requires further attention, \
+    root cause is either unknown or unresolved.
+task.status.resolved.save.entry=Resolved
+task.status.resolved.save.entry.help=Save entry and complete task.
+task.status.unresolved.save.entry=Unresolved
+task.status.unresolved.save.entry.help=Save entry and indicate that this task requires further attention, \
+    root cause is either unknown or unresolved.
+task.save.entry=Save
+task.save.entry.help=Save entry and leave task status unchanged.
 
 taskRecurringSchedule.nextTargetStartDate.mayNotBePast=Please select a start date that is not in the past.
Index: trunk/grails-app/views/entryDetailed/_create.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/_create.gsp	(revision 859)
+++ trunk/grails-app/views/entryDetailed/_create.gsp	(revision 860)
@@ -109,8 +109,11 @@
                 <input class="save" type="submit" value="Save" />
             </span>
+            <custom:helpBalloon code="task.save.entry"
+                                            iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
             <span class="button">
                 <input class="flag" type="button" value="Unresolved" name="submit_andSetAttentionFlag" />
             </span>
-            <custom:helpBalloon code="task.status.unresolved" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+            <custom:helpBalloon code="task.status.unresolved.save.entry"
+                                            iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
             <span class="button">
                 <g:if test="${entryInstance.task.attentionFlag}" >
@@ -125,5 +128,6 @@
                 </g:else>
             </span>
-            <custom:helpBalloon code="task.status.resolved" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+            <custom:helpBalloon code="task.status.resolved.save.entry"
+                                            iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
         </div>
     </g:form>