sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
iNPUTmice 2014-07-18 21:57:27 +02:00
parent c65600edc9 2f514381a2
commit 1cfe557b2b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
<string name="title_activity_conversations">Conversations</string> <string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Compartir con Conversación</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_start_conversation">Nueva Conversación</string>
<string name="title_activity_choose_contact">Elegir Contacto</string>
<string name="just_now">ahora</string> <string name="just_now">ahora</string>
<string name="minute_ago">hace 1 min</string> <string name="minute_ago">hace 1 min</string>
<string name="minutes_ago">hace %d min</string> <string name="minutes_ago">hace %d min</string>
@ -47,10 +48,7 @@
<string name="show_otr_key">Clave OTR</string> <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="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="start_conversation">Comenzar conversación</string>
<string name="invite_contacts">Invitar contactos</string> <string name="invite_contact">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="contacts">Contactos</string> <string name="contacts">Contactos</string>
<string name="search_jabber_id">Busca o escribe identificador Jabber</string> <string name="search_jabber_id">Busca o escribe identificador Jabber</string>
<string name="choose_account">Seleccionar cuenta</string> <string name="choose_account">Seleccionar cuenta</string>
@ -272,4 +270,6 @@
<string name="bookmark_already_exists">Este marcador ya exsite</string> <string name="bookmark_already_exists">Este marcador ya exsite</string>
<string name="you">Tú</string> <string name="you">Tú</string>
<string name="action_edit_subject">Editar asunto de la conferencia</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> </resources>

2
res/values/strings.xml
View File

@ -22,6 +22,7 @@
<string name="title_activity_conversations">Conversations</string> <string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_sharewith">Share with Conversation</string>
<string name="title_activity_start_conversation">Start 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="just_now">just now</string>
<string name="minute_ago">1 min ago</string> <string name="minute_ago">1 min ago</string>
<string name="minutes_ago">%d mins 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="bookmark_already_exists">This bookmark already exists</string>
<string name="you">You</string> <string name="you">You</string>
<string name="action_edit_subject">Edit conference subject</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="conference_not_found">Conference not found</string>
<string name="leave">Leave</string> <string name="leave">Leave</string>
</resources> </resources>