summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorSamantha Ming <sming@gitlab.com>2019-07-25 19:30:50 -0700
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-20 15:15:18 -0500
commitf1f34baf6f4e0866feb3f4c7523e3dccf5784b0b (patch)
tree0922f96df924d9e9bf99ccc3a047683b7586b9c7 /locale
parentfd589be32f02c160812bbce0f5fb2178fb7142d3 (diff)
downloadgitlab-ce-f1f34baf6f4e0866feb3f4c7523e3dccf5784b0b.tar.gz
Improve UX multi assigness in MR
Add merge warning on avatar in: - open view assigness - collapsed view assigness - dropdown (search) view assigness Add can_merge option to MR sidebar entity
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot21
1 files changed, 15 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 26e6cb524bd..2b71d099a01 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -128,9 +128,6 @@ msgstr[1] ""
msgid "%{actionText} & %{openOrClose} %{noteable}"
msgstr ""
-msgid "%{canMergeCount}/%{assigneesCount} can merge"
-msgstr ""
-
msgid "%{commit_author_link} authored %{commit_timeago}"
msgstr ""
@@ -202,6 +199,9 @@ msgstr ""
msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
msgstr ""
+msgid "%{mergeLength}/%{usersLength} can merge"
+msgstr ""
+
msgid "%{mrText}, this issue will be closed automatically."
msgstr ""
@@ -279,6 +279,9 @@ msgstr ""
msgid "%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc."
msgstr ""
+msgid "%{userName} (cannot merge)"
+msgstr ""
+
msgid "%{userName}'s avatar"
msgstr ""
@@ -306,6 +309,9 @@ msgstr ""
msgid "(external source)"
msgstr ""
+msgid "+ %{amount} more"
+msgstr ""
+
msgid "+ %{count} more"
msgstr ""
@@ -7439,9 +7445,6 @@ msgstr ""
msgid "No milestones to show"
msgstr ""
-msgid "No one can merge"
-msgstr ""
-
msgid "No other labels with such name or description"
msgstr ""
@@ -13452,6 +13455,9 @@ msgstr ""
msgid "cannot include leading slash or directory traversal."
msgstr ""
+msgid "cannot merge"
+msgstr ""
+
msgid "comment"
msgstr ""
@@ -13879,6 +13885,9 @@ msgstr ""
msgid "no contributions"
msgstr ""
+msgid "no one can merge"
+msgstr ""
+
msgid "none"
msgstr ""