Merge branch '335028-improve-time-tracking-wordage' into 'master'

Improve time tracking wordage

See merge request gitlab-org/gitlab!66720

app/assets/javascripts/sidebar/components/time_tracking/help_state.vue

@@ -15,9 +15,7 @@ export default {
     },
     estimateText() {
       return sprintf(
-        s__(
-          'estimateCommand|%{slash_command} will update the estimated time with the latest command.',
-        ),
+        s__('estimateCommand|%{slash_command} overwrites the total estimated time.'),
         {
           slash_command: '<code>/estimate</code>',
         },
@@ -26,7 +24,7 @@ export default {
     },
     spendText() {
       return sprintf(
-        s__('spendCommand|%{slash_command} will update the sum of the time spent.'),
+        s__('spendCommand|%{slash_command} adds or subtracts time already spent.'),
         {
           slash_command: '<code>/spend</code>',
         },
@@ -41,7 +39,7 @@ export default {
   <div data-testid="helpPane" class="time-tracking-help-state">
     <div class="time-tracking-info">
       <h4>{{ __('Track time with quick actions') }}</h4>
-      <p>{{ __('Quick actions can be used in the issues description and comment boxes.') }}</p>
+      <p>{{ __('Quick actions can be used in description and comment boxes.') }}</p>
       <p v-html="estimateText"></p>
       <p v-html="spendText"></p>
       <gl-button :href="href">{{ __('Learn more') }}</gl-button>

doc/user/project/time_tracking.md

@@ -14,8 +14,8 @@ requests in GitLab.
 Use time tracking for these tasks:
 
 - Record the time spent working on an issue or a merge request.
-- Add an estimate of the amount of time needed to complete an issue or a merge
-  request.
+- Add or update an estimate of the total time to complete an issue or a merge
+request.
 - View a breakdown of time spent working on an issue or a merge request.
 
 You don't have to indicate an estimate to enter the time spent, and vice versa.
@@ -45,9 +45,14 @@ For example, if you need to enter an estimate of 1 month, 2 weeks, 3 days, 4 hou
 type `/estimate 1mo 2w 3d 4h 5m`.
 Check the [time units you can use](#configuration).
 
-Every time you enter a new time estimate, any previous time estimates are
-overridden by this new value. There should only be one valid estimate in an
-issue or a merge request.
+The estimate is designed to show the total estimated time. The estimated
+time remaining is automatically calculated and displayed when hovering over
+the time tracking information in the right sidebar.
+
+![Estimated time remaining](img/remaining_time_v14_2.png)
+
+An issue or a merge request can have only one estimate. Every time you enter a
+new time estimate, it overwrites the previous value.
 
 To remove an estimation entirely, use `/remove_estimate`.
 

locale/gitlab.pot

@@ -26810,7 +26810,7 @@ msgstr ""
 msgid "Queued"
 msgstr ""
 
-msgid "Quick actions can be used in the issues description and comment boxes."
+msgid "Quick actions can be used in description and comment boxes."
 msgstr ""
 
 msgid "Quick help"
@@ -38701,7 +38701,7 @@ msgstr ""
 msgid "error"
 msgstr ""
 
-msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
+msgid "estimateCommand|%{slash_command} overwrites the total estimated time."
 msgstr ""
 
 msgid "exceeds the limit of %{bytes} bytes"
@@ -39619,7 +39619,7 @@ msgstr ""
 msgid "specified top is not part of the tree"
 msgstr ""
 
-msgid "spendCommand|%{slash_command} will update the sum of the time spent."
+msgid "spendCommand|%{slash_command} adds or subtracts time already spent."
 msgstr ""
 
 msgid "ssh:"