Commit d7e3a946 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Fix conflicts in `locale/gitlab.pot`

parent 1a526645
......@@ -8,13 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2018-05-03 10:13+0200\n"
"PO-Revision-Date: 2018-05-03 10:13+0200\n"
=======
"POT-Creation-Date: 2018-05-02 22:28+0200\n"
"PO-Revision-Date: 2018-05-02 22:28+0200\n"
>>>>>>> upstream/master
"POT-Creation-Date: 2018-05-04 17:37+0200\n"
"PO-Revision-Date: 2018-05-04 17:37+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -71,6 +66,16 @@ msgid_plural "%d metrics"
msgstr[0] ""
msgstr[1] ""
msgid "%d staged change"
msgid_plural "%d staged changes"
msgstr[0] ""
msgstr[1] ""
msgid "%d unstaged change"
msgid_plural "%d unstaged changes"
msgstr[0] ""
msgstr[1] ""
msgid "%d vulnerability"
msgid_plural "%d vulnerabilities"
msgstr[0] ""
......@@ -124,14 +129,14 @@ msgstr ""
msgid "%{title} changes"
msgstr ""
<<<<<<< HEAD
msgid "%{type} detected %d vulnerability"
msgid_plural "%{type} detected %d vulnerabilities"
msgstr[0] ""
msgstr[1] ""
=======
>>>>>>> upstream/master
msgid "%{unstaged} unstaged and %{staged} staged changes"
msgstr ""
msgid "(checkout the %{link} for information on how to install it)."
msgstr ""
......@@ -214,12 +219,9 @@ msgstr ""
msgid "Accept terms"
msgstr ""
<<<<<<< HEAD
msgid "Accepted MR"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Access Tokens"
msgstr ""
......@@ -882,12 +884,9 @@ msgstr ""
msgid "CI/CD configuration"
msgstr ""
<<<<<<< HEAD
msgid "CI/CD for external repo"
msgstr ""
=======
>>>>>>> upstream/master
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
msgstr ""
......@@ -1744,20 +1743,13 @@ msgstr ""
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr ""
<<<<<<< HEAD
msgid "Creating epic"
=======
msgid "Cron Timezone"
msgstr ""
msgid "Cron syntax"
>>>>>>> upstream/master
msgstr ""
msgid "CurrentUser|Profile"
msgid "Cron Timezone"
msgstr ""
msgid "CurrentUser|Settings"
msgid "Cron syntax"
msgstr ""
msgid "Current node"
......@@ -1817,12 +1809,9 @@ msgstr ""
msgid "Decline and sign out"
msgstr ""
<<<<<<< HEAD
msgid "Default classification label"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Define a custom pattern with cron syntax"
msgstr ""
......@@ -1927,12 +1916,9 @@ msgstr ""
msgid "Directory name"
msgstr ""
<<<<<<< HEAD
msgid "Disable"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Discard changes"
msgstr ""
......@@ -1945,15 +1931,12 @@ msgstr ""
msgid "Dismiss Cycle Analytics introduction box"
msgstr ""
<<<<<<< HEAD
msgid "Dismiss Merge Request promotion"
msgstr ""
msgid "Documentation for popular identity providers"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Domain"
msgstr ""
......@@ -2538,10 +2521,6 @@ msgstr ""
msgid "Group ID"
msgstr ""
<<<<<<< HEAD
msgid "GroupRoadmap|Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr ""
msgid "GroupRoadmap|From %{dateWord}"
msgstr ""
......@@ -2551,14 +2530,21 @@ msgstr ""
msgid "GroupRoadmap|Something went wrong while fetching epics"
msgstr ""
msgid "GroupRoadmap|Sorry, no epics matched your search"
msgstr ""
msgid "GroupRoadmap|The roadmap shows the progress of your epics along a timeline"
msgstr ""
msgid "GroupRoadmap|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 &ndash; from %{startDate} to %{endDate}."
msgstr ""
msgid "GroupRoadmap|To widen your search, change or remove filters. Only epics in the past 3 months and the next 3 months are shown &ndash; from %{startDate} to %{endDate}."
msgstr ""
msgid "GroupRoadmap|Until %{dateWord}"
msgstr ""
=======
>>>>>>> upstream/master
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
msgstr ""
......@@ -2696,7 +2682,6 @@ msgstr ""
msgid "Import repository"
msgstr ""
<<<<<<< HEAD
msgid "ImportButtons|Connect repositories from"
msgstr ""
......@@ -2709,8 +2694,6 @@ msgstr ""
msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
msgstr ""
=======
>>>>>>> upstream/master
msgid "Include a Terms of Service agreement that all users must accept."
msgstr ""
......@@ -2982,12 +2965,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 ""
......@@ -3138,12 +3118,9 @@ msgstr ""
msgid "Move issue"
msgstr ""
<<<<<<< HEAD
msgid "Multiple issue boards"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Name"
msgstr ""
......@@ -4043,12 +4020,9 @@ msgstr ""
msgid "Resolve discussion"
msgstr ""
<<<<<<< HEAD
msgid "Response metrics (Custom)"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Retry"
msgstr ""
......@@ -4093,6 +4067,12 @@ msgstr ""
msgid "Running"
msgstr ""
msgid "SAML SSO"
msgstr ""
msgid "SAML SSO for %{group_name}"
msgstr ""
msgid "SAML Single Sign On"
msgstr ""
......@@ -4132,6 +4112,9 @@ msgstr ""
msgid "Search"
msgstr ""
msgid "Search branches"
msgstr ""
msgid "Search branches and tags"
msgstr ""
......@@ -4177,6 +4160,9 @@ msgstr ""
msgid "Select branch/tag"
msgstr ""
msgid "Select source branch"
msgstr ""
msgid "Select target branch"
msgstr ""
......@@ -4266,7 +4252,6 @@ msgid_plural "Showing %d events"
msgstr[0] ""
msgstr[1] ""
<<<<<<< HEAD
msgid "Sidebar|Change weight"
msgstr ""
......@@ -4279,8 +4264,12 @@ msgstr ""
msgid "Sidebar|Weight"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Sign in to %{group_name}"
msgstr ""
msgid "Sign in with Single Sign-On"
msgstr ""
msgid "Sign out"
msgstr ""
......@@ -4320,6 +4309,9 @@ msgstr ""
msgid "Something went wrong. Please try again."
msgstr ""
msgid "Sorry, no epics matched your search"
msgstr ""
msgid "Sort by"
msgstr ""
......@@ -4601,15 +4593,12 @@ msgstr ""
msgid "Terms of Service Agreement"
msgstr ""
<<<<<<< HEAD
msgid "Thanks! Don't show me this again"
msgstr ""
msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
msgstr ""
=======
>>>>>>> upstream/master
msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"
msgstr ""
......@@ -4736,6 +4725,9 @@ msgstr ""
msgid "This directory"
msgstr ""
msgid "This group allows you to sign in with your %{group_name} Single Sign-On account. This will redirect you to an external sign in page."
msgstr ""
msgid "This is a confidential issue."
msgstr ""
......@@ -4811,15 +4803,12 @@ msgstr ""
msgid "Time between merge request creation and merge/close"
msgstr ""
<<<<<<< HEAD
msgid "Time between updates and capacity settings."
msgstr ""
msgid "Time in seconds GitLab will wait for a response from the external service. When the service does not respond in time, access will be denied."
msgstr ""
=======
>>>>>>> upstream/master
msgid "Time remaining"
msgstr ""
......@@ -5016,6 +5005,9 @@ 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 ""
msgid "To widen your search, change or remove filters. If something is missing, create an epic."
msgstr ""
msgid "Todo"
msgstr ""
......@@ -5058,7 +5050,6 @@ msgstr ""
msgid "Try again"
msgstr ""
<<<<<<< HEAD
msgid "Turn on Service Desk"
msgstr ""
......@@ -5068,11 +5059,6 @@ msgstr ""
msgid "Unknown"
msgstr ""
=======
msgid "Unable to load the diff. %{button_try_again}"
msgstr ""
>>>>>>> upstream/master
msgid "Unlock"
msgstr ""
......@@ -5232,7 +5218,6 @@ msgstr ""
msgid "Web terminal"
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 ""
......@@ -5245,14 +5230,9 @@ msgstr ""
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
msgstr ""
msgid "When leaving the URL blank, classification labels can still be specified whitout disabling cross project features or performing external authorization checks."
msgstr ""
=======
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks."
msgstr ""
>>>>>>> upstream/master
msgid "Wiki"
msgstr ""
......@@ -5653,7 +5633,6 @@ msgstr[1] ""
msgid "deploy token"
msgstr ""
<<<<<<< HEAD
msgid "detected %d fixed vulnerability"
msgid_plural "detected %d fixed vulnerabilities"
msgstr[0] ""
......@@ -5667,8 +5646,6 @@ msgstr[1] ""
msgid "detected no vulnerabilities"
msgstr ""
=======
>>>>>>> upstream/master
msgid "disabled"
msgstr ""
......@@ -5913,12 +5890,9 @@ msgstr ""
msgid "personal access token"
msgstr ""
<<<<<<< HEAD
msgid "private key does not match certificate."
msgstr ""
=======
>>>>>>> upstream/master
msgid "remaining"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment