Fix gitlab.pot generation by removing line breaks47092-fix-pot-generation

13 files changed, 87 insertions, 76 deletions

diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue
index 83f78394238..f3369e973a5 100644
--- a/app/assets/javascripts/badges/components/badge_settings.vue
+++ b/app/assets/javascripts/badges/components/badge_settings.vue
@@ -18,9 +18,7 @@ export default {
   computed: {
     ...mapState(['badgeInModal', 'isEditing']),
     deleteModalText() {
-      return s__(
-        'Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored.',
-      );
+      return s__('Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored.');
     },
   },
   methods: {
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index bb5fcea648d..e147f4b9a3e 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -41,10 +41,7 @@ export default {
     generalApplicationDescription() {
       return sprintf(
         _.escape(
-          s__(
-            `ClusterIntegration|Install applications on your Kubernetes cluster.
-            Read more about %{helpLink}`,
-          ),
+          s__(`ClusterIntegration|Install applications on your Kubernetes cluster. Read more about %{helpLink}`),
         ),
         {
           helpLink: `<a href="${this.helpPath}">
@@ -66,12 +63,7 @@ export default {
     ingressDescription() {
       const extraCostParagraph = sprintf(
         _.escape(
-          s__(
-            `ClusterIntegration|%{boldNotice} This will add some extra resources
-            like a load balancer, which may incur additional costs depending on
-            the hosting provider your Kubernetes cluster is installed on. If you are using
-            Google Kubernetes Engine, you can %{pricingLink}.`,
-          ),
+          s__(`ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}.`),
         ),
         {
           boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`,
@@ -83,10 +75,7 @@ export default {
 
       const externalIpParagraph = sprintf(
         _.escape(
-          s__(
-            `ClusterIntegration|After installing Ingress, you will need to point your wildcard DNS
-            at the generated external IP address in order to view your app after it is deployed. %{ingressHelpLink}`,
-          ),
+          s__(`ClusterIntegration|After installing Ingress, you will need to point your wildcard DNS at the generated external IP address in order to view your app after it is deployed. %{ingressHelpLink}`),
         ),
         {
           ingressHelpLink: `<a href="${this.ingressHelpPath}">
@@ -108,10 +97,7 @@ export default {
     prometheusDescription() {
       return sprintf(
         _.escape(
-          s__(
-            `ClusterIntegration|Prometheus is an open-source monitoring system
-            with %{gitlabIntegrationLink} to monitor deployed applications.`,
-          ),
+          s__(`ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications.`),
         ),
         {
           gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index 22eb7bd44c5..84843c3e7d0 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -169,11 +169,7 @@ export default {
       this.targetGroup = group;
       this.targetParentGroup = parentGroup;
       this.showModal = true;
-      this.groupLeaveConfirmationMessage = s__(
-        `GroupsTree|Are you sure you want to leave the "${
-          group.fullName
-        }" group?`,
-      );
+      this.groupLeaveConfirmationMessage = s__(`GroupsTree|Are you sure you want to leave the "${ group.fullName }" group?`);
     },
     hideLeaveGroupModal() {
       this.showModal = false;
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue
index e2b42ab2642..33cf84bbf4e 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue
@@ -27,9 +27,7 @@ export default {
     ...mapGetters('commit', ['commitButtonDisabled', 'discardDraftButtonDisabled']),
     overviewText() {
       return sprintf(
-        __(
-          '<strong>%{changedFilesLength} unstaged</strong> and <strong>%{stagedFilesLength} staged</strong> changes',
-        ),
+        __('<strong>%{changedFilesLength} unstaged</strong> and <strong>%{stagedFilesLength} staged</strong> changes'),
         {
           stagedFilesLength: this.stagedFiles.length,
           changedFilesLength: this.changedFiles.length,
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 72d7e22fba0..5954d5494ba 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -227,9 +227,7 @@ Please check your network connection and try again.`;
             this.toggleStateButtonLoading(false);
             Flash(
               sprintf(
-                __(
-                  'Something went wrong while closing the %{issuable}. Please try again later',
-                ),
+                __('Something went wrong while closing the %{issuable}. Please try again later'),
                 { issuable: this.noteableDisplayName },
               ),
             );
@@ -242,9 +240,7 @@ Please check your network connection and try again.`;
             this.toggleStateButtonLoading(false);
             Flash(
               sprintf(
-                __(
-                  'Something went wrong while reopening the %{issuable}. Please try again later',
-                ),
+                __('Something went wrong while reopening the %{issuable}. Please try again later'),
                 { issuable: this.noteableDisplayName },
               ),
             );
diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js
index f79049b85f6..1ac50facc7b 100644
--- a/app/assets/javascripts/notes/mixins/resolvable.js
+++ b/app/assets/javascripts/notes/mixins/resolvable.js
@@ -45,9 +45,7 @@ export default {
         })
         .catch(() => {
           this.isResolving = false;
-          const msg = __(
-            'Something went wrong while resolving this discussion. Please try again.',
-          );
+          const msg = __('Something went wrong while resolving this discussion. Please try again.');
           Flash(msg, 'alert', this.$el);
         });
     },
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
index ab7d2d41ece..5f608899f96 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
@@ -46,9 +46,7 @@ export default {
     },
     errorMessage() {
       return sprintf(
-        s__(
-          'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}',
-        ),
+        s__('ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}'),
         { error: this.gapiError },
       );
     },
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
index 25350ef0fa9..072bdee87d9 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
@@ -75,15 +75,11 @@ export default {
     errorMessage() {
       if (!this.projectHasBillingEnabled) {
         if (this.gapiError) {
-          return s__(
-            'ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again.',
-          );
+          return s__('ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again.');
         }
 
         return sprintf(
-          s__(
-            'This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target="_blank" rel="noopener noreferrer">enable billing <i class="fa fa-external-link" aria-hidden="true"></i></a> and try again.',
-          ),
+          s__('This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target="_blank" rel="noopener noreferrer">enable billing <i class="fa fa-external-link" aria-hidden="true"></i></a> and try again.'),
           {
             linkToBilling:
               'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral',
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js
index 2a1c0819916..5d24af8220f 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js
@@ -1,8 +1,6 @@
 import { s__ } from '~/locale';
 
-export const GCP_API_ERROR = s__(
-  'ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later.',
-);
+export const GCP_API_ERROR = s__('ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later.');
 export const GCP_API_CLOUD_BILLING_ENDPOINT =
   'https://www.googleapis.com/discovery/v1/apis/cloudbilling/v1/rest';
 export const GCP_API_CLOUD_RESOURCE_MANAGER_ENDPOINT =
diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
index 3f6e2f05396..4b5b95e678b 100644
--- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
@@ -57,9 +57,7 @@ export default {
         .then(() => location.reload())
         .catch(() => {
           Flash(
-            __(
-              'Something went wrong trying to change the confidentiality of this issue',
-            ),
+            __('Something went wrong trying to change the confidentiality of this issue'),
           );
         });
     },
diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form.vue
index 4165aa19acf..104cde09c6b 100644
--- a/app/assets/javascripts/sidebar/components/confidential/edit_form.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/edit_form.vue
@@ -18,14 +18,10 @@ export default {
   },
   computed: {
     confidentialityOnWarning() {
-      return s__(
-        'confidentiality|You are going to turn on the confidentiality. This means that only team members with <strong>at least Reporter access</strong> are able to see and leave comments on the issue.',
-      );
+      return s__('confidentiality|You are going to turn on the confidentiality. This means that only team members with <strong>at least Reporter access</strong> are able to see and leave comments on the issue.');
     },
     confidentialityOffWarning() {
-      return s__(
-        'confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue.',
-      );
+      return s__('confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue.');
     },
   },
 };
diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form.vue b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
index d392977e5e2..750e93129c1 100644
--- a/app/assets/javascripts/sidebar/components/lock/edit_form.vue
+++ b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
@@ -22,17 +22,13 @@ export default {
   computed: {
     lockWarning() {
       return sprintf(
-        __(
-          'Lock this %{issuableDisplayName}? Only <strong>project members</strong> will be able to comment.',
-        ),
+        __('Lock this %{issuableDisplayName}? Only <strong>project members</strong> will be able to comment.'),
         { issuableDisplayName: this.issuableDisplayName },
       );
     },
     unlockWarning() {
       return sprintf(
-        __(
-          'Unlock this %{issuableDisplayName}? <strong>Everyone</strong> will be able to comment.',
-        ),
+        __('Unlock this %{issuableDisplayName}? <strong>Everyone</strong> will be able to comment.'),
         { issuableDisplayName: this.issuableDisplayName },
       );
     },
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 035a2275d9f..68275e4130b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-29 09:43-0500\n"
-"PO-Revision-Date: 2018-05-29 09:43-0500\n"
+"POT-Creation-Date: 2018-06-01 02:56-0500\n"
+"PO-Revision-Date: 2018-06-01 02:56-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -193,6 +193,9 @@ msgstr ""
 msgid "404|Please contact your GitLab administrator if you think this is a mistake."
 msgstr ""
 
+msgid "<strong>%{changedFilesLength} unstaged</strong> and <strong>%{stagedFilesLength} staged</strong> changes"
+msgstr ""
+
 msgid "<strong>Removes</strong> source branch"
 msgstr ""
 
@@ -610,13 +613,13 @@ msgstr ""
 msgid "Badges|This project has no badges"
 msgstr ""
 
-msgid "Badges|Your badges"
+msgid "Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored."
 msgstr ""
 
-msgid "Begin with the selected commit"
+msgid "Badges|Your badges"
 msgstr ""
 
-msgid "Blame"
+msgid "Begin with the selected commit"
 msgstr ""
 
 msgid "Branch (%{branch_count})"
@@ -993,6 +996,9 @@ msgstr ""
 msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
 msgstr ""
 
+msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}."
+msgstr ""
+
 msgid "ClusterIntegration|API URL"
 msgstr ""
 
@@ -1005,12 +1011,21 @@ msgstr ""
 msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration"
 msgstr ""
 
+msgid "ClusterIntegration|After installing Ingress, you will need to point your wildcard DNS at the generated external IP address in order to view your app after it is deployed. %{ingressHelpLink}"
+msgstr ""
+
 msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}"
 msgstr ""
 
 msgid "ClusterIntegration|An error occured while trying to fetch your projects: %{error}"
 msgstr ""
 
+msgid "ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}"
+msgstr ""
+
+msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later."
+msgstr ""
+
 msgid "ClusterIntegration|Applications"
 msgstr ""
 
@@ -1107,6 +1122,9 @@ msgstr ""
 msgid "ClusterIntegration|Install"
 msgstr ""
 
+msgid "ClusterIntegration|Install applications on your Kubernetes cluster. Read more about %{helpLink}"
+msgstr ""
+
 msgid "ClusterIntegration|Installed"
 msgstr ""
 
@@ -1209,6 +1227,9 @@ msgstr ""
 msgid "ClusterIntegration|Prometheus"
 msgstr ""
 
+msgid "ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications."
+msgstr ""
+
 msgid "ClusterIntegration|Read our %{link_to_help_page} on Kubernetes cluster integration."
 msgstr ""
 
@@ -1299,6 +1320,9 @@ msgstr ""
 msgid "ClusterIntegration|Validating project billing status"
 msgstr ""
 
+msgid "ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again."
+msgstr ""
+
 msgid "ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
 msgstr ""
 
@@ -1558,6 +1582,9 @@ msgstr ""
 msgid "Copy reference to clipboard"
 msgstr ""
 
+msgid "Copy to clipboard"
+msgstr ""
+
 msgid "Create"
 msgstr ""
 
@@ -2276,6 +2303,9 @@ msgstr ""
 msgid "GroupsEmptyState|You can manage your group member’s permissions and access to each project in the group."
 msgstr ""
 
+msgid "GroupsTree|Are you sure you want to leave the \"${ group.fullName }\" group?"
+msgstr ""
+
 msgid "GroupsTree|Create a project in this group."
 msgstr ""
 
@@ -2350,6 +2380,9 @@ msgstr ""
 msgid "IDE|Go back"
 msgstr ""
 
+msgid "IDE|Open in file view"
+msgstr ""
+
 msgid "IDE|Review"
 msgstr ""
 
@@ -2574,6 +2607,9 @@ msgstr ""
 msgid "Lock not found"
 msgstr ""
 
+msgid "Lock this %{issuableDisplayName}? Only <strong>project members</strong> will be able to comment."
+msgstr ""
+
 msgid "Lock to current projects"
 msgstr ""
 
@@ -2984,9 +3020,6 @@ msgstr ""
 msgid "Performance optimization"
 msgstr ""
 
-msgid "Permalink"
-msgstr ""
-
 msgid "Permissions"
 msgstr ""
 
@@ -3416,9 +3449,6 @@ msgstr ""
 msgid "Quick actions can be used in the issues description and comment boxes."
 msgstr ""
 
-msgid "Raw"
-msgstr ""
-
 msgid "Read more"
 msgstr ""
 
@@ -3741,9 +3771,15 @@ msgstr ""
 msgid "Something went wrong on our end."
 msgstr ""
 
+msgid "Something went wrong trying to change the confidentiality of this issue"
+msgstr ""
+
 msgid "Something went wrong when toggling the button"
 msgstr ""
 
+msgid "Something went wrong while closing the %{issuable}. Please try again later"
+msgstr ""
+
 msgid "Something went wrong while fetching the latest pipeline status."
 msgstr ""
 
@@ -3753,6 +3789,12 @@ msgstr ""
 msgid "Something went wrong while fetching the registry list."
 msgstr ""
 
+msgid "Something went wrong while reopening the %{issuable}. Please try again later"
+msgstr ""
+
+msgid "Something went wrong while resolving this discussion. Please try again."
+msgstr ""
+
 msgid "Something went wrong. Please try again."
 msgstr ""
 
@@ -3870,6 +3912,9 @@ msgstr ""
 msgid "Specify the following URL during the Runner setup:"
 msgstr ""
 
+msgid "Squash commits"
+msgstr ""
+
 msgid "Stage all"
 msgstr ""
 
@@ -4208,6 +4253,9 @@ msgstr ""
 msgid "This project does not belong to a group and can therefore not make use of group Runners."
 msgstr ""
 
+msgid "This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target=\"_blank\" rel=\"noopener noreferrer\">enable billing <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a> and try again."
+msgstr ""
+
 msgid "This repository"
 msgstr ""
 
@@ -4440,6 +4488,9 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
+msgid "Unlock this %{issuableDisplayName}? <strong>Everyone</strong> will be able to comment."
+msgstr ""
+
 msgid "Unlocked"
 msgstr ""
 
@@ -4851,6 +4902,12 @@ msgstr ""
 msgid "command line instructions"
 msgstr ""
 
+msgid "confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue."
+msgstr ""
+
+msgid "confidentiality|You are going to turn on the confidentiality. This means that only team members with <strong>at least Reporter access</strong> are able to see and leave comments on the issue."
+msgstr ""
+
 msgid "connecting"
 msgstr ""