Change 'Todo' to 'To Do'

Currently, we label items to be done as "Todo." This is grammatically
incorrect and (therefore) confusing—especially to our Spanish-speaking
users for whom "todo" has a specific and unrelated meaning.

We should use "To Do" and always use it as singular (not "To Dos").

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot

4 files changed, 15 insertions, 15 deletions

diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index db6e40a6fd0..8cdfc7369a0 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -49,5 +49,5 @@
   - else
     .todo-actions
       = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
-        Add todo
+        Add a To Do
         = icon('spinner spin')
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 8212fb8bb33..731e763f2be 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -1,11 +1,11 @@
 - @hide_top_links = true
-- page_title "Todos"
-- header_title "Todos", dashboard_todos_path
+- page_title "To-Do List"
+- header_title "To-Do List", dashboard_todos_path
 
 = render_dashboard_gold_trial(current_user)
 
 .page-title-holder.d-flex.align-items-center
-  %h1.page-title= _('Todos')
+  %h1.page-title= _('To-Do List')
 
 - if current_user.todos.any?
   .top-area
@@ -13,7 +13,7 @@
       %li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }>
         = link_to todos_filter_path(state: 'pending') do
           %span
-            Todos
+            To Do
           %span.badge.badge-pill
             = number_with_delimiter(todos_pending_count)
       %li.todos-done{ class: active_when(params[:state] == 'done') }>
@@ -102,24 +102,24 @@
         %p
           Are you looking for things to do? Take a look at
           = succeed "," do
-            = link_to "the opened issues", issues_dashboard_path
+            = link_to "open issues", issues_dashboard_path
           contribute to
-          = link_to "merge requests", merge_requests_dashboard_path
-          or mention someone in a comment to assign a new todo automatically.
+          = link_to "a merge request\,", merge_requests_dashboard_path
+          or mention someone in a comment to automatically assign them a new to-do item.
       - else
         %h4.text-center
-          There are no todos to show.
+          Nothing is on your to-do list. Nice work!
   - else
     .todos-empty
       .todos-empty-hero.svg-content
         = image_tag 'illustrations/todos_empty.svg'
       .todos-empty-content
         %h4
-          Todos let you see what you should do next
+          Your To-Do List shows what to work on next
         %p
-          When an issue or merge request is assigned to you, or when you
+          When an issue or merge request is assigned to you, or when you receive a
           %strong
             @mention
-          in a comment, this will trigger a new item in your todo list, automatically.
+          in a comment, this automatically triggers a new item in your To-Do List.
         %p
-          You will always know what to work on next.
+          It's how you always know what to work on next.
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index f8b7d0c530a..f9ee6f42e23 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -53,7 +53,7 @@
                   = number_with_delimiter(merge_requests_count)
           - if header_link?(:todos)
             = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do
-              = link_to dashboard_todos_path, title: _('Todos'), aria: { label: _('Todos') }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+              = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = sprite_icon('todo-done', size: 16)
                 %span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
                   = todos_count_format(todos_pending_count)
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index e87e560266f..b4f8377c008 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -10,7 +10,7 @@
     .block.issuable-sidebar-header
       - if signed_in
         %span.issuable-header-text.hide-collapsed.float-left
-          = _('Todo')
+          = _('To Do')
       %a.gutter-toggle.float-right.js-sidebar-toggle.has-tooltip{ role: "button", href: "#", "aria-label" => "Toggle sidebar", title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }
         = sidebar_gutter_toggle_icon
       - if signed_in