summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-21 12:36:16 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-21 14:03:46 -0700
commitadd9defa05179865ee5460fd4bbd67cac9e23f53 (patch)
treed676a8deb8b84fe473a945222ccb01d6183b983e /locale
parent0c5c5a7ffa97b2b85d22ee2802f3787c53aab834 (diff)
downloadgitlab-ce-add9defa05179865ee5460fd4bbd67cac9e23f53.tar.gz
Fix sentence for i18n44895-explicit-merge-conflict
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot26
1 files changed, 19 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 74027b7aef5..608d2a584ba 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-17 09:05-0700\n"
-"PO-Revision-Date: 2018-05-17 09:05-0700\n"
+"POT-Creation-Date: 2018-05-21 12:38-0700\n"
+"PO-Revision-Date: 2018-05-21 12:38-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -82,6 +82,9 @@ msgstr[1] ""
msgid "%{loadingIcon} Started"
msgstr ""
+msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
+msgstr ""
+
msgid "%{nip_domain} can be used as an alternative to a custom domain."
msgstr ""
@@ -1447,7 +1450,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"
@@ -2487,6 +2490,9 @@ msgstr ""
msgid "Lock %{issuableDisplayName}"
msgstr ""
+msgid "Lock not found"
+msgstr ""
+
msgid "Lock to current projects"
msgstr ""
@@ -4281,6 +4287,9 @@ msgstr ""
msgid "Toggle Sidebar"
msgstr ""
+msgid "Toggle discussion"
+msgstr ""
+
msgid "Toggle sidebar"
msgstr ""
@@ -4602,15 +4611,21 @@ msgstr ""
msgid "You can only edit files when you are on a branch"
msgstr ""
-msgid "You can resolve the merge conflict using either the Interactive mode, by choosing"
+msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
msgstr ""
msgid "You cannot write to this read-only GitLab instance."
msgstr ""
+msgid "You have no permissions"
+msgstr ""
+
msgid "You have reached your project limit"
msgstr ""
+msgid "You must have master access to force delete a lock"
+msgstr ""
+
msgid "You must sign in to star a project"
msgstr ""
@@ -4692,9 +4707,6 @@ msgstr ""
msgid "branch name"
msgstr ""
-msgid "buttons, or by editing the files directly. Commit these changes into"
-msgstr ""
-
msgid "command line instructions"
msgstr ""