summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndré Luís <me@andr3.net>2019-07-16 02:48:40 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-07-16 02:48:40 +0000
commitee85e3f4668743c916b48dabfc7fd58214a4505c (patch)
treec1d50dda90ad51e6d1729dc33783b53e3df09bde /locale
parentad5bcd9109b341630a2d880dab45e9f0788a7d28 (diff)
downloadgitlab-ce-ee85e3f4668743c916b48dabfc7fd58214a4505c.tar.gz
Fix broken vue i18n strings
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot6
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index dd0aac1f259..f498961c8d1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9733,6 +9733,9 @@ msgstr ""
msgid "Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead."
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."
+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."
msgstr ""
@@ -12516,6 +12519,9 @@ msgstr ""
msgid "You'll need to use different branch names to get a valid comparison."
msgstr ""
+msgid "You're not allowed to %{tag_start}edit%{tag_end} files in this project directly. Please fork this project, make your changes there, and submit a merge request."
+msgstr ""
+
msgid "You're not allowed to make changes to this project directly. A fork of this project has been created that you can make changes in, so you can submit a merge request."
msgstr ""