moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #120 from kruks23/development

Browse Source 
Update Spanish Translations + harcoded pref_advanced_options
This commit is contained in:
Daniel Gultsch 2014-05-16 23:13:08 +02:00
commit f9394e2e69
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
res/values-es/strings.xml
View File

@ -5,11 +5,14 @@
<string name="action_settings">Ajustes</string> <string name="action_settings">Ajustes</string>
<string name="action_add">Nueva conversación</string> <string name="action_add">Nueva conversación</string>
<string name="action_accounts">Gestionar cuentas</string> <string name="action_accounts">Gestionar cuentas</string>
<string name="action_refresh">Actualizar lista de contactos</string>
<string name="action_end_conversation">Terminar conversación</string> <string name="action_end_conversation">Terminar conversación</string>
<string name="action_contact_details">Detalles del contacto</string> <string name="action_contact_details">Detalles del contacto</string>
<string name="action_muc_details">Detalles de la conferencia</string> <string name="action_muc_details">Detalles de la conferencia</string>
<string name="action_secure">Conversación segura</string> <string name="action_secure">Conversación segura</string>
<string name="action_add_account">Añadir cuenta</string> <string name="action_add_account">Añadir cuenta</string>
<string name="action_edit_contact">Editar contacto</string>
<string name="action_delete_contact">Eliminar contacto de la lista</string>
<string name="title_activity_contacts">Contactos</string> <string name="title_activity_contacts">Contactos</string>
<string name="just_now">ahora</string> <string name="just_now">ahora</string>
<string name="sending">enviando&#8230;</string> <string name="sending">enviando&#8230;</string>
@ -131,4 +134,33 @@
<string name="attach_choose_picture">Selecciona imagen</string> <string name="attach_choose_picture">Selecciona imagen</string>
<string name="attach_take_picture">Toma una foto</string> <string name="attach_take_picture">Toma una foto</string>
<string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string> <string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string>
<string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
<string name="error_compressing_image">Error convirtiendo el archivo de imagen</string>
<string name="error_file_not_found">Archivo no encontrado</string>
<string name="error_io_exception">Error I/O general. ¿Puede que te hayas quedado sin espacio en disco?</string>
<string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar imágenes no nos proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de ficheros diferente para seleccionar la imagen</small></string>
<string name="account_status">Estado:</string>
<string name="account_status_unknown">Desconocido</string>
<string name="account_status_disabled">Deshabilitado temporalmente</string>
<string name="account_status_online">Conectado</string>
<string name="account_status_connecting">Conectando\u2026</string>
<string name="account_status_offline">Desconectado</string>
<string name="account_status_unauthorized">No autorizado</string>
<string name="account_status_not_found">Servidor no encontrado</string>
<string name="account_status_no_internet">Sin conectividad</string>
<string name="account_status_requires_tls">El servidor requiere TLS</string>
<string name="account_status_error">Certificado no confiable</string>
<string name="account_status_regis_fail">Error en el registro</string>
<string name="account_status_regis_conflict">El identificador ya está en uso</string>
<string name="account_status_regis_success">Registro completado</string>
<string name="account_status_regis_not_sup">El servidor no soporta registros</string>
<string name="certif_no_trust">No conectar</string>
<string name="certif_trust">Confiar en el certificado</string>
<string name="encryption_choice_none">Texto plano</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">openPGP</string>
<string name="mgmt_account_edit">Editar cuenta</string>
<string name="mgmt_account_delete">Eliminar cuenta</string>
<string name="mgmt_account_disable">Deshabilitar temporalmente</string>
<string name="mgmt_account_enable">Habilitar</string>
</resources> </resources>

2
res/xml/preferences.xml
View File

@ -68,7 +68,7 @@
android:defaultValue="true"/> android:defaultValue="true"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="Advanced Options"> android:title="@string/pref_advanced_options">
<CheckBoxPreference <CheckBoxPreference
android:key="never_send" android:key="never_send"
android:title="@string/pref_never_send_crash" android:title="@string/pref_never_send_crash"