Resolve conflicts in `locale/gitlab.pot`

locale/gitlab.pot

@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-10-06 22:39+0200\n"
-"PO-Revision-Date: 2017-10-06 22:39+0200\n"
-=======
-"POT-Creation-Date: 2017-10-10 17:50+0200\n"
-"PO-Revision-Date: 2017-10-10 17:50+0200\n"
->>>>>>> upstream/master
+"POT-Creation-Date: 2017-10-18 11:13+0200\n"
+"PO-Revision-Date: 2017-10-18 11:13+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -117,6 +112,9 @@ msgstr ""
 msgid "Add new directory"
 msgstr ""
 
+msgid "AdminHealthPageLink|health page"
+msgstr ""
+
 msgid "All"
 msgstr ""
 
@@ -138,6 +136,9 @@ msgstr ""
 msgid "Are you sure you want to discard your changes?"
 msgstr ""
 
+msgid "Are you sure you want to leave this group?"
+msgstr ""
+
 msgid "Are you sure you want to reset registration token?"
 msgstr ""
 
@@ -171,18 +172,21 @@ msgstr ""
 msgid "AutoDevOps|Auto DevOps (Beta)"
 msgstr ""
 
-msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
-msgstr ""
-
 msgid "AutoDevOps|Auto DevOps documentation"
 msgstr ""
 
 msgid "AutoDevOps|Enable in settings"
 msgstr ""
 
+msgid "AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
+msgstr ""
+
 msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
 msgstr ""
 
+msgid "AutoDevOps|You can activate %{link_to_settings} for this project."
+msgstr ""
+
 msgid "Billing"
 msgstr ""
 
@@ -245,6 +249,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}"
 msgstr ""
 
+msgid "Branch has changed"
+msgstr ""
+
 msgid "BranchSwitcherPlaceholder|Search branches"
 msgstr ""
 
@@ -455,19 +462,27 @@ msgstr ""
 msgid "CiStatus|running"
 msgstr ""
 
+msgid "CircuitBreakerApiLink|circuitbreaker api"
+msgstr ""
+
 msgid "Clone repository"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Close"
-=======
+msgstr ""
+
 msgid "Cluster"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account"
 msgstr ""
 
+msgid "ClusterIntegration|Advanced settings"
+msgstr ""
+
+msgid "ClusterIntegration|Cluster details"
+msgstr ""
+
 msgid "ClusterIntegration|Cluster integration"
 msgstr ""
 
@@ -519,6 +534,9 @@ msgstr ""
 msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters"
 msgstr ""
 
+msgid "ClusterIntegration|Manage Cluster integration on your GitLab project"
+msgstr ""
+
 msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}"
 msgstr ""
 
@@ -546,6 +564,9 @@ msgstr ""
 msgid "ClusterIntegration|Save"
 msgstr ""
 
+msgid "ClusterIntegration|See and edit the details for your cluster"
+msgstr ""
+
 msgid "ClusterIntegration|See machine types"
 msgstr ""
 
@@ -677,6 +698,12 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node"
+msgstr ""
+
+msgid "Control the maximum concurrency of repository backfill for this secondary node"
+msgstr ""
+
 msgid "Copy SSH public key to clipboard"
 msgstr ""
 
@@ -701,6 +728,9 @@ msgstr ""
 msgid "Create merge request"
 msgstr ""
 
+msgid "Create new branch"
+msgstr ""
+
 msgid "Create new..."
 msgstr ""
 
@@ -787,11 +817,10 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Dismiss Merge Request promotion"
-=======
 msgid "Dismiss Cycle Analytics introduction box"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Dismiss Merge Request promotion"
 msgstr ""
 
 msgid "Don't show again"
@@ -916,9 +945,15 @@ msgstr ""
 msgid "Geo Nodes"
 msgstr ""
 
+msgid "Geo|File sync capacity"
+msgstr ""
+
 msgid "Geo|Groups to replicate"
 msgstr ""
 
+msgid "Geo|Repository sync capacity"
+msgstr ""
+
 msgid "Geo|Select groups to replicate."
 msgstr ""
 
@@ -1045,18 +1080,16 @@ msgstr ""
 msgid "Install a Runner compatible with GitLab CI"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Instance"
 msgid_plural "Instances"
 msgstr[0] ""
 msgstr[1] ""
-=======
+
 msgid "Internal - The group and any internal projects can be viewed by any logged in user."
 msgstr ""
 
 msgid "Internal - The project can be accessed by any logged in user."
 msgstr ""
->>>>>>> upstream/master
 
 msgid "Interval Pattern"
 msgstr ""
@@ -1149,11 +1182,13 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Locked Files"
-=======
+msgstr ""
+
 msgid "Login"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Maximum git storage failures"
 msgstr ""
 
 msgid "Median"
@@ -1183,11 +1218,10 @@ msgstr ""
 msgid "More information is available|here"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Multiple issue boards"
-=======
+msgstr ""
+
 msgid "New Cluster"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "New Issue"
@@ -1492,6 +1526,9 @@ msgstr ""
 msgid "Profiles|your account"
 msgstr ""
 
+msgid "Project '%{project_name}' is in the process of being deleted."
+msgstr ""
+
 msgid "Project '%{project_name}' queued for deletion."
 msgstr ""
 
@@ -1501,9 +1538,6 @@ msgstr ""
 msgid "Project '%{project_name}' was successfully updated."
 msgstr ""
 
-msgid "Project '%{project_name}' will be deleted."
-msgstr ""
-
 msgid "Project access must be granted explicitly to each user."
 msgstr ""
 
@@ -1546,7 +1580,6 @@ msgstr ""
 msgid "ProjectNetworkGraph|Graph"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "ProjectSettings|Contact an admin to change this setting."
 msgstr ""
 
@@ -1560,9 +1593,9 @@ msgid "ProjectSettings|This setting is applied on the server level but has been
 msgstr ""
 
 msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
-=======
+msgstr ""
+
 msgid "Projects"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "ProjectsDropdown|Frequently visited"
@@ -1586,14 +1619,13 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Push Rules"
-=======
 msgid "Public - The group and any public projects can be viewed without any authentication."
 msgstr ""
 
 msgid "Public - The project can be accessed without any authentication."
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Push Rules"
 msgstr ""
 
 msgid "Push events"
@@ -1680,6 +1712,15 @@ msgstr ""
 msgid "Search branches and tags"
 msgstr ""
 
+msgid "Seconds before reseting failure information"
+msgstr ""
+
+msgid "Seconds to wait after a storage failure"
+msgstr ""
+
+msgid "Seconds to wait for a storage access attempt"
+msgstr ""
+
 msgid "Select Archive Format"
 msgstr ""
 
@@ -1736,11 +1777,7 @@ msgstr ""
 msgid "Something went wrong while fetching the registry list."
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}"
-=======
 msgid "Sort by"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "SortOptions|Access level, ascending"
@@ -1901,6 +1938,9 @@ msgstr ""
 msgid "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage."
 msgstr ""
 
+msgid "The number of failures of after which GitLab will completely prevent access to the storage. The number of failures can be reset in the admin interface: %{link_to_health_page} or using the %{api_documentation_link}."
+msgstr ""
+
 msgid "The phase of the development lifecycle."
 msgstr ""
 
@@ -1931,6 +1971,12 @@ msgstr ""
 msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
 msgstr ""
 
+msgid "The time in seconds GitLab will keep failure information. When no failures occur during this time, information about the mount is reset."
+msgstr ""
+
+msgid "The time in seconds GitLab will try to access storage. After this time a timeout error will be raised."
+msgstr ""
+
 msgid "The time taken by each data entry gathered by that stage."
 msgstr ""
 
@@ -1940,6 +1986,9 @@ msgstr ""
 msgid "There are problems accessing Git storage: "
 msgstr ""
 
+msgid "This branch has changed since you started editing. Would you like to create a new branch?"
+msgstr ""
+
 msgid "This is a confidential issue."
 msgstr ""
 
@@ -2112,12 +2161,9 @@ msgstr ""
 msgid "Total test time for all commits/merges"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Track activity with Contribution Analytics."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Unlock"
 msgstr ""
 
@@ -2190,6 +2236,9 @@ msgstr ""
 msgid "Weight"
 msgstr ""
 
+msgid "When access to a storage fails. GitLab will prevent access to the storage for the time specified here. This allows the filesystem to recover. Repositories on failing shards are temporarly unavailable"
+msgstr ""
+
 msgid "Wiki"
 msgstr ""
 
@@ -2313,9 +2362,15 @@ msgstr ""
 msgid "You are on a read-only GitLab instance."
 msgstr ""
 
+msgid "You are on a read-only GitLab instance. If you want to make any changes, you must visit the %{link_to_primary_node}."
+msgstr ""
+
 msgid "You can only add files when you are on a branch"
 msgstr ""
 
+msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
+msgstr ""
+
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""
 
@@ -2352,12 +2407,9 @@ msgstr ""
 msgid "Your comment will not be visible to the public."
 msgstr ""
 
-<<<<<<< HEAD
-=======
 msgid "Your groups"
 msgstr ""
 
->>>>>>> upstream/master
 msgid "Your name"
 msgstr ""
 
@@ -2383,15 +2435,14 @@ msgid_plural "parents"
 msgstr[0] ""
 msgstr[1] ""
 
-<<<<<<< HEAD
-msgid "to help your contributors communicate effectively!"
-=======
 msgid "password"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "personal access token"
 msgstr ""
 
+msgid "to help your contributors communicate effectively!"
+msgstr ""
+
 msgid "username"
 msgstr ""