summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-13 00:08:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-13 00:08:05 +0000
commit47b8f79a0896f406008d5a7eda2781f8da301e91 (patch)
tree1f15328719ca1215a2bd0ec6650ece0ca59de3f4 /locale
parent52fe64b740a4ddbd5b085386dfe40fea191174ea (diff)
downloadgitlab-ce-47b8f79a0896f406008d5a7eda2781f8da301e91.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot12
1 files changed, 6 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b8d97df1ab9..4a787a55e31 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6078,6 +6078,9 @@ msgstr ""
msgid "Discussion"
msgstr ""
+msgid "Discussion to reply to cannot be found"
+msgstr ""
+
msgid "Disk Usage"
msgstr ""
@@ -7395,9 +7398,6 @@ msgstr ""
msgid "Failed to reset key. Please try again."
msgstr ""
-msgid "Failed to save comment!"
-msgstr ""
-
msgid "Failed to save merge conflicts resolutions. Please try again!"
msgstr ""
@@ -16399,9 +16399,6 @@ msgstr ""
msgid "Something went wrong while adding your award. Please try again."
msgstr ""
-msgid "Something went wrong while adding your comment. Please try again."
-msgstr ""
-
msgid "Something went wrong while applying the suggestion. Please try again."
msgstr ""
@@ -20647,6 +20644,9 @@ msgstr ""
msgid "Your changes have been successfully committed."
msgstr ""
+msgid "Your comment could not be submitted because %{error}"
+msgstr ""
+
msgid "Your comment could not be submitted! Please check your network connection and try again."
msgstr ""