summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 21:09:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 21:09:38 +0000
commit232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9 (patch)
treea2b11b9a805ef1165d8730934ba4a4f801f31870 /locale
parent00fa950a34b1c94617110b150b8b2517d5241249 (diff)
downloadgitlab-ce-232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 0336e834d06..1bbb8be6af5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1777,6 +1777,9 @@ msgstr ""
msgid "An error occurred while committing your changes."
msgstr ""
+msgid "An error occurred while decoding the file."
+msgstr ""
+
msgid "An error occurred while deleting the approvers group"
msgstr ""
@@ -1918,6 +1921,9 @@ msgstr ""
msgid "An error occurred while loading the file."
msgstr ""
+msgid "An error occurred while loading the file. Please try again later."
+msgstr ""
+
msgid "An error occurred while loading the merge request changes."
msgstr ""