Skip to content

G
gitlab-ce
Commit f8a96a0a authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in locale/gitlab.pot 

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