diff options
Diffstat (limited to 'webapp')
| -rwxr-xr-x | webapp/i18n/en.json | 5 | ||||
| -rw-r--r-- | webapp/images/warning.png | bin | 0 -> 1046 bytes | |||
| -rw-r--r-- | webapp/webpack.config.js | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 91ebd13c6..62f50e39f 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1455,11 +1455,14 @@ "emoji_picker.recent": "Recently Used", "emoji_picker.search": "Search", "emoji_picker.symbols": "Symbols", + "error.generic.title": "Error", + "error.generic.message": "An error has occurred.", + "error.generic.link_message": "Back to Mattermost", "error.generic.link": "Back to Mattermost", "error.generic.message": "An error has occurred.", "error.local_storage.help1": "Enable cookies", "error.local_storage.help2": "Turn off private browsing", - "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)", + "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 52+, Safari 9, Edge 40+)", "error.local_storage.message": "Mattermost was unable to load because a setting in your browser prevents the use of its local storage features. To allow Mattermost to load, try the following actions:", "error.not_found.link_message": "Back to Mattermost", "error.not_found.message": "The page you were trying to reach does not exist", diff --git a/webapp/images/warning.png b/webapp/images/warning.png Binary files differnew file mode 100644 index 000000000..19e13399b --- /dev/null +++ b/webapp/images/warning.png diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index e9de8dd82..b779e5d85 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -322,7 +322,8 @@ if (TEST) { {from: 'images/logo-email.png', to: 'images'}, {from: 'images/circles.png', to: 'images'}, {from: 'images/favicon', to: 'images/favicon'}, - {from: 'images/appIcons.png', to: 'images'} + {from: 'images/appIcons.png', to: 'images'}, + {from: 'images/warning.png', to: 'images'} ]) ); } |
