Skip to content

G
gitlab-ce
Commit b67070f9 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg
Browse files
Options

Fix merge conflicts for Gitaly Server admin

parent c59c9fe9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 129 deletions
app/views/admin/dashboard/index.html.haml
View file @ b67070f9
...@@ -158,8 +158,6 @@ ...@@ -158,8 +158,6 @@
GitLab Pages GitLab Pages
%span.pull-right %span.pull-right
= Gitlab::Pages::VERSION = Gitlab::Pages::VERSION
<<<<<<< HEAD
- if Gitlab::Geo.enabled? - if Gitlab::Geo.enabled?
%p %p
= link_to 'Geo', admin_geo_nodes_path = link_to 'Geo', admin_geo_nodes_path
...@@ -168,9 +166,6 @@ ...@@ -168,9 +166,6 @@
= Gitlab::Geo.current_node.primary ? 'Primary node' : 'Secondary node' = Gitlab::Geo.current_node.primary ? 'Primary node' : 'Secondary node'
- else - else
Undefined Undefined
=======
>>>>>>> upstream/master
%p %p
Ruby Ruby
%span.pull-right %span.pull-right
......
locale/gitlab.pot
View file @ b67070f9
...@@ -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-01-31 17:04+0100\n"
"POT-Creation-Date: 2018-01-31 09:31+0100\n" "PO-Revision-Date: 2018-01-31 17:04+0100\n"
"PO-Revision-Date: 2018-01-31 09:31+0100\n"
=======
"POT-Creation-Date: 2018-01-30 14:59+0100\n"
"PO-Revision-Date: 2018-01-30 14:59+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"
...@@ -162,12 +157,9 @@ msgstr "" ...@@ -162,12 +157,9 @@ msgstr ""
msgid "All" msgid "All"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "All changes are committed" msgid "All changes are committed"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "An error occurred previewing the blob" msgid "An error occurred previewing the blob"
msgstr "" msgstr ""
...@@ -267,7 +259,6 @@ msgstr "" ...@@ -267,7 +259,6 @@ msgstr ""
msgid "Avatar will be removed. Are you sure?" msgid "Avatar will be removed. Are you sure?"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Billing" msgid "Billing"
msgstr "" msgstr ""
...@@ -322,8 +313,6 @@ msgstr "" ...@@ -322,8 +313,6 @@ msgstr ""
msgid "BillingPlans|per user" msgid "BillingPlans|per user"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Branch" msgid "Branch"
msgid_plural "Branches" msgid_plural "Branches"
msgstr[0] "" msgstr[0] ""
...@@ -518,12 +507,9 @@ msgstr "" ...@@ -518,12 +507,9 @@ msgstr ""
msgid "Choose file..." msgid "Choose file..."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "CiStatusLabel|canceled" msgid "CiStatusLabel|canceled"
msgstr "" msgstr ""
...@@ -593,7 +579,6 @@ msgstr "" ...@@ -593,7 +579,6 @@ msgstr ""
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Cluster" msgid "Cluster"
msgstr "" msgstr ""
...@@ -603,11 +588,6 @@ msgstr "" ...@@ -603,11 +588,6 @@ msgstr ""
msgid "ClusterIntegration|API URL" msgid "ClusterIntegration|API URL"
msgstr "" msgstr ""
=======
msgid "ClusterIntegration|API URL"
msgstr ""
>>>>>>> upstream/master
msgid "ClusterIntegration|Add an existing cluster" msgid "ClusterIntegration|Add an existing cluster"
msgstr "" msgstr ""
...@@ -758,12 +738,9 @@ msgstr "" ...@@ -758,12 +738,9 @@ msgstr ""
msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ClusterIntegration|Multiple clusters are available in GitLab Enterprise Edition Premium and Ultimate" msgid "ClusterIntegration|Multiple clusters are available in GitLab Enterprise Edition Premium and Ultimate"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "ClusterIntegration|Note:" msgid "ClusterIntegration|Note:"
msgstr "" msgstr ""
...@@ -1254,7 +1231,6 @@ msgstr "" ...@@ -1254,7 +1231,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 ""
...@@ -1270,8 +1246,6 @@ msgstr "" ...@@ -1270,8 +1246,6 @@ msgstr ""
msgid "Error fetching contributors data." msgid "Error fetching contributors data."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Error fetching refs" msgid "Error fetching refs"
msgstr "" msgstr ""
...@@ -1371,30 +1345,12 @@ msgid "GPG Keys" ...@@ -1371,30 +1345,12 @@ msgid "GPG Keys"
msgstr "" msgstr ""
msgid "Generate a default set of labels" msgid "Generate a default set of labels"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "Geo Nodes" msgid "Geo Nodes"
msgstr "" msgstr ""
msgid "GeoNodeSyncStatus|Node is failing or broken." msgid "GeoNodeSyncStatus|Node is failing or broken."
=======
msgstr ""
msgid "Git storage health information has been reset"
msgstr ""
msgid "Git version"
msgstr ""
msgid "GitLab Runner section"
msgstr ""
msgid "Gitaly Servers"
msgstr ""
msgid "Go to your fork"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage." msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage."
...@@ -1439,14 +1395,10 @@ msgstr "" ...@@ -1439,14 +1395,10 @@ msgstr ""
msgid "GeoNodes|Local LFS objects:" msgid "GeoNodes|Local LFS objects:"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "GeoNodes|Local job artifacts:" msgid "GeoNodes|Local job artifacts:"
msgstr "" msgstr ""
msgid "GeoNodes|New node" msgid "GeoNodes|New node"
=======
msgid "GroupsTree|Are you sure you want to leave the \"${group.fullName}\" group?"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "GeoNodes|Out of sync" msgid "GeoNodes|Out of sync"
...@@ -1494,16 +1446,7 @@ msgstr "" ...@@ -1494,16 +1446,7 @@ msgstr ""
msgid "Geo|Repository sync capacity" msgid "Geo|Repository sync capacity"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Geo|Select groups to replicate." msgid "Geo|Select groups to replicate."
=======
msgid "Hide value"
msgid_plural "Hide values"
msgstr[0] ""
msgstr[1] ""
msgid "History"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Git storage health information has been reset" msgid "Git storage health information has been reset"
...@@ -1515,14 +1458,7 @@ msgstr "" ...@@ -1515,14 +1458,7 @@ msgstr ""
msgid "GitLab Runner section" msgid "GitLab Runner section"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Gitaly Servers" msgid "Gitaly Servers"
=======
msgid "Interested parties can even contribute by pushing commits if they want to."
msgstr ""
msgid "Internal - The group and any internal projects can be viewed by any logged in user."
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Go to your fork" msgid "Go to your fork"
...@@ -1543,7 +1479,6 @@ msgstr "" ...@@ -1543,7 +1479,6 @@ msgstr ""
msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup." msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_with_group_lock}." msgid "GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_with_group_lock}."
msgstr "" msgstr ""
...@@ -1683,8 +1618,6 @@ msgstr "" ...@@ -1683,8 +1618,6 @@ msgstr ""
msgid "Issues" msgid "Issues"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable." msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr "" msgstr ""
...@@ -1765,12 +1698,9 @@ msgstr "" ...@@ -1765,12 +1698,9 @@ msgstr ""
msgid "Leave project" msgid "Leave project"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "License" msgid "License"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Loading the GitLab IDE..." msgid "Loading the GitLab IDE..."
msgstr "" msgstr ""
...@@ -1905,12 +1835,9 @@ msgstr "" ...@@ -1905,12 +1835,9 @@ msgstr ""
msgid "New tag" msgid "New tag"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "No changes" msgid "No changes"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "No connection could be made to a Gitaly Server, please check your logs!" msgid "No connection could be made to a Gitaly Server, please check your logs!"
msgstr "" msgstr ""
...@@ -2007,12 +1934,9 @@ msgstr "" ...@@ -2007,12 +1934,9 @@ msgstr ""
msgid "Number of access attempts" msgid "Number of access attempts"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "OK" msgid "OK"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Oct" msgid "Oct"
msgstr "" msgstr ""
...@@ -2289,7 +2213,6 @@ msgstr "" ...@@ -2289,7 +2213,6 @@ msgstr ""
msgid "ProjectNetworkGraph|Graph" msgid "ProjectNetworkGraph|Graph"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ProjectSettings|Contact an admin to change this setting." msgid "ProjectSettings|Contact an admin to change this setting."
msgstr "" msgstr ""
...@@ -2308,8 +2231,6 @@ msgstr "" ...@@ -2308,8 +2231,6 @@ msgstr ""
msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails." msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Projects" msgid "Projects"
msgstr "" msgstr ""
...@@ -2397,12 +2318,9 @@ msgstr "" ...@@ -2397,12 +2318,9 @@ msgstr ""
msgid "Register / Sign In" msgid "Register / Sign In"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Registry" msgid "Registry"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Related Commits" msgid "Related Commits"
msgstr "" msgstr ""
...@@ -2424,12 +2342,9 @@ msgstr "" ...@@ -2424,12 +2342,9 @@ msgstr ""
msgid "Remind later" msgid "Remind later"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Remove" msgid "Remove"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Remove avatar" msgid "Remove avatar"
msgstr "" msgstr ""
...@@ -2489,12 +2404,9 @@ msgstr "" ...@@ -2489,12 +2404,9 @@ msgstr ""
msgid "Search branches and tags" msgid "Search branches and tags"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Seconds before reseting failure information" msgid "Seconds before reseting failure information"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Seconds to wait for a storage access attempt" msgid "Seconds to wait for a storage access attempt"
msgstr "" msgstr ""
...@@ -2578,7 +2490,7 @@ msgstr "" ...@@ -2578,7 +2490,7 @@ msgstr ""
msgid "Something went wrong on our end." msgid "Something went wrong on our end."
msgstr "" msgstr ""
msgid "Something went wrong when toggling the button" msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName}"
msgstr "" msgstr ""
msgid "Something went wrong when toggling the button" msgid "Something went wrong when toggling the button"
...@@ -2817,15 +2729,12 @@ msgstr "" ...@@ -2817,15 +2729,12 @@ msgstr ""
msgid "Team" msgid "Team"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Thanks! Don't show me this again" msgid "Thanks! Don't show me this again"
msgstr "" 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." 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 "" msgstr ""
=======
>>>>>>> upstream/master
msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project" msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"
msgstr "" msgstr ""
...@@ -2904,7 +2813,6 @@ msgstr "" ...@@ -2904,7 +2813,6 @@ msgstr ""
msgid "There are problems accessing Git storage: " msgid "There are problems accessing Git storage: "
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "There was an error when reseting email token." msgid "There was an error when reseting email token."
msgstr "" msgstr ""
...@@ -2917,8 +2825,6 @@ msgstr "" ...@@ -2917,8 +2825,6 @@ msgstr ""
msgid "This board\\'s scope is reduced" msgid "This board\\'s scope is reduced"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "This directory" msgid "This directory"
msgstr "" msgstr ""
...@@ -2964,12 +2870,9 @@ msgstr "" ...@@ -2964,12 +2870,9 @@ msgstr ""
msgid "This repository" msgid "This repository"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here." msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Time before an issue gets scheduled" msgid "Time before an issue gets scheduled"
msgstr "" msgstr ""
...@@ -3118,12 +3021,9 @@ msgstr[1] "" ...@@ -3118,12 +3021,9 @@ msgstr[1] ""
msgid "Time|s" msgid "Time|s"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Title" msgid "Title"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "ToggleButton|Toggle Status: OFF" msgid "ToggleButton|Toggle Status: OFF"
msgstr "" msgstr ""
...@@ -3139,7 +3039,6 @@ msgstr "" ...@@ -3139,7 +3039,6 @@ msgstr ""
msgid "Total test time for all commits/merges" msgid "Total test time for all commits/merges"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Track activity with Contribution Analytics." msgid "Track activity with Contribution Analytics."
msgstr "" msgstr ""
...@@ -3158,14 +3057,6 @@ msgstr "" ...@@ -3158,14 +3057,6 @@ msgstr ""
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
=======
msgid "Trigger this manual action"
msgstr ""
msgid "Unable to reset project cache."
msgstr ""
>>>>>>> upstream/master
msgid "Unlock" msgid "Unlock"
msgstr "" msgstr ""
...@@ -3176,7 +3067,6 @@ msgid "Unstar" ...@@ -3176,7 +3067,6 @@ msgid "Unstar"
msgstr "" msgstr ""
msgid "Up to date" msgid "Up to date"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "Upgrade your plan to activate Advanced Global Search." msgid "Upgrade your plan to activate Advanced Global Search."
...@@ -3192,8 +3082,6 @@ msgid "Upgrade your plan to activate Issue weight." ...@@ -3192,8 +3082,6 @@ msgid "Upgrade your plan to activate Issue weight."
msgstr "" msgstr ""
msgid "Upgrade your plan to improve Issue boards." msgid "Upgrade your plan to improve Issue boards."
=======
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Upload New File" msgid "Upload New File"
...@@ -3248,15 +3136,12 @@ msgid "We don't have enough data to show this stage." ...@@ -3248,15 +3136,12 @@ msgid "We don't have enough data to show this stage."
msgstr "" 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."
<<<<<<< HEAD
msgstr "" msgstr ""
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 ""
msgid "Weight" msgid "Weight"
=======
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Wiki" msgid "Wiki"
...@@ -3382,21 +3267,15 @@ msgstr "" ...@@ -3382,21 +3267,15 @@ 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 ""
msgid "You can also star a label to make it a priority label."
msgstr ""
msgid "You can only add files when you are on a branch" msgid "You can only add files when you are on a branch"
msgstr "" msgstr ""
msgid "You can only edit files when you are on a branch" msgid "You can only edit files when you are on a branch"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead." msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "You cannot write to this read-only GitLab instance." msgid "You cannot write to this read-only GitLab instance."
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