Commit 981d27c1 authored by Dylan Griffith's avatar Dylan Griffith

Resolve conflicts in locale/gitlab.pot by regenerating

parent 2ad0f22d
......@@ -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-04 17:37+0200\n"
"PO-Revision-Date: 2018-05-04 17:37+0200\n"
=======
"POT-Creation-Date: 2018-05-09 09:24+0200\n"
"PO-Revision-Date: 2018-05-09 09:24+0200\n"
>>>>>>> upstream/master
"POT-Creation-Date: 2018-05-09 14:38+0200\n"
"PO-Revision-Date: 2018-05-09 14:38+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -392,6 +387,9 @@ msgstr ""
msgid "An error occurred while detecting host keys"
msgstr ""
msgid "An error occurred while dismissing the alert. Refresh the page and try again."
msgstr ""
msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
msgstr ""
......@@ -449,6 +447,12 @@ msgstr ""
msgid "An error occurred while saving assignees"
msgstr ""
msgid "An error occurred while subscribing to notifications."
msgstr ""
msgid "An error occurred while unsubscribing to notifications."
msgstr ""
msgid "An error occurred while validating username"
msgstr ""
......@@ -491,14 +495,13 @@ msgstr ""
msgid "Artifacts"
msgstr ""
<<<<<<< HEAD
msgid "Ascending"
msgstr ""
msgid "Assertion consumer service URL"
=======
msgid "Ask your group master to setup a group Runner."
>>>>>>> upstream/master
msgstr ""
msgid "Assertion consumer service URL"
msgstr ""
msgid "Assign custom color like #FF0000"
......@@ -908,11 +911,10 @@ msgstr ""
msgid "CI/CD configuration"
msgstr ""
<<<<<<< HEAD
msgid "CI/CD for external repo"
=======
msgstr ""
msgid "CI/CD settings"
>>>>>>> upstream/master
msgstr ""
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
......@@ -1236,6 +1238,9 @@ msgstr ""
msgid "ClusterIntegration|Environment scope"
msgstr ""
msgid "ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's Google Kubernetes Engine Integration."
msgstr ""
msgid "ClusterIntegration|GitLab Integration"
msgstr ""
......@@ -1371,6 +1376,9 @@ msgstr ""
msgid "ClusterIntegration|Read our %{link_to_help_page} on Kubernetes cluster integration."
msgstr ""
msgid "ClusterIntegration|Redeem up to $500 in free credit for Google Cloud Platform"
msgstr ""
msgid "ClusterIntegration|Remove Kubernetes cluster integration"
msgstr ""
......@@ -1461,6 +1469,9 @@ msgstr ""
msgid "ClusterIntegration|properly configured"
msgstr ""
msgid "ClusterIntegration|sign up"
msgstr ""
msgid "Collapse"
msgstr ""
......@@ -1585,6 +1596,9 @@ msgstr ""
msgid "Configure limits for web and API requests."
msgstr ""
msgid "Configure push and pull mirrors."
msgstr ""
msgid "Configure storage path and circuit breaker settings."
msgstr ""
......@@ -1738,6 +1752,9 @@ msgstr ""
msgid "Create group label"
msgstr ""
msgid "Create issue"
msgstr ""
msgid "Create lists from labels. Issues with that label appear in that list."
msgstr ""
......@@ -1774,6 +1791,9 @@ msgstr ""
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr ""
msgid "Created"
msgstr ""
msgid "Creating epic"
msgstr ""
......@@ -1857,6 +1877,54 @@ msgstr[1] ""
msgid "Deploy Keys"
msgstr ""
msgid "DeployKeys|+%{count} others"
msgstr ""
msgid "DeployKeys|Current project"
msgstr ""
msgid "DeployKeys|Deploy key"
msgstr ""
msgid "DeployKeys|Enabled deploy keys"
msgstr ""
msgid "DeployKeys|Error enabling deploy key"
msgstr ""
msgid "DeployKeys|Error getting deploy keys"
msgstr ""
msgid "DeployKeys|Error removing deploy key"
msgstr ""
msgid "DeployKeys|Expand %{count} other projects"
msgstr ""
msgid "DeployKeys|Loading deploy keys"
msgstr ""
msgid "DeployKeys|No deploy keys found. Create one with the form above."
msgstr ""
msgid "DeployKeys|Privately accessible deploy keys"
msgstr ""
msgid "DeployKeys|Project usage"
msgstr ""
msgid "DeployKeys|Publicly accessible deploy keys"
msgstr ""
msgid "DeployKeys|Read access only"
msgstr ""
msgid "DeployKeys|Write access allowed"
msgstr ""
msgid "DeployKeys|You are going to remove this deploy key. Are you sure?"
msgstr ""
msgid "DeployTokens|Active Deploy Tokens (%{active_tokens})"
msgstr ""
......@@ -1950,15 +2018,12 @@ msgstr ""
msgid "Disable"
msgstr ""
<<<<<<< HEAD
=======
msgid "Disable for this project"
msgstr ""
msgid "Disable group Runners"
msgstr ""
>>>>>>> upstream/master
msgid "Discard changes"
msgstr ""
......@@ -2019,11 +2084,10 @@ msgstr ""
msgid "Due date"
msgstr ""
<<<<<<< HEAD
msgid "During this process, you’ll be asked for URLs from GitLab’s side. Use the URLs shown below."
=======
msgstr ""
msgid "Each Runner can be in one of the following states:"
>>>>>>> upstream/master
msgstr ""
msgid "Edit"
......@@ -2035,9 +2099,6 @@ msgstr ""
msgid "Edit files in the editor and commit changes here"
msgstr ""
msgid "Editing"
msgstr ""
msgid "Elasticsearch"
msgstr ""
......@@ -2071,14 +2132,13 @@ msgstr ""
msgid "Enable and configure Prometheus metrics."
msgstr ""
<<<<<<< HEAD
msgid "Enable classification control using an external service"
=======
msgstr ""
msgid "Enable for this project"
msgstr ""
msgid "Enable group Runners"
>>>>>>> upstream/master
msgstr ""
msgid "Enable or disable version check and usage ping."
......@@ -2374,14 +2434,7 @@ msgstr ""
msgid "GeoNodes|Checksummed"
msgstr ""
<<<<<<< HEAD
msgid "GeoNodes|Data replication lag:"
=======
msgid "GitLab Group Runners can execute code for all the projects in this group."
msgstr ""
msgid "GitLab Runner section"
>>>>>>> upstream/master
msgid "GeoNodes|Data replication lag"
msgstr ""
msgid "GeoNodes|Disabling a node stops the sync process. Are you sure?"
......@@ -2396,47 +2449,43 @@ msgstr ""
msgid "GeoNodes|Full"
msgstr ""
msgid "GeoNodes|GitLab version does not match the primary node version"
msgid "GeoNodes|GitLab version"
msgstr ""
msgid "GeoNodes|GitLab version:"
msgid "GeoNodes|GitLab version does not match the primary node version"
msgstr ""
msgid "GeoNodes|Health status:"
msgid "GeoNodes|Health status"
msgstr ""
<<<<<<< HEAD
msgid "GeoNodes|Last event ID seen from primary:"
msgid "GeoNodes|Last event ID seen from primary"
msgstr ""
msgid "GeoNodes|Latest event log status:"
=======
msgid "Group CI/CD settings"
msgid "GeoNodes|Latest event log status"
msgstr ""
msgid "Group ID"
msgid "GeoNodes|Learn more about Repository checksum progress"
msgstr ""
msgid "Group Runners"
msgid "GeoNodes|Learn more about Repository verification"
msgstr ""
msgid "Group masters can register group runners in the %{link}"
msgid "GeoNodes|Learn more about Wiki checksum progress"
msgstr ""
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
>>>>>>> upstream/master
msgid "GeoNodes|Learn more about Wiki verification"
msgstr ""
msgid "GeoNodes|Loading nodes"
msgstr ""
msgid "GeoNodes|Local LFS objects:"
msgid "GeoNodes|Local LFS objects"
msgstr ""
msgid "GeoNodes|Local attachments:"
msgid "GeoNodes|Local attachments"
msgstr ""
msgid "GeoNodes|Local job artifacts:"
msgid "GeoNodes|Local job artifacts"
msgstr ""
msgid "GeoNodes|New node"
......@@ -2457,19 +2506,25 @@ msgstr ""
msgid "GeoNodes|Removing a node stops the sync process. Are you sure?"
msgstr ""
msgid "GeoNodes|Replication slot WAL:"
msgid "GeoNodes|Replication slot WAL"
msgstr ""
msgid "GeoNodes|Replication slots"
msgstr ""
msgid "GeoNodes|Replication slots:"
msgid "GeoNodes|Repositories"
msgstr ""
msgid "GeoNodes|Repositories:"
msgid "GeoNodes|Repositories checksummed for verification with their counterparts on Secondary nodes"
msgstr ""
msgid "GeoNodes|Repository checksums verified:"
msgid "GeoNodes|Repositories verified with their counterparts on the Primary node"
msgstr ""
msgid "GeoNodes|Repository verification progress:"
msgid "GeoNodes|Repository checksum progress"
msgstr ""
msgid "GeoNodes|Repository verification progress"
msgstr ""
msgid "GeoNodes|Selective"
......@@ -2487,10 +2542,10 @@ msgstr ""
msgid "GeoNodes|Something went wrong while repairing node"
msgstr ""
msgid "GeoNodes|Storage config:"
msgid "GeoNodes|Storage config"
msgstr ""
msgid "GeoNodes|Sync settings:"
msgid "GeoNodes|Sync settings"
msgstr ""
msgid "GeoNodes|Synced"
......@@ -2508,13 +2563,19 @@ msgstr ""
msgid "GeoNodes|Verified"
msgstr ""
msgid "GeoNodes|Wiki checksums verified:"
msgid "GeoNodes|Wiki checksum progress"
msgstr ""
msgid "GeoNodes|Wiki verification progress"
msgstr ""
msgid "GeoNodes|Wikis"
msgstr ""
msgid "GeoNodes|Wikis checksums calculated verifies:"
msgid "GeoNodes|Wikis checksummed for verification with their counterparts on Secondary nodes"
msgstr ""
msgid "GeoNodes|Wikis:"
msgid "GeoNodes|Wikis verified with their counterparts on the Primary node"
msgstr ""
msgid "GeoNodes|You have configured Geo nodes using an insecure HTTP connection. We recommend the use of HTTPS."
......@@ -2565,6 +2626,9 @@ msgstr ""
msgid "GitLab Geo"
msgstr ""
msgid "GitLab Group Runners can execute code for all the projects in this group."
msgstr ""
msgid "GitLab Runner section"
msgstr ""
......@@ -2592,9 +2656,18 @@ msgstr ""
msgid "Got it!"
msgstr ""
msgid "Group CI/CD settings"
msgstr ""
msgid "Group ID"
msgstr ""
msgid "Group Runners"
msgstr ""
msgid "Group masters can register group runners in the %{link}"
msgstr ""
msgid "GroupRoadmap|From %{dateWord}"
msgstr ""
......@@ -2726,6 +2799,18 @@ msgstr ""
msgid "Housekeeping successfully started"
msgstr ""
msgid "IDE|Commit"
msgstr ""
msgid "IDE|Edit"
msgstr ""
msgid "IDE|Go back"
msgstr ""
msgid "IDE|Review"
msgstr ""
msgid "Identity provider single sign on URL"
msgstr ""
......@@ -2934,6 +3019,9 @@ msgstr ""
msgid "LastPushEvent|at"
msgstr ""
msgid "Latest changes"
msgstr ""
msgid "Learn more"
msgstr ""
......@@ -2982,27 +3070,25 @@ msgstr ""
msgid "Lock %{issuableDisplayName}"
msgstr ""
<<<<<<< HEAD
msgid "Lock not found"
=======
msgstr ""
msgid "Lock to current projects"
>>>>>>> upstream/master
msgstr ""
msgid "Locked"
msgstr ""
<<<<<<< HEAD
msgid "Locked Files"
msgstr ""
msgid "Locks give the ability to lock specific file or folder."
=======
msgid "Locked to current projects"
msgstr ""
msgid "Locked to this project"
>>>>>>> upstream/master
msgstr ""
msgid "Locks give the ability to lock specific file or folder."
msgstr ""
msgid "Login"
......@@ -3271,11 +3357,10 @@ msgstr ""
msgid "New tag"
msgstr ""
<<<<<<< HEAD
msgid "No Label"
=======
msgid "No"
>>>>>>> upstream/master
msgstr ""
msgid "No Label"
msgstr ""
msgid "No assignee"
......@@ -3620,33 +3705,39 @@ msgstr ""
msgid "Pipelines|This project is not currently set up to run pipelines."
msgstr ""
msgid "Pipeline|Existing branch name, tag"
msgid "Pipeline|Create for"
msgstr ""
msgid "Pipeline|Retry pipeline"
msgid "Pipeline|Create pipeline"
msgstr ""
msgid "Pipeline|Retry pipeline #%{pipelineId}?"
msgid "Pipeline|Existing branch name or tag"
msgstr ""
msgid "Pipeline|Run Pipeline"
msgid "Pipeline|Retry pipeline"
msgstr ""
msgid "Pipeline|Run on"
msgid "Pipeline|Retry pipeline #%{pipelineId}?"
msgstr ""
msgid "Pipeline|Run pipeline"
msgid "Pipeline|Run Pipeline"
msgstr ""
msgid "Pipeline|Search branches"
msgstr ""
msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default."
msgstr ""
msgid "Pipeline|Stop pipeline"
msgstr ""
msgid "Pipeline|Stop pipeline #%{pipelineId}?"
msgstr ""
msgid "Pipeline|Variables"
msgstr ""
msgid "Pipeline|You’re about to retry pipeline %{pipelineId}."
msgstr ""
......@@ -4037,11 +4128,10 @@ msgstr ""
msgid "Register / Sign In"
msgstr ""
<<<<<<< HEAD
msgid "Registry"
=======
msgid "Register and see your runners for this group."
>>>>>>> upstream/master
msgstr ""
msgid "Registry"
msgstr ""
msgid "Related Commits"
......@@ -4071,12 +4161,9 @@ msgstr ""
msgid "Remove"
msgstr ""
<<<<<<< HEAD
=======
msgid "Remove Runner"
msgstr ""
>>>>>>> upstream/master
msgid "Remove avatar"
msgstr ""
......@@ -4125,11 +4212,10 @@ msgstr ""
msgid "Resolve discussion"
msgstr ""
<<<<<<< HEAD
msgid "Response metrics (Custom)"
=======
msgstr ""
msgid "Resume"
>>>>>>> upstream/master
msgstr ""
msgid "Retry"
......@@ -4347,6 +4433,9 @@ msgstr ""
msgid "Share the <strong>%{sso_label}</strong> with members so they can sign in to your group through your identity provider"
msgstr ""
msgid "Shared Runners"
msgstr ""
msgid "SharedRunnersMinutesSettings|By resetting the pipeline minutes for this namespace, the currently used minutes will be set to zero."
msgstr ""
......@@ -4356,9 +4445,6 @@ msgstr ""
msgid "SharedRunnersMinutesSettings|Reset used pipeline minutes"
msgstr ""
msgid "Shared Runners"
msgstr ""
msgid "Show command"
msgstr ""
......@@ -4843,24 +4929,22 @@ msgstr ""
msgid "There was an error when unsubscribing from this label."
msgstr ""
<<<<<<< HEAD
msgid "This board\\'s scope is reduced"
=======
msgid "They can be managed using the %{link}."
msgstr ""
msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
>>>>>>> upstream/master
msgstr ""
msgid "This board\\'s scope is reduced"
msgstr ""
msgid "This directory"
msgstr ""
<<<<<<< HEAD
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 group does not provide any group Runners yet."
>>>>>>> upstream/master
msgstr ""
msgid "This is a confidential issue."
......@@ -4911,6 +4995,9 @@ msgstr ""
msgid "This merge request is locked."
msgstr ""
msgid "This option is disabled while you still have unstaged changes"
msgstr ""
msgid "This page is unavailable because you are not allowed to read information across multiple projects."
msgstr ""
......@@ -4941,9 +5028,6 @@ msgstr ""
msgid "Time between merge request creation and merge/close"
msgstr ""
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 ""
......@@ -5131,14 +5215,13 @@ msgstr ""
msgid "To import an SVN repository, check out %{svn_link}."
msgstr ""
<<<<<<< HEAD
msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
msgstr ""
msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
=======
msgstr ""
msgid "To start serving your jobs you can add Runners to your group"
>>>>>>> upstream/master
msgstr ""
msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
......@@ -5303,9 +5386,6 @@ msgstr ""
msgid "Verified"
msgstr ""
msgid "View and edit lines"
msgstr ""
msgid "View epics list"
msgstr ""
......@@ -5315,6 +5395,9 @@ msgstr ""
msgid "View group labels"
msgstr ""
msgid "View issue"
msgstr ""
msgid "View labels"
msgstr ""
......@@ -5360,7 +5443,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 ""
......@@ -5368,9 +5450,9 @@ msgid "Weight"
msgstr ""
msgid "Weight %{weight}"
=======
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects"
>>>>>>> upstream/master
msgstr ""
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
......@@ -5675,6 +5757,9 @@ msgstr ""
msgid "ciReport|Code quality"
msgstr ""
msgid "ciReport|Confidence Level"
msgstr ""
msgid "ciReport|Container scanning detects known vulnerabilities in your docker images."
msgstr ""
......@@ -5702,15 +5787,27 @@ msgstr ""
msgid "ciReport|Dependency scanning resulted in error while loading results"
msgstr ""
msgid "ciReport|Description"
msgstr ""
msgid "ciReport|Dismiss vulnerability"
msgstr ""
msgid "ciReport|Dynamic Application Security Testing (DAST) detects known vulnerabilities in your web application."
msgstr ""
msgid "ciReport|Failed to load %{reportName} report"
msgstr ""
msgid "ciReport|File"
msgstr ""
msgid "ciReport|Fixed:"
msgstr ""
msgid "ciReport|Identifier"
msgstr ""
msgid "ciReport|Instances"
msgstr ""
......@@ -5720,6 +5817,9 @@ msgstr ""
msgid "ciReport|Loading %{reportName} report"
msgstr ""
msgid "ciReport|Namespace"
msgstr ""
msgid "ciReport|No changes to code quality"
msgstr ""
......@@ -5729,6 +5829,9 @@ msgstr ""
msgid "ciReport|Performance metrics"
msgstr ""
msgid "ciReport|Revert dismissal"
msgstr ""
msgid "ciReport|SAST detected"
msgstr ""
......@@ -5747,18 +5850,36 @@ msgstr ""
msgid "ciReport|Security scanning is loading"
msgstr ""
msgid "ciReport|Severity"
msgstr ""
msgid "ciReport|Show complete code vulnerabilities report"
msgstr ""
msgid "ciReport|Solution"
msgstr ""
msgid "ciReport|Source"
msgstr ""
msgid "ciReport|Static Application Security Testing (SAST) detects known vulnerabilities in your source code."
msgstr ""
msgid "ciReport|There was an error creating the issue. Please try again."
msgstr ""
msgid "ciReport|There was an error dismissing the vulnerability. Please try again."
msgstr ""
msgid "ciReport|There was an error loading SAST report"
msgstr ""
msgid "ciReport|There was an error loading dependency scanning report"
msgstr ""
msgid "ciReport|There was an error reverting the dismissal. Please try again."
msgstr ""
msgid "ciReport|Unapproved vulnerabilities (red) can be marked as approved."
msgstr ""
......@@ -5804,11 +5925,10 @@ msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr ""
<<<<<<< HEAD
msgid "here"
=======
msgid "for this project"
>>>>>>> upstream/master
msgstr ""
msgid "here"
msgstr ""
msgid "importing"
......
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