narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

Contact details translations + update spanish translations

Browse source
This commit is contained in:
kruks23 2014-05-22 22:58:25 +02:00
parent b99779432c
commit 950165033b
3 changed files with 46 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
res/values-es/strings.xml
View file

@ -13,6 +13,7 @@
<string name="action_add_account">Añadir cuenta</string>
<string name="action_edit_contact">Editar contacto</string>
<string name="action_delete_contact">Eliminar contacto de la lista</string>
<string name="action_add_phone_book">Añadir a contactos del teléfono</string>
<string name="title_activity_contacts">Contactos</string>
<string name="just_now">ahora</string>
<string name="minutes_ago">min</string>
@ -26,7 +27,7 @@
<string name="participant">Participante</string>
<string name="visitor">Visitante</string>
<string name="enter_new_name">Introduce un nuevo nombre:</string>
<string name="remove_contact_text">¿Quieres eliminar a %s de tu lista?. La conversación asociada a esta cuenta no se eliminará.</string>
<string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string>
<string name="untrusted_cert_hint">El servidor %s presenta un certificado no confiable, posiblemente auto firmado.</string>
<string name="account_info">Información del servidor</string>
<string name="register_account">Registrar nueva cuenta en servidor</string>
@ -39,6 +40,9 @@
<string name="invite_contacts_to_existing">Invitar a conferencia existente</string>
<string name="new_conference">Crear nueva conferencia</string>
<string name="cancel">Cancelar</string>
<string name="add">Añadir</string>
<string name="edit">Editar</string>
<string name="delete">Eliminar</string>
<string name="create_invite">Crear \u0026 Invitar</string>
<string name="new_conference_explained">¿Quieres crear una nueva conferencia con una dirección generada aleatoriamente e invitar a los contactos seleccionados a ella?</string>
<string name="no_open_mucs">No hay conferencias existentes</string>
@ -128,11 +132,13 @@
<string name="pref_grant_presence_updates">Suscripción de presencia</string>
<string name="pref_grant_presence_updates_summary">Por defecto otorgar y pedir suscripciones de presencia de los contactos que has creado</string>
<string name="subscriptions">Suscripciones</string>
<string name="subscription_updated">Suscripción actualizada</string>
<string name="your_account">Tu cuenta</string>
<string name="keys">Claves</string>
<string name="send_presence_updates">Enviar actualizaciones de presencia</string>
<string name="receive_presence_updates">Recibir actualizaciones de presencia</string>
<string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string>
<string name="asked_for_presence_updates">Solictida actualizaciones de presencia</string>
<string name="attach_choose_picture">Seleccionar imagen</string>
<string name="attach_take_picture">Hacer foto</string>
<string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string>
@ -170,4 +176,12 @@
<string name="save">Guardar</string>
<string name="passwords_do_not_match">Las contraseñas no coinciden</string>
<string name="invalid_jid">El identificador no es un identificador de Jabber válido</string>
<string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
<string name="add_phone_book_text">¿Te gustaría añadir a %s a tus contactos del teléfono?</string>
<string name="contact_status_online">Disponible</string>
<string name="contact_status_free_to_chat">Hablador</string>
<string name="contact_status_away">Ausente</string>
<string name="contact_status_extended_away">Ausencia ext.</string>
<string name="contact_status_do_not_disturb">No molestar</string>
<string name="contact_status_offline">Desconectado</string>
</resources>

13
res/values/strings.xml
View file

@ -12,6 +12,7 @@
<string name="action_secure">Secure conversation</string>
<string name="action_add_account">Add account</string>
<string name="action_edit_contact">Edit name</string>
<string name="action_add_phone_book">Add to phone book</string>
<string name="action_delete_contact">Delete from roster</string>
<string name="title_activity_contacts">Contacts</string>
<string name="just_now">just now</string>
@ -39,6 +40,9 @@
<string name="invite_contacts_to_existing">Invite to existing conference</string>
<string name="new_conference">Create new conference</string>
<string name="cancel">Cancel</string>
<string name="add">Add</string>
<string name="edit">Edit</string>
<string name="delete">Delete</string>
<string name="create_invite">Create \u0026 Invite</string>
<string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string>
<string name="no_open_mucs">No existing conferences</string>
@ -128,11 +132,13 @@
<string name="pref_grant_presence_updates">Grant presence updates</string>
<string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
<string name="subscriptions">Subscriptions</string>
<string name="subscription_updated">Subscription updated</string>
<string name="your_account">Your account</string>
<string name="keys">Keys</string>
<string name="send_presence_updates">Send presence updates</string>
<string name="receive_presence_updates">Receive presence updates</string>
<string name="ask_for_presence_updates">Ask for presence updates</string>
<string name="asked_for_presence_updates">Asked for presence updates</string>
<string name="attach_choose_picture">Choose picture</string>
<string name="attach_take_picture">Take picture</string>
<string name="preemptively_grant">Preemptively grant subscription request</string>
@ -171,4 +177,11 @@
<string name="passwords_do_not_match">Passwords do not match</string>
<string name="invalid_jid">This is not a valid Jabber ID</string>
<string name="error_out_of_memory">Ouf of memory. Image is to large</string>
<string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
<string name="contact_status_online">online</string>
<string name="contact_status_free_to_chat">free to chat</string>
<string name="contact_status_away">away</string>
<string name="contact_status_extended_away">extended away</string>
<string name="contact_status_do_not_disturb">do not disturb</string>
<string name="contact_status_offline">offline</string>
</resources>

36
src/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -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();
}
}