Regenerated 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: 2018-05-16 14:41+0200\n"
-"PO-Revision-Date: 2018-05-16 14:41+0200\n"
-=======
-"POT-Creation-Date: 2018-05-16 18:52+0200\n"
-"PO-Revision-Date: 2018-05-16 18:52+0200\n"
->>>>>>> upstream/master
+"POT-Creation-Date: 2018-05-22 07:03+0000\n"
+"PO-Revision-Date: 2018-05-22 07:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1673,7 +1668,7 @@ msgstr ""
 msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images."
 msgstr ""
 
-msgid "ContainerRegistry|You can also %{deploy_token} for read-only access to the registry images."
+msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images."
 msgstr ""
 
 msgid "Continuous Integration and Deployment"
@@ -2158,11 +2153,10 @@ msgstr ""
 msgid "Enable the Performance Bar for a given group."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Enabled"
-=======
+msgstr ""
+
 msgid "Ends at (UTC)"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Environments"
@@ -4702,11 +4696,10 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "State your message to activate"
-=======
 msgid "Starts at (UTC)"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "State your message to activate"
 msgstr ""
 
 msgid "Status"
@@ -5270,6 +5263,9 @@ msgstr ""
 msgid "Toggle Sidebar"
 msgstr ""
 
+msgid "Toggle discussion"
+msgstr ""
+
 msgid "Toggle sidebar"
 msgstr ""
 
@@ -6009,9 +6005,6 @@ msgstr ""
 msgid "mrWidget|An error occured while removing your approval."
 msgstr ""
 
-msgid "mrWidget|An error occured while retrieving approval data for this merge request."
-msgstr ""
-
 msgid "mrWidget|An error occured while submitting your approval."
 msgstr ""