Skip to content

G
gitlab-ce
Commit d10aaa07 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve conflicts in locale/gitlab.pot

parent 0e3d90ea
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 95 deletions
locale/gitlab.pot
View file @ d10aaa07
...@@ -8,13 +8,8 @@ msgid "" ...@@ -8,13 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD "POT-Creation-Date: 2018-03-08 08:54+0100\n"
"POT-Creation-Date: 2018-03-05 14:35-0600\n" "PO-Revision-Date: 2018-03-08 08:54+0100\n"
"PO-Revision-Date: 2018-03-05 14:35-0600\n"
=======
"POT-Creation-Date: 2018-03-06 17:36+0100\n"
"PO-Revision-Date: 2018-03-06 17:36+0100\n"
>>>>>>> upstream/master
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -36,6 +31,11 @@ msgid_plural "%d commits behind" ...@@ -36,6 +31,11 @@ msgid_plural "%d commits behind"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "%d exporter"
msgid_plural "%d exporters"
msgstr[0] ""
msgstr[1] ""
msgid "%d issue" msgid "%d issue"
msgid_plural "%d issues" msgid_plural "%d issues"
msgstr[0] "" msgstr[0] ""
...@@ -51,6 +51,11 @@ msgid_plural "%d merge requests" ...@@ -51,6 +51,11 @@ msgid_plural "%d merge requests"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "%d metric"
msgid_plural "%d metrics"
msgstr[0] ""
msgstr[1] ""
msgid "%s additional commit has been omitted to prevent performance issues." msgid "%s additional commit has been omitted to prevent performance issues."
msgid_plural "%s additional commits have been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues."
msgstr[0] "" msgstr[0] ""
...@@ -67,11 +72,10 @@ msgid_plural "%{count} participants" ...@@ -67,11 +72,10 @@ msgid_plural "%{count} participants"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
<<<<<<< HEAD
msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
=======
msgid "%{loadingIcon} Started" msgid "%{loadingIcon} Started"
>>>>>>> upstream/master msgstr ""
msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
msgstr "" msgstr ""
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
...@@ -243,12 +247,9 @@ msgstr "" ...@@ -243,12 +247,9 @@ msgstr ""
msgid "Allows you to add and manage Kubernetes clusters." msgid "Allows you to add and manage Kubernetes clusters."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect." msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to connect."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
msgstr "" msgstr ""
...@@ -509,6 +510,9 @@ msgstr[1] "" ...@@ -509,6 +510,9 @@ msgstr[1] ""
msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}" msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}"
msgstr "" msgstr ""
msgid "Branch has changed"
msgstr ""
msgid "Branch is already taken" msgid "Branch is already taken"
msgstr "" msgstr ""
...@@ -605,14 +609,13 @@ msgstr "" ...@@ -605,14 +609,13 @@ msgstr ""
msgid "Branches|Sort by" msgid "Branches|Sort by"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart."
=======
msgid "Branches|Stale" msgid "Branches|Stale"
msgstr "" msgstr ""
msgid "Branches|Stale branches" msgid "Branches|Stale branches"
>>>>>>> upstream/master msgstr ""
msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart."
msgstr "" msgstr ""
msgid "Branches|The default branch cannot be deleted" msgid "Branches|The default branch cannot be deleted"
...@@ -678,6 +681,9 @@ msgstr "" ...@@ -678,6 +681,9 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
msgid "Cancel edit"
msgstr ""
msgid "Cannot modify managed Kubernetes cluster" msgid "Cannot modify managed Kubernetes cluster"
msgstr "" msgstr ""
...@@ -735,7 +741,6 @@ msgstr "" ...@@ -735,7 +741,6 @@ msgstr ""
msgid "Choose file..." msgid "Choose file..."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Choose which groups you wish to synchronize to this secondary node." msgid "Choose which groups you wish to synchronize to this secondary node."
msgstr "" msgstr ""
...@@ -748,11 +753,6 @@ msgstr "" ...@@ -748,11 +753,6 @@ msgstr ""
msgid "Choose which shards you wish to synchronize to this secondary node." msgid "Choose which shards you wish to synchronize to this secondary node."
msgstr "" msgstr ""
=======
msgid "Choose which repositories you want to import."
msgstr ""
>>>>>>> upstream/master
msgid "CiStatusLabel|canceled" msgid "CiStatusLabel|canceled"
msgstr "" msgstr ""
...@@ -858,12 +858,9 @@ msgstr "" ...@@ -858,12 +858,9 @@ msgstr ""
msgid "Close" msgid "Close"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster" msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
msgstr "" msgstr ""
...@@ -954,6 +951,9 @@ msgstr "" ...@@ -954,6 +951,9 @@ msgstr ""
msgid "ClusterIntegration|Helm Tiller" msgid "ClusterIntegration|Helm Tiller"
msgstr "" msgstr ""
msgid "ClusterIntegration|In order to show the health of the cluster, we'll need to provision your cluster with Prometheus to collect the required data."
msgstr ""
msgid "ClusterIntegration|Ingress" msgid "ClusterIntegration|Ingress"
msgstr "" msgstr ""
...@@ -963,6 +963,9 @@ msgstr "" ...@@ -963,6 +963,9 @@ msgstr ""
msgid "ClusterIntegration|Install" msgid "ClusterIntegration|Install"
msgstr "" msgstr ""
msgid "ClusterIntegration|Install Prometheus"
msgstr ""
msgid "ClusterIntegration|Installed" msgid "ClusterIntegration|Installed"
msgstr "" msgstr ""
...@@ -981,6 +984,9 @@ msgstr "" ...@@ -981,6 +984,9 @@ msgstr ""
msgid "ClusterIntegration|Kubernetes cluster details" msgid "ClusterIntegration|Kubernetes cluster details"
msgstr "" msgstr ""
msgid "ClusterIntegration|Kubernetes cluster health"
msgstr ""
msgid "ClusterIntegration|Kubernetes cluster integration" msgid "ClusterIntegration|Kubernetes cluster integration"
msgstr "" msgstr ""
...@@ -1014,6 +1020,9 @@ msgstr "" ...@@ -1014,6 +1020,9 @@ msgstr ""
msgid "ClusterIntegration|Learn more about environments" msgid "ClusterIntegration|Learn more about environments"
msgstr "" msgstr ""
msgid "ClusterIntegration|Learn more about security configuration"
msgstr ""
msgid "ClusterIntegration|Machine type" msgid "ClusterIntegration|Machine type"
msgstr "" msgstr ""
...@@ -1074,6 +1083,9 @@ msgstr "" ...@@ -1074,6 +1083,9 @@ msgstr ""
msgid "ClusterIntegration|Save changes" msgid "ClusterIntegration|Save changes"
msgstr "" msgstr ""
msgid "ClusterIntegration|Security"
msgstr ""
msgid "ClusterIntegration|See and edit the details for your Kubernetes cluster" msgid "ClusterIntegration|See and edit the details for your Kubernetes cluster"
msgstr "" msgstr ""
...@@ -1101,6 +1113,9 @@ msgstr "" ...@@ -1101,6 +1113,9 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong while installing %{title}" msgid "ClusterIntegration|Something went wrong while installing %{title}"
msgstr "" msgstr ""
msgid "ClusterIntegration|The default cluster configuration grants access to a wide set of functionalities needed to successfully build and deploy a containerised application."
msgstr ""
msgid "ClusterIntegration|This account must have permissions to create a Kubernetes cluster in the %{link_to_container_project} specified below" msgid "ClusterIntegration|This account must have permissions to create a Kubernetes cluster in the %{link_to_container_project} specified below"
msgstr "" msgstr ""
...@@ -1246,7 +1261,6 @@ msgstr "" ...@@ -1246,7 +1261,6 @@ msgstr ""
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Connect all repositories" msgid "Connect all repositories"
msgstr "" msgstr ""
...@@ -1259,11 +1273,6 @@ msgstr "" ...@@ -1259,11 +1273,6 @@ msgstr ""
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
=======
msgid "Connect repositories from GitHub"
msgstr ""
>>>>>>> upstream/master
msgid "Container Registry" msgid "Container Registry"
msgstr "" msgstr ""
...@@ -1378,15 +1387,12 @@ msgstr "" ...@@ -1378,15 +1387,12 @@ msgstr ""
msgid "Create empty bare repository" msgid "Create empty bare repository"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Create epic" msgid "Create epic"
msgstr "" msgstr ""
msgid "Create file" msgid "Create file"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Create lists from labels. Issues with that label appear in that list." msgid "Create lists from labels. Issues with that label appear in that list."
msgstr "" msgstr ""
...@@ -1396,6 +1402,15 @@ msgstr "" ...@@ -1396,6 +1402,15 @@ msgstr ""
msgid "Create merge request and branch" msgid "Create merge request and branch"
msgstr "" msgstr ""
msgid "Create new branch"
msgstr ""
msgid "Create new directory"
msgstr ""
msgid "Create new file"
msgstr ""
msgid "Create new label" msgid "Create new label"
msgstr "" msgstr ""
...@@ -1503,7 +1518,6 @@ msgstr "" ...@@ -1503,7 +1518,6 @@ msgstr ""
msgid "Directory name" msgid "Directory name"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
...@@ -1513,8 +1527,6 @@ msgstr "" ...@@ -1513,8 +1527,6 @@ msgstr ""
msgid "Discover GitLab Geo." msgid "Discover GitLab Geo."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Dismiss Cycle Analytics introduction box" msgid "Dismiss Cycle Analytics introduction box"
msgstr "" msgstr ""
...@@ -1707,7 +1719,6 @@ msgstr "" ...@@ -1707,7 +1719,6 @@ msgstr ""
msgid "Explore public groups" msgid "Explore public groups"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "External Classification Policy Authorization" msgid "External Classification Policy Authorization"
msgstr "" msgstr ""
...@@ -1723,8 +1734,6 @@ msgstr "" ...@@ -1723,8 +1734,6 @@ msgstr ""
msgid "ExternalAuthorizationService|When no classification label is set the default label `%{default_label}` will be used." msgid "ExternalAuthorizationService|When no classification label is set the default label `%{default_label}` will be used."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Failed" msgid "Failed"
msgstr "" msgstr ""
...@@ -1752,6 +1761,9 @@ msgstr "" ...@@ -1752,6 +1761,9 @@ msgstr ""
msgid "Fields on this page are now uneditable, you can configure" msgid "Fields on this page are now uneditable, you can configure"
msgstr "" msgstr ""
msgid "File name"
msgstr ""
msgid "Files" msgid "Files"
msgstr "" msgstr ""
...@@ -1865,9 +1877,18 @@ msgstr "" ...@@ -1865,9 +1877,18 @@ msgstr ""
msgid "GeoNodes|New node" msgid "GeoNodes|New node"
msgstr "" msgstr ""
msgid "GeoNodes|Node Authentication was successfully repaired."
msgstr ""
msgid "GeoNodes|Node was successfully removed."
msgstr ""
msgid "GeoNodes|Out of sync" msgid "GeoNodes|Out of sync"
msgstr "" 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 "" msgstr ""
...@@ -1880,6 +1901,15 @@ msgstr "" ...@@ -1880,6 +1901,15 @@ msgstr ""
msgid "GeoNodes|Selective" msgid "GeoNodes|Selective"
msgstr "" msgstr ""
msgid "GeoNodes|Something went wrong while changing node status"
msgstr ""
msgid "GeoNodes|Something went wrong while removing node"
msgstr ""
msgid "GeoNodes|Something went wrong while repairing node"
msgstr ""
msgid "GeoNodes|Storage config:" msgid "GeoNodes|Storage config:"
msgstr "" msgstr ""
...@@ -2077,6 +2107,9 @@ msgstr "" ...@@ -2077,6 +2107,9 @@ msgstr ""
msgid "Housekeeping successfully started" msgid "Housekeeping successfully started"
msgstr "" msgstr ""
msgid "If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}"
msgstr ""
msgid "If you already have files you can push them using the %{link_to_cli} below." msgid "If you already have files you can push them using the %{link_to_cli} below."
msgstr "" msgstr ""
...@@ -2220,9 +2253,18 @@ msgstr "" ...@@ -2220,9 +2253,18 @@ msgstr ""
msgid "Labels" msgid "Labels"
msgstr "" msgstr ""
msgid "Labels can be applied to %{features}. Group labels are available for any project within the group."
msgstr ""
msgid "Labels can be applied to issues and merge requests to categorize them." msgid "Labels can be applied to issues and merge requests to categorize them."
msgstr "" msgstr ""
msgid "Labels|Promote Label"
msgstr ""
msgid "Labels|Promote label %{labelTitle} to Group Label?"
msgstr ""
msgid "Last %d day" msgid "Last %d day"
msgid_plural "Last %d days" msgid_plural "Last %d days"
msgstr[0] "" msgstr[0] ""
...@@ -2276,7 +2318,6 @@ msgstr "" ...@@ -2276,7 +2318,6 @@ msgstr ""
msgid "Leave project" msgid "Leave project"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "License" msgid "License"
msgstr "" msgstr ""
...@@ -2287,9 +2328,6 @@ msgid "List your GitHub repositories" ...@@ -2287,9 +2328,6 @@ msgid "List your GitHub repositories"
msgstr "" msgstr ""
msgid "Loading the GitLab IDE..." msgid "Loading the GitLab IDE..."
=======
msgid "List your GitHub repositories"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Lock" msgid "Lock"
...@@ -2379,6 +2417,12 @@ msgstr "" ...@@ -2379,6 +2417,12 @@ msgstr ""
msgid "Milestones|Milestone %{milestoneTitle} was not found" msgid "Milestones|Milestone %{milestoneTitle} was not found"
msgstr "" msgstr ""
msgid "Milestones|Promote %{milestoneTitle} to group milestone?"
msgstr ""
msgid "Milestones|Promote Milestone"
msgstr ""
msgid "MissingSSHKeyWarningLink|add an SSH key" msgid "MissingSSHKeyWarningLink|add an SSH key"
msgstr "" msgstr ""
...@@ -2391,6 +2435,9 @@ msgstr "" ...@@ -2391,6 +2435,9 @@ msgstr ""
msgid "Monitoring" msgid "Monitoring"
msgstr "" msgstr ""
msgid "More info"
msgstr ""
msgid "More information" msgid "More information"
msgstr "" msgstr ""
...@@ -2465,6 +2512,9 @@ msgstr "" ...@@ -2465,6 +2512,9 @@ msgstr ""
msgid "New tag" msgid "New tag"
msgstr "" msgstr ""
msgid "No Label"
msgstr ""
msgid "No assignee" msgid "No assignee"
msgstr "" msgstr ""
...@@ -2483,6 +2533,9 @@ msgstr "" ...@@ -2483,6 +2533,9 @@ msgstr ""
msgid "No file chosen" msgid "No file chosen"
msgstr "" msgstr ""
msgid "No labels created yet."
msgstr ""
msgid "No repository" msgid "No repository"
msgstr "" msgstr ""
...@@ -2513,7 +2566,6 @@ msgstr "" ...@@ -2513,7 +2566,6 @@ msgstr ""
msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}" msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Note: As an administrator you may like to configure %{github_integration_link}, which will allow login via GitHub and allow connecting repositories without generating a Personal Access Token." msgid "Note: As an administrator you may like to configure %{github_integration_link}, which will allow login via GitHub and allow connecting repositories without generating a Personal Access Token."
msgstr "" msgstr ""
...@@ -2523,11 +2575,6 @@ msgstr "" ...@@ -2523,11 +2575,6 @@ msgstr ""
msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow connecting repositories without generating a Personal Access Token." msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow connecting repositories without generating a Personal Access Token."
msgstr "" msgstr ""
=======
msgid "Note: As an administrator you may like to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token."
msgstr ""
>>>>>>> upstream/master
msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token." msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token."
msgstr "" msgstr ""
...@@ -2660,12 +2707,9 @@ msgstr "" ...@@ -2660,12 +2707,9 @@ msgstr ""
msgid "Password" msgid "Password"
msgstr "" msgstr ""
<<<<<<< HEAD
=======
msgid "Pending" msgid "Pending"
msgstr "" msgstr ""
>>>>>>> upstream/master
msgid "Personal Access Token" msgid "Personal Access Token"
msgstr "" msgstr ""
...@@ -2996,6 +3040,12 @@ msgstr "" ...@@ -2996,6 +3040,12 @@ msgstr ""
msgid "ProjectsDropdown|This feature requires browser localStorage support" msgid "ProjectsDropdown|This feature requires browser localStorage support"
msgstr "" msgstr ""
msgid "PrometheusService|%{exporters} with %{metrics} were found"
msgstr ""
msgid "PrometheusService|<p class=\"text-tertiary\">No <a href=\"%{docsUrl}\">common metrics</a> were found</p>"
msgstr ""
msgid "PrometheusService|Active" msgid "PrometheusService|Active"
msgstr "" msgstr ""
...@@ -3008,6 +3058,9 @@ msgstr "" ...@@ -3008,6 +3058,9 @@ msgstr ""
msgid "PrometheusService|By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server." msgid "PrometheusService|By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server."
msgstr "" msgstr ""
msgid "PrometheusService|Common metrics"
msgstr ""
msgid "PrometheusService|Finding and configuring metrics..." msgid "PrometheusService|Finding and configuring metrics..."
msgstr "" msgstr ""
...@@ -3029,15 +3082,9 @@ msgstr "" ...@@ -3029,15 +3082,9 @@ msgstr ""
msgid "PrometheusService|Missing environment variable" msgid "PrometheusService|Missing environment variable"
msgstr "" msgstr ""
msgid "PrometheusService|Monitored"
msgstr ""
msgid "PrometheusService|More information" msgid "PrometheusService|More information"
msgstr "" msgstr ""
msgid "PrometheusService|No metrics are being monitored. To start monitoring, deploy to an environment."
msgstr ""
msgid "PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/" msgid "PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/"
msgstr "" msgstr ""
...@@ -3053,7 +3100,16 @@ msgstr "" ...@@ -3053,7 +3100,16 @@ msgstr ""
msgid "PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below" msgid "PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below"
msgstr "" msgstr ""
msgid "PrometheusService|View environments" msgid "PrometheusService|Waiting for your first deployment to an environment to find common metrics"
msgstr ""
msgid "Promote"
msgstr ""
msgid "Promote to Group Label"
msgstr ""
msgid "Promote to Group Milestone"
msgstr "" msgstr ""
msgid "Protip:" msgid "Protip:"
...@@ -3065,11 +3121,7 @@ msgstr "" ...@@ -3065,11 +3121,7 @@ msgstr ""
msgid "Public - The project can be accessed without any authentication." msgid "Public - The project can be accessed without any authentication."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Push Rules" msgid "Push Rules"
=======
msgid "Push access to this project is necessary in order to enable this option"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Push events" msgid "Push events"
...@@ -3176,14 +3228,13 @@ msgstr "" ...@@ -3176,14 +3228,13 @@ msgstr ""
msgid "Revert this merge request" msgid "Revert this merge request"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Roadmap" msgid "Roadmap"
msgstr "" msgstr ""
msgid "Run CI/CD pipelines for external repositories" msgid "Run CI/CD pipelines for external repositories"
======= msgstr ""
msgid "Running" msgid "Running"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "SSH Keys" msgid "SSH Keys"
...@@ -3210,12 +3261,9 @@ msgstr "" ...@@ -3210,12 +3261,9 @@ msgstr ""
msgid "Scheduling Pipelines" msgid "Scheduling Pipelines"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Scoped issue boards" msgid "Scoped issue boards"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Search" msgid "Search"
msgstr "" msgstr ""
...@@ -3944,7 +3992,6 @@ msgstr "" ...@@ -3944,7 +3992,6 @@ msgstr ""
msgid "Tip:" msgid "Tip:"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Title" msgid "Title"
msgstr "" msgstr ""
...@@ -3960,11 +4007,6 @@ msgstr "" ...@@ -3960,11 +4007,6 @@ msgstr ""
msgid "To connect an SVN repository, check out %{svn_link}." msgid "To connect an SVN repository, check out %{svn_link}."
msgstr "" msgstr ""
=======
msgid "To GitLab"
msgstr ""
>>>>>>> upstream/master
msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
msgstr "" msgstr ""
...@@ -4118,7 +4160,6 @@ msgstr "" ...@@ -4118,7 +4160,6 @@ msgstr ""
msgid "We want to be sure it is you, please confirm you are not a robot." msgid "We want to be sure it is you, please confirm you are not a robot."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Web IDE" msgid "Web IDE"
msgstr "" msgstr ""
...@@ -4128,8 +4169,6 @@ msgstr "" ...@@ -4128,8 +4169,6 @@ msgstr ""
msgid "Weight" msgid "Weight"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Wiki" msgid "Wiki"
msgstr "" msgstr ""
...@@ -4334,11 +4373,10 @@ msgstr "" ...@@ -4334,11 +4373,10 @@ msgstr ""
msgid "Your Kubernetes cluster information on this page is still editable, but you are advised to disable and reconfigure" msgid "Your Kubernetes cluster information on this page is still editable, but you are advised to disable and reconfigure"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Your changes have been committed. Commit %{commitId} %{commitStats}"
=======
msgid "Your changes can be committed to %{branch_name} because a merge request is open." msgid "Your changes can be committed to %{branch_name} because a merge request is open."
>>>>>>> upstream/master msgstr ""
msgid "Your changes have been committed. Commit %{commitId} %{commitStats}"
msgstr "" msgstr ""
msgid "Your comment will not be visible to the public." msgid "Your comment will not be visible to the public."
...@@ -4445,7 +4483,6 @@ msgstr[1] "" ...@@ -4445,7 +4483,6 @@ msgstr[1] ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command." msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "here" msgid "here"
msgstr "" msgstr ""
...@@ -4461,11 +4498,6 @@ msgstr "" ...@@ -4461,11 +4498,6 @@ msgstr ""
msgid "locked by %{path_lock_user_name} %{created_at}" msgid "locked by %{path_lock_user_name} %{created_at}"
msgstr "" msgstr ""
=======
msgid "importing"
msgstr ""
>>>>>>> upstream/master
msgid "merge request" msgid "merge request"
msgid_plural "merge requests" msgid_plural "merge requests"
msgstr[0] "" msgstr[0] ""
...@@ -4474,10 +4506,12 @@ msgstr[1] "" ...@@ -4474,10 +4506,12 @@ msgstr[1] ""
msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch" msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "mrWidget|Add approval" msgid "mrWidget|Add approval"
msgstr "" msgstr ""
msgid "mrWidget|Allows edits from maintainers"
msgstr ""
msgid "mrWidget|An error occured while removing your approval." msgid "mrWidget|An error occured while removing your approval."
msgstr "" msgstr ""
...@@ -4491,9 +4525,6 @@ msgid "mrWidget|Approve" ...@@ -4491,9 +4525,6 @@ msgid "mrWidget|Approve"
msgstr "" msgstr ""
msgid "mrWidget|Approved by" msgid "mrWidget|Approved by"
=======
msgid "mrWidget|Allows edits from maintainers"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "mrWidget|Cancel automatic merge" msgid "mrWidget|Cancel automatic merge"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7