Resolve conflict in locale/gitlab.pot

Signed-off-by: Rémy Coutable <remy@rymai.me>

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-03-27 14:40+0300\n"
-"PO-Revision-Date: 2018-03-27 14:40+0300\n"
+"POT-Creation-Date: 2018-03-30 17:57+0200\n"
+"PO-Revision-Date: 2018-03-30 17:57+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -148,6 +148,9 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
+msgid "Account and limit settings"
+msgstr ""
+
 msgid "Active"
 msgstr ""
 
@@ -385,6 +388,12 @@ msgstr ""
 msgid "Assign to"
 msgstr ""
 
+msgid "Assigned Issues"
+msgstr ""
+
+msgid "Assigned Merge Requests"
+msgstr ""
+
 msgid "Assigned to :name"
 msgstr ""
 
@@ -412,6 +421,9 @@ msgstr ""
 msgid "Auto DevOps enabled"
 msgstr ""
 
+msgid "Auto DevOps, runners amd job artifacts"
+msgstr ""
+
 msgid "Auto Review Apps and Auto Deploy need a %{kubernetes} to work correctly."
 msgstr ""
 
@@ -1285,6 +1297,9 @@ msgstr ""
 msgid "Confidentiality"
 msgstr ""
 
+msgid "Configure the way a user creates a new account."
+msgstr ""
+
 msgid "Connect"
 msgstr ""
 
@@ -1345,6 +1360,9 @@ msgstr ""
 msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images."
 msgstr ""
 
+msgid "Continuous Integration and Deployment"
+msgstr ""
+
 msgid "Contribution"
 msgstr ""
 
@@ -1414,16 +1432,10 @@ msgstr ""
 msgid "Create empty repository"
 msgstr ""
 
-msgid "Create file"
-<<<<<<< HEAD
-msgstr ""
-
 msgid "Create epic"
 msgstr ""
 
 msgid "Create file"
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Create group label"
@@ -1471,12 +1483,9 @@ msgstr ""
 msgid "Creates a new branch from %{branchName} and re-directs to create a new merge request"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Creating epic"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Cron Timezone"
 msgstr ""
 
@@ -1560,7 +1569,6 @@ msgstr ""
 msgid "Directory name"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Disable"
 msgstr ""
 
@@ -1570,11 +1578,6 @@ msgstr ""
 msgid "Discover GitLab Geo."
 msgstr ""
 
-=======
-msgid "Discard draft"
-msgstr ""
-
->>>>>>> upstream/master
 msgid "Dismiss Cycle Analytics introduction box"
 msgstr ""
 
@@ -1641,6 +1644,12 @@ msgstr ""
 msgid "Enable Auto DevOps"
 msgstr ""
 
+msgid "Enable and configure InfluxDB metrics."
+msgstr ""
+
+msgid "Enable and configure Prometheus metrics."
+msgstr ""
+
 msgid "Enable classification control using an external service"
 msgstr ""
 
@@ -1692,7 +1701,6 @@ msgstr ""
 msgid "Environments|You don't have any environments right now."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Epic will be removed! Are you sure?"
 msgstr ""
 
@@ -1705,20 +1713,15 @@ msgstr ""
 msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Error checking branch data. Please try again."
 msgstr ""
 
 msgid "Error committing changes. Please try again."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Error creating epic"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Error fetching contributors data."
 msgstr ""
 
@@ -1964,15 +1967,9 @@ msgstr ""
 msgid "GeoNodes|Replication slot WAL:"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "GeoNodes|Replication slots:"
 msgstr ""
 
-=======
->>>>>>> upstream/master
-msgid "GroupsTree|Create a project in this group."
-msgstr ""
-
 msgid "GeoNodes|Repositories checksummed:"
 msgstr ""
 
@@ -2018,17 +2015,6 @@ msgstr ""
 msgid "GeoNodes|Wiki checksums verified:"
 msgstr ""
 
-msgid "Help"
-msgstr ""
-
-msgid "Help"
-msgstr ""
-
-msgid "Hide value"
-msgid_plural "Hide values"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "GeoNodes|Wikis checksummed:"
 msgstr ""
 
@@ -2077,6 +2063,9 @@ msgstr ""
 msgid "GitHub import"
 msgstr ""
 
+msgid "GitLab CI Linter has been moved"
+msgstr ""
+
 msgid "GitLab Runner section"
 msgstr ""
 
@@ -2203,6 +2192,12 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+msgid "Help page"
+msgstr ""
+
+msgid "Help page text and support page url."
+msgstr ""
+
 msgid "Hide value"
 msgid_plural "Hide values"
 msgstr[0] ""
@@ -2372,10 +2367,10 @@ msgstr ""
 msgid "Labels can be applied to issues and merge requests to categorize them."
 msgstr ""
 
-msgid "Labels|Promote Label"
+msgid "Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>"
 msgstr ""
 
-msgid "Labels|Promote label %{labelTitle} to Group Label?"
+msgid "Labels|Promote Label"
 msgstr ""
 
 msgid "Last %d day"
@@ -2467,12 +2462,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-<<<<<<< HEAD
 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 ""
 
@@ -2527,6 +2519,12 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+msgid "Metrics - Influx"
+msgstr ""
+
+msgid "Metrics - Prometheus"
+msgstr ""
+
 msgid "Metrics|Business"
 msgstr ""
 
@@ -2617,6 +2615,9 @@ msgstr ""
 msgid "Milestones|Promote Milestone"
 msgstr ""
 
+msgid "Milestones|This action cannot be reversed."
+msgstr ""
+
 msgid "MissingSSHKeyWarningLink|add an SSH key"
 msgstr ""
 
@@ -2886,6 +2887,9 @@ msgstr ""
 msgid "Owner"
 msgstr ""
 
+msgid "Pages"
+msgstr ""
+
 msgid "Pagination|Last »"
 msgstr ""
 
@@ -3446,15 +3450,12 @@ msgstr ""
 msgid "Reviewing"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Roadmap"
 msgstr ""
 
 msgid "Run CI/CD pipelines for external repositories"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Runners"
 msgstr ""
 
@@ -3554,9 +3555,18 @@ msgstr ""
 msgid "Service URL"
 msgstr ""
 
+msgid "Session expiration, projects limit and attachment size."
+msgstr ""
+
 msgid "Set a password on your account to pull or push via %{protocol}."
 msgstr ""
 
+msgid "Set default and restrict visibility levels. Configure import sources and git access protocol."
+msgstr ""
+
+msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication."
+msgstr ""
+
 msgid "Set up CI/CD"
 msgstr ""
 
@@ -3607,12 +3617,24 @@ msgstr ""
 msgid "Sidebar|Weight"
 msgstr ""
 
+msgid "Sign-in restrictions"
+msgstr ""
+
+msgid "Sign-up restrictions"
+msgstr ""
+
+msgid "Size and domain settings for static websites"
+msgstr ""
+
 msgid "Snippets"
 msgstr ""
 
 msgid "Something went wrong on our end"
 msgstr ""
 
+msgid "Something went wrong on our end."
+msgstr ""
+
 msgid "Something went wrong trying to change the confidentiality of this issue"
 msgstr ""
 
@@ -3622,27 +3644,18 @@ msgstr ""
 msgid "Something went wrong when toggling the button"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Something went wrong while fetching Dependency Scanning."
 msgstr ""
 
-=======
->>>>>>> upstream/master
-msgid "Something went wrong while fetching the projects."
-msgstr ""
-
 msgid "Something went wrong while fetching SAST."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Something went wrong while fetching the projects."
 msgstr ""
 
 msgid "Something went wrong while fetching the registry list."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Something went wrong. Please try again."
 msgstr ""
 
@@ -3766,6 +3779,12 @@ msgstr ""
 msgid "StarProject|Star"
 msgstr ""
 
+msgid "Starred Projects"
+msgstr ""
+
+msgid "Starred Projects' Activity"
+msgstr ""
+
 msgid "Starred projects"
 msgstr ""
 
@@ -3993,6 +4012,9 @@ msgstr ""
 msgid "There are problems accessing Git storage: "
 msgstr ""
 
+msgid "There was an error loading results"
+msgstr ""
+
 msgid "There was an error loading users activity calendar."
 msgstr ""
 
@@ -4264,6 +4286,9 @@ msgstr ""
 msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
 msgstr ""
 
+msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
+msgstr ""
+
 msgid "To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown."
 msgstr ""
 
@@ -4354,12 +4379,9 @@ msgstr ""
 msgid "Upvotes"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Use the following registration token during setup:"
 msgstr ""
 
@@ -4372,12 +4394,9 @@ msgstr ""
 msgid "View and edit lines"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "View epics list"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "View file @ "
 msgstr ""
 
@@ -4396,6 +4415,9 @@ msgstr ""
 msgid "View replaced file @ "
 msgstr ""
 
+msgid "Visibility and access controls"
+msgstr ""
+
 msgid "VisibilityLevel|Internal"
 msgstr ""
 
@@ -4423,7 +4445,6 @@ msgstr ""
 msgid "Web IDE"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
 msgstr ""
 
@@ -4433,8 +4454,6 @@ msgstr ""
 msgid "When leaving the URL blank, classification labels can still be specified whitout disabling cross project features or performing external authorization checks."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Wiki"
 msgstr ""
 
@@ -4645,9 +4664,21 @@ msgstr ""
 msgid "You're receiving this email because of your account on %{host}. %{manage_notifications_link} &middot; %{help_link}"
 msgstr ""
 
+msgid "Your Groups"
+msgstr ""
+
 msgid "Your Kubernetes cluster information on this page is still editable, but you are advised to disable and reconfigure"
 msgstr ""
 
+msgid "Your Projects (default)"
+msgstr ""
+
+msgid "Your Projects' Activity"
+msgstr ""
+
+msgid "Your Todos"
+msgstr ""
+
 msgid "Your changes can be committed to %{branch_name} because a merge request is open."
 msgstr ""
 
@@ -4669,6 +4700,11 @@ msgstr ""
 msgid "among other things"
 msgstr ""
 
+msgid "and %d fixed vulnerability"
+msgid_plural "and %d fixed vulnerabilities"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "assign yourself"
 msgstr ""
 
@@ -4678,6 +4714,12 @@ msgstr ""
 msgid "by"
 msgstr ""
 
+msgid "ciReport|%{type} detected no new security vulnerabilities"
+msgstr ""
+
+msgid "ciReport|%{type} detected no security vulnerabilities"
+msgstr ""
+
 msgid "ciReport|Code quality"
 msgstr ""
 
@@ -4735,6 +4777,12 @@ msgstr ""
 msgid "ciReport|SAST:container no vulnerabilities were found"
 msgstr ""
 
+msgid "ciReport|Security scanning"
+msgstr ""
+
+msgid "ciReport|Security scanning failed loading any results"
+msgstr ""
+
 msgid "ciReport|Show complete code vulnerabilities report"
 msgstr ""
 
@@ -4764,6 +4812,19 @@ msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "detected %d fixed vulnerability"
+msgid_plural "detected %d fixed vulnerabilities"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "detected %d new vulnerability"
+msgid_plural "detected %d new vulnerabilities"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "detected no vulnerabilities"
+msgstr ""
+
 msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
 msgstr ""
 
@@ -4773,6 +4834,9 @@ msgstr ""
 msgid "importing"
 msgstr ""
 
+msgid "in progress"
+msgstr ""
+
 msgid "is invalid because there is downstream lock"
 msgstr ""