Merge branch 'fix65' into 'master'

Improve strings about busy indicator

See merge request gitlab-org/gitlab!72442

app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue

@@ -339,7 +339,7 @@ export default {
           </div>
           <div class="gl-display-flex">
             <span class="gl-text-gray-600 gl-ml-5">
-              {{ s__('SetStatusModal|A busy indicator is shown next to your name and avatar.') }}
+              {{ s__('SetStatusModal|An indicator appears next to your name and avatar') }}
             </span>
           </div>
         </div>

app/views/profiles/show.html.haml

@@ -71,7 +71,7 @@
           placeholder: s_("Profiles|What's your status?")
         .checkbox-icon-inline-wrapper
           = status_form.check_box :availability, { data: { testid: "user-availability-checkbox" }, label: s_("Profiles|Busy"), wrapper_class: 'gl-mr-0 gl-font-weight-bold' }, availability["busy"], availability["not_set"]
-          .gl-text-gray-600.gl-ml-5= s_('Profiles|"Busy" will be shown next to your name')
+          .gl-text-gray-600.gl-ml-5= s_('Profiles|An indicator appears next to your name and avatar')
     .col-lg-12
       %hr
   .row.user-time-preferences.js-search-settings-section

locale/gitlab.pot

@@ -26071,9 +26071,6 @@ msgstr ""
 msgid "Profiles| You are going to change the username %{currentUsernameBold} to %{newUsernameBold}. Profile and projects will be redirected to the %{newUsername} namespace but this redirect will expire once the %{currentUsername} namespace is registered by another user or group. Please update your Git repository remotes as soon as possible."
 msgstr ""
 
-msgid "Profiles|\"Busy\" will be shown next to your name"
-msgstr ""
-
 msgid "Profiles|%{provider} Active"
 msgstr ""
 
@@ -26101,6 +26098,9 @@ msgstr ""
 msgid "Profiles|An error occurred while updating your username, please try again."
 msgstr ""
 
+msgid "Profiles|An indicator appears next to your name and avatar"
+msgstr ""
+
 msgid "Profiles|Avatar cropper"
 msgstr ""
 
@@ -31294,10 +31294,10 @@ msgstr ""
 msgid "SetPasswordToCloneLink|set a password"
 msgstr ""
 
-msgid "SetStatusModal|A busy indicator is shown next to your name and avatar."
+msgid "SetStatusModal|Add status emoji"
 msgstr ""
 
-msgid "SetStatusModal|Add status emoji"
+msgid "SetStatusModal|An indicator appears next to your name and avatar"
 msgstr ""
 
 msgid "SetStatusModal|Busy"