summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatrin Leinweber <724395-katrinleinweber@users.noreply.gitlab.com>2019-05-30 16:11:55 +0200
committerKatrin Leinweber <724395-katrinleinweber@users.noreply.gitlab.com>2019-05-30 19:57:27 +0200
commit6c0d4c958a23c616789ba5e96d7e2b232782597b (patch)
tree849d8d65495afea3a3dcd525495a48c16e74b907
parenta546b76ab263cf0d339087583762cd2b6ff50792 (diff)
downloadgitlab-ce-6c0d4c958a23c616789ba5e96d7e2b232782597b.tar.gz
Fix typo & run bin/rake gettext:regenerate
-rw-r--r--app/assets/javascripts/repository/components/table/index.vue2
-rw-r--r--locale/gitlab.pot6
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index f4df98ac2ff..cccde1bb278 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -100,7 +100,7 @@ export default {
this.fetchFiles();
}
})
- .catch(() => createFlash(__('An error occurding while fetching folder content.')));
+ .catch(() => createFlash(__('An error occurred while fetching folder content.')));
},
normalizeData(key, data) {
return this.entries[key].concat(data.map(({ node }) => node));
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d1ec833abff..b7245212738 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -832,9 +832,6 @@ msgstr ""
msgid "An error has occurred"
msgstr ""
-msgid "An error occurding while fetching folder content."
-msgstr ""
-
msgid "An error occurred creating the new branch."
msgstr ""
@@ -862,6 +859,9 @@ msgstr ""
msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
msgstr ""
+msgid "An error occurred while fetching folder content."
+msgstr ""
+
msgid "An error occurred while fetching label colors."
msgstr ""