summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-31 21:12:35 -0800
committerCorey Hulen <corey@hulen.com>2016-01-31 21:12:35 -0800
commit0b022b130a6a4d4c3984fc7d021b2817b56480a1 (patch)
tree012ca48d9e0d87e52aa7786a05b4ba6d2d86710d /i18n
parent7ff7c864611590347cb6a230d31635ecabdc4f25 (diff)
parent90b65b593f2ecda94df3160067ac264762198c35 (diff)
downloadchat-0b022b130a6a4d4c3984fc7d021b2817b56480a1.tar.gz
chat-0b022b130a6a4d4c3984fc7d021b2817b56480a1.tar.bz2
chat-0b022b130a6a4d4c3984fc7d021b2817b56480a1.zip
Merge pull request #2031 from mattermost/Typos-and-tweaks
occured > occurred
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index a5eb4f607..c6d705819 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -401,7 +401,7 @@
},
{
"id": "api.context.unknown.app_error",
- "translation": "An unknown error has occured. Please contact support."
+ "translation": "An unknown error has occurred. Please contact support."
},
{
"id": "api.export.json.app_error",
@@ -957,7 +957,7 @@
},
{
"id": "api.team.email_teams.sending.error",
- "translation": "An error occured while sending an email in emailTeams err=%v"
+ "translation": "An error occurred while sending an email in emailTeams err=%v"
},
{
"id": "api.team.export_team.admin.app_error",