Regenerate `locale/gitlab.pot`

locale/gitlab.pot

@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2018-07-09 08:42+0200\n"
-"PO-Revision-Date: 2018-07-09 08:42+0200\n"
-=======
-"POT-Creation-Date: 2018-07-09 08:28+0200\n"
-"PO-Revision-Date: 2018-07-09 08:28+0200\n"
->>>>>>> upstream/master
+"POT-Creation-Date: 2018-07-09 15:51+0200\n"
+"PO-Revision-Date: 2018-07-09 15:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -2486,7 +2481,6 @@ msgstr ""
 msgid "Epic"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Epic will be removed! Are you sure?"
 msgstr ""
 
@@ -2508,11 +2502,6 @@ msgstr ""
 msgid "Error fetching contributors data."
 msgstr ""
 
-=======
-msgid "Error fetching contributors data."
-msgstr ""
-
->>>>>>> upstream/master
 msgid "Error fetching labels."
 msgstr ""
 
@@ -3312,12 +3301,9 @@ msgid "Introducing Cycle Analytics"
 msgstr ""
 
 msgid "Issue Boards"
-<<<<<<< HEAD
 msgstr ""
 
 msgid "Issue board focus mode"
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Issue events"
@@ -3532,15 +3518,12 @@ msgstr ""
 msgid "Locked to current projects"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Locks give the ability to lock specific file or folder."
 msgstr ""
 
 msgid "Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Manage all notifications"
 msgstr ""
 
@@ -3580,12 +3563,9 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Merge Request"
 msgstr ""
 
@@ -3736,46 +3716,12 @@ msgstr ""
 msgid "Metrics|e.g. Throughput"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Metrics|e.g. rate(http_requests_total[5m])"
-=======
-msgid "Metrics"
-msgstr ""
-
-msgid "Metrics - Influx"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Metrics|e.g. req/sec"
 msgstr ""
 
-msgid "Metrics|Check out the CI/CD documentation on deploying to an environment"
-msgstr ""
-
-msgid "Metrics|Environment"
-msgstr ""
-
-msgid "Metrics|Learn about environments"
-msgstr ""
-
-msgid "Metrics|No deployed environments"
-msgstr ""
-
-msgid "Metrics|There was an error fetching the environments data, please try again"
-msgstr ""
-
-msgid "Metrics|There was an error getting deployment information."
-msgstr ""
-
-msgid "Metrics|There was an error getting environments information."
-msgstr ""
-
-msgid "Metrics|Unexpected deployment data response from prometheus endpoint"
-msgstr ""
-
-msgid "Metrics|Unexpected metrics data response from prometheus endpoint"
-msgstr ""
-
 msgid "Milestone"
 msgstr ""
 
@@ -4117,12 +4063,9 @@ msgstr ""
 msgid "Oops, are you sure?"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Open"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Open in Xcode"
 msgstr ""
 
@@ -5707,15 +5650,12 @@ msgstr ""
 msgid "There are problems accessing Git storage: "
 msgstr ""
 
-<<<<<<< HEAD
 msgid "There was an error adding a todo."
 msgstr ""
 
 msgid "There was an error deleting the todo."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "There was an error loading users activity calendar."
 msgstr ""
 
@@ -7010,15 +6950,12 @@ msgstr ""
 msgid "mrWidget|Merged by"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "mrWidget|No Approval required"
 msgstr ""
 
 msgid "mrWidget|No Approval required; you can still approve"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "mrWidget|Open in Web IDE"
 msgstr ""