diff options
| author | Eugen <eugen@zeonfederated.com> | 2016-12-18 21:22:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 21:22:46 +0100 |
| commit | 6b67b55cee5d3adda87b3990e54bdd7fefee1ef6 (patch) | |
| tree | fc748c7e4e210dbdf0d7c118e81e8bf0b8c00eca | |
| parent | 5ae1b39ec9b4d5269d2f01aeaa4304252b694519 (diff) | |
| parent | f5c8d64b6d43f5b515ea69088f190f20fb04a27c (diff) | |
Merge pull request #356 from victorhck/master
added two missings spanish translations
| -rw-r--r-- | app/assets/javascripts/components/locales/es.jsx | 4 | ||||
| -rw-r--r-- | config/locales/simple_form.es.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/locales/es.jsx b/app/assets/javascripts/components/locales/es.jsx index d6e61fd9e..6bd9b18ed 100644 --- a/app/assets/javascripts/components/locales/es.jsx +++ b/app/assets/javascripts/components/locales/es.jsx @@ -35,8 +35,8 @@ const es = { "tabs_bar.notifications": "Notificaciones", "compose_form.placeholder": "¿En qué estás pensando?", "compose_form.publish": "Publicar", - "compose_form.sensitive": null, - "compose_form.unlisted": "No listado", + "compose_form.sensitive": "Marcar el contenido como sensible", + "compose_form.unlisted": "Privado", "navigation_bar.settings": "Ajustes", "navigation_bar.public_timeline": "Público", "navigation_bar.logout": "Cerrar sesión", diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index b6a8fe3d2..f1db48df8 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -9,7 +9,7 @@ es: current_password: Contraseña actual display_name: Mostrar nombre email: Dirección de correo electrónico - header: Título + header: Img. cabecera locale: Idioma new_password: Nueva contraseña note: Biografía |