diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-05 11:58:18 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 11:58:18 -0400 |
| commit | dc2f2a800105b77e665ec2a00c6290f35b1a2ba3 (patch) | |
| tree | 82f23c2e72a7c785f55c2d6c1c35c10c16994918 /i18n/en.json | |
| parent | a65f1fc266f15eaa8f79541d4d11440c3d356bb6 (diff) | |
| download | chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.gz chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.bz2 chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.zip | |
PLT-3145 Custom Emojis (#3381)
* Reorganized Backstage code to use a view controller and separated it from integrations code
* Renamed InstalledIntegrations component to BackstageList
* Added EmojiList page
* Added AddEmoji page
* Added custom emoji to autocomplete and text formatter
* Moved system emoji to EmojiStore
* Stopped trying to get emoji before logging in
* Rerender posts when emojis change
* Fixed submit handler on backstage pages to properly support enter
* Removed debugging code
* Updated javascript driver
* Fixed unit tests
* Fixed backstage routes
* Added clientside validation to prevent users from creating an emoji with the same name as a system one
* Fixed AddEmoji page to properly redirect when an emoji is created successfully
* Fixed updating emoji list when an emoji is deleted
* Added type prop to BackstageList to properly support using a table for the list
* Added help text to EmojiList
* Fixed backstage on smaller screen sizes
* Disable custom emoji by default
* Improved restrictions on creating emojis
* Fixed non-admin users seeing the option to delete each other's emojis
* Fixing gofmt
* Fixed emoji unit tests
* Fixed trying to get emoji from the server when it's disabled
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/i18n/en.json b/i18n/en.json index 3d433dae9..f76c7f637 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -581,7 +581,7 @@ }, { "id": "api.emoji.create.parse.app_error", - "translation": "Unable to create emoji. Image exceeds maximum file size." + "translation": "Unable to create emoji. Could not understand request." }, { "id": "api.emoji.create.permissions.app_error", @@ -589,7 +589,7 @@ }, { "id": "api.emoji.create.too_large.app_error", - "translation": "Unable to create emoji. Could not understand request." + "translation": "Unable to create emoji. Image must be less than 64 KB in size." }, { "id": "api.emoji.delete.permissions.app_error", @@ -621,7 +621,7 @@ }, { "id": "api.emoji.upload.large_image.app_error", - "translation": "Unable to create emoji. Image exceeds maximum dimensions." + "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels." }, { "id": "api.export.json.app_error", @@ -2080,6 +2080,10 @@ "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'" }, { + "id": "ent.emoji.licence_disable.app_error", + "translation": "Custom emoji restrictions disabled by current license. Please contact your system administrator about upgrading your enterprise license." + }, + { "id": "ent.ldap.do_login.bind_admin_user.app_error", "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword." }, |