summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-03-09 12:27:44 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-03-09 12:27:44 -0500
commit08742a41eb52534b217cfaba82ff3f94646a7a63 (patch)
treebf59b5e3d2487e8219bc5bf6f3a3c3d4effab028
parent13837c01217550688ac25f7f61938ef59422cb2c (diff)
parentb77a04009e8b670d704b8f1b862d6ed5bb42d4e8 (diff)
downloadchat-08742a41eb52534b217cfaba82ff3f94646a7a63.tar.gz
chat-08742a41eb52534b217cfaba82ff3f94646a7a63.tar.bz2
chat-08742a41eb52534b217cfaba82ff3f94646a7a63.zip
Merge pull request #2394 from ZBoxApp/es-locs
Add missing server spanish locs
-rw-r--r--i18n/en.json32
-rw-r--r--i18n/es.json20
2 files changed, 34 insertions, 18 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 6ac5ce5c2..bc33fc019 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -456,22 +456,6 @@
"translation": "S3 is not supported for local storage export."
},
{
- "id": "api.file.move_file.get_from_s3.app_error",
- "translation": "Unable to get file from S3."
- },
- {
- "id": "api.file.move_file.delete_from_s3.app_error",
- "translation": "Unable to delete file from S3."
- },
- {
- "id": "api.file.move_file.rename.app_error",
- "translation": "Unable to move file locally."
- },
- {
- "id": "api.file.move_file.configured.app_error",
- "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
- },
- {
"id": "api.file.file_upload.exceeds",
"translation": "File exceeds max image size."
},
@@ -524,6 +508,22 @@
"translation": "Initializing file api routes"
},
{
+ "id": "api.file.move_file.configured.app_error",
+ "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+ },
+ {
+ "id": "api.file.move_file.delete_from_s3.app_error",
+ "translation": "Unable to delete file from S3."
+ },
+ {
+ "id": "api.file.move_file.get_from_s3.app_error",
+ "translation": "Unable to get file from S3."
+ },
+ {
+ "id": "api.file.move_file.rename.app_error",
+ "translation": "Unable to move file locally."
+ },
+ {
"id": "api.file.open_file_write_stream.configured.app_error",
"translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
},
diff --git a/i18n/es.json b/i18n/es.json
index 6443d18dc..4c0c1fd03 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -456,8 +456,8 @@
"translation": "S3 no está soportado para exportar al almacenamiento local."
},
{
- "id": "api.export.write_file.app_error",
- "translation": "No se puede escribir al archivo a exportar"
+ "id": "api.file.file_upload.exceeds",
+ "translation": "El archivo excede el tamaño máximo para una imagen."
},
{
"id": "api.file.file_upload.exceeds",
@@ -508,6 +508,22 @@
"translation": "Inicializando rutas del API para los archivos"
},
{
+ "id": "api.file.move_file.configured.app_error",
+ "translation": "No ha sido configurado apropiadamente el almacenamiento. Por favor configuralo para utilizar ya sea S3 o almacenamiento local."
+ },
+ {
+ "id": "api.file.move_file.delete_from_s3.app_error",
+ "translation": "No se pudo eliminar el archivo del S3."
+ },
+ {
+ "id": "api.file.move_file.get_from_s3.app_error",
+ "translation": "No se pudo obtener el archivo desde el S3."
+ },
+ {
+ "id": "api.file.move_file.rename.app_error",
+ "translation": "No se pudo mover el archivo localmente."
+ },
+ {
"id": "api.file.open_file_write_stream.configured.app_error",
"translation": "El almacenamiento de archivos no ha sido configurado apropiadamente. Por favor configuralo ya sea para S3 o para almacenamiento en el servidor local."
},