diff options
author | Christian S <christian@pix-art.de> | 2015-10-07 12:44:02 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-10-07 12:44:02 +0200 |
commit | e76ddbaa6c74a6ec2007100d665f250a599a293e (patch) | |
tree | 096ff46011a30e7ec8bbacf929eba26b912d06a3 /src/main/res/values-es/strings.xml | |
parent | a41baa76709eba69f84282c381bcf867828b5089 (diff) | |
parent | 043e19dd65b127d0672e5be70086696521e301d2 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-es/strings.xml')
-rw-r--r-- | src/main/res/values-es/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 7edd598ba..2ffd15810 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -408,7 +408,10 @@ <string name="public_conference">Conversación de acceso público</string> <string name="private_conference">Conversación privada solo para miembros</string> <string name="conference_options">Opciones de conversación</string> + <string name="members_only">Privada, solo miembros</string> <string name="non_anonymous">No anónima</string> + <string name="moderated">Moderada</string> + <string name="you_are_not_participating">No estás participando</string> <string name="modified_conference_options">¡Modificadas las opciones de la conversación!</string> <string name="could_not_modify_conference_options">No se pueden modificar las opciones de la conversación</string> <string name="never">Nunca</string> @@ -480,4 +483,5 @@ <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string> <string name="pref_use_white_background">Usar fondo blanco</string> <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string> + <string name="account_status_dns_timeout">Timeout en DNS</string> </resources> |