summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2018-07-18 11:30:48 -0400
committerGitHub <noreply@github.com>2018-07-18 11:30:48 -0400
commit6b27b74f0cbd39e5d1400cddbed6437a4df64856 (patch)
tree0de822be9950802bc08ee460558aebc296f089df /i18n/en.json
parent715de382d23ff287f3ed6289b14b5a18240af5ff (diff)
downloadchat-6b27b74f0cbd39e5d1400cddbed6437a4df64856.tar.gz
chat-6b27b74f0cbd39e5d1400cddbed6437a4df64856.tar.bz2
chat-6b27b74f0cbd39e5d1400cddbed6437a4df64856.zip
translations PR 20180718 (#9123)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json40
1 files changed, 20 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 2992b2044..9493a36b0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -160,10 +160,6 @@
"translation": "The channel has been archived or deleted"
},
{
- "id": "api.reaction.town_square_read_only",
- "translation": "Reacting to posts is not possible in read-only channels."
- },
- {
"id": "api.channel.delete_channel.type.invalid",
"translation": "Cannot delete direct or group message channels"
},
@@ -1447,6 +1443,10 @@
"translation": "You cannot save reaction for the other user."
},
{
+ "id": "api.reaction.town_square_read_only",
+ "translation": "Reacting to posts is not possible in read-only channels."
+ },
+ {
"id": "api.roles.patch_roles.license.error",
"translation": "Your license does not support advanced permissions."
},
@@ -2395,22 +2395,6 @@
"translation": "Cluster API endpoint not found."
},
{
- "id": "app.import.emoji.bad_file.error",
- "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
- },
- {
- "id": "app.import.validate_emoji_import_data.empty.error",
- "translation": "Import emoji data empty."
- },
- {
- "id": "app.import.validate_emoji_import_data.name_missing.error",
- "translation": "Import emoji name field missing or blank."
- },
- {
- "id": "app.import.validate_emoji_import_data.image_missing.error",
- "translation": "Import emoji image field missing or blank."
- },
- {
"id": "app.import.bulk_import.file_scan.error",
"translation": "Error reading import data file."
},
@@ -2423,6 +2407,10 @@
"translation": "Incorrect or missing version in the data import file. Make sure version is the first object in your import file and try again."
},
{
+ "id": "app.import.emoji.bad_file.error",
+ "translation": "Error reading import emoji image file. Emoji with name: \"{{.EmojiName}}\""
+ },
+ {
"id": "app.import.import_channel.scheme_deleted.error",
"translation": "Cannot set a channel to use a deleted scheme."
},
@@ -2643,6 +2631,18 @@
"translation": "Missing required direct post property: user"
},
{
+ "id": "app.import.validate_emoji_import_data.empty.error",
+ "translation": "Import emoji data empty."
+ },
+ {
+ "id": "app.import.validate_emoji_import_data.image_missing.error",
+ "translation": "Import emoji image field missing or blank."
+ },
+ {
+ "id": "app.import.validate_emoji_import_data.name_missing.error",
+ "translation": "Import emoji name field missing or blank."
+ },
+ {
"id": "app.import.validate_post_import_data.channel_missing.error",
"translation": "Missing required Post property: Channel."
},