From 950165033b473127790c459775bdfe06ec1cea3c Mon Sep 17 00:00:00 2001 From: kruks23 Date: Thu, 22 May 2014 22:58:25 +0200 Subject: [PATCH] Contact details translations + update spanish translations --- res/values-es/strings.xml | 16 ++++++++- res/values/strings.xml | 13 +++++++ .../ui/ContactDetailsActivity.java | 36 +++++++++---------- 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c4330d5d..ffe06442 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -13,6 +13,7 @@ Añadir cuenta Editar contacto Eliminar contacto de la lista + Añadir a contactos del teléfono Contactos ahora min @@ -26,7 +27,7 @@ Participante Visitante Introduce un nuevo nombre: - ¿Quieres eliminar a %s de tu lista?. La conversación asociada a esta cuenta no se eliminará. + ¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará. El servidor %s presenta un certificado no confiable, posiblemente auto firmado. Información del servidor Registrar nueva cuenta en servidor @@ -39,6 +40,9 @@ Invitar a conferencia existente Crear nueva conferencia Cancelar + Añadir + Editar + Eliminar Crear \u0026 Invitar ¿Quieres crear una nueva conferencia con una dirección generada aleatoriamente e invitar a los contactos seleccionados a ella? No hay conferencias existentes @@ -128,11 +132,13 @@ Suscripción de presencia Por defecto otorgar y pedir suscripciones de presencia de los contactos que has creado Suscripciones + Suscripción actualizada Tu cuenta Claves Enviar actualizaciones de presencia Recibir actualizaciones de presencia Solicitar actualizaciones de presencia + Solictida actualizaciones de presencia Seleccionar imagen Hacer foto Por defecto otorgar peticiones de suscripción @@ -170,4 +176,12 @@ Guardar Las contraseñas no coinciden El identificador no es un identificador de Jabber válido + Sin memoria. La imagen es demasiado grande + ¿Te gustaría añadir a %s a tus contactos del teléfono? + Disponible + Hablador + Ausente + Ausencia ext. + No molestar + Desconectado \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 9de0b233..b2c97478 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12,6 +12,7 @@ Secure conversation Add account Edit name + Add to phone book Delete from roster Contacts just now @@ -39,6 +40,9 @@ Invite to existing conference Create new conference Cancel + Add + Edit + Delete Create \u0026 Invite Do you want to create a new conference with a randomly generated address and invite the selected contacts to it? No existing conferences @@ -128,11 +132,13 @@ Grant presence updates Preemptively grant and ask for presence subscription for contacts you created Subscriptions + Subscription updated Your account Keys Send presence updates Receive presence updates Ask for presence updates + Asked for presence updates Choose picture Take picture Preemptively grant subscription request @@ -171,4 +177,11 @@ Passwords do not match This is not a valid Jabber ID Ouf of memory. Image is to large + Do you want to add %s to your phones contact list? + online + free to chat + away + extended away + do not disturb + offline \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java index 72a0909a..83ae99d9 100644 --- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -89,11 +89,10 @@ public class ContactDetailsActivity extends XmppActivity { @Override public void onClick(View v) { AlertDialog.Builder builder = new AlertDialog.Builder(activity); - builder.setTitle("Add to phone book"); - builder.setMessage("Do you want to add " + contact.getJid() - + " to your phones contact list?"); - builder.setNegativeButton("Cancel", null); - builder.setPositiveButton("Add", addToPhonebook); + builder.setTitle(getString(R.string.action_add_phone_book)); + builder.setMessage(getString(R.string.add_phone_book_text, contact.getJid())); + builder.setNegativeButton(getString(R.string.cancel), null); + builder.setPositiveButton(getString(R.string.add), addToPhonebook); builder.create().show(); } }; @@ -125,17 +124,17 @@ public class ContactDetailsActivity extends XmppActivity { @Override public boolean onOptionsItemSelected(MenuItem menuItem) { AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setNegativeButton("Cancel", null); + builder.setNegativeButton(getString(R.string.cancel), null); switch (menuItem.getItemId()) { case android.R.id.home: finish(); break; case R.id.action_delete_contact: - builder.setTitle("Delete from roster") + builder.setTitle(getString(R.string.action_delete_contact)) .setMessage( getString(R.string.remove_contact_text, contact.getJid())) - .setPositiveButton("Delete", removeFromRoster).create() + .setPositiveButton(getString(R.string.delete), removeFromRoster).create() .show(); break; case R.id.action_edit_contact: @@ -146,7 +145,7 @@ public class ContactDetailsActivity extends XmppActivity { name = (EditText) view.findViewById(R.id.editText1); name.setText(contact.getDisplayName()); builder.setView(view).setTitle(contact.getJid()) - .setPositiveButton("Edit", editContactNameListener) + .setPositiveButton(getString(R.string.edit), editContactNameListener) .create().show(); } else { @@ -191,7 +190,8 @@ public class ContactDetailsActivity extends XmppActivity { @Override public void onClick(View v) { - Toast.makeText(getApplicationContext(), "Asked for presence updates",Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getString(R.string.asked_for_presence_updates), + Toast.LENGTH_SHORT).show(); xmppConnectionService.requestPresenceUpdatesFrom(contact); } @@ -205,31 +205,31 @@ public class ContactDetailsActivity extends XmppActivity { switch (contact.getMostAvailableStatus()) { case Presences.CHAT: - status.setText("free to chat"); + status.setText(R.string.contact_status_free_to_chat); status.setTextColor(0xFF83b600); break; case Presences.ONLINE: - status.setText("online"); + status.setText(R.string.contact_status_online); status.setTextColor(0xFF83b600); break; case Presences.AWAY: - status.setText("away"); + status.setText(R.string.contact_status_away); status.setTextColor(0xFFffa713); break; case Presences.XA: - status.setText("extended away"); + status.setText(R.string.contact_status_extended_away); status.setTextColor(0xFFffa713); break; case Presences.DND: - status.setText("do not disturb"); + status.setText(R.string.contact_status_do_not_disturb); status.setTextColor(0xFFe92727); break; case Presences.OFFLINE: - status.setText("offline"); + status.setText(R.string.contact_status_offline); status.setTextColor(0xFFe92727); break; default: - status.setText("offline"); + status.setText(R.string.contact_status_offline); status.setTextColor(0xFFe92727); break; } @@ -346,7 +346,7 @@ public class ContactDetailsActivity extends XmppActivity { } } if (updated) { - Toast.makeText(getApplicationContext(), "Subscription updated", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getString(R.string.subscription_updated), Toast.LENGTH_SHORT).show(); } }