summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-02-04 08:52:22 +0000
committerSean McGivern <sean@gitlab.com>2019-02-04 08:52:22 +0000
commit70b92fb380659717e2f3a4f5aac802ec5460e78c (patch)
treef7e8132f13cdcb25b098924e92eff5d53022483d /locale
parent200ebab1cf8a41585c94a15bcc37547abd73bc80 (diff)
parent863ee930a6260c42d3d0252a0310ac9adff24862 (diff)
downloadgitlab-ce-70b92fb380659717e2f3a4f5aac802ec5460e78c.tar.gz
Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master'
Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot12
1 files changed, 12 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8caa876e6b0..fd7e4754a7a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2992,6 +2992,9 @@ msgstr ""
msgid "Error Tracking"
msgstr ""
+msgid "Error deleting %{issuableType}"
+msgstr ""
+
msgid "Error fetching contributors data."
msgstr ""
@@ -3040,6 +3043,9 @@ msgstr ""
msgid "Error saving label update."
msgstr ""
+msgid "Error updating %{issuableType}"
+msgstr ""
+
msgid "Error updating status for all todos."
msgstr ""
@@ -6524,6 +6530,9 @@ msgstr ""
msgid "Snippets"
msgstr ""
+msgid "Someone edited this issue at the same time you did. The description has been updated and you will need to make your changes again."
+msgstr ""
+
msgid "Something went wrong on our end"
msgstr ""
@@ -7710,6 +7719,9 @@ msgstr ""
msgid "Update"
msgstr ""
+msgid "Update failed"
+msgstr ""
+
msgid "Update now"
msgstr ""