From 32a829445c8cd9e542acbf3168e0592ea8bdf323 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 22 Sep 2021 09:11:53 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- locale/gitlab.pot | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'locale') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cd7703d2083..fe666a2c6b4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -465,7 +465,10 @@ msgstr "" msgid "%{code_open}Protected:%{code_close} Only exposed to protected branches or tags." msgstr "" -msgid "%{commit_author_link} authored %{commit_timeago}" +msgid "%{commit_author_link} authored %{commit_authored_timeago}" +msgstr "" + +msgid "%{commit_author_link} authored %{commit_authored_timeago} and %{commit_committer_avatar} %{commit_committer_link} committed %{commit_committer_timeago}" msgstr "" msgid "%{completedCount} completed weight" @@ -4771,6 +4774,9 @@ msgstr "" msgid "Authenticated Git LFS request rate limit" msgstr "" +msgid "Authenticated Git LFS requests" +msgstr "" + msgid "Authenticated web rate limit period in seconds" msgstr "" @@ -16393,10 +16399,10 @@ msgstr "" msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}." msgstr "" -msgid "GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually." +msgid "GroupSettings|This setting is applied to all subgroups unless overridden by a group owner. Groups that have already been added to the project lose access." msgstr "" -msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually." +msgid "GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually." msgstr "" msgid "GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects." -- cgit v1.2.3