Skip to content

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

Conflicts: locale/gitlab.pot

parent c72cae1f
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 40 deletions
locale/gitlab.pot
View file @ f382321f
...@@ -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-02-23 13:23+0100\n"
"POT-Creation-Date: 2018-02-22 17:55+0100\n" "PO-Revision-Date: 2018-02-23 13:23+0100\n"
"PO-Revision-Date: 2018-02-22 17:55+0100\n"
=======
"POT-Creation-Date: 2018-02-20 10:26+0100\n"
"PO-Revision-Date: 2018-02-20 10:26+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"
...@@ -140,9 +135,15 @@ msgstr "" ...@@ -140,9 +135,15 @@ msgstr ""
msgid "Add Group Webhooks and GitLab Enterprise Edition." msgid "Add Group Webhooks and GitLab Enterprise Edition."
msgstr "" msgstr ""
msgid "Add Kubernetes cluster"
msgstr ""
msgid "Add License" msgid "Add License"
msgstr "" msgstr ""
msgid "Add Readme"
msgstr ""
msgid "Add new directory" msgid "Add new directory"
msgstr "" msgstr ""
...@@ -200,12 +201,9 @@ msgstr "" ...@@ -200,12 +201,9 @@ msgstr ""
msgid "AdminUsers|To confirm, type %{username}" msgid "AdminUsers|To confirm, type %{username}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Advanced settings" msgid "Advanced settings"
msgstr "" msgstr ""
...@@ -251,12 +249,9 @@ msgstr "" ...@@ -251,12 +249,9 @@ msgstr ""
msgid "An error occurred while importing project" msgid "An error occurred while importing project"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "An error occurred while initializing path locks" msgid "An error occurred while initializing path locks"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "An error occurred while loading commits" msgid "An error occurred while loading commits"
msgstr "" msgstr ""
...@@ -269,15 +264,12 @@ msgstr "" ...@@ -269,15 +264,12 @@ msgstr ""
msgid "An error occurred while loading the file" msgid "An error occurred while loading the file"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "An error occurred while making the request." msgid "An error occurred while making the request."
msgstr "" msgstr ""
msgid "An error occurred while removing approver" msgid "An error occurred while removing approver"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "An error occurred while rendering KaTeX" msgid "An error occurred while rendering KaTeX"
msgstr "" msgstr ""
...@@ -290,12 +282,9 @@ msgstr "" ...@@ -290,12 +282,9 @@ msgstr ""
msgid "An error occurred while retrieving diff" msgid "An error occurred while retrieving diff"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "An error occurred while saving LDAP override status. Please try again." msgid "An error occurred while saving LDAP override status. Please try again."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "An error occurred while saving assignees" msgid "An error occurred while saving assignees"
msgstr "" msgstr ""
...@@ -371,6 +360,9 @@ msgstr "" ...@@ -371,6 +360,9 @@ msgstr ""
msgid "Authors: %{authors}" msgid "Authors: %{authors}"
msgstr "" msgstr ""
msgid "Auto DevOps enabled"
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 ""
...@@ -395,7 +387,13 @@ msgstr "" ...@@ -395,7 +387,13 @@ msgstr ""
msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
msgstr "" msgstr ""
msgid "AutoDevOps|You can activate %{link_to_settings} for this project." msgid "AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}."
msgstr ""
msgid "AutoDevOps|add a Kubernetes cluster"
msgstr ""
msgid "AutoDevOps|enable Auto DevOps (Beta)"
msgstr "" msgstr ""
msgid "Available" msgid "Available"
...@@ -464,8 +462,8 @@ msgstr "" ...@@ -464,8 +462,8 @@ msgstr ""
msgid "BillingPlans|per user" msgid "BillingPlans|per user"
msgstr "" msgstr ""
msgid "Branch" msgid "Branch (%{branch_count})"
msgid_plural "Branches" msgid_plural "Branches (%{branch_count})"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
...@@ -1059,6 +1057,11 @@ msgid_plural "Commits" ...@@ -1059,6 +1057,11 @@ msgid_plural "Commits"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "Commit (%{commit_count})"
msgid_plural "Commits (%{commit_count})"
msgstr[0] ""
msgstr[1] ""
msgid "Commit Message" msgid "Commit Message"
msgstr "" msgstr ""
...@@ -1212,6 +1215,9 @@ msgstr "" ...@@ -1212,6 +1215,9 @@ msgstr ""
msgid "Copy branch name to clipboard" msgid "Copy branch name to clipboard"
msgstr "" msgstr ""
msgid "Copy command to clipboard"
msgstr ""
msgid "Copy commit SHA to clipboard" msgid "Copy commit SHA to clipboard"
msgstr "" msgstr ""
...@@ -1421,6 +1427,9 @@ msgstr "" ...@@ -1421,6 +1427,9 @@ msgstr ""
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
msgid "Enable Auto DevOps"
msgstr ""
msgid "Environments|An error occurred while fetching the environments." msgid "Environments|An error occurred while fetching the environments."
msgstr "" msgstr ""
...@@ -1592,6 +1601,9 @@ msgstr "" ...@@ -1592,6 +1601,9 @@ msgstr ""
msgid "Files" msgid "Files"
msgstr "" msgstr ""
msgid "Files (%{human_size})"
msgstr ""
msgid "Filter by commit message" msgid "Filter by commit message"
msgstr "" msgstr ""
...@@ -1890,6 +1902,9 @@ msgstr "" ...@@ -1890,6 +1902,9 @@ msgstr ""
msgid "Housekeeping successfully started" msgid "Housekeeping successfully started"
msgstr "" msgstr ""
msgid "If you already have files you can push them using the %{link_to_cli} below."
msgstr ""
msgid "Import repository" msgid "Import repository"
msgstr "" msgstr ""
...@@ -1985,6 +2000,9 @@ msgstr "" ...@@ -1985,6 +2000,9 @@ msgstr ""
msgid "Kubernetes cluster was successfully updated." msgid "Kubernetes cluster was successfully updated."
msgstr "" msgstr ""
msgid "Kubernetes configured"
msgstr ""
msgid "Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page" msgid "Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page"
msgstr "" msgstr ""
...@@ -2032,6 +2050,9 @@ msgstr "" ...@@ -2032,6 +2050,9 @@ msgstr ""
msgid "Learn more" msgid "Learn more"
msgstr "" msgstr ""
msgid "Learn more about protected branches"
msgstr ""
msgid "Learn more in the" msgid "Learn more in the"
msgstr "" msgstr ""
...@@ -2268,6 +2289,9 @@ msgstr "" ...@@ -2268,6 +2289,9 @@ msgstr ""
msgid "Not enough data" msgid "Not enough data"
msgstr "" msgstr ""
msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}"
msgstr ""
msgid "Notification events" msgid "Notification events"
msgstr "" msgstr ""
...@@ -2370,6 +2394,9 @@ msgstr "" ...@@ -2370,6 +2394,9 @@ msgstr ""
msgid "Options" msgid "Options"
msgstr "" msgstr ""
msgid "Otherwise it is recommended you start with one of the options below."
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
...@@ -2478,19 +2505,19 @@ msgstr "" ...@@ -2478,19 +2505,19 @@ msgstr ""
msgid "Pipeline|Retry pipeline" msgid "Pipeline|Retry pipeline"
msgstr "" msgstr ""
msgid "Pipeline|Retry pipeline #%{id}?" msgid "Pipeline|Retry pipeline #%{pipelineId}?"
msgstr "" msgstr ""
msgid "Pipeline|Stop pipeline" msgid "Pipeline|Stop pipeline"
msgstr "" msgstr ""
msgid "Pipeline|Stop pipeline #%{id}?" msgid "Pipeline|Stop pipeline #%{pipelineId}?"
msgstr "" msgstr ""
msgid "Pipeline|You’re about to retry pipeline %{id}." msgid "Pipeline|You’re about to retry pipeline %{pipelineId}."
msgstr "" msgstr ""
msgid "Pipeline|You’re about to stop pipeline %{id}." msgid "Pipeline|You’re about to stop pipeline %{pipelineId}."
msgstr "" msgstr ""
msgid "Pipeline|all" msgid "Pipeline|all"
...@@ -2526,6 +2553,9 @@ msgstr "" ...@@ -2526,6 +2553,9 @@ msgstr ""
msgid "Private - The group and its projects can only be viewed by members." msgid "Private - The group and its projects can only be viewed by members."
msgstr "" msgstr ""
msgid "Private projects can be created in your personal namespace with:"
msgstr ""
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
...@@ -2763,6 +2793,12 @@ msgstr "" ...@@ -2763,6 +2793,12 @@ msgstr ""
msgid "Push events" msgid "Push events"
msgstr "" msgstr ""
msgid "Push project from command line"
msgstr ""
msgid "Push to create a project"
msgstr ""
msgid "PushRule|Committer restriction" msgid "PushRule|Committer restriction"
msgstr "" msgstr ""
...@@ -2945,9 +2981,6 @@ msgstr "" ...@@ -2945,9 +2981,6 @@ msgstr ""
msgid "Set up Koding" msgid "Set up Koding"
msgstr "" msgstr ""
msgid "Set up auto deploy"
msgstr ""
msgid "SetPasswordToCloneLink|set a password" msgid "SetPasswordToCloneLink|set a password"
msgstr "" msgstr ""
...@@ -2963,6 +2996,9 @@ msgstr "" ...@@ -2963,6 +2996,9 @@ msgstr ""
msgid "SharedRunnersMinutesSettings|Reset used pipeline minutes" msgid "SharedRunnersMinutesSettings|Reset used pipeline minutes"
msgstr "" msgstr ""
msgid "Show command"
msgstr ""
msgid "Show parent pages" msgid "Show parent pages"
msgstr "" msgstr ""
...@@ -3007,12 +3043,9 @@ msgstr "" ...@@ -3007,12 +3043,9 @@ msgstr ""
msgid "Something went wrong while closing the issue. Please try again later" msgid "Something went wrong while closing the issue. Please try again later"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Something went wrong while fetching SAST." msgid "Something went wrong while fetching SAST."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Something went wrong while fetching the projects." msgid "Something went wrong while fetching the projects."
msgstr "" msgstr ""
...@@ -3169,8 +3202,8 @@ msgstr "" ...@@ -3169,8 +3202,8 @@ msgstr ""
msgid "System Hooks" msgid "System Hooks"
msgstr "" msgstr ""
msgid "Tag" msgid "Tag (%{tag_count})"
msgid_plural "Tags" msgid_plural "Tags (%{tag_count})"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
...@@ -3303,6 +3336,9 @@ msgstr "" ...@@ -3303,6 +3336,9 @@ msgstr ""
msgid "The repository for this project does not exist." msgid "The repository for this project does not exist."
msgstr "" msgstr ""
msgid "The repository for this project is empty"
msgstr ""
msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request." msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request."
msgstr "" msgstr ""
...@@ -3574,6 +3610,9 @@ msgstr[1] "" ...@@ -3574,6 +3610,9 @@ msgstr[1] ""
msgid "Time|s" msgid "Time|s"
msgstr "" msgstr ""
msgid "Tip:"
msgstr ""
msgid "Title" msgid "Title"
msgstr "" msgstr ""
...@@ -3613,12 +3652,9 @@ msgstr "" ...@@ -3613,12 +3652,9 @@ msgstr ""
msgid "Trigger this manual action" msgid "Trigger this manual action"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Turn on Service Desk" msgid "Turn on Service Desk"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Unable to reset project cache." msgid "Unable to reset project cache."
msgstr "" msgstr ""
...@@ -3850,6 +3886,9 @@ msgstr "" ...@@ -3850,6 +3886,9 @@ msgstr ""
msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?" msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
msgstr "" msgstr ""
msgid "You can also create a project from the command line."
msgstr ""
msgid "You can also star a label to make it a priority label." msgid "You can also star a label to make it a priority label."
msgstr "" msgstr ""
...@@ -3997,6 +4036,9 @@ msgstr "" ...@@ -3997,6 +4036,9 @@ msgstr ""
msgid "ciReport|no security vulnerabilities" msgid "ciReport|no security vulnerabilities"
msgstr "" msgstr ""
msgid "command line instructions"
msgstr ""
msgid "commit" msgid "commit"
msgstr "" msgstr ""
...@@ -4031,7 +4073,6 @@ msgstr[1] "" ...@@ -4031,7 +4073,6 @@ 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|An error occured while removing your approval." msgid "mrWidget|An error occured while removing your approval."
msgstr "" msgstr ""
...@@ -4050,8 +4091,6 @@ msgstr "" ...@@ -4050,8 +4091,6 @@ msgstr ""
msgid "mrWidget|Approved by" msgid "mrWidget|Approved by"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "mrWidget|Cancel automatic merge" msgid "mrWidget|Cancel automatic merge"
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