Minor translation namespace fixesvue-i18n-js-vue-mr-widget-directory

Removed some namespaces for translations
and added additional ones to some mrwidget
vue files.

4 files changed, 28 insertions, 21 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
index 56f81e635d9..fb826be19f5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
@@ -90,7 +90,7 @@ export default {
             v-html="mr.sourceBranchLink"
           /><clipboard-button
             :text="branchNameClipboardData"
-            :title="s__('mrWidget|Copy branch name to clipboard')"
+            :title="__('Copy branch name to clipboard')"
             css-class="btn-default btn-transparent btn-clipboard"
           />
           {{ s__('mrWidget|into') }}
@@ -139,7 +139,7 @@ export default {
             type="button"
             class="btn dropdown-toggle qa-dropdown-toggle"
             data-toggle="dropdown"
-            :aria-label="s__('mrWidget|Download as')"
+            :aria-label="__('Download as')"
             aria-haspopup="true"
             aria-expanded="false"
           >
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
index 2997171922f..8e8e67228ed 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
@@ -101,7 +101,7 @@ export default {
           class="btn btn-sm btn-default js-cancel-auto-merge"
           @click.prevent="cancelAutomaticMerge"
         >
-          <i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+          <i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"> </i>
           {{ cancelButtonText }}
         </a>
       </h4>
@@ -125,7 +125,7 @@ export default {
             href="#"
             @click.prevent="removeSourceBranch"
           >
-            <i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+            <i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"> </i>
             {{ s__('mrWidget|Delete source branch') }}
           </a>
         </p>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
index 5a3d4fd7d4a..7312b31c01c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
@@ -23,17 +23,21 @@ export default {
       </div>
       <div class="text col-md-7 order-md-first col-12">
         <span>{{
-          __(
-            'Merge requests are a place to propose changes you have made to a project and discuss those changes with others.',
+          s__(
+            'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.',
           )
         }}</span>
         <p>
-          {{ __('Interested parties can even contribute by pushing commits if they want to.') }}
+          {{
+            s__(
+              'mrWidgetNothingToMerge|Interested parties can even contribute by pushing commits if they want to.',
+            )
+          }}
         </p>
         <p>
           {{
-            __(
-              "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.",
+            s__(
+              "mrWidgetNothingToMerge|Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.",
             )
           }}
         </p>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 54ea28921f6..1635faf312c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3101,6 +3101,9 @@ msgstr ""
 msgid "Copy URL to clipboard"
 msgstr ""
 
+msgid "Copy branch name to clipboard"
+msgstr ""
+
 msgid "Copy command to clipboard"
 msgstr ""
 
@@ -3314,9 +3317,6 @@ msgstr ""
 msgid "CurrentUser|Settings"
 msgstr ""
 
-msgid "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch."
-msgstr ""
-
 msgid "Custom CI config path"
 msgstr ""
 
@@ -3796,6 +3796,9 @@ msgstr ""
 msgid "Download artifacts"
 msgstr ""
 
+msgid "Download as"
+msgstr ""
+
 msgid "Download asset"
 msgstr ""
 
@@ -6348,9 +6351,6 @@ msgstr ""
 msgid "Merge requests"
 msgstr ""
 
-msgid "Merge requests are a place to propose changes you have made to a project and discuss those changes with others."
-msgstr ""
-
 msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
 msgstr ""
 
@@ -12778,6 +12778,15 @@ msgstr ""
 msgid "mrWidgetCommitsAdded|1 merge commit"
 msgstr ""
 
+msgid "mrWidgetNothingToMerge|Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch."
+msgstr ""
+
+msgid "mrWidgetNothingToMerge|Interested parties can even contribute by pushing commits if they want to."
+msgstr ""
+
+msgid "mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others."
+msgstr ""
+
 msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch"
 msgstr ""
 
@@ -12820,9 +12829,6 @@ msgstr ""
 msgid "mrWidget|Closes"
 msgstr ""
 
-msgid "mrWidget|Copy branch name to clipboard"
-msgstr ""
-
 msgid "mrWidget|Create an issue to resolve them later"
 msgstr ""
 
@@ -12835,9 +12841,6 @@ msgstr ""
 msgid "mrWidget|Did not close"
 msgstr ""
 
-msgid "mrWidget|Download as"
-msgstr ""
-
 msgid "mrWidget|Email patches"
 msgstr ""