From d6fd0343ae86917dd18e219be2556c65cbf032d7 Mon Sep 17 00:00:00 2001 From: kruks23 Date: Fri, 23 May 2014 16:20:49 +0200 Subject: [PATCH] Title activities translations + contacts translations + update Spanish Translations --- AndroidManifest.xml | 12 ++++++------ res/values-es/strings.xml | 18 ++++++++++++++++-- res/values/strings.xml | 14 ++++++++++++++ .../conversations/ui/ContactsActivity.java | 18 +++++++++--------- src/eu/siacs/conversations/ui/EditAccount.java | 4 ++-- 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d8ef5fa41..62ea4035d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -39,7 +39,7 @@ @@ -49,23 +49,23 @@ diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ffe064427..f0f05a678 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -15,6 +15,11 @@ Eliminar contacto de la lista Añadir a contactos del teléfono Contactos + Gestionar Cuentas + Ajustes + Detalles de Conferencia + Detalles de Contacto + Conversations ahora min conversaciones por leer @@ -39,10 +44,19 @@ Invitar contactos Invitar a conferencia existente Crear nueva conferencia + Crear nuevo contacto + Contactos + Seleccionar cuenta + Conferencia multiusuario + ¿Estás intentando unirte a una conferencia? Cancelar Añadir Editar Eliminar + Guardar + Sí + No + Ok 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 @@ -130,7 +144,7 @@ Aceptar Ha ocurrido un error Suscripción de presencia - Por defecto otorgar y pedir suscripciones de presencia de los contactos que has creado + Por defecto solicitar y conceder suscripciones de presencia de los contactos que has creado Suscripciones Suscripción actualizada Tu cuenta @@ -141,7 +155,7 @@ Solictida actualizaciones de presencia Seleccionar imagen Hacer foto - Por defecto otorgar peticiones de suscripción + Por defecto conceder solicitud de suscripción El archivo seleccionado no es una imagen Error convirtiendo el archivo de imagen Archivo no encontrado diff --git a/res/values/strings.xml b/res/values/strings.xml index b2c974786..0512106ec 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -15,6 +15,11 @@ Add to phone book Delete from roster Contacts + Manage Accounts + Settings + Conference Details + Contact Details + Conversations just now min ago unread Conversations @@ -39,10 +44,19 @@ Invite Contacts Invite to existing conference Create new conference + Create new contact + Contacts + Choose account + Multi User Conference + Are you trying to join a conference? Cancel Add Edit Delete + Save + Yes + No + Ok 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 diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java index c18b08915..f4c8ef0be 100644 --- a/src/eu/siacs/conversations/ui/ContactsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactsActivity.java @@ -186,7 +186,7 @@ public class ContactsActivity extends XmppActivity { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.account_offline)); builder.setMessage(getString(R.string.cant_invite_while_offline)); - builder.setNegativeButton("OK", null); + builder.setNegativeButton(getString(R.string.ok), null); builder.setIconAttribute(android.R.attr.alertDialogIcon); builder.create().show(); return false; @@ -289,12 +289,12 @@ public class ContactsActivity extends XmppActivity { Contact newContact = new Contact(searchString); newContact.resetOption(Contact.Options.IN_ROSTER); aggregatedContacts.add(newContact); - contactsHeader.setText("Create new contact"); + contactsHeader.setText(getString(R.string.new_contact)); } else { - contactsHeader.setText("Contacts"); + contactsHeader.setText(getString(R.string.contacts)); } } else { - contactsHeader.setText("Contacts"); + contactsHeader.setText(getString(R.string.contacts)); } contactsAdapter.notifyDataSetChanged(); @@ -427,7 +427,7 @@ public class ContactsActivity extends XmppActivity { } AlertDialog.Builder accountChooser = new AlertDialog.Builder(this); - accountChooser.setTitle("Choose account"); + accountChooser.setTitle(getString(R.string.choose_account)); accountChooser.setItems(accountList, listener); return accountChooser.create(); } @@ -435,9 +435,9 @@ public class ContactsActivity extends XmppActivity { public void showIsMucDialogIfNeeded(final Contact clickedContact) { if (clickedContact.couldBeMuc()) { AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle("Multi User Conference"); - dialog.setMessage("Are you trying to join a conference?"); - dialog.setPositiveButton("Yes", new OnClickListener() { + dialog.setTitle(getString(R.string.multi_user_conference)); + dialog.setMessage(getString(R.string.trying_join_conference)); + dialog.setPositiveButton(getString(R.string.yes), new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -445,7 +445,7 @@ public class ContactsActivity extends XmppActivity { clickedContact.getAccount(), true); } }); - dialog.setNegativeButton("No", new OnClickListener() { + dialog.setNegativeButton(getString(R.string.no), new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java index 47930747b..d1863f7e4 100644 --- a/src/eu/siacs/conversations/ui/EditAccount.java +++ b/src/eu/siacs/conversations/ui/EditAccount.java @@ -82,8 +82,8 @@ public class EditAccount extends DialogFragment { }); builder.setView(view); - builder.setNeutralButton(R.string.cancel, null); - builder.setPositiveButton(R.string.save, null); + builder.setNeutralButton(getString(R.string.cancel), null); + builder.setPositiveButton(getString(R.string.save), null); return builder.create(); }