diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-21 12:52:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-21 12:52:34 +0000 |
| commit | 96b03792190a1679b99c0918d09b76b1c2e44dc7 (patch) | |
| tree | d5b052ac8fcd80182d844f426caf3222e545a27e /locale | |
| parent | d9f9904c60b1fee162d22ece4b8875fafd04b7e6 (diff) | |
| parent | e4c44b089b58d010fe8e05dbc76acbc68720ae43 (diff) | |
| download | gitlab-ce-96b03792190a1679b99c0918d09b76b1c2e44dc7.tar.gz | |
Merge branch 'ce-22058-improve-ux-multi-assignees-in-mr' into 'master'
Improve UX multi assigness in MR
See merge request gitlab-org/gitlab-ce!31545
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 6776bc3ea24..1c1a3a51932 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 "" @@ -13443,6 +13446,9 @@ msgstr "" msgid "cannot include leading slash or directory traversal." msgstr "" +msgid "cannot merge" +msgstr "" + msgid "comment" msgstr "" @@ -13870,6 +13876,9 @@ msgstr "" msgid "no contributions" msgstr "" +msgid "no one can merge" +msgstr "" + msgid "none" msgstr "" |