Commit 3f4ae43e authored by Mayra Cabrera's avatar Mayra Cabrera

Fixes conflict for gitlab.pot

parent f8324c83
......@@ -2867,7 +2867,6 @@ msgstr ""
msgid "Environments|You don't have any environments right now."
msgstr ""
<<<<<<< HEAD
msgid "Environments|protected"
msgstr ""
......@@ -2907,8 +2906,6 @@ msgstr ""
msgid "Epics|start"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Error"
msgstr ""
......@@ -3969,12 +3966,9 @@ msgstr ""
msgid "Inline"
msgstr ""
<<<<<<< HEAD
msgid "Input host keys manually"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Input your repository URL"
msgstr ""
......@@ -5809,7 +5803,6 @@ msgstr ""
msgid "Public pipelines"
msgstr ""
<<<<<<< HEAD
msgid "Pull"
msgstr ""
......@@ -5819,11 +5812,6 @@ msgstr ""
msgid "Push Rules"
msgstr ""
=======
msgid "Push"
msgstr ""
>>>>>>> upstream/master
msgid "Push events"
msgstr ""
......@@ -6331,12 +6319,9 @@ msgstr ""
msgid "Set up Koding"
msgstr ""
<<<<<<< HEAD
msgid "Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
msgstr ""
......@@ -6821,15 +6806,12 @@ msgstr ""
msgid "Test coverage parsing"
msgstr ""
<<<<<<< HEAD
msgid "Thanks! Don't show me this again"
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."
msgstr ""
=======
>>>>>>> upstream/master
msgid "The Git LFS objects will <strong>not</strong> be synced."
msgstr ""
......@@ -7112,7 +7094,6 @@ msgstr ""
msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches."
msgstr ""
<<<<<<< HEAD
msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user."
msgstr ""
......@@ -7122,8 +7103,6 @@ msgstr ""
msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here."
msgstr ""
=======
>>>>>>> upstream/master
msgid "Time before an issue gets scheduled"
msgstr ""
......@@ -7497,7 +7476,6 @@ msgstr ""
msgid "Updating"
msgstr ""
<<<<<<< HEAD
msgid "Upgrade your plan to activate Advanced Global Search."
msgstr ""
......@@ -7513,8 +7491,6 @@ msgstr ""
msgid "Upgrade your plan to improve Issue boards."
msgstr ""
=======
>>>>>>> upstream/master
msgid "Upload <code>GoogleCodeProjectHosting.json</code> here:"
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