Commit 9309c8af authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in locale/gitlab.pot

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 4f878a45
...@@ -369,15 +369,12 @@ msgid "Chat" ...@@ -369,15 +369,12 @@ msgid "Chat"
msgstr "" msgstr ""
msgid "Checking %{text} availability…" msgid "Checking %{text} availability…"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "Checking branch availability..." msgid "Checking branch availability..."
msgstr "" msgstr ""
msgid "Cherry-pick this commit" msgid "Cherry-pick this commit"
=======
>>>>>>> origin/master
msgstr "" msgstr ""
msgid "Checking branch availability..." msgid "Checking branch availability..."
...@@ -455,12 +452,9 @@ msgstr "" ...@@ -455,12 +452,9 @@ msgstr ""
msgid "ClusterIntegration|%{appList} was successfully installed on your cluster" msgid "ClusterIntegration|%{appList} was successfully installed on your cluster"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ClusterIntegration|%{appList} was successfully installed on your cluster" msgid "ClusterIntegration|%{appList} was successfully installed on your cluster"
msgstr "" msgstr ""
=======
>>>>>>> origin/master
msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}" msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}"
msgstr "" msgstr ""
...@@ -1845,7 +1839,6 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support" ...@@ -1845,7 +1839,6 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support"
msgstr "" msgstr ""
msgid "PrometheusService|By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server." msgid "PrometheusService|By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server."
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "PrometheusService|Finding and configuring metrics..." msgid "PrometheusService|Finding and configuring metrics..."
...@@ -1879,8 +1872,6 @@ msgid "PrometheusService|View environments" ...@@ -1879,8 +1872,6 @@ msgid "PrometheusService|View environments"
msgstr "" msgstr ""
msgid "Public - The group and any public projects can be viewed without any authentication." msgid "Public - The group and any public projects can be viewed without any authentication."
=======
>>>>>>> origin/master
msgstr "" msgstr ""
msgid "PrometheusService|Finding and configuring metrics..." msgid "PrometheusService|Finding and configuring metrics..."
...@@ -2215,7 +2206,6 @@ msgid "Tags" ...@@ -2215,7 +2206,6 @@ msgid "Tags"
msgstr "" msgstr ""
msgid "TagsPage|Browse commits" msgid "TagsPage|Browse commits"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "TagsPage|Browse files" msgid "TagsPage|Browse files"
...@@ -2285,8 +2275,6 @@ msgid "TagsPage|protected" ...@@ -2285,8 +2275,6 @@ msgid "TagsPage|protected"
msgstr "" msgstr ""
msgid "Target Branch" msgid "Target Branch"
=======
>>>>>>> origin/master
msgstr "" msgstr ""
msgid "TagsPage|Browse files" msgid "TagsPage|Browse files"
...@@ -2603,12 +2591,9 @@ msgid "Total Time" ...@@ -2603,12 +2591,9 @@ msgid "Total Time"
msgstr "" msgstr ""
msgid "Total issue time spent" msgid "Total issue time spent"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "Total test time for all commits/merges" msgid "Total test time for all commits/merges"
=======
>>>>>>> origin/master
msgstr "" msgstr ""
msgid "Total test time for all commits/merges" msgid "Total test time for all commits/merges"
......
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