Merge branch 'proof-read' into 'master'

Fix typo

See merge request gitlab-org/gitlab-ce!28939

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));

locale/gitlab.pot

@@ -853,9 +853,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 ""
 
@@ -883,6 +880,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 ""