From c2f65d6e6f569415fe60e40aec5be6458d6a99bb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Nov 2022 06:10:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- locale/gitlab.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'locale') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e9cb7b51451..e90175cf321 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -38418,10 +38418,10 @@ msgstr "" msgid "Some common domains are not allowed. %{learn_more_link}." msgstr "" -msgid "Someone edited the file the same time you did. Please check out %{link_start}the file %{icon}%{link_end} and make sure your changes will not unintentionally remove theirs." +msgid "Someone edited the %{issuableType} at the same time you did. Review %{linkStart}the %{issuableType}%{linkEnd} and make sure you don't unintentionally overwrite their changes." msgstr "" -msgid "Someone edited the issue at the same time you did. Please check out %{linkStart}the issue%{linkEnd} and make sure your changes will not unintentionally remove theirs." +msgid "Someone edited the file the same time you did. Please check out %{link_start}the file %{icon}%{link_end} and make sure your changes will not unintentionally remove theirs." msgstr "" msgid "Someone edited this %{issueType} at the same time you did. The description has been updated and you will need to make your changes again." -- cgit v1.2.3