summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-04-13 09:22:18 -0300
committerChristopher Speller <crspeller@gmail.com>2016-04-13 08:22:18 -0400
commit76c4bebf9f6b1a56cc0a3243e7301d3c65dd8fb6 (patch)
tree15b22c89baa7c8442a1f0d4182c9804e23022e50 /i18n/en.json
parent49ab8b216191749bd39694d79f687a84ad24adf0 (diff)
downloadchat-76c4bebf9f6b1a56cc0a3243e7301d3c65dd8fb6.tar.gz
chat-76c4bebf9f6b1a56cc0a3243e7301d3c65dd8fb6.tar.bz2
chat-76c4bebf9f6b1a56cc0a3243e7301d3c65dd8fb6.zip
Add spanish missing locs and sort by id (#2694)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json98
1 files changed, 49 insertions, 49 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 27f9a680a..a135e04be 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,27 +48,11 @@
"translation": "September"
},
{
- "id": "api.admin.upload_brand_image.storage.app_error",
- "translation": "Unable to upload image. Image storage is not configured."
- },
- {
- "id": "api.admin.upload_brand_image.too_large.app_error",
- "translation": "Unable to upload file. File is too large."
- },
- {
- "id": "api.admin.upload_brand_image.parse.app_error",
- "translation": "Could not parse multipart form"
- },
- {
- "id": "api.admin.upload_brand_image.no_file.app_error",
- "translation": "No file under 'image' in request"
- },
- {
- "id": "api.admin.upload_brand_image.array.app_error",
- "translation": "Empty array under 'image' in request"
+ "id": "api.admin.file_read_error",
+ "translation": "Error reading log file"
},
{
- "id": "api.admin.upload_brand_image.not_available.app_error",
+ "id": "api.admin.get_brand_image.not_available.app_error",
"translation": "Custom branding is not configured or supported on this server"
},
{
@@ -76,52 +60,40 @@
"translation": "Image storage is not configured."
},
{
- "id": "api.admin.get_brand_image.not_available.app_error",
- "translation": "Custom branding is not configured or supported on this server"
- },
- {
- "id": "store.sql_system.get_by_name.app_error",
- "translation": "We couldn't find the system variable."
- },
- {
- "id": "ent.brand.save_brand_image.open.app_error",
- "translation": "Unable to open the image."
- },
- {
- "id": "ent.brand.save_brand_image.decode_config.app_error",
- "translation": "Unable to decode image config."
+ "id": "api.admin.init.debug",
+ "translation": "Initializing admin api routes"
},
{
- "id": "ent.brand.save_brand_image.too_large.app_error",
- "translation": "Unable to open image. Image is too large."
+ "id": "api.admin.test_email.body",
+ "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!"
},
{
- "id": "ent.brand.save_brand_image.decode.app_error",
- "translation": "Unable to decode image."
+ "id": "api.admin.test_email.subject",
+ "translation": "Mattermost - Testing Email Settings"
},
{
- "id": "ent.brand.save_brand_image.encode.app_error",
- "translation": "Unable to encode image as PNG."
+ "id": "api.admin.upload_brand_image.array.app_error",
+ "translation": "Empty array under 'image' in request"
},
{
- "id": "ent.brand.save_brand_image.save_image.app_error",
- "translation": "Unable to save image"
+ "id": "api.admin.upload_brand_image.no_file.app_error",
+ "translation": "No file under 'image' in request"
},
{
- "id": "api.admin.file_read_error",
- "translation": "Error reading log file"
+ "id": "api.admin.upload_brand_image.not_available.app_error",
+ "translation": "Custom branding is not configured or supported on this server"
},
{
- "id": "api.admin.init.debug",
- "translation": "Initializing admin api routes"
+ "id": "api.admin.upload_brand_image.parse.app_error",
+ "translation": "Could not parse multipart form"
},
{
- "id": "api.admin.test_email.body",
- "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!"
+ "id": "api.admin.upload_brand_image.storage.app_error",
+ "translation": "Unable to upload image. Image storage is not configured."
},
{
- "id": "api.admin.test_email.subject",
- "translation": "Mattermost - Testing Email Settings"
+ "id": "api.admin.upload_brand_image.too_large.app_error",
+ "translation": "Unable to upload file. File is too large."
},
{
"id": "api.api.init.parsing_templates.debug",
@@ -1832,6 +1804,30 @@
"translation": "Inappropriate permissions to regenerate outcoming webhook token"
},
{
+ "id": "ent.brand.save_brand_image.decode.app_error",
+ "translation": "Unable to decode image."
+ },
+ {
+ "id": "ent.brand.save_brand_image.decode_config.app_error",
+ "translation": "Unable to decode image config."
+ },
+ {
+ "id": "ent.brand.save_brand_image.encode.app_error",
+ "translation": "Unable to encode image as PNG."
+ },
+ {
+ "id": "ent.brand.save_brand_image.open.app_error",
+ "translation": "Unable to open the image."
+ },
+ {
+ "id": "ent.brand.save_brand_image.save_image.app_error",
+ "translation": "Unable to save image"
+ },
+ {
+ "id": "ent.brand.save_brand_image.too_large.app_error",
+ "translation": "Unable to open image. Image is too large."
+ },
+ {
"id": "ent.compliance.licence_disable.app_error",
"translation": "Compliance functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
},
@@ -3272,6 +3268,10 @@
"translation": "We encountered an error finding the system properties"
},
{
+ "id": "store.sql_system.get_by_name.app_error",
+ "translation": "We couldn't find the system variable."
+ },
+ {
"id": "store.sql_system.save.app_error",
"translation": "We encountered an error saving the system property"
},