diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
| commit | 6611100480c86c07972c1223e7231c136966e11d (patch) | |
| tree | d6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /app/javascript/mastodon/locales/defaultMessages.json | |
| parent | 1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff) | |
| parent | d8d42179590db772cc5b1873385cba7e5afe20df (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 2a89c1153..dd249adf1 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2,6 +2,19 @@ { "descriptors": [ { + "defaultMessage": "Oops!", + "id": "alert.unexpected.title" + }, + { + "defaultMessage": "An unexpected error occurred.", + "id": "alert.unexpected.message" + } + ], + "path": "app/javascript/mastodon/actions/alerts.json" + }, + { + "descriptors": [ + { "defaultMessage": "{name} mentioned you", "id": "notification.mention" } |