diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
| commit | 1cfe557b2b7035c3b7df26948b82a11dff141e77 (patch) | |
| tree | a3e9f2f85db66d61c3508fd3a1cafea50854224d | |
| parent | c65600edc9861c5f1788676e03a8164904a79193 (diff) | |
| parent | 2f514381a22edd8c26c0b15f822c032edc1702df (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
| -rw-r--r-- | res/values-es/strings.xml | 8 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ef1dcac8..9ebf673b 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -22,6 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Compartir con Conversación</string> <string name="title_activity_start_conversation">Nueva Conversación</string> + <string name="title_activity_choose_contact">Elegir Contacto</string> <string name="just_now">ahora</string> <string name="minute_ago">hace 1 min</string> <string name="minutes_ago">hace %d min</string> @@ -47,10 +48,7 @@ <string name="show_otr_key">Clave OTR</string> <string name="no_otr_fingerprint">No se ha generado una clave OTR. Continúa y comienza una conversación encriptada</string> <string name="start_conversation">Comenzar conversación</string> - <string name="invite_contacts">Invitar contactos</string> - <string name="invite_contacts_to_existing">Invitar a conferencia existente</string> - <string name="new_conference">Crear nueva conferencia</string> - <string name="new_contact">Crear nuevo contacto</string> + <string name="invite_contact">Invitar contactos</string> <string name="contacts">Contactos</string> <string name="search_jabber_id">Busca o escribe identificador Jabber</string> <string name="choose_account">Seleccionar cuenta</string> @@ -272,4 +270,6 @@ <string name="bookmark_already_exists">Este marcador ya exsite</string> <string name="you">Tú</string> <string name="action_edit_subject">Editar asunto de la conferencia</string> + <string name="conference_not_found">Conferencia no encontrada</string> + <string name="leave">Salir</string> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index af655f67..61e3ee94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> + <string name="title_activity_choose_contact">Choose contact</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> <string name="minutes_ago">%d mins ago</string> @@ -269,7 +270,6 @@ <string name="bookmark_already_exists">This bookmark already exists</string> <string name="you">You</string> <string name="action_edit_subject">Edit conference subject</string> - <string name="title_activity_choose_contact">Choose contact</string> <string name="conference_not_found">Conference not found</string> <string name="leave">Leave</string> </resources> |